@gct-paas/word 0.1.47-beta.12 → 0.1.47-beta.14

package/dist/index.es.js

@@ -32591,7 +32591,7 @@ const createList = (n) => Array.from({ length: n }, (_2, i) => i);
 const _hoisted_1$2g = { class: "gct-time-container" };
 const _hoisted_2$1u = { class: "scrollbar-container" };
 const _hoisted_3$1b = ["onClick"];
-const _hoisted_4$T = { class: "gct-time-footer" };
+const _hoisted_4$S = { class: "gct-time-footer" };
 const _hoisted_5$H = { class: "gct-right-btns" };
 const _sfc_main$3u = /* @__PURE__ */ defineComponent({
   __name: "time",
@@ -32779,7 +32779,7 @@ const _sfc_main$3u = /* @__PURE__ */ defineComponent({
             ]);
           }), 128))
         ]),
-        createElementVNode("div", _hoisted_4$T, [
+        createElementVNode("div", _hoisted_4$S, [
           createElementVNode("div", {
             class: "gct-now-btn",
             onClick: nowDay
@@ -32819,7 +32819,7 @@ const GctTimer = /* @__PURE__ */ _export_sfc(_sfc_main$3u, [["__scopeId", "data-
 const _hoisted_1$2f = { class: "gct-dtp-panel-inner" };
 const _hoisted_2$1t = { class: "gct-dtp-date" };
 const _hoisted_3$1a = { class: "gct-dtp-header" };
-const _hoisted_4$S = { class: "text" };
+const _hoisted_4$R = { class: "text" };
 const _hoisted_5$G = { class: "gct-dtp-head" };
 const _hoisted_6$t = { class: "gct-dtp-rows-wrapper" };
 const _hoisted_7$o = ["onClick"];
@@ -32833,7 +32833,7 @@ const _hoisted_10$9 = {
   class: "gct-dtp-time"
 };
 const _hoisted_11$6 = { class: "gct-dtp-time-header" };
-const _hoisted_12$4 = { class: "gct-dtp-time-container" };
+const _hoisted_12$5 = { class: "gct-dtp-time-container" };
 const _sfc_main$3t = /* @__PURE__ */ defineComponent({
   __name: "calendar",
   props: {
@@ -33021,7 +33021,7 @@ const _sfc_main$3t = /* @__PURE__ */ defineComponent({
                 color: "#64748b",
                 onClick: withModifiers(prevMonth, ["stop"])
               }),
-              createElementVNode("div", _hoisted_4$S, toDisplayString(monthTitle.value), 1),
+              createElementVNode("div", _hoisted_4$R, toDisplayString(monthTitle.value), 1),
               createVNode(unref(GctIcon), {
                 class: "nav",
                 icon: "icon-a-Rightarrow",
@@ -33084,7 +33084,7 @@ const _sfc_main$3t = /* @__PURE__ */ defineComponent({
           ]),
           showTimeLocal.value ? (openBlock(), createElementBlock("div", _hoisted_10$9, [
             createElementVNode("div", _hoisted_11$6, toDisplayString(timeValue.value), 1),
-            createElementVNode("div", _hoisted_12$4, [
+            createElementVNode("div", _hoisted_12$5, [
               createVNode(GctTimer, {
                 "model-value": timeValue.value,
                 format: __props.timeFormat,
@@ -33232,7 +33232,7 @@ const _hoisted_3$18 = {
   key: 0,
   class: "group-label"
 };
-const _hoisted_4$R = ["onClick"];
+const _hoisted_4$Q = ["onClick"];
 const _hoisted_5$F = { class: "option-label" };
 const _hoisted_6$s = { class: "option-right" };
 const _hoisted_7$n = {
@@ -33371,7 +33371,7 @@ const _sfc_main$3p = /* @__PURE__ */ defineComponent({
                                 })) : createCommentVNode("", true)
                               ])
                             ], 64))
-                          ], 10, _hoisted_4$R);
+                          ], 10, _hoisted_4$Q);
                         }), 128)),
                         group2._showDivider !== false && groupIndex !== normalizedGroupOptions.value.length - 1 ? (openBlock(), createElementBlock("div", _hoisted_7$n)) : createCommentVNode("", true)
                       ], 64);
@@ -33660,7 +33660,7 @@ const _hoisted_1$28 = {
 };
 const _hoisted_2$1n = ["src"];
 const _hoisted_3$14 = { class: "upload-img-mask" };
-const _hoisted_4$Q = { class: "tip-text" };
+const _hoisted_4$P = { class: "tip-text" };
 const _hoisted_5$E = {
   key: 2,
   class: "upload-loading"
@@ -33752,7 +33752,7 @@ const _sfc_main$3k = /* @__PURE__ */ defineComponent({
           }, [
             createElementVNode("div", null, [
               _cache[1] || (_cache[1] = createElementVNode("i", { class: "iconfont icon-tupian_wudaima" }, null, -1)),
-              createElementVNode("div", _hoisted_4$Q, toDisplayString(__props.tip), 1)
+              createElementVNode("div", _hoisted_4$P, toDisplayString(__props.tip), 1)
             ])
           ])),
           loading.value ? (openBlock(), createElementBlock("div", _hoisted_5$E, [..._cache[2] || (_cache[2] = [
@@ -33788,7 +33788,7 @@ const _hoisted_3$13 = {
   key: 1,
   class: "gct-input-clear-icon-default"
 };
-const _hoisted_4$P = {
+const _hoisted_4$O = {
   key: 2,
   class: "gct-input-count"
 };
@@ -33998,7 +33998,7 @@ const _sfc_main$3j = /* @__PURE__ */ defineComponent({
               })
             ]))
           ])) : createCommentVNode("", true),
-          props.showCount ? (openBlock(), createElementBlock("span", _hoisted_4$P, [
+          props.showCount ? (openBlock(), createElementBlock("span", _hoisted_4$O, [
             createTextVNode(toDisplayString(countValue.value), 1),
             props.maxLength ? (openBlock(), createElementBlock("span", _hoisted_5$D, " / " + toDisplayString(props.maxLength), 1)) : createCommentVNode("", true)
           ])) : createCommentVNode("", true),
@@ -34020,7 +34020,7 @@ const _hoisted_3$12 = {
   key: 1,
   class: "stepper"
 };
-const _hoisted_4$O = {
+const _hoisted_4$N = {
   key: 2,
   class: "gct-input-number-suffix"
 };
@@ -34286,7 +34286,7 @@ const _sfc_main$3i = /* @__PURE__ */ defineComponent({
             })
           ], 2)
         ])) : createCommentVNode("", true),
-        props.suffix ? (openBlock(), createElementBlock("span", _hoisted_4$O, [
+        props.suffix ? (openBlock(), createElementBlock("span", _hoisted_4$N, [
           createElementVNode("span", _hoisted_5$C, toDisplayString(__props.suffix), 1)
         ])) : createCommentVNode("", true)
       ], 2);
@@ -34480,7 +34480,7 @@ const GctLoading = /* @__PURE__ */ _export_sfc(_sfc_main$3f, [["render", _sfc_re
 const _hoisted_1$22 = { class: "message-wrapper" };
 const _hoisted_2$1i = ["onMouseenter", "onMouseleave"];
 const _hoisted_3$$ = { class: "message-message" };
-const _hoisted_4$N = ["onClick"];
+const _hoisted_4$M = ["onClick"];
 const _sfc_main$3e = /* @__PURE__ */ defineComponent({
   __name: "Message",
   setup(__props, { expose: __expose }) {
@@ -34551,7 +34551,7 @@ const _sfc_main$3e = /* @__PURE__ */ defineComponent({
                   key: 0,
                   class: "message-close icon iconfont icon-guanbi",
                   onClick: ($event) => remove2(item.id)
-                }, null, 8, _hoisted_4$N)) : createCommentVNode("", true)
+                }, null, 8, _hoisted_4$M)) : createCommentVNode("", true)
               ], 42, _hoisted_2$1i);
             }), 128))
           ]),
@@ -35833,7 +35833,7 @@ const GctSegmentSlider = /* @__PURE__ */ _export_sfc(_sfc_main$39, [["__scopeId"
 const _hoisted_1$1Z = { class: "popper-container" };
 const _hoisted_2$1g = { class: "group-name" };
 const _hoisted_3$Z = ["onClick"];
-const _hoisted_4$M = ["onClick"];
+const _hoisted_4$L = ["onClick"];
 const _hoisted_5$B = {
   key: 2,
   class: "empty"
@@ -36035,7 +36035,7 @@ const _sfc_main$38 = /* @__PURE__ */ defineComponent({
                             _: 2
                           }, 1032, ["disabled"])
                         ], 64))
-                      ], 10, _hoisted_4$M);
+                      ], 10, _hoisted_4$L);
                     }), 128)),
                     !normalizedFlatOptions.value.length ? (openBlock(), createElementBlock("div", _hoisted_5$B, " 暂无数据 ")) : createCommentVNode("", true)
                   ])
@@ -36101,7 +36101,7 @@ const _hoisted_2$1f = {
   class: "gct-ss-search-icon"
 };
 const _hoisted_3$Y = { class: "gct-ss-list" };
-const _hoisted_4$L = ["onClick"];
+const _hoisted_4$K = ["onClick"];
 const _hoisted_5$A = {
   key: 0,
   class: "gct-ss-empty"
@@ -36275,7 +36275,7 @@ const _sfc_main$37 = /* @__PURE__ */ defineComponent({
                       key: item.value,
                       class: normalizeClass(["gct-ss-option", { selected: item.value === __props.modelValue, disabled: item.disabled }]),
                       onClick: ($event) => onSelect(item)
-                    }, toDisplayString(item.label), 11, _hoisted_4$L);
+                    }, toDisplayString(item.label), 11, _hoisted_4$K);
                   }), 128)),
                   !filteredOptions.value.length ? (openBlock(), createElementBlock("div", _hoisted_5$A, "暂无数据")) : createCommentVNode("", true)
                 ])
@@ -36341,7 +36341,7 @@ const _hoisted_3$X = {
   key: 0,
   class: "selection-col"
 };
-const _hoisted_4$K = ["onClick"];
+const _hoisted_4$J = ["onClick"];
 const _hoisted_5$z = {
   key: 0,
   class: "selection-col"
@@ -36507,7 +36507,7 @@ const _sfc_main$35 = /* @__PURE__ */ defineComponent({
                     ], true)
                   ], 4);
                 }), 128))
-              ], 14, _hoisted_4$K);
+              ], 14, _hoisted_4$J);
             }), 128))
           ])
         ])
@@ -36609,7 +36609,7 @@ const _hoisted_2$1d = {
   class: "rdo-tree-select-node__switcher placeholder"
 };
 const _hoisted_3$W = { class: "rdo-tree-select-node__title" };
-const _hoisted_4$J = { class: "rdo-tree-select-node__label" };
+const _hoisted_4$I = { class: "rdo-tree-select-node__label" };
 const _hoisted_5$y = {
   key: 0,
   class: "rdo-tree-select-node__tag"
@@ -36669,7 +36669,7 @@ const _sfc_main$32 = /* @__PURE__ */ defineComponent({
             })
           ], 2)) : (openBlock(), createElementBlock("span", _hoisted_2$1d)),
           createElementVNode("span", _hoisted_3$W, [
-            createElementVNode("span", _hoisted_4$J, toDisplayString(__props.node.title), 1),
+            createElementVNode("span", _hoisted_4$I, toDisplayString(__props.node.title), 1),
             __props.node.isDefault && !hasChildren.value ? (openBlock(), createElementBlock("span", _hoisted_5$y, "默认")) : createCommentVNode("", true)
           ])
         ], 6),
@@ -37106,7 +37106,7 @@ const _hoisted_3$V = {
   key: 1,
   class: "rdo-tree-select__empty"
 };
