cloud-web-corejs 1.0.54-dev.210 → 1.0.54-dev.213

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

@@ -240,6 +240,7 @@ modules = {
     await this.initSaleOrgData();
     await this.initUserRoleData();
     await this.initBdService();
+    // this.handleAllTableColumnWidget();
     this.buildFormModel(!this.formJsonObj ? null : this.formJsonObj.widgetList);
     // this.hanldeCommonWidget();//处理组件显隐规则
     if (formConfig.isLoadEntity) {
@@ -467,14 +468,25 @@ modules = {
         }
       });
     },
+    handleAllTableColumnWidget(){
+      traverseAllWidgetsNew(this.formJson.widgetList, (widget) => {
+          //修复data-table旧数据表格列widget与editWidget为空的问题
+        if(widget.type == "data-table"){
+          this.handleTableColumnWidget(widget);
+        }
+      })
+    },
     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 => {
+          for (let item of t.children){
             columnLoopDo(item)
-          })
+          }
+          /*t.children.forEach(item => {
+            columnLoopDo(item)
+          })*/
         } else {
           let type1 = columnFormatMap[t.formatS];
           if (type1 && t.columnOption && !t.widget) {
@@ -482,25 +494,28 @@ modules = {
               this.getFieldWidgetByType(type1)
             );
             fieldWidget.options = t.columnOption;
-            fieldWidget.columnType = t.formatS
             t.widget = fieldWidget;
           }
+          if (t.widget) t.widget.columnType = t.formatS
+
           let type2 = columnFormatMap[t.editFormatS];
           if (type2 && t.editColumnOption && !t.editWidget) {
             let fieldWidget = this.copyNewFieldWidget(
               this.getFieldWidgetByType(type2)
             );
             fieldWidget.options = t.editColumnOption;
-            fieldWidget.columnType = t.editFormatS
-
             t.editWidget = fieldWidget;
           }
+          if (t.editWidget) t.editWidget.columnType = t.editFormatS
         }
       }
 
-      widget.options.tableColumns.forEach(item => {
+      for (let item of widget.options.tableColumns){
         columnLoopDo(item)
-      })
+      }
+      /*widget.options.tableColumns.forEach(item => {
+        columnLoopDo(item)
+      })*/
     },
     hanldeCommonWidget2() {
       let wfParam = this.wfParam || {};
@@ -618,14 +633,14 @@ modules = {
       }
     },
     getIsfreeWidgetTypesOfWf(widget) {
-      if(!widget)return false;
+      if (!widget) return false;
       let widgetType = widget.type;
       let sourceType = widget.sourceType;
       let result = freeWidgetTypesOfWf.includes(widgetType) || (sourceType && freeWidgetTypesOfWf.includes(sourceType))
       return widget.options.label == "重置" || result
     },
     getIsHiddenWidgetTypesOfWf(widget) {
-      if(!widget)return false;
+      if (!widget) return false;
       let widgetType = widget.type;
       let targetType = widget.targetType;
       let result = hiddenWidgetTypesOfWf.includes(widgetType) || (targetType && hiddenWidgetTypesOfWf.includes(targetType))
@@ -633,11 +648,13 @@ modules = {
     },
     hanldeWfWidgetNew1(widget) {
       if (!widget) return;
-      if (this.getIsfreeWidgetTypesOfWf(widget))return//过滤掉不受限组件
+      let flag = widget.columnType && ['editDelete', 'removeTreeRow'].includes(widget.columnType)
+      if (!flag && this.getIsfreeWidgetTypesOfWf(widget)) return//过滤掉不受限组件
       if (this.widgetEditOnWf) return//匹配到流程第一步可编辑，不执行下面禁用隐藏
       let wfParam = this.wfParam || {};
       if (!wfParam.hasWf) return;//过滤掉没流程
-      if (widget.columnType == 'editDelete') {
+
+      if (flag) {
         //数据表格列的删除标识，有流程隐藏
         widget.options.hidden = true
       } else if (this.getIsHiddenWidgetTypesOfWf(widget)) {