cloud-web-corejs 1.0.54-dev.800 → 1.0.54-dev.801

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

@@ -1,178 +1,188 @@
-<template>
-  <div>
-    <el-form-item class="form-item-label-top" prop="name" :rules="nameRequiredRule">
-      <span slot="label"
-        >{{ i18nt("designer.setting.uniqueName") }}
-        <el-tooltip effect="light" :content="i18nt('designer.setting.editNameHelp')">
-          <i class="el-icon-info"></i
-        ></el-tooltip>
-      </span>
-      <template
-        v-if="
-          (!!selectedWidget.category && selectedWidget.type !== 'sub-form') || noFieldList
-        "
-      >
-        <el-input
-          type="text"
-          v-model="optionModel.name"
-          :readonly="widgetNameReadonly"
-          @change="updateWidgetNameAndRef"
-        ></el-input>
-      </template>
-      <template v-else>
-        <el-select
-          v-model="optionModel.name"
-          allow-create
-          filterable
-          :disabled="true"
-          @change="updateWidgetNameAndRef"
-          :title="i18nt('designer.setting.editNameHelp')"
-        >
-          <el-option
-            v-for="(sf, sfIdx) in serverFieldList"
-            :key="sfIdx"
-            :label="sf.label"
-            :value="sf.name"
-          ></el-option>
-        </el-select>
-      </template>
-    </el-form-item>
-    <el-form-item label="按钮编码" v-show="showAuthCode">
-      <div style="word-break: break-all">
-        <el-tooltip effect="light" content="复制">
-          <a class="a-link" style="color: unset;" @click="copyAuthCode"><span><i class="el-icon-copy-document" style="margin-right:2px"></i>{{ authCode }}</span></a>
-        </el-tooltip>
-      </div>
-    </el-form-item>
-  </div>
-</template>
-
-<script>
-import i18n from "../../../../../components/xform/utils/i18n";
-import { isEmptyStr } from "../../../../../components/xform/utils/util";
-import Clipboard from 'clipboard'
-
-export default {
-  name: "name-editor",
-  mixins: [i18n],
-  props: {
-    designer: Object,
-    selectedWidget: Object,
-    optionModel: Object,
-    parentList: Array,
-  },
-  inject: ["serverFieldList", "getDesignerConfig", "isDataTableChildWidget"],
-  data() {
-    return {
-      nameRequiredRule: [{ required: true, message: "name required" }],
-    };
-  },
-  computed: {
-    noFieldList() {
-      return !this.serverFieldList || this.serverFieldList.length <= 0;
-    },
-
-    widgetNameReadonly() {
-      return !!this.getDesignerConfig().widgetNameReadonly;
-    },
-    showAuthCode() {
-      // return this.selectedWidget.category !== "container";
-      return [
-        "button",
-        "a-text",
-        "a-link",
-        "a-link2",
-        "search_button",
-        "save_button",
-        "reset_button",
-        "table-export-button",
-        "select-export-button",
-        "add_button",
-        "import-button",
-        "import2-button",
-        "print-button",
-        "print-detail-button",
-        "download-button",
-        "copy_button",
-        "save_submit_wf_button",
-        "tempStorage",
-        "dropdown",
-        "dropdown-item",
-      ].includes(this.selectedWidget.type);
-    },
-    authCode() {
-      return (
-        this.designer.vueInstance?.reportTemplate?.formCode + ":" + this.optionModel.name
-      );
-    },
-  },
-  methods: {
-    copyAuthCode(e){
-      this.copyToClipboard(this.authCode, e, this.$message, '复制成功', '复制失败');
-    },
-    copyToClipboard(content, clickEvent, $message, successMsg, errorMsg) {
-      const clipboard = new Clipboard(clickEvent.target, {
-        text: () => content
-      });
-
-      clipboard.on('success', () => {
-        $message.success(successMsg);
-        clipboard.destroy();
-      })
-
-      clipboard.on('error', () => {
-        $message.error(errorMsg);
-        clipboard.destroy();
-      });
-
-      clipboard.onClick(clickEvent);
-    },
-    updateWidgetNameAndRef(newName) {
-      let oldName = this.designer.selectedWidgetName;
-      if (isEmptyStr(newName)) {
-        this.selectedWidget.options.name = oldName;
-        this.$message.info(this.i18nt("designer.hint.nameRequired"));
-        return;
-      }
-
-      if (!!this.designer.formWidget) {
-        let foundRef = this.designer.formWidget.getWidgetRef(newName); // 检查newName是否已存在！！
-
-        if (!!foundRef) {
-          if (this.isDataTableChildWidget()) {
-            let parentList = this.parentList;
-            for (let i; i < parentList.length; i++) {}
-          } else {
-            this.selectedWidget.options.name = oldName;
-            this.$message.info(this.i18nt("designer.hint.duplicateName") + newName);
-            return;
-          }
-        }
-
-        let widgetInDesign = this.designer.formWidget.getWidgetRef(oldName);
-        if (!!widgetInDesign && !!widgetInDesign.registerToRefList) {
-          widgetInDesign.registerToRefList(oldName); //注册组件新的ref名称并删除老的ref！！
-          let newLabel = this.getLabelByFieldName(newName);
-          this.designer.updateSelectedWidgetNameAndLabel(
-            this.selectedWidget,
-            newName,
-            newLabel
-          );
-        }
-      }
-    },
-
-    getLabelByFieldName(fieldName) {
-      for (let i = 0; i < this.serverFieldList.length; i++) {
-        if (this.serverFieldList[i].name === fieldName) {
-          return this.serverFieldList[i].label;
-        }
-      }
-
-      return null;
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped></style>
+<template>
+  <div>
+    <el-form-item class="form-item-label-top" prop="name" :rules="nameRequiredRule">
+      <span slot="label"
+        >{{ i18nt("designer.setting.uniqueName") }}
+        <el-tooltip effect="light" :content="i18nt('designer.setting.editNameHelp')">
+          <i class="el-icon-info"></i
+        ></el-tooltip>
+      </span>
+      <template
+        v-if="
+          (!!selectedWidget.category && selectedWidget.type !== 'sub-form') || noFieldList
+        "
+      >
+        <el-input
+          type="text"
+          v-model="optionModel.name"
+          :readonly="widgetNameReadonly"
+          @change="updateWidgetNameAndRef"
+        ></el-input>
+      </template>
+      <template v-else>
+        <el-select
+          v-model="optionModel.name"
+          allow-create
+          filterable
+          :disabled="true"
+          @change="updateWidgetNameAndRef"
+          :title="i18nt('designer.setting.editNameHelp')"
+        >
+          <el-option
+            v-for="(sf, sfIdx) in serverFieldList"
+            :key="sfIdx"
+            :label="sf.label"
+            :value="sf.name"
+          ></el-option>
+        </el-select>
+      </template>
+    </el-form-item>
+    <el-form-item label="按钮编码" v-show="showAuthCode" class="form-item-label-top">
+      <div style="word-break: break-all">
+        <el-tooltip effect="light" content="复制">
+          <a class="a-link" style="" @click="copyAuthCode"><i class="el-icon-copy-document"></i><span>{{ authCode }}</span></a>
+        </el-tooltip>
+      </div>
+    </el-form-item>
+  </div>
+</template>
+
+<script>
+import i18n from "../../../../../components/xform/utils/i18n";
+import { isEmptyStr } from "../../../../../components/xform/utils/util";
+import Clipboard from 'clipboard'
+
+export default {
+  name: "name-editor",
+  mixins: [i18n],
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+    parentList: Array,
+  },
+  inject: ["serverFieldList", "getDesignerConfig", "isDataTableChildWidget"],
+  data() {
+    return {
+      nameRequiredRule: [{ required: true, message: "name required" }],
+    };
+  },
+  computed: {
+    noFieldList() {
+      return !this.serverFieldList || this.serverFieldList.length <= 0;
+    },
+
+    widgetNameReadonly() {
+      return !!this.getDesignerConfig().widgetNameReadonly;
+    },
+    showAuthCode() {
+      // return this.selectedWidget.category !== "container";
+      return [
+        "button",
+        "a-text",
+        "a-link",
+        "a-link2",
+        "search_button",
+        "save_button",
+        "reset_button",
+        "table-export-button",
+        "select-export-button",
+        "add_button",
+        "import-button",
+        "import2-button",
+        "print-button",
+        "print-detail-button",
+        "download-button",
+        "copy_button",
+        "save_submit_wf_button",
+        "tempStorage",
+        "dropdown",
+        "dropdown-item",
+      ].includes(this.selectedWidget.type);
+    },
+    authCode() {
+      return (
+        this.designer.vueInstance?.reportTemplate?.formCode + ":" + this.optionModel.name
+      );
+    },
+  },
+  methods: {
+    copyAuthCode(e){
+      this.copyToClipboard(this.authCode, e, this.$message, '复制成功', '复制失败');
+    },
+    copyToClipboard(content, clickEvent, $message, successMsg, errorMsg) {
+      const clipboard = new Clipboard(clickEvent.target, {
+        text: () => content
+      });
+
+      clipboard.on('success', () => {
+        $message.success(successMsg);
+        clipboard.destroy();
+      })
+
+      clipboard.on('error', () => {
+        $message.error(errorMsg);
+        clipboard.destroy();
+      });
+
+      clipboard.onClick(clickEvent);
+    },
+    updateWidgetNameAndRef(newName) {
+      let oldName = this.designer.selectedWidgetName;
+      if (isEmptyStr(newName)) {
+        this.selectedWidget.options.name = oldName;
+        this.$message.info(this.i18nt("designer.hint.nameRequired"));
+        return;
+      }
+
+      if (!!this.designer.formWidget) {
+        let foundRef = this.designer.formWidget.getWidgetRef(newName); // 检查newName是否已存在！！
+
+        if (!!foundRef) {
+          if (this.isDataTableChildWidget()) {
+            let parentList = this.parentList;
+            for (let i; i < parentList.length; i++) {}
+          } else {
+            this.selectedWidget.options.name = oldName;
+            this.$message.info(this.i18nt("designer.hint.duplicateName") + newName);
+            return;
+          }
+        }
+
+        let widgetInDesign = this.designer.formWidget.getWidgetRef(oldName);
+        if (!!widgetInDesign && !!widgetInDesign.registerToRefList) {
+          widgetInDesign.registerToRefList(oldName); //注册组件新的ref名称并删除老的ref！！
+          let newLabel = this.getLabelByFieldName(newName);
+          this.designer.updateSelectedWidgetNameAndLabel(
+            this.selectedWidget,
+            newName,
+            newLabel
+          );
+        }
+      }
+    },
+
+    getLabelByFieldName(fieldName) {
+      for (let i = 0; i < this.serverFieldList.length; i++) {
+        if (this.serverFieldList[i].name === fieldName) {
+          return this.serverFieldList[i].label;
+        }
+      }
+
+      return null;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+  .a-link{
+    display:flex;line-height:1.2;width:100%;align-items:center;color:rgba(0,0,0,0.65);
+    > i{
+      margin-right:8px;
+    }
+    > span{
+      flex:1
+    }
+  }
+</style>

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

@@ -15,7 +15,7 @@
     <el-form-item :label="i18nt('启用特定用户显示规则设置')">
       <el-switch v-model="optionModel.userTextRuleEnabled"></el-switch>
     </el-form-item>
-    <el-form-item :label="i18nt('特定用户显示规则设置')" v-if="optionModel.userTextRuleEnabled">
+    <el-form-item :label="i18nt('特定用户显示规则设置')" v-if="optionModel.userTextRuleEnabled" class="el-form-item-second">
       <a href="javascript:void(0);" class="a-link link-oneLind" @click="openDialog">
         <span>{{ optionModel.userTextRuleConfig && optionModel.userTextRuleConfig.length ? "已维护" : "" }}</span>
         <i class="el-icon-edit"></i>

package/src/components/xform/form-designer/setting-panel/propertyRegister.js

@@ -266,6 +266,7 @@ const EVENT_PROPERTIES = {
   onCheckboxChange: "onCheckboxChange-editor",
   onSearchTable: "onSearchTable-editor",
   onResetTable: "onResetTable-editor",
+  afterColumnsCreated: "afterColumnsCreated-editor",
 
   //tree事件
   onNodeClick: "onNodeClick-editor",

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

@@ -286,6 +286,7 @@ export const containers = [
       onCellDblclick: "",
       onSearchTable: "",
       onResetTable: "",
+      afterColumnsCreated: "",
       dynamicColumnsScript: null,
       dynamicColumnSourceType: "none",
       dynamicColumnMode: "append",

package/src/components/xform/form-render/container-item/data-table-mixin.js

@@ -5,6 +5,7 @@ import containerItemMixin from "./containerItemMixin";
 
 import * as formatUtil from "../../../../components/xform/utils/format.js";
 import tableConfig from "../../../../components/table/config.js";
+import { getTableStateValue } from "../../../../components/table/state";
 import { extendDeeply } from "../../../../utils/index.js";
 import {
   assembleAxiosConfig,
@@ -1280,6 +1281,7 @@ modules = {
               const finish = () => {
                 this.initFieldSchemaData(true);
                 this.afterDynamicColumnsCommonWidget(effectiveColumns);
+                this.emitAfterColumnsCreated(columns);
                 resolve(columns);
               };
               if (reloadResult?.then) {
@@ -1288,6 +1290,7 @@ modules = {
                 finish();
               }
             } else {
+              this.emitAfterColumnsCreated(columns);
               resolve(columns);
             }
           },
@@ -1295,6 +1298,35 @@ modules = {
         );
       });
     },
+    /**
+     * 表头（列）创建完成后的统一出口：首次建表和运行时重建列（setTableColumns /
+     * 动态列加载）两条链路都经这里，脚本拿到的一定是已经写进 VXE 的最终列。
+     *
+     * 脚本签名：function (dataId, formCode, columns, $grid)
+     *   columns —— 应用到 VXE 的列配置数组（含 checkbox 列、分组表头 children）
+     *   $grid   —— vxe-grid 实例，需要活列对象时用 $grid.getTableColumn()
+     *
+     * 注意：每次表头重建都会触发（动态列表单首屏会触发两次：静态列建表一次、
+     * 动态列回来重建一次），脚本必须幂等。
+     * @param {Array} columns 已应用的列配置。
+     */
+    emitAfterColumnsCreated(columns) {
+      const script = this.widget.options.afterColumnsCreated;
+      if (!script) return;
+      // 列刚写进 vxeOption，DOM 表头还没渲染完，等一拍脚本才能操作表头节点
+      this.$nextTick(() => {
+        try {
+          this.handleCustomEvent(
+            script,
+            ["columns", "$grid"],
+            [columns || [], this.getGridTable()]
+          );
+        } catch (error) {
+          // handleCustomEvent 已按配置弹「前端脚本异常」，这里吞掉避免打断建表后续流程
+          console.error("afterColumnsCreated 脚本执行异常", error);
+        }
+      });
+    },
     /**
      * 替换列配置并刷新 VXE 列、行 schema 和组件选项。
      * @param {Array} tableColumns 新列配置。
@@ -2017,7 +2049,7 @@ modules = {
           if (this.widget.options.showPagination) {
             let proxyInfo = $grid.getProxyInfo();
             let searchCount = true;
-            let isQueryAllPage = $grid.isQueryAllPage;
+            let isQueryAllPage = getTableStateValue($grid, "isQueryAllPage");
             if (isQueryAllPage === false) {
               searchCount = false;
             }
@@ -2610,7 +2642,7 @@ modules = {
               }
 
               // let $grid = this.getGridTable();
-              let isQueryAllPage = $grid.isQueryAllPage;
+              let isQueryAllPage = getTableStateValue($grid, "isQueryAllPage");
               let pathStr1 = "";
               /* if (isQueryAllPage === false) {
                 queryParams.searchCount = false;
@@ -2894,6 +2926,7 @@ modules = {
         }
         // 列已就绪，补建 created 阶段被延后的行 schema
         this.flushPendingSchemaInit();
+        this.emitAfterColumnsCreated(opts?.columns || columns);
         this.tryAutoLoadDynamicColumns().finally(() => {
           if (!isQueryTable) {
             setTimeout(() => {

package/src/components/xform/form-render/container-item/detail-item.vue

@@ -175,6 +175,8 @@ import {
   DEFAULT_SUBMIT_BTN,
   DEFAULT_SAVE_SUBMIT_BTN,
 } from "../../../../components/wf/wfButtonName";
+import { loadWfAutoConfirm } from "../../../../components/wf/wfAutoConfirm";
+import { loadWfUserRange } from "../../../../components/wf/wfUserRange";
 import settingConfig from "@/settings.js";
 
 export default {
@@ -193,9 +195,11 @@ export default {
   created() {
     this.initRefList();
     this.handleOnCreated();
-    //只有流程表单才需要按钮名，避免给普通详情页平白多一次请求(模块内全局只发一次)
+    //只有流程表单才需要按钮名/自动确认开关，避免给普通详情页平白多一次请求(模块内全局只发一次)
     if (this.getFormRef()?.formConfig?.wfEnabled) {
       loadWfButtonNames(this);
+      loadWfAutoConfirm(this);
+      loadWfUserRange(this);
     }
   },
   mounted() {
@@ -349,12 +353,9 @@ export default {
     startWf() {
       let ws = this.wfStart();
       if (!ws || !ws.option || !ws.ctx) return;
-      // 启动确认提示语跟随「提交流程按钮名」:包一层现成的 startConfirmText 钩子,
-      // 既保住模板脚本 wfStartConfirmText 的最高优先级,又不必改公共的 wf.js
-      // (wf.js 默认分支走 $t2(文案, key),i18n 命中 key 会把自定义按钮名吞掉)。
-      let inner = ws.option.startConfirmText;
-      //只有后台真配了按钮名才改提示语；没配就返空，让 wf.js 走它自己的默认链
-      let btnName = getWfButtonNames().submitBtn;
+      // startConfirmText 原样透传:它只承载模板脚本 wfStartConfirmText 的文案(见 indexMixin
+      // 的 option 构造)。按钮名拼接与「后台 param19 自动确认」都由 wf.js 统一处理——
+      // 在这里替它拼默认文案的话,wf.js 会把它当成脚本自定义的告警,自动确认就失效了。
       let innerOnStart = ws.option.onStart;
       let formRef = this.getFormRef && this.getFormRef();
       openStartWfDialog(ws.ctx, {
@@ -377,11 +378,6 @@ export default {
             runBefore();
           }
         },
-        startConfirmText: async (ctx) => {
-          let text = typeof inner === "function" ? await inner.call(this, ctx) : inner;
-          if (typeof text === "string" && text.trim()) return text; //模板脚本优先
-          return btnName ? `您确定要${btnName}吗？` : ""; //返空 → wf.js 走自身默认
-        },
       });
     },
     // 触发宿主翻单：step = -1 上一单 / +1 下一单

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

@@ -3,6 +3,14 @@ import { saveUserLog } from "@base/api/user";
 import settingConfig from "@/settings";
 import { openStartWfDialog } from "../../../components/wf/wfUtil";
 import { getWfButtonNames } from "../../../components/wf/wfButtonName";
+import {
+  isWfAutoConfirm,
+  loadWfAutoConfirm,
+} from "../../../components/wf/wfAutoConfirm";
+import {
+  isWfUserRangeEnabled,
+  loadWfUserRange,
+} from "../../../components/wf/wfUserRange";
 
 let modules = {};
 modules = {
@@ -134,7 +142,7 @@ modules = {
         });
       }
     },
-    saveAndSubmitWfHandle(option) {
+    async saveAndSubmitWfHandle(option) {
       let formRef = this.getFormRef ? this.getFormRef() : this;
       let formConfig = formRef.formConfig;
       let reportTemplate = formRef.reportTemplate;
@@ -159,12 +167,18 @@ modules = {
           ? this.$t1(`您确定要${btnName}吗？`)
           : this.$t1("您确定要保存并提交流程吗？"));
 
+      // param19 + param12 都开：这道「保存前」的确认框不弹，把确认交给 wfStartDialog——
+      // 它在保存之后才探 preStart，探到候选人就由「修改候选人」弹框顶替，探不到才弹确认框。
+      // 任一为 false 都当场弹：param12 关着后面不可能有候选人弹框，延后没有意义。
+      await Promise.all([loadWfAutoConfirm(this), loadWfUserRange(this)]);
+      let autoConfirm = isWfAutoConfirm() && isWfUserRangeEnabled();
+
       return this.saveDefaultHandle({
         ...option,
         config: {
           ...option?.config,
           successMsg: option?.config?.successMsg ?? true,
-          isConfirm: option?.config?.isConfirm ?? true,
+          isConfirm: option?.config?.isConfirm ?? !autoConfirm,
           confirmText: option?.config?.confirmText || confirmText,
           skipHostReloadAfterSave: true,
           //提交前置处理(与「提交流程」按钮共用同一个表单脚本)
@@ -187,7 +201,8 @@ modules = {
               wfCode: reportTemplate.objTypeCode,
               formCode: reportTemplate.formCode,
               serviceId: reportTemplate.serviceName,
-              skipStartConfirm: true,
+              // 上面确认过就不再弹第二次；上面因 param19 跳过了，就得让弹框自己去确认
+              skipStartConfirm: !autoConfirm,
               // 提交后行为复用 xform 侧统一方法：
               //  成功 → onWfStartSuccess（关页签/刷新本页）；失败/取消 → onWfStartAbort（刷新到编辑态）
               onStartSuccess: () =>