cloud-web-corejs 1.0.54-dev.784 → 1.0.54-dev.786

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.784",
+  "version": "1.0.54-dev.786",
   "scripts": {
     "dev": "vue-cli-service serve",
     "dev:micro": "vue-cli-service serve --port 17527",

package/src/components/baseInputExport/mixins.js

@@ -1,10 +1,10 @@
-import {getToken} from "../../utils/auth";
-import {openCnPrint} from "../../components/cnPrint/index";
-import {openHiPrint} from "../../components/hiprint/index";
-import {openJdPrint} from "../../components/jdPrint/index";
-import {openPddPrint} from "../../components/pddPrint/index";
-import {openVipPrint} from "../../components/vipPrint/index";
-import {openXhsPrint} from "../../components/xhsPrint/index";
+import { getToken } from "../../utils/auth";
+import { openCnPrint } from "../../components/cnPrint/index";
+import { openHiPrint } from "../../components/hiprint/index";
+import { openJdPrint } from "../../components/jdPrint/index";
+import { openPddPrint } from "../../components/pddPrint/index";
+import { openVipPrint } from "../../components/vipPrint/index";
+import { openXhsPrint } from "../../components/xhsPrint/index";
 
 let modules;
 let configUtil = {
@@ -29,7 +29,7 @@ modules = {
   },
   computed: {
     buttonName() {
-      if(this.option.label){
+      if (this.option.label) {
         return this.option.label;
       }
       let exportTemplates = this.exportTemplates;
@@ -143,14 +143,13 @@ modules = {
     },
     getTableGrid() {
       let grid = null;
-      let tableTarget = this.option.tableTarget
+      let tableTarget = this.option.tableTarget;
       if (tableTarget) {
         if (typeof tableTarget === "function") {
           grid = tableTarget();
         } else {
           grid = tableTarget;
         }
-
       } else if (this.option.tableRef) {
         grid = this.parentTarget.$refs[this.option.tableRef];
       }
@@ -160,23 +159,22 @@ modules = {
       let checkRows = [];
       let $grid = this.getTableGrid();
 
-
       let condition = null;
-      if(this.option.customCondition){
+      if (this.option.customCondition) {
         let condition1 = this.option.customCondition(item);
-        if(condition1)condition = condition1;
+        if (condition1) condition = condition1;
       }
-      if(!condition){
+      if (!condition) {
         if ($grid) {
           checkRows = $grid.getCheckboxRecords(true);
         } else {
-          checkRows
-            = typeof this.option.param === "function"
-            ? this.option.param(item)
-            : this.option.param;
+          checkRows =
+            typeof this.option.param === "function"
+              ? this.option.param(item)
+              : this.option.param;
         }
         let ids = checkRows ? checkRows.map((row) => row.id) : [];
-        condition = ids.length ? {id: ids} : null;
+        condition = ids.length ? { id: ids } : null;
       }
       return condition;
 
@@ -222,7 +220,12 @@ modules = {
       if ($grid) {
         checkRows = $grid.getCheckboxRecords(true);
         if (!checkRows.length) {
-          this.$baseAlert(this.$t2("请选择需要导出/打印的数据", "components.baseInputExport.selectDataTip"));
+          this.$baseAlert(
+            this.$t2(
+              "请选择需要导出/打印的数据",
+              "components.baseInputExport.selectDataTip"
+            )
+          );
           return;
         }
       }
@@ -238,7 +241,9 @@ modules = {
       } else if (this.exportTypes.includes(etType)) {
         //导出excel
         let conditions = this.tableDefalutHandle(exportTemplate) || [];
-        this.$baseConfirm(this.$t2("您确定要导出吗？", "components.baseInputExport.exportTip")).then(() => {
+        this.$baseConfirm(
+          this.$t2("您确定要导出吗？", "components.baseInputExport.exportTip")
+        ).then(() => {
           let condition = $grid
             ? this.tableDefalutHandle(exportTemplate)
             : this.tableDefalutHandle(exportTemplate);
@@ -371,16 +376,17 @@ modules = {
       }
 
       function downLoadFile(row, that) {
-        let realFileName = fileName ? fileName + "-" + row.uuid : row.uuid;
-        let fileUrl
-          = configUtil.baseUrl
-          + that.option.prefix
-          + "/export_ins/download?uuid="
-          + row.uuid
-          + "&ippaaapp="
-          + row.ippaaapp
-          + "&n="
-          + realFileName;
+        let filename = row.filename || fileName;
+        let realFileName = filename ? filename + "-" + row.uuid : row.uuid;
+        let fileUrl =
+          configUtil.baseUrl +
+          that.option.prefix +
+          "/export_ins/download?uuid=" +
+          row.uuid +
+          "&ippaaapp=" +
+          row.ippaaapp +
+          "&n=" +
+          realFileName;
         var params = {};
         that.parentTarget.$http({
           method: "post",

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

@@ -52,19 +52,19 @@ import formulaDialog from "@base/components/xform/form-designer/form-widget/dial
 import baseFormulaDialog from "@base/components/xform/form-designer/form-widget/dialog/baseFormulaDialog.vue";
 import QRCode from "qrcode";
 import { openLuckysheetDialog } from "@base/components/luckysheet";
-import {
-  openComponentDialog as mountComponentDialog,
-} from "@base/utils/componentDialog";
-import {
-  buildTreeSubmitData,
-  copyTreeData,
-  getTreeLoadState,
-  isTemporaryTreeKey,
-  resolveTreeCopyConfig,
-  resolveTreeFields,
-  resolveTreeIdentityConfig,
-  resolveTreeSubmitConfig,
-} from "../utils/treeTableUtil";
+import {
+  openComponentDialog as mountComponentDialog,
+} from "@base/utils/componentDialog";
+import {
+  buildTreeSubmitData,
+  copyTreeData,
+  getTreeLoadState,
+  isTemporaryTreeKey,
+  resolveTreeCopyConfig,
+  resolveTreeFields,
+  resolveTreeIdentityConfig,
+  resolveTreeSubmitConfig,
+} from "../utils/treeTableUtil";
 
 let modules = {};
 const baseRefUtil = {
@@ -1293,12 +1293,12 @@ modules = {
 
       return hasModifyItem;
     },
-    loadFormData(options = {}) {
-      let config = options.config || {};
+    loadFormData(options = {}) {
+      let config = options.config || {};
       let that = this;
       let formConfig = this.formConfig;
       let entity = formConfig.entity;
-      let dataId = options.dataId ?? this.dataId;
+      let dataId = options.dataId ?? this.dataId;
       let reportTemplate = this.reportTemplate;
       let scriptCode = formConfig.formScriptCode || "getOne";
 
@@ -1327,13 +1327,13 @@ modules = {
               ...formScriptParam,
             },
           },
-          ...defaultOption,
-          success: (res) => {
-            formData = res.objx || {};
-            this.setFormData(formData, {
-              replace: options.replace === true,
-            });
-            options.callback && options.callback(formData);
+          ...defaultOption,
+          success: (res) => {
+            formData = res.objx || {};
+            this.setFormData(formData, {
+              replace: options.replace === true,
+            });
+            options.callback && options.callback(formData);
           },
           ...config,
         });
@@ -1434,6 +1434,9 @@ modules = {
                   config: {
                     successMsg: false,
                     isConfirm: false,
+                    // 这次保存是「启动流程」的一环,保存完就要接着提交,不能让宿主重挂载
+                    // 把当前表单销毁;刷新交给 onWfStartSuccess / onWfStartAbort。
+                    skipHostReloadAfterSave: true,
                     success: (res) => {
                       done();
                     },
@@ -1462,6 +1465,8 @@ modules = {
                     config: {
                       successMsg: false,
                       isConfirm: false,
+                      // 同上:流程通过前的自动保存,后续由流程侧刷新,此处不重挂载。
+                      skipHostReloadAfterSave: true,
                       success: (res) => {
                         done();
                       },
@@ -2001,22 +2006,22 @@ modules = {
         n
       );
     },
-    setFormData: function (e, options = {}) {
-      let t = this;
+    setFormData: function (e, options = {}) {
+      let t = this;
       /*Object.keys(this.formDataModel).forEach(function (i) {
         e && e.hasOwnProperty(i) && (t.formDataModel[i] = baseRefUtil.deepClone(e[i]));
       });*/
-      let nextFormData = baseRefUtil.deepClone(e || {});
-      if (options.replace === true) {
-        Object.keys(t.formDataModel).forEach((key) => {
-          t.$delete(t.formDataModel, key);
-        });
-        Object.keys(nextFormData).forEach((key) => {
-          t.$set(t.formDataModel, key, nextFormData[key]);
-        });
-      } else {
-        Object.assign(t.formDataModel, nextFormData);
-      }
+      let nextFormData = baseRefUtil.deepClone(e || {});
+      if (options.replace === true) {
+        Object.keys(t.formDataModel).forEach((key) => {
+          t.$delete(t.formDataModel, key);
+        });
+        Object.keys(nextFormData).forEach((key) => {
+          t.$set(t.formDataModel, key, nextFormData[key]);
+        });
+      } else {
+        Object.assign(t.formDataModel, nextFormData);
+      }
       this.currentFormData = e || {};
       this.broadcast("ContainerItem", "setFormData", this.formDataModel),
         this.broadcast("FieldWidget", "setFormData", this.formDataModel);
@@ -3993,206 +3998,206 @@ modules = {
             reject(msg);
           });
       });
-    },
-    getTreeTableUtilContext(tableTarget, $grid, source) {
-      let treeConfig = $grid?.treeConfig || {};
-      let originOption
-        = $grid?.params?.originOption || $grid?.originOption || {};
-      let fields = resolveTreeFields(treeConfig, {
-        strict: true,
-      });
-      let identityConfig = resolveTreeIdentityConfig(
-        treeConfig,
-        originOption.treeIdentityConfig || {}
-      );
-      let copyConfig = resolveTreeCopyConfig(
-        fields,
-        identityConfig,
-        originOption.treeCopyConfig || {}
-      );
-      let submitConfig = resolveTreeSubmitConfig(
-        originOption.treeSubmitConfig || {}
-      );
-      let temporaryKeyRegistry
-        = tableTarget?.treeTemporaryKeyRegistry || new Set();
-      let knownFormalKeyRegistry
-        = tableTarget?.treeKnownFormalKeyRegistry || new Set();
-
-      this.collectTreeRuntimeRows(source || [], treeConfig).forEach((row) => {
-        let rowValue = row[fields.rowField];
-        let marker = row._X_TREE_TEMP_KEY;
-        if (marker !== undefined && marker !== null) {
-          temporaryKeyRegistry.add(marker);
-        }
-        if (
-          rowValue !== undefined
-          && rowValue !== null
-          && rowValue !== ""
-          && !isTemporaryTreeKey(row, fields.rowField, identityConfig)
-        ) {
-          knownFormalKeyRegistry.add(rowValue);
-        }
-      });
-
-      return {
-        fields,
-        identityConfig,
-        copyConfig,
-        submitConfig,
-        temporaryKeyRegistry,
-        knownFormalKeyRegistry,
-      };
-    },
-    collectTreeRuntimeRows(rows, treeConfig) {
-      let result = [];
-      let visited = new WeakSet();
-      let childrenFields = [
-        treeConfig?.children,
-        treeConfig?.mapChildren || "_X_ROW_CHILD",
-      ].filter(Boolean);
-      let visit = (items) => {
-        if (!Array.isArray(items)) return;
-        items.forEach((item) => {
-          if (!item || typeof item !== "object" || visited.has(item)) return;
-          visited.add(item);
-          result.push(item);
-          childrenFields.forEach((field) => {
-            visit(item[field]);
-          });
-        });
-      };
-      visit(rows);
-      return result;
-    },
-    getTreeRuntimeSource($grid, source) {
-      let result = Array.isArray(source) ? source.slice() : [];
-      let runtimeSources = [
-        $grid?.getTableData?.()?.fullData,
-        $grid?.$refs?.xTable?.tableFullTreeData,
-      ];
-      runtimeSources.forEach((rows) => {
-        if (!Array.isArray(rows)) return;
-        rows.forEach((row) => {
-          if (!result.includes(row)) result.push(row);
-        });
-      });
-      return result;
-    },
-    getTreeUnloadedRows($grid, treeConfig) {
-      let xTable = $grid?.$refs?.xTable;
-      let fullData = this.getTreeRuntimeSource($grid, []);
-      return this.collectTreeRuntimeRows(fullData, treeConfig).filter(
-        (row) =>
-          getTreeLoadState(row, {
-            fields: resolveTreeFields(treeConfig),
-            isTreeNodeLoaded:
-              typeof xTable?.isTreeExpandLoaded === "function"
-                ? (targetRow) => xTable.isTreeExpandLoaded(targetRow)
-                : null,
-          }).requiresLoad
-      );
-    },
-    async ensureTreeTableLoadState(formTemplateTableDTO, operation) {
-      let tableTarget = this.getWidgetRef(formTemplateTableDTO.uniqueName);
-      let $grid = tableTarget?.getGridTable?.();
-      let treeConfig = $grid?.treeConfig;
-      if (!$grid || !treeConfig?.lazy) return;
-
-      let treeContext = this.getTreeTableUtilContext(
-        tableTarget,
-        $grid,
-        this.formDataModel[formTemplateTableDTO.name] || []
-      );
-      let strategy = operation === "copy"
-        ? treeContext.copyConfig.lazyStrategy
-        : treeContext.submitConfig.unloadedChildrenStrategy;
-      if (operation === "submit" && strategy === "omit") return;
-
-      let xTable = $grid.$refs?.xTable;
-      if (
-        !xTable
-        || typeof xTable.isTreeExpandLoaded !== "function"
-        || typeof $grid.setTreeExpand !== "function"
-      ) {
-        throw new Error(
-          `[${formTemplateTableDTO.tableAlias}]无法读取树节点加载状态`
-        );
-      }
-
-      let unloadedRows = this.getTreeUnloadedRows($grid, treeConfig);
-      if (!unloadedRows.length) return;
-      if (strategy !== "loadAll") {
-        let action = operation === "copy" ? "复制" : "保存";
-        throw new Error(
-          `[${formTemplateTableDTO.tableAlias}]存在尚未加载的树节点，请先展开后再${action}`
-        );
-      }
-
-      let loopCount = 0;
-      while (unloadedRows.length) {
-        if (loopCount++ > 100) {
-          throw new Error(
-            `[${formTemplateTableDTO.tableAlias}]树节点层级过深，无法完成加载`
-          );
-        }
-        let currentRows = unloadedRows;
-        await Promise.all(
-          currentRows.map((row) => $grid.setTreeExpand(row, true))
-        );
-        unloadedRows = this.getTreeUnloadedRows($grid, treeConfig);
-        if (
-          unloadedRows.length === currentRows.length
-          && unloadedRows.every((row) => currentRows.includes(row))
-        ) {
-          throw new Error(
-            `[${formTemplateTableDTO.tableAlias}]树节点加载未完成，已停止保存`
-          );
-        }
-      }
-    },
-    async ensureTreeTableReadyForSubmit(formTemplateTableDTO) {
-      return this.ensureTreeTableLoadState(
-        formTemplateTableDTO,
-        "submit"
-      );
-    },
-    async prepareTreeTablesForCopy() {
-      let treeTables = this.getFormTemplateTableDTOs().filter(
-        (item) => item.isTreeTable
-      );
-      for (let index = 0; index < treeTables.length; index++) {
-        await this.ensureTreeTableLoadState(treeTables[index], "copy");
-      }
-    },
-    async buildSubmitPayload(option) {
-      let treeTables = this.getFormTemplateTableDTOs().filter(
-        (item) => item.isTreeTable
-      );
-      for (let index = 0; index < treeTables.length; index++) {
-        await this.ensureTreeTableReadyForSubmit(treeTables[index]);
-      }
-      let formDataSnapshot = this.$baseLodash.cloneDeep(this.formDataModel);
-      let subData = this.getSubData2(false, {
-        mode: "submit",
-        formDataModel: formDataSnapshot,
-      });
-      if (option) {
-        let realFormData = {};
-        Object.keys(option).forEach((key) => {
-          realFormData[option[key]] = subData[key];
-        });
-        return realFormData;
-      }
-      return subData;
-    },
-    getSubData2(flag, context = {}) {
+    },
+    getTreeTableUtilContext(tableTarget, $grid, source) {
+      let treeConfig = $grid?.treeConfig || {};
+      let originOption
+        = $grid?.params?.originOption || $grid?.originOption || {};
+      let fields = resolveTreeFields(treeConfig, {
+        strict: true,
+      });
+      let identityConfig = resolveTreeIdentityConfig(
+        treeConfig,
+        originOption.treeIdentityConfig || {}
+      );
+      let copyConfig = resolveTreeCopyConfig(
+        fields,
+        identityConfig,
+        originOption.treeCopyConfig || {}
+      );
+      let submitConfig = resolveTreeSubmitConfig(
+        originOption.treeSubmitConfig || {}
+      );
+      let temporaryKeyRegistry
+        = tableTarget?.treeTemporaryKeyRegistry || new Set();
+      let knownFormalKeyRegistry
+        = tableTarget?.treeKnownFormalKeyRegistry || new Set();
+
+      this.collectTreeRuntimeRows(source || [], treeConfig).forEach((row) => {
+        let rowValue = row[fields.rowField];
+        let marker = row._X_TREE_TEMP_KEY;
+        if (marker !== undefined && marker !== null) {
+          temporaryKeyRegistry.add(marker);
+        }
+        if (
+          rowValue !== undefined
+          && rowValue !== null
+          && rowValue !== ""
+          && !isTemporaryTreeKey(row, fields.rowField, identityConfig)
+        ) {
+          knownFormalKeyRegistry.add(rowValue);
+        }
+      });
+
+      return {
+        fields,
+        identityConfig,
+        copyConfig,
+        submitConfig,
+        temporaryKeyRegistry,
+        knownFormalKeyRegistry,
+      };
+    },
+    collectTreeRuntimeRows(rows, treeConfig) {
+      let result = [];
+      let visited = new WeakSet();
+      let childrenFields = [
+        treeConfig?.children,
+        treeConfig?.mapChildren || "_X_ROW_CHILD",
+      ].filter(Boolean);
+      let visit = (items) => {
+        if (!Array.isArray(items)) return;
+        items.forEach((item) => {
+          if (!item || typeof item !== "object" || visited.has(item)) return;
+          visited.add(item);
+          result.push(item);
+          childrenFields.forEach((field) => {
+            visit(item[field]);
+          });
+        });
+      };
+      visit(rows);
+      return result;
+    },
+    getTreeRuntimeSource($grid, source) {
+      let result = Array.isArray(source) ? source.slice() : [];
+      let runtimeSources = [
+        $grid?.getTableData?.()?.fullData,
+        $grid?.$refs?.xTable?.tableFullTreeData,
+      ];
+      runtimeSources.forEach((rows) => {
+        if (!Array.isArray(rows)) return;
+        rows.forEach((row) => {
+          if (!result.includes(row)) result.push(row);
+        });
+      });
+      return result;
+    },
+    getTreeUnloadedRows($grid, treeConfig) {
+      let xTable = $grid?.$refs?.xTable;
+      let fullData = this.getTreeRuntimeSource($grid, []);
+      return this.collectTreeRuntimeRows(fullData, treeConfig).filter(
+        (row) =>
+          getTreeLoadState(row, {
+            fields: resolveTreeFields(treeConfig),
+            isTreeNodeLoaded:
+              typeof xTable?.isTreeExpandLoaded === "function"
+                ? (targetRow) => xTable.isTreeExpandLoaded(targetRow)
+                : null,
+          }).requiresLoad
+      );
+    },
+    async ensureTreeTableLoadState(formTemplateTableDTO, operation) {
+      let tableTarget = this.getWidgetRef(formTemplateTableDTO.uniqueName);
+      let $grid = tableTarget?.getGridTable?.();
+      let treeConfig = $grid?.treeConfig;
+      if (!$grid || !treeConfig?.lazy) return;
+
+      let treeContext = this.getTreeTableUtilContext(
+        tableTarget,
+        $grid,
+        this.formDataModel[formTemplateTableDTO.name] || []
+      );
+      let strategy = operation === "copy"
+        ? treeContext.copyConfig.lazyStrategy
+        : treeContext.submitConfig.unloadedChildrenStrategy;
+      if (operation === "submit" && strategy === "omit") return;
+
+      let xTable = $grid.$refs?.xTable;
+      if (
+        !xTable
+        || typeof xTable.isTreeExpandLoaded !== "function"
+        || typeof $grid.setTreeExpand !== "function"
+      ) {
+        throw new Error(
+          `[${formTemplateTableDTO.tableAlias}]无法读取树节点加载状态`
+        );
+      }
+
+      let unloadedRows = this.getTreeUnloadedRows($grid, treeConfig);
+      if (!unloadedRows.length) return;
+      if (strategy !== "loadAll") {
+        let action = operation === "copy" ? "复制" : "保存";
+        throw new Error(
+          `[${formTemplateTableDTO.tableAlias}]存在尚未加载的树节点，请先展开后再${action}`
+        );
+      }
+
+      let loopCount = 0;
+      while (unloadedRows.length) {
+        if (loopCount++ > 100) {
+          throw new Error(
+            `[${formTemplateTableDTO.tableAlias}]树节点层级过深，无法完成加载`
+          );
+        }
+        let currentRows = unloadedRows;
+        await Promise.all(
+          currentRows.map((row) => $grid.setTreeExpand(row, true))
+        );
+        unloadedRows = this.getTreeUnloadedRows($grid, treeConfig);
+        if (
+          unloadedRows.length === currentRows.length
+          && unloadedRows.every((row) => currentRows.includes(row))
+        ) {
+          throw new Error(
+            `[${formTemplateTableDTO.tableAlias}]树节点加载未完成，已停止保存`
+          );
+        }
+      }
+    },
+    async ensureTreeTableReadyForSubmit(formTemplateTableDTO) {
+      return this.ensureTreeTableLoadState(
+        formTemplateTableDTO,
+        "submit"
+      );
+    },
+    async prepareTreeTablesForCopy() {
+      let treeTables = this.getFormTemplateTableDTOs().filter(
+        (item) => item.isTreeTable
+      );
+      for (let index = 0; index < treeTables.length; index++) {
+        await this.ensureTreeTableLoadState(treeTables[index], "copy");
+      }
+    },
+    async buildSubmitPayload(option) {
+      let treeTables = this.getFormTemplateTableDTOs().filter(
+        (item) => item.isTreeTable
+      );
+      for (let index = 0; index < treeTables.length; index++) {
+        await this.ensureTreeTableReadyForSubmit(treeTables[index]);
+      }
+      let formDataSnapshot = this.$baseLodash.cloneDeep(this.formDataModel);
+      let subData = this.getSubData2(false, {
+        mode: "submit",
+        formDataModel: formDataSnapshot,
+      });
+      if (option) {
+        let realFormData = {};
+        Object.keys(option).forEach((key) => {
+          realFormData[option[key]] = subData[key];
+        });
+        return realFormData;
+      }
+      return subData;
+    },
+    getSubData2(flag, context = {}) {
       let that = this;
       let formCode = this.reportTemplate.formCode;
       let tableFiledMap = this.getTableFiledMap();
       let formTemplateTableDTOs = this.getFormTemplateTableDTOs();
-      let formDataModel
-        = context.formDataModel
-        || this.$baseLodash.cloneDeep(this.formDataModel);
+      let formDataModel
+        = context.formDataModel
+        || this.$baseLodash.cloneDeep(this.formDataModel);
       let formConfig = this.formConfig;
 
       let res = {};
@@ -4227,32 +4232,32 @@ modules = {
           newFormData[tableAlias] = item ?? null;
         } else {
           if (formTemplateTableDTO.isTreeTable) {
-            let tableTarget = this.getWidgetRef(
-              formTemplateTableDTO.uniqueName
-            );
-            let $grid = tableTarget.getGridTable();
-            let treeTaBm = newFormData.treeTaBm || [];
-            treeTaBm.push(formTemplateTableDTO.tableAlias);
-            newFormData.treeTaBm = treeTaBm;
-            let modelRows = formDataModel[formTemplateTableDTO.name];
-            let sourceRows = Array.isArray(modelRows) ? modelRows : [];
-            let treeContext = this.getTreeTableUtilContext(
-              tableTarget,
-              $grid,
-              sourceRows
-            );
-            newFormData[tableAlias] = buildTreeSubmitData(sourceRows, {
-              ...treeContext,
-              submitConfig:
-                context.mode === "submit"
-                  ? treeContext.submitConfig
-                  : {
-                      ...treeContext.submitConfig,
-                      orphanParentStrategy: "preserve",
-                    },
-              strict: context.mode === "submit",
-            });
-          } else {
+            let tableTarget = this.getWidgetRef(
+              formTemplateTableDTO.uniqueName
+            );
+            let $grid = tableTarget.getGridTable();
+            let treeTaBm = newFormData.treeTaBm || [];
+            treeTaBm.push(formTemplateTableDTO.tableAlias);
+            newFormData.treeTaBm = treeTaBm;
+            let modelRows = formDataModel[formTemplateTableDTO.name];
+            let sourceRows = Array.isArray(modelRows) ? modelRows : [];
+            let treeContext = this.getTreeTableUtilContext(
+              tableTarget,
+              $grid,
+              sourceRows
+            );
+            newFormData[tableAlias] = buildTreeSubmitData(sourceRows, {
+              ...treeContext,
+              submitConfig:
+                context.mode === "submit"
+                  ? treeContext.submitConfig
+                  : {
+                      ...treeContext.submitConfig,
+                      orphanParentStrategy: "preserve",
+                    },
+              strict: context.mode === "submit",
+            });
+          } else {
             newFormData[tableAlias] =
               formDataModel[formTemplateTableDTO.name] ?? null;
           }
@@ -4449,10 +4454,10 @@ modules = {
         this.$baseReload();
       }
     },
-    reloadForm(option) {
-      let target1 = this.$attrs["parent-target"];
-      let target2 = target1?.$attrs["parent-target"];
-      let target = !target2 ? this : target1;
+    reloadForm(option) {
+      let target1 = this.$attrs["parent-target"];
+      let target2 = target1?.$attrs["parent-target"];
+      let target = !target2 ? this : target1;
       /* if (this.$attrs['reloadDialog'] !== true) {
         target = this.$attrs['parent-target'];
       }else{
@@ -4462,44 +4467,44 @@ modules = {
       for (let key in updateParam) {
         target.$emit("update:" + key, updateParam[key]);
       }*/
-      try {
-        let reloadListener = target?.$listeners?.reload;
-        if (Array.isArray(reloadListener)) {
-          return Promise.all(
-            reloadListener.map((listener) => listener(target, option))
-          );
-        }
-        if (typeof reloadListener === "function") {
-          return Promise.resolve(reloadListener(target, option));
-        }
-        return Promise.resolve(target.$baseReload(option));
-      } catch (error) {
-        return Promise.reject(error);
-      }
-    },
-    async reloadSavedFormData(option = {}) {
-      let updateParam = option.updateParam || {};
-      let nextDataId = updateParam.dataId ?? this.dataId;
-      let nextFormCode = updateParam.formCode;
-      if (nextDataId === undefined || nextDataId === null || nextDataId === "") {
-        throw new Error("缺少保存后的数据 ID，无法重新加载表单。");
-      }
-      let response = await this.loadFormData({
-        dataId: nextDataId,
-        replace: true,
-      });
-      if (!response || response.type !== "success") {
-        throw new Error(response?.content || "保存后的表单数据重新加载失败。");
-      }
-      if (nextDataId !== undefined && nextDataId !== null) {
-        this.$emit("update:dataId", nextDataId);
-      }
-      if (nextFormCode) {
-        this.$emit("update:formCode", nextFormCode);
-      }
-      await new Promise((resolve) => this.$nextTick(resolve));
-      return response;
-    },
+      try {
+        let reloadListener = target?.$listeners?.reload;
+        if (Array.isArray(reloadListener)) {
+          return Promise.all(
+            reloadListener.map((listener) => listener(target, option))
+          );
+        }
+        if (typeof reloadListener === "function") {
+          return Promise.resolve(reloadListener(target, option));
+        }
+        return Promise.resolve(target.$baseReload(option));
+      } catch (error) {
+        return Promise.reject(error);
+      }
+    },
+    async reloadSavedFormData(option = {}) {
+      let updateParam = option.updateParam || {};
+      let nextDataId = updateParam.dataId ?? this.dataId;
+      let nextFormCode = updateParam.formCode;
+      if (nextDataId === undefined || nextDataId === null || nextDataId === "") {
+        throw new Error("缺少保存后的数据 ID，无法重新加载表单。");
+      }
+      let response = await this.loadFormData({
+        dataId: nextDataId,
+        replace: true,
+      });
+      if (!response || response.type !== "success") {
+        throw new Error(response?.content || "保存后的表单数据重新加载失败。");
+      }
+      if (nextDataId !== undefined && nextDataId !== null) {
+        this.$emit("update:dataId", nextDataId);
+      }
+      if (nextFormCode) {
+        this.$emit("update:formCode", nextFormCode);
+      }
+      await new Promise((resolve) => this.$nextTick(resolve));
+      return response;
+    },
     saveForm(callback) {
       this.validateForm((valid) => {
         if (!valid) return;
@@ -4894,69 +4899,69 @@ modules = {
     getFormRef() {
       return this;
     },
-    isObject(value) {
-      return Object.prototype.toString.call(value) === "[object Object]";
-    },
-    handleCopyTreeData(value, widget) {
-      if (!Array.isArray(value) || !widget) return;
-
-      let widgetName = widget.options.name;
-      let gridRef = this.getWidgetRef(widgetName);
-      let $grid = gridRef?.getGridTable?.();
-      if (!$grid) {
-        throw new Error(`[${widgetName}]树表尚未初始化`);
-      }
-      if (
-        $grid.treeConfig?.lazy
-        && this.getTreeUnloadedRows($grid, $grid.treeConfig).length
-      ) {
-        throw new Error(
-          `[${widgetName}]存在尚未加载的树节点，无法复制不完整子树`
-        );
-      }
-
-      // prepareTreeTablesForCopy 会在深拷贝及 copyDataHandle 之前完成 loadAll，
-      // 此处只消费准备好的副本；不能再混入 VXE 活对象，否则会覆盖脚本修改并产生同键冲突。
-      let sourceRows = value;
-      if (!sourceRows.length) return;
-
-      let treeContext = this.getTreeTableUtilContext(
-        gridRef,
-        $grid,
-        sourceRows
-      );
-      let copiedRows = copyTreeData(sourceRows, {
-        ...treeContext,
-        temporaryKeyRegistry: new Set(
-          treeContext.temporaryKeyRegistry
-        ),
-        targetRows: [],
-      });
-      let fields = treeContext.fields;
-      let ignoredFields = new Set([
-        fields.rowField,
-        fields.parentField,
-        fields.childrenField,
-        fields.mapChildrenField,
-        fields.hasChildField,
-        treeContext.identityConfig.physicalIdField,
-        "_X_ROW_KEY",
-        "_X_ROW_CHILD",
-        "_X_TREE_TEMP_KEY",
-        "f_wbs",
-      ]);
-
-      copiedRows.forEach((row) => {
-        this.handleCopyDefaultData(row);
-        Object.keys(row).forEach((key) => {
-          if (ignoredFields.has(key) || !Array.isArray(row[key])) return;
-          this.handleCopyData(row[key], key);
-        });
-      });
-
-      value.splice(0, value.length, ...copiedRows);
-    },
-    handleCopyDefaultData(data) {
+    isObject(value) {
+      return Object.prototype.toString.call(value) === "[object Object]";
+    },
+    handleCopyTreeData(value, widget) {
+      if (!Array.isArray(value) || !widget) return;
+
+      let widgetName = widget.options.name;
+      let gridRef = this.getWidgetRef(widgetName);
+      let $grid = gridRef?.getGridTable?.();
+      if (!$grid) {
+        throw new Error(`[${widgetName}]树表尚未初始化`);
+      }
+      if (
+        $grid.treeConfig?.lazy
+        && this.getTreeUnloadedRows($grid, $grid.treeConfig).length
+      ) {
+        throw new Error(
+          `[${widgetName}]存在尚未加载的树节点，无法复制不完整子树`
+        );
+      }
+
+      // prepareTreeTablesForCopy 会在深拷贝及 copyDataHandle 之前完成 loadAll，
+      // 此处只消费准备好的副本；不能再混入 VXE 活对象，否则会覆盖脚本修改并产生同键冲突。
+      let sourceRows = value;
+      if (!sourceRows.length) return;
+
+      let treeContext = this.getTreeTableUtilContext(
+        gridRef,
+        $grid,
+        sourceRows
+      );
+      let copiedRows = copyTreeData(sourceRows, {
+        ...treeContext,
+        temporaryKeyRegistry: new Set(
+          treeContext.temporaryKeyRegistry
+        ),
+        targetRows: [],
+      });
+      let fields = treeContext.fields;
+      let ignoredFields = new Set([
+        fields.rowField,
+        fields.parentField,
+        fields.childrenField,
+        fields.mapChildrenField,
+        fields.hasChildField,
+        treeContext.identityConfig.physicalIdField,
+        "_X_ROW_KEY",
+        "_X_ROW_CHILD",
+        "_X_TREE_TEMP_KEY",
+        "f_wbs",
+      ]);
+
+      copiedRows.forEach((row) => {
+        this.handleCopyDefaultData(row);
+        Object.keys(row).forEach((key) => {
+          if (ignoredFields.has(key) || !Array.isArray(row[key])) return;
+          this.handleCopyData(row[key], key);
+        });
+      });
+
+      value.splice(0, value.length, ...copiedRows);
+    },
+    handleCopyDefaultData(data) {
       data.create_by = null;
       data._create_by = null;
       data.create_date = null;
@@ -5011,22 +5016,22 @@ modules = {
         });
       }
     },
-    async openCopyEditTab(copyData) {
-      try {
-        await this.prepareTreeTablesForCopy();
-        let formData = this.$baseLodash.cloneDeep(
-          copyData || this.formDataModel
-        );
-        if (formData) {
-          this.handleCopyData(formData);
-        }
-        this.$emit("openCopyEditTab", formData);
-        return true;
-      } catch (error) {
-        this.$message.error(error?.message || "树表数据尚未准备完成");
-        return false;
-      }
-    },
+    async openCopyEditTab(copyData) {
+      try {
+        await this.prepareTreeTablesForCopy();
+        let formData = this.$baseLodash.cloneDeep(
+          copyData || this.formDataModel
+        );
+        if (formData) {
+          this.handleCopyData(formData);
+        }
+        this.$emit("openCopyEditTab", formData);
+        return true;
+      } catch (error) {
+        this.$message.error(error?.message || "树表数据尚未准备完成");
+        return false;
+      }
+    },
 
     async exportPdf() {
       // statusEl.style.display = 'block';

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

@@ -274,15 +274,12 @@ modules = {
                 = typeof formRef.reloadSavedFormData === "function"
                 ? formRef.reloadSavedFormData
                 : formRef.reloadForm;
+              // 保存成功后一律让宿主整页重挂载(toggle v-if):新增/编辑都需要出流程信息、
+              // 切编辑模板、按新状态重算显隐与只读——这些就地取数(reloadSavedFormData)做不到。
+              // 唯一例外是「保存并提交」路径(skipHostReloadAfterSave=true),
+              // 它的刷新交给流程结束后的 onWfStartSuccess / onWfStartAbort,避免刷两次。
               let runHostReload = async () => {
-                let currentFormCode = formRef.reportTemplate?.formCode;
-                if (
-                  skipHostReloadAfterSave
-                  || !editFormCode
-                  || editFormCode === currentFormCode
-                ) {
-                  return;
-                }
+                if (skipHostReloadAfterSave) return;
                 await formRef.reloadForm({ updateParam });
               };
               let callbacksStarted = false;