@gct-paas/word 0.1.73-patch.3 → 0.1.73-patch.4

package/dist/index.es.js

@@ -1,4 +1,4 @@
-/*! @gct-paas/word v0.1.73-patch.3 */
+/*! @gct-paas/word v0.1.73-patch.4 */
 import { Fragment, Suspense, Teleport, Transition, TransitionGroup, cloneVNode, computed, createApp, createBlock, createCommentVNode, createElementBlock, createElementVNode, createSlots, createStaticVNode, createTextVNode, createVNode, defineAsyncComponent, defineComponent, getCurrentInstance, getCurrentScope, guardReactiveProps, h, inject, isRef, isVNode, markRaw, mergeModels, mergeProps, nextTick, normalizeClass, normalizeProps, normalizeStyle, onBeforeMount, onBeforeUnmount, onMounted, onScopeDispose, onUnmounted, openBlock, provide, reactive, readonly, ref, render, renderList, renderSlot, resolveComponent, resolveDynamicComponent, shallowRef, toDisplayString, toRaw, toRef, toValue, unref, useCssVars, useModel, useSlots, vModelText, vShow, watch, watchEffect, withCtx, withDirectives, withKeys, withModifiers } from "vue";
 import FloatingVue, { PopperWrapper } from "floating-vue";
 import VueKonva from "vue-konva";
