cloud-web-corejs 1.0.54-dev.207 → 1.0.54-dev.209

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

@@ -20,7 +20,9 @@ import {
   overwriteObj,
   runDataSourceRequest,
   getContainerWidgetByName,
-  cloneFormConfigWithoutEventHandler
+  cloneFormConfigWithoutEventHandler,
+  loopHandleWidget,
+  traverseAllWidgetsNew, columnFormatMap
 } from '../../../components/xform/utils/util';
 import {
   containers,
@@ -183,7 +185,9 @@ modules = {
       userRoleDTO2s: [],
       defaultUserSaleOrgDTO: null,
       bdService: null,
-      globalParam: {}
+      globalParam: {},
+      widgetEditOnWf: null,
+      wfModifyEnabled: false
     };
   },
   computed: {
@@ -235,12 +239,13 @@ modules = {
     await this.initUserRoleData();
     await this.initBdService();
     this.buildFormModel(!this.formJsonObj ? null : this.formJsonObj.widgetList);
-    this.hanldeCommonWidget();//处理组件显隐规则
+    // this.hanldeCommonWidget();//处理组件显隐规则
     if (formConfig.isLoadEntity) {
       await this.loadDefaultEntityData(() => {
         this.handleCustomEvent(formConfig.formScriptSuccess);
       });
     } else {
+      this.hanldeCommonWidget2();//处理组件显隐，可编辑
       this.handleShowContent();
     }
     this.handleOnCreated(),
@@ -429,8 +434,296 @@ modules = {
 
       return Object.keys(originalWidget.options).indexOf(configName) > -1;
     },
+    loopHandleAllWidget(callback) {
+      let columnLoopDo = (t, e) => {
+        if (t.children && t.children.length) {
+          t.children.forEach(item => {
+            columnLoopDo(item)
+          })
+        } else {
+          if (t.widget) {
+            callback && callback(t.widget)
+          }
+          if (t.editWidget) {
+            callback && callback(t.editWidget)
+          }
+          if (t.widgetList && t.widgetList.length) {
+            loopHandleWidget(t.widgetList, (widget) => {
+              callback && callback(widget)
+            });
+          }
+        }
+      }
+      loopHandleWidget(this.formJson.widgetList, (widget, parentWidget) => {
+        if (callback) {
+          callback(widget)
+          if (widget.type == "data-table") {
+            widget.options.tableColumns.forEach(item => {
+              columnLoopDo(item)
+            })
+          }
+        }
+      });
+    },
+    handleTableColumnWidget(widget) {
+      //修复data-table旧数据表格列widget与editWidget为空的问题
+      if (!widget || widget.type != "data-table" || !widget.options.tableColumns) return
+      let columnLoopDo = (t, e) => {
+        if (t.children && t.children.length) {
+          t.children.forEach(item => {
+            columnLoopDo(item)
+          })
+        } else {
+          let type1 = columnFormatMap[t.formatS];
+          if (type1 && t.columnOption && !t.widget) {
+            let fieldWidget = this.copyNewFieldWidget(
+              this.getFieldWidgetByType(type1)
+            );
+            fieldWidget.options = t.columnOption;
+            t.widget = fieldWidget;
+          }
+          let type2 = columnFormatMap[t.editFormatS];
+          if (type2 && t.editColumnOption && !t.editWidget) {
+            let fieldWidget = this.copyNewFieldWidget(
+              this.getFieldWidgetByType(type2)
+            );
+            fieldWidget.options = t.editColumnOption;
+            t.editWidget = fieldWidget;
+          }
+        }
+      }
+
+      widget.options.tableColumns.forEach(item => {
+        columnLoopDo(item)
+      })
+    },
+    hanldeCommonWidget2() {
+      let wfParam = this.wfParam || {};
+      let wfInfo = wfParam?.wfInfo
+      let taskDefinitionKey = wfInfo?.taskDefinitionKey;
+      let toModify = wfInfo?.toModify || false;//后台返回流程可以修改单据
+
+      let hasModifyItem = false;
+      let saveButton;
+      let saveButtonOptions;
+      let bdService = this.bdService;
+
+      let widgetEditOnWf = this.hanldeWfWidgetNew0();//是否有流程时，当前用户特定流程节点是否可全局可编辑
+      this.widgetEditOnWf = widgetEditOnWf;
+
+      traverseAllWidgetsNew(this.formJson.widgetList, (widget) => {
+        //修复data-table旧数据表格列widget与editWidget为空的问题
+        this.handleTableColumnWidget(widget);
+
+        //处理组件显隐规则
+        this.handleWidgetShowRule(widget);
+
+        if (wfParam.hasWf) {
+          //有流程
+          //设置组件的有流程可编辑，有流程隐藏
+          this.hanldeWfWidgetNew1(widget)
+          if (toModify) {
+            //后台返回流程可以修改单据
+            //设置组件的特定流程节点的可编辑，仅显示，隐藏
+            if (taskDefinitionKey) {
+              this.hanldeWfWidgetNew2(widget, (modifyFlag, saveButtonWidget) => {
+                if (!saveButton && saveButtonWidget) {
+                  //获取保存按钮
+                  saveButton = saveButtonWidget
+                }
+              })
+            }
+            if (widget.formItemFlag && !widget.options.hidden && !widget.options.disbaled) {
+              //存在存在可以编辑输入框框
+              hasModifyItem = true;
+            }
+          }
+        }
+      });
+      if (toModify && hasModifyItem && saveButton) {
+        //后台返回流程可以修改单据，存在保存按钮，存在可以编辑输入框框
+        saveButton.options.disabled = false;
+        saveButton.options.hidden = false;
+      }
+
+      this.wfModifyEnabled = hasModifyItem;
+    },
+    hanldeWfWidgetNew0() {
+
+      let wfParam = this.wfParam || {};
+      let wfInfo = wfParam?.wfInfo
+      let toModify = wfInfo?.toModify;
+      let result = false;
+
+      let formConfig = this.formConfig;
+      if (toModify && formConfig.wfConfigDataEnabled) {
+
+        let modelKey = wfInfo.modelKey;
+        let companyCode = this.$store.getters.companyCode;
+        let taskStep = (wfInfo.taskStep ?? "") + "";
+        let taskDefinitionKey = wfInfo.taskDefinitionKey;
+        let bdService = this.bdService;
+
+        let wfConfigData = formConfig.wfConfigData || []
+        let flag = false;
+        wfConfigData.forEach(item => {
+          let type = item.type;
+          let taskStepList = item.taskSteps ? item.taskSteps.split(',') : []
+          if (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) {
+              //可编辑
+              result = true;
+            }
+          }
+        })
+        return result;
+      }
+    },
+    hanldeWfWidgetNew1(widget) {
+      let wfParam = this.wfParam || {};
+      if (!wfParam.hasWf) return;
+      let isWfFlag = this.hasConfig(widget, 'wfFlag');
+      let widgetType = widget?.type;
+      let enabledByWf = widget?.options?.enabledByWf;
+      let hiddenByWf = widget?.options?.hiddenByWf;
+      let widgetName = widget?.options?.name;
+      /*    if (!hiddenByWf && this.widgetEditOnWf) {
+            enabledByWf = true;
+          }*/
+      let hidden = null;
+      let disabled = null;
+      if (isWfFlag) {
+        if (!this.widgetEditOnWf) {
+          if (this.hasConfig(widget, 'disabled')) {
+            if (!enabledByWf) {
+              disabled = true;
+              let onClick = widget.options.onClick;
+              if (onClick && onClick.startsWith("this.getFormRef().$baseReload()")) {
+                disabled = false;
+              }
+            } else {
+              disabled = false;
+            }
+            if (widgetType == 'reset_button' && enabledByWf === undefined) {
+              disabled = false;
+            }
+            if (disabled !== null) {
+              widget.options.disabled = disabled;
+            }
+          }
+        }
+
+        if (hiddenByWf) {
+          hidden = true
+        }
+        if (widget && widgetType == 'save_button' && hiddenByWf === undefined) {
+          hidden = true
+        }
+        if (hidden !== null) {
+          widget.options.hidden = hidden;
+        }
+      }
+
+      /*if (widget?.type == "data-table") {
+        let loopDo = (t, e) => {
+          if (t.children && t.children.length) {
+            t.children.forEach(item => {
+              loopDo(item)
+            })
+          } else {
+            if (t.widget) {
+              this.hanldeWfWidgetNew1(t.widget)
+            }
+            if (t.widgetList && t.widgetList.length) {
+              loopHandleWidget(t.widgetList, (item1) => {
+                this.hanldeWfWidgetNew1(item1)
+              });
+            }
+          }
+        }
+        widget.options.tableColumns.forEach(item => {
+          loopDo(item)
+        })
+
+      }*/
+    },
+    hanldeWfWidgetNew2(widget, callback) {
+      let hasModifyItem = false;
+      let saveButton;
+      let flag = this.hanldeWfWidgetItemNew(widget)
+      if (flag) {
+        hasModifyItem = true
+      }
+      if (widget?.options?.saveButton) {
+        saveButton = widget;
+      }
+      callback(hasModifyItem, saveButton)
+    },
+    hanldeWfWidgetItemNew(widget) {
+      let hasModifyItem = false;
+      // let widget = target.field || target.widget;
+      let wfEdit = widget?.options.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 = (widget, columnOptions) => {
+        let options = widget?.options || columnOptions;
+        if (!options || !options.wfEdit) return
+        let wfConfigData = options.wfConfigData || [];
+        let flag = false;
+        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;
+                flag = true;
+              } else if (type === 2) {
+                //仅显示
+                // target.setDisabled && target.setDisabled(true);
+                if (options.disabled !== undefined) options.disabled = true;
+                // target.setHidden(false);
+                options.hidden = false;
+                flag = true;
+              } else if (type === 3) {
+                // target.setHidden(true);
+                options.hidden = true;
+                flag = true;
+              }
+            }
+          }
+        })
+        /*if (flag && e && widget.type == 'baseAttachment') {
+          e.initOption();
+        }*/
+      }
+      handleWfConfigData(widget)
+      return hasModifyItem;
+    },
+
     hanldeCommonWidget() {
-      this.loopHandleWidget(this.formJson.widgetList, (widget) => {
+      loopHandleWidget(this.formJson.widgetList, (widget) => {
         //处理组件显隐规则
         this.handleWidgetShowRule(widget)
       });
@@ -489,6 +782,7 @@ modules = {
             }
           }
         }
+        return optionModel.hidden;
       }
 
     },
