@gct-paas/excel 0.1.17 → 0.1.18

package/dist/{document-sub-table-action-rz6gyez5.js → document-sub-table-action-Cy6Rd8OS.js}

@@ -1,7 +1,7 @@
-import { computed, markRaw, ref, onUnmounted, watch, toRef, reactive, inject, provide, defineComponent, openBlock, createElementBlock, mergeProps, unref, createElementVNode, normalizeClass, renderSlot, createVNode, toDisplayString, createCommentVNode, onMounted, onBeforeMount, resolveComponent, createBlock, withCtx, Fragment, renderList, createTextVNode, toRaw } from "vue";
-import { cloneDeep, has, merge, defaults, pickBy, isNil, mergeWith, debounce, omit, last, pick } from "lodash-es";
-import { e as ComponentTypeEnum, F as FIELD_TYPE, i as api, aM as ButtonTypeEnum, t as FormTypeEnum, aH as safeParseArray, aq as RenderModeEnum, aJ as mergeByMultiKey, aL as BpmnSignatureTypeEnum, aI as BpmnNodeTypeEnum, b7 as stockCheck, ao as getParseRuleInfo, ap as getParseRuleValue, b8 as materialCheck, ay as calcFillData, at as FormulaRuleFieldKeyEnum, b9 as judgeUnique, g as SubTableType, ba as getRowId, ae as useCurrentPageFormState, R as Dependency_ENUM, Q as ASSIGNMENTSTRATEGY_ENUM, aF as uuid2, a3 as DeviceLink, E as useNamespace, _ as _export_sfc, al as NCB_PROVIDE, ab as useWidgetStaticAttrs, b6 as setSelectMobileTdId, h as CellType, aZ as deleteSubtableRow, aA as transformUtils, D as useModal, bb as q, aK as getSubTableQuickFillInfo } from "./document-quick-fillin.vue_vue_type_style_index_0_scoped_a18386ab_lang-Bbu6cwRC.js";
-import { u as useFormModel, w as watchDebounced } from "./mb-render-Bejyn-ep.js";
+import { computed, watch, toRaw, onUnmounted, markRaw, ref, toRef, reactive, inject, provide, defineComponent, openBlock, createElementBlock, mergeProps, unref, createElementVNode, normalizeClass, renderSlot, createVNode, toDisplayString, isVNode, createCommentVNode, onMounted, onBeforeMount, resolveComponent, createBlock, withCtx, Fragment, renderList, createTextVNode } from "vue";
+import { cloneDeep, has, isNil, merge, defaults, pickBy, mergeWith, omit, last, pick } from "lodash-es";
+import { e as ComponentTypeEnum, F as FIELD_TYPE, i as api, aU as ButtonTypeEnum, t as FormTypeEnum, aO as safeParseArray, aq as RenderModeEnum, aQ as mergeByMultiKey, aT as BpmnSignatureTypeEnum, aP as BpmnNodeTypeEnum, ab as useWidgetStaticAttrs, by as assembleRules, bz as deleteFormRule, bA as setFormRule, aF as requestDisplayValidation, bB as isReferenceOptionActive, bC as validateAllFields, bD as runValidation, bE as stockCheck, am as getParseRuleInfo, an as getParseRuleValue, bF as materialCheck, ax as calcFillData, as as FormulaRuleFieldKeyEnum, bG as judgeUnique, g as SubTableType, ao as useCurrentPageFormState, R as Dependency_ENUM, Q as ASSIGNMENTSTRATEGY_ENUM, aM as uuid2, a3 as DeviceLink, E as useNamespace, _ as _export_sfc, aj as NCB_PROVIDE, b6 as buildFormChangeDisplayRows, aR as getRowId, bw as resolveRowFormChangeMark, bv as resolveFormChangeRowUi, bk as isAnnLocationSelected, bx as setSelectMobileTdId, bl as isFormChangeGhostRow, h as CellType, ad as setSelectAnnotationId, br as recordSubtableRowDelete, b9 as deleteSubtableRow, bs as relocateDeletedRowsToEnd, bH as FRONT_ROW_KEY, az as transformUtils, bj as insertSubtableRows, bq as recordSubtableRowAdd, D as useModal, bI as q, aS as getSubTableQuickFillInfo } from "./document-quick-fillin.vue_vue_type_style_index_0_scoped_a18386ab_lang-DKTGEH4Q.js";
+import { u as useFormModel, w as watchDebounced } from "./mb-render-Cs7LUxzk.js";
 import dayjs from "dayjs";
 var MaterialConsumptionPatternEnum = /* @__PURE__ */ ((MaterialConsumptionPatternEnum2) => {
   MaterialConsumptionPatternEnum2["RECORD"] = "record";
@@ -625,6 +625,254 @@ const useOnlineFormTransformField2Component = (fieldType) => {
     }
   }[fieldType];
 };
