@gct-paas/word 0.1.67 → 0.1.69

package/dist/index.es.js

@@ -1,4 +1,4 @@
-/*! @gct-paas/word v0.1.67 */
+/*! @gct-paas/word v0.1.69 */
 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";
@@ -122504,6 +122504,7 @@ var init_material_consume_table_controller = __esmMin((() => {
 				if (this.mcPattern === MaterialConsumptionPatternEnum.RECORD) {
 					const { dataManager, rowIndex, subFieldKey } = option;
 					const row = (dataManager.getRawData()[subFieldKey] ?? [])[rowIndex];
+					if (!row) throw new Error("请填写数据");
 					if (!row.product_id_) throw new Error("物料不能为空");
 					this.validateExpiration(row);
 				} else await this.bomEntriesValidator.validate(this.actualTableData);
@@ -133538,17 +133539,6 @@ var init_sub_table_action_vue_vue_type_script_setup_true_name_sub_table_action_l
 				if (visible) return rows.filter((row) => !row.deleted_);
 				return rows;
 			};
-			/**
-			* 确保目标行数据结构已经存在 dataManager 中
-			* - 首次填报校验时，填充自动渲染的第一行
-			* - 条码扫描时，填充最后一行
-			*/
-			const checkTargetRowThen = (cb) => {
-				const { dataManager } = docInst.value;
-				const { path, index } = getCtx();
-				if (!dataManager.get(`${path}[${index}]`)) dataManager.insertAt(path, index, {});
-				setTimeout(cb);
-			};
 			const readonly = computed(() => {
 				const state = resolveWidgetState({
 					doc: props.doc,
@@ -133600,19 +133590,15 @@ var init_sub_table_action_vue_vue_type_script_setup_true_name_sub_table_action_l
 				if (!ctrl || !valuePath || !subFieldKey) return;
 				const { doc } = props;
 				const { dataManager, mainModelKey } = doc;
-				if (val === "confirm") checkTargetRowThen(() => {
-					ctrl.confirm({
-						dataManager,
-						subFieldKey,
-						rowIndex
-					}, subModelKey, doc);
-				});
-				else if (val === "scan") checkTargetRowThen(() => {
-					ctrl.openScanModal(tableName, {
-						doc,
-						subFieldKey,
-						subModelKey
-					});
+				if (val === "confirm") ctrl.confirm({
+					dataManager,
+					subFieldKey,
+					rowIndex
+				}, subModelKey, doc);
+				else if (val === "scan") ctrl.openScanModal(tableName, {
+					doc,
+					subFieldKey,
+					subModelKey
 				});
 				else if (val === "edit-row") ctrl.editRow({
 					dataManager,
@@ -133629,12 +133615,10 @@ var init_sub_table_action_vue_vue_type_script_setup_true_name_sub_table_action_l
 				const { doc } = props;
 				const { subRenderer, valuePath, subFieldKey, subModelKey } = getCtx();
 				if (!valuePath || !subFieldKey) return;
-				if (val === "scan") checkTargetRowThen(() => {
-					openWarehouseInventoryScan({
-						doc,
-						subRenderer,
-						subFieldKey
-					});
+				if (val === "scan") openWarehouseInventoryScan({
+					doc,
+					subRenderer,
+					subFieldKey
 				});
 				else if (val === "change-rule") await changeWarehouseInventoryParseRule({
 					doc,
@@ -133823,17 +133807,17 @@ var init_sub_table_action_vue_vue_type_script_setup_true_name_sub_table_action_l
 	});
 }));
 //#endregion
-//#region src/runtime/canvas/table/render/table-structure-overlay/sub-table-action.vue?vue&type=style&index=0&scoped=e16ba4cf&lang.less
-var init_sub_table_action_vue_vue_type_style_index_0_scoped_e16ba4cf_lang = __esmMin((() => {}));
+//#region src/runtime/canvas/table/render/table-structure-overlay/sub-table-action.vue?vue&type=style&index=0&scoped=d4a2947b&lang.less
+var init_sub_table_action_vue_vue_type_style_index_0_scoped_d4a2947b_lang = __esmMin((() => {}));
 //#endregion
 //#region src/runtime/canvas/table/render/table-structure-overlay/sub-table-action.vue
 var sub_table_action_default;
 var init_sub_table_action = __esmMin((() => {
 	init_sub_table_action_vue_vue_type_script_setup_true_name_sub_table_action_lang();
 	init_sub_table_action_vue_vue_type_script_setup_true_name_sub_table_action_lang();
-	init_sub_table_action_vue_vue_type_style_index_0_scoped_e16ba4cf_lang();
+	init_sub_table_action_vue_vue_type_style_index_0_scoped_d4a2947b_lang();
 	init__plugin_vue_export_helper();
-	sub_table_action_default = /*#__PURE__*/ _plugin_vue_export_helper_default(sub_table_action_vue_vue_type_script_setup_true_name_sub_table_action_lang_default, [["__scopeId", "data-v-e16ba4cf"]]);
+	sub_table_action_default = /*#__PURE__*/ _plugin_vue_export_helper_default(sub_table_action_vue_vue_type_script_setup_true_name_sub_table_action_lang_default, [["__scopeId", "data-v-d4a2947b"]]);
 }));
 //#endregion
 //#region src/runtime/canvas/table/render/table-structure-overlay/index.vue?vue&type=script&setup=true&lang.ts
@@ -148260,9 +148244,9 @@ var online_form_model_select_default = /* @__PURE__ */ defineComponent({
 				moduleType
 			}).then((res) => {
 				if (!(res === null || res === void 0 ? void 0 : res.ok) || !(res === null || res === void 0 ? void 0 : res.params)) return;
-				const { modelKey, formId } = res.params;
+				const { modelKey, formSelected } = res.params;
 				emit("update:joinModelKey", modelKey);
-				localVal.value = formId;
+				localVal.value = formSelected.id;
 			});
 		};
 		return (_ctx, _cache) => {
@@ -151392,7 +151376,7 @@ var calcModelFields = (model, isMaster = true) => {
 	const { modelKey, modelName } = model || {};
 	return buildIdentifierGroup({
 		id: isMaster ? modelKey : "_",
-		name: isMaster ? modelName : "子表当前行",
+		name: isMaster ? modelName : "当前数据",
 		model,
 		idToChildren: isMaster ? false : true
 	});

package/dist/word.css

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

package/package.json

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