@@ -566,7 +860,7 @@ modules = {
           }
           widget.options.tableColumns.forEach(item => {
             loopDo(item)
-            this.loopHandleWidget(item.widgetList, (item1) => {
+            loopHandleWidget(item.widgetList, (item1) => {
               toDo2(item1)
             });
           })
@@ -577,7 +871,7 @@ modules = {
         }*/
       }
 
-      this.loopHandleWidget(this.formJson.widgetList, (widget) => {
+      loopHandleWidget(this.formJson.widgetList, (widget) => {
         //有流程，处理禁用状态
         let formItemFlag = widget?.formItemFlag
         if (formItemFlag) {
@@ -604,7 +898,7 @@ modules = {
       let saveButtonOptions;
       let bdService = this.bdService;
 
-      this.loopHandleWidget(this.formJson.widgetList, (widget) => {
+      loopHandleWidget(this.formJson.widgetList, (widget) => {
         let flag = this.hanldeWfWidgetItem(widget)
         if (!hasModifyItem && flag) {
           hasModifyItem = true
@@ -692,21 +986,16 @@ modules = {
 
         widget.options.tableColumns.forEach(item => {
           loopDo(item)
-          this.loopHandleWidget(item.widgetList, (item1) => {
+          loopHandleWidget(item.widgetList, (item1) => {
             handleWfConfigData(item1)
           });
         })
-        /*this.loopHandleWidget(widget.widgetList, (item1) => {
-          handleWfConfigData(item1.options)
-        });
-        this.loopHandleWidget(widget.buttons, (item1) => {
-          handleWfConfigData(item1.options)
-        });*/
       }
 
       return hasModifyItem;
     },
     loadDefaultEntityData(callback) {
+      let that = this;
       let formConfig = this.formConfig;
       // let isLoadEntity = formConfig.isLoadEntity;
       let entity = formConfig.entity;
@@ -745,10 +1034,11 @@ modules = {
                 this.hasWf = hasWf;
                 this.wfParam = wfParam;
 
-                if (hasWf) {
+                /*if (hasWf) {
                   this.hanldeWfWidget();
                   this.hanldeWfWidget2();
-                }
+                }*/
+                this.hanldeCommonWidget2();//处理组件显隐，可编辑
 
                 this.showFormContent = true;
                 this.$nextTick(() => {
@@ -784,6 +1074,37 @@ modules = {
                 })
               }
             }
+
+            if (formConfig.wfAgreenBindSave) {
+              option.onClickAgree = (done) => {
+                if (that.wfModifyEnabled) {
+                  let formRef = this.getFormRef ? this.getFormRef() : this;
+                  formRef.validate(valid => {
+                    if (valid) {
+                      done();
+                    }
+                  });
+                } else {
+                  done();
+                }
+              }
+              option.onBeforeAgree = (done) => {
+                if (that.wfModifyEnabled) {
+                  this.saveDefaultHandle({
+                    config: {
+                      successMsg: false,
+                      isConfirm: false,
+                      success: res => {
+                        done()
+                      },
+                    }
+                  })
+                } else {
+                  done();
+                }
+              }
+            }
+
             let resOption = option
             if (wfConfig1) {
               resOption = extendDeeply(resOption, wfConfig1)
@@ -817,6 +1138,7 @@ modules = {
             formData = res.objx || {};
             // this.currentFormData = res.objx || {};
             if (!wfConfig) {
+              this.hanldeCommonWidget2();//处理组件显隐，可编辑
               this.setFormData(formData);
               this.showFormContent = true;
               this.$nextTick(() => {
@@ -827,6 +1149,7 @@ modules = {
           }
         });
       } else {
+        this.hanldeCommonWidget2();//处理组件显隐，可编辑
         this.handleShowContent();
       }
     },
@@ -1142,19 +1465,19 @@ modules = {
       if (!!subFormName) {
         let subFormRef = this.getWidgetRef(subFormName)
         if (!!subFormRef) {
-          if(subFormRef.widget.type == "data-table"){
+          if (subFormRef.widget.type == "data-table") {
             let rows = subFormRef.getValue();
-            if(rows){
+            if (rows) {
               rows.forEach(row => {
-                result.push( widgetName + '_' + row._X_ROW_KEY)
+                result.push(widgetName + '_' + row._X_ROW_KEY)
               })
             }
 
-          }else{
+          } else {
             let rowIds = subFormRef.getRowIdData()
             if (!!rowIds && (rowIds.length > 0)) {
               rowIds.forEach(rid => {
-                result.push( widgetName + '@row' + rid)
+                result.push(widgetName + '@row' + rid)
               })
             }
           }
@@ -2128,126 +2451,6 @@ modules = {
       this.formDrawerOption.confirm && this.formDrawerOption.confirm()
     },
 
-    loopHandleWidget: function (e, callback) {
-      let t = this;
-      e
-      && e.length > 0
-      && e.forEach(function (e) {
-        t.loopHandleWidgetItem(e, callback);
-      });
-    },
-    loopHandleWidgetItem: function (e, callback) {
-      let t = this;
-      let dataId = this.dataId;
-      let currentFormData = this.currentFormData;
-      let fieldKeyName = this.getFieldKeyName(e)
-      let defaultValue = e.options.defaultValue === undefined || e.options.defaultValue === "" ? null : e.options.defaultValue;
-      if ('container' === e.category) {
-        callback(e)
-        if ('vf-dialog' === e.type || 'vf-drawer' === e.type) ;
-        else if ('data-table' === e.type) {
-          if (!!e.widgetList) {
-            e.widgetList.forEach((childItem) => {
-              this.loopHandleWidgetItem(childItem, callback);
-            });
-          }
-          if (!!e.buttons) {
-            e.buttons.forEach((childItem) => {
-              this.loopHandleWidgetItem(childItem, callback);
-            });
-          }
-        } else if ('list-h5' === e.type) {
-          if (!!e.widgetList && (e.widgetList.length > 0)) {
-            e.widgetList.forEach((childItem) => {
-              this.loopHandleWidgetItem(childItem, callback);
-            });
-          }
-        } else if ('grid' === e.type) {
-          e.cols
-          && e.cols.length > 0
-          && e.cols.forEach(function (e) {
-            t.loopHandleWidgetItem(e, callback);
-          });
-        } else if ('table' === e.type) {
-          e.rows
-          && e.rows.length > 0
-          && e.rows.forEach(function (e) {
-            e.cols
-            && e.cols.length > 0
-            && e.cols.forEach(function (e) {
-              t.loopHandleWidgetItem(e, callback);
-            });
-          });
-        } else if ('h5-table' === e.type) {
-          e.rows
-          && e.rows.length > 0
-          && e.rows.forEach(function (e) {
-            e.cols
-            && e.cols.length > 0
-            && e.cols.forEach(function (e) {
-              t.loopHandleWidgetItem(e, callback);
-            });
-          });
-        } else if ('tab' === e.type) {
-          e.tabs
-          && e.tabs.length > 0
-          && e.tabs.forEach(function (e) {
-            e.widgetList
-            && e.widgetList.length > 0
-            && e.widgetList.forEach(function (e) {
-              t.loopHandleWidgetItem(e, callback);
-            });
-          });
-        } else if ('detail' === e.type) {
-          if (e.panes) {
-            e.panes.forEach(function (e) {
-              if (e.widgetList) {
-                e.widgetList.forEach(function (e) {
-                  t.loopHandleWidgetItem(e, callback);
-                });
-              }
-              if (e.buttonWidgetList) {
-                e.buttonWidgetList.forEach(function (e) {
-                  t.loopHandleWidgetItem(e, callback);
-                });
-              }
-            });
-          }
-          if (e.widgetList) {
-            e.widgetList.forEach(function (e) {
-              t.loopHandleWidgetItem(e, callback);
-            });
-          }
-        } else if ('detail-pane' === e.type) {
-          if (e.widgetList) {
-            e.widgetList.forEach(function (e) {
-              t.loopHandleWidgetItem(e, callback);
-            });
-          }
-          if (e.buttonWidgetList) {
-            e.buttonWidgetList.forEach(function (e) {
-              t.loopHandleWidgetItem(e, callback);
-            });
-          }
-        } else {
-          'grid-col' === e.type || e.type,
-          e.widgetList
-          && e.widgetList.length > 0
-          && e.widgetList.forEach(function (e) {
-            t.loopHandleWidgetItem(e, callback);
-          });
-        }
-
-      } else {
-        callback && callback(e)
-        /*if (dataId || currentFormData.hasOwnProperty(fieldKeyName)) {
-          let c = currentFormData[fieldKeyName] ?? null;
-          this.$set(this.formDataModel, fieldKeyName, baseRefUtil.deepClone(c));
-        } else {
-          this.$set(this.formDataModel, fieldKeyName, defaultValue);
-        }*/
-      }
-    },
 
   }
 };

package/src/components/xform/utils/util.js

@@ -277,6 +277,41 @@ export function traverseContainerWidgets(
   }); */
 }
 
+export function traverseAllWidgetsNew(widgetList, callback) {
+  if (!widgetList) {
+    return;
+  }
+  let columnLoopDo = (t, e) => {
+    if (t.children && t.children.length) {
+      t.children.forEach(item => {
+        columnLoopDo(item)
+      })
+    } else {
+      if (t.widget) {
+        callback && callback(t.widget)
+      }
+      if (t.editWidget) {
+        callback && callback(t.editWidget)
+      }
+      if (t.widgetList && t.widgetList.length) {
+        loopHandleWidget(t.widgetList, (widget) => {
+          callback && callback(widget)
+        });
+      }
+    }
+  }
+  loopHandleWidget(widgetList, (widget,parentWidget) => {
+    if(callback){
+      callback(widget)
+      if(widget.type == "data-table"){
+        widget.options.tableColumns.forEach(item => {
+          columnLoopDo(item)
+        })
+      }
+    }
+  });
+}
+
 export function traverseAllWidgets(widgetList, handler) {
   if (!widgetList) {
     return;
@@ -807,6 +842,9 @@ export function getDefaultFormConfig() {
     saveScriptCode: "saveUpdate",
     wfConfig: null,
     wfStartBindSave: false,
+    wfAgreenBindSave:false,
+    wfConfigDataEnabled:false,
+    wfConfigData:[]
   };
 }