@tmagic/form 1.8.0-manmanyu.10 → 1.8.0-manmanyu.12

package/dist/es/Form.vue_vue_type_script_setup_true_lang.js

@@ -35,6 +35,10 @@ var Form_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineCompo
 		keyProp: { default: "__key" },
 		popperClass: {},
 		preventSubmitDefault: { type: Boolean },
+		useFieldTextInError: {
+			type: Boolean,
+			default: true
+		},
 		extendState: {},
 		showDiff: {},
 		selfDiffFieldTypes: {},
@@ -279,7 +283,7 @@ var Form_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineCompo
 					Object.entries(invalidFields).forEach(([prop, ValidateError]) => {
 						ValidateError.forEach(({ field, message }) => {
 							const name = field || prop;
-							const text = getTextByName(name, props.config) || name;
+							const text = (props.useFieldTextInError ? getTextByName(name, props.config) : void 0) || name;
 							error.push(`${text} -> ${message}`);
 						});
 					});

package/dist/es/FormBox.vue_vue_type_script_setup_true_lang.js

@@ -19,6 +19,10 @@ var FormBox_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineCo
 		inline: { type: Boolean },
 		labelPosition: {},
 		preventSubmitDefault: { type: Boolean },
+		useFieldTextInError: {
+			type: Boolean,
+			default: true
+		},
 		extendState: {}
 	},
 	emits: [
@@ -81,6 +85,7 @@ var FormBox_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineCo
 					"label-position": __props.labelPosition,
 					inline: __props.inline,
 					"prevent-submit-default": __props.preventSubmitDefault,
+					"use-field-text-in-error": __props.useFieldTextInError,
 					"extend-state": __props.extendState,
 					onChange: changeHandler
 				}, null, 8, [
@@ -93,6 +98,7 @@ var FormBox_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineCo
 					"label-position",
 					"inline",
 					"prevent-submit-default",
+					"use-field-text-in-error",
 					"extend-state"
 				]), renderSlot(_ctx.$slots, "default")]),
 				_: 3

package/dist/es/FormDialog.vue_vue_type_script_setup_true_lang.js

@@ -41,6 +41,10 @@ var FormDialog_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defin
 			type: Boolean,
 			default: true
 		},
+		useFieldTextInError: {
+			type: Boolean,
+			default: true
+		},
 		extendState: {},
 		theme: {}
 	},
@@ -195,6 +199,7 @@ var FormDialog_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defin
 					"label-position": __props.labelPosition,
 					inline: __props.inline,
 					"prevent-submit-default": __props.preventSubmitDefault,
+					"use-field-text-in-error": __props.useFieldTextInError,
 					"extend-state": __props.extendState,
 					theme: effectiveTheme.value,
 					onChange: changeHandler
@@ -209,6 +214,7 @@ var FormDialog_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defin
 					"label-position",
 					"inline",
 					"prevent-submit-default",
+					"use-field-text-in-error",
 					"extend-state",
 					"theme"
 				]), renderSlot(_ctx.$slots, "default")], 4)) : createCommentVNode("v-if", true)]),

package/dist/es/FormDrawer.vue_vue_type_script_setup_true_lang.js

@@ -24,6 +24,10 @@ var FormDrawer_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defin
 		inline: { type: Boolean },
 		labelPosition: {},
 		preventSubmitDefault: { type: Boolean },
+		useFieldTextInError: {
+			type: Boolean,
+			default: true
+		},
 		beforeClose: {},
 		extendState: {},
 		theme: {}
@@ -171,6 +175,7 @@ var FormDrawer_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defin
 					"label-position": __props.labelPosition,
 					inline: __props.inline,
 					"prevent-submit-default": __props.preventSubmitDefault,
+					"use-field-text-in-error": __props.useFieldTextInError,
 					"extend-state": __props.extendState,
 					theme: effectiveTheme.value,
 					onChange: changeHandler
@@ -184,6 +189,7 @@ var FormDrawer_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defin
 					"label-position",
 					"inline",
 					"prevent-submit-default",
+					"use-field-text-in-error",
 					"extend-state",
 					"theme"
 				]), renderSlot(_ctx.$slots, "default")], 512)) : createCommentVNode("v-if", true)]),

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

@@ -148,7 +148,8 @@ var Container_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ define
 			labelWidth: itemLabelWidth.value,
 			labelPosition: props.config.labelPosition,
 			rules: rule.value,
