@gct-paas/word 0.1.74-beta.35 → 0.1.74-beta.36

package/dist/index.es.js

@@ -1,5 +1,5 @@
-/*! @gct-paas/word v0.1.74-beta.35 */
-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, toHandlers, toRaw, toRef, toValue, unref, useAttrs, useCssVars, useModel, useSlots, vModelRadio, vModelText, vShow, watch, watchEffect, withCtx, withDirectives, withKeys, withModifiers } from "vue";
+/*! @gct-paas/word v0.1.74-beta.36 */
+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";
 import { HttpUtil, api } from "@gct-paas/api";
@@ -126376,6 +126376,18 @@ var init_material_consume_table_controller = __esmMin((() => {
 				"dataStatus",
 				void 0
 			);
+			_defineProperty(
+				this,
+				/** 当前控制器已绑定的文档。一个文档可能拆成多个画布表格组件。 */
+				"setupDoc",
+				void 0
+			);
+			_defineProperty(
+				this,
+				/** 脱离分页表格组件生命周期，同一文档只保留一组监听。 */
+				"setupScope",
+				void 0
+			);
 			_defineProperty(
 				this,
 				/**
@@ -126455,20 +126467,23 @@ var init_material_consume_table_controller = __esmMin((() => {
 		*/
 		initTableData(dataManager, subFieldKey, defaultData) {
 			if (this.isDataProcessed) return;
+			const existingRows = dataManager.getRawData()[subFieldKey];
+			if (Array.isArray(existingRows) && existingRows.some((row) => row && !row.deleted_ && !row.__gw_default)) return;
 			const rows = this.calcFormState();
 			if (!(rows === null || rows === void 0 ? void 0 : rows.length)) return;
 			const tableRows = transformUtils.transformSourceData2SubTable(rows, {}, defaultData);
 			tableRows.forEach((row, i) => {
 				ensureFrontRowKey(row);
-				const option = {
-					dataManager,
-					subFieldKey,
-					rowIndex: i
-				};
-				if (i === 0) MCDataUtil.updateRow(option, false);
-				else MCDataUtil.updateRow(option, this.enableSequenceLoading);
+				row.is_confirmed_ = i > 0 && this.enableSequenceLoading;
 			});
 			this.actualTableData = tableRows;
+			tableRows.forEach((row, i) => {
+				MCDataUtil.updateConfirmableFieldsDisablement({
+					dataManager,
+					rowPath: `$.${subFieldKey}[${i}]`,
+					disabled: !!row.is_confirmed_
+				});
+			});
 		}
 		/**
 		* 根据数据计算需要禁用的字段
@@ -126638,18 +126653,26 @@ var init_material_consume_table_controller = __esmMin((() => {
 		* @param opts
 		*/
 		async setup(opts) {
+			var _this$setupScope;
+			const sameDoc = this.setupDoc === opts.doc;
 			this.tableDataRef = opts.tableDataRef;
 			this.mainFormState = opts.mainFormState ?? ref({});
 			this.subTableInfo = opts.subTableInfo;
 			this.dataStatus = opts.dataStatus;
+			if (sameDoc) return;
+			(_this$setupScope = this.setupScope) === null || _this$setupScope === void 0 || _this$setupScope.stop();
+			this.setupScope = effectScope(true);
+			this.setupDoc = opts.doc;
 			this.initTableData(opts.doc.dataManager, opts.subTableInfo.subFieldKey, opts.defaultRowData);
-			watch(() => this.materialNoNum, () => this.syncQtyRequiredFromBom(opts.doc), { immediate: true });
-			watch(() => this.tableDataRef.value.map((row) => [
-				row.qty_,
-				row.product_id_,
-				row.bom_entry_id_,
-				row.deleted_
-			]), () => this.updateDerivedQtyFields(opts.doc), { deep: true });
+			this.setupScope.run(() => {
+				watch(() => this.materialNoNum, () => this.syncQtyRequiredFromBom(opts.doc), { immediate: true });
+				watch(() => this.tableDataRef.value.map((row) => [
+					row.qty_,
+					row.product_id_,
+					row.bom_entry_id_,
+					row.deleted_
+				]), () => this.updateDerivedQtyFields(opts.doc), { deep: true });
+			});
 		}
 		/**
 		* 按当前 materialNoNum 回写各行 qty_required_（校验侧 total 已通过 getter 实时读取）
@@ -137758,17 +137781,17 @@ var init_tree_node_vue_vue_type_script_setup_true_lang = __esmMin((() => {
 	});
 }));
 //#endregion
-//#region src/runtime/renderer/dropdowns/components/tree/tree-node.vue?vue&type=style&index=0&scoped=6969370b&lang.less
-var init_tree_node_vue_vue_type_style_index_0_scoped_6969370b_lang = __esmMin((() => {}));
+//#region src/runtime/renderer/dropdowns/components/tree/tree-node.vue?vue&type=style&index=0&scoped=6d1436ce&lang.less
+var init_tree_node_vue_vue_type_style_index_0_scoped_6d1436ce_lang = __esmMin((() => {}));
 //#endregion
 //#region src/runtime/renderer/dropdowns/components/tree/tree-node.vue
 var tree_node_default;
 var init_tree_node = __esmMin((() => {
 	init_tree_node_vue_vue_type_script_setup_true_lang();
 	init_tree_node_vue_vue_type_script_setup_true_lang();
-	init_tree_node_vue_vue_type_style_index_0_scoped_6969370b_lang();
+	init_tree_node_vue_vue_type_style_index_0_scoped_6d1436ce_lang();
 	init__plugin_vue_export_helper();
-	tree_node_default = /*#__PURE__*/ _plugin_vue_export_helper_default(tree_node_vue_vue_type_script_setup_true_lang_default, [["__scopeId", "data-v-6969370b"]]);
+	tree_node_default = /*#__PURE__*/ _plugin_vue_export_helper_default(tree_node_vue_vue_type_script_setup_true_lang_default, [["__scopeId", "data-v-6d1436ce"]]);
 }));
 //#endregion
 //#region src/runtime/renderer/dropdowns/components/tree/tree-dropdown.vue?vue&type=script&setup=true&lang.ts
