@tmagic/form 1.8.0-manmanyu.9 → 1.8.1

package/dist/es/containers/GroupListItem.vue_vue_type_script_setup_true_lang.js

@@ -1,17 +1,20 @@
-import { filterFunction } from "../utils/form.js";
+import { appendProp, filterFunction } from "../utils/form.js";
+import { getGroupListRowConfig } from "../utils/tableGroupList.js";
 import Container_default from "./Container.js";
-import { Fragment, computed, createBlock, createCommentVNode, createElementBlock, createElementVNode, createTextVNode, createVNode, defineComponent, inject, openBlock, ref, unref, vShow, withCtx, withDirectives } from "vue";
-import { TMagicButton, TMagicCard, TMagicIcon, TMagicInputNumber, TMagicPopover } from "@tmagic/design";
+import { Fragment, computed, createBlock, createCommentVNode, createElementBlock, createElementVNode, createTextVNode, createVNode, defineComponent, inject, openBlock, ref, renderSlot, unref, vShow, withCtx, withDirectives } from "vue";
+import { TMagicButton, TMagicCard, TMagicIcon, TMagicInputNumber, TMagicPopover, TMagicTooltip } from "@tmagic/design";
 import { ArrowDown, ArrowRight, Bottom, Delete, DocumentCopy, Position, Top } from "@element-plus/icons-vue";
 //#region packages/form/src/containers/GroupListItem.vue?vue&type=script&setup=true&lang.ts
 var _hoisted_1 = { class: "m-fields-group-list-item-header" };
-var _hoisted_2 = ["innerHTML"];
-var _hoisted_3 = { style: {
+var _hoisted_2 = { class: "m-fields-group-list-item-title" };
+var _hoisted_3 = ["innerHTML"];
+var _hoisted_4 = { class: "m-fields-group-list-item-actions" };
+var _hoisted_5 = { style: {
 	"text-align": "right",
 	"margin-top": "20px"
 } };
-var _hoisted_4 = ["innerHTML"];
-var GroupListItem_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
+var _hoisted_6 = ["innerHTML"];
+var GroupListItem_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	name: "MFormGroupListItem",
 	__name: "GroupListItem",
 	props: {
@@ -21,6 +24,7 @@ var GroupListItem_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */
 		groupModel: {},
 		config: {},
 		labelWidth: {},
+		labelPosition: {},
 		prop: {},
 		size: {},
 		index: {},
@@ -39,15 +43,13 @@ var GroupListItem_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */
 		const mForm = inject("mForm");
 		const defaultExpandQuantity = props.config.defaultExpandQuantity ?? 7;
 		const expand = ref(props.config.expandAll || defaultExpandQuantity > props.index);
-		const rowConfig = computed(() => ({
-			type: "row",
-			span: props.config.span || 24,
-			items: props.config.items,
-			labelWidth: props.config.labelWidth,
-			[mForm?.keyProp || "__key"]: `${props.config[mForm?.keyProp || "__key"]}${String(props.index)}`
-		}));
+		const rowConfig = computed(() => getGroupListRowConfig(props.config, props.index, mForm?.keyProp));
+		const rowProp = computed(() => appendProp(props.prop, props.index));
 		const title = computed(() => {
-			if (props.config.titleKey && props.model[props.config.titleKey]) return props.model[props.config.titleKey];
+			if (props.config.titleKey && props.model[props.config.titleKey]) {
+				const { titlePrefix } = props.config;
+				return titlePrefix ? `${titlePrefix} ${String(props.index + 1)}: ${props.model[props.config.titleKey]}` : `${props.model[props.config.titleKey]}`;
+			}
 			if (props.config.title) return filterFunction(mForm, props.config.title, props);
 			return `${props.config.titlePrefix || "组"} ${String(props.index + 1)}`;
 		});
@@ -102,98 +104,112 @@ var GroupListItem_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */
 						})]),
 						_: 1
 					}, 8, ["disabled"]),