-			extra: filterFunction(mForm, props.config.extra, props)
+			extra: filterFunction(mForm, props.config.extra, props),
+			extraTips: props.config.extraTips
 		}));
 		const itemLabelWidth = computed(() => props.config.labelWidth ?? props.labelWidth);
 		watchEffect(() => {

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

@@ -1,5 +1,5 @@
 import GroupListItem_default from "./GroupListItem.js";
-import { Fragment, createBlock, createCommentVNode, createElementBlock, createElementVNode, defineComponent, openBlock, renderList, renderSlot } from "vue";
+import { Fragment, createBlock, createCommentVNode, createElementBlock, createElementVNode, defineComponent, openBlock, renderList, renderSlot, toDisplayString } from "vue";
 import { cloneDeep } from "lodash-es";
 //#region packages/form/src/containers/GroupList.vue?vue&type=script&setup=true&lang.ts
 var _hoisted_1 = { class: "m-fields-group-list" };
@@ -8,11 +8,12 @@ var _hoisted_3 = {
 	key: 1,
 	class: "el-table__empty-block"
 };
-var _hoisted_4 = {
+var _hoisted_4 = { class: "el-table__empty-text t-table__empty" };
+var _hoisted_5 = {
 	key: 3,
 	class: "m-fields-group-list-footer"
 };
-var _hoisted_5 = { style: {
+var _hoisted_6 = { style: {
 	"display": "flex",
 	"justify-content": "flex-end",
 	"flex": "1"
@@ -63,7 +64,7 @@ var GroupList_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ define
 					innerHTML: __props.config.extra,
 					style: { "color": "rgba(0, 0, 0, 0.45)" }
 				}, null, 8, _hoisted_2)) : createCommentVNode("v-if", true),
-				!__props.model[__props.name] || !__props.model[__props.name].length ? (openBlock(), createElementBlock("div", _hoisted_3, [..._cache[1] || (_cache[1] = [createElementVNode("span", { class: "el-table__empty-text t-table__empty" }, "暂无数据", -1)])])) : (openBlock(true), createElementBlock(Fragment, { key: 2 }, renderList(__props.model[__props.name], (item, index) => {
+				!__props.model[__props.name] || !__props.model[__props.name].length ? (openBlock(), createElementBlock("div", _hoisted_3, [createElementVNode("span", _hoisted_4, "暂无" + toDisplayString(__props.config.titlePrefix || "") + "数据", 1)])) : (openBlock(true), createElementBlock(Fragment, { key: 2 }, renderList(__props.model[__props.name], (item, index) => {
 					return openBlock(), createBlock(GroupListItem_default, {
 						key: index,
 						model: item,
@@ -94,7 +95,7 @@ var GroupList_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ define
 						"group-model"
 					]);
 				}), 128)),
-				!__props.isCompare ? (openBlock(), createElementBlock("div", _hoisted_4, [renderSlot(_ctx.$slots, "toggle-button"), createElementVNode("div", _hoisted_5, [renderSlot(_ctx.$slots, "add-button")])])) : createCommentVNode("v-if", true)
+				!__props.isCompare ? (openBlock(), createElementBlock("div", _hoisted_5, [renderSlot(_ctx.$slots, "toggle-button"), createElementVNode("div", _hoisted_6, [renderSlot(_ctx.$slots, "add-button")])])) : createCommentVNode("v-if", true)
 			]);
 		};
 	}

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

@@ -1,7 +1,7 @@
 import { filterFunction } from "../utils/form.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 { 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" };
@@ -47,7 +47,10 @@ var GroupListItem_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ de
 			[mForm?.keyProp || "__key"]: `${props.config[mForm?.keyProp || "__key"]}${String(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)}`;
 		});
@@ -103,17 +106,20 @@ var GroupListItem_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ de
 						_: 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),
