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

package/dist/index.es.js

@@ -53405,7 +53405,7 @@ class BomEntryValidator {
    */
   calcQtyConsumed(arr = this.historyData) {
     const groupData = this.filterGroupData(arr);
-    return groupData.reduce((acc, cur) => acc + (cur.qty_ ?? 0), 0);
+    return groupData.reduce((acc, cur) => acc + (Number(cur.qty_) ?? 0), 0);
   }
   /**
    * 计算自定义的数量校验的最大值和最小值
@@ -53857,20 +53857,20 @@ class McWebRender extends MCRender {
     });
   }
 }
-const KEY = "_subFieldConfig";
+const SUB_FIELD_CONFIG_KEY = "_subFieldConfig";
 const getSubFieldConfig = (paramsConfig) => {
   return {
     init(subConfig) {
       if (!paramsConfig) return;
-      paramsConfig[KEY] = subConfig;
+      paramsConfig[SUB_FIELD_CONFIG_KEY] = subConfig;
     },
     get(valuePath) {
-      if (!valuePath || !paramsConfig?.[KEY]) return {};
-      return paramsConfig[KEY][valuePath] || {};
+      if (!valuePath || !paramsConfig?.[SUB_FIELD_CONFIG_KEY]) return {};
+      return paramsConfig[SUB_FIELD_CONFIG_KEY][valuePath] || {};
     },
     set(valuePath, subConfig) {
-      if (!valuePath || !paramsConfig?.[KEY]) return;
-      paramsConfig[KEY][valuePath] = subConfig;
+      if (!valuePath || !paramsConfig?.[SUB_FIELD_CONFIG_KEY]) return;
+      paramsConfig[SUB_FIELD_CONFIG_KEY][valuePath] = subConfig;
     }
   };
 };
@@ -53911,6 +53911,26 @@ class MCDataUtil {
     const { row, keys: keys2 = this.allFields, disabled = true } = opts;
     this.editMCTable(row, { fieldDisabled: this.arrToObj(keys2, disabled) });
   }
+  /**
+   * 物料消耗表 需求数量、已消耗数量 不可修改
+   * @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);
+  }
+  /**
+   * 物料消耗表 更新[需求数量、已消耗数量]以外字段是否禁用
+   * @param rowPath $.f_sub[n] n 必须为数字
+   */
+  static updateOtherFieldsDisabled(option) {
+    const { dataManager, rowPath, row, disabled } = option;
+    const config = { newDisabled: disabled };
+    Object.keys(row).filter((key) => !["qty_required_", "qty_consumed_"].includes(key)).forEach((key) => {
+      dataManager.setFieldRuntimeSpecificConfig(`${rowPath}.${key}`, config);
+    });
+  }
   /**
    * 设置行数据的编辑状态
    */
@@ -53925,13 +53945,11 @@ class MCDataUtil {
     const rows = dataManager.getRawData()[subFieldKey] ?? [];
     rows[rowIndex] = row;
     dataManager.set(subFieldKey, rows);
-    dataManager.getFieldRuntimeSpecificConfigKeys().forEach((key) => {
-      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 });
-      }
+    MCDataUtil.updateOtherFieldsDisabled({
+      dataManager,
+      rowPath: `$.${subFieldKey}[${rowIndex}]`,
+      row,
+      disabled: isConfirmed
     });
   }
 }
@@ -54317,7 +54335,7 @@ class MaterialConsumeTableController {
     if (this.hasEditingRow()) {
       return;
     }
-    const isLast = this.actualTableData[this.actualTableData.length - 1] === option.row;
+    const isLast = option.rowIndex === this.actualTableData.length - 1;
     if (this.enableSequenceLoading && !isLast) {
       this.error(
         "顺序投料时只能最后一条数据开启编辑状态"
@@ -54394,8 +54412,7 @@ class MaterialConsumeTableController {
         return data;
       }, {});
       doc.dataManager.setMultiple(wordValue);
-      doc.dataManager.setFieldRuntimeSpecificConfig(`${rowPath}.qty_required_`, { newDisabled: true });
-      doc.dataManager.setFieldRuntimeSpecificConfig(`${rowPath}.qty_consumed_`, { newDisabled: true });
+      MCDataUtil.disableQtyFields(doc.dataManager, rowPath);
     }
   }
 }
@@ -103434,14 +103451,6 @@ 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) => {
@@ -103513,6 +103522,30 @@ async function initializeDocumentEngine(props, payload, result) {
   });
   doc.dataManager.setRawData(rawData, defaultDataMap);
   doc.dataManager.applyInitData({ ...paramMap, ...dsMap });
+  if (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 };
+      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) => {
+        if (row.is_confirmed_) {
+          MCDataUtil.updateOtherFieldsDisabled({
+            dataManager: doc.dataManager,
+            rowPath: `$.${subFieldKey}[${rowIndex}]`,
+            row,
+            disabled: true
+          });
+        }
+      });
+    });
+    getSubFieldConfig(doc.paramsConfig).init(subConfig);
+  }
   await runDocumentPostLoadEnrichFlush(doc);
   await waitForDataManagerSettle();
   syncInitRawDataSnapshot(doc);
