@gct-paas/word 0.1.74-beta.42 → 0.1.74-beta.43

package/dist/domain/table/business/shared/scan-action.d.ts

@@ -24,12 +24,14 @@ export declare function resolveScanParsedValue<T extends Record<string, unknown>
 export declare function resolveScanFillData(input: ScanModalInput): Record<string, unknown>;
 /** 取扫码数量调整方向，默认 add */
 export declare function resolveScanAdjustType(input: ScanModalInput): ScanAdjustType;
+/** 出入库空行：物料、批次都没值 */
+export declare function isProductBatchEmptyRow(row: Record<string, unknown>): boolean;
 /**
  * 扫码入行：优先回填首个空壳占位行，否则在活跃区末尾新增。
  * 避免版面默认空行时 insertAt 导致「第一行空、第二行有数据」。
  * 回填时空壳行按字段合并，保留 front_row_key_ / group_ 等元数据。
  */
-export declare function appendOrFillScanRow(doc: Doc, subFieldKey: string, row: Record<string, unknown>): number;
+export declare function appendOrFillScanRow(doc: Doc, subFieldKey: string, row: Record<string, unknown>, isEmptyRow?: (item: Record<string, unknown>) => boolean): number;
 /** 将 widget 上的条码解析规则 id 字符串转为配置对象 */
 export declare function toParseRuleConfig(value?: string): ParseRuleProps | undefined;
 /**

package/dist/index.es.js

@@ -1,4 +1,4 @@
-/*! @gct-paas/word v0.1.74-beta.42 */
+/*! @gct-paas/word v0.1.74-beta.43 */
 import { Fragment, Suspense, Teleport, Transition, TransitionGroup, cloneVNode, computed, createApp, createBlock, createCommentVNode, createElementBlock, createElementVNode, createSlots, createStaticVNode, createTextVNode, createVNode, defineAsyncComponent, defineComponent, effectScope, 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, toHandlers, toRaw, toRef, toValue, unref, useAttrs, useCssVars, useModel, useSlots, vModelRadio, vModelText, vShow, watch, watchEffect, withCtx, withDirectives, withKeys, withModifiers } from "vue";
 import St, { PopperWrapper } from "floating-vue";
 import VueKonva from "vue-konva";
@@ -102632,15 +102632,24 @@ function resolveScanFillData(input) {
 function resolveScanAdjustType(input) {
 	return input.type === "minus" ? "minus" : "add";
 }
+function isEmptyScanValue(value) {
+	if (value == null || value === "") return true;
+	if (typeof value === "object" && !Array.isArray(value) && Object.keys(value).length === 0) return true;
+	return false;
+}
+/** 出入库空行：物料、批次都没值 */
+function isProductBatchEmptyRow(row) {
+	return isEmptyScanValue(row.product_id_) && isEmptyScanValue(row.material_no_) && isEmptyScanValue(row.material_no__id_);
+}
 /**
 * 扫码入行：优先回填首个空壳占位行，否则在活跃区末尾新增。
 * 避免版面默认空行时 insertAt 导致「第一行空、第二行有数据」。
 * 回填时空壳行按字段合并，保留 front_row_key_ / group_ 等元数据。
 */
-function appendOrFillScanRow(doc, subFieldKey, row) {
+function appendOrFillScanRow(doc, subFieldKey, row, isEmptyRow = (item) => !hasSubtableBusinessData(item)) {
 	const arrayPath = `$.${subFieldKey}`;
 	const rows = doc.dataManager.getRawData()[subFieldKey] ?? [];
-	const emptyIndex = rows.findIndex((r) => r && !r.deleted_ && !hasSubtableBusinessData(r));
+	const emptyIndex = rows.findIndex((r) => r && !r.deleted_ && isEmptyRow(r));
 	if (emptyIndex >= 0) {
 		const existing = rows[emptyIndex];
 		const frontKey = ensureFrontRowKey(existing);
@@ -102869,7 +102878,7 @@ var init_scan$5 = __esmMin((() => {
 		}
 		const selected = await pickProductionIdentificationScanRecord(records);
 		if (!selected) return;
-		const rowIndex = appendOrFillScanRow(doc, subFieldKey, buildWarehouseInScanRow(selected, parsed, resolveScanFillData(input)));
+		const rowIndex = appendOrFillScanRow(doc, subFieldKey, buildWarehouseInScanRow(selected, parsed, resolveScanFillData(input)), isProductBatchEmptyRow);
 		await doc.dataManager.whenEmitSettled();
 		await hydrateSubtableRowLabels(doc, subFieldKey, [rowIndex]);
 	};
@@ -103424,7 +103433,7 @@ var init_scan$4 = __esmMin((() => {
 			await doc.dataManager.whenEmitSettled();
 			return;
 		}
-		const rowIndex = appendOrFillScanRow(doc, subFieldKey, buildWarehouseOutScanRow(selected, parsed, fillData, scanQty));
+		const rowIndex = appendOrFillScanRow(doc, subFieldKey, buildWarehouseOutScanRow(selected, parsed, fillData, scanQty), isProductBatchEmptyRow);
 		await doc.dataManager.whenEmitSettled();
 		await hydrateSubtableRowLabels(doc, subFieldKey, [rowIndex]);
 	};

package/package.json

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