+					createVNode(unref(TMagicTooltip), { content: `删除 ${title.value}` }, {
+						default: withCtx(() => [!__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)]),
+						_: 1
+					}, 8, ["content"]),
 					copyable.value && !__props.isCompare ? (openBlock(), createBlock(unref(TMagicButton), {
-						key: 1,
+						key: 0,
 						link: "",
 						size: "default",
 						type: "primary",
@@ -124,7 +130,7 @@ var GroupListItem_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ de
 						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), {
+					movable.value && !__props.isCompare ? (openBlock(), createElementBlock(Fragment, { key: 1 }, [withDirectives(createVNode(unref(TMagicButton), {
 						link: "",
 						size: "default",
 						disabled: __props.disabled,
@@ -144,7 +150,7 @@ var GroupListItem_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ de
 						_: 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,
+						key: 2,
 						trigger: "click",
 						placement: "top",
 						width: "200",
@@ -190,7 +196,7 @@ var GroupListItem_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ de
 						_: 1
 					}, 8, ["visible"])) : createCommentVNode("v-if", true),
 					itemExtra.value ? (openBlock(), createElementBlock("span", {
-						key: 4,
+						key: 3,
 						innerHTML: itemExtra.value,
 						class: "m-form-tip"
 					}, null, 8, _hoisted_4)) : createCommentVNode("v-if", true)

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

@@ -99,14 +99,16 @@ var Table_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComp
 						"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"
+						"onSelect",
+						"empty-text"
 					])) : createCommentVNode("v-if", true)]),
 					_: 1
 				}, 8, ["disabled"]),

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