-					createElementVNode("span", { innerHTML: title.value }, null, 8, _hoisted_2),
-					!__props.isCompare ? withDirectives((openBlock(), createBlock(unref(TMagicButton), {
-						key: 0,
-						size: "default",
-						link: "",
-						class: "delete-button",
-						icon: unref(Delete),
-						disabled: __props.disabled,
-						onClick: removeHandler
-					}, null, 8, ["icon", "disabled"])), [[vShow, showDelete.value]]) : createCommentVNode("v-if", true),
-					copyable.value && !__props.isCompare ? (openBlock(), createBlock(unref(TMagicButton), {
-						key: 1,
-						link: "",
-						size: "default",
-						type: "primary",
-						icon: unref(DocumentCopy),
-						disabled: __props.disabled,
-						onClick: copyHandler
-					}, {
-						default: withCtx(() => [..._cache[6] || (_cache[6] = [createTextVNode("复制", -1)])]),
-						_: 1
-					}, 8, ["icon", "disabled"])) : createCommentVNode("v-if", true),
-					movable.value && !__props.isCompare ? (openBlock(), createElementBlock(Fragment, { key: 2 }, [withDirectives(createVNode(unref(TMagicButton), {
-						link: "",
-						size: "default",
-						disabled: __props.disabled,
-						icon: unref(Top),
-						onClick: _cache[0] || (_cache[0] = ($event) => changeOrder(-1))
-					}, {
-						default: withCtx(() => [..._cache[7] || (_cache[7] = [createTextVNode("上移", -1)])]),
-						_: 1
-					}, 8, ["disabled", "icon"]), [[vShow, __props.index !== 0]]), withDirectives(createVNode(unref(TMagicButton), {
-						link: "",
-						size: "default",
-						disabled: __props.disabled,
-						icon: unref(Bottom),
-						onClick: _cache[1] || (_cache[1] = ($event) => changeOrder(1))
-					}, {
-						default: withCtx(() => [..._cache[8] || (_cache[8] = [createTextVNode("下移", -1)])]),
-						_: 1
-					}, 8, ["disabled", "icon"]), [[vShow, __props.index !== length.value - 1]])], 64)) : createCommentVNode("v-if", true),
-					__props.config.moveSpecifyLocation && !__props.isCompare ? (openBlock(), createBlock(unref(TMagicPopover), {
-						key: 3,
-						trigger: "click",
-						placement: "top",
-						width: "200",
-						visible: moveSpecifyLocationVisible.value
-					}, {
-						reference: withCtx(() => [createVNode(unref(TMagicButton), {
+					createElementVNode("div", _hoisted_2, [renderSlot(_ctx.$slots, "title", {
+						model: __props.model,
+						index: __props.index,
+						lastValues: __props.lastValues,
+						prop: rowProp.value,
+						title: title.value
+					}, () => [createElementVNode("span", { innerHTML: title.value }, null, 8, _hoisted_3)])]),
+					createElementVNode("div", _hoisted_4, [
+						copyable.value && !__props.isCompare ? (openBlock(), createBlock(unref(TMagicButton), {
+							key: 0,
 							link: "",
-							size: "small",
+							size: "default",
 							type: "primary",
-							icon: unref(Position),
+							icon: unref(DocumentCopy),
 							disabled: __props.disabled,
-							onClick: _cache[2] || (_cache[2] = ($event) => moveSpecifyLocationVisible.value = true)
+							onClick: copyHandler
 						}, {
-							default: withCtx(() => [..._cache[9] || (_cache[9] = [createTextVNode("移动至", -1)])]),
+							default: withCtx(() => [..._cache[6] || (_cache[6] = [createTextVNode("复制", -1)])]),
 							_: 1
-						}, 8, ["icon", "disabled"])]),
-						default: withCtx(() => [createElementVNode("div", null, [createElementVNode("div", null, [
-							_cache[10] || (_cache[10] = createTextVNode(" 第", -1)),
-							createVNode(unref(TMagicInputNumber), {
-								style: { "margin": "0 5px" },
-								modelValue: moveSpecifyLocationIndex.value,
-								"onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => moveSpecifyLocationIndex.value = $event),
-								size: "small",
-								min: 1,
-								disabled: __props.disabled
-							}, null, 8, ["modelValue", "disabled"]),
-							_cache[11] || (_cache[11] = createTextVNode("行 ", -1))
-						]), createElementVNode("div", _hoisted_3, [createVNode(unref(TMagicButton), {
-							size: "small",
-							text: "",
-							onClick: _cache[4] || (_cache[4] = ($event) => moveSpecifyLocationVisible.value = false)
+						}, 8, ["icon", "disabled"])) : createCommentVNode("v-if", true),
+						movable.value && !__props.isCompare ? (openBlock(), createElementBlock(Fragment, { key: 1 }, [withDirectives(createVNode(unref(TMagicButton), {
+							link: "",
+							size: "default",
+							disabled: __props.disabled,
+							icon: unref(Top),
+							onClick: _cache[0] || (_cache[0] = ($event) => changeOrder(-1))
 						}, {
-							default: withCtx(() => [..._cache[12] || (_cache[12] = [createTextVNode("取消", -1)])]),
+							default: withCtx(() => [..._cache[7] || (_cache[7] = [createTextVNode("上移", -1)])]),
 							_: 1
-						}), createVNode(unref(TMagicButton), {
-							size: "small",
-							type: "primary",
-							onClick: moveSpecifyLocationHandler
+						}, 8, ["disabled", "icon"]), [[vShow, __props.index !== 0]]), withDirectives(createVNode(unref(TMagicButton), {
+							link: "",
+							size: "default",
+							disabled: __props.disabled,
+							icon: unref(Bottom),
+							onClick: _cache[1] || (_cache[1] = ($event) => changeOrder(1))
 						}, {
-							default: withCtx(() => [..._cache[13] || (_cache[13] = [createTextVNode("确认", -1)])]),
+							default: withCtx(() => [..._cache[8] || (_cache[8] = [createTextVNode("下移", -1)])]),
 							_: 1
-						})])])]),
-						_: 1
-					}, 8, ["visible"])) : createCommentVNode("v-if", true),
-					itemExtra.value ? (openBlock(), createElementBlock("span", {
-						key: 4,
-						innerHTML: itemExtra.value,
-						class: "m-form-tip"
-					}, null, 8, _hoisted_4)) : createCommentVNode("v-if", true)
+						}, 8, ["disabled", "icon"]), [[vShow, __props.index !== length.value - 1]])], 64)) : createCommentVNode("v-if", true),
+						__props.config.moveSpecifyLocation && !__props.isCompare ? (openBlock(), createBlock(unref(TMagicPopover), {
+							key: 2,
+							trigger: "click",
+							placement: "top",
+							width: "200",
+							visible: moveSpecifyLocationVisible.value
+						}, {
+							reference: withCtx(() => [createVNode(unref(TMagicButton), {
+								link: "",
+								size: "small",
+								type: "primary",
+								icon: unref(Position),
+								disabled: __props.disabled,
+								onClick: _cache[2] || (_cache[2] = ($event) => moveSpecifyLocationVisible.value = true)
+							}, {
+								default: withCtx(() => [..._cache[9] || (_cache[9] = [createTextVNode("移动至", -1)])]),
+								_: 1
+							}, 8, ["icon", "disabled"])]),
+							default: withCtx(() => [createElementVNode("div", null, [createElementVNode("div", null, [
+								_cache[10] || (_cache[10] = createTextVNode(" 第", -1)),
+								createVNode(unref(TMagicInputNumber), {
+									style: { "margin": "0 5px" },
+									modelValue: moveSpecifyLocationIndex.value,
+									"onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => moveSpecifyLocationIndex.value = $event),
+									size: "small",
+									min: 1,
+									disabled: __props.disabled
+								}, null, 8, ["modelValue", "disabled"]),
+								_cache[11] || (_cache[11] = createTextVNode("行 ", -1))
+							]), createElementVNode("div", _hoisted_5, [createVNode(unref(TMagicButton), {
+								size: "small",
+								text: "",
+								onClick: _cache[4] || (_cache[4] = ($event) => moveSpecifyLocationVisible.value = false)
+							}, {
+								default: withCtx(() => [..._cache[12] || (_cache[12] = [createTextVNode("取消", -1)])]),
+								_: 1
+							}), createVNode(unref(TMagicButton), {
+								size: "small",
+								type: "primary",
+								onClick: moveSpecifyLocationHandler
+							}, {
+								default: withCtx(() => [..._cache[13] || (_cache[13] = [createTextVNode("确认", -1)])]),
+								_: 1
+							})])])]),
+							_: 1
+						}, 8, ["visible"])) : createCommentVNode("v-if", true),
+						createCommentVNode(" v-if 必须挂在 Tooltip 上：子节点为 false 时 ElOnlyChild 会报 no valid child node found "),
+						!__props.isCompare ? (openBlock(), createBlock(unref(TMagicTooltip), {
+							key: 3,
+							content: `删除 ${title.value}`
+						}, {
+							default: withCtx(() => [withDirectives(createVNode(unref(TMagicButton), {
+								size: "default",
+								link: "",
+								class: "delete-button",
+								icon: unref(Delete),
+								disabled: __props.disabled,
+								onClick: removeHandler
+							}, null, 8, ["icon", "disabled"]), [[vShow, showDelete.value]])]),
+							_: 1
+						}, 8, ["content"])) : createCommentVNode("v-if", true),
+						itemExtra.value ? (openBlock(), createElementBlock("span", {
+							key: 4,
+							innerHTML: itemExtra.value,
+							class: "m-form-tip"
+						}, null, 8, _hoisted_6)) : createCommentVNode("v-if", true)
+					])
 				])]),
 				default: withCtx(() => [expand.value ? (openBlock(), createBlock(Container_default, {
 					key: 0,
@@ -202,7 +218,8 @@ var GroupListItem_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */
 					lastValues: __props.lastValues,
 					"is-compare": __props.isCompare,
 					labelWidth: __props.labelWidth,
-					prop: `${__props.prop}${__props.prop ? "." : ""}${String(__props.index)}`,
+					labelPosition: __props.labelPosition,
+					prop: rowProp.value,
 					size: __props.size,
 					disabled: __props.disabled,
 					onChange: changeHandler,
@@ -213,11 +230,12 @@ var GroupListItem_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */
 					"lastValues",
 					"is-compare",
 					"labelWidth",
+					"labelPosition",
 					"prop",
 					"size",
 					"disabled"
 				])) : createCommentVNode("v-if", true)]),
