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

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

@@ -471,10 +471,10 @@ modules = {
         }
       });
     },
-    handleAllTableColumnWidget(){
+    handleAllTableColumnWidget() {
       traverseAllWidgetsNew(this.formJson.widgetList, (widget) => {
         //修复data-table旧数据表格列widget与editWidget为空的问题
-        if(widget.type == "data-table"){
+        if (widget.type == "data-table") {
           this.handleTableColumnWidget(widget);
         }
       })
@@ -484,7 +484,7 @@ modules = {
       if (!widget || widget.type != "data-table" || !widget.options.tableColumns) return
       let columnLoopDo = (t, e) => {
         if (t.children && t.children.length) {
-          for (let item of t.children){
+          for (let item of t.children) {
             columnLoopDo(item)
           }
           /*t.children.forEach(item => {
@@ -513,7 +513,7 @@ modules = {
         }
       }
 
-      for (let item of widget.options.tableColumns){
+      for (let item of widget.options.tableColumns) {
         columnLoopDo(item)
       }
       /*widget.options.tableColumns.forEach(item => {
@@ -541,11 +541,14 @@ modules = {
         //处理组件显隐规则
         this.handleWidgetShowRule(widget);
 
-        if(wfParam.hasWf){
-          if(wfInfo.taskStep == "9999"){
+        if (wfParam.hasWf) {
+          if (wfInfo.taskStep == "9999") {
             //结束节点
+            //有流程，且不匹配流程节点可编辑表单设置信息
+            this.hanldeWfWidgetNew1(widget)
+            //设置组件的有流程可编辑，有流程隐藏
             this.hanldeWfWidgetItemNew(widget)
-          }else{
+          } else {
             if (!widgetEditOnWf) {
               //有流程，且不匹配流程节点可编辑表单设置信息
               //设置组件的有流程可编辑，有流程隐藏
@@ -710,6 +713,7 @@ modules = {
         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(',') : []
@@ -1055,6 +1059,7 @@ modules = {
               objId: dataId, //单据ID
               wfCode: wfCode, //流程编码
               showStartBtn: true, //是否放出启动按钮,流程已启动时此参数失效
+              showWfFold: true,
               formCode: formCode,
               callback: (wfParam) => {
                 this.setFormData(formData);

package/src/components/xform/mixins/scriptHttp.js

@@ -174,8 +174,6 @@ modules = {
               }
             });
           })
-
-
         })
       }
       if (opts.isConfirm) {