+const constantRequiredStyles = {
+  "--required-border-color": "rgb(255, 31, 31, 0.36)",
+  "--required-border-hover-color": "rgb(255, 31, 31, 0.86)",
+  "--required-background-color": "rgb(255, 31, 31, 0.04)"
+};
+const resetRequiredStyles = {
+  "--required-border-color": "#e9e9e9",
+  "--required-border-hover-color": "var(--ant-primary-color)",
+  "--required-background-color": "transparent"
+};
+const reliableVerticalTextStyles = {
+  "writing-mode": "horizontal-tb",
+  display: "inline-block",
+  width: "1em",
+  "line-height": "1.2",
+  "white-space": "normal",
+  "word-break": "break-all",
+  "letter-spacing": "0",
+  "text-align": "center"
+};
+const isVerticalLrText = (style) => {
+  const mode = style?.writingMode ?? style?.["writing-mode"];
+  return mode === "vertical-lr";
+};
+function useValidator(props) {
+  const widget = props.widget;
+  const {
+    showModelName,
+    showFieldName,
+    modelKey,
+    fieldType,
+    targetFieldId,
+    isFieldModel,
+    showRequired,
+    showDisabled,
+    showDisplayStatus,
+    dataRelationShip
+  } = useWidgetStaticAttrs(widget);
+  const sizeStyles = {
+    "--size": `${widget.props.size ?? 12}px`,
+    "--cmp-width": `${widget.props.cmpWidth ?? 0}px`,
+    "--cmp-height": `${widget.props.cmpHeight ?? 0}px`
+  };
+  const skipFormItem = computed(() => {
+    if (widget.component === ComponentTypeEnum.DynValue) {
+      return true;
+    }
+    return !widget.formItem;
+  });
+  const blocked = computed(() => {
+    return !!showDisabled.value || ["readonly-text", "readonly-component"].includes(showDisplayStatus.value);
+  });
+  const rules = computed(() => {
+    if (skipFormItem.value || !targetFieldId) {
+      return [];
+    }
+    return assembleRules({
+      showRequired: !!showRequired.value,
+      fieldType,
+      validatorInfo: {
+        showModelName,
+        showModelKey: modelKey,
+        showFieldName,
+        subFieldKey: widget.props.subFieldKey,
+        targetFieldId
+      },
+      props: widget.props
+    });
+  });
+  const getRules = (ruleList, options) => ruleList.map((item) => ({
+    ...item,
+    ...options
+  }));
+  const resolveSubtableColIndex = () => {
+    if (!isNil(props.childSubTableDataIndex)) {
+      return props.childSubTableDataIndex;
+    }
+    if (targetFieldId === "value_") {
+      if (!isNil(props.realColIndex)) return props.realColIndex;
+      if (!isNil(props.realRowIndex)) return 0;
+    }
+    return void 0;
+  };
+  const resolveAttachMeta = () => {
+    const belongFieldId = props.referenceInfo?.belongFieldId;
+    const optionValue = props.referenceInfo?.optionValue;
+    if (!belongFieldId || isNil(optionValue)) return null;
+    return {
+      belongFieldId,
+      optionValue,
+      multiple: props.referenceInfo?.multiple,
+      subtableFieldId: props.subtableFieldId,
+      realRowIndex: props.realRowIndex,
+      childSubTableDataIndex: resolveSubtableColIndex()
+    };
+  };
+  const resolveRuleEntry = () => {
+    const attach = resolveAttachMeta();
+    const attachOpts = attach ? {
+      _belongFieldId: attach.belongFieldId,
+      _optionValue: attach.optionValue,
+      _multiple: attach.multiple
+    } : {};
+    if (props.subtableFieldId) {
+      if (!isNil(props.realRowIndex)) {
+        const colIdx = resolveSubtableColIndex();
+        if (colIdx !== void 0) {
+          return {
+            key: `${props.subtableFieldId}_${props.realRowIndex}_${targetFieldId}_${colIdx}`,
+            options: {
+              _subtableFieldId: props.subtableFieldId,
+              _realRowIndex: props.realRowIndex,
+              _targetFieldId: targetFieldId,
+              _childSubTableDataIndex: colIdx,
+              ...attachOpts
+            },
+            attach
+          };
+        }
+        return {
+          key: `${props.subtableFieldId}_${props.realRowIndex}_${targetFieldId}`,
+          options: {
+            _subtableFieldId: props.subtableFieldId,
+            _realRowIndex: props.realRowIndex,
+            _targetFieldId: targetFieldId,
+            ...attachOpts
+          },
+          attach
+        };
+      }
+      return null;
+    }
+    return {
+      key: targetFieldId,
+      options: {
+        _targetFieldId: targetFieldId,
+        ...attachOpts
+      },
+      attach
+    };
+  };
+  const instanceId = /* @__PURE__ */ Symbol("validatorInstance");
+  let prevRuleKey;
+  let prevRuleSignature;
+  watch(
+    () => [
+      rules.value,
+      blocked.value,
+      widget.props?.keepExceptionHighlight,
+      props.realRowIndex,
+      props.childSubTableDataIndex,
+      props.referenceInfo?.belongFieldId,
+      props.referenceInfo?.optionValue,
+      props.referenceInfo?.multiple
+    ],
+    () => {
+      if (!targetFieldId || !rules.value) return;
+      const entry = resolveRuleEntry();
+      if (prevRuleKey && (!entry || entry.key !== prevRuleKey)) {
+        deleteFormRule(prevRuleKey, instanceId);
+        prevRuleSignature = void 0;
+      }
+      if (!entry) {
+        prevRuleKey = void 0;
+        return;
+      }
+      if (rules.value.length === 0) {
+        deleteFormRule(entry.key, instanceId);
+        prevRuleKey = void 0;
+        prevRuleSignature = void 0;
+        return;
+      }
+      const signature = JSON.stringify({
+        key: entry.key,
+        blocked: blocked.value,
+        keep: widget.props?.keepExceptionHighlight,
+        attach: entry.attach,
+        // 规则条数 / trigger 变化才重写，避免 deep 无关抖动
+        ruleFingerprints: rules.value.map((r) => [r.trigger, r.message])
+      });
+      if (signature === prevRuleSignature) {
+        return;
+      }
+      setFormRule(
+        entry.key,
+        getRules(toRaw(rules.value), entry.options),
+        {
+          blocked: blocked.value,
+          keepExceptionHighlight: typeof widget.props?.keepExceptionHighlight === "boolean" ? widget.props.keepExceptionHighlight : void 0,
+          attach: entry.attach ?? null
+        },
+        instanceId
+      );
+      prevRuleKey = entry.key;
+      prevRuleSignature = signature;
+      const uniqueId = dataRelationShip?.uniqueId;
+      if (uniqueId) {
+        requestDisplayValidation(uniqueId);
+      }
+    },
+    {
+      immediate: true
+    }
+  );
+  onUnmounted(() => {
+    if (prevRuleKey) {
+      deleteFormRule(prevRuleKey, instanceId);
+      prevRuleKey = void 0;
+    }
+  });
+  const referenceActive = computed(
+    () => isReferenceOptionActive(props.referenceInfo, props.formData)
+  );
+  const widgetStyles = computed(() => {
+    if (widget.component === ComponentTypeEnum.DynValue) return {};
+    const requiredActive = showRequired.value && !blocked.value && referenceActive.value;
+    const isAttachField = !!props.referenceInfo?.belongFieldId;
+    return {
+      ...sizeStyles,
+      ...requiredActive ? constantRequiredStyles : isAttachField ? resetRequiredStyles : {},
+      ...isVerticalLrText(widget.style) ? reliableVerticalTextStyles : {}
+    };
+  });
+  return {
+    widgetStyles,
+    targetFieldId,
+    isFieldModel
+  };
+}
+const validate = async (formData, paper, uniqueId) => {
+  if (uniqueId) {
+    const res2 = await validateAllFields(uniqueId);
+    if (res2) {
+      return {
+        isValid: res2.isValid,
+        fields: res2.fields,
+        uiApplied: true
+      };
+    }
+  }
+  const res = await runValidation(formData, paper, { mode: "all" });
+  if (!res) return;
+  return {
+    isValid: res.isValid,
+    fields: res.fields,
+    uiApplied: false
+  };
+};
 class BomEntryValidator {
   constructor(bomEntry, enableSequenceLoading, materialNoNum, historyData, mainMaterialNo, mcPattern) {
     this.bomEntry = bomEntry;
@@ -2240,142 +2488,6 @@ class SubTableCore {
     console.log(this.ctx.widget.props.tableTitle, "处理表单按钮点击事件", params);
   }
 }
-function useFormulaExpWatcher(options) {
-  const {
-    props,
-    currentPageFormState,
-    needMinValidateCalc,
-    needMaxValidateCalc,
-    onCalculateFormula,
-    onMinComputed,
-    onMaxComputed,
-    debounceMs = 200,
-    returnType = "string"
-  } = options;
-  let calcReqId = 0;
-  async function computeMinMaxOnce() {
-    const myId = ++calcReqId;
-    const getValue = (v) => {
-      if (returnType === "number") {
-        const parsed = v == null ? null : parseFloat(String(v));
-        return Number.isFinite(parsed) ? parsed : null;
-      }
-      return v;
-    };
-    if (needMinValidateCalc) {
-      try {
-        const v = await onCalculateFormula("min");
-        if (myId !== calcReqId) return;
-        onMinComputed?.(getValue(v));
-      } catch (e) {
-      }
-    }
-    if (needMaxValidateCalc) {
-      try {
-        const v = await onCalculateFormula("max");
-        if (myId !== calcReqId) return;
-        onMaxComputed?.(getValue(v));
-      } catch (e) {
-      }
-    }
-  }
-  const debouncedCompute = debounce(computeMinMaxOnce, debounceMs);
-  const topStops = [];
-  const hashRowStops = /* @__PURE__ */ new Map();
-  const clearAllStops = () => {
-    while (topStops.length) {
-      const s = topStops.shift();
-      try {
-        s && s();
-      } catch (e) {
-      }
-    }
-    for (const [, rowMap] of hashRowStops) {
-      for (const stop2 of rowMap.values()) {
-        try {
-          stop2 && stop2();
-        } catch (e) {
-        }
-      }
-    }
-    hashRowStops.clear();
-    debouncedCompute.cancel?.();
-    calcReqId++;
-  };
-  const setupWatchesFromMerged = (parseInfos = []) => {
-    if (!needMinValidateCalc && !needMaxValidateCalc) return;
-    if (!Array.isArray(parseInfos) || parseInfos.length === 0) {
-      debouncedCompute();
-      return;
-    }
-    for (const p of parseInfos) {
-      const { type, processed, hashValue } = p;
-      if (type === "plain") {
-        const stop2 = watch(
-          () => currentPageFormState.value?.[processed],
-          () => {
-            console.log("plain");
-            debouncedCompute();
-          },
-          { immediate: true }
-        );
-        topStops.push(stop2);
-      } else if (type === "underscore") {
-        const stop2 = watch(
-          () => props.formData?.[processed],
-          () => {
-            console.log("underscore");
-            debouncedCompute();
-          },
-          { immediate: true }
-        );
-        topStops.push(stop2);
-      } else if (type === "hash") {
-        if (!hashRowStops.has(hashValue)) hashRowStops.set(hashValue, /* @__PURE__ */ new Map());
-        const rowMap = hashRowStops.get(hashValue);
-        const stopLen = watch(
-          () => currentPageFormState.value?.[hashValue]?.length ?? 0,
-          () => {
-            const arr = currentPageFormState.value?.[hashValue];
-            for (const row of arr) {
-              const rid = `${getRowId(row)}_${processed}`;
-              if (!rowMap.has(rid)) {
-                const stopPerRow = watch(
-                  () => [row?.[processed], row?.deleted_],
-                  () => {
-                    debouncedCompute();
-                  },
-                  { immediate: true }
-                );
-                rowMap.set(rid, stopPerRow);
-              }
-            }
-            const existingIds = new Set(arr.map(getRowId));
-            for (const r of Array.from(rowMap.keys())) {
-              if (!existingIds.has(r)) {
-                const rid = `${r}_${processed}`;
-                const s = rowMap.get(rid);
-                s && s();
-                rowMap.delete(rid);
-              }
-            }
-            debouncedCompute();
-          },
-          { immediate: true }
-        );
-        topStops.push(stopLen);
-      }
-    }
-    debouncedCompute();
-  };
-  const stop = () => {
-    clearAllStops();
-  };
-  return {
-    setupWatchesFromMerged,
-    stop
-  };
-}
 const identify = (...args) => window.NocodeAdapter.utils?.formulaIdentify?.(...args) ?? [];
 const calculate = (...args) => window.NocodeAdapter.utils?.formulaCalculate?.(...args);
 function useDependency(widget, props) {
@@ -2919,7 +3031,7 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const BorderTD = /* @__PURE__ */ _export_sfc(_sfc_main$6, [["__scopeId", "data-v-d6e21476"]]);
+const BorderTD = /* @__PURE__ */ _export_sfc(_sfc_main$6, [["__scopeId", "data-v-5c2388a6"]]);
 const _sfc_main$5 = {};
 const _hoisted_1$4 = { class: "nocode-loading" };
 function _sfc_render(_ctx, _cache) {
@@ -2973,6 +3085,9 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
     };
   }
 });
