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

package/src/components/xform/form-designer/setting-panel/form-setting.vue

@@ -413,7 +413,7 @@
                 type=""
                 circle=""
                 icon="el-icon-minus"
-                @click="addItem"
+                @click="wfConfigData.splice(scope.$index,1)"
               ></el-button>
             </template>
           </el-table-column>

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

@@ -21,7 +21,8 @@ import {
   runDataSourceRequest,
   getContainerWidgetByName,
   cloneFormConfigWithoutEventHandler,
-  loopHandleWidget
+  loopHandleWidget,
+  traverseAllWidgetsNew, columnFormatMap
 } from '../../../components/xform/utils/util';
 import {
   containers,
@@ -433,11 +434,74 @@ 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 toModify = wfInfo?.toModify || false;//后台返回流程可以修改单据
 
       let hasModifyItem = false;
       let saveButton;
@@ -447,34 +511,37 @@ modules = {
       let widgetEditOnWf = this.hanldeWfWidgetNew0();//是否有流程时，当前用户特定流程节点是否可全局可编辑
       this.widgetEditOnWf = widgetEditOnWf;
 
-      loopHandleWidget(this.formJson.widgetList, (widget) => {
+      traverseAllWidgetsNew(this.formJson.widgetList, (widget) => {
+        //修复data-table旧数据表格列widget与editWidget为空的问题
+        this.handleTableColumnWidget(widget);
 
-        let isModify = false;
         //处理组件显隐规则
-        let hidden = this.handleWidgetShowRule(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 (modifyFlag) {
-                  hasModifyItem = true;
-                }*/
               })
             }
             if (widget.formItemFlag && !widget.options.hidden && !widget.options.disbaled) {
+              //存在存在可以编辑输入框框
               hasModifyItem = true;
             }
           }
         }
       });
-      if (hasModifyItem && saveButton) {
+      if (toModify && hasModifyItem && saveButton) {
+        //后台返回流程可以修改单据，存在保存按钮，存在可以编辑输入框框
         saveButton.options.disabled = false;
         saveButton.options.hidden = false;
       }
@@ -525,32 +592,32 @@ modules = {
       let enabledByWf = widget?.options?.enabledByWf;
       let hiddenByWf = widget?.options?.hiddenByWf;
       let widgetName = widget?.options?.name;
-      if (!hiddenByWf && this.widgetEditOnWf) {
-        enabledByWf = true;
-      }
+      /*    if (!hiddenByWf && this.widgetEditOnWf) {
+            enabledByWf = true;
+          }*/
       let hidden = null;
       let disabled = null;
       if (isWfFlag) {
-        if (this.hasConfig(widget, 'disabled')) {
-
-          if (!enabledByWf) {
-            disabled = true;
-            let onClick = widget.options.onClick;
-            if (onClick && onClick.startsWith("this.getFormRef().$baseReload()")) {
+        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;
             }
-          } else {
-            disabled = false;
-          }
-          if (widgetType == 'reset_button' && enabledByWf === undefined) {
-            disabled = false;
-          }
-          if (disabled !== null) {
-            widget.options.disabled = disabled;
+            if (widgetType == 'reset_button' && enabledByWf === undefined) {
+              disabled = false;
+            }
+            if (disabled !== null) {
+              widget.options.disabled = disabled;
+            }
           }
         }
 
-
         if (hiddenByWf) {
           hidden = true
         }
@@ -562,7 +629,7 @@ modules = {
         }
       }
 
-      if (widget?.type == "data-table") {
+      /*if (widget?.type == "data-table") {
         let loopDo = (t, e) => {
           if (t.children && t.children.length) {
             t.children.forEach(item => {
@@ -583,7 +650,7 @@ modules = {
           loopDo(item)
         })
 
-      }
+      }*/
     },
     hanldeWfWidgetNew2(widget, callback) {
       let hasModifyItem = false;
@@ -652,29 +719,6 @@ modules = {
         }*/
       }
       handleWfConfigData(widget)
-      if (widget.type == "data-table") {
-        let loopDo = (t) => {
-          if (t.children && t.children.length) {
-            t.children.forEach(item => {
-              loopDo(item)
-            })
-          } else {
-            if (t.widget) {
-              handleWfConfigData(t.widget)
-            }
-            if (t.widgetList && t.widgetList.length) {
-              loopHandleWidget(t.widgetList, (item1) => {
-                handleWfConfigData(item1)
-              });
-            }
-          }
-        }
-
-        widget.options.tableColumns.forEach(item => {
-          loopDo(item)
-        })
-      }
-
       return hasModifyItem;
     },
 

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;