-				_: 1
+				_: 3
 			}, 8, ["flat", "body-style"]);
 		};
 	}

package/dist/es/containers/Panel.vue_vue_type_script_setup_true_lang.js

@@ -16,7 +16,7 @@ var _hoisted_3 = {
 };
 var _hoisted_4 = { style: { "flex": "1" } };
 var _hoisted_5 = ["src"];
-var Panel_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
+var Panel_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	name: "MFormPanel",
 	__name: "Panel",
 	props: {
@@ -26,6 +26,7 @@ var Panel_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineCo
 		config: {},
 		name: {},
 		labelWidth: {},
+		labelPosition: {},
 		prop: {},
 		size: {},
 		disabled: { type: Boolean },
@@ -88,6 +89,7 @@ var Panel_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineCo
 						size: __props.size,
 						disabled: __props.disabled,
 						"label-width": __props.config.labelWidth || __props.labelWidth,
+						"label-position": __props.config.labelPosition || __props.labelPosition,
 						onChange: changeHandler,
 						onAddDiffCount: _cache[2] || (_cache[2] = ($event) => onAddDiffCount())
 					}, null, 8, [
@@ -98,7 +100,8 @@ var Panel_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineCo
 						"prop",
 						"size",
 						"disabled",
-						"label-width"
+						"label-width",
+						"label-position"
 					]);
 				}), 128))]), createElementVNode("img", {
 					class: "m-form-schematic",
@@ -114,6 +117,7 @@ var Panel_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineCo
 						size: __props.size,
 						disabled: __props.disabled,
 						"label-width": __props.config.labelWidth || __props.labelWidth,
+						"label-position": __props.config.labelPosition || __props.labelPosition,
 						onChange: changeHandler,
 						onAddDiffCount: _cache[3] || (_cache[3] = ($event) => onAddDiffCount())
 					}, null, 8, [
@@ -124,7 +128,8 @@ var Panel_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineCo
 						"prop",
 						"size",
 						"disabled",
-						"label-width"
+						"label-width",
+						"label-position"
 					]);
 				}), 128))])]),
 				_: 3