@@ -103614,6 +103647,7 @@ function useDocumentFactory(props, payload) {
   }
   async function refreshData() {
     const doc = docIns.value;
+    const subFieldConfigCache = docIns.value?.paramsConfig?.[SUB_FIELD_CONFIG_KEY];
     const execute = lastExecute.value;
     const requestId = unref(props.requestId) ?? execute?.id;
     if (!doc || !execute || !requestId) return;
@@ -103646,6 +103680,7 @@ function useDocumentFactory(props, payload) {
         initDocModelJson
       };
       doc.paramsConfig = paramsConfig ?? {};
+      doc.paramsConfig[SUB_FIELD_CONFIG_KEY] = subFieldConfigCache;
       if (doc.mode !== fillModeType) {
         doc.setMode(fillModeType);
       }
@@ -109526,19 +109561,44 @@ const _sfc_main$2w = /* @__PURE__ */ defineComponent({
         tableController.changeScanRule(props.doc.mainModelKey, subModelKey);
       }
     };
+    const getIsAddable = () => {
+      if (isMaterialConsumeTable.value) {
+        const { subFieldKey } = getCtx();
+        const tableData = docInst.value.dataManager.getRawData()[subFieldKey] ?? [];
+        const isAllConfirmed = tableData.every((row) => row.is_confirmed_);
+        if (!isAllConfirmed) {
+          GctMessage.error("同时只能有一条数据开启编辑状态");
+        }
+        return isAllConfirmed;
+      }
+      return true;
+    };
+    const handleAddRowAfter = (subFieldKey, rowIndex) => {
+      if (isMaterialConsumeTable.value) {
+        MCDataUtil.disableQtyFields(props.doc.dataManager, `$.${subFieldKey}[${rowIndex}]`);
+      }
+    };
     const insertRows = (index2, count = 1) => {
-      const { path } = getCtx();
+      if (!getIsAddable()) return;
+      const { path, subFieldKey } = getCtx();
       props.doc.dataManager.insertAt(path, index2, ...Array.from({ length: count }, () => ({})));
+      handleAddRowAfter(subFieldKey, index2);
     };
     const removeRow = () => {
       const { path, index: index2 } = getCtx();
       props.doc.dataManager.removeAt(path, index2);
     };
     const copyRow = () => {
-      const { path, index: index2 } = getCtx();
+      if (!getIsAddable()) return;
+      const { path, index: index2, subFieldKey } = getCtx();
       const storageIndex = props.doc.dataManager.resolveSubtableVisibleIndex(path, index2);
-      const data = props.doc.dataManager.get(`${path}[${storageIndex}]`) || {};
-      props.doc.dataManager.insertAt(path, index2 + 1, omit(data, "id_"));
+      let data = props.doc.dataManager.get(`${path}[${storageIndex}]`) || {};
+      data = omit(data, "id_");
+      if (isMaterialConsumeTable.value) {
+        data = omit(data, "is_confirmed_");
+      }
+      props.doc.dataManager.insertAt(path, index2 + 1, data);
+      handleAddRowAfter(subFieldKey, index2 + 1);
     };
     const actionHandlers = {
       insertRowAfter() {
@@ -109619,7 +109679,8 @@ const _sfc_main$2w = /* @__PURE__ */ defineComponent({
                       ]),
                       _cache[12] || (_cache[12] = createElementVNode("div", { class: "item-label" }, " 复制行 ", -1))
                     ]),
-                    createElementVNode("div", {
+                    !isMaterialConsumeTable.value ? (openBlock(), createElementBlock("div", {
+                      key: 0,
                       class: "menu-item",
                       onClick: _cache[4] || (_cache[4] = ($event) => handleAction("insertRowBeforeMore"))
                     }, [
@@ -109638,8 +109699,9 @@ const _sfc_main$2w = /* @__PURE__ */ defineComponent({
                           }, ["stop"]))
                         }, null, 8, ["modelValue"])
                       ])
-                    ]),
-                    createElementVNode("div", {
+                    ])) : createCommentVNode("", true),
+                    !isMaterialConsumeTable.value ? (openBlock(), createElementBlock("div", {
+                      key: 1,
                       class: "menu-item",
                       onClick: _cache[7] || (_cache[7] = ($event) => handleAction("insertRowAfterMore"))
                     }, [
@@ -109658,7 +109720,7 @@ const _sfc_main$2w = /* @__PURE__ */ defineComponent({
                           }, ["stop"]))
                         }, null, 8, ["modelValue"])
                       ])