@@ -139559,8 +139582,9 @@ var init_table_dropdown_vue_vue_type_script_setup_true_lang = __esmMin((() => {
 			const onChangeSelect = async (row) => {
 				var _row$_item;
 				const { belongingObject, fieldType } = props.widget.widgetMeta.field;
-				if (belongingObject && fieldType === FIELD_TYPE.MATERIAL_NO && row.is_locked_) {
-					GctMessage.error(await getLotLockedReason(row.id_));
+				const selectedOption = (row === null || row === void 0 ? void 0 : row._item) ?? row;
+				if (belongingObject && fieldType === FIELD_TYPE.MATERIAL_NO && (selectedOption === null || selectedOption === void 0 ? void 0 : selectedOption.is_locked_)) {
+					GctMessage.error(await getLotLockedReason(selectedOption.id_));
 					return;
 				}
 				const { __VALUE__ } = row || {};

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

@@ -93,6 +93,10 @@ export declare class MaterialConsumeTableController {
     dataStatus?: string;
     /** 表单是否已暂存或提交（已处理过则不再跑初始化） */
     get isDataProcessed(): boolean;
+    /** 当前控制器已绑定的文档。一个文档可能拆成多个画布表格组件。 */
+    private setupDoc?;
+    /** 脱离分页表格组件生命周期，同一文档只保留一组监听。 */
+    private setupScope?;
     /** 批次数量或生产数量 */
     get materialNoNum(): any;
     /** 物料消耗模式（自身没有配置的话取环境的默认值） */

package/dist/word.css

@@ -8752,31 +8752,32 @@ textarea[data-v-a7d89044]::placeholder {
   word-break: break-all;
   pointer-events: none;
 }
-.tree-node[data-v-6969370b] {
+.tree-node[data-v-6d1436ce] {
   display: flex;
   align-items: center;
   height: 30px;
+  padding-right: 4px;
   cursor: pointer;
   transition: all 0.2s ease;
 }
-.tree-node[data-v-6969370b]:hover:not(.disabled) {
+.tree-node[data-v-6d1436ce]:hover:not(.disabled) {
   background: #f2f5f8;
 }
-.tree-node.selected[data-v-6969370b] {
+.tree-node.selected[data-v-6d1436ce] {
   background: #e6f7ff;
 }
-.tree-node.disabled[data-v-6969370b] {
+.tree-node.disabled[data-v-6d1436ce] {
   opacity: 0.3;
   pointer-events: none;
 }
-.tree-node .expand-icon[data-v-6969370b] {
+.tree-node .expand-icon[data-v-6d1436ce] {
   width: 16px;
   display: inline-flex;
   align-items: center;
   justify-content: center;
   margin-right: 4px;
 }
-.tree-node .node-label[data-v-6969370b] {
+.tree-node .node-label[data-v-6d1436ce] {
   flex: 1;
   font-size: 13px;
   color: #212528;
@@ -8784,9 +8785,10 @@ textarea[data-v-a7d89044]::placeholder {
   overflow: hidden;
   text-overflow: ellipsis;
 }
-.tree-node .node-right[data-v-6969370b] {
+.tree-node .node-right[data-v-6d1436ce] {
   margin-left: 8px;
   display: inline-flex;
+  flex-shrink: 0;
   align-items: center;
 }
 .tree-dropdown[data-v-c2f538d9] {

package/package.json

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