@gct-paas/word 0.1.47 → 0.1.49

package/dist/index.es.js

@@ -53934,29 +53934,36 @@ class MCDataUtil {
     const { row, keys: keys2 = this.allFields, disabled = true } = opts;
     this.editMCTable(row, { fieldDisabled: this.arrToObj(keys2, disabled) });
   }
+  static _updateDisablement(option) {
+    const { dataManager, rowPath, fields, disabled } = option;
+    const config = { newDisabled: disabled };
+    fields.forEach((field) => {
+      dataManager.setFieldRuntimeSpecificConfig(`${rowPath}.${field}`, config);
+    });
+  }
   /**
-   * 物料消耗表 需求数量、已消耗数量 不可修改
+   * 物料消耗表[需求数量、已消耗数量]一直禁用
    * @param rowPath $.f_sub[n] n 必须为数字
    */
   static disableQtyFields(dataManager, rowPath) {
-    const config = { newDisabled: true };
-    dataManager.setFieldRuntimeSpecificConfig(`${rowPath}.qty_required_`, config);
-    dataManager.setFieldRuntimeSpecificConfig(`${rowPath}.qty_consumed_`, config);
+    const fields = ["qty_consumed_", "qty_required_"];
+    this._updateDisablement({ dataManager, rowPath, fields, disabled: true });
   }
   /**
-   * 物料消耗表 更新部分字段是否禁用
+   * 物料消耗表 物料类型是否是[查看物料]时需要更新[物料批号、数量]字段是否禁用
    * @param rowPath $.f_sub[n] n 必须为数字
    */
