cloud-web-corejs 1.0.54-dev.119 → 1.0.54-dev.120

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.119",
+  "version": "1.0.54-dev.120",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/components/xform/form-render/container-item/data-table-mixin.js

@@ -941,7 +941,7 @@ modules = {
         tableOption = extendDeeply(tableOption, tableConfig);
         this.tableConfig = tableConfig;
       }
-      debugger
+
       if (tableOption.config.showFooter && !tableOption.config.footerMethod) {
 
         let footerColumnIds = columns.filter(item => !!item.params?.footerDataType).map(item => item.params.columnId);

package/src/components/xform/form-render/indexMixin.js

@@ -373,16 +373,17 @@ modules = {
       for (let key in refList) {
         let target = refList[key];
         let widget = target.field || target.widget;
+        /*
         let wfEdit = widget?.options.wfEdit;
         if (wfEdit) {
           let wfConfigData = widget?.options?.wfConfigData || [];
           wfConfigData.forEach(item => {
+
             let type = item.type;
             let taskStepList = item.taskSteps ? item.taskSteps.split(',') : []
             if (type && taskStepList.includes(taskStep)) {
               let companyCodeStr = item.companyCodes;
               let companyCodes = companyCodeStr ? companyCodeStr.split(",").filter(item => !!item) : [];
-              // let companyCodes = companyInfos.map(item => item.companyCode);
               let flag1 = !item.serveName || item.serveName == bdService;
               let flag2 = !item.modelKey || item.modelKey == modelKey;
               let flag3 = !companyCodes.length || companyCodes.includes(companyCode)
@@ -401,15 +402,11 @@ modules = {
                 }
               }
             }
-
-            /*if (item.modelId == wfInfo.modelId) {
-              if (item.nodeIds.includes(taskDefinitionKey)) {
-                hasModifyItem = true;
-                target.setDisabled(false);
-                target.setHidden(false);
-              }
-            }*/
           })
+        }*/
+        let flag = this.hanldeWfWidgetItem(target)
+        if(!hasModifyItem && flag){
+          hasModifyItem = true
         }
         if (!saveButton && widget?.options?.saveButton) {
           saveButton = target;
@@ -420,6 +417,67 @@ modules = {
         saveButton.setHidden(false);
       }
     },
+    hanldeWfWidgetItem(target){
+      let hasModifyItem = false;
+      let widget = target.field || target.widget;
+      let wfEdit = widget?.options.wfEdit;
+      if (wfEdit) {
+        let bdService = this.bdService;
+        let wfParam = this.wfParam;
+        let wfInfo = wfParam.wfInfo
+        let modelKey = wfInfo.modelKey;
+        let companyCode = this.$store.getters.companyCode;
+        let taskStep = (wfInfo.taskStep ?? "") + "";
+
+        let handleWfConfigData = (options)=>{
+          if(!options || !options.wfEdit)return
+          let wfConfigData = options.wfConfigData || [];
+          wfConfigData.forEach(item => {
+
+            let type = item.type;
+            let taskStepList = item.taskSteps ? item.taskSteps.split(',') : []
+            if (type && taskStepList.includes(taskStep)) {
+              let companyCodeStr = item.companyCodes;
+              let companyCodes = companyCodeStr ? companyCodeStr.split(",").filter(item => !!item) : [];
+              let flag1 = !item.serveName || item.serveName == bdService;
+              let flag2 = !item.modelKey || item.modelKey == modelKey;
+              let flag3 = !companyCodes.length || companyCodes.includes(companyCode)
+              if (flag1 && flag2 && flag3) {
+                if (type === 1) {
+                  //可编辑
+                  hasModifyItem = true;
+                  if(options.disabled!==undefined)options.disabled = false;
+                  // target.setDisabled && target.setDisabled(false);
+                  // target.setHidden(false);
+                  options.hidden = false;
+                } else if (type === 2) {
+                  //仅显示
+                  // target.setDisabled && target.setDisabled(true);
+                  if(options.disabled!==undefined)options.disabled = true;
+                  // target.setHidden(false);
+                  options.hidden = false;
+                } else if (type === 3) {
+                  // target.setHidden(true);
+                  options.hidden = true;
+                }
+              }
+            }else if(type == "data-table"){
+              target.options.tableColumns.forEach(item => {
+                handleWfConfigData(item.columnOption)
+              })
+              target.widgetList.forEach(item => {
+                handleWfConfigData(item.options)
+              })
+              target.buttons.forEach(item => {
+                handleWfConfigData(item.options)
+              })
+            }
+          })
+        }
+        handleWfConfigData(widget?.options)
+      }
+      return hasModifyItem;
+    },
     loadDefaultEntityData(callback) {
       let formConfig = this.formConfig;
       // let isLoadEntity = formConfig.isLoadEntity;

package/src/views/user/notify_message/dialog.vue

@@ -87,7 +87,7 @@ export default {
 };
 </script>
 
-<style>
+<style scoped>
 .designer-dialog.indexUse #containt .detail-wrap .d-cont {
   height: calc(100vh - 82px)
 }