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

package/package.json

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

package/src/components/xform/form-designer/designer.js

@@ -84,6 +84,7 @@ let chartContainers = [],
         wfConfig: null,
         wfStartBindSave:false,
         wfAgreenBindSave:false,
+        wfAgreeConfigData:[],
         wfConfigDataEnabled:false,
         wfConfigData:[],
       },
@@ -1016,7 +1017,9 @@ let chartContainers = [],
       },
       copyNewFieldWidget(origin) {
         let newWidget = baseRefUtil.deepClone(origin);
+        let sourceType = newWidget.type;
         newWidget.type = (newWidget.targetType || newWidget.type);
+        newWidget.sourceType = sourceType;
         let tempId = baseRefUtil.generateId();
         newWidget.id = newWidget.type.replace(/-/g, '') + tempId;
         if (newWidget.hasOwnProperty("tableField")) {
@@ -1095,6 +1098,9 @@ let chartContainers = [],
       },
       copyNewContainerWidget(origin) {
         let newCon = baseRefUtil.deepClone(origin);
+        let sourceType = newCon.type;
+        newCon.type = (newCon.targetType || newCon.type);
+        newCon.sourceType = sourceType;
         newCon.id = newCon.type.replace(/-/g, '') + baseRefUtil.generateId();
         newCon.options.name = newCon.id;
         if (newCon.options.keyNameEnabled = true) {

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

@@ -21,10 +21,16 @@
           <el-form-item :label="i18nt('流程通过时自动保存表单数据')">
             <el-switch v-model="formConfig.wfAgreenBindSave"></el-switch>
           </el-form-item>
+          <el-form-item :label="i18nt('流程通过时自动保存表单数据的节点配置')">
+            <a href="javascript:void(0);" class="a-link link-oneLind" @click="openWfConfigDataDialog2">
+              <span>{{ formConfig.wfAgreeConfigData && formConfig.wfAgreeConfigData.length ? "已维护" : "" }}</span>
+              <i class="el-icon-edit"></i>
+            </a>
+          </el-form-item>
           <el-form-item :label="i18nt('启用流程节点可编辑表单')">
             <el-switch v-model="formConfig.wfConfigDataEnabled"></el-switch>
           </el-form-item>
-          <el-form-item :label="i18nt('流程节点可编辑表单设置')">
+          <el-form-item :label="i18nt('流程节点可编辑表单配置')">
             <a href="javascript:void(0);" class="a-link link-oneLind" @click="openWfConfigDataDialog">
               <span>{{ formConfig.wfConfigData && formConfig.wfConfigData.length ? "已维护" : "" }}</span>
               <i class="el-icon-edit"></i>
@@ -73,47 +79,11 @@
               <i class="el-icon-edit"></i>
             </a>
           </el-form-item>
-          <!--
-                    <el-form-item :label="i18nt('designer.setting.formSize')">
-                      <el-select v-model="formConfig.size"><el-option v-for="item in formSizes" :key="item.value" :label="item.label" :value="item.value"></el-option></el-select>
-                    </el-form-item>
-                    <el-form-item :label="i18nt('designer.setting.labelPosition')">
-                      <el-radio-group v-model="formConfig.labelPosition" class="radio-group-custom">
-                        <el-radio-button label="left">{{ i18nt('designer.setting.leftPosition') }}</el-radio-button>
-                        <el-radio-button label="top">{{ i18nt('designer.setting.topPosition') }}</el-radio-button>
-                      </el-radio-group>
-                    </el-form-item>
-                    <el-form-item :label="i18nt('designer.setting.labelAlign')">
-                      <el-radio-group v-model="formConfig.labelAlign" class="radio-group-custom">
-                        <el-radio-button label="label-left-align">{{ i18nt('designer.setting.leftAlign') }}</el-radio-button>
-                        <el-radio-button label="label-center-align">{{ i18nt('designer.setting.centerAlign') }}</el-radio-button>
-                        <el-radio-button label="label-right-align">{{ i18nt('designer.setting.rightAlign') }}</el-radio-button>
-                      </el-radio-group>
-                    </el-form-item>
-                    <el-form-item :label="i18nt('designer.setting.labelWidth')">
-                      <el-input-number v-model="formConfig.labelWidth" :min="0" style="width: 100%"></el-input-number>
-                    </el-form-item>-->
           <el-form-item :label="i18nt('designer.setting.formCss')">
             <el-button type="info" icon="el-icon-edit" plain round @click="editFormCss">
               {{ i18nt('designer.setting.addCss') }}
             </el-button>
           </el-form-item>
-          <!--
-          <el-form-item :label="i18nt('designer.setting.customClass')">
-            <el-select v-model="formConfig.customClass" multiple filterable allow-create default-first-option>
-              <el-option v-for="(item, idx) in cssClassList" :key="idx" :label="item" :value="item"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item :label="i18nt('designer.setting.globalFunctions')">
-            <el-button type="info" icon="el-icon-edit" plain round @click="editGlobalFunctions">{{ i18nt('designer.setting.addEventHandler') }}</el-button>
-          </el-form-item>
-          <el-form-item label-width="0">
-            <el-divider class="custom-divider">{{ i18nt('designer.setting.formSFCSetting') }}</el-divider>
-          </el-form-item>
-          <el-form-item :label="i18nt('designer.setting.formModelName')"><el-input type="text" v-model="formConfig.modelName"></el-input></el-form-item>
-          <el-form-item :label="i18nt('designer.setting.formRefName')"><el-input type="text" v-model="formConfig.refName"></el-input></el-form-item>
-          <el-form-item :label="i18nt('designer.setting.formRulesName')"><el-input type="text" v-model="formConfig.rulesName"></el-input></el-form-item>
-        -->
         </el-collapse-item>
         <el-collapse-item name="2" title="列表标签页信息">
           <el-form-item :label="i18nt('列表启用多标签')">
@@ -336,7 +306,7 @@
     <el-dialog
       v-if="dialogVisible"
       custom-class="dialog-style list-dialog"
-      :title="i18nt('流程节点信息')"
+      :title="i18nt('流程节点可编辑表单配置')"
       :visible.sync="dialogVisible"
       :show-close="!0"
       :append-to-body="true"
@@ -391,15 +361,15 @@
               <el-input v-model="row.taskSteps" clearable></el-input>
             </template>
           </el-table-column>
-<!--          <el-table-column :label="i18nt('设置')" width="150">
-            <template slot-scope="{row}">
-              <el-select v-model="row.type" clearable>
-                <el-option :value="1" label="可编辑"></el-option>
-                <el-option :value="2" label="仅显示"></el-option>
-                <el-option :value="3" label="隐藏"></el-option>
-              </el-select>
-            </template>
-          </el-table-column>-->
+          <!--          <el-table-column :label="i18nt('设置')" width="150">
+                      <template slot-scope="{row}">
+                        <el-select v-model="row.type" clearable>
+                          <el-option :value="1" label="可编辑"></el-option>
+                          <el-option :value="2" label="仅显示"></el-option>
+                          <el-option :value="3" label="隐藏"></el-option>
+                        </el-select>
+                      </template>
+                    </el-table-column>-->
           <el-table-column :label="i18nt('designer.setting.actionColumn')" width="100" align="center">
             <template #header>
               <span>{{ i18nt('designer.setting.actionColumn') }}</span>
@@ -430,6 +400,103 @@
       </div>
     </el-dialog>
 
+    <el-dialog
+      v-if="dialogVisible2"
+      custom-class="dialog-style list-dialog"
+      :title="i18nt('流程通过时自动保存表单数据的节点配置')"
+      :visible.sync="dialogVisible2"
+      :show-close="!0"
+      :append-to-body="true"
+      :modal="false"
+      :close-on-click-modal="!1"
+      :close-on-press-escape="!1"
+      :destroy-on-close="!0"
+      width="1220px"
+      top="5vh"
+      v-dialog-drag
+      :fullscreen="true"
+    >
+      <div class="cont" style="padding-bottom: 8px;">
+        <el-table
+          ref="singleTable"
+          width="100%"
+          :data="wfAgreeConfigData"
+          height="100%"
+          border=""
+          row-key="columnId"
+          stripe=""
+          style="margin-bottom: 0px;"
+        >
+          <el-table-column type="index" width="35" fixed="left"></el-table-column>
+          <el-table-column :label="i18nt('服务')" width="150">
+            <template slot-scope="{row}">
+              <el-select v-model="row.serveType" @change="changeServeType(row)">
+                <el-option :value="1" label="正式"></el-option>
+                <el-option :value="2" label="UAT"></el-option>
+                <el-option :value="3" label="测试"></el-option>
+                <el-option :value="4" label="自定义"></el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column :label="i18nt('自定义服务')" width="150">
+            <template slot-scope="{row}">
+              <el-input v-model="row.serveName" clearable :disabled="row.serveType!==4"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column :label="i18nt('组织编码')" width="250">
+            <template slot-scope="{row,$index}">
+              <el-input v-model="row.companyCodes" clearable></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column :label="i18nt('流程模板编码')" width="150">
+            <template slot-scope="{row}">
+              <el-input v-model="row.modelKey" clearable></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column :label="i18nt('节点步骤')" width="250">
+            <template slot-scope="{row}">
+              <el-input v-model="row.taskSteps" clearable></el-input>
+            </template>
+          </el-table-column>
+          <!--          <el-table-column :label="i18nt('设置')" width="150">
+                      <template slot-scope="{row}">
+                        <el-select v-model="row.type" clearable>
+                          <el-option :value="1" label="可编辑"></el-option>
+                          <el-option :value="2" label="仅显示"></el-option>
+                          <el-option :value="3" label="隐藏"></el-option>
+                        </el-select>
+                      </template>
+                    </el-table-column>-->
+          <el-table-column :label="i18nt('designer.setting.actionColumn')" width="100" align="center">
+            <template #header>
+              <span>{{ i18nt('designer.setting.actionColumn') }}</span>
+              <el-button :title="i18nt('designer.setting.addTableColumn')" size="mini" type="" circle=""
+                         icon="el-icon-plus" @click="addItem2"></el-button>
+            </template>
+            <template slot-scope="scope">
+              <el-button
+                :title="i18nt('designer.setting.deleteTableColumn')"
+                size="mini"
+                type=""
+                circle=""
+                icon="el-icon-minus"
+                @click="wfAgreeConfigData.splice(scope.$index,1)"
+              ></el-button>
+            </template>
+          </el-table-column>
+
+        </el-table>
+      </div>
+      <div class="dialog-footer" slot="footer">
+        <el-button @click="dialogVisible2 = false" class="button-sty" icon="el-icon-close">
+          {{ i18nt('designer.hint.cancel') }}
+        </el-button>
+        <el-button type="primary" @click="confirmWfConfigDataDialog2" class="button-sty" icon="el-icon-check">
+          {{ i18nt('designer.hint.confirm') }}
+        </el-button>
+      </div>
+    </el-dialog>
+
     <formTemplateDialog v-if="showFormTemplateDialog" :visiable.sync="showFormTemplateDialog"
                         @confirm="confirmFormTemplate" multi="false"/>
     <wfObjConfigDialog v-if="showWfObjConfigDialog" :visiable.sync="showWfObjConfigDialog"
@@ -501,7 +568,10 @@ export default {
       showWfObjConfigDialog: false,
 
       dialogVisible: false,
-      wfConfigData: []
+      wfConfigData: [],
+
+      dialogVisible2: false,
+      wfAgreeConfigData: []
     };
   },
   created() {
@@ -743,6 +813,28 @@ export default {
       this.dialogVisible = !1;
       this.formConfig.wfConfigData = this.wfConfigData;
     },
+
+    openWfConfigDataDialog2() {
+      let wfAgreeConfigData = this.formConfig.wfAgreeConfigData || [];
+      this.dialogVisible2 = true;
+      this.wfAgreeConfigData = this.$baseLodash.cloneDeep(wfAgreeConfigData)
+    },
+    addItem2() {
+      let newItem = {
+        type: null,
+        serveType: null,
+        serveName: null,
+        modelKey: null,
+        taskSteps: null,
+        companyCodes: null
+      }
+      this.wfAgreeConfigData.push(newItem);
+    },
+    confirmWfConfigDataDialog2() {
+      this.dialogVisible2 = !1;
+      this.formConfig.wfAgreeConfigData = this.wfAgreeConfigData;
+    },
+
   }
 };
 </script>

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

@@ -1,11 +1,11 @@
 <template>
   <div>
-    <el-form-item :label="i18nt('有流程可编辑')">
+<!--    <el-form-item :label="i18nt('有流程可编辑')">
       <el-switch v-model="optionModel.enabledByWf" @change="changeEnabledByWf"></el-switch>
     </el-form-item>
     <el-form-item :label="i18nt('有流程隐藏')">
       <el-switch v-model="optionModel.hiddenByWf" @change="changeHiddenByWf"></el-switch>
-    </el-form-item>
+    </el-form-item>-->
     <el-form-item :label="i18nt('特定流程节点设置')">
       <el-switch v-model="optionModel.wfEdit" @change="changeWfEdit"></el-switch>
     </el-form-item>
@@ -24,16 +24,6 @@
         <i class="el-icon-edit"></i>
       </a>
     </el-form-item>
-
-    <!--    <el-form-item :label="i18nt('特定流程节点显隐')">
-          <el-switch v-model="optionModel.wfEdit" @change="changeWfEdit"></el-switch>
-        </el-form-item>
-        <el-form-item :label="i18nt('流程节点信息')">
-          <a href="javascript:void(0);" class="a-link link-oneLind" @click="openDialog">
-            <span>{{ optionModel.wfConfigData && optionModel.wfConfigData.length ? "已维护" : "" }}</span>
-            <i class="el-icon-edit"></i>
-          </a>
-        </el-form-item>-->
     <el-dialog
       v-if="dialogVisible"
       custom-class="dialog-style list-dialog"
@@ -101,24 +91,6 @@
               </el-select>
             </template>
           </el-table-column>
-          <!--          <el-table-column :label="i18nt('流程模板')" width="250" prop="label">
-                      <template slot-scope="scope">
-                        <el-select v-model="scope.row.modelId" @change="changeModelId">
-                          <el-option v-for="(wfDefItem,index) in wfDefItems" :key="index" :value="wfDefItem.modelId"
-                                     :label="wfDefItem.modelName"></el-option>
-                        </el-select>
-
-                      </template>
-                    </el-table-column>
-                    <el-table-column :label="i18nt('流程节点')" width="550" prop="prop">
-                      <template slot-scope="scope">
-                        <el-checkbox-group v-model="scope.row.nodeIds" v-if="!!wfNodeMap[scope.row.modelId]">
-                          <el-checkbox v-for="(node,index) in wfNodeMap[scope.row.modelId]" :key="index"
-                                       :label="node.nodeId">{{ node.nodeName }}
-                          </el-checkbox>
-                        </el-checkbox-group>
-                      </template>
-                    </el-table-column>-->
           <el-table-column :label="i18nt('designer.setting.actionColumn')" width="100" align="center">
             <template #header>
               <span>{{ i18nt('designer.setting.actionColumn') }}</span>

package/src/components/xform/form-designer/widget-panel/widgetsConfig.js

@@ -889,6 +889,9 @@ const projectTagConfig = {
 
 }
 
+export const hiddenWidgetTypesOfWf = ["button"];
+export const freeWidgetTypesOfWf = ["reset_button"];
+
 export const basicFields = [
   {
     type: "input",
@@ -1759,6 +1762,7 @@ export const basicFields = [
     options: {
       name: "",
       label: "",
+      wfHideFlag:1,
       columnWidth: "200px",
       size: "",
       displayStyle: "block",
@@ -1969,6 +1973,7 @@ export const basicFields = [
       prefixIcon: "",
       suffixIcon: "",
       customClass: "",
+      wfHideFlag:1,
       aLinkFlag: 1,
       underline: false,
       href: "",

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

@@ -28,7 +28,9 @@ import {
   containers,
   advancedFields,
   basicFields,
-  customFields
+  customFields,
+  hiddenWidgetTypesOfWf,
+  freeWidgetTypesOfWf
 } from "../../../components/xform/form-designer/widget-panel/widgetsConfig.js"
 import scriptHttpMixin from "../../../components/xform/mixins/scriptHttp";
 import defaultHandleMixin from "../../../components/xform/mixins/defaultHandle";
@@ -480,6 +482,7 @@ modules = {
               this.getFieldWidgetByType(type1)
             );
             fieldWidget.options = t.columnOption;
+            fieldWidget.columnType = t.formatS
             t.widget = fieldWidget;
           }
           let type2 = columnFormatMap[t.editFormatS];
@@ -488,6 +491,8 @@ modules = {
               this.getFieldWidgetByType(type2)
             );
             fieldWidget.options = t.editColumnOption;
+            fieldWidget.columnType = t.editFormatS
+
             t.editWidget = fieldWidget;
           }
         }
@@ -518,20 +523,15 @@ modules = {
         //处理组件显隐规则
         this.handleWidgetShowRule(widget);
 
-        if (wfParam.hasWf) {
-          //有流程
+        if (!widgetEditOnWf && wfParam.hasWf) {
+          //有流程，且不匹配流程节点可编辑表单设置信息
           //设置组件的有流程可编辑，有流程隐藏
           this.hanldeWfWidgetNew1(widget)
           if (toModify) {
             //后台返回流程可以修改单据
             //设置组件的特定流程节点的可编辑，仅显示，隐藏
             if (taskDefinitionKey) {
-              this.hanldeWfWidgetNew2(widget, (modifyFlag, saveButtonWidget) => {
-                if (!saveButton && saveButtonWidget) {
-                  //获取保存按钮
-                  saveButton = saveButtonWidget
-                }
-              })
+              this.hanldeWfWidgetNew2(widget)
             }
             if (widget.formItemFlag && !widget.options.hidden && !widget.options.disbaled) {
               //存在存在可以编辑输入框框
@@ -540,14 +540,47 @@ modules = {
           }
         }
       });
-      if (toModify && hasModifyItem && saveButton) {
-        //后台返回流程可以修改单据，存在保存按钮，存在可以编辑输入框框
-        saveButton.options.disabled = false;
-        saveButton.options.hidden = false;
-      }
+
 
       this.wfModifyEnabled = hasModifyItem;
     },
+    getIsSaveAtWfAgree() {
+      //流程通过的时候是否可以执行保存
+      let wfParam = this.wfParam || {};
+      let wfInfo = wfParam?.wfInfo
+      let toModify = wfInfo?.toModify;
+      let result = false;
+
+      let formConfig = this.formConfig;
+      if (toModify && formConfig.wfAgreenBindSave) {
+
+        let modelKey = wfInfo.modelKey;
+        let companyCode = this.$store.getters.companyCode;
+        let taskStep = (wfInfo.taskStep ?? "") + "";
+        let taskDefinitionKey = wfInfo.taskDefinitionKey;
+        let bdService = this.bdService;
+
+        let wfConfigData = formConfig.wfAgreeConfigData || []
+        let flag = false;
+        wfConfigData.forEach(item => {
+          let type = item.type;
+          let taskStepList = item.taskSteps ? item.taskSteps.split(',') : []
+          if (taskStepList.includes(taskStep)) {
+            let companyCodeStr = item.companyCodes;
+            let companyCodes = companyCodeStr ? companyCodeStr.split(",").filter(item => !!item) : [];
+            let flag1 = !item.serveName || item.serveName == bdService;
+            let flag2 = !item.modelKey || item.modelKey == modelKey;
+            let flag3 = !companyCodes.length || companyCodes.includes(companyCode)
+            if (flag1 && flag2 && flag3) {
+              //可编辑
+              result = true;
+            }
+          }
+        })
+        return result;
+      }
+    },
+
     hanldeWfWidgetNew0() {
 
       let wfParam = this.wfParam || {};
@@ -584,85 +617,53 @@ modules = {
         return result;
       }
     },
+    getIsfreeWidgetTypesOfWf(widget) {
+      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;
+      let widgetType = widget.type;
+      let targetType = widget.targetType;
+      let result = hiddenWidgetTypesOfWf.includes(widgetType) || (targetType && hiddenWidgetTypesOfWf.includes(targetType))
+      return result
+    },
     hanldeWfWidgetNew1(widget) {
+      if (!widget) return;
+      if (this.getIsfreeWidgetTypesOfWf(widget))return//过滤掉不受限组件
+      if (this.widgetEditOnWf) return//匹配到流程第一步可编辑，不执行下面禁用隐藏
       let wfParam = this.wfParam || {};
-      if (!wfParam.hasWf) return;
-      let isWfFlag = this.hasConfig(widget, 'wfFlag');
-      let widgetType = widget?.type;
-      let enabledByWf = widget?.options?.enabledByWf;
-      let hiddenByWf = widget?.options?.hiddenByWf;
-      let widgetName = widget?.options?.name;
-      /*    if (!hiddenByWf && this.widgetEditOnWf) {
-            enabledByWf = true;
-          }*/
-      let hidden = null;
-      let disabled = null;
-      if (isWfFlag) {
-        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;
-            }
-            if (widgetType == 'reset_button' && enabledByWf === undefined) {
-              disabled = false;
-            }
-            if (disabled !== null) {
-              widget.options.disabled = disabled;
-            }
-          }
-        }
-
-        if (hiddenByWf) {
-          hidden = true
-        }
-        if (widget && widgetType == 'save_button' && hiddenByWf === undefined) {
-          hidden = true
-        }
-        if (hidden !== null) {
-          widget.options.hidden = hidden;
-        }
+      if (!wfParam.hasWf) return;//过滤掉没流程
+      if (widget.columnType == 'editDelete') {
+        //数据表格列的删除标识，有流程隐藏
+        widget.options.hidden = true
+      } else if (this.getIsHiddenWidgetTypesOfWf(widget)) {
+        //有流程隐藏的组件，button
+        widget.options.hidden = true
+      } else if (widget.formItemFlag) {
+        //有流程禁用，编辑输入框
+        widget.options.disabled = true;
       }
 
-      /*if (widget?.type == "data-table") {
-        let loopDo = (t, e) => {
-          if (t.children && t.children.length) {
-            t.children.forEach(item => {
-              loopDo(item)
-            })
-          } else {
-            if (t.widget) {
-              this.hanldeWfWidgetNew1(t.widget)
-            }
-            if (t.widgetList && t.widgetList.length) {
-              loopHandleWidget(t.widgetList, (item1) => {
-                this.hanldeWfWidgetNew1(item1)
-              });
-            }
-          }
-        }
-        widget.options.tableColumns.forEach(item => {
-          loopDo(item)
-        })
 
-      }*/
     },
     hanldeWfWidgetNew2(widget, callback) {
       let hasModifyItem = false;
       let saveButton;
-      let flag = this.hanldeWfWidgetItemNew(widget)
-      if (flag) {
-        hasModifyItem = true
+      if (!this.widgetEditOnWf) {
+        let flag = this.hanldeWfWidgetItemNew(widget)
+        if (flag) {
+          hasModifyItem = true
+        }
       }
+
       if (widget?.options?.saveButton) {
         saveButton = widget;
       }
-      callback(hasModifyItem, saveButton)
+      callback && callback(hasModifyItem, saveButton)
     },
     hanldeWfWidgetItemNew(widget) {
       let hasModifyItem = false;
@@ -1076,8 +1077,9 @@ modules = {
             }
 
             if (formConfig.wfAgreenBindSave) {
+              //流程通过的时候，是否自动保存单据
               option.onClickAgree = (done) => {
-                if (that.wfModifyEnabled) {
+                if (that.getIsSaveAtWfAgree()) {
                   let formRef = this.getFormRef ? this.getFormRef() : this;
                   formRef.validate(valid => {
                     if (valid) {
@@ -1089,7 +1091,7 @@ modules = {
                 }
               }
               option.onBeforeAgree = (done) => {
-                if (that.wfModifyEnabled) {
+                if (that.getIsSaveAtWfAgree()) {
                   this.saveDefaultHandle({
                     config: {
                       successMsg: false,

package/src/components/xform/utils/util.js

@@ -843,6 +843,7 @@ export function getDefaultFormConfig() {
     wfConfig: null,
     wfStartBindSave: false,
     wfAgreenBindSave:false,
+    wfAgreeConfigData:[],
     wfConfigDataEnabled:false,
     wfConfigData:[]
   };

package/src/views/user/login/indexMixin.js

@@ -495,7 +495,7 @@ export default {
       this.qrTimer2 = setTimeout(() => {
         this.qrExpired = true;
         this.clearQrLoginTimer();
-      }, 10000)
+      }, 60000)
     },
     checkQrLoginTimerHanlde() {
       this.qrTimer1 = setTimeout(() => {