From 52e123212f37e214ee4599649adbd743e0d86c2b Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 15 四月 2024 10:32:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue | 100 +++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 90 insertions(+), 10 deletions(-)
diff --git a/Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue b/Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue
index 7b8dee8..afeee51 100644
--- a/Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue
+++ b/Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue
@@ -57,10 +57,15 @@
import func from "@/util/func";
import {validatenull} from "@/util/validate";
import {doAction} from '@/actions/base/BaseAction';
+import Vue from "vue";
export default {
name: "dynamic-button",
props: {
+ componentVO: {
+ type: Object,
+ default: {}
+ },
type: {
type: String
},
@@ -73,13 +78,19 @@
butttonList: {
type: Array
},
- selectList: {
+ default:{
+ type:String,
+ },
+ sourceData: {
+ //鎸夐挳鎵�灞炲尯鍩熺殑涓婁竴鍖哄煙閫変腑鏁版嵁
+ type: Object,
+ default: {}
+ },
+ dataStore: {
+ //鎸夐挳鎵�灞炲尯鍩熼�変腑鏁版嵁
type: Array,
default: []
},
- default:{
- type:String,
- }
},
data() {
return {
@@ -273,18 +284,87 @@
},
methods: {
//琛ㄦ牸鏍戦粯璁ゆ柊澧炲瓙椤�
- handleDefaultAddChildren(row){
+ handleDefaultAddChildren(row) {
this.visible = true;
this.formName = '鏂板瀛愮骇'
this.$refs.dynamicForm.form = row;
},
buttonClick(item) {
- doAction(item,{
- paramVOS: item.paramVOS,
- dataStore: [],
- sourceData: {},
- callback: function (){
+ const paramVOS=item.paramVOS;
+ const DefineVO = this.componentVO.treeDefineVO || this.componentVO.tableDefineVO || this.componentVO.treeTableDefineVO || this.componentVO.formDefineVO;
+ if (!paramVOS['title']) {
+ paramVOS['title'] = item.name + (DefineVO.title || DefineVO.componentTitle || '');
+ }
+ if (!paramVOS['type']) {
+ paramVOS['type'] = DefineVO.btmType;
+ }
+ for(let item in paramVOS) {
+ if (item.includes('.${') && item.includes('}')) {
+ //鏇挎崲鎴愭簮鏁版嵁涓殑鍊�
+ if (Object.keys(this.sourceData).length === 0) {
+ this.$message.error("璇峰厛閫夋嫨涓�鏉℃潵婧愭暟鎹�");
+ return false;
+ }
+ item=item.replace(/:/g,'=');
+ let values = item.split(';');
+ let initValues = []
+ } else if (item.includes('${') && item.includes('}')) {
+ //鏇挎崲鎴愰�変腑鏁版嵁鐨勫��
+ if (this.dataStore.length < 1) {
+ this.$message.error("璇峰厛閫夋嫨涓�鏉℃暟鎹�");
+ return false;
+ }
+ item=item.replace(/:/g,'=');
+ }
+ }
+ /*if (paramVOS['initvalue']) {
+ var values = paramVOS['initvalue'].split(';');
+ var initValues = []
+ layui.each(values, function (i, item) {
+ item=item.replace(':','=');
+ if (item.indexOf('${') > -1) {
+ if (item.split('=')[1].indexOf('.') > -1) {
+ if (sourceData.length<1 || !sourceData[0].oid) {
+ isShow = false;
+ $webUtil.showErrorMsg("璇峰厛閫夋嫨涓�鏉℃潵婧愭暟鎹�");
+ return false;
+ }
+ var name = item.split('=')[1].split('.')[1].replace('${', '').replace('}', '');
+ if (name == 'oid') {
+ item = item.split('=')[0] + '=' + sourceData[0]['oid']
+ } else {
+ item = item.split('=')[0] + '=' + sourceData[0][name]
+ }
+ } else {
+ if (dataStore.length < 1) {
+ isShow = false;
+ $webUtil.showErrorMsg("璇峰厛閫夋嫨涓�鏉℃暟鎹�");
+ return false;
+ }
+ var name = item.split('=')[1].replace('${', '').replace('}', '');
+ item = item.split('=')[0] + '=' + dataStore[0][name];
+
+ }
+ }
+ initValues.push(item)
+ })
+ paramVOS['initvalue'] = initValues.join(';')
+ }*/
+ if(paramVOS['BSContent'] || paramVOS['BSContext']){
+ paramVOS['context']=paramVOS['BSContext'] || paramVOS['BSContent']
+ paramVOS['content']=paramVOS['BSContext'] || paramVOS['BSContent'];
+ }
+
+ const that=this;
+ doAction(item, {
+ paramVOS: paramVOS,
+ dataStore: this.dataStore || [],
+ sourceData: this.sourceData || {},
+ callback: function () {
+ if (that.$parent.handleRefresh) {
+ that.$parent.handleRefresh()
+ }
}
});
}
--
Gitblit v1.9.3