@@ -70,6 +70,7 @@ var useTableColumns = (props, emit, currentPage, pageSize, modelName) => {
 		const defaultFixed = isMagicAdmin.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 && isMagicAdmin.value ? true : props.config.flat;
 		const actionColumn = {
 			props: {
 				label: "操作",
@@ -79,7 +80,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,

package/dist/es/fields/Number.vue_vue_type_script_setup_true_lang.js

@@ -1,6 +1,6 @@
 import { useAddField } from "../utils/useAddField.js";
 import { createBlock, createCommentVNode, defineComponent, inject, openBlock, ref, unref, watch } from "vue";
-import { TMagicInputNumber } from "@tmagic/design";
+import { TMagicInputNumber, isMagicAdminTheme } from "@tmagic/design";
 //#region packages/form/src/fields/Number.vue?vue&type=script&setup=true&lang.ts
 var Number_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	name: "MFormNumber",
@@ -24,6 +24,7 @@ var Number_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineCom
 	setup(__props, { emit: __emit }) {
 		const props = __props;
 		const emit = __emit;
+		const isMagicAdmin = isMagicAdminTheme();
 		const value = ref();
 		watch(() => props.model[props.name], (v) => {
 			value.value = v;
@@ -43,7 +44,7 @@ var Number_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineCom
 				modelValue: value.value,
 				"onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => value.value = $event),
 				clearable: "",
-				"controls-position": "right",
+				"controls-position": unref(isMagicAdmin) ? "" : "right",
 				size: __props.size,
 				max: __props.config.max,
 				min: __props.config.min,
@@ -54,6 +55,7 @@ var Number_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineCom
 				onInput: inputHandler
 			}, null, 8, [
 				"modelValue",
+				"controls-position",
 				"size",
 				"max",
 				"min",

package/dist/es/style.css

@@ -298,6 +298,7 @@ fieldset.m-fieldset .m-form-tip {
   display: flex;
   justify-content: space-between;
   margin-top: 10px;
+  margin-bottom: 16px;
 }
 
 .m-form-panel .el-card__header:hover {

package/dist/es/submitForm.js

@@ -28,13 +28,20 @@ import { createApp, defineComponent, h, nextTick, ref, watch } from "vue";
 *   initValues: { name: 'foo' },
 *   returnChangeRecords: true,
 * });
+*
+* // 调试模式：可见地渲染表单，点击「确定」才提交：
+* const values = await submitForm({
+*   config: [...],
+*   initValues: { name: 'foo' },
+*   debug: true,
+* });
 * ```
 */
 var submitForm = (options) => {
-	const { native, appContext, timeout = 1e4, returnChangeRecords, ...formProps } = options;
+	const { native, appContext, timeout = 1e4, returnChangeRecords, debug = false, ...formProps } = options;
 	return new Promise((resolve, reject) => {
 		const container = document.createElement("div");
-		container.style.display = "none";
+		if (!debug) container.style.display = "none";
 		document.body.appendChild(container);
 		let cleaned = false;
 		let timer = null;
@@ -42,22 +49,106 @@ var submitForm = (options) => {
 			name: "MFormSubmitWrapper",
 			setup() {
 				const formRef = ref(null);
-				const stop = watch(() => formRef.value?.initialized, async (initialized) => {
-					if (!initialized) return;
-					stop();
+				const errorMsg = ref("");
+				const doSubmit = async () => {
 					try {
 						await nextTick();
-						const changeRecords = [...formRef.value.changeRecords ?? []];
+						const changeRecords = [...formRef.value?.changeRecords ?? []];
 						const result = await formRef.value.submitForm(native);
 						resolve(returnChangeRecords ? {
 							values: result,
 							changeRecords
 						} : result);
+						cleanup();
 					} catch (err) {
+						if (debug) {
+							errorMsg.value = err instanceof Error ? err.message : String(err);
+							return;
+						}
 						reject(err);
-					} finally {
 						cleanup();
 					}
+				};
+				if (debug) {
+					const handleCancel = () => {
+						reject(/* @__PURE__ */ new Error("submitForm canceled in debug mode."));
+						cleanup();
+					};
+					const btnBase = {
+						padding: "8px 20px",
+						fontSize: "14px",
+						lineHeight: "1",
+						border: "1px solid #dcdfe6",
+						borderRadius: "4px",
+						cursor: "pointer"
+					};
+					return () => h("div", { style: {
+						position: "fixed",
+						inset: "0",
+						zIndex: "10000",
+						display: "flex",
+						alignItems: "center",
+						justifyContent: "center",
+						background: "rgba(0, 0, 0, 0.5)"
+					} }, [h("div", { style: {
+						display: "flex",
+						flexDirection: "column",
+						width: "600px",
+						maxWidth: "90vw",
+						maxHeight: "85vh",
+						background: "#fff",
+						borderRadius: "8px",
+						boxShadow: "0 8px 24px rgba(0, 0, 0, 0.2)",
+						overflow: "hidden"
+					} }, [
+						h("div", { style: {
+							padding: "16px 20px",
+							fontSize: "16px",
+							fontWeight: "600",
+							borderBottom: "1px solid #ebeef5"
+						} }, "submitForm 调试"),
+						h("div", { style: {
+							flex: "1",
+							padding: "20px",
+							overflow: "auto"
+						} }, [h(Form_default, {
+							...formProps,
+							ref: formRef
+						}), errorMsg.value ? h("div", {
+							style: {
+								marginTop: "12px",
+								color: "#f56c6c",
+								fontSize: "13px",
+								lineHeight: "1.5"
+							},
+							innerHTML: errorMsg.value
+						}) : null]),
+						h("div", { style: {
+							display: "flex",
+							justifyContent: "flex-end",
+							gap: "12px",
+							padding: "12px 20px",
+							borderTop: "1px solid #ebeef5"
+						} }, [h("button", {
+							type: "button",
+							onClick: handleCancel,
+							style: { ...btnBase }
+						}, "取消"), h("button", {
+							type: "button",
+							onClick: doSubmit,
+							style: {
+								...btnBase,
+								color: "#fff",
+								background: "#409eff",
+								borderColor: "#409eff"
+							}
+						}, "确定")])
+					])]);
+				}
+				const stop = watch(() => formRef.value?.initialized, (initialized) => {
+					if (!initialized) return;
+					stop();
+					doSubmit();
 				}, {
 					flush: "post",
 					immediate: true
@@ -81,7 +172,7 @@ var submitForm = (options) => {
 			} catch {}
 			container.parentNode?.removeChild(container);
 		};
-		if (timeout > 0) timer = setTimeout(() => {
+		if (timeout > 0 && !debug) timer = setTimeout(() => {
 			if (!cleaned) {
 				reject(/* @__PURE__ */ new Error(`submitForm timeout after ${timeout}ms: form is not initialized.`));
 				cleanup();

package/dist/style.css

@@ -298,6 +298,7 @@ fieldset.m-fieldset .m-form-tip {
   display: flex;
   justify-content: space-between;
   margin-top: 10px;
+  margin-bottom: 16px;
 }
 
 .m-form-panel .el-card__header:hover {

package/dist/themes/magic-admin.css

@@ -298,6 +298,7 @@ fieldset.m-fieldset .m-form-tip {
   display: flex;
   justify-content: space-between;
   margin-top: 10px;
+  margin-bottom: 16px;
 }
 
 .m-form-panel .el-card__header:hover {