-                    ])
+                    ])) : createCommentVNode("", true)
                   ]),
                   computedInfo.value.isDeleteBtnVisible ? (openBlock(), createElementBlock("div", _hoisted_13$3, [
                     createElementVNode("div", {
@@ -109699,7 +109761,7 @@ const _sfc_main$2w = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const SubTableAction = /* @__PURE__ */ _export_sfc(_sfc_main$2w, [["__scopeId", "data-v-13501110"]]);
+const SubTableAction = /* @__PURE__ */ _export_sfc(_sfc_main$2w, [["__scopeId", "data-v-59412dfb"]]);
 const _sfc_main$2v = /* @__PURE__ */ defineComponent({
   __name: "index",
   props: {

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

@@ -42,6 +42,21 @@ export declare class MCDataUtil {
         /** 设置的值(不给则true) */
         disabled?: boolean;
     }): void;
+    /**
+     * 物料消耗表 需求数量、已消耗数量 不可修改
+     * @param rowPath $.f_sub[n] n 必须为数字
+     */
+    static disableQtyFields(dataManager: DataManager, rowPath: string): void;
+    /**
+     * 物料消耗表 更新[需求数量、已消耗数量]以外字段是否禁用
+     * @param rowPath $.f_sub[n] n 必须为数字
+     */
+    static updateOtherFieldsDisabled(option: {
+        dataManager: DataManager;
+        rowPath: string;
+        row: any;
+        disabled: boolean;
+    }): void;
     /**
      * 设置行数据的编辑状态
      */

package/dist/sdk/doc-runtime/utils/sub-field-config.d.ts

@@ -1,6 +1,7 @@
 /**
  * 存取 doc.paramsConfig._subFieldConfig
  */
+export declare const SUB_FIELD_CONFIG_KEY = "_subFieldConfig";
 export declare const getSubFieldConfig: (paramsConfig: any) => {
     init(subConfig: any): void;
     get(valuePath: string | undefined): any;

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-13501110] {
+.sub-table-action-container[data-v-59412dfb] {
   position: absolute;
   z-index: 999;
 }
-.sub-table-action-bar[data-v-13501110],
-.sub-table-action-popper[data-v-13501110] {
+.sub-table-action-bar[data-v-59412dfb],
+.sub-table-action-popper[data-v-59412dfb] {
   pointer-events: auto;
   user-select: none;
 }
-.sub-table-action-bar[data-v-13501110] {
+.sub-table-action-bar[data-v-59412dfb] {
   display: flex;
 }
-.sub-table-action-bar .more-btn[data-v-13501110],
-.sub-table-action-bar .confirm-btn[data-v-13501110] {
+.sub-table-action-bar .more-btn[data-v-59412dfb],
+.sub-table-action-bar .confirm-btn[data-v-59412dfb] {
   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-13501110] {
+.sub-table-action-bar .more-btn[data-v-59412dfb] {
   width: 10px;
   background: #026ac8;
   border-radius: 0 4px 4px 0;
 }
-.sub-table-action-bar .confirm-btn[data-v-13501110] {
+.sub-table-action-bar .confirm-btn[data-v-59412dfb] {
   margin-left: 4px;
   border-radius: 4px;
   border: 1px solid #4ec262;
 }
-.sub-table-action-popper[data-v-13501110] {
+.sub-table-action-popper[data-v-59412dfb] {
   padding: 2px 8px;
 }
-.sub-table-action-popper .action-menu[data-v-13501110] {
+.sub-table-action-popper .action-menu[data-v-59412dfb] {
   padding: 4px 0;
   width: 220px;
   user-select: none;
 }
-.sub-table-action-popper .action-menu + .action-menu[data-v-13501110] {
+.sub-table-action-popper .action-menu + .action-menu[data-v-59412dfb] {
   margin-top: 4px;
   padding-top: 4px;
   border-top: 1px solid #efefef;
 }
-.sub-table-action-popper .action-menu .menu-title[data-v-13501110] {
+.sub-table-action-popper .action-menu .menu-title[data-v-59412dfb] {
   color: #bcbcbc;
   margin: 4px 0;
 }
-.sub-table-action-popper .action-menu .menu-item[data-v-13501110] {
+.sub-table-action-popper .action-menu .menu-item[data-v-59412dfb] {
   display: flex;
   align-items: center;
   padding: 8px 10px;
   border-radius: 4px;
 }
-.sub-table-action-popper .action-menu .menu-item[data-v-13501110]:hover {
+.sub-table-action-popper .action-menu .menu-item[data-v-59412dfb]:hover {
   cursor: pointer;
   background-color: #f2f5f8;
 }
-.sub-table-action-popper .action-menu .menu-item .item-icon[data-v-13501110] {
+.sub-table-action-popper .action-menu .menu-item .item-icon[data-v-59412dfb] {
   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-13501110] {
+.sub-table-action-popper .action-menu .menu-item .item-icon.scale-large[data-v-59412dfb] {
   transform: scale(1.5);
 }
-.sub-table-action-popper .action-menu .menu-item .item-label[data-v-13501110] {
+.sub-table-action-popper .action-menu .menu-item .item-label[data-v-59412dfb] {
   flex-grow: 1;
   margin-left: 8px;
 }
-.sub-table-action-popper .action-menu .menu-item .item-label.flex-between-center[data-v-13501110] {
+.sub-table-action-popper .action-menu .menu-item .item-label.flex-between-center[data-v-59412dfb] {
   display: flex;
   justify-content: space-between;
   align-items: center;

package/package.json

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