@gct-paas/word 0.1.48 → 0.1.50

package/dist/index.es.js

@@ -53962,19 +53962,15 @@ class MCDataUtil {
    * @param rowPath $.f_sub[n] n 必须为数字
    */
   static updateFixedFieldsDisablement(option) {
-    const fields = ["product_id_", "material_no_", "routing_operation_id_"];
-    this._updateDisablement({ ...option, fields });
+    const { disabledFields = [], ...otherOptions } = option;
+    const fields = ["product_id_", "material_no_", "routing_operation_id_", ...disabledFields];
+    this._updateDisablement({ ...otherOptions, fields });
   }
   /**
    * 设置行数据的编辑状态
    */
   static updateRow(option, isConfirmed) {
-    const {
-      row,
-      rowIndex,
-      dataManager,
-      subFieldKey
-    } = option;
+    const { row, rowIndex, dataManager, subFieldKey } = option;
     row.is_confirmed_ = isConfirmed;
     const rows = dataManager.getRawData()[subFieldKey] ?? [];
     rows[rowIndex] = row;
@@ -54140,8 +54136,8 @@ class MaterialConsumeTableController {
   }
   /**
    * 获取是否是 物料查看
-   * @param product_id_ 
-   * @returns 
+   * @param product_id_
+   * @returns
    */
   getMaterialTypeIsView(product_id_) {
     if (product_id_) {
@@ -54199,7 +54195,6 @@ class MaterialConsumeTableController {
       if (!find) {
         throw new Error(
           "表格数据里没有匹配的物料，请选择该物料后再扫码"
-          /*$t('sys.edhr.mcTable.noMatchMaterial')*/
         );
       }
       materialData = find;
@@ -54377,7 +54372,6 @@ class MaterialConsumeTableController {
     if (this.enableSequenceLoading && !isLast) {
       this.error(
         "顺序投料时只能最后一条数据开启编辑状态"
-        /*$t('sys.edhr.mcTable.onlyLastRowCanEdit')*/
       );
       return;
     }
@@ -54547,9 +54541,9 @@ class FormTmplBomController {
   /**
    * 根据字段key获取子表控制器
    */
-  // findTableControllerByField(subFieldKey: string) {
-  //   return this.tableControllers[subFieldKey];
-  // }
+  findTableControllerByField(subFieldKey) {
+    return this.tableControllers[subFieldKey];
+  }
   // 方法废弃，word 里改在初始化时记录到 paramsConfig
   /**
    * 处理字段组件
@@ -103395,6 +103389,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;
@@ -103479,18 +103487,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) => {
@@ -103580,11 +103577,19 @@ async function initializeDocumentEngine(props, payload, result) {
         MCDataUtil.disableQtyFields(doc.dataManager, `${table_key_}[${index2}]`);
       });
       rows.forEach((row, rowIndex) => {
+        MCDataUtil.updateViewFieldsDisablement({
+          dataManager: doc.dataManager,
+          rowPath: `$.${subFieldKey}[${rowIndex}]`,
+          disabled: Boolean(
+            tmplBomC?.findTableControllerByField(table_key_)?.getMaterialTypeIsView(row.product_id_)
+          )
+        });
         if (row.is_confirmed_) {
           MCDataUtil.updateFixedFieldsDisablement({
             dataManager: doc.dataManager,
             rowPath: `$.${subFieldKey}[${rowIndex}]`,
-            disabled: true
+            disabled: true,
+            disabledFields: ["qty_", "expiration_date_"]
           });
         }
       });
@@ -110395,6 +110400,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) {
@@ -110497,9 +110510,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());
   }
@@ -130134,7 +130148,7 @@ const _sfc_main$a = /* @__PURE__ */ defineComponent({
             renderSlot(_ctx.$slots, "rdo_version_render", normalizeProps(guardReactiveProps({ record, column, rowIndex })), void 0, true)
           ]),
           empty: withCtx(() => [..._cache[0] || (_cache[0] = [
-            createElementVNode("div", { class: "vxe-grid-empty" }, [
+            createElementVNode("div", { class: "vxe-grid-empty-word" }, [
               createElementVNode("img", {
                 src: _imports_0,
                 alt: ""
@@ -130148,7 +130162,7 @@ const _sfc_main$a = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const BaseVxeTable = /* @__PURE__ */ _export_sfc(_sfc_main$a, [["__scopeId", "data-v-a8a422f5"]]);
+const BaseVxeTable = /* @__PURE__ */ _export_sfc(_sfc_main$a, [["__scopeId", "data-v-8ae65aef"]]);
 const DEVICE_TYPE_MODEL_KEY = "em_device_type";
 const ENTITY_CATEGORY = "entity";
 const _sfc_main$9 = /* @__PURE__ */ defineComponent({

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

@@ -65,6 +65,7 @@ export declare class MCDataUtil {
         dataManager: DataManager;
         rowPath: string;
         disabled: boolean;
+        disabledFields?: string[];
     }): void;
     /**
      * 设置行数据的编辑状态

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/runtime/canvas/table/render/material-consume/tmpl-bom-controller.d.ts

@@ -62,6 +62,7 @@ export declare class FormTmplBomController {
     /**
      * 根据字段key获取子表控制器
      */
+    findTableControllerByField(subFieldKey: string): MaterialConsumeTableController | undefined;
     /**
      * 处理字段组件
      * - 补充物料字段的额外查询条件

package/dist/word.css

@@ -12267,7 +12267,7 @@ svg.portrait-icon[data-v-8bdb451e] {
   width: 100%;
   height: 248px;
 }
-.base-vxe-table-wrapper[data-v-a8a422f5] {
+.base-vxe-table-wrapper[data-v-8ae65aef] {
   display: flex;
   flex-direction: column;
   flex: 1;
@@ -12275,9 +12275,21 @@ svg.portrait-icon[data-v-8bdb451e] {
   width: 800px;
   height: 360px;
 }
-.base-vxe-table-wrapper[data-v-a8a422f5] .dropdown-vxe-table .row--active {
+.base-vxe-table-wrapper[data-v-8ae65aef] .dropdown-vxe-table .row--active {
   background: #e6f7ff;
 }
+.base-vxe-table-wrapper .vxe-grid-empty-word[data-v-8ae65aef] {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  color: rgba(0, 0, 0, 0.45);
+  margin: 32px 0;
+}
+.base-vxe-table-wrapper .vxe-grid-empty-word > img[data-v-8ae65aef] {
+  width: 60px;
+  margin-bottom: 12px;
+}
 .pagination-container[data-v-7a947e96] {
   position: relative;
   display: flex;

package/package.json

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