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

package/package.json

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

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

@@ -482,19 +482,19 @@ 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
         }
       }
 
@@ -618,14 +618,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 +633,12 @@ modules = {
     },
     hanldeWfWidgetNew1(widget) {
       if (!widget) return;
-      if (this.getIsfreeWidgetTypesOfWf(widget))return//过滤掉不受限组件
+      if (this.getIsfreeWidgetTypesOfWf(widget)) return//过滤掉不受限组件
       if (this.widgetEditOnWf) return//匹配到流程第一步可编辑，不执行下面禁用隐藏
       let wfParam = this.wfParam || {};
       if (!wfParam.hasWf) return;//过滤掉没流程
-      if (widget.columnType == 'editDelete') {
+
+      if (widget.columnType && ['editDelete', 'removeTreeRow'].includes(widget.columnType)) {
         //数据表格列的删除标识，有流程隐藏
         widget.options.hidden = true
       } else if (this.getIsHiddenWidgetTypesOfWf(widget)) {