+function _isSlot(s) {
+  return typeof s === "function" || Object.prototype.toString.call(s) === "[object Object]" && !isVNode(s);
+}
 const DocumentSubTable = /* @__PURE__ */ defineComponent({
   name: "NocodeDocumentSubTable",
   props: {
@@ -3014,8 +3129,6 @@ const DocumentSubTable = /* @__PURE__ */ defineComponent({
     }
   },
   setup(props, {
-    emit,
-    expose,
     slots
   }) {
     const defaultDataMap = inject(NCB_PROVIDE.DEFAULT_FIELD_DATA);
@@ -3059,19 +3172,32 @@ const DocumentSubTable = /* @__PURE__ */ defineComponent({
     });
     const dataInfo = computed(() => {
       const visibleToRealIndexMap = {};
+      const displayToLiveRowIndexMap = {};
       const filterValue = [];
-      modelValue.value.forEach((item, realIndex) => {
+      const annRowDetails = dataRelationShip?.annRowDetails;
+      const showRowAnn = !!annRowDetails?.length;
+      const sourceRows = showRowAnn ? buildFormChangeDisplayRows(field, modelValue.value, annRowDetails) : modelValue.value;
+      let liveRowCounter = -1;
+      sourceRows.forEach((item, realIndex) => {
+        if (!showRowAnn && item.deleted_) return;
+        const visibleIndex = filterValue.length;
+        visibleToRealIndexMap[visibleIndex] = realIndex;
         if (!item.deleted_) {
-          const visibleIndex = filterValue.length;
-          visibleToRealIndexMap[visibleIndex] = realIndex;
-          filterValue.push(item);
+          liveRowCounter += 1;
+          displayToLiveRowIndexMap[visibleIndex] = liveRowCounter;
+        } else {
+          displayToLiveRowIndexMap[visibleIndex] = -1;
         }
+        filterValue.push(item);
       });
+      const tableData = showRowAnn && !(props.start > 0) ? filterValue : filterValue.slice(props.start, props.end);
       return {
-        tableData: filterValue.slice(props.start, props.end),
-        hasSubData: filterValue.length > 1,
-        isEndRow: props.end === filterValue.length,
-        visibleToRealIndexMap
+        tableData,
+        hasSubData: filterValue.filter((d) => !d.deleted_).length > 1,
+        isEndRow: showRowAnn ? true : props.end === filterValue.length,
+        visibleToRealIndexMap,
+        displayToLiveRowIndexMap,
+        showRowAnn
       };
     });
     const currentFieldDefaultData = computed(() => {
@@ -3081,16 +3207,14 @@ const DocumentSubTable = /* @__PURE__ */ defineComponent({
       if (props.isMobile) {
         return false;
       }
-      if (dataRelationShip?.formChangeStatus) {
-        return false;
-      }
       return showDisplayStatus.value === "edit-component";
     });
-    computed(() => showAction.value && quickFill);
     const handleDeleteRow = (rowData, dataIdx) => {
+      recordSubtableRowDelete(dataRelationShip, field, rowData);
       deleteSubtableRow(field, props.start + dataIdx);
-      if (rowData.id_ || rowData.group_ && rowData._2DTABLE_.some((item) => item.id_)) {
+      if (rowData.id_ || rowData.group_ && rowData._2DTABLE_?.some((item) => item.id_)) {
         rowData.deleted_ = true;
+        modelValue.value = relocateDeletedRowsToEnd(modelValue.value);
       } else {
         rowData.tempDeleted = true;
         modelValue.value = modelValue.value.filter((d) => !d.tempDeleted);
@@ -3106,7 +3230,7 @@ const DocumentSubTable = /* @__PURE__ */ defineComponent({
       rowData,
       quickFillDatas
     }) => {
-      const newRowsData = actionType === "copyRow" ? [cloneDeep(omit(rowData, "id_"))] : Array.from({
+      const newRowsData = actionType === "copyRow" ? [cloneDeep(omit(rowData, ["id_", FRONT_ROW_KEY]))] : Array.from({
         length: rowNum
       }, (_, index2) => transformUtils.addSubTableRowItem({
         defaultData: currentFieldDefaultData.value,
@@ -3127,17 +3251,22 @@ const DocumentSubTable = /* @__PURE__ */ defineComponent({
           insertIndex = realIndex + 1;
           break;
         case "last":
-          insertIndex = modelValue.value.length;
+          insertIndex = modelValue.value.reduce((last2, row, i) => !row?.deleted_ ? i : last2, -1) + 1;
           break;
       }
       if (actionType === "currentRow") {
         const firstData = newRowsData.shift();
-        merge(rowData, firstData);
+        merge(rowData, omit(firstData, ["id_", FRONT_ROW_KEY]));
+      }
+      if (newRowsData.length > 0) {
+        insertSubtableRows(field, insertIndex, newRowsData.length);
+        modelValue.value.splice(insertIndex, 0, ...newRowsData);
+        modelValue.value = relocateDeletedRowsToEnd(modelValue.value);
+        recordSubtableRowAdd(dataRelationShip, field, newRowsData);
       }
-      modelValue.value.splice(insertIndex, 0, ...newRowsData);
       updateCalcCallback?.(dataRelationShip?.uniqueId);
     };
-    const handleDefaultClick = (rowData, dataIdx) => {
+    const handleDefaultClick = () => {
       const {
         fieldId
       } = props.subInfo;
@@ -3220,16 +3349,68 @@ const DocumentSubTable = /* @__PURE__ */ defineComponent({
       showDelBtn,
       showActionMenu,
       dataIdx,
-      dynHeight
+      dynHeight,
+      showRowWatermark,
+      rowGroupKey
     }) => {
       const menus = subTableCore?.calcSubTableActionMenu({
         rowData,
         showDelBtn
       });
+      const annRowDetails = dataRelationShip?.annRowDetails;
+      const rowMark = dataIdx !== -1 && annRowDetails?.length ? resolveRowFormChangeMark(field, rowData, annRowDetails) : null;
+      const rowUi = resolveFormChangeRowUi(rowData, rowMark);
+      const isRowSelected = isAnnLocationSelected(dataRelationShip?.annSelectId, rowMark?.cellLocation);
+      const trClass = [rowUi.trClass, isRowSelected ? "form-change-row-selected" : ""].filter(Boolean).join(" ");
+      const handleRowAnnClick = (e) => {
+        if (!rowMark) return;
+        if (e.target?.closest?.(".sub-table-action-bar")) return;
+        setSelectAnnotationId(rowMark.cellLocation, dataRelationShip);
+      };
+      const wmHostTdId = rowMark && showRowWatermark ? trData.nextIds.find((tdId) => {
+        let tdInfo = props.widgetCenter[tdId];
+        if (subTableCore) {
+          tdInfo = subTableCore.calcNewTdInfo({
+            oldTdInfo: tdInfo,
+            rowData
+          });
+        }
+        const mergeInfo = props.subInfo.mergeBlock?.[tdId];
+        if (mergeInfo) return true;
+        if (tdInfo.cellHidden) return false;
+        return !!tdInfo.cellValueType;
+      }) : null;
+      const layoutRowWatermark = (el) => {
+        if (!(el instanceof HTMLElement) || !rowGroupKey) return;
+        requestAnimationFrame(() => {
+          const table = el.closest("table");
+          const host = el.offsetParent;
+          if (!table || !host) return;
+          const group = Array.from(table.querySelectorAll("tr[data-fc-row-key]")).filter((tr) => tr.getAttribute("data-fc-row-key") === rowGroupKey);
+          if (!group.length) return;
+          const firstRect = group[0].getBoundingClientRect();
+          const lastRect = group[group.length - 1].getBoundingClientRect();
+          const hostRect = host.getBoundingClientRect();
+          el.style.left = `${firstRect.left - hostRect.left}px`;
+          el.style.top = `${firstRect.top - hostRect.top}px`;
+          el.style.width = `${firstRect.width}px`;
+          el.style.height = `${Math.max(lastRect.bottom - firstRect.top, firstRect.height)}px`;
+        });
+      };
+      const rowWatermark = rowMark && wmHostTdId && rowUi.wmKind ? createVNode("span", {
+        "class": ["form-change-row-wm", rowUi.wmClass],
+        "data-row-key": rowGroupKey,
+        "ref": layoutRowWatermark
+      }, [rowUi.wmText]) : null;
       return createVNode("tr", {
         "key": trKey,
-        "height": dynHeight || trData.props.height
-      }, [trData.nextIds.map((tdId, tdIdx) => {
+        "height": dynHeight || trData.props.height,
+        "class": trClass || void 0,
+        "data-fc-row-op": rowMark?.op || void 0,
+        "data-fc-row-key": rowMark && rowGroupKey ? rowGroupKey : void 0,
+        "data-fc-wm": rowMark && showRowWatermark ? rowUi.wmKind || void 0 : void 0,
+        "onClick": rowMark ? handleRowAnnClick : void 0
+      }, [trData.nextIds.map((tdId) => {
         let tdInfo = props.widgetCenter[tdId];
         if (subTableCore) {
           tdInfo = subTableCore.calcNewTdInfo({
@@ -3253,6 +3434,7 @@ const DocumentSubTable = /* @__PURE__ */ defineComponent({
             hidden: false
           });
         }
+        const cellWm = tdId === wmHostTdId ? rowWatermark : null;
         if (tdInfo.cellValueType) {
           if (props.isMobile) {
             Object.assign(tdAttrs, {
@@ -3263,10 +3445,13 @@ const DocumentSubTable = /* @__PURE__ */ defineComponent({
             formData: rowData
           };
           if (dataIdx !== -1) {
+            const displayIndex = Number(props.start ?? 0) + dataIdx;
+            const ghost = dataInfo.value.showRowAnn && isFormChangeGhostRow(rowData);
             Object.assign(subWidgetAttrs, {
               subtableFieldId: field,
-              realRowIndex: Number(props.start ?? 0) + dataIdx,
-              pageRowIndex: dataIdx
+              realRowIndex: ghost ? void 0 : dataInfo.value.showRowAnn ? dataInfo.value.displayToLiveRowIndexMap?.[displayIndex] : displayIndex,
+              pageRowIndex: dataIdx,
+              rowKey: getRowId(rowData)
             });
           }
           if (tdInfo.props.isNewFixedTableInDyn) {
@@ -3281,7 +3466,7 @@ const DocumentSubTable = /* @__PURE__ */ defineComponent({
           }, tdAttrs, {
             "isEmpty": true
           }), {
-            default: () => [tdInfo.cellValueType !== CellType.Default || tdInfo.cellWidget.props.value ? slots.widget?.({
+            default: () => [cellWm, tdInfo.cellValueType !== CellType.Default || tdInfo.cellWidget.props.value ? slots.widget?.({
               tdInfo,
               ...subWidgetAttrs
             }) : null]
@@ -3292,7 +3477,9 @@ const DocumentSubTable = /* @__PURE__ */ defineComponent({
             "style": tdInfo.style
           }, tdAttrs, {
             "isEmpty": true
-          }), null);
+          }), _isSlot(cellWm) ? cellWm : {
+            default: () => [cellWm]
+          });
         }
       }), showAction.value && showActionMenu ? createVNode("div", {
         "class": "sub-table-action-bar"
@@ -3319,7 +3506,7 @@ const DocumentSubTable = /* @__PURE__ */ defineComponent({
     }, [createVNode("colgroup", null, [colsWidth.map((cw, cwIdx) => createVNode("col", {
       "key": cwIdx,
       "width": cw
-    }, null))]), createVNode("tbody", null, [props.subInfo.containerIds.map((trId, trIdx) => {
+    }, null))]), createVNode("tbody", null, [props.subInfo.containerIds.map((trId) => {
       const trInfo = props.widgetCenter[trId];
       if (trInfo.props.identifier !== "dynamicTr") {
         const dynHeight = props.subInfo.dynamicRowHeights?.[trId];
@@ -3331,20 +3518,20 @@ const DocumentSubTable = /* @__PURE__ */ defineComponent({
         });
       }
       if (trId === lastDynamicId) {
-        const lastDataIdx = dataInfo.value.tableData.length - 1;
         return dataInfo.value.tableData.map((data, dataIdx) => {
+          const stableRowKey = getRowId(data);
           return dynamicIds.map((rowId, rowIdx) => {
-            const isLast = dataIdx === lastDataIdx && rowIdx === lastDynRowIdx;
             const showDelBtn = dataInfo.value.hasSubData && rowIdx === lastDynRowIdx;
-            dataInfo.value.isEndRow && isLast;
             const showActionMenu = rowIdx === lastDynRowIdx;
             const row = props.widgetCenter[rowId];
             const dynHeight = props.subInfo.dynamicRowHeights?.[rowId]?.[dataIdx];
-            return renderTr2Td(`${dataIdx}_${rowIdx}`, row, data, {
+            return renderTr2Td(`${stableRowKey}_${rowIdx}`, row, data, {
               showDelBtn,
               showActionMenu,
               dataIdx,
-              dynHeight
+              dynHeight,
+              showRowWatermark: rowIdx === 0,
+              rowGroupKey: stableRowKey
             });
           });
         });
@@ -3536,8 +3723,6 @@ const MaterialConsumeTable = /* @__PURE__ */ defineComponent({
     }
   },
   setup(props, {
-    emit,
-    expose,
     slots
   }) {
     const defaultDataMap = inject(NCB_PROVIDE.DEFAULT_FIELD_DATA);
@@ -3560,8 +3745,7 @@ const MaterialConsumeTable = /* @__PURE__ */ defineComponent({
       colsWidth,
       dynamicIds,
       isRowSubTable2d,
-      childInitRowLen,
-      quickFill
+      childInitRowLen
     } = reactive(props.widget.props);
     const lastDynRowIdx = dynamicIds.length - 1;
     const lastDynamicId = last(dynamicIds);
@@ -3611,11 +3795,12 @@ const MaterialConsumeTable = /* @__PURE__ */ defineComponent({
       }
       return showDisplayStatus.value === "edit-component";
     });
-    computed(() => showAction.value && quickFill);
     const handleDeleteRow = (rowData, dataIdx) => {
+      recordSubtableRowDelete(dataRelationShip, field, rowData);
       deleteSubtableRow(field, props.start + dataIdx);
-      if (rowData.id_ || rowData.group_ && rowData._2DTABLE_.some((item) => item.id_)) {
+      if (rowData.id_ || rowData.group_ && rowData._2DTABLE_?.some((item) => item.id_)) {
         rowData.deleted_ = true;
+        modelValue.value = relocateDeletedRowsToEnd(modelValue.value);
       } else {
         rowData.tempDeleted = true;
         modelValue.value = modelValue.value.filter((d) => !d.tempDeleted);
@@ -3633,7 +3818,7 @@ const MaterialConsumeTable = /* @__PURE__ */ defineComponent({
       if (!isFormChange.value && tableController.hasEditingRow()) {
         return;
       }
-      const newRowsData = actionType === "copyRow" ? [cloneDeep(omit(rowData, "id_"))] : Array.from({
+      const newRowsData = actionType === "copyRow" ? [cloneDeep(omit(rowData, ["id_", FRONT_ROW_KEY]))] : Array.from({
         length: rowNum
       }, (_, index2) => transformUtils.addSubTableRowItem({
         defaultData: currentFieldDefaultData.value,
@@ -3661,13 +3846,17 @@ const MaterialConsumeTable = /* @__PURE__ */ defineComponent({
       }
       if (actionType === "currentRow") {
         const firstData = newRowsData.shift();
-        merge(rowData, firstData);
+        merge(rowData, omit(firstData, ["id_", FRONT_ROW_KEY]));
+      }
+      if (newRowsData.length > 0) {
+        insertSubtableRows(field, insertIndex, newRowsData.length);
+        modelValue.value.splice(insertIndex, 0, ...newRowsData);
+        modelValue.value = relocateDeletedRowsToEnd(modelValue.value);
+        recordSubtableRowAdd(dataRelationShip, field, newRowsData);
       }
-      modelValue.value.splice(insertIndex, 0, ...newRowsData);
       updateCalcCallback?.(dataRelationShip?.uniqueId);
     };
     const handleAction = (action, rowData) => {
-      console.log("action", action);
       switch (action) {
         case MaterialConsumeActionType.CONFIRM:
           tableController.confirm(rowData);
@@ -3812,7 +4001,7 @@ const MaterialConsumeTable = /* @__PURE__ */ defineComponent({
       return createVNode("tr", {
         "key": trKey,
         "height": dynHeight || trData.props.height
-      }, [trData.nextIds.map((tdId, tdIdx) => {
+      }, [trData.nextIds.map((tdId) => {
         const tdInfo = getNewTdInfo(props.widgetCenter[tdId], rowData);
         const tdAttrs = {
           key: tdId,
@@ -3843,7 +4032,8 @@ const MaterialConsumeTable = /* @__PURE__ */ defineComponent({
             Object.assign(subWidgetAttrs, {
               subtableFieldId: field,
               realRowIndex: Number(props.start ?? 0) + dataIdx,
-              pageRowIndex: dataIdx
+              pageRowIndex: dataIdx,
+              rowKey: getRowId(rowData)
             });
           }
           if (tdInfo.props.isNewFixedTableInDyn) {
@@ -3893,7 +4083,7 @@ const MaterialConsumeTable = /* @__PURE__ */ defineComponent({
     }, [createVNode("colgroup", null, [colsWidth.map((cw, cwIdx) => createVNode("col", {
       "key": cwIdx,
       "width": cw
-    }, null))]), createVNode("tbody", null, [props.subInfo.containerIds.map((trId, trIdx) => {
+    }, null))]), createVNode("tbody", null, [props.subInfo.containerIds.map((trId) => {
       const trInfo = props.widgetCenter[trId];
       console.log("trInfo", trInfo);
       if (trInfo.props.identifier !== "dynamicTr") {
@@ -3908,18 +4098,18 @@ const MaterialConsumeTable = /* @__PURE__ */ defineComponent({
       if (trId === lastDynamicId) {
         const lastDataIdx = dataInfo.value.tableData.length - 1;
         return dataInfo.value.tableData.map((data, dataIdx) => {
+          const stableRowKey = getRowId(data);
           return dynamicIds.map((rowId, rowIdx) => {
             const isLastDynRow = rowIdx === lastDynRowIdx;
             const isLast = dataIdx === lastDataIdx && isLastDynRow;
             const showDelBtn = dataInfo.value.hasSubData && isLastDynRow && // 开启了顺序投料时，只有最后一行可以删除
             (tableController.enableSequenceLoading ? isLast : true);
             const showScanBtn = isLast;
-            dataInfo.value.isEndRow && isLast;
             const showActionMenu = isLastDynRow;
             const showEditBtn = !isFormChange.value && (tableController.enableSequenceLoading ? isLast : true) && data.is_confirmed_;
             const row = props.widgetCenter[rowId];
             const dynHeight = props.subInfo.dynamicRowHeights?.[rowId]?.[dataIdx];
-            return renderTr2Td(`${dataIdx}_${rowIdx}`, row, data, {
+            return renderTr2Td(`${stableRowKey}_${rowIdx}`, row, data, {
               showDelBtn,
               showActionMenu,
               showScanBtn,
@@ -4791,9 +4981,9 @@ export {
   SubTableCore as S,
   _sfc_main$4 as _,
   useFormTmplConfig as a,
-  useFormulaExpWatcher as b,
-  useStyles as c,
-  useDependency as d,
+  useStyles as b,
+  useDependency as c,
+  useValidator as d,
   DocumentPaper as e,
   DocumentSubTableAction as f,
   MaterialConsumeTableController as g,
@@ -4809,5 +4999,6 @@ export {
   DocumentLoading as q,
   MCDataUtil as r,
   useOnlineFormActionButton as s,
-  useOnlineFormTransformField2Component as u
+  useOnlineFormTransformField2Component as u,
+  validate as v
 };