@gct-paas/excel 0.1.39-beta.1 → 0.1.39-beta.10

package/dist/{dynamic-table-action-Cm8HO12b.js → dynamic-table-action-BQfJFJ4j.js}

@@ -1,10 +1,10 @@
 import { reactive, toRaw, computed, watch, onScopeDispose, inject, h, shallowReactive, markRaw, ref, nextTick, toRef, provide, defineComponent, openBlock, createElementBlock, mergeProps, unref, createElementVNode, normalizeClass, renderSlot, createCommentVNode, createVNode, toDisplayString, Fragment, renderList, onUnmounted, isVNode, onMounted, onBeforeMount, resolveComponent, createBlock, withCtx, createTextVNode } from "vue";
-import { ai as CellWidgetViewState, F as FIELD_TYPE, b8 as RenderModeEnum, Y as FormTypeEnum, bE as BpmnNodeTypeEnum, cr as getFieldPlaceholder, bU as MobileFillTypeEnum, C as ComponentTypeEnum, $ as PlatformEnum, cs as isReferenceOptionActive, E as api, bu as uuid2, c2 as calcUtils, bj as findRuntimeTableRow, c4 as ensureTableRowKeys, b$ as bindRuntimeTableColumns, bi as getRowId, ct as FRONT_ROW_KEY, bw as isAttachFieldActive, cu as filterRulesByTrigger, cv as isEmptyValue$1, c3 as ensureFrontRowKey, b0 as getParseRuleInfo, aF as transformUtils, aY as materialCheck, aZ as getLotLockedReason, a_ as validateReinspectionDate, bn as FormulaRuleFieldKeyEnum, f as SubTableType, b1 as getParseRuleValue, cw as buildError, H as CreateType, bl as findRuntimeParentRow, aI as Dependency_ENUM, aH as ASSIGNMENTSTRATEGY_ENUM, bJ as commonUtils, aM as DeviceLink, a8 as _export_sfc, cd as getRenderedRuntimeTableCell, y as CellType, cm as relocateDeletedRowsToEnd, cx as resetTableRowIdentity, J as useModal, cy as q, cz as QUICK_FILL_ALLOWED_FIELDS, cA as groupFixedTableRows, cB as processQuickFillRows, cC as getIsGroupEmpty } from "./dynamic-table-action.vue_vue_type_style_index_0_scoped_53d7e66c_lang-CYRNF_U3.js";
+import { ai as CellWidgetViewState, F as FIELD_TYPE, b8 as RenderModeEnum, Y as FormTypeEnum, bE as BpmnNodeTypeEnum, cv as getFieldPlaceholder, bV as MobileFillTypeEnum, C as ComponentTypeEnum, $ as PlatformEnum, cw as isReferenceOptionActive, E as api, bu as uuid2, c3 as calcUtils, bj as findRuntimeTableRow, c7 as ensureTableRowKeys, c0 as bindRuntimeTableColumns, bi as getRowId, cx as FRONT_ROW_KEY, cm as isTableRowKeyMatch, bw as isAttachFieldActive, cy as filterRulesByTrigger, cz as isEmptyValue$1, c4 as decodeTableCellRowKey, c6 as ensureFrontRowKey, b0 as getParseRuleInfo, aF as transformUtils, aY as materialCheck, aZ as getLotLockedReason, a_ as validateReinspectionDate, bn as FormulaRuleFieldKeyEnum, f as SubTableType, b1 as getParseRuleValue, cA as buildError, H as CreateType, bl as findRuntimeParentRow, aI as Dependency_ENUM, aH as ASSIGNMENTSTRATEGY_ENUM, bJ as commonUtils, aM as DeviceLink, a8 as _export_sfc, cg as getRenderedRuntimeTableCell, y as CellType, cq as relocateDeletedRowsToEnd, cB as resetTableRowIdentity, J as useModal, cC as q, cD as QUICK_FILL_ALLOWED_FIELDS, cE as groupFixedTableRows, cF as processQuickFillRows, cG as getIsGroupEmpty } from "./dynamic-table-action.vue_vue_type_style_index_0_scoped_53d7e66c_lang-DZRtpBe8.js";
 import { cloneDeep, isEmpty, has, pickBy, isNil, mergeWith, omit, last, pick, merge } from "lodash-es";
 import dayjs from "dayjs";
 import { a as useNamespace, I as Icon } from "./AntdIcon-DCIaV352.js";
 import { Modal, message } from "ant-design-vue";