package/dist/es/containers/Row.vue_vue_type_script_setup_true_lang.js

@@ -2,7 +2,7 @@ import Col_default from "./Col.js";
 import { Fragment, createBlock, createElementBlock, defineComponent, inject, openBlock, renderList, unref, withCtx } from "vue";
 import { TMagicRow } from "@tmagic/design";
 //#region packages/form/src/containers/Row.vue?vue&type=script&setup=true&lang.ts
-var Row_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
+var Row_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	name: "MFormRow",
 	__name: "Row",
 	props: {
@@ -12,6 +12,7 @@ var Row_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComp
 		config: {},
 		name: {},
 		labelWidth: {},
+		labelPosition: {},
 		prop: {},
 		size: {},
 		expandMore: { type: Boolean },
@@ -34,6 +35,7 @@ var Row_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComp
 						span: col.span || __props.config.span || 24 / __props.config.items.length,
 						config: col,
 						labelWidth: __props.config.labelWidth || __props.labelWidth,
+						labelPosition: __props.config.labelPosition || __props.labelPosition,
 						expandMore: __props.expandMore,
 						model: __props.name ? __props.model[__props.name] : __props.model,
 						lastValues: __props.name ? __props.lastValues[__props.name] : __props.lastValues,
@@ -47,6 +49,7 @@ var Row_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComp
 						"span",
 						"config",
 						"labelWidth",
+						"labelPosition",
 						"expandMore",
 						"model",
 						"lastValues",

package/dist/es/containers/Step.vue_vue_type_script_setup_true_lang.js

@@ -2,7 +2,7 @@ import Container_default from "./Container.js";
 import { Fragment, createBlock, createCommentVNode, createElementBlock, createVNode, defineComponent, inject, openBlock, ref, renderList, unref, vShow, watchEffect, withCtx, withDirectives } from "vue";
 import { TMagicStep, TMagicSteps } from "@tmagic/design";
 //#region packages/form/src/containers/Step.vue?vue&type=script&setup=true&lang.ts
-var Step_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
+var Step_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	name: "MFormStep",
 	__name: "Step",
 	props: {
@@ -13,6 +13,7 @@ var Step_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineCom
 		config: {},
 		stepActive: { default: 1 },
 		labelWidth: {},
+		labelPosition: {},
 		size: {},
 		disabled: { type: Boolean }
 	},
@@ -64,6 +65,7 @@ var Step_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineCom
 						size: __props.size,
 						disabled: __props.disabled,
 						"label-width": __props.config.labelWidth || __props.labelWidth,
+						"label-position": __props.config.labelPosition || __props.labelPosition,
 						onChange: changeHandler,
 						onAddDiffCount: _cache[0] || (_cache[0] = ($event) => onAddDiffCount())
 					}, null, 8, [
@@ -74,7 +76,8 @@ var Step_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineCom
 						"prop",
 						"size",
 						"disabled",
-						"label-width"
+						"label-width",
+						"label-position"
 					])), [[vShow, active.value - 1 === index]]) : createCommentVNode("v-if", true)], 64);
 				}), 256))], 64);
 			}), 256))]);

