@gct-paas/word 0.1.63 → 0.1.64

package/dist/index.es.js

@@ -33535,7 +33535,7 @@ function getValue$1(value, multiple) {
   }
   return value;
 }
-function setValue$1(value, valuePath, payload) {
+function setValue(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$1(path) {
+function getIdPath(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$1,
+    getCompanionPath: getIdPath,
     preserveOnHydrate: true,
     skipWhenCompanionPresent: true,
     buildCacheKey: (path, value, doc) => ({
@@ -85362,7 +85362,7 @@ class DataManager {
     return getHrefPath(path);
   }
   getIdPath(path) {
-    return getIdPath$1(path);
+    return getIdPath(path);
   }
   getFieldRuntimeSpecificConfigKeys() {
     return [...this.fieldRuntimeConfigByPath.keys()];
@@ -86591,7 +86591,7 @@ class DataManager {
       designValuePath,
       getLabelPath(designValuePath),
       getHrefPath(designValuePath),
-      getIdPath$1(designValuePath)
+      getIdPath(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$1(path));
+      paths.add(getIdPath(path));
     }
     return [...paths];
   }
@@ -86626,7 +86626,7 @@ class DataManager {
         designValuePath,
         getLabelPath(designValuePath),
         getHrefPath(designValuePath),
-        getIdPath$1(designValuePath)
+        getIdPath(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$1(valuePath)] = optionId ?? null;
+    updates[getIdPath(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$1(F$2.materialContainer);
+const MATERIAL_CONTAINER_ID = getIdPath(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$1(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(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,
@@ -109014,7 +109014,7 @@ class MaterialConsumeTableController {
     if (data.expiration) {
       row.expiration_date_ = toDateOnly(data.expiration);
     }
-    this.setDefaultValue(row);
+    this.setDefaultValue(row, option.doc);
     try {
       const newArr = this.bomEntriesValidator.mergeRowInArr(row, this.actualTableData);
       await this.bomEntriesValidator.validateScanCanInsert(newArr);
@@ -109256,7 +109256,7 @@ class MaterialConsumeTableController {
    * 设置默认值，如工序，需求数量/已消耗数量
    * @param row
    */
-  setDefaultValue(row) {
+  setDefaultValue(row, doc) {
     if (!row.routing_operation_id_) {
       row.routing_operation_id_ = this.tmplBomController.operationId;
     }
@@ -109268,6 +109268,7 @@ class MaterialConsumeTableController {
         row.bom_entry_id_ = util.bomEntry.id_;
       }
     }
+    this.updateRowConsumed(doc);
   }
   getDefaultValue(row) {
     const value = {};
@@ -109487,9 +109488,10 @@ 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_ }) => {
+      const tableController = tmplBomC?.findTableControllerByField(table_key_);
+      const useBomMode = tableController?.mcPattern === MaterialConsumptionPatternEnum.BOM;
       if (useBomMode) {
         const entries = personal_bom_enabled_ ? entries_ : tmplBomC.bomEntries;
         const includedIds = [];
@@ -109509,7 +109511,6 @@ const initMaterialConsumeTableConfig = (doc, subConfig, tmplBomC) => {
       });
       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) {
@@ -109534,6 +109535,12 @@ const initMaterialConsumeTableConfig = (doc, subConfig, tmplBomC) => {
     }
   );
 };
+const handleAllMCTablesMounted = (doc, tmplBomC) => {
+  tmplBomC.formInstBom?.formTmplBomList?.forEach(({ table_key_ }) => {
+    const tableController = tmplBomC.findTableControllerByField(table_key_);
+    tableController?.updateRowConsumed(doc);
+  });
+};
 class DocRequestStrategy {
   props;
   payload;
@@ -110825,10 +110832,14 @@ function useDocumentFactory(props, payload) {
         try {
           const response = await runFetchDocument(newRequestId);
           if (!response) return;
-          if (response.tmplBomC) {
-            tmplBomCRef.value = response.tmplBomC;
-          }
           await mountDocument(response);
+          const { tmplBomC } = response;
+          if (tmplBomC) {
+            tmplBomCRef.value = tmplBomC;
+            if (docIns.value) {
+              handleAllMCTablesMounted(docIns.value, tmplBomC);
+            }
+          }
         } catch (err) {
           console.error(err);
         }
@@ -111743,7 +111754,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$1(value, path));
+      Object.assign(payload, setValue(value, path));
     }
   }
 }
@@ -111794,7 +111805,7 @@ async function submitDeviceScan(params) {
   if (!row) {
     return { ok: false, message: MSG_NO_DATA };
   }
-  const payload = setValue$1(row.__VALUE__, runtimeValuePath);
+  const payload = setValue(row.__VALUE__, runtimeValuePath);
   appendFillMapPayload(payload, parsed, parseRules, runtimeValuePath);
   return { ok: true, payload, record: row._item };
 }
@@ -125381,7 +125392,7 @@ const _sfc_main$2c = /* @__PURE__ */ defineComponent({
         return getValue$1(value, isMultiple.value);
       },
       set(v) {
-        const data = setValue$1(v, runtimeValuePath.value, {
+        const data = setValue(v, runtimeValuePath.value, {
           multiple: isMultiple.value
         });
         docInst.value?.dataManager.setMultiple(data, "user");
@@ -139658,7 +139669,7 @@ const _sfc_main$f = /* @__PURE__ */ defineComponent({
       emitChange(value);
     }
     function emitChange(value) {
-      const data = setValue$1(value, runtimeValuePath.value, {
+      const data = setValue(value, runtimeValuePath.value, {
         multiple: props.isMultiple
       });
       emit("change", data);
@@ -139955,7 +139966,7 @@ const _sfc_main$d = /* @__PURE__ */ defineComponent({
       emitChange(null);
     }
     function emitChange(value) {
-      const data = setValue$1(value, runtimeValuePath.value, {
+      const data = setValue(value, runtimeValuePath.value, {
         multiple: props.isMultiple
       });
       emit("change", data);
@@ -140043,7 +140054,7 @@ const _sfc_main$c = /* @__PURE__ */ defineComponent({
       () => isDateTime.value ? resolveDateTimePickerTimeFormat(widgetProps.value) : void 0
     );
     function onPanelChange(v) {
-      const data = setValue$1(
+      const data = setValue(
         v ? formatDateTimeForStorage(v, storageFormat.value, pickerTimeFormat.value) : v,
         runtimeValuePath.value
       );
@@ -140082,7 +140093,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$1(value, runtimeValuePath.value);
+      const data = setValue(value, runtimeValuePath.value);
       emit("change", data);
     }
     return (_ctx, _cache) => {
@@ -140555,7 +140566,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$1(runtimeValuePath.value));
+    const id = docInst.value.dataManager.get(getIdPath(runtimeValuePath.value));
     return id != null && id !== "" ? String(id) : void 0;
   });
   const businessLinkage = computed(
@@ -140782,10 +140793,6 @@ 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 +140985,7 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
           showValue = value;
         }
       }
-      const data = setValue$1(showValue, runtimeValuePath.value);
+      const data = setValue(showValue, runtimeValuePath.value);
       emit("change", data, __DEFAULT__ ? __DEFAULT__._item : row?._item);
     };
     __expose({
@@ -141389,7 +141396,7 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
         GctMessage.warning("请等待附件上传完成后再点击确定");
         return;
       }
-      return setValue$1(innerValue.value, runtimeValuePath.value);
+      return setValue(innerValue.value, runtimeValuePath.value);
     }
     function cancelUploading() {
       uploadRef.value?.cancelUploading?.();
@@ -141717,7 +141724,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
         GctMessage.warning("请等待图片上传完成后再点击确定");
         return;
       }
-      return setValue$1(innerValue.value, runtimeValuePath.value);
+      return setValue(innerValue.value, runtimeValuePath.value);
     }
     function cancelUploading() {
       uploadRef.value?.cancelUploading?.();
@@ -142002,7 +142009,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$1(data, runtimeValuePath.value);
+      return setValue(data, runtimeValuePath.value);
     };
     const validateAll = async () => {
       clearErrors();

package/dist/runtime/canvas/table/render/material-consume/material-consume-table-controller.d.ts

@@ -237,7 +237,7 @@ export declare class MaterialConsumeTableController {
      * 设置默认值，如工序，需求数量/已消耗数量
      * @param row
      */
-    setDefaultValue(row: IMaterialConsumeData): void;
+    setDefaultValue(row: IMaterialConsumeData, doc: Doc): void;
     getDefaultValue(row: IMaterialConsumeData): any;
     /**
      * 处理[物料消耗表]下拉字段变更

package/dist/runtime/canvas/table/render/material-consume/material-consume.util.d.ts

@@ -2,10 +2,15 @@ import { Doc } from '../../../../../core';
 import { DocModel } from '../../../../../core/model';
 import { FormTmplBomController } from './tmpl-bom-controller';
 /**
- * 同步[物料消耗表] formTmplBomList 信息
+ * 同步[物料消耗表] formTmplBomList 信息到 widgetProps 上
+ * 因为 formTmplBomList 有独立存取接口
  */
 export declare const syncMaterialConsumeTableBomInfo: (templateId: string, docModel: DocModel) => Promise<void>;
 /**
  * 处理表单实例上的[物料消耗表]相关配置
  */
 export declare const initMaterialConsumeTableConfig: (doc: Doc, subConfig: Record<string, any>, tmplBomC?: FormTmplBomController) => void;
+/**
+ * 文档加载完毕后，处理所有[物料消耗表]已消耗数量累加计算
+ */
+export declare const handleAllMCTablesMounted: (doc: Doc, tmplBomC: FormTmplBomController) => void;

package/package.json

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