@gct-paas/word 0.1.63-beta.9 → 0.1.63

package/dist/index.es.js

@@ -33535,7 +33535,7 @@ function getValue$1(value, multiple) {
   }
   return value;
 }
-function setValue(value, valuePath, payload) {
+function setValue$1(value, valuePath, payload) {
   const { multiple = false, valueKey } = payload || {};
   const values = multiple ? value?.map((item) => valueKey ? item[valueKey] : item).join(",") || null : value ?? null;
   return {
@@ -81339,7 +81339,7 @@ function getLabelPath(path) {
 function getHrefPath(path) {
   return path + HREF_SUFFIX;
 }
-function getIdPath(path) {
+function getIdPath$1(path) {
   return path + ID_SUFFIX;
 }
 function isCompanionIdPath(path) {
@@ -84511,7 +84511,7 @@ function createIdEnricher(reg) {
   return createCompanionEnricher(reg, {
     cacheNamespace: "id_enrich_resolve",
     defaultIdPrefix: "id:",
-    getCompanionPath: getIdPath,
+    getCompanionPath: getIdPath$1,
     preserveOnHydrate: true,
     skipWhenCompanionPresent: true,
     buildCacheKey: (path, value, doc) => ({
@@ -85362,7 +85362,7 @@ class DataManager {
     return getHrefPath(path);
   }
   getIdPath(path) {
-    return getIdPath(path);
+    return getIdPath$1(path);
   }
   getFieldRuntimeSpecificConfigKeys() {
     return [...this.fieldRuntimeConfigByPath.keys()];
@@ -86591,7 +86591,7 @@ class DataManager {
       designValuePath,
       getLabelPath(designValuePath),
       getHrefPath(designValuePath),
-      getIdPath(designValuePath)
+      getIdPath$1(designValuePath)
     ];
     const wildcardKeys = new Set(bases.map((path) => this.convertPathToWildcard(path)));
     const result = new Set(bases);
@@ -86615,7 +86615,7 @@ class DataManager {
       paths.add(path);
       paths.add(getLabelPath(path));
       paths.add(getHrefPath(path));
-      paths.add(getIdPath(path));
+      paths.add(getIdPath$1(path));
     }
     return [...paths];
   }
@@ -86626,7 +86626,7 @@ class DataManager {
         designValuePath,
         getLabelPath(designValuePath),
         getHrefPath(designValuePath),
-        getIdPath(designValuePath)
+        getIdPath$1(designValuePath)
       ].map((path) => this.convertPathToWildcard(path))
     );
     const nodes = this.collectDepNodes();
@@ -86873,7 +86873,7 @@ function buildFieldSelectUpdates(valuePath, value, optionId, options = {}) {
     [valuePath]: normalizedValue
   };
   if (options.persistOptionId) {
-    updates[getIdPath(valuePath)] = optionId ?? null;
+    updates[getIdPath$1(valuePath)] = optionId ?? null;
   }
   return updates;
 }
@@ -89134,7 +89134,7 @@ const CLEAR_ON_MFG_ORDER_SWITCH = [F$2.materialContainer, F$2.productionContaine
 const CLEAR_ON_MATERIAL_CONTAINER_NO_EMPTY = [...CLEAR_ON_COMMON_EMPTY];
 const CLEAR_ON_MATERIAL_CONTAINER_NO_SWITCH = [F$2.mfgOrder, F$2.productionContainer];
 const CLEAR_ON_MATERIAL_CONTAINER_NO_MANUAL_SWITCH = [...CLEAR_ON_COMMON_EMPTY];
-const MATERIAL_CONTAINER_ID = getIdPath(F$2.materialContainer);
+const MATERIAL_CONTAINER_ID = getIdPath$1(F$2.materialContainer);
 const PRODUCT_EDITABILITY_WATCH = [
   F$2.materialContainer,
   MATERIAL_CONTAINER_ID,
@@ -89444,7 +89444,7 @@ function handleMfgOrderChange(doc, subFieldKey, rowIndex) {
 function handleMaterialContainerNoChange(doc, subFieldKey, rowIndex) {
   const ctx = getRowChangeCtx(doc, subFieldKey, rowIndex);
   if (!ctx) return;
-  const clearWhenPresent = isBlank(ctx.row[getIdPath(F$2.materialContainer)]) ? [...CLEAR_ON_MATERIAL_CONTAINER_NO_MANUAL_SWITCH, ...CLEAR_ON_MATERIAL_CONTAINER_NO_SWITCH] : CLEAR_ON_MATERIAL_CONTAINER_NO_SWITCH;
+  const clearWhenPresent = isBlank(ctx.row[getIdPath$1(F$2.materialContainer)]) ? [...CLEAR_ON_MATERIAL_CONTAINER_NO_MANUAL_SWITCH, ...CLEAR_ON_MATERIAL_CONTAINER_NO_SWITCH] : CLEAR_ON_MATERIAL_CONTAINER_NO_SWITCH;
   handleIdentityFieldChange$1(
     ctx,
     F$2.materialContainer,
@@ -108232,7 +108232,6 @@ class BomEntryValidator {
       if (idSet.size > 1) {
         throw new Error(
           "整批替代不允许混用主料或者替代料"
-          /*$t('sys.edhr.mcTable.notAllowMixSubstituteMaterial')*/
         );
       }
     }
@@ -108279,7 +108278,6 @@ class BomEntryValidator {
     if (["eq", "lte"].includes(this.bomEntry.qty_validation_rule_) && consumeNum > this.remainingNum) {
       throw new Error(
         "当前物料上料总消耗不能大于需求数量"
-        /*$t('sys.edhr.mcTable.overMaterialConsumeError')*/
       );
     }
     if (this.bomEntry.qty_validation_rule_ === "bounds") {
@@ -109490,53 +109488,51 @@ const syncMaterialConsumeTableBomInfo = async (templateId, docModel) => {
 const initMaterialConsumeTableConfig = (doc, subConfig, tmplBomC) => {
   if (!tmplBomC?.formInstBom?.formTmplBomList) return;
   const useBomMode = tmplBomC.defaultMCPattern === MaterialConsumptionPatternEnum.BOM;
-  tmplBomC.formInstBom.formTmplBomList.forEach(({
-    personal_bom_enabled_,
-    entries_,
-    table_key_
-  }) => {
-    if (useBomMode) {
-      const entries = personal_bom_enabled_ ? entries_ : tmplBomC.bomEntries;
-      const includedIds = [];
-      (entries || []).forEach((e) => {
-        includedIds.push(e.product_id_.split(":").pop());
-        (e.substitute_material_entries_ || []).forEach((_e) => {
-          includedIds.push(_e.product_id_.split(":").pop());
+  tmplBomC.formInstBom.formTmplBomList.forEach(
+    ({ personal_bom_enabled_, entries_, table_key_ }) => {
+      if (useBomMode) {
+        const entries = personal_bom_enabled_ ? entries_ : tmplBomC.bomEntries;
+        const includedIds = [];
+        (entries || []).forEach((e) => {
+          includedIds.push(e.product_id_.split(":").pop());
+          (e.substitute_material_entries_ || []).forEach((_e) => {
+            includedIds.push(_e.product_id_.split(":").pop());
+          });
         });
-      });
-      subConfig[`${table_key_}[n].product_id_`] = { "id_.in": includedIds };
-    }
-    const subFieldKey = table_key_.replace("$.", "");
-    const rows = doc.dataManager.getRawData()[subFieldKey] || [];
-    const rowCount = rows.length;
-    repeat(rowCount || 1, (index2) => {
-      MCDataUtil.disableQtyFields(doc.dataManager, `${table_key_}[${index2}]`);
-    });
-    rows.forEach((row, rowIndex) => {
-      const rowPath = `${table_key_}[${rowIndex}]`;
-      const tableController = tmplBomC?.findTableControllerByField(table_key_);
-      if (row.product_id_) {
-        const versionId = row.product_id_.split(":").pop();
-        if (versionId) {
-          subConfig[`${rowPath}.material_no_`] = {
-            "product_id_.versionIn": [versionId]
-          };
-        }
+        subConfig[`${table_key_}[n].product_id_`] = { "id_.in": includedIds };
       }
-      MCDataUtil.updateViewFieldsDisablement({
-        dataManager: doc.dataManager,
-        rowPath,
-        disabled: !!tableController?.getMaterialTypeIsView(row.product_id_)
+      const subFieldKey = table_key_.replace("$.", "");
+      const rows = doc.dataManager.getRawData()[subFieldKey] || [];
+      const rowCount = rows.length;
+      repeat(rowCount || 1, (index2) => {
+        MCDataUtil.disableQtyFields(doc.dataManager, `${table_key_}[${index2}]`);
       });
-      if (row.is_confirmed_) {
-        MCDataUtil.updateConfirmableFieldsDisablement({
+      rows.forEach((row, rowIndex) => {
+        const rowPath = `${table_key_}[${rowIndex}]`;
+        const tableController = tmplBomC?.findTableControllerByField(table_key_);
+        if (row.product_id_) {
+          const versionId = row.product_id_.split(":").pop();
+          if (versionId) {
+            subConfig[`${rowPath}.material_no_`] = {
+              "product_id_.versionIn": [versionId]
+            };
+          }
+        }
+        MCDataUtil.updateViewFieldsDisablement({
           dataManager: doc.dataManager,
           rowPath,
-          disabled: true
+          disabled: !!tableController?.getMaterialTypeIsView(row.product_id_)
         });
-      }
-    });
-  });
+        if (row.is_confirmed_) {
+          MCDataUtil.updateConfirmableFieldsDisablement({
+            dataManager: doc.dataManager,
+            rowPath,
+            disabled: true
+          });
+        }
+      });
+    }
+  );
 };
 class DocRequestStrategy {
   props;
@@ -111747,7 +111743,7 @@ function appendFillMapPayload(payload, parsed, parseRules, runtimeValuePath) {
     for (const formField of mapItem?.formFields || []) {
       const path = resolveTargetPath(runtimeValuePath, formField);
       if (!path || path === runtimeValuePath) continue;
-      Object.assign(payload, setValue(value, path));
+      Object.assign(payload, setValue$1(value, path));
     }
   }
 }
@@ -111798,7 +111794,7 @@ async function submitDeviceScan(params) {
   if (!row) {
     return { ok: false, message: MSG_NO_DATA };
   }
-  const payload = setValue(row.__VALUE__, runtimeValuePath);
+  const payload = setValue$1(row.__VALUE__, runtimeValuePath);
   appendFillMapPayload(payload, parsed, parseRules, runtimeValuePath);
   return { ok: true, payload, record: row._item };
 }
@@ -125385,7 +125381,7 @@ const _sfc_main$2c = /* @__PURE__ */ defineComponent({
         return getValue$1(value, isMultiple.value);
       },
       set(v) {
-        const data = setValue(v, runtimeValuePath.value, {
+        const data = setValue$1(v, runtimeValuePath.value, {
           multiple: isMultiple.value
         });
         docInst.value?.dataManager.setMultiple(data, "user");
@@ -129165,7 +129161,7 @@ const _sfc_main$1G = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const MaterialConsumeTablePanel = /* @__PURE__ */ _export_sfc(_sfc_main$1G, [["__scopeId", "data-v-0b5a3b4b"]]);
+const MaterialConsumeTablePanel = /* @__PURE__ */ _export_sfc(_sfc_main$1G, [["__scopeId", "data-v-0e3048f6"]]);
 const schema$a = createTablePanelSchema("material-consume-table.basic", MaterialConsumeTablePanel);
 const schema$9 = createTablePanelSchema("fixed-table.basic", BoundedSubTablePanel);
 const _sfc_main$1F = /* @__PURE__ */ defineComponent({
@@ -139662,7 +139658,7 @@ const _sfc_main$f = /* @__PURE__ */ defineComponent({
       emitChange(value);
     }
     function emitChange(value) {
-      const data = setValue(value, runtimeValuePath.value, {
+      const data = setValue$1(value, runtimeValuePath.value, {
         multiple: props.isMultiple
       });
       emit("change", data);
@@ -139959,7 +139955,7 @@ const _sfc_main$d = /* @__PURE__ */ defineComponent({
       emitChange(null);
     }
     function emitChange(value) {
-      const data = setValue(value, runtimeValuePath.value, {
+      const data = setValue$1(value, runtimeValuePath.value, {
         multiple: props.isMultiple
       });
       emit("change", data);
@@ -140047,7 +140043,7 @@ const _sfc_main$c = /* @__PURE__ */ defineComponent({
       () => isDateTime.value ? resolveDateTimePickerTimeFormat(widgetProps.value) : void 0
     );
     function onPanelChange(v) {
-      const data = setValue(
+      const data = setValue$1(
         v ? formatDateTimeForStorage(v, storageFormat.value, pickerTimeFormat.value) : v,
         runtimeValuePath.value
       );
@@ -140086,7 +140082,7 @@ const _sfc_main$b = /* @__PURE__ */ defineComponent({
     const pickerFormat = computed(() => resolveTimePickerFormat(widgetProps.value));
     function onPanelChange(timeObj) {
       const value = timeObj.value == null ? timeObj.value : completeTimeValue(timeObj.value);
-      const data = setValue(value, runtimeValuePath.value);
+      const data = setValue$1(value, runtimeValuePath.value);
       emit("change", data);
     }
     return (_ctx, _cache) => {
@@ -140559,7 +140555,7 @@ function useTableDropdown(props, searchFilters) {
   const columns2 = computed(() => getColumns(strategy.value.columnsKey, strategy.value.isTree));
   const selectedId = computed(() => {
     if (!runtimeValuePath.value) return void 0;
-    const id = docInst.value.dataManager.get(getIdPath(runtimeValuePath.value));
+    const id = docInst.value.dataManager.get(getIdPath$1(runtimeValuePath.value));
     return id != null && id !== "" ? String(id) : void 0;
   });
   const businessLinkage = computed(
@@ -140786,6 +140782,10 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
         row?._item?.id_,
         { persistOptionId: persistOptionId.value }
       );
+      if (persistOptionId.value) {
+        const idPath = getIdPath(runtimeValuePath.value);
+        Object.assign(data, setValue(row?._item?.id_ ?? void 0, idPath));
+      }
       if (clearValuePath.value) {
         Object.assign(data, buildFieldSelectUpdates(clearValuePath.value, void 0));
       }
@@ -140978,7 +140978,7 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
           showValue = value;
         }
       }
-      const data = setValue(showValue, runtimeValuePath.value);
+      const data = setValue$1(showValue, runtimeValuePath.value);
       emit("change", data, __DEFAULT__ ? __DEFAULT__._item : row?._item);
     };
     __expose({
@@ -141389,7 +141389,7 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
         GctMessage.warning("请等待附件上传完成后再点击确定");
         return;
       }
-      return setValue(innerValue.value, runtimeValuePath.value);
+      return setValue$1(innerValue.value, runtimeValuePath.value);
     }
     function cancelUploading() {
       uploadRef.value?.cancelUploading?.();
@@ -141717,7 +141717,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
         GctMessage.warning("请等待图片上传完成后再点击确定");
         return;
       }
-      return setValue(innerValue.value, runtimeValuePath.value);
+      return setValue$1(innerValue.value, runtimeValuePath.value);
     }
     function cancelUploading() {
       uploadRef.value?.cancelUploading?.();
@@ -142002,7 +142002,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const persistSignatures = () => {
       const list = signatureList.value.map(({ displaySrc: _2, ...item }) => item);
       const data = list.length ? JSON.stringify(list) : void 0;
-      return setValue(data, runtimeValuePath.value);
+      return setValue$1(data, runtimeValuePath.value);
     };
     const validateAll = async () => {
       clearErrors();

package/dist/word.css

@@ -10774,22 +10774,22 @@ svg.portrait-icon[data-v-8bdb451e] {
 .bom-entry-item .iconfont.btn-item[data-v-cabb46fe] {
   margin-right: 8px;
 }
-.panel-material-consume-table[data-v-0b5a3b4b] {
+.panel-material-consume-table[data-v-0e3048f6] {
   position: relative;
 }
-.panel-material-consume-table .container[data-v-0b5a3b4b] {
+.panel-material-consume-table .container[data-v-0e3048f6] {
   padding: 16px;
 }
-.panel-material-consume-table .form-custom-label[data-v-0b5a3b4b] {
+.panel-material-consume-table .form-custom-label[data-v-0e3048f6] {
   display: inline-flex;
   align-items: center;
   gap: 4px;
 }
-.panel-material-consume-table .form-custom-label .icon[data-v-0b5a3b4b] {
+.panel-material-consume-table .form-custom-label .icon[data-v-0e3048f6] {
   cursor: pointer;
   vertical-align: text-top;
 }
-.panel-material-consume-table .content[data-v-0b5a3b4b] {
+.panel-material-consume-table .content[data-v-0e3048f6] {
   display: flex;
   align-items: center;
   justify-content: flex-end;
@@ -10797,7 +10797,7 @@ svg.portrait-icon[data-v-8bdb451e] {
   line-height: 22px;
   width: 100%;
 }
-.panel-material-consume-table .entries-container[data-v-0b5a3b4b] {
+.panel-material-consume-table .entries-container[data-v-0e3048f6] {
   padding: 6px 0;
 }
 .add-ds-btn[data-v-e5dff26f] {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gct-paas/word",
-  "version": "0.1.63-beta.9",
+  "version": "0.1.63",
   "description": "GCT 在线 word",
   "keywords": [
     "vue",