package/dist/es/containers/Tabs.vue_vue_type_script_setup_true_lang.js

@@ -1,10 +1,11 @@
 import { display, filterFunction, initValue } from "../utils/form.js";
+import { applyMountValueEffects } from "../utils/collectFields.js";
 import Container_default from "./Container.js";
 import { Fragment, computed, createBlock, createElementBlock, createElementVNode, createTextVNode, createVNode, defineComponent, inject, mergeProps, openBlock, ref, renderList, resolveDynamicComponent, toDisplayString, unref, watch, watchEffect, withCtx } from "vue";
 import { isEmpty } from "lodash-es";
 import { TMagicBadge, getDesignConfig } from "@tmagic/design";
 //#region packages/form/src/containers/Tabs.vue?vue&type=script&setup=true&lang.ts
-var Tabs_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
+var Tabs_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	name: "MFormTabs",
 	__name: "Tabs",
 	props: {
@@ -18,6 +19,7 @@ var Tabs_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineCom
 		name: {},
 		size: {},
 		labelWidth: {},
+		labelPosition: {},
 		prop: { default: "" },
 		expandMore: { type: Boolean },
 		disabled: { type: Boolean }
@@ -94,12 +96,15 @@ var Tabs_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineCom
 					prop: props.prop,
 					config: props.config
 				});