-import { u as useFormModel } from "./mb-render-BZXw-tG7.js";
+import { u as useFormModel } from "./mb-render-DybPk-KF.js";
 var MaterialConsumptionPatternEnum = /* @__PURE__ */ ((MaterialConsumptionPatternEnum2) => {
   MaterialConsumptionPatternEnum2["RECORD"] = "record";
   MaterialConsumptionPatternEnum2["BOM"] = "bom";
@@ -942,6 +942,8 @@ function convertV1Runtime(runtime) {
   return { schemaVersion: 1, formConfig, sheets: [sheet] };
 }
 const MULTI_SHEET_SCHEMA_VERSION = 2;
+const MAX_RUNTIME_SHEETS = 100;
+const MAX_RUNTIME_SHEET_TITLE_LENGTH = 255;
 function assertObject(value, message2) {
   if (!value || typeof value !== "object" || Array.isArray(value)) throw new Error(message2);
 }
@@ -1007,7 +1009,9 @@ function normalizeRuntime(runtime) {
   if (!Array.isArray(runtime.sheets) || runtime.sheets.length === 0) {
     throw new Error("多 Sheet 运行时至少需要一个工作表");
   }
-  if (runtime.sheets.length > 10) throw new Error("每份表单最多支持 10 个工作表");
+  if (runtime.sheets.length > MAX_RUNTIME_SHEETS) {
+    throw new Error(`每份表单最多支持 ${MAX_RUNTIME_SHEETS} 个工作表`);
+  }
   const formConfig = runtime.formConfig ?? {};
   assertObject(formConfig, "多 Sheet 运行时的 formConfig 格式无效");
   const ids = /* @__PURE__ */ new Set();
@@ -1018,7 +1022,9 @@ function normalizeRuntime(runtime) {
     const sheetId = String(rawSheet.sheetId ?? "").trim();
     const title = String(rawSheet.title ?? "").trim();
     if (!sheetId) throw new Error(`第 ${index + 1} 个工作表缺少 sheetId`);
-    if (!title || title.length > 20) throw new Error(`工作表名称必须为 1 到 20 个字符：${title}`);
+    if (!title || title.length > MAX_RUNTIME_SHEET_TITLE_LENGTH) {
+      throw new Error(`工作表名称必须为 1 到 ${MAX_RUNTIME_SHEET_TITLE_LENGTH} 个字符：${title}`);
+    }
     if (ids.has(sheetId)) throw new Error(`重复的 sheetId：${sheetId}`);
     if (titles.has(title)) throw new Error(`重复的工作表名称：${title}`);
     ids.add(sheetId);
@@ -1589,6 +1595,14 @@ class RuntimeFormStateStore {
     const paths = Object.keys(values);
     this.mutate(paths, source, () => this.assignValues(this.reactiveState, values));
   }
+  /**
+   * 保存后只回填后端身份元数据，不能用仅含 id_/front_row_key_ 的数组覆盖当前业务行。
+   * 二维内置复合键可通过原始子行键匹配保存前的本地行。
+   */
+  patchSavedMetadata(values) {
+    const paths = Object.keys(values);
+    this.mutate(paths, "restore", () => this.mergeSavedMetadata(this.reactiveState, values));
+  }
   /**
    * 用新对象整体替换实例数据，删除旧对象中多余的顶层字段。
    * 草稿/接口恢复后会清空用户修改标记；restore 来源同时恢复为非脏状态。
@@ -1700,6 +1714,46 @@ class RuntimeFormStateStore {
       target[key] = incoming;
     });
   }
+  mergeSavedMetadata(target, incoming, path = "") {
+    if (Array.isArray(incoming)) {
+      const isTableRows = this.subtableFields.has(path) || path.endsWith("._2DTABLE_");
+      if (!isTableRows || !Array.isArray(target)) return incoming;
+      incoming.forEach((savedRow) => {
+        const rowKey = savedRow?.[FRONT_ROW_KEY];
+        const savedId = savedRow?.id_;
+        let currentRow = target.find((row) => {
+          if (!row || typeof row !== "object") return false;
+          if (rowKey != null && isTableRowKeyMatch(rowKey, row[FRONT_ROW_KEY])) return true;
+          return savedId != null && row.id_ != null && String(row.id_) === String(savedId);
+        });
+        let matchedByGroup = false;
+        if (!currentRow && Array.isArray(savedRow?._2DTABLE_) && savedRow.group_ != null && String(savedRow.group_).trim() !== "") {
+          const matchingGroups = target.filter(
+            (row) => Array.isArray(row?._2DTABLE_) && row.group_ != null && String(row.group_) === String(savedRow.group_)
+          );
+          if (matchingGroups.length === 1) {
+            currentRow = matchingGroups[0];
+            matchedByGroup = true;
+          }
+        }
+        if (currentRow) {
+          this.mergeSavedMetadata(
+            currentRow,
+            matchedByGroup ? { ...savedRow, [FRONT_ROW_KEY]: currentRow[FRONT_ROW_KEY] } : savedRow,
+            path
+          );
+        }
+      });
+      return target;
+    }
+    if (!incoming || typeof incoming !== "object") return incoming;
+    if (!target || typeof target !== "object" || Array.isArray(target)) return incoming;
+    Object.entries(incoming).forEach(([key, value]) => {
+      const childPath = path ? `${path}.${key}` : key;
+      target[key] = this.mergeSavedMetadata(target[key], value, childPath);
+    });
+    return target;
+  }
   /**
    * 所有写入口共用的表格身份边界：整表恢复/回填、数组插入、二维子行替换均在通知前补齐。
    * 只处理业务索引声明的表格及 _2DTABLE_，不把多选值、上传文件等数组当作表格。
@@ -1784,6 +1838,7 @@ class RuntimeAsyncTaskCoordinator {
       fieldIdentity: options.fieldIdentity,
       sheetId: options.sheetId,
       required: options.required !== false,
+      blockOnFailure: options.blockOnFailure !== false,
       status: "pending",
       sequence,
       promise: task,
@@ -1827,7 +1882,7 @@ class RuntimeAsyncTaskCoordinator {
    * 等待全部 required 任务达到稳定状态。
    *
    * 一轮任务完成后的字段回填可能触发新的公式或远程任务，因此这里循环读取任务表，直到
-   * 没有新的 pending required 任务。稳定后统一检查失败项，使提交事务得到明确失败原因。
+   * 没有新的 pending required 任务。稳定后只检查需要阻断提交的失败项。
    */
   async waitForRequired(keyPrefix) {
     const matches = (task) => task.required && (!keyPrefix || task.key.startsWith(keyPrefix));
@@ -1839,7 +1894,7 @@ class RuntimeAsyncTaskCoordinator {
       await Promise.allSettled(pending.map((task) => task.promise));
     }
     const failed = Array.from(this.tasks.values()).filter(
-      (task) => matches(task) && task.status === "rejected"
+      (task) => matches(task) && task.blockOnFailure && task.status === "rejected"
     );
     if (failed.length) {
       const details = failed.map((task) => {
@@ -3185,11 +3240,12 @@ class RuntimeValidationService {
     this.pendingLive = this.pendingLive === "blur" ? "blur" : trigger;
     if (this.liveTimer) clearTimeout(this.liveTimer);
     this.liveTimer = void 0;
-    if (immediate) void this.flushLive().catch((error) => console.error("字段校验失败", error));
+    if (immediate)
+      void this.flushLive().catch((error) => this.logBackgroundError("字段校验失败", error));
     else
       this.liveTimer = setTimeout(() => {
         this.liveTimer = void 0;
-        void this.flushLive().catch((error) => console.error("字段校验失败", error));
+        void this.flushLive().catch((error) => this.logBackgroundError("字段校验失败", error));
       }, 300);
   }
   async flushLive() {
@@ -3211,11 +3267,17 @@ class RuntimeValidationService {
     this.displayTimer = void 0;
     const run = () => {
       this.displayTimer = void 0;
-      void this.validate("display").catch((error) => console.error("字段展示校验失败", error));
+      void this.validate("display").catch(
+        (error) => this.logBackgroundError("字段展示校验失败", error)
+      );
     };
     if (immediate) run();
     else this.displayTimer = setTimeout(run, 320);
   }
+  logBackgroundError(label, error) {
+    if (error instanceof Error && error.message.startsWith("以下异步任务执行失败：")) return;
+    console.error(label, error);
+  }
   pruneComments() {
     if (!this.binding || this.disposed) return;
     this.binding.applyComments(
@@ -3813,8 +3875,10 @@ const SNAPSHOT_SKIP = /* @__PURE__ */ new Set([
 ]);
 function rowIdentityKeys(row) {
   if (!row) return [];
+  const frontRowKey = row[FRONT_ROW_KEY] != null && String(row[FRONT_ROW_KEY]).trim() !== "" ? String(row[FRONT_ROW_KEY]) : void 0;
   return [
-    row[FRONT_ROW_KEY] != null && String(row[FRONT_ROW_KEY]).trim() !== "" ? String(row[FRONT_ROW_KEY]) : void 0,
+    frontRowKey,
+    decodeTableCellRowKey(frontRowKey)?.cellRowKey,
     row.id_ != null && row.id_ !== "" ? String(row.id_) : void 0
   ].filter(Boolean);
 }
@@ -4548,7 +4612,16 @@ class BomEntriesValidator {
       memberIndexes.push(idx);
       if (byLot && !row.material_no_) emptyLotIndexes.push(idx);
     });
-    const needInsert = !this.groupExistsInTable(arr, target);
+    const targetExists = this.groupExistsInTable(arr, target);
+    if (!targetExists) {
+      const index = arr.findIndex((row2) => !row2.deleted_);
+      const row = arr[index];
+      const canReuse = row && !row.product_id_ && !row.bom_entry_id_ && !row.is_confirmed_ && arr.every((item, idx) => item.deleted_ || idx === index);
+      if (canReuse) {
+        emptyProductIndexes.push(index);
+      }
+    }
+    const needInsert = !targetExists && emptyProductIndexes.length === 0;
     const last2 = memberIndexes[memberIndexes.length - 1];
     let groupInsertIndex = -1;
     if (needInsert) {
@@ -8690,7 +8763,7 @@ const MaterialConsumeTable = /* @__PURE__ */ defineComponent({
     const {
       showDisplayStatus,
       dataRelationShip
-    } = useWidgetStaticAttrs(props);
+    } = useWidgetStaticAttrs(props.widget);
     const sheetId = () => fields.value?.findWidgetById(props.widget.id)?.sheetId;
     const formModelController = useFormModel().injectController();
     const tableController = props.tableController;
@@ -10223,109 +10296,111 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
 });
 const DynamicTableAction = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-53d7e66c"]]);
 export {
-  closeValidatorPopovers as $,
-  useFieldPresentation as A,
+  RuntimeSheetService as $,
+  useStyles as A,
   BorderTD as B,
-  useRuntimeEditorFlusher as C,
+  useDependency as C,
   DEFAULT_BOOLEAN_FIELD_WIDTH as D,
   EMPTY_PRODUCT_VERSION_ID as E,
-  createRuntimeInstanceContext as F,
-  RuntimeInstanceRegistry as G,
-  RequiredQtyCalcRule as H,
-  registerFormulaFuncs as I,
-  DocumentPaper as J,
-  DynamicTableAction as K,
-  getRuntimeDataFieldId as L,
-  MULTI_SHEET_SCHEMA_VERSION as M,
+  useFieldPresentation as F,
+  useRuntimeEditorFlusher as G,
+  createRuntimeInstanceContext as H,
+  RuntimeInstanceRegistry as I,
+  RequiredQtyCalcRule as J,
+  registerFormulaFuncs as K,
+  DocumentPaper as L,
+  MAX_RUNTIME_SHEETS as M,
   NCB_PROVIDE as N,
-  buildRuntimeFieldPath as O,
-  resolveRuntimeFieldProps as P,
-  resolveRuntimeFieldState as Q,
+  DynamicTableAction as O,
+  getRuntimeDataFieldId as P,
+  buildRuntimeFieldPath as Q,
   RuntimeFormStateStore as R,
   ScanParamType as S,
-  getRuntimeDependencyOutputKey as T,
-  isRowAddedInCurrentFormChange as U,
-  MaterialConsumeTableController as V,
-  setFormulaParamsConfig as W,
-  normalizeRuntime as X,
-  RuntimeSheetService as Y,
-  validateObjectBomQtyOnSubmit as Z,
+  resolveRuntimeFieldProps as T,
+  resolveRuntimeFieldState as U,
+  getRuntimeDependencyOutputKey as V,
+  isRowAddedInCurrentFormChange as W,
+  MaterialConsumeTableController as X,
+  setFormulaParamsConfig as Y,
+  normalizeRuntime as Z,
   _sfc_main$5 as _,
-  normalizeHistoricalBusinessRow as a,
-  enrichFormChangeRowDetails as a0,
-  useMaterialBalance as a1,
-  collectFormChangeFieldLocations as a2,
-  nextFormChangeRowViewHistoryId as a3,
-  DeviceConnector as a4,
-  DocumentLoading as a5,
-  DynamicQuickFillModal as a6,
-  FixedQuickFillModal as a7,
-  FormTmplConfigController as a8,
-  LEGACY_RUNTIME_FORM_CONFIG_KEYS as a9,
-  resolveFormChangeRowUi as aA,
-  resolveRowFormChangeMark as aB,
-  setSelectMobileTdId as aC,
-  stripLegacyFormConfigFromPaper as aD,
-  SubTableActionMenuTypeEnum as aE,
-  getMenuByAction as aF,
-  SubTableActionEnum as aG,
-  resolveScanFillData as aH,
-  getInsertSubMenu as aI,
-  resolveScanAdjustType as aJ,
-  resolveScanQty as aK,
-  toDateOnly as aL,
-  getCopySubMenu as aM,
-  resolveScanParsedValue as aN,
-  isProductBatchEmptyRow as aO,
-  LEGACY_RUNTIME_SHEET_ID as aa,
-  LEGACY_RUNTIME_SHEET_TITLE as ab,
-  MCDataUtil as ac,
-  OCR_MODEL_PRECISION_ENUM_KEY as ad,
-  RuntimeAsyncTaskCoordinator as ae,
-  RuntimeDependencyService as af,
-  RuntimeFieldRegistry as ag,
-  RuntimeInstanceEventBus as ah,
-  RuntimePersistenceCoordinator as ai,
-  RuntimeValidationService as aj,
-  SubTableCore as ak,
-  buildFormChangeDisplayRows as al,
-  convertV1Runtime as am,
-  detailsHaveFormChangeRowOps as an,
-  extractFormChangeRowDetails as ao,
-  getFormChangeRowKey as ap,
-  getFormChangeRowOp as aq,
-  getSubTableQuickFillInfo as ar,
-  isAnnLocationSelected as as,
-  isBlank as at,
-  isFormChangeGhostRow as au,
-  normalizeHistoricalFieldConfig as av,
-  pickObjectFieldKeys as aw,
-  recordSubtableRowAdd as ax,
-  recordSubtableRowDelete as ay,
-  resolveAnnotationFieldLocation as az,
-  DeviceLinkTmplUtil as b,
+  MAX_RUNTIME_SHEET_TITLE_LENGTH as a,
+  validateObjectBomQtyOnSubmit as a0,
+  closeValidatorPopovers as a1,
+  enrichFormChangeRowDetails as a2,
+  useMaterialBalance as a3,
+  collectFormChangeFieldLocations as a4,
+  nextFormChangeRowViewHistoryId as a5,
+  DeviceConnector as a6,
+  DocumentLoading as a7,
+  DynamicQuickFillModal as a8,
+  FixedQuickFillModal as a9,
+  recordSubtableRowDelete as aA,
+  resolveAnnotationFieldLocation as aB,
+  resolveFormChangeRowUi as aC,
+  resolveRowFormChangeMark as aD,
+  setSelectMobileTdId as aE,
+  stripLegacyFormConfigFromPaper as aF,
+  SubTableActionMenuTypeEnum as aG,
+  getMenuByAction as aH,
+  SubTableActionEnum as aI,
+  resolveScanFillData as aJ,
+  getInsertSubMenu as aK,
+  resolveScanAdjustType as aL,
+  resolveScanQty as aM,
+  toDateOnly as aN,
+  getCopySubMenu as aO,
+  resolveScanParsedValue as aP,
+  isProductBatchEmptyRow as aQ,
+  FormTmplConfigController as aa,
+  LEGACY_RUNTIME_FORM_CONFIG_KEYS as ab,
+  LEGACY_RUNTIME_SHEET_ID as ac,
+  LEGACY_RUNTIME_SHEET_TITLE as ad,
+  MCDataUtil as ae,
+  OCR_MODEL_PRECISION_ENUM_KEY as af,
+  RuntimeAsyncTaskCoordinator as ag,
+  RuntimeDependencyService as ah,
+  RuntimeFieldRegistry as ai,
+  RuntimeInstanceEventBus as aj,
+  RuntimePersistenceCoordinator as ak,
+  RuntimeValidationService as al,
+  SubTableCore as am,
+  buildFormChangeDisplayRows as an,
+  convertV1Runtime as ao,
+  detailsHaveFormChangeRowOps as ap,
+  extractFormChangeRowDetails as aq,
+  getFormChangeRowKey as ar,
+  getFormChangeRowOp as as,
+  getSubTableQuickFillInfo as at,
+  isAnnLocationSelected as au,
+  isBlank as av,
+  isFormChangeGhostRow as aw,
+  normalizeHistoricalFieldConfig as ax,
+  pickObjectFieldKeys as ay,
+  recordSubtableRowAdd as az,
+  MULTI_SHEET_SCHEMA_VERSION as b,
   createRuntimeDocumentV2 as c,
-  normalizeAIOcrTmpl as d,
-  useWidgetStaticAttrs as e,
-  useRuntimeInstanceServices as f,
+  normalizeHistoricalBusinessRow as d,
+  DeviceLinkTmplUtil as e,
+  normalizeAIOcrTmpl as f,
   getBusinessFieldKey as g,
-  setSelectAnnotationId as h,
-  useRuntimeRowState as i,
-  getObjectBomMaterialLotQuery as j,
-  buildObjectLotExtraQuery as k,
-  MaterialConsumptionPatternEnum as l,
-  resolveObjectBomEntry as m,
+  useWidgetStaticAttrs as h,
+  useRuntimeInstanceServices as i,
+  setSelectAnnotationId as j,
+  useRuntimeRowState as k,
+  getObjectBomMaterialLotQuery as l,
+  buildObjectLotExtraQuery as m,
   normalizeFieldWidth as n,
-  runWithFillProduct as o,
-  useNocodeFormWidget as p,
-  applyConsumeObjectTraceChange as q,
+  MaterialConsumptionPatternEnum as o,
+  resolveObjectBomEntry as p,
+  runWithFillProduct as q,
   resolveObjectFieldKeys as r,
   setSelectValidatorId as s,
-  getObjectBomProductQuery as t,
+  useNocodeFormWidget as t,
   useFormTmplConfig as u,
   validateObjectBomForScan as v,
-  normalizeHistoricalAutofillRow as w,
-  parseRuntimeFieldPath as x,
-  useStyles as y,
-  useDependency as z
+  applyConsumeObjectTraceChange as w,
+  getObjectBomProductQuery as x,
+  normalizeHistoricalAutofillRow as y,
+  parseRuntimeFieldPath as z
 };