From 2cbad4e40c2938a90172aa24551e82a4817b9640 Mon Sep 17 00:00:00 2001
From: yuxc <yuxc@vci-tech.com>
Date: 星期四, 25 四月 2024 15:21:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue | 58 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue b/Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue
index afeee51..caaaf14 100644
--- a/Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue
+++ b/Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue
@@ -318,55 +318,54 @@
item=item.replace(/:/g,'=');
}
}
- /*if (paramVOS['initvalue']) {
- var values = paramVOS['initvalue'].split(';');
- var initValues = []
- layui.each(values, function (i, item) {
- item=item.replace(':','=');
+ paramVOS['initvalue']=paramVOS['initvalue'] || paramVOS['initValue'];
+ let isShow = true;
+ if (paramVOS['initvalue']) {
+ let values = paramVOS['initvalue'].split(';');
+ let initValues = {}
+ values.forEach((i, item) => {
+ item = item.replace(':', '=');
if (item.indexOf('${') > -1) {
if (item.split('=')[1].indexOf('.') > -1) {
- if (sourceData.length<1 || !sourceData[0].oid) {
+ if (this.sourceData.length < 1 || !this.sourceData.oid) {
isShow = false;
- $webUtil.showErrorMsg("璇峰厛閫夋嫨涓�鏉℃潵婧愭暟鎹�");
+ this.$message.error("璇峰厛閫夋嫨涓�鏉℃潵婧愭暟鎹�");
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]
- }
+ let name = item.split('=')[1].split('.')[1].replace('${', '').replace('}', '');
+ initValues[item.split('=')[0]] = this.sourceData[name]
} else {
- if (dataStore.length < 1) {
+ if (this.dataStore.length < 1) {
isShow = false;
- $webUtil.showErrorMsg("璇峰厛閫夋嫨涓�鏉℃暟鎹�");
+ this.$message.error("璇峰厛閫夋嫨涓�鏉℃暟鎹�");
return false;
}
- var name = item.split('=')[1].replace('${', '').replace('}', '');
- item = item.split('=')[0] + '=' + dataStore[0][name];
+ let name = item.split('=')[1].replace('${', '').replace('}', '');
+ initValues[item.split('=')[0]] = this.dataStore[0][name];
}
}
- initValues.push(item)
})
- paramVOS['initvalue'] = initValues.join(';')
- }*/
+ paramVOS['initvalue'] = initValues
+ }
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()
+ if(isShow){
+ doAction(item, {
+ paramVOS: paramVOS,
+ dataStore: this.dataStore || [],
+ sourceData: this.sourceData || {},
+ callback: function () {
+ if (that.$parent.handleRefresh) {
+ that.$parent.handleRefresh()
+ }
}
- }
- });
+ });
+ }
}
},
}
@@ -375,3 +374,4 @@
<style scoped>
</style>
+
--
Gitblit v1.9.3