+				const tabsModel = props.model[props.name];
+				if (Array.isArray(tabsModel) && Array.isArray(props.config.items)) for (const tab of tabsModel) applyMountValueEffects(mForm, props.config.items, tab);
 				emit("change", props.model[props.name]);
 			} else {
 				const newObj = await initValue(mForm, {
 					config: props.config.items,
 					initValues: {}
 				});
+				applyMountValueEffects(mForm, props.config.items, newObj);
 				newObj.title = `标签${tabs.value.length + 1}`;
 				props.model[props.name].push(newObj);
 				emit("change", props.model[props.name], { changeRecords: [{
@@ -169,6 +174,7 @@ var Tabs_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineCom
 								prop: __props.config.dynamic ? `${__props.prop}${__props.prop ? "." : ""}${String(tabIndex)}` : tab.name ? `${__props.prop}${__props.prop ? "." : ""}${tab.name}` : __props.prop,
 								size: __props.size,
 								"label-width": tab.labelWidth || __props.labelWidth,
+								"label-position": tab.labelPosition || __props.labelPosition,
 								"expand-more": __props.expandMore,
 								onChange: changeHandler,
 								onAddDiffCount: ($event) => onAddDiffCount(Number(tabIndex))
@@ -181,6 +187,7 @@ var Tabs_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineCom
 								"prop",
 								"size",
 								"label-width",
+								"label-position",
 								"expand-more",
 								"onAddDiffCount"
 							]);

package/dist/es/containers/table/ActionsColumn.vue_vue_type_script_setup_true_lang.js

@@ -3,7 +3,7 @@ import { cloneDeep } from "lodash-es";
 import { TMagicButton, TMagicTooltip } from "@tmagic/design";
 import { Delete, DocumentCopy, Sort } from "@element-plus/icons-vue";
 //#region packages/form/src/containers/table/ActionsColumn.vue?vue&type=script&setup=true&lang.ts
-var ActionsColumn_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
+var ActionsColumn_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	__name: "ActionsColumn",
 	props: {
 		config: {},

package/dist/es/containers/table/SortColumn.vue_vue_type_script_setup_true_lang.js

@@ -2,7 +2,7 @@ import { Fragment, createBlock, createCommentVNode, createElementBlock, createVN
 import { TMagicButton, TMagicTooltip } from "@tmagic/design";
 import { ArrowDown, ArrowUp } from "@element-plus/icons-vue";
 //#region packages/form/src/containers/table/SortColumn.vue?vue&type=script&setup=true&lang.ts
-var SortColumn_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
+var SortColumn_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	__name: "SortColumn",
 	props: {
 		index: {},

package/dist/es/containers/table/Table.vue_vue_type_script_setup_true_lang.js

@@ -17,11 +17,11 @@ var _hoisted_2 = { style: {
 } };
 var _hoisted_3 = { style: { "display": "flex" } };
 var _hoisted_4 = {
-	key: 1,
+	key: 2,
 	class: "bottom",
 	style: { "text-align": "right" }
 };
-var Table_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
+var Table_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	name: "MFormTable",
 	__name: "Table",
 	props: {
@@ -82,12 +82,14 @@ var Table_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineCo
 					style: { "color": "rgba(0, 0, 0, 0.45)" },
 					innerHTML: __props.config.extra
 				}, null, 8, _hoisted_1)) : createCommentVNode("v-if", true),
-				createVNode(unref(TMagicTooltip), {
+				createCommentVNode(" v-if 必须挂在 Tooltip 上：表格未就绪时 ElOnlyChild 会报 no valid child node found "),
+				__props.model[modelName.value] ? (openBlock(), createBlock(unref(TMagicTooltip), {
+					key: 1,
 					content: "拖拽可排序",
 					placement: "left-start",
 					disabled: __props.config.dropSort !== true || __props.config.dropSortHandle
 				}, {
-					default: withCtx(() => [__props.model[modelName.value] ? (openBlock(), createBlock(unref(TMagicTable), {
+					default: withCtx(() => [(openBlock(), createBlock(unref(TMagicTable), {
 						ref: "tMagicTable",
 						style: { "width": "100%" },
 						"show-header": "",
@@ -99,20 +101,22 @@ var Table_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineCo
 						"default-expand-all": true,
 						key: updateKey.value,
 						onSelect: unref(selectHandle),
-						onSortChange: sortChangeHandler
+						onSortChange: sortChangeHandler,
+						"empty-text": `暂无${__props.config.titlePrefix || ""}数据`
 					}, null, 8, [
 						"row-key",
 						"columns",
 						"data",
 						"border",
 						"max-height",
-						"onSelect"
-					])) : createCommentVNode("v-if", true)]),
+						"onSelect",
+						"empty-text"
+					]))]),
 					_: 1
-				}, 8, ["disabled"]),
+				}, 8, ["disabled"])) : createCommentVNode("v-if", true),
 				renderSlot(_ctx.$slots, "default"),
 				createElementVNode("div", _hoisted_2, [createElementVNode("div", _hoisted_3, [
-					!unref(isFullscreen) ? renderSlot(_ctx.$slots, "toggle-button", { key: 0 }) : createCommentVNode("v-if", true),
+					!unref(isFullscreen) ? renderSlot(_ctx.$slots, "toggle-button", {}, void 0, void 0, 0) : createCommentVNode("v-if", true),
 					__props.config.enableFullscreen !== false ? (openBlock(), createBlock(unref(TMagicButton), {
 						key: 1,
 						icon: unref(FullScreen),
@@ -153,7 +157,7 @@ var Table_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineCo
 						default: withCtx(() => [..._cache[1] || (_cache[1] = [createTextVNode("清空", -1)])]),
 						_: 1
 					}, 8, ["disabled", "onClick"])) : createCommentVNode("v-if", true)
-				]), !__props.isCompare ? renderSlot(_ctx.$slots, "add-button", { key: 0 }) : createCommentVNode("v-if", true)]),
+				]), !__props.isCompare ? renderSlot(_ctx.$slots, "add-button", {}, void 0, void 0, 0) : createCommentVNode("v-if", true)]),
 				__props.config.pagination ? (openBlock(), createElementBlock("div", _hoisted_4, [createVNode(unref(TMagicPagination), {
 					layout: "total, sizes, prev, pager, next, jumper",
 					"hide-on-single-page": __props.model[modelName.value].length < unref(pageSize),

package/dist/es/containers/table/useTableColumns.js

@@ -1,9 +1,10 @@
-import { display, getDataByPage, sortArray } from "../../utils/form.js";
+import { isGlobalFlat } from "../../utils/config.js";
+import { appendProp, display, getDataByPage, sortArray } from "../../utils/form.js";
+import { isTableColumnRendered, makeTableColumnConfig } from "../../utils/tableGroupList.js";
 import Container_default from "../Container.js";
 import ActionsColumn_default from "./ActionsColumn.js";
 import SortColumn_default from "./SortColumn.js";
 import { computed, h, inject } from "vue";
-import { cloneDeep } from "lodash-es";
 import { TMagicIcon, TMagicTooltip } from "@tmagic/design";
 import { WarningFilled } from "@element-plus/icons-vue";
 //#region packages/form/src/containers/table/useTableColumns.ts
@@ -34,15 +35,7 @@ var useTableColumns = (props, emit, currentPage, pageSize, modelName) => {
 		if (typeof props.config.selection === "function") return props.config.selection(mForm, { model: props.model[modelName.value] });
 		return props.config.selection;
 	});
-	const getProp = (index) => {
-		return `${props.prop}${props.prop ? "." : ""}${index + 1 + currentPage.value * pageSize.value - 1}`;
-	};
-	const makeConfig = (config, row) => {
-		const newConfig = cloneDeep(config);
-		if (typeof config.itemsFunction === "function") newConfig.items = config.itemsFunction(row);
-		delete newConfig.display;
-		return newConfig;
-	};
+	const getProp = (index) => appendProp(props.prop, index + currentPage.value * pageSize.value);
 	const changeHandler = (v, eventData) => {
 		emit("change", props.model, eventData);
 	};
@@ -66,8 +59,10 @@ var useTableColumns = (props, emit, currentPage, pageSize, modelName) => {
 			type: "selection",
 			width: 45
 		} });
-		let actionFixed = props.config.fixed === false ? void 0 : "left";
+		const defaultFixed = isGlobalFlat.value ? "right" : "left";
+		let actionFixed = props.config.fixed === false ? void 0 : defaultFixed;
 		if (typeof props.config.fixed === "string" && ["left", "right"].includes(props.config.fixed)) actionFixed = props.config.fixed;
+		const actionFlat = props.config.flat === void 0 && isGlobalFlat.value ? true : props.config.flat;
 		const actionColumn = {
 			props: {
 				label: "操作",
@@ -77,7 +72,7 @@ var useTableColumns = (props, emit, currentPage, pageSize, modelName) => {
 			},
 			cell: ({ row, $index }) => h(ActionsColumn_default, {
 				row,
-				flat: props.config.flat,
+				flat: actionFlat,
 				index: $index,
 				model: props.model,
 				config: props.config,
@@ -119,7 +114,7 @@ var useTableColumns = (props, emit, currentPage, pageSize, modelName) => {
 			},
 			cell: ({ $index }) => h("span", $index + 1 + currentPage.value * pageSize.value)
 		});
-		for (const column of props.config.items) if (column.type !== "hidden" && display$1(column.display)) {
+		for (const column of props.config.items) if (isTableColumnRendered(column, display$1)) {
 			const titleTipValue = titleTip(column.titleTip);
 			columns.push({
 				props: {
@@ -135,7 +130,7 @@ var useTableColumns = (props, emit, currentPage, pageSize, modelName) => {
 					disabled: props.disabled,
 					prop: getProp($index),
 					rules: column.rules,
-					config: makeConfig(column, row),
+					config: makeTableColumnConfig(column, row),
 					model: row,
 					lastValues: lastData.value[$index],
 					isCompare: props.isCompare,