@@ -123339,20 +123339,19 @@ function findLastIndex(array, predicate) {
 var BomEntryValidator, BomEntriesValidator;
 var init_bom_validator = __esmMin((() => {
 	init_service$5();
-	init_types$2();
 	init_defineProperty();
 	BomEntryValidator = class {
 		/** 剩于可消耗数量 */
 		get remainingNum() {
 			return this.total - this.hasConsumed;
 		}
-		constructor(bomEntry, enableSequenceLoading, materialNoNum, historyData, mainMaterialNo, mcPattern) {
+		constructor(bomEntry, enableSequenceLoading, materialNoNum, historyData, mainMaterialNo, noBomMode) {
 			_defineProperty(this, "bomEntry", void 0);
 			_defineProperty(this, "enableSequenceLoading", void 0);
 			_defineProperty(this, "materialNoNum", void 0);
 			_defineProperty(this, "historyData", void 0);
 			_defineProperty(this, "mainMaterialNo", void 0);
-			_defineProperty(this, "mcPattern", void 0);
+			_defineProperty(this, "noBomMode", void 0);
 			_defineProperty(
 				this,
 				/** 该明细使用到的产品的id集合 */
@@ -123382,7 +123381,7 @@ var init_bom_validator = __esmMin((() => {
 			this.materialNoNum = materialNoNum;
 			this.historyData = historyData;
 			this.mainMaterialNo = mainMaterialNo;
-			this.mcPattern = mcPattern;
+			this.noBomMode = noBomMode;
 			this.productIds.push(this.bomEntry.product_id_);
 			this.productCodes[this.bomEntry.product_id_] = this.bomEntry.product_code_;
 			if (this.bomEntry.substitute_material_enabled_ && this.bomEntry.substitute_material_entries_) this.bomEntry.substitute_material_entries_.forEach((i) => {
@@ -123525,21 +123524,21 @@ var init_bom_validator = __esmMin((() => {
 		}
 	};
 	BomEntriesValidator = class {
-		constructor(entries, enableSequenceLoading, materialNoNum, historyData, mainMaterialNo, mcPattern) {
+		constructor(entries, enableSequenceLoading, materialNoNum, historyData, mainMaterialNo, noBomMode) {
 			_defineProperty(this, "entries", void 0);
 			_defineProperty(this, "enableSequenceLoading", void 0);
 			_defineProperty(this, "materialNoNum", void 0);
 			_defineProperty(this, "historyData", void 0);
 			_defineProperty(this, "mainMaterialNo", void 0);
-			_defineProperty(this, "mcPattern", void 0);
+			_defineProperty(this, "noBomMode", void 0);
 			_defineProperty(this, "bomEntryValidators", void 0);
 			this.entries = entries;
 			this.enableSequenceLoading = enableSequenceLoading;
 			this.materialNoNum = materialNoNum;
 			this.historyData = historyData;
 			this.mainMaterialNo = mainMaterialNo;
-			this.mcPattern = mcPattern;
-			this.bomEntryValidators = entries.map((i) => new BomEntryValidator(i, enableSequenceLoading, materialNoNum, historyData, mainMaterialNo, mcPattern));
+			this.noBomMode = noBomMode;
+			this.bomEntryValidators = entries.map((i) => new BomEntryValidator(i, enableSequenceLoading, materialNoNum, historyData, mainMaterialNo, noBomMode));
 		}
 		/**
 		* 翻译物料的code
@@ -123577,7 +123576,7 @@ var init_bom_validator = __esmMin((() => {
 		* @param row 单行的数据
 		*/
 		validateInBom(row) {
-			if (this.mcPattern === MaterialConsumptionPatternEnum.RECORD) return;
+			if (this.noBomMode) return;
 			if (!row.product_id_) throw new Error("物料不能为空");
 			if (!this.findUtilByProductId(row.product_id_)) {
 				const name = row.product_id__lb_ || "";
@@ -123650,7 +123649,7 @@ var init_bom_validator = __esmMin((() => {
 		async validateScanCanInsert(arr) {
 			const editRow = arr.find((i) => !i.is_confirmed_);
 			if (!editRow) throw new Error("没有正在编辑的行");
-			if (this.mcPattern === MaterialConsumptionPatternEnum.RECORD) return;
+			if (this.noBomMode) return;
 			this.validateInBom(editRow);
 			await this.validateSequenceLoading(editRow, arr);
 			this.validateSubstitute(arr);
@@ -123931,6 +123930,9 @@ var init_material_consume_table_controller = __esmMin((() => {
 		get mcPattern() {
 			return this.tmplBom.material_consumption_pattern_ ?? this.tmplBomController.defaultMCPattern;
 		}
+		get isRecordPattern() {
+			return this.mcPattern === MaterialConsumptionPatternEnum.RECORD && !this.tmplBom.personal_bom_enabled_;
+		}
 		/**
 		* 解析规则配置
 		*/
@@ -124018,7 +124020,7 @@ var init_material_consume_table_controller = __esmMin((() => {
 			this.tmplBom = tmplBom;
 			this.initScanRule(this.tmplBom.barcode_parsing_rules_id_);
 			markRaw(this);
-			this.bomEntriesValidator = new BomEntriesValidator(this.actualBomEntries, this.enableSequenceLoading, this.materialNoNum, this.tmplBomController.historyData, this.tmplBomController.materialNo, this.mcPattern);
+			this.bomEntriesValidator = new BomEntriesValidator(this.actualBomEntries, this.enableSequenceLoading, this.materialNoNum, this.tmplBomController.historyData, this.tmplBomController.materialNo, this.isRecordPattern);
 		}
 		/** 错误信息 */
 		error(message) {
@@ -124108,7 +124110,6 @@ var init_material_consume_table_controller = __esmMin((() => {
 		async parseScanStr(str, option) {
 			var _this$scanRuleProps;
 			if (!this.isFirstBlankRow() && this.hasEditingRow()) return;
-			const isRecordPattern = this.mcPattern === MaterialConsumptionPatternEnum.RECORD;
 			const data = getParseRuleValue$1(str, this.scanRules);
 			console.log("parseScanStr", data);
 			const arr = await materialCheck({
@@ -124116,15 +124117,15 @@ var init_material_consume_table_controller = __esmMin((() => {
 				production_identification_name_: data.lot,
 				qty_: data.qty,
 				validate_: data.expiration,
-				bom_entries_: isRecordPattern ? null : this.actualBomEntries,
+				bom_entries_: this.isRecordPattern ? null : this.actualBomEntries,
 				operation_id_: this.tmplBomController.operationId
-			}) || (isRecordPattern ? [{ productionIdentificationName: data.lot }] : null);
+			}) || (this.isRecordPattern ? [{ productionIdentificationName: data.lot }] : null);
 			if (!arr) {
 				this.error("扫描的物料不存在或不在bom中");
 				return;
 			}
 			let materialData = arr[0];
-			if (arr.length > 1 && !isRecordPattern) {
+			if (arr.length > 1 && !this.isRecordPattern) {
 				const ids = this.actualTableData.map((i) => i.product_id_);
 				const find = arr.find((j) => ids.includes(j.materialId));
 				if (!find) throw new Error("表格数据里没有匹配的物料，请选择该物料后再扫码");
@@ -124136,7 +124137,7 @@ var init_material_consume_table_controller = __esmMin((() => {
 				qty_: data.qty,
 				is_confirmed_: false
 			};
-			if (isRecordPattern && !row.product_id_) row._scanFallback = true;
+			if (this.isRecordPattern && !row.product_id_) row._scanFallback = true;
 			if ((_this$scanRuleProps = this.scanRuleProps) === null || _this$scanRuleProps === void 0 || (_this$scanRuleProps = _this$scanRuleProps.fillMapArr) === null || _this$scanRuleProps === void 0 ? void 0 : _this$scanRuleProps.length) {
 				const fillData = calcFillData(data, this.scanRuleProps.fillMapArr);
 				console.log("fillData", fillData);
@@ -124221,7 +124222,7 @@ var init_material_consume_table_controller = __esmMin((() => {
 		async confirm(option, subModelKey, doc) {
 			try {
 				if (doc) await this.applyUnitConversionBeforeConfirm(option, doc);
-				if (this.mcPattern === MaterialConsumptionPatternEnum.RECORD) {
+				if (this.isRecordPattern) {
 					const { dataManager, rowIndex, subFieldKey } = option;
 					const row = (dataManager.getRawData()[subFieldKey] ?? [])[rowIndex];
 					if (!row) throw new Error("请填写数据");
@@ -124245,7 +124246,7 @@ var init_material_consume_table_controller = __esmMin((() => {
 			if (!rules.length) return;
 			const rawRows = dataManager.getRawData()[subFieldKey] ?? [];
 			const tableRows = ((_this$tableDataRef = this.tableDataRef) === null || _this$tableDataRef === void 0 ? void 0 : _this$tableDataRef.value) ?? rawRows;
-			const row = this.mcPattern === MaterialConsumptionPatternEnum.RECORD ? tableRows[rowIndex] ?? rawRows[rowIndex] : tableRows.find((item) => !item.is_confirmed_ && !item.deleted_) ?? rawRows.find((item) => !item.is_confirmed_ && !item.deleted_);
+			const row = this.isRecordPattern ? tableRows[rowIndex] ?? rawRows[rowIndex] : tableRows.find((item) => !item.is_confirmed_ && !item.deleted_) ?? rawRows.find((item) => !item.is_confirmed_ && !item.deleted_);
 			if (!row) return;
 			if (!await applyUnitConversionRules({
 				rules,

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

@@ -1,4 +1,4 @@
-import { IBomEntry, IMaterialConsumeData, MaterialConsumptionPatternEnum } from '../../../../../domain/table/business/material/types';
+import { IBomEntry, IMaterialConsumeData } from '../../../../../domain/table/business/material/types';
 export declare class BomEntryValidator {
     bomEntry: IBomEntry;
     /** 是否启用顺序投料 */
@@ -10,7 +10,7 @@ export declare class BomEntryValidator {
     /** 表单实例的批次号 */
     mainMaterialNo: string;
     /** 物料消耗模式 */
-    mcPattern: MaterialConsumptionPatternEnum;
+    noBomMode: boolean;
     /** 该明细使用到的产品的id集合 */
     productIds: string[];
     /** 物料和code的映射 */
@@ -31,7 +31,7 @@ export declare class BomEntryValidator {
     /** 表单实例的批次号 */
     mainMaterialNo: string, 
     /** 物料消耗模式 */
-    mcPattern: MaterialConsumptionPatternEnum);
+    noBomMode: boolean);
     /**
      * 翻译物料的code
      * @param productId
@@ -90,7 +90,7 @@ export declare class BomEntriesValidator {
     /** 表单实例的批次号 */
     mainMaterialNo: string;
     /** 物料消耗模式 */
-    mcPattern: MaterialConsumptionPatternEnum;
+    noBomMode: boolean;
     bomEntryValidators: BomEntryValidator[];
     constructor(entries: IBomEntry[], 
     /** 是否启用顺序投料 */
@@ -102,7 +102,7 @@ export declare class BomEntriesValidator {
     /** 表单实例的批次号 */
     mainMaterialNo: string, 
     /** 物料消耗模式 */
-    mcPattern: MaterialConsumptionPatternEnum);
+    noBomMode: boolean);
     /**
      * 翻译物料的code
      * @param productId

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

@@ -89,6 +89,7 @@ export declare class MaterialConsumeTableController {
     get materialNoNum(): number;
     /** 物料消耗模式（自身没有配置的话取环境的默认值） */
     get mcPattern(): MaterialConsumptionPatternEnum;
+    get isRecordPattern(): boolean;
     /**
      * 解析规则数据对象
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gct-paas/word",
-  "version": "0.1.73-patch.3",
+  "version": "0.1.73-patch.4",
   "description": "GCT 在线 word",
   "keywords": [
     "vue",