cloud-web-corejs 1.0.54-dev.225 → 1.0.54-dev.226

package/package.json

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

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

@@ -542,27 +542,23 @@ modules = {
         this.handleWidgetShowRule(widget);
 
         if (wfParam.hasWf) {
-          if (wfInfo.taskStep == "9999") {
-            //结束节点
+          if (!widgetEditOnWf) {
             //有流程，且不匹配流程节点可编辑表单设置信息
-            this.hanldeWfWidgetNew1(widget)
             //设置组件的有流程可编辑，有流程隐藏
-            this.hanldeWfWidgetItemNew(widget)
-          } else {
-            if (!widgetEditOnWf) {
-              //有流程，且不匹配流程节点可编辑表单设置信息
-              //设置组件的有流程可编辑，有流程隐藏
-              this.hanldeWfWidgetNew1(widget)
-              if (toModify) {
-                //后台返回流程可以修改单据
-                //设置组件的特定流程节点的可编辑，仅显示，隐藏
-                if (taskDefinitionKey) {
-                  this.hanldeWfWidgetNew2(widget)
-                }
-                if (widget.formItemFlag && !widget.options.hidden && !widget.options.disbaled) {
-                  //存在存在可以编辑输入框框
-                  hasModifyItem = true;
-                }
+            this.hanldeWfWidgetNew1(widget)
+            if (wfInfo.taskStep == "9999") {
+              this.hanldeWfWidgetItemNew(widget)
+            }
+            else if (toModify) {
+              //后台返回流程可以修改单据
+              //设置组件的特定流程节点的可编辑，仅显示，隐藏
+              if (taskDefinitionKey) {
+                // this.hanldeWfWidgetNew2(widget)
+                this.hanldeWfWidgetItemNew(widget)
+              }
+              if (widget.formItemFlag && !widget.options.hidden && !widget.options.disbaled) {
+                //存在存在可以编辑输入框框
+                hasModifyItem = true;
               }
             }
           }