-const _hoisted_4$I = ["title"];
+const _hoisted_4$H = ["title"];
 const _hoisted_5$x = { class: "rdo-tree-select__value-text" };
 const _hoisted_6$o = {
   key: 0,
@@ -37335,7 +37335,7 @@ const _sfc_main$31 = /* @__PURE__ */ defineComponent({
               }, [
                 createElementVNode("span", _hoisted_5$x, toDisplayString(selectedDisplay.value.text), 1),
                 selectedDisplay.value.showDefaultTag ? (openBlock(), createElementBlock("span", _hoisted_6$o, "默认")) : createCommentVNode("", true)
-              ], 8, _hoisted_4$I)) : (openBlock(), createElementBlock("span", _hoisted_7$j, toDisplayString(__props.placeholder), 1)),
+              ], 8, _hoisted_4$H)) : (openBlock(), createElementBlock("span", _hoisted_7$j, toDisplayString(__props.placeholder), 1)),
               innerValue.value && __props.allowClear && !__props.disabled ? (openBlock(), createBlock(unref(GctIcon), {
                 key: 2,
                 class: "rdo-tree-select__clear",
@@ -39173,7 +39173,7 @@ const colorUtils$1 = {
 const _hoisted_1$1S = { class: "color-picker-container" };
 const _hoisted_2$1a = { class: "color-submenu-panel" };
 const _hoisted_3$T = { class: "color-content-standard" };
-const _hoisted_4$H = { class: "items" };
+const _hoisted_4$G = { class: "items" };
 const _hoisted_5$w = ["onClick"];
 const _sfc_main$2$ = /* @__PURE__ */ defineComponent({
   __name: "ColorPicker",
@@ -39220,7 +39220,7 @@ const _sfc_main$2$ = /* @__PURE__ */ defineComponent({
             ]),
             createElementVNode("div", _hoisted_3$T, [
               _cache[1] || (_cache[1] = createElementVNode("div", { class: "title" }, "标准色", -1)),
-              createElementVNode("div", _hoisted_4$H, [
+              createElementVNode("div", _hoisted_4$G, [
                 (openBlock(true), createElementBlock(Fragment, null, renderList(unref(colorUtils$1).standard, (c2, idx) => {
                   return openBlock(), createBlock(unref(_sfc_main$34), {
                     key: "theme-" + idx,
@@ -49743,11 +49743,7 @@ class DataManager {
   }
   /** 收集与字段绑定相关的路径（含 value / label / href 及通配符变体） */
   collectFieldBindingPaths(designValuePath) {
-    const bases = [
-      designValuePath,
-      getLabelPath(designValuePath),
-      getHrefPath(designValuePath)
-    ];
+    const bases = [designValuePath, getLabelPath(designValuePath), getHrefPath(designValuePath)];
     const wildcardKeys = new Set(bases.map((path) => this.convertPathToWildcard(path)));
     const result = new Set(bases);
     const scanTargets = [
@@ -53202,6 +53198,7 @@ const postApi = api.apaas.modelComprehensive.postBizServiceModelCategoryModelKey
 HttpUtil.use((inst) => {
   inst.interceptors.response.use((response) => {
     if (response.config.__useWordMessage && !response.data.ok) {
+      response.data.message = void 0;
       GctMessage.error(response.data.subMessage);
     }
     return response;
@@ -53860,6 +53857,23 @@ class McWebRender extends MCRender {
     });
   }
 }
+const KEY = "_subFieldConfig";
+const getSubFieldConfig = (paramsConfig) => {
+  return {
+    init(subConfig) {
+      if (!paramsConfig) return;
+      paramsConfig[KEY] = subConfig;
+    },
+    get(valuePath) {
+      if (!valuePath || !paramsConfig?.[KEY]) return {};
+      return paramsConfig[KEY][valuePath] || {};
+    },
+    set(valuePath, subConfig) {
+      if (!valuePath || !paramsConfig?.[KEY]) return;
+      paramsConfig[KEY][valuePath] = subConfig;
+    }
+  };
+};
 class MCDataUtil {
   static allFields = [
     "product_id_",
@@ -53915,6 +53929,9 @@ class MCDataUtil {
       if (key.startsWith(`$.${subFieldKey}[${rowIndex}]`)) {
         dataManager.setFieldRuntimeSpecificConfig(key, { newDisabled: isConfirmed });
       }
+      if ([`$.${subFieldKey}[${rowIndex}].qty_required_`, `$.${subFieldKey}[${rowIndex}].qty_consumed_`].includes(key)) {
+        dataManager.setFieldRuntimeSpecificConfig(key, { newDisabled: true });
+      }
     });
   }
 }
@@ -54327,20 +54344,58 @@ class MaterialConsumeTableController {
       }
     }
   }
-  /**
-   * 统一处理表格内部的字段的值变更
-   * @param opts
-   */
-  handleChange(opts) {
-    const { field, row, option } = opts;
-    console.log("handleChange", opts);
-    if (field === "product_id_") {
-      row.material_no_ = void 0;
-      row.qty_ = void 0;
-      this.setDefaultValue(row);
-    } else if (field === "material_no_") {
-      row.product_id_ = option.product_id_;
-      this.setDefaultValue(row);
+  getDefaultValue(row) {
+    const value = {};
+    if (!row.routing_operation_id_) {
+      value.routing_operation_id_ = this.tmplBomController.operationId;
+    }
+    if (row.product_id_) {
+      const util = this.bomEntriesValidator.findUtilByProductId(row.product_id_);
+      if (util) {
+        value.qty_required_ = util.total;
+        value.qty_consumed_ = util.hasConsumed;
+        value.bom_entry_id_ = util.bomEntry.id_;
+      }
+    }
+    return value;
+  }
+  handleSelectChange({
+    changedData,
+    selectedOption,
+    doc,
+    parsed,
+    dataIndex
+  }) {
+    const { fieldKey, parentFieldKey, parentFieldPath } = parsed;
+    if (["product_id_", "material_no_"].includes(fieldKey)) {
+      const rowPath = `${parentFieldPath}[${dataIndex}]`;
+      if (fieldKey === "product_id_") {
+        const versionId = changedData[`${rowPath}.product_id_`]?.split(":").pop();
+        if (versionId) {
+          getSubFieldConfig(doc.paramsConfig).set(`${rowPath}.material_no_`, {
+            "product_id_.versionIn": [versionId]
+          });
+        }
+        doc.dataManager.setMultiple({
+          [`${rowPath}.material_no_`]: void 0,
+          [`${rowPath}.material_no__lb_`]: void 0,
+          [`${rowPath}.qty_`]: void 0
+        });
+      } else if (fieldKey === "material_no_") {
+        doc.dataManager.setMultiple({
+          [`${rowPath}.product_id_`]: selectedOption.product_id_
+          // [`${rowPath}.product_id__lb_`]: record.product_id__lb_, // 目前取不到
+        });
+      }
+      const rowData = doc.dataManager.getRawData()[parentFieldKey][dataIndex];
+      const value = this.getDefaultValue(rowData);
+      const wordValue = Object.entries(value).reduce((data, [key, value2]) => {
+        data[`${rowPath}.${key}`] = value2;
+        return data;
+      }, {});
+      doc.dataManager.setMultiple(wordValue);
+      doc.dataManager.setFieldRuntimeSpecificConfig(`${rowPath}.qty_required_`, { newDisabled: true });
+      doc.dataManager.setFieldRuntimeSpecificConfig(`${rowPath}.qty_consumed_`, { newDisabled: true });
     }
   }
 }
@@ -54353,7 +54408,7 @@ class FormTmplBomController {
   materialNo;
   /** 历史填报数据 */
   historyData = [];
-  /** 表单控制器(key是tableKey) */
+  /** 表单控制器(key是 valuePath) */
   tableControllers = {};
   /** 字段key和tableKey的映射 */
   field2TableMap = {};
@@ -54434,16 +54489,14 @@ class FormTmplBomController {
   }
   /**
    * 根据字段key获取子表控制器
-   * @param field
-   * @return {*}
    */
-  // findTableControllerByField(field: string) {
-  //   return this.tableControllers[this.field2TableMap[field]!];
+  // findTableControllerByField(subFieldKey: string) {
+  //   return this.tableControllers[subFieldKey];
   // }
+  // 方法废弃，word 里改在初始化时记录到 paramsConfig
   /**
    * 处理字段组件
    * - 补充物料字段的额外查询条件
-   * @param field
    */
   // handleField(field: any) {
   //   const { subFieldKey, fieldType } = field;
@@ -55075,6 +55128,7 @@ const apiFetchers = {
       const result = await api.apaas.designerCommon.getGetCanBeUsedOrgUser({
         modelKey,
         fieldKey,
+        onlyHasSeat: true,
         pageSize: API_CONFIG.USER_PAGE_SIZE
       });
       const { data = [], totalCount, totalPage } = result || {};
@@ -103348,7 +103402,7 @@ async function prepareDocumentRenderData(options) {
   });
 }
 async function initializeDocumentEngine(props, payload, result) {
-  const { id, requestInfo, fillModeType, paramsConfig } = result;
+  const { id, requestInfo, fillModeType, paramsConfig, tmplBomC } = result;
   const materialNo = paramsConfig?.materialNo || requestInfo.materialNo;
   const { mainModelKey, masterSlaveList } = await prepareDocumentFieldContext({
     requestInfo,
@@ -103380,6 +103434,14 @@ async function initializeDocumentEngine(props, payload, result) {
       r.widgetMeta.props = matchedBom;
     });
   }
+  if (paramsConfig && tmplBomC?.formInstBom?.formTmplBomList) {
+    const subConfig = {};
+    tmplBomC.formInstBom.formTmplBomList.forEach(({ table_key_, entries_ }) => {
+      const includedIds = (entries_ || []).map((e) => e.product_id_.split(":").pop());
+      subConfig[`${table_key_}[n].product_id_`] = { "id_.in": includedIds };
+    });
+    getSubFieldConfig(paramsConfig).init(subConfig);
+  }
   const instances = docModel.getWidgetInstances();
   if (fillModeType !== DocModeTypeConst.Edit) {
     instances.forEach((instance2) => {
@@ -105071,13 +105133,13 @@ function getDropdownOverlayActionConfig(type4, options) {
         icon: "icon-saoyisao",
         actionType: "scan-dialog",
         dialogKey: "device-scan",
-        tooltip: "点击可切换到搜索模式"
+        tooltip: "双击可切换到搜索模式"
       };
     }
     return {
       icon: "icon-pad_search",
       actionType: "scan-dropdown",
-      tooltip: "点击可切换到扫码模式"
+      tooltip: "双击可切换到扫码模式"
     };
   }
   const supported = getSupportedDropdownTypes();
@@ -106299,16 +106361,21 @@ Schema.warning = warning;
 Schema.messages = messages;
 Schema.validators = validators;
 const buildError = (validatorInfo, message) => JSON.stringify({ ...validatorInfo, message });
-const createRule = (validator2, message) => ({
+const createRule = (validator2, message, trigger = "change") => ({
   required: true,
   validator: validator2,
-  message
+  message,
+  trigger
 });
 const requiredRule = (ctx) => {
   if (!ctx.showRequired) return null;
-  return createRule((_rule, value, _callback, _source, _options) => {
-    return !isEmptyValue$1(value);
-  }, buildError(ctx.validatorInfo, "字段为必填项！"));
+  return createRule(
+    (_rule, value, _callback, _source, _options) => {
+      return !isEmptyValue$1(value);
+    },
+    buildError(ctx.validatorInfo, "字段为必填项！"),
+    "manual"
+  );
 };
 const minNumberRule = (ctx) => {
   if (ctx.enableRangeValidate && ctx.minValidateMode === RangeValidateModeTypeConst.Fixed_Number) {
@@ -106338,6 +106405,7 @@ const minNumberFormulaRule = (ctx) => {
   if (ctx.enableRangeValidate && ctx.minValidateMode === RangeValidateModeTypeConst.Variable_Validate && ctx.minFormulaExpr) {
     return {
       required: true,
+      trigger: "change",
       async validator(_rule, value, _callback, _source, _options) {
         const rawData = ctx.getRawData();
         const subRowData = ctx.getSubRowFormData(ctx.validatorInfo.runtimeValuePath);
@@ -106360,6 +106428,7 @@ const maxNumberFormulaRule = (ctx) => {
   if (ctx.enableRangeValidate && ctx.maxValidateMode === RangeValidateModeTypeConst.Variable_Validate && ctx.maxFormulaExpr) {
     return {
       required: true,
+      trigger: "change",
       async validator(_rule, value, _callback, _source, _options) {
         const rawData = ctx.getRawData();
         const subRowData = ctx.getSubRowFormData(ctx.validatorInfo.runtimeValuePath);
@@ -106410,6 +106479,7 @@ const minTimeFormulaRule = (ctx) => {
   if (ctx.enableRangeValidate && ctx.minDateValidateMode === RangeValidateModeTypeConst.Variable_Validate && ctx.minDateFormulaExpr) {
     return {
       required: true,
+      trigger: "change",
       async validator(_rule, value, _callback, _source, _options) {
         const rawData = ctx.getRawData();
         const subRowData = ctx.getSubRowFormData(ctx.validatorInfo.runtimeValuePath);
@@ -106439,6 +106509,7 @@ const maxTimeFormulaRule = (ctx) => {
   if (ctx.enableRangeValidate && ctx.maxDateValidateMode === RangeValidateModeTypeConst.Variable_Validate && ctx.maxDateFormulaExpr) {
     return {
       required: true,
+      trigger: "change",
       async validator(_rule, value, _callback, _source, _options) {
         const rawData = ctx.getRawData();
         const subRowData = ctx.getSubRowFormData(ctx.validatorInfo.runtimeValuePath);
@@ -106464,6 +106535,17 @@ const maxTimeFormulaRule = (ctx) => {
   }
   return null;
 };
+function filterRulesByTrigger(rules2, trigger) {
+  if (trigger === "all") return rules2;
+  return rules2.filter((rule) => {
+    const ruleTrigger = rule.trigger;
+    if (!ruleTrigger) return trigger === "change";
+    if (trigger === "blur") {
+      return ruleTrigger === "blur" || ruleTrigger === "change";
+    }
+    return ruleTrigger === trigger;
+  });
+}
 const assembleRules = (ctx) => {
   const rules2 = [
     requiredRule(ctx),
@@ -106504,13 +106586,49 @@ function createValidateAll() {
     }
   };
 }
+async function waitForDataSettle() {
+  await nextTick();
+  await new Promise((resolve) => setTimeout(resolve, 0));
+}
+const DEBOUNCE_MS$1 = 300;
+const schedulersByDocId = /* @__PURE__ */ new Map();
+function getScheduler(doc) {
+  let scheduler = schedulersByDocId.get(doc.id);
+  if (!scheduler) {
+    scheduler = { debounceTimer: null, running: false, pendingTrigger: "change" };
+    schedulersByDocId.set(doc.id, scheduler);
+  }
+  return scheduler;
+}
+function clearScheduler(doc) {
+  const scheduler = schedulersByDocId.get(doc.id);
+  if (!scheduler) return;
+  if (scheduler.debounceTimer) {
+    clearTimeout(scheduler.debounceTimer);
+    scheduler.debounceTimer = null;
+  }
+  schedulersByDocId.delete(doc.id);
+}
+function pruneStaleValidationComments(doc, map) {
+  if (!map) return null;
+  const validPaths = new Set(listWidgetValuePaths(doc));
+  const next = {};
+  for (const [path, errors] of Object.entries(map)) {
+    if (validPaths.has(path)) {
+      next[path] = errors;
+    }
+  }
+  return Object.keys(next).length ? next : null;
+}
 function showValidationComments(doc, map) {
-  doc.eventManager.dispatchCustom("inter:show-validation-comment", map);
+  doc.eventManager.dispatchCustom(
+    "inter:show-validation-comment",
+    pruneStaleValidationComments(doc, map)
+  );
 }
-function hasValidationComments(doc) {
-  if (!doc) return false;
-  const map = doc.interactionManager.get("validationCommentMap");
-  return !!map && Object.keys(map).length > 0;
+function pruneValidationComments(doc) {
+  const current = doc.interactionManager.get("validationCommentMap");
+  showValidationComments(doc, current);
 }
 function findLayoutNodeByValuePath(doc, runtimeValuePath) {
   let found;
@@ -106591,72 +106709,113 @@ function buildWidgetValidationPayload(doc, widget) {
     rules: rules2
   };
 }
-const validateAllFields = async (doc) => {
+function clearResolvedManualErrors(doc, map) {
+  if (!map) return map;
+  const next = { ...map };
+  for (const path of Object.keys(next)) {
+    const widget = findLayoutNodeByValuePath(doc, path);
+    const payload = widget ? buildWidgetValidationPayload(doc, widget) : null;
+    if (!payload) continue;
+    const hasManual = filterRulesByTrigger(payload.rules, "manual").length > 0;
+    const hasLive = filterRulesByTrigger(payload.rules, "change").length > 0;
+    if (hasManual && !hasLive && !isEmptyValue$1(payload.value)) {
+      delete next[path];
+    }
+  }
+  return Object.keys(next).length ? next : null;
+}
+function mergeLiveValidation(doc, liveResult, livePaths) {
+  const current = doc.interactionManager.get("validationCommentMap");
+  const base = current && Object.keys(current).length ? { ...current } : {};
+  for (const path of livePaths) {
+    if (liveResult?.[path]) {
+      base[path] = liveResult[path];
+    } else {
+      delete base[path];
+    }
+  }
+  const merged = Object.keys(base).length ? base : liveResult;
+  return clearResolvedManualErrors(doc, merged);
+}
+async function runValidation(doc, mode) {
   const formState = {};
   const formRules = {};
+  const livePaths = [];
   for (const runtimeValuePath of listWidgetValuePaths(doc)) {
     const widget = findLayoutNodeByValuePath(doc, runtimeValuePath);
     if (!widget) continue;
     const payload = buildWidgetValidationPayload(doc, widget);
     if (!payload) continue;
+    const activeRules = filterRulesByTrigger(payload.rules, mode);
+    if (!activeRules.length) continue;
     formState[payload.runtimeValuePath] = payload.value;
-    formRules[payload.runtimeValuePath] = payload.rules;
+    formRules[payload.runtimeValuePath] = activeRules;
+    if (mode !== "all") {
+      livePaths.push(payload.runtimeValuePath);
+    }
+  }
+  if (!Object.keys(formRules).length) {
+    if (mode === "all") {
+      showValidationComments(doc, null);
+    }
+    return null;
   }
   const validateAll = createValidateAll();
   const result = await validateAll(formRules, formState);
   console.log("validateAllFields", result);
-  showValidationComments(doc, result);
+  if (mode === "all") {
+    showValidationComments(doc, result);
+  } else {
+    showValidationComments(doc, mergeLiveValidation(doc, result, livePaths));
+  }
   return result;
-};
-const DEBOUNCE_MS$1 = 300;
-const schedulers = /* @__PURE__ */ new WeakMap();
-function registerDocValidationRefresh(doc, options) {
-  let debounceTimer = null;
-  let running = false;
-  const scheduler = {
-    schedule(opts) {
-      if (options.isSuppressed()) return;
-      if (!hasValidationComments(doc)) return;
-      if (debounceTimer) {
-        clearTimeout(debounceTimer);
-        debounceTimer = null;
-      }
-      const run = async () => {
-        if (running || options.isSuppressed()) return;
-        running = true;
-        try {
-          await waitForDataManagerSettle();
-          if (!hasValidationComments(doc)) return;
-          await validateAllFields(doc);
-        } finally {
-          running = false;
-        }
-      };
-      if (opts?.immediate) {
-        void run();
-        return;
-      }
-      debounceTimer = setTimeout(() => {
-        debounceTimer = null;
-        void run();
-      }, DEBOUNCE_MS$1);
-    },
-    dispose() {
-      if (debounceTimer) {
-        clearTimeout(debounceTimer);
-        debounceTimer = null;
-      }
+}
+async function executeValidation(doc, trigger) {
+  const scheduler = getScheduler(doc);
+  if (scheduler.running) {
+    scheduler.pendingTrigger = trigger === "all" ? "all" : trigger;
+    return;
+  }
+  scheduler.running = true;
+  try {
+    await waitForDataSettle();
+    await runValidation(doc, trigger);
+    const pending = scheduler.pendingTrigger;
+    scheduler.pendingTrigger = "change";
+    if (pending !== trigger) {
+      await runValidation(doc, pending);
     }
-  };
-  schedulers.set(doc, scheduler);
-  return () => {
-    scheduler.dispose();
-    schedulers.delete(doc);
-  };
+  } finally {
+    scheduler.running = false;
+  }
 }
-function requestValidationRefresh(doc, immediate = false) {
-  schedulers.get(doc)?.schedule({ immediate });
+function requestFullValidation(doc, options = {}) {
+  const { immediate = false, trigger = "change" } = options;
+  const scheduler = getScheduler(doc);
+  if (immediate) {
+    if (scheduler.debounceTimer) {
+      clearTimeout(scheduler.debounceTimer);
+      scheduler.debounceTimer = null;
+    }
+    void executeValidation(doc, trigger);
+    return;
+  }
+  scheduler.pendingTrigger = trigger;
+  if (scheduler.debounceTimer) {
+    clearTimeout(scheduler.debounceTimer);
+  }
+  scheduler.debounceTimer = setTimeout(() => {
+    scheduler.debounceTimer = null;
+    void executeValidation(doc, scheduler.pendingTrigger);
+  }, DEBOUNCE_MS$1);
 }
+function disposeDocValidationScheduler(doc) {
+  clearScheduler(doc);
+}
+const validateAllFields = async (doc) => {
+  await waitForDataSettle();
+  return runValidation(doc, "all");
+};
 const _sfc_main$2O = /* @__PURE__ */ defineComponent({
   __name: "overlay-render",
   props: {
@@ -106670,6 +106829,7 @@ const _sfc_main$2O = /* @__PURE__ */ defineComponent({
   },
   emits: ["enter", "leave"],
   setup(__props) {
+    const tmplBomCRef = inject(TMPL_BOM_CONTROLLER);
     const interCtx = useInteractionContext();
     const designCtx = useDesignSuiteContext();
     const props = __props;
@@ -106743,16 +106903,21 @@ const _sfc_main$2O = /* @__PURE__ */ defineComponent({
     const showActionIcon = computed(() => !!actionConfig.value.icon);
     watch(
       () => [interCtx.focusModelId, interCtx.focusTick],
-      ([modelId], [oldModelId]) => {
+      async ([modelId], [oldModelId]) => {
         const isCurrent = modelId === props.modelId;
         const wasCurrent = oldModelId === props.modelId;
         if (wasCurrent && !isCurrent) {
           console.log("blur");
-          props.doc.eventManager.dispatchCustom("ime:commit-validate", {
-            valuePath: runtimeValuePath.value,
-            formats: buildNumberFormats(widgetProps.value, widgetType.value)
-          });
-          requestValidationRefresh(props.doc);
+          const commitTasks = props.doc.eventManager.dispatchCustom(
+            "ime:commit-validate",
+            {
+              valuePath: runtimeValuePath.value,
+              formats: buildNumberFormats(widgetProps.value, widgetType.value)
+            }
+          );
+          await Promise.all(commitTasks);
+          await waitForDataManagerSettle();
+          requestFullValidation(props.doc, { immediate: true, trigger: "blur" });
         }
         if (isCurrent) {
           console.log("focus");
@@ -106801,7 +106966,6 @@ const _sfc_main$2O = /* @__PURE__ */ defineComponent({
                   designCtx.runtime.getMasterSlaveFieldList(props.doc.mainModelKey)
                 );
                 props.doc.dataManager.setMultiple({ ...payload, ...dataValues });
-                requestValidationRefresh(props.doc, true);
               }
             }
           });
@@ -106858,7 +107022,6 @@ const _sfc_main$2O = /* @__PURE__ */ defineComponent({
             const savedValue = await bodyRef?.value?.onSave?.();
             if (!savedValue) return;
             props.doc.dataManager.setMultiple(savedValue);
-            requestValidationRefresh(props.doc, true);
             close();
           } catch (error) {
             GctMessage.warning("业务处理失败,请联系管理员");
@@ -106876,7 +107039,26 @@ const _sfc_main$2O = /* @__PURE__ */ defineComponent({
         designCtx.runtime.getMasterSlaveFieldList(props.doc.mainModelKey)
       );
       props.doc.dataManager.setMultiple({ ...data, ...dataValues });
-      requestValidationRefresh(props.doc, true);
+      const subFieldValuePath = props.widget.widgetMeta?.field?.valuePath;
+      const dataIndex = props.widget.dataSlotIndex?.dataIndex;
+      if (subFieldValuePath && isNumber(dataIndex)) {
+        const parsed = parseValuePath(subFieldValuePath);
+        const { parentFieldPath } = parsed;
+        const allRegions = props.doc.model?.document.body.children.flatMap(
+          (w2) => w2.name === "w:tbl" ? w2.regions : []
+        );
+        const isMaterialConsumeTable = allRegions?.find((r) => r.valuePath === parentFieldPath)?.type === "material-consume-table";
+        if (isMaterialConsumeTable && tmplBomCRef?.value) {
+          const tableController = tmplBomCRef.value.tableControllers[parentFieldPath];
+          tableController?.handleSelectChange({
+            changedData: data,
+            selectedOption: record,
+            doc: props.doc,
+            parsed,
+            dataIndex
+          });
+        }
+      }
     }
     return (_ctx, _cache) => {
       return isTargetReady.value ? (openBlock(), createBlock(Teleport, {
@@ -106940,7 +107122,7 @@ const _sfc_main$2O = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const OverlayRender = /* @__PURE__ */ _export_sfc(_sfc_main$2O, [["__scopeId", "data-v-d9277289"]]);
+const OverlayRender = /* @__PURE__ */ _export_sfc(_sfc_main$2O, [["__scopeId", "data-v-4da4215f"]]);
 let activeHoverId = 0;
 function useHoverDelay(callback, delay = 120) {
   let timer = null;
@@ -108640,7 +108822,7 @@ function useTableSelection() {
 const _hoisted_1$1L = { class: "col-headers" };
 const _hoisted_2$17 = ["onMouseenter"];
 const _hoisted_3$R = ["onClick"];
-const _hoisted_4$G = ["onMousedown"];
+const _hoisted_4$F = ["onMousedown"];
 const _hoisted_5$v = { class: "row-headers" };
 const _hoisted_6$n = ["onMouseenter"];
 const _hoisted_7$i = ["onClick"];
@@ -108931,7 +109113,7 @@ const _sfc_main$2A = /* @__PURE__ */ defineComponent({
                     height: `${__props.tableHeight}px`
                   }),
                   onMousedown: ($event) => onResizeMouseDown("col", colIndex, $event)
-                }, null, 46, _hoisted_4$G)
+                }, null, 46, _hoisted_4$F)
               ]);
             }), 128))
           ]),
@@ -109227,16 +109409,26 @@ const _sfc_main$2x = /* @__PURE__ */ defineComponent({
   }
 });
 const _hoisted_1$1K = { class: "sub-table-action-bar" };
-const _hoisted_2$16 = { class: "material-consume-menu" };
-const _hoisted_3$Q = ["onClick"];
-const _hoisted_4$F = { class: "sub-table-btn scan-btn" };
-const _hoisted_5$u = { class: "sub-table-action-content" };
-const _hoisted_6$m = { class: "action-group" };
-const _hoisted_7$h = { class: "insert-row-container" };
-const _hoisted_8$e = { class: "insert-row-item" };
-const _hoisted_9$a = { class: "insert-row-item" };
-const _hoisted_10$7 = { class: "sub-table-btn" };
-const _hoisted_11$5 = { class: "sub-table-btn" };
+const _hoisted_2$16 = { class: "sub-table-action-popper" };
+const _hoisted_3$Q = {
+  key: 0,
+  class: "action-menu"
+};
+const _hoisted_4$E = ["onClick"];
+const _hoisted_5$u = { class: "item-label" };
+const _hoisted_6$m = { class: "action-menu" };
+const _hoisted_7$h = { class: "item-icon" };
+const _hoisted_8$e = { class: "item-icon" };
+const _hoisted_9$a = { class: "item-icon scale-large" };
+const _hoisted_10$7 = { class: "item-label flex-between-center" };
+const _hoisted_11$5 = { class: "item-icon scale-large" };
+const _hoisted_12$4 = { class: "item-label flex-between-center" };
+const _hoisted_13$3 = {
+  key: 1,
+  class: "action-menu"
+};
+const _hoisted_14$3 = { class: "item-icon" };
+const _hoisted_15$2 = { class: "more-btn" };
 const _sfc_main$2w = /* @__PURE__ */ defineComponent({
   __name: "sub-table-action",
   props: {
@@ -109252,12 +109444,6 @@ const _sfc_main$2w = /* @__PURE__ */ defineComponent({
     const props = __props;
     const mainFields = designCtx.runtime.getFieldList(props.doc.mainModelKey);
     const HOVER_DELAY = { show: 200, hide: 150 };
-    const materialMenus = [
-      { label: "条码扫描", value: "scan" },
-      { label: "BOM", value: "bom" },
-      { label: "条码解析规则变更", value: "change" }
-    ];
-    const insertMoreRef = ref(null);
     const formState = reactive({
       upRowNum: 1,
       downRowNum: 1
@@ -109287,21 +109473,33 @@ const _sfc_main$2w = /* @__PURE__ */ defineComponent({
     const isMaterialConsumeTable = computed(() => {
       return props.cell?.subRenderer?.type === "material-consume-table";
     });
-    const isMaterialConsumeTableConfirmed = computed(() => {
-      const { subFieldKey } = getCtx();
-      const { dataIndex: rowIndex } = props.cell.subRenderer;
+    const computedInfo = computed(() => {
+      const { index: rowIndex, subFieldKey } = getCtx();
       const tableData = docInst.value.dataManager.getRawData()[subFieldKey] ?? [];
-      return tableData[rowIndex]?.is_confirmed_;
+      const isDeleteBtnVisible = tableData.length >= 2;
+      const isRowConfirmed = !!tableData[rowIndex]?.is_confirmed_;
+      return {
+        isDeleteBtnVisible,
+        isRowConfirmed
+      };
+    });
+    const materialMenuList = computed(() => {
+      return [
+        { icon: "icon-bianji", label: "编辑行", value: "edit", visible: computedInfo.value.isRowConfirmed },
+        { icon: "icon-saoyisao", label: "条码扫描", value: "scan", visible: props.isLastGroup },
+        { icon: "icon-a-bom11", label: "BOM", value: "bom", visible: props.isLastGroup },
+        { icon: "icon-tiaomajiexi", label: "条码解析规则变更", value: "change", visible: props.isLastGroup }
+      ];
     });
     const handleMaterialConsumeAction = async (val) => {
       if (!tmplBomCRef?.value?.tableControllers || !props.cell?.subRenderer?.valuePath) return;
       const tableController = tmplBomCRef.value.tableControllers[props.cell.subRenderer.valuePath];
       if (!tableController) return;
-      const { subFieldKey } = getCtx();
+      const { index: rowIndex, subFieldKey } = getCtx();
       if (!subFieldKey) return;
       const { dataManager } = docInst.value;
       const tableData = dataManager.getRawData()[subFieldKey] ?? [];
-      const { dataIndex: rowIndex, tableName } = props.cell.subRenderer;
+      const { tableName } = props.cell.subRenderer;
       let row = tableData[rowIndex];
       const insertEmptyRow = (row2, rowIndex2, cb) => {
         if (!row2) {
@@ -109340,7 +109538,7 @@ const _sfc_main$2w = /* @__PURE__ */ defineComponent({
       const { path, index: index2 } = getCtx();
       const storageIndex = props.doc.dataManager.resolveSubtableVisibleIndex(path, index2);
       const data = props.doc.dataManager.get(`${path}[${storageIndex}]`) || {};
-      props.doc.dataManager.insertAt(path, index2 + 1, data);
+      props.doc.dataManager.insertAt(path, index2 + 1, omit(data, "id_"));
     };
     const actionHandlers = {
       insertRowAfter() {
@@ -109359,7 +109557,6 @@ const _sfc_main$2w = /* @__PURE__ */ defineComponent({
       copyCurrentRow: copyRow
     };
     const handleAction = (key) => {
-      insertMoreRef.value?.hide?.();
       actionHandlers[key]?.();
       formState.upRowNum = 1;
       formState.downRowNum = 1;
@@ -109370,167 +109567,139 @@ const _sfc_main$2w = /* @__PURE__ */ defineComponent({
       }, [
         !readonly2.value ? (openBlock(), createElementBlock("div", {
           key: 0,
-          class: "sub-table-action",
+          class: "sub-table-action-container",
           style: normalizeStyle(__props.pos)
         }, [
           createElementVNode("div", _hoisted_1$1K, [
-            isMaterialConsumeTable.value && __props.isLastGroup && !isMaterialConsumeTableConfirmed.value ? (openBlock(), createElementBlock("div", {
-              key: 0,
-              class: "sub-table-btn confirm-btn",
-              onClick: _cache[0] || (_cache[0] = ($event) => handleMaterialConsumeAction("confirm"))
-            }, [
-              createVNode(unref(GctIcon), {
-                icon: "icon-tijiao1",
-                color: "#4ec262"
-              })
-            ])) : createCommentVNode("", true),
-            isMaterialConsumeTable.value && __props.isLastGroup ? (openBlock(), createBlock(unref(_sfc_main$3q), {
-              key: 1,
-              placement: "bottom-start",
-              triggers: ["hover"],
-              popperTriggers: ["hover"],
-              delay: HOVER_DELAY,
-              "instant-move": ""
-            }, {
-              popper: withCtx(() => [
-                createElementVNode("div", _hoisted_2$16, [
-                  (openBlock(), createElementBlock(Fragment, null, renderList(materialMenus, (item) => {
-                    return createElementVNode("div", {
-                      key: item.value,
-                      class: "menu-item",
-                      onClick: ($event) => handleMaterialConsumeAction(item.value)
-                    }, toDisplayString(item.label), 9, _hoisted_3$Q);
-                  }), 64))
-                ])
-              ]),
-              default: withCtx(() => [
-                createElementVNode("div", _hoisted_4$F, [
-                  createVNode(unref(GctIcon), {
-                    icon: "icon-saoyisao",
-                    color: "#5378ff"
-                  })
-                ])
-              ]),
-              _: 1
-            })) : createCommentVNode("", true),
             createVNode(unref(_sfc_main$3q), {
-              placement: "right",
-              triggers: ["hover"],
-              popperTriggers: ["hover"],
+              placement: "bottom-end",
+              triggers: ["click"],
+              popperTriggers: ["click"],
               delay: HOVER_DELAY,
               "instant-move": ""
             }, {
               popper: withCtx(() => [
-                createElementVNode("div", _hoisted_5$u, [
+                createElementVNode("div", _hoisted_2$16, [
+                  isMaterialConsumeTable.value ? (openBlock(), createElementBlock("div", _hoisted_3$Q, [
+                    _cache[10] || (_cache[10] = createElementVNode("div", { class: "menu-title" }, "业务操作", -1)),
+                    (openBlock(true), createElementBlock(Fragment, null, renderList(materialMenuList.value.filter((o) => o.visible), (item) => {
+                      return openBlock(), createElementBlock("div", {
+                        key: item.value,
+                        class: "menu-item",
+                        onClick: ($event) => handleMaterialConsumeAction(item.value)
+                      }, [
+                        createElementVNode("div", {
+                          class: normalizeClass(["item-icon", item.value === "change" ? "scale-large" : void 0])
+                        }, [
+                          createVNode(unref(GctIcon), {
+                            icon: item.icon
+                          }, null, 8, ["icon"])
+                        ], 2),
+                        createElementVNode("div", _hoisted_5$u, toDisplayString(item.label), 1)
+                      ], 8, _hoisted_4$E);
+                    }), 128))
+                  ])) : createCommentVNode("", true),
                   createElementVNode("div", _hoisted_6$m, [
-                    isMaterialConsumeTable.value && isMaterialConsumeTableConfirmed.value ? (openBlock(), createElementBlock("div", {
-                      key: 0,
-                      class: "sub-table-btn",
-                      onClick: _cache[1] || (_cache[1] = ($event) => handleMaterialConsumeAction("edit"))
-                    }, [
-                      createVNode(unref(GctIcon), {
-                        icon: "icon-bianji",
-                        color: "#fff"
-                      })
-                    ])) : createCommentVNode("", true),
+                    _cache[15] || (_cache[15] = createElementVNode("div", { class: "menu-title" }, "行编辑", -1)),
                     createElementVNode("div", {
-                      class: "sub-table-btn",
-                      onClick: _cache[2] || (_cache[2] = ($event) => handleAction("insertRowAfter"))
+                      class: "menu-item",
+                      onClick: _cache[0] || (_cache[0] = ($event) => handleAction("insertRowAfter"))
                     }, [
-                      createVNode(unref(GctIcon), {
-                        icon: "icon-tianjia",
-                        color: "#fff"
-                      })
+                      createElementVNode("div", _hoisted_7$h, [
+                        createVNode(unref(GctIcon), { icon: "icon-tianjia" })
+                      ]),
+                      _cache[11] || (_cache[11] = createElementVNode("div", { class: "item-label" }, " 加一行 ", -1))
                     ]),
                     createElementVNode("div", {
-                      class: "sub-table-btn",
-                      onClick: _cache[3] || (_cache[3] = ($event) => handleAction("copyCurrentRow"))
+                      class: "menu-item",
+                      onClick: _cache[1] || (_cache[1] = ($event) => handleAction("copyCurrentRow"))
                     }, [
-                      createVNode(unref(GctIcon), {
-                        icon: "icon-fuzhihang",
-                        color: "#fff"
-                      })
+                      createElementVNode("div", _hoisted_8$e, [
+                        createVNode(unref(GctIcon), { icon: "icon-fuzhihang" })
+                      ]),
+                      _cache[12] || (_cache[12] = createElementVNode("div", { class: "item-label" }, " 复制行 ", -1))
                     ]),
-                    createVNode(unref(_sfc_main$3q), {
-                      ref_key: "insertMoreRef",
-                      ref: insertMoreRef,
-                      placement: "bottom-start",
-                      showTriggers: ["hover"],
-                      popperShowTriggers: ["hover"],
-                      popperHideTriggers: ["hover"],
-                      delay: HOVER_DELAY,
-                      distance: 6,
-                      "instant-move": ""
-                    }, {
-                      popper: withCtx(() => [
-                        createElementVNode("div", _hoisted_7$h, [
-                          createElementVNode("div", _hoisted_8$e, [
-                            createElementVNode("div", {
-                              class: "title",
-                              onClick: _cache[4] || (_cache[4] = ($event) => handleAction("insertRowBeforeMore"))
-                            }, " 在上方插入行 "),
-                            createVNode(unref(GctInputNumber), {
-                              modelValue: formState.upRowNum,
-                              "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => formState.upRowNum = $event),
-                              min: 1,
-                              integer: "",
-                              style: { "width": "68px" }
-                            }, null, 8, ["modelValue"])
-                          ]),
-                          createElementVNode("div", _hoisted_9$a, [
-                            createElementVNode("div", {
-                              class: "title",
-                              onClick: _cache[6] || (_cache[6] = ($event) => handleAction("insertRowAfterMore"))
-                            }, " 在下方插入行 "),
-                            createVNode(unref(GctInputNumber), {
-                              modelValue: formState.downRowNum,
-                              "onUpdate:modelValue": _cache[7] || (_cache[7] = ($event) => formState.downRowNum = $event),
-                              min: 1,
-                              integer: "",
-                              style: { "width": "68px" }
-                            }, null, 8, ["modelValue"])
-                          ])
-                        ])
+                    createElementVNode("div", {
+                      class: "menu-item",
+                      onClick: _cache[4] || (_cache[4] = ($event) => handleAction("insertRowBeforeMore"))
+                    }, [
+                      createElementVNode("div", _hoisted_9$a, [
+                        createVNode(unref(GctIcon), { icon: "icon-shangfangcharuhang" })
                       ]),
-                      default: withCtx(() => [
-                        createElementVNode("div", _hoisted_10$7, [
-                          createVNode(unref(GctIcon), {
-                            icon: "icon-gengduo1",
-                            color: "#fff"
-                          })
-                        ])
+                      createElementVNode("div", _hoisted_10$7, [
+                        _cache[13] || (_cache[13] = createElementVNode("div", null, " 在上方插入行 ", -1)),
+                        createVNode(unref(GctInputNumber), {
+                          modelValue: formState.upRowNum,
+                          "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => formState.upRowNum = $event),
+                          min: 1,
+                          integer: "",
+                          style: { "width": "68px" },
+                          onClick: _cache[3] || (_cache[3] = withModifiers(() => {
+                          }, ["stop"]))
+                        }, null, 8, ["modelValue"])
+                      ])
+                    ]),
+                    createElementVNode("div", {
+                      class: "menu-item",
+                      onClick: _cache[7] || (_cache[7] = ($event) => handleAction("insertRowAfterMore"))
+                    }, [
+                      createElementVNode("div", _hoisted_11$5, [
+                        createVNode(unref(GctIcon), { icon: "icon-xiafangcharuhang" })
                       ]),
-                      _: 1
-                    }, 512)
+                      createElementVNode("div", _hoisted_12$4, [
+                        _cache[14] || (_cache[14] = createElementVNode("div", null, " 在下方插入行 ", -1)),
+                        createVNode(unref(GctInputNumber), {
+                          modelValue: formState.downRowNum,
+                          "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => formState.downRowNum = $event),
+                          min: 1,
+                          integer: "",
+                          style: { "width": "68px" },
+                          onClick: _cache[6] || (_cache[6] = withModifiers(() => {
+                          }, ["stop"]))
+                        }, null, 8, ["modelValue"])
+                      ])
+                    ])
                   ]),
-                  createElementVNode("div", {
-                    class: "sub-table-btn delete-icon",
-                    onClick: _cache[8] || (_cache[8] = ($event) => handleAction("deleteRowCurrent"))
-                  }, [
-                    createVNode(unref(GctIcon), {
-                      icon: "icon-shanchu1",
-                      color: "#fff"
-                    })
-                  ])
+                  computedInfo.value.isDeleteBtnVisible ? (openBlock(), createElementBlock("div", _hoisted_13$3, [
+                    createElementVNode("div", {
+                      class: "menu-item",
+                      onClick: _cache[8] || (_cache[8] = ($event) => handleAction("deleteRowCurrent"))
+                    }, [
+                      createElementVNode("div", _hoisted_14$3, [
+                        createVNode(unref(GctIcon), { icon: "icon-shanchu1" })
+                      ]),
+                      _cache[16] || (_cache[16] = createElementVNode("div", { class: "item-label" }, " 删除行 ", -1))
+                    ])
+                  ])) : createCommentVNode("", true)
                 ])
               ]),
               default: withCtx(() => [
-                createElementVNode("div", _hoisted_11$5, [
+                createElementVNode("div", _hoisted_15$2, [
                   createVNode(unref(GctIcon), {
-                    icon: "icon-neibuyingyong",
-                    color: "#5378ff"
+                    icon: "icon-gengduo1",
+                    color: "#fff"
                   })
                 ])
               ]),
               _: 1
-            })
+            }),
+            isMaterialConsumeTable.value && __props.isLastGroup && !computedInfo.value.isRowConfirmed ? (openBlock(), createElementBlock("div", {
+              key: 0,
+              class: "confirm-btn",
+              onClick: _cache[9] || (_cache[9] = ($event) => handleMaterialConsumeAction("confirm"))
+            }, [
+              createVNode(unref(GctIcon), {
+                icon: "icon-tijiao1",
+                color: "#4ec262"
+              })
+            ])) : createCommentVNode("", true)
           ])
         ], 4)) : createCommentVNode("", true)
       ], 8, ["to"]);
     };
   }
 });
-const SubTableAction = /* @__PURE__ */ _export_sfc(_sfc_main$2w, [["__scopeId", "data-v-3228f8df"]]);
+const SubTableAction = /* @__PURE__ */ _export_sfc(_sfc_main$2w, [["__scopeId", "data-v-13501110"]]);
 const _sfc_main$2v = /* @__PURE__ */ defineComponent({
   __name: "index",
   props: {
@@ -110429,10 +110598,10 @@ function useDocLooperAutoSaveNotify(factory2, ops, options) {
 function useValidationFullSync(factory2, options) {
   let suppress = true;
   let unsubscribeData = null;
-  let unregisterRefresh = null;
   let stopWatchDoc = null;
   let stopWatchTick = null;
   let knownWidgetPaths = /* @__PURE__ */ new Set();
+  let boundDoc = null;
   function isSuppressed() {
     return suppress || !!options?.suppressSignal?.value;
   }
@@ -110442,30 +110611,34 @@ function useValidationFullSync(factory2, options) {
   function disposeSubscriptions() {
     unsubscribeData?.();
     unsubscribeData = null;
-    unregisterRefresh?.();
-    unregisterRefresh = null;
     stopWatchTick?.();
     stopWatchTick = null;
+    if (boundDoc) {
+      disposeDocValidationScheduler(boundDoc);
+    }
+    boundDoc = null;
   }
   function bindDoc() {
     disposeSubscriptions();
     const doc = factory2.docIns.value;
     if (!doc) return;
+    boundDoc = doc;
     snapshotWidgetPaths(doc);
-    unregisterRefresh = registerDocValidationRefresh(doc, { isSuppressed });
     unsubscribeData = doc.dataManager.subscribe("$", () => {
-      requestValidationRefresh(doc);
+      if (isSuppressed()) return;
+      requestFullValidation(doc, { trigger: "change" });
     });
     stopWatchTick = watch(
       () => factory2.docInfo.value.updateTick,
       () => {
         const currentDoc = factory2.docIns.value;
-        if (!currentDoc || !hasValidationComments(currentDoc)) return;
+        if (!currentDoc || isSuppressed()) return;
         const currentPaths = new Set(listWidgetValuePaths(currentDoc));
         const hasRowStructureChange = [...currentPaths].some((path) => !knownWidgetPaths.has(path)) || [...knownWidgetPaths].some((path) => !currentPaths.has(path));
         if (!hasRowStructureChange) return;
         snapshotWidgetPaths(currentDoc);
-        requestValidationRefresh(currentDoc, true);
+        pruneValidationComments(currentDoc);
+        requestFullValidation(currentDoc, { immediate: true, trigger: "change" });
       }
     );
   }
@@ -111312,7 +111485,7 @@ const _sfc_main$2o = /* @__PURE__ */ defineComponent({
 const _hoisted_1$1E = { class: "color-picker-container" };
 const _hoisted_2$11 = { class: "color-content-auto" };
 const _hoisted_3$N = { class: "color-content-theme" };
-const _hoisted_4$E = ["onClick"];
+const _hoisted_4$D = ["onClick"];
 const _hoisted_5$t = { class: "color-content-standard" };
 const _hoisted_6$l = { class: "items" };
 const _hoisted_7$g = ["onClick"];
@@ -111395,7 +111568,7 @@ const _sfc_main$2n = /* @__PURE__ */ defineComponent({
                           class: "color-icon",
                           style: normalizeStyle({ "background-color": c2.color }),
                           onClick: ($event) => handleColorClick(c2.color)
-                        }, null, 12, _hoisted_4$E))
+                        }, null, 12, _hoisted_4$D))
                       ]),
                       _: 2
                     }, 1024);
@@ -111898,7 +112071,7 @@ const svgTableMaterialConsume = "data:image/svg+xml,%3c?xml%20version='1.0'%20st
 const _hoisted_1$1A = { class: "items-container" };
 const _hoisted_2$10 = { class: "ribbon-tab-item" };
 const _hoisted_3$M = { class: "ribbon-tab-item" };
-const _hoisted_4$D = { class: "ribbon-tab-item" };
+const _hoisted_4$C = { class: "ribbon-tab-item" };
 const _hoisted_5$s = { class: "ribbon-tab-item" };
 const _hoisted_6$k = { class: "ribbon-tab-item" };
 const _hoisted_7$f = { class: "ribbon-tab-item" };
@@ -112205,7 +112378,7 @@ const _sfc_main$2j = /* @__PURE__ */ defineComponent({
           }, 8, ["modelValue", "options"])
         ]),
         _cache[27] || (_cache[27] = createElementVNode("div", { class: "split-divider" }, null, -1)),
-        createElementVNode("div", _hoisted_4$D, [
+        createElementVNode("div", _hoisted_4$C, [
           createVNode(ButtonIcon, {
             tooltip: "加粗",
             iconExtraProps: { icon: "icon-Bold" },
@@ -112339,7 +112512,7 @@ const Ribbon = /* @__PURE__ */ _export_sfc(_sfc_main$2i, [["__scopeId", "data-v-
 const _hoisted_1$1y = { class: "toolkit-item" };
 const _hoisted_2$_ = { class: "toolkit-popper-wrap" };
 const _hoisted_3$L = { class: "toolkit-popper-title" };
-const _hoisted_4$C = { class: "title" };
+const _hoisted_4$B = { class: "title" };
 const _hoisted_5$r = { class: "label" };
 const _sfc_main$2h = /* @__PURE__ */ defineComponent({
   __name: "toolkit-item",
@@ -112407,7 +112580,7 @@ const _sfc_main$2h = /* @__PURE__ */ defineComponent({
             fn: withCtx(() => [
               createElementVNode("div", _hoisted_2$_, [
                 createElementVNode("div", _hoisted_3$L, [
-                  createElementVNode("span", _hoisted_4$C, toDisplayString(__props.title), 1),
+                  createElementVNode("span", _hoisted_4$B, toDisplayString(__props.title), 1),
                   createElementVNode("span", {
                     class: "close",
                     onClick: onClose
@@ -112579,7 +112752,7 @@ function createDesignPaperWidgetToWidgetFactory(getManifest) {
 const _hoisted_1$1x = { class: "content-fields-wrapper" };
 const _hoisted_2$Z = { class: "search" };
 const _hoisted_3$K = { class: "container" };
-const _hoisted_4$B = { class: "item main" };
+const _hoisted_4$A = { class: "item main" };
 const _hoisted_5$q = {
   key: 0,
   class: "field-list-wrap"
@@ -112687,7 +112860,7 @@ const _sfc_main$2g = /* @__PURE__ */ defineComponent({
           }, 8, ["modelValue"])
         ]),
         createElementVNode("div", _hoisted_3$K, [
-          createElementVNode("div", _hoisted_4$B, toDisplayString(unref(modelMeta)?.modelName), 1),
+          createElementVNode("div", _hoisted_4$A, toDisplayString(unref(modelMeta)?.modelName), 1),
           filteredFields.value.length ? (openBlock(), createElementBlock("div", _hoisted_5$q, [
             createVNode(unref(GctScrollbar), null, {
               default: withCtx(() => [
@@ -112875,7 +113048,7 @@ const _hoisted_3$I = {
   key: 0,
   class: "breadcrumb"
 };
-const _hoisted_4$A = {
+const _hoisted_4$z = {
   key: 1,
   class: "title"
 };
@@ -112966,7 +113139,7 @@ const _sfc_main$2d = /* @__PURE__ */ defineComponent({
               ]),
               _: 1
             })
-          ])) : (openBlock(), createElementBlock("div", _hoisted_4$A, toDisplayString(unref(schemaTitle) || "表单属性"), 1))
+          ])) : (openBlock(), createElementBlock("div", _hoisted_4$z, toDisplayString(unref(schemaTitle) || "表单属性"), 1))
         ]),
         createElementVNode("div", {
           class: normalizeClass(["panel-container", unref(active) ? unref(active).panelType.replace(":", "-") + "-container" : void 0])
@@ -113510,7 +113683,7 @@ function resolveTableColModelIndex(tableCell) {
 const _hoisted_1$1t = { class: "item-suffix" };
 const _hoisted_2$W = { class: "item-suffix" };
 const _hoisted_3$H = { class: "item-suffix" };
-const _hoisted_4$z = { class: "item-suffix" };
+const _hoisted_4$y = { class: "item-suffix" };
 const _sfc_main$27 = /* @__PURE__ */ defineComponent({
   __name: "table-menu",
   props: {
@@ -113685,7 +113858,7 @@ const _sfc_main$27 = /* @__PURE__ */ defineComponent({
         }, [
           _cache[25] || (_cache[25] = createElementVNode("i", { class: "item-icon icon iconfont icon-a-xiacharuhang1" }, null, -1)),
           _cache[26] || (_cache[26] = createElementVNode("span", { class: "item-name" }, "在下方插入行", -1)),
-          createElementVNode("div", _hoisted_4$z, [
+          createElementVNode("div", _hoisted_4$y, [
             createVNode(unref(GctInputNumber), {
               min: 1,
               modelValue: insertAfterRowCount.value,
@@ -113809,7 +113982,7 @@ const _sfc_main$26 = /* @__PURE__ */ defineComponent({
 const _hoisted_1$1s = { class: "validation-comment-item" };
 const _hoisted_2$V = { class: "validation-comment-panel-container" };
 const _hoisted_3$G = { class: "comment-header" };
-const _hoisted_4$y = { class: "comment-messages" };
+const _hoisted_4$x = { class: "comment-messages" };
 const _hoisted_5$o = { class: "message-item" };
 const _hoisted_6$i = { class: "field-name" };
 const _hoisted_7$d = { class: "error-text" };
@@ -113895,7 +114068,7 @@ const _sfc_main$25 = /* @__PURE__ */ defineComponent({
                 class: normalizeClass(["comment-tag", header.value.cls])
               }, toDisplayString(header.value.title), 3)
             ]),
-            createElementVNode("div", _hoisted_4$y, [
+            createElementVNode("div", _hoisted_4$x, [
               (openBlock(true), createElementBlock(Fragment, null, renderList(fieldErrorList.value, (item) => {
                 return openBlock(), createElementBlock("div", _hoisted_5$o, [
                   createElementVNode("div", _hoisted_6$i, toDisplayString(unref(fieldInfo)?.name) + "：", 1),
@@ -113996,7 +114169,7 @@ const ValidationCommentLayer = /* @__PURE__ */ _export_sfc(_sfc_main$24, [["__sc
 const _hoisted_1$1q = { class: "cl__item" };
 const _hoisted_2$U = { class: "cl__item-panel-container" };
 const _hoisted_3$F = { class: "cl__hdr" };
-const _hoisted_4$x = { class: "cl__hdr-title" };
+const _hoisted_4$w = { class: "cl__hdr-title" };
 const _hoisted_5$n = {
   key: 0,
   class: "cl__hdr-flag"
@@ -114111,7 +114284,7 @@ const _sfc_main$23 = /* @__PURE__ */ defineComponent({
         }, [
           createElementVNode("article", _hoisted_2$U, [
             createElementVNode("header", _hoisted_3$F, [
-              createElementVNode("div", _hoisted_4$x, toDisplayString(getHeaderLabel(__props.data.changeType)), 1),
+              createElementVNode("div", _hoisted_4$w, toDisplayString(getHeaderLabel(__props.data.changeType)), 1),
               __props.data.isCurrentChange ? (openBlock(), createElementBlock("div", _hoisted_5$n, "本次变更")) : createCommentVNode("", true)
             ]),
             createElementVNode("div", _hoisted_6$h, [
@@ -114705,7 +114878,7 @@ const _hoisted_3$E = {
   key: 1,
   class: "empty-container"
 };
-const _hoisted_4$w = {
+const _hoisted_4$v = {
   key: 0,
   class: "right-container"
 };
@@ -114793,7 +114966,7 @@ const _sfc_main$1$ = /* @__PURE__ */ defineComponent({
                   width: isPreview.value ? "0px" : `${unref(rightWidth)}px`
                 })
               }, [
-                !isPreview.value ? (openBlock(), createElementBlock("div", _hoisted_4$w, [
+                !isPreview.value ? (openBlock(), createElementBlock("div", _hoisted_4$v, [
                   createElementVNode("div", {
                     class: "divider",
                     onMousedown: _cache[0] || (_cache[0] = (e) => handleMouseDown(e))
@@ -118885,7 +119058,7 @@ const PortraitIcon = /* @__PURE__ */ _export_sfc(_sfc_main$1G, [["render", _sfc_
 const _hoisted_1$1k = { class: "orientation-item" };
 const _hoisted_2$R = { class: "orientation-icon" };
 const _hoisted_3$D = { class: "orientation-item" };
-const _hoisted_4$v = { class: "orientation-icon" };
+const _hoisted_4$u = { class: "orientation-icon" };
 const _sfc_main$1F = /* @__PURE__ */ defineComponent({
   __name: "orientation-module",
   props: {
@@ -118924,7 +119097,7 @@ const _sfc_main$1F = /* @__PURE__ */ defineComponent({
             }, 8, ["value"])
           ]),
           createElementVNode("label", _hoisted_3$D, [
-            createElementVNode("span", _hoisted_4$v, [
+            createElementVNode("span", _hoisted_4$u, [
               createVNode(LandscapeIcon)
             ]),
             createVNode(unref(GctRadio), {
@@ -119096,7 +119269,7 @@ const _hoisted_3$C = {
   key: 0,
   class: "head"
 };
-const _hoisted_4$u = { class: "title" };
+const _hoisted_4$t = { class: "title" };
 const _hoisted_5$l = {
   key: 1,
   class: "link"
@@ -119133,7 +119306,7 @@ const _sfc_main$1D = /* @__PURE__ */ defineComponent({
             onClick: ($event) => _ctx.$emit("active", item)
           }, [
             item?.thead ? (openBlock(), createElementBlock("div", _hoisted_3$C, [
-              createElementVNode("span", _hoisted_4$u, toDisplayString(item.thead.name || "[表头]"), 1),
+              createElementVNode("span", _hoisted_4$t, toDisplayString(item.thead.name || "[表头]"), 1),
               createVNode(unref(GctIcon), {
                 class: "icon",
                 icon: "icon-shanchu2",
@@ -119602,7 +119775,7 @@ function usePanelProps(targetRef, propsPath, opts) {
 const _hoisted_1$1g = { class: "panel-dynamic-table" };
 const _hoisted_2$N = { class: "container" };
 const _hoisted_3$A = { class: "container" };
-const _hoisted_4$t = { class: "form-custom-label" };
+const _hoisted_4$s = { class: "form-custom-label" };
 const _hoisted_5$k = { class: "content" };
 const _sfc_main$1B = /* @__PURE__ */ defineComponent({
   __name: "DynamicTablePanel",
@@ -119704,7 +119877,7 @@ const _sfc_main$1B = /* @__PURE__ */ defineComponent({
             createElementVNode("div", _hoisted_3$A, [
               createVNode(unref(GctFormItem), null, {
                 label: withCtx(() => [
-                  createElementVNode("div", _hoisted_4$t, [
+                  createElementVNode("div", _hoisted_4$s, [
                     _cache[2] || (_cache[2] = createElementVNode("span", null, "快速填报", -1)),
                     createVNode(unref(_sfc_main$34), {
                       distance: 12,
@@ -119754,7 +119927,7 @@ const schema$b = {
 const _hoisted_1$1f = { class: "panel-2d-table" };
 const _hoisted_2$M = { class: "container" };
 const _hoisted_3$z = { class: "line-content" };
-const _hoisted_4$s = { class: "line-content cell-count" };
+const _hoisted_4$r = { class: "line-content cell-count" };
 const _sfc_main$1A = /* @__PURE__ */ defineComponent({
   __name: "_2DTablePanel",
   props: {
@@ -119866,7 +120039,7 @@ const _sfc_main$1A = /* @__PURE__ */ defineComponent({
                   onClick: _cache[1] || (_cache[1] = withModifiers(($event) => onDelete("deleteDataGroup2D"), ["stop"]))
                 }, "删除动态关联")) : createCommentVNode("", true)
               ]),
-              createElementVNode("div", _hoisted_4$s, [
+              createElementVNode("div", _hoisted_4$r, [
                 _cache[2] || (_cache[2] = createElementVNode("span", null, "当前已固定", -1)),
                 createElementVNode("span", null, toDisplayString(unref(regionRef)?.cellCount), 1),
                 _cache[3] || (_cache[3] = createElementVNode("span", null, "个单元格", -1))
@@ -119931,7 +120104,8 @@ const AddBtn = /* @__PURE__ */ _export_sfc(_sfc_main$1z, [["__scopeId", "data-v-
 const _sfc_main$1y = /* @__PURE__ */ defineComponent({
   __name: "parse-rule-editor",
   props: {
-    modelValue: { default: void 0 }
+    modelValue: { default: void 0 },
+    subModelKey: { default: void 0 }
   },
   emits: ["update:modelValue"],
   setup(__props, { emit: __emit }) {
@@ -119960,8 +120134,9 @@ const _sfc_main$1y = /* @__PURE__ */ defineComponent({
     return (_ctx, _cache) => {
       return openBlock(), createBlock(AddBtn, {
         modelValue: value.value,
-        "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => value.value = $event)
-      }, null, 8, ["modelValue"]);
+        "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => value.value = $event),
+        subModelKey: __props.subModelKey
+      }, null, 8, ["modelValue", "subModelKey"]);
     };
   }
 });
@@ -120035,7 +120210,7 @@ const _hoisted_3$y = {
   key: 0,
   class: "iconfont icon-drag mover"
 };
-const _hoisted_4$r = { class: "bom-entry-item-content ks-col" };
+const _hoisted_4$q = { class: "bom-entry-item-content ks-col" };
 const _hoisted_5$j = { class: "bom-entry-item-content-item ell overflow-hidden" };
 const _hoisted_6$e = ["title"];
 const _hoisted_7$9 = { class: "bom-entry-item-btns ml8px" };
@@ -120067,7 +120242,7 @@ const _sfc_main$1w = /* @__PURE__ */ defineComponent({
     }
     const edit = async (data) => {
       const cloneData = cloneDeep(data);
-      const hasIds = calcHasProductIds();
+      const hasIds = calcHasProductIds(data);
       triggerUtil.handle("OPEN_MATERIAL_CONSUME_TABLE_ADD_MATERIAL_MODAL", { data: cloneData, hasIds }).then((res) => {
         if (res.ok) {
           Object.assign(data, res.data);
@@ -120131,7 +120306,7 @@ const _sfc_main$1w = /* @__PURE__ */ defineComponent({
           item: withCtx(({ element }) => [
             createElementVNode("div", _hoisted_2$L, [
               !__props.disabled ? (openBlock(), createElementBlock("i", _hoisted_3$y)) : createCommentVNode("", true),
-              createElementVNode("div", _hoisted_4$r, [
+              createElementVNode("div", _hoisted_4$q, [
                 createElementVNode("div", _hoisted_5$j, [
                   (openBlock(), createBlock(_sfc_main$1x, {
                     key: element.product_id_,
@@ -120177,11 +120352,11 @@ const _sfc_main$1w = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const BomEntryEditor = /* @__PURE__ */ _export_sfc(_sfc_main$1w, [["__scopeId", "data-v-bd727c66"]]);
+const BomEntryEditor = /* @__PURE__ */ _export_sfc(_sfc_main$1w, [["__scopeId", "data-v-d7a225cc"]]);
 const _hoisted_1$1c = { class: "panel-material-consume-table" };
 const _hoisted_2$K = { class: "container" };
 const _hoisted_3$x = { class: "container" };
-const _hoisted_4$q = { class: "content" };
+const _hoisted_4$p = { class: "content" };
 const _hoisted_5$i = { class: "entries-container" };
 const _hoisted_6$d = { class: "content" };
 const _sfc_main$1v = /* @__PURE__ */ defineComponent({
@@ -120291,7 +120466,7 @@ const _sfc_main$1v = /* @__PURE__ */ defineComponent({
                   createVNode(_sfc_main$1y, {
                     modelValue: unref(regionProps).barcode_parsing_rules_id_,
                     "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => unref(regionProps).barcode_parsing_rules_id_ = $event),
-                    subModelKey: fieldInfo.value?.modelKey
+                    subModelKey: fieldInfo.value?.bindInfo
                   }, null, 8, ["modelValue", "subModelKey"])
                 ]),
                 _: 1
@@ -120301,7 +120476,7 @@ const _sfc_main$1v = /* @__PURE__ */ defineComponent({
                   createElementVNode("div", { class: "form-custom-label" }, " 人为指定物料 ", -1)
                 ])]),
                 default: withCtx(() => [
-                  createElementVNode("div", _hoisted_4$q, [
+                  createElementVNode("div", _hoisted_4$p, [
                     createVNode(unref(GctSwitch), {
                       modelValue: unref(regionProps).personal_bom_enabled_,
                       "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => unref(regionProps).personal_bom_enabled_ = $event),
@@ -120342,7 +120517,7 @@ const _sfc_main$1v = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const MaterialConsumeTablePanel = /* @__PURE__ */ _export_sfc(_sfc_main$1v, [["__scopeId", "data-v-e911ba4d"]]);
+const MaterialConsumeTablePanel = /* @__PURE__ */ _export_sfc(_sfc_main$1v, [["__scopeId", "data-v-d02b91ab"]]);
 const schema$9 = {
   key: "material-consume-table.basic",
   title: [
@@ -120354,7 +120529,7 @@ const schema$9 = {
 const _hoisted_1$1b = { class: "panel-fixed-table" };
 const _hoisted_2$J = { class: "container" };
 const _hoisted_3$w = { class: "line-content" };
-const _hoisted_4$p = { class: "line-content cell-count" };
+const _hoisted_4$o = { class: "line-content cell-count" };
 const _sfc_main$1u = /* @__PURE__ */ defineComponent({
   __name: "FixedTablePanel",
   props: {
@@ -120466,7 +120641,7 @@ const _sfc_main$1u = /* @__PURE__ */ defineComponent({
                   onClick: _cache[1] || (_cache[1] = withModifiers(($event) => onDelete("deleteBoundedItem"), ["stop"]))
                 }, "删除数据分组")) : createCommentVNode("", true)
               ]),
-              createElementVNode("div", _hoisted_4$p, [
+              createElementVNode("div", _hoisted_4$o, [
                 _cache[2] || (_cache[2] = createElementVNode("span", null, "当前已固定", -1)),
                 createElementVNode("span", null, toDisplayString(unref(regionRef)?.cellCount), 1),
                 _cache[3] || (_cache[3] = createElementVNode("span", null, "个单元格", -1))
@@ -120491,7 +120666,7 @@ const schema$8 = {
 const _hoisted_1$1a = { class: "panel-check-table" };
 const _hoisted_2$I = { class: "container" };
 const _hoisted_3$v = { class: "line-content" };
-const _hoisted_4$o = { class: "line-content cell-count" };
+const _hoisted_4$n = { class: "line-content cell-count" };
 const _sfc_main$1t = /* @__PURE__ */ defineComponent({
   __name: "CheckTablePanel",
   props: {
@@ -120603,7 +120778,7 @@ const _sfc_main$1t = /* @__PURE__ */ defineComponent({
                   onClick: _cache[1] || (_cache[1] = withModifiers(($event) => onDelete("deleteDataGroup2D"), ["stop"]))
                 }, "删除动态关联")) : createCommentVNode("", true)
               ]),
-              createElementVNode("div", _hoisted_4$o, [
+              createElementVNode("div", _hoisted_4$n, [
                 _cache[2] || (_cache[2] = createElementVNode("span", null, "当前已固定", -1)),
                 createElementVNode("span", null, toDisplayString(unref(regionRef)?.cellCount), 1),
                 _cache[3] || (_cache[3] = createElementVNode("span", null, "个单元格", -1))
@@ -120628,7 +120803,7 @@ const schema$7 = {
 const _hoisted_1$19 = { class: "panel-data-group" };
 const _hoisted_2$H = { class: "container" };
 const _hoisted_3$u = { class: "line-content" };
-const _hoisted_4$n = { class: "content" };
+const _hoisted_4$m = { class: "content" };
 const _sfc_main$1s = /* @__PURE__ */ defineComponent({
   __name: "DataGroupPanel",
   props: {
@@ -120692,7 +120867,7 @@ const _sfc_main$1s = /* @__PURE__ */ defineComponent({
               ]),
               createVNode(unref(GctFormItem), { label: "引用填充（撑满固定表）" }, {
                 default: withCtx(() => [
-                  createElementVNode("div", _hoisted_4$n, [
+                  createElementVNode("div", _hoisted_4$m, [
                     createVNode(unref(GctSwitch), {
                       modelValue: unref(regionProps).autoFill,
                       "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => unref(regionProps).autoFill = $event),
@@ -120737,7 +120912,7 @@ const schema$6 = {
 const _hoisted_1$18 = { class: "panel-data-group-2d" };
 const _hoisted_2$G = { class: "container" };
 const _hoisted_3$t = { class: "line-content" };
-const _hoisted_4$m = { class: "content" };
+const _hoisted_4$l = { class: "content" };
 const _sfc_main$1r = /* @__PURE__ */ defineComponent({
   __name: "DataGroup2DPanel",
   props: {
@@ -120818,7 +120993,7 @@ const _sfc_main$1r = /* @__PURE__ */ defineComponent({
               ]),
               createVNode(unref(GctFormItem), { label: "引用填充（撑满表格）" }, {
                 default: withCtx(() => [
-                  createElementVNode("div", _hoisted_4$m, [
+                  createElementVNode("div", _hoisted_4$l, [
                     createVNode(unref(GctSwitch), {
                       modelValue: unref(regionProps).autoFill,
                       "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => unref(regionProps).autoFill = $event),
@@ -121851,7 +122026,7 @@ const _sfc_main$1g = /* @__PURE__ */ defineComponent({
 const _hoisted_1$12 = { class: "data-source-model-link-wrapper" };
 const _hoisted_2$C = { class: "model-link-container" };
 const _hoisted_3$r = { class: "model-link-content" };
-const _hoisted_4$l = { class: "model-link-item" };
+const _hoisted_4$k = { class: "model-link-item" };
 const _hoisted_5$h = { class: "model-link-item" };
 const _sfc_main$1f = /* @__PURE__ */ defineComponent({
   __name: "data-source-model-link",
@@ -122026,7 +122201,7 @@ const _sfc_main$1f = /* @__PURE__ */ defineComponent({
       return openBlock(), createElementBlock("div", _hoisted_1$12, [
         createElementVNode("div", _hoisted_2$C, [
           createElementVNode("div", _hoisted_3$r, [
-            createElementVNode("div", _hoisted_4$l, [
+            createElementVNode("div", _hoisted_4$k, [
               _cache[9] || (_cache[9] = createElementVNode("span", { class: "blank first" }, "当", -1)),
               createVNode(unref(GctSelect), {
                 class: "custom-select",
@@ -122278,7 +122453,7 @@ const _sfc_main$1d = /* @__PURE__ */ defineComponent({
 const _hoisted_1$10 = { class: "data-source-field-map-wrapper" };
 const _hoisted_2$A = { class: "field-map-container" };
 const _hoisted_3$p = { class: "field-map-content" };
-const _hoisted_4$k = { class: "field-map-item" };
+const _hoisted_4$j = { class: "field-map-item" };
 const _hoisted_5$g = { class: "blank last" };
 const _hoisted_6$c = ["onClick"];
 const _sfc_main$1c = /* @__PURE__ */ defineComponent({
@@ -122427,7 +122602,7 @@ const _sfc_main$1c = /* @__PURE__ */ defineComponent({
         _cache[3] || (_cache[3] = createElementVNode("div", { class: "line" }, null, -1)),
         createElementVNode("div", _hoisted_2$A, [
           createElementVNode("div", _hoisted_3$p, [
-            createElementVNode("div", _hoisted_4$k, [
+            createElementVNode("div", _hoisted_4$j, [
               createVNode(unref(GctSelect), {
                 class: "custom-select",
                 bordered: false,
@@ -122514,7 +122689,7 @@ const DataSourceFieldMap = /* @__PURE__ */ _export_sfc(_sfc_main$1c, [["__scopeI
 const _hoisted_1$$ = { class: "param-link-container" };
 const _hoisted_2$z = { class: "param-link-content" };
 const _hoisted_3$o = { class: "param-link-item" };
-const _hoisted_4$j = { class: "blank last" };
+const _hoisted_4$i = { class: "blank last" };
 const _hoisted_5$f = ["onClick"];
 const _sfc_main$1b = /* @__PURE__ */ defineComponent({
   __name: "param-field-link",
@@ -122656,7 +122831,7 @@ const _sfc_main$1b = /* @__PURE__ */ defineComponent({
                 "onUpdate:modelValue": ($event) => fieldItem.field = $event,
                 options: fieldOptions.value
               }, null, 8, ["modelValue", "onUpdate:modelValue", "options"]),
-              createElementVNode("span", _hoisted_4$j, [
+              createElementVNode("span", _hoisted_4$i, [
                 createElementVNode("i", {
                   class: "iconfont icon-shanchu",
                   onClick: ($event) => removeFieldItem(fieldItem)
@@ -123014,7 +123189,7 @@ const _sfc_main$19 = /* @__PURE__ */ defineComponent({
 const _hoisted_1$Z = { class: "field-dependency-form" };
 const _hoisted_2$x = { class: "form-row current-component" };
 const _hoisted_3$m = { class: "control" };
-const _hoisted_4$i = { class: "field-icon" };
+const _hoisted_4$h = { class: "field-icon" };
 const _hoisted_5$e = { class: "form-row" };
 const _hoisted_6$b = { class: "control" };
 const _hoisted_7$8 = { class: "form-row" };
@@ -123113,7 +123288,7 @@ const _sfc_main$18 = /* @__PURE__ */ defineComponent({
         createElementVNode("div", _hoisted_2$x, [
           _cache[9] || (_cache[9] = createElementVNode("div", { class: "label" }, "当前组件", -1)),
           createElementVNode("div", _hoisted_3$m, [
-            createElementVNode("div", _hoisted_4$i, [
+            createElementVNode("div", _hoisted_4$h, [
               createVNode(unref(GctIcon), {
                 class: "icon",
                 icon: __props.fieldIdentity.icon,
@@ -123294,7 +123469,7 @@ const getFormulaFieldOptions = (infoList) => {
 const _hoisted_1$Y = { class: "field-dependency-module" };
 const _hoisted_2$w = { class: "field-dependency-list" };
 const _hoisted_3$l = { class: "item-header" };
-const _hoisted_4$h = { class: "title" };
+const _hoisted_4$g = { class: "title" };
 const _hoisted_5$d = { class: "main" };
 const _hoisted_6$a = {
   key: 0,
@@ -123459,7 +123634,7 @@ const _sfc_main$17 = /* @__PURE__ */ defineComponent({
               class: "field-dependency-item"
             }, [
               createElementVNode("div", _hoisted_3$l, [
-                createElementVNode("div", _hoisted_4$h, [
+                createElementVNode("div", _hoisted_4$g, [
                   createElementVNode("span", _hoisted_5$d, toDisplayString(unref(FieldDependencyTypeCh)[type4]), 1),
                   type4 === unref(FieldDependencyTypeConst).Assignment ? (openBlock(), createElementBlock("span", _hoisted_6$a, " 公式计算 ")) : createCommentVNode("", true)
                 ]),
@@ -123758,8 +123933,7 @@ const schema$2 = {
 };
 const _hoisted_1$V = { class: "panel-table-header" };
 const _hoisted_2$u = { class: "container" };
-const _hoisted_3$j = { class: "readonly-text" };
-const _hoisted_4$g = { class: "render-mode" };
+const _hoisted_3$j = { class: "render-mode" };
 const _sfc_main$14 = /* @__PURE__ */ defineComponent({
   __name: "TableHeaderPanel",
   props: {
@@ -123817,15 +123991,9 @@ const _sfc_main$14 = /* @__PURE__ */ defineComponent({
                 ]),
                 _: 1
               }, 8, ["label"]),
-              createVNode(unref(GctFormItem), { label: "单元格" }, {
-                default: withCtx(() => [
-                  createElementVNode("span", _hoisted_3$j, toDisplayString(headerInfo.value.range), 1)
-                ]),
-                _: 1
-              }),
               createVNode(unref(GctFormItem), { label: "渲染方式" }, {
                 default: withCtx(() => [
-                  createElementVNode("span", _hoisted_4$g, toDisplayString(headerInfo.value.renderMode), 1)
+                  createElementVNode("span", _hoisted_3$j, toDisplayString(headerInfo.value.renderMode), 1)
                 ]),
                 _: 1
               })
@@ -123837,7 +124005,7 @@ const _sfc_main$14 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const TableHeaderPanel = /* @__PURE__ */ _export_sfc(_sfc_main$14, [["__scopeId", "data-v-22abf304"]]);
+const TableHeaderPanel = /* @__PURE__ */ _export_sfc(_sfc_main$14, [["__scopeId", "data-v-1c020e08"]]);
 const schema$1 = {
   key: "table-header.basic",
   title: "表头",
@@ -130171,8 +130339,7 @@ function shouldEnableLinkage(doc, clickedFieldType, clickedKey) {
 function buildLikeQuery(fields, keyword, query) {
   if (!keyword?.trim()) {
     return {
-      //   queryData: { ...query }, // todo 暂时注释，不然一条数据都请求不到
-      queryData: {},
+      queryData: { ...query },
       exp: ""
     };
   }
@@ -130183,7 +130350,7 @@ function buildLikeQuery(fields, keyword, query) {
       return prev;
     },
     {
-      // ...query // todo 暂时注释，不然一条数据都请求不到
+      ...query
     }
   );
   const exp = `OR(${fields.map((k) => `${k}.like`).join(",")})`;
@@ -130194,8 +130361,15 @@ const selectStrategyMap = {
     columnsKey: "lot-sn",
     fetcher: "lot2sn",
     allowManualInput: true,
-    buildQuery({ keyword }) {
-      return buildLikeQuery(["material_no_"], keyword);
+    buildQuery({ keyword, extraParams }) {
+      return buildLikeQuery(
+        ["material_no_"],
+        keyword,
+        {
+          "instance_status_.ne": "ARCHIVED",
+          ...extraParams
+        }
+      );
     },
     transform: transformLotData
   },
@@ -130204,7 +130378,7 @@ const selectStrategyMap = {
     fetcher: "lot2sn",
     allowManualInput: true,
     buildQuery({ keyword }) {
-      return buildLikeQuery(["material_no_"], keyword);
+      return buildLikeQuery(["material_no_"], keyword, { "instance_status_.ne": "ARCHIVED" });
     },
     transform: transformLotData
   },
@@ -130213,7 +130387,7 @@ const selectStrategyMap = {
     fetcher: "lot2sn",
     allowManualInput: true,
     buildQuery({ keyword }) {
-      return buildLikeQuery(["material_no_"], keyword);
+      return buildLikeQuery(["material_no_"], keyword, { "instance_status_.ne": "ARCHIVED" });
     },
     transform: transformLotData
   },
@@ -130239,7 +130413,11 @@ const selectStrategyMap = {
     columnsKey: "route-operation",
     fetcher: "ref",
     buildQuery({ keyword }) {
-      return buildLikeQuery(["name_", "code_"], keyword);
+      return buildLikeQuery(["name_", "code_"], keyword, {
+        type_: "NODE_SPEC",
+        operating_state_: true
+        // ref_master_id_: paramsConfig?.routingId, // todo
+      });
     },
     transform: transformLotData
   },
@@ -130248,7 +130426,9 @@ const selectStrategyMap = {
     fetcher: "ref",
     clearFieldId: "scrap_reason_1_",
     buildQuery({ keyword }) {
-      return buildLikeQuery(["name_", "code_"], keyword);
+      return buildLikeQuery(["name_", "code_"], keyword, {
+        operating_state_: true
+      });
     },
     transform: transformLotData
   },
@@ -130272,7 +130452,9 @@ const selectStrategyMap = {
           isLinkQuery: true
         };
         if (keyword?.trim()) {
-          const { queryData: searchQuery, exp } = buildLikeQuery(["name_", "code_"], keyword);
+          const { queryData: searchQuery, exp } = buildLikeQuery(["name_", "code_"], keyword, {
+            operating_state_: true
+          });
           return { queryData: { ...queryData, ...searchQuery }, exp };
         }
         return {
@@ -130280,7 +130462,9 @@ const selectStrategyMap = {
           exp: ""
         };
       }
-      return buildLikeQuery(["name_", "code_"], keyword);
+      return buildLikeQuery(["name_", "code_"], keyword, {
+        operating_state_: true
+      });
     },
     transform: transformLotData
   },
@@ -130289,7 +130473,9 @@ const selectStrategyMap = {
     fetcher: "ref",
     clearFieldId: "not_good_reason_1_",
     buildQuery({ keyword }) {
-      return buildLikeQuery(["name_", "code_"], keyword);
+      return buildLikeQuery(["name_", "code_"], keyword, {
+        operating_state_: true
+      });
     },
     transform: transformLotData
   },
@@ -130313,7 +130499,9 @@ const selectStrategyMap = {
           isLinkQuery: true
         };
         if (keyword?.trim()) {
-          const { queryData: searchQuery, exp } = buildLikeQuery(["name_", "code_"], keyword);
+          const { queryData: searchQuery, exp } = buildLikeQuery(["name_", "code_"], keyword, {
+            operating_state_: true
+          });
           return { queryData: { ...queryData, ...searchQuery }, exp };
         }
         return {
@@ -130321,7 +130509,9 @@ const selectStrategyMap = {
           exp: ""
         };
       }
-      return buildLikeQuery(["name_", "code_"], keyword);
+      return buildLikeQuery(["name_", "code_"], keyword, {
+        operating_state_: true
+      });
     },
     transform: transformLotData
   },
@@ -130329,8 +130519,15 @@ const selectStrategyMap = {
     columnsKey: "rdo-ref",
     fetcher: "rdo2ref",
     isTree: true,
-    buildQuery({ keyword }) {
-      return buildLikeQuery(["name_", "code_"], keyword);
+    buildQuery({ keyword, extraParams }) {
+      return buildLikeQuery(
+        ["name_", "code_"],
+        keyword,
+        {
+          operating_state_: true,
+          ...extraParams
+        }
+      );
     },
     transform: transformTreeData
   },
@@ -130339,7 +130536,9 @@ const selectStrategyMap = {
     fetcher: "rdo2ref",
     isTree: true,
     buildQuery({ keyword }) {
-      return buildLikeQuery(["name_", "code_"], keyword);
+      return buildLikeQuery(["name_", "code_"], keyword, {
+        operating_state_: true
+      });
     },
     transform: transformTreeData
   }
@@ -130421,12 +130620,22 @@ function useTableDropdown(props, searchFilters) {
     const { buildQuery, fetcher: fetcher2, transform } = strategy.value;
     const isLinkQuery = enableLinkage.value;
     const filters = unref(searchFilters);
+    const valuePath = fieldMeta.value?.valuePath;
+    const subFieldConfig = getSubFieldConfig(docInst.value.paramsConfig);
+    let extraParams = subFieldConfig.get(valuePath);
+    const dataIndex = props.widget?.dataSlotIndex?.dataIndex;
+    if (valuePath && isNumber(dataIndex)) {
+      const _valuePath = valuePath.replace("[n]", `[${dataIndex}]`);
+      const _extraParams = subFieldConfig.get(_valuePath);
+      Object.assign(extraParams, _extraParams);
+    }
     const { queryData = {}, exp = "" } = buildQuery?.({
       keyword,
       isLinkQuery,
       linkDataId: isLinkQuery ? String(linkDataValue.value ?? "") : void 0,
       searchField: widgetProps.value.searchField,
-      deviceTypeId: deviceTypeId ?? filters?.deviceTypeId
+      deviceTypeId: deviceTypeId ?? filters?.deviceTypeId,
+      extraParams
     }) ?? {};
     const res = await apiFetchers[fetcher2].getOptions({
       fieldKey: fieldInfo.value.key,