-  static updateOtherFieldsDisabled(option) {
-    const { dataManager, rowPath, disabled } = option;
-    const config = { newDisabled: disabled };
-    [
-      "product_id_",
-      "material_no_",
-      "routing_operation_id_"
-    ].forEach((key) => {
-      dataManager.setFieldRuntimeSpecificConfig(`${rowPath}.${key}`, config);
-    });
+  static updateViewFieldsDisablement(option) {
+    const fields = ["material_no_", "qty_"];
+    this._updateDisablement({ ...option, fields });
+  }
+  /**
+   * 物料消耗表 更新固定几个字段是否禁用
+   * @param rowPath $.f_sub[n] n 必须为数字
+   */
+  static updateFixedFieldsDisablement(option) {
+    const fields = ["product_id_", "material_no_", "routing_operation_id_"];
+    this._updateDisablement({ ...option, fields });
   }
   /**
    * 设置行数据的编辑状态
@@ -53972,7 +53979,7 @@ class MCDataUtil {
     const rows = dataManager.getRawData()[subFieldKey] ?? [];
     rows[rowIndex] = row;
     dataManager.set(subFieldKey, rows);
-    MCDataUtil.updateOtherFieldsDisabled({
+    MCDataUtil.updateFixedFieldsDisablement({
       dataManager,
       rowPath: `$.${subFieldKey}[${rowIndex}]`,
       disabled: isConfirmed
@@ -54132,19 +54139,16 @@ class MaterialConsumeTableController {
     }
   }
   /**
-   * 根据数据计算需要禁用的字段
-   * @param row
-   * @return {*}
+   * 获取是否是 物料查看
+   * @param product_id_ 
+   * @returns 
    */
-  calcDisabledFields(row) {
-    const disabledKeys = ["qty_consumed_", "qty_required_"];
-    if (row.product_id_) {
-      const util = this.bomEntriesValidator.findUtilByProductId(row.product_id_);
-      if (util?.bomEntry.type_ === "view") {
-        disabledKeys.push("material_no_", "qty_");
-      }
+  getMaterialTypeIsView(product_id_) {
+    if (product_id_) {
+      const util = this.bomEntriesValidator.findUtilByProductId(product_id_);
+      return util?.bomEntry.type_ === "view";
     }
-    return disabledKeys;
+    return false;
   }
   /**
    * 获取bom内主物料，替换物料查询的算子
@@ -54422,7 +54426,8 @@ class MaterialConsumeTableController {
     if (["product_id_", "material_no_"].includes(fieldKey)) {
       const rowPath = `${parentFieldPath}[${dataIndex}]`;
       if (fieldKey === "product_id_") {
-        const versionId = changedData[`${rowPath}.product_id_`]?.split(":").pop();
+        const product_id_ = changedData[`${rowPath}.product_id_`];
+        const versionId = product_id_?.split(":").pop();
         if (versionId) {
           getSubFieldConfig(doc.paramsConfig).set(`${rowPath}.material_no_`, {
             "product_id_.versionIn": [versionId]
@@ -54433,6 +54438,8 @@ class MaterialConsumeTableController {
           [`${rowPath}.material_no__lb_`]: void 0,
           [`${rowPath}.qty_`]: void 0
         });
+        const disabled = this.getMaterialTypeIsView(product_id_);
+        MCDataUtil.updateViewFieldsDisablement({ dataManager: doc.dataManager, rowPath, disabled });
       } else if (fieldKey === "material_no_") {
         doc.dataManager.setMultiple({
           [`${rowPath}.product_id_`]: selectedOption.product_id_
@@ -54446,7 +54453,6 @@ class MaterialConsumeTableController {
         return data;
       }, {});
       doc.dataManager.setMultiple(wordValue);
-      MCDataUtil.disableQtyFields(doc.dataManager, rowPath);
     }
   }
 }
@@ -103389,6 +103395,20 @@ function useDependency(doc, widget, ctx) {
     initDependency
   };
 }
+const syncMaterialConsumeTableBomInfo = async (templateId, docModel) => {
+  const formTmplBomList = await api.apaas.onlineFormTmpl.getGetBomByFormTmplId({ id: templateId });
+  if (formTmplBomList?.length) {
+    if (docModel.document.config) {
+      docModel.document.config.formTmplBomList = formTmplBomList;
+    }
+    docModel.document.children[0]?.children.flatMap((el) => el.regions).filter((r) => r?.type === "material-consume-table").forEach((r) => {
+      const { valuePath } = r;
+      const matchedBom = formTmplBomList.find((bom) => bom.table_key_ === valuePath);
+      if (!matchedBom) return;
+      r.widgetMeta.props = matchedBom;
+    });
+  }
+};
 async function runDocumentPostLoadEnrichFlush(doc) {
   const instances = doc.model?.getWidgetInstances() ?? [];
   if (!instances.length) return;
@@ -103473,18 +103493,7 @@ async function initializeDocumentEngine(props, payload, result) {
   const linkFieldKey = checkTableRegions[0]?.linkFieldKey;
   const docModel = ModelConverter.toModel(runtimeJsonForModel);
   const templateId = result.tid.split(":")[1];
-  const formTmplBomList = await api.apaas.onlineFormTmpl.getGetBomByFormTmplId({ id: templateId });
-  if (formTmplBomList?.length) {
-    if (docModel.document.config) {
-      docModel.document.config.formTmplBomList = formTmplBomList;
-    }
-    docModel.document.children[0]?.children.flatMap((el) => el.regions).filter((r) => r?.type === "material-consume-table").forEach((r) => {
-      const { valuePath } = r;
-      const matchedBom = formTmplBomList.find((bom) => bom.table_key_ === valuePath);
-      if (!matchedBom) return;
-      r.widgetMeta.props = matchedBom;
-    });
-  }
+  await syncMaterialConsumeTableBomInfo(templateId, docModel);
   const instances = docModel.getWidgetInstances();
   if (fillModeType !== DocModeTypeConst.Edit) {
     instances.forEach((instance2) => {
@@ -103575,7 +103584,7 @@ async function initializeDocumentEngine(props, payload, result) {
       });
       rows.forEach((row, rowIndex) => {
         if (row.is_confirmed_) {
-          MCDataUtil.updateOtherFieldsDisabled({
+          MCDataUtil.updateFixedFieldsDisablement({
             dataManager: doc.dataManager,
             rowPath: `$.${subFieldKey}[${rowIndex}]`,
             disabled: true
@@ -109538,6 +109547,13 @@ const _sfc_main$2w = /* @__PURE__ */ defineComponent({
         index: yDataIndex ?? dataIndex ?? 0
       };
     };
+    const getTableRows = (subFieldKey, visible) => {
+      const rows = docInst.value.dataManager.getRawData()[subFieldKey] ?? [];
+      if (visible) {
+        return rows.filter((row) => !row.deleted_);
+      }
+      return rows;
+    };
     const readonly2 = computed(() => {
       const state = resolveWidgetState({
         doc: props.doc,
@@ -109551,9 +109567,9 @@ const _sfc_main$2w = /* @__PURE__ */ defineComponent({
     });
     const computedInfo = computed(() => {
       const { index: rowIndex, subFieldKey } = getCtx();
-      const tableData = docInst.value.dataManager.getRawData()[subFieldKey] ?? [];
-      const isDeleteBtnVisible = tableData.length > 1;
-      const isRowConfirmed = !!tableData[rowIndex]?.is_confirmed_;
+      const visibleRows = getTableRows(subFieldKey, true);
+      const isDeleteBtnVisible = visibleRows.length > 1;
+      const isRowConfirmed = !!visibleRows[rowIndex]?.is_confirmed_;
       return {
         isDeleteBtnVisible,
         isRowConfirmed
@@ -109575,23 +109591,23 @@ const _sfc_main$2w = /* @__PURE__ */ defineComponent({
       if (!subFieldKey) return;
       const subModelKey = mainFields.find((f) => f.key === subFieldKey)?.bindInfo;
       const { dataManager } = docInst.value;
-      const tableData = dataManager.getRawData()[subFieldKey] ?? [];
+      const allRows = getTableRows(subFieldKey);
       const { tableName } = props.cell.subRenderer;
-      let row = tableData[rowIndex];
-      const insertEmptyRow = (row2, rowIndex2, cb) => {
-        if (!row2) {
-          row2 = {};
-          tableData[rowIndex2] = row2;
-          dataManager.set(subFieldKey, tableData);
+      const row = allRows[rowIndex];
+      const checkTargetRow = (_row, cb) => {
+        if (!_row) {
+          _row = {};
+          allRows.splice(rowIndex, 0, _row);
+          dataManager.set(subFieldKey, allRows);
         }
         setTimeout(cb);
       };
       if (val === "confirm") {
-        insertEmptyRow(row, rowIndex, () => {
+        checkTargetRow(row, () => {
           tableController.confirm({ row, rowIndex, dataManager, subFieldKey }, subModelKey);
         });
       } else if (val === "scan") {
-        insertEmptyRow(row, rowIndex, () => {
+        checkTargetRow(row, () => {
           tableController.openScanModal(tableName, { dataManager, subFieldKey }, subModelKey);
         });
       } else if (val === "edit") {
@@ -109605,8 +109621,8 @@ const _sfc_main$2w = /* @__PURE__ */ defineComponent({
     const getIsAddable = () => {
       if (isMaterialConsumeTable.value) {
         const { subFieldKey } = getCtx();
-        const tableData = docInst.value.dataManager.getRawData()[subFieldKey] ?? [];
-        const isAllConfirmed = tableData.length && tableData.every((row) => row.is_confirmed_);
+        const visibleRows = getTableRows(subFieldKey, true);
+        const isAllConfirmed = visibleRows.length && visibleRows.every((row) => row.is_confirmed_);
         if (!isAllConfirmed) {
           GctMessage.error("同时只能有一条数据开启编辑状态");
         }
@@ -109802,7 +109818,7 @@ const _sfc_main$2w = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const SubTableAction = /* @__PURE__ */ _export_sfc(_sfc_main$2w, [["__scopeId", "data-v-8fbc11fb"]]);
+const SubTableAction = /* @__PURE__ */ _export_sfc(_sfc_main$2w, [["__scopeId", "data-v-9ca63e84"]]);
 const _sfc_main$2v = /* @__PURE__ */ defineComponent({
   __name: "index",
   props: {
@@ -110382,6 +110398,14 @@ function validateDocDesigner(doc) {
       source: "doc"
     });
   }
+  const materialConsumeTableRegions = children.filter((w2) => w2.name === "w:tbl" && w2.hasMaterialConsumeTable).flatMap((w2) => w2.materialConsumeTable);
+  if (materialConsumeTableRegions.some((r) => !r.widgetMeta.props.barcode_parsing_rules_id_)) {
+    errors.push({
+      code: "barcode-parsing-rules-required",
+      message: "请给物料消耗表设置条码解析规则",
+      source: "doc"
+    });
+  }
   return createDesignerValidationResult(errors);
 }
 function validateDesigner(doc) {
@@ -110484,9 +110508,10 @@ function useDocOperations(docRef) {
       dirty: changedScopes.length > 0
     };
   }
-  function markAsSaved() {
+  async function markAsSaved() {
     const doc = getDoc();
     if (!doc) return;
+    await syncMaterialConsumeTableBomInfo(doc.docRuntimeMeta.id, doc.model);
     doc.docRuntimeMeta.handleInfo.initDocModelJson = JSON.stringify(exportModel());
     doc.docRuntimeMeta.handleInfo.initRawDataSnapshot = cloneDeep(doc.dataManager.getRawData());
   }

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

@@ -42,16 +42,26 @@ export declare class MCDataUtil {
         /** 设置的值(不给则true) */
         disabled?: boolean;
     }): void;
+    private static _updateDisablement;
     /**
-     * 物料消耗表 需求数量、已消耗数量 不可修改
+     * 物料消耗表[需求数量、已消耗数量]一直禁用
      * @param rowPath $.f_sub[n] n 必须为数字
      */
     static disableQtyFields(dataManager: DataManager, rowPath: string): void;
     /**
-     * 物料消耗表 更新部分字段是否禁用
+     * 物料消耗表 物料类型是否是[查看物料]时需要更新[物料批号、数量]字段是否禁用
      * @param rowPath $.f_sub[n] n 必须为数字
      */
-    static updateOtherFieldsDisabled(option: {
+    static updateViewFieldsDisablement(option: {
+        dataManager: DataManager;
+        rowPath: string;
+        disabled: boolean;
+    }): void;
+    /**
+     * 物料消耗表 更新固定几个字段是否禁用
+     * @param rowPath $.f_sub[n] n 必须为数字
+     */
+    static updateFixedFieldsDisablement(option: {
         dataManager: DataManager;
         rowPath: string;
         disabled: boolean;
@@ -139,11 +149,11 @@ export declare class MaterialConsumeTableController {
      */
     calcFormState(): IMaterialConsumeData[] | undefined;
     /**
-     * 根据数据计算需要禁用的字段
-     * @param row
-     * @return {*}
+     * 获取是否是 物料查看
+     * @param product_id_
+     * @returns
      */
-    calcDisabledFields(row: IMaterialConsumeData): (keyof IMaterialConsumeData)[];
+    getMaterialTypeIsView(product_id_?: string): boolean;
     /**
      * 获取bom内主物料，替换物料查询的算子
      * @return {*}

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

@@ -0,0 +1,2 @@
+import { DocModel } from '../../../../../core/model';
+export declare const syncMaterialConsumeTableBomInfo: (templateId: string, docModel: DocModel) => Promise<void>;

package/dist/word.css

@@ -8680,20 +8680,20 @@ textarea[data-v-57fe54a3]::placeholder {
 .table-action .row-headers .row-header:last-child .row-add-btn[data-v-c40eef9f] .gct-icon.bottom {
   transform: translateY(-100%);
 }
-.sub-table-action-container[data-v-8fbc11fb] {
+.sub-table-action-container[data-v-9ca63e84] {
   position: absolute;
   z-index: 999;
 }
-.sub-table-action-bar[data-v-8fbc11fb],
-.sub-table-action-popper[data-v-8fbc11fb] {
+.sub-table-action-bar[data-v-9ca63e84],
+.sub-table-action-popper[data-v-9ca63e84] {
   pointer-events: auto;
   user-select: none;
 }
-.sub-table-action-bar[data-v-8fbc11fb] {
+.sub-table-action-bar[data-v-9ca63e84] {
   display: flex;
 }
-.sub-table-action-bar .more-btn[data-v-8fbc11fb],
-.sub-table-action-bar .confirm-btn[data-v-8fbc11fb] {
+.sub-table-action-bar .more-btn[data-v-9ca63e84],
+.sub-table-action-bar .confirm-btn[data-v-9ca63e84] {
   display: flex;
   justify-content: center;
   align-items: center;
@@ -8702,44 +8702,44 @@ textarea[data-v-57fe54a3]::placeholder {
   cursor: pointer;
   box-sizing: border-box;
 }
-.sub-table-action-bar .more-btn[data-v-8fbc11fb] {
+.sub-table-action-bar .more-btn[data-v-9ca63e84] {
   width: 10px;
   background: #026ac8;
   border-radius: 0 4px 4px 0;
 }
-.sub-table-action-bar .confirm-btn[data-v-8fbc11fb] {
+.sub-table-action-bar .confirm-btn[data-v-9ca63e84] {
   margin-left: 4px;
   border-radius: 4px;
   border: 1px solid #4ec262;
 }
-.sub-table-action-popper[data-v-8fbc11fb] {
+.sub-table-action-popper[data-v-9ca63e84] {
   padding: 2px 8px;
 }
-.sub-table-action-popper .action-menu[data-v-8fbc11fb] {
+.sub-table-action-popper .action-menu[data-v-9ca63e84] {
   padding: 4px 0;
   width: 220px;
   user-select: none;
 }
-.sub-table-action-popper .action-menu + .action-menu[data-v-8fbc11fb] {
+.sub-table-action-popper .action-menu + .action-menu[data-v-9ca63e84] {
   margin-top: 4px;
   padding-top: 4px;
   border-top: 1px solid #efefef;
 }
-.sub-table-action-popper .action-menu .menu-title[data-v-8fbc11fb] {
+.sub-table-action-popper .action-menu .menu-title[data-v-9ca63e84] {
   color: #bcbcbc;
   margin: 4px 0;
 }
-.sub-table-action-popper .action-menu .menu-item[data-v-8fbc11fb] {
+.sub-table-action-popper .action-menu .menu-item[data-v-9ca63e84] {
   display: flex;
   align-items: center;
   padding: 8px 10px;
   border-radius: 4px;
 }
-.sub-table-action-popper .action-menu .menu-item[data-v-8fbc11fb]:hover {
+.sub-table-action-popper .action-menu .menu-item[data-v-9ca63e84]:hover {
   cursor: pointer;
   background-color: #f2f5f8;
 }
-.sub-table-action-popper .action-menu .menu-item .item-icon[data-v-8fbc11fb] {
+.sub-table-action-popper .action-menu .menu-item .item-icon[data-v-9ca63e84] {
   display: flex;
   align-items: center;
   justify-content: start;
@@ -8747,14 +8747,14 @@ textarea[data-v-57fe54a3]::placeholder {
   width: 20px;
   height: 20px;
 }
-.sub-table-action-popper .action-menu .menu-item .item-icon.scale-large[data-v-8fbc11fb] {
+.sub-table-action-popper .action-menu .menu-item .item-icon.scale-large[data-v-9ca63e84] {
   transform: scale(1.5);
 }
-.sub-table-action-popper .action-menu .menu-item .item-label[data-v-8fbc11fb] {
+.sub-table-action-popper .action-menu .menu-item .item-label[data-v-9ca63e84] {
   flex-grow: 1;
   margin-left: 8px;
 }
-.sub-table-action-popper .action-menu .menu-item .item-label.flex-between-center[data-v-8fbc11fb] {
+.sub-table-action-popper .action-menu .menu-item .item-label.flex-between-center[data-v-9ca63e84] {
   display: flex;
   justify-content: space-between;
   align-items: center;

package/package.json

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