@tmagic/form 1.8.0-manmanyu.14 → 1.8.0-manmanyu.16

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

@@ -1,15 +1,15 @@
+import { isGlobalFlat } from "../../utils/config.js";
 import { display, getDataByPage, sortArray } from "../../utils/form.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, isMagicAdminTheme } from "@tmagic/design";
+import { TMagicIcon, TMagicTooltip } from "@tmagic/design";
 import { WarningFilled } from "@element-plus/icons-vue";
 //#region packages/form/src/containers/table/useTableColumns.ts
 var useTableColumns = (props, emit, currentPage, pageSize, modelName) => {
 	const mForm = inject("mForm");
-	const isMagicAdmin = isMagicAdminTheme();
 	const display$1 = (fuc) => display(mForm, fuc, props);
 	const lastData = computed(() => props.config.pagination ? getDataByPage(props.lastValues[modelName.value], currentPage.value, pageSize.value) : props.lastValues[modelName.value] || []);
 	const itemExtra = (fuc, index) => {
@@ -67,10 +67,10 @@ var useTableColumns = (props, emit, currentPage, pageSize, modelName) => {
 			type: "selection",
 			width: 45
 		} });
-		const defaultFixed = isMagicAdmin.value ? "right" : "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 && isMagicAdmin.value ? true : props.config.flat;
+		const actionFlat = props.config.flat === void 0 && isGlobalFlat.value ? true : props.config.flat;
 		const actionColumn = {
 			props: {
 				label: "操作",

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

@@ -1,7 +1,8 @@
 import { useAddField } from "../utils/useAddField.js";
+import { isGlobalFlat } from "../utils/config.js";
 import FormDialog_default from "../FormDialog.js";
 import { computed, createElementBlock, createTextVNode, createVNode, defineComponent, inject, normalizeStyle, openBlock, readonly, ref, toDisplayString, unref, withCtx } from "vue";
-import { TMagicButton, TMagicIcon, isMagicAdminTheme } from "@tmagic/design";
+import { TMagicButton, TMagicIcon } from "@tmagic/design";
 import { Notebook } from "@element-plus/icons-vue";
 //#region packages/form/src/fields/Link.vue?vue&type=script&setup=true&lang.ts
 var _hoisted_1 = ["href"];
@@ -33,7 +34,6 @@ var Link_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineCompo
 	setup(__props, { emit: __emit }) {
 		const props = __props;
 		const emit = __emit;
-		const isMagicAdmin = isMagicAdminTheme(props);
 		useAddField(props.prop);
 		const formValue = ref({});
 		const editor = ref();
@@ -71,7 +71,7 @@ var Link_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineCompo
 			editor.value && (editor.value.dialogVisible = false);
 		};
 		return (_ctx, _cache) => {
-			return unref(isMagicAdmin) && __props.config.href && !__props.disabled ? (openBlock(), createElementBlock("a", {
+			return unref(isGlobalFlat) && __props.config.href && !__props.disabled ? (openBlock(), createElementBlock("a", {
 				key: 0,
 				target: "_blank",
 				href: href.value,

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

@@ -1,6 +1,7 @@
 import { useAddField } from "../utils/useAddField.js";
+import { isGlobalFlat } from "../utils/config.js";
 import { createBlock, createCommentVNode, defineComponent, inject, openBlock, ref, unref, watch } from "vue";
-import { TMagicInputNumber, isMagicAdminTheme } from "@tmagic/design";
+import { TMagicInputNumber } 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,7 +25,6 @@ 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;
@@ -44,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": unref(isMagicAdmin) ? "" : "right",
+				"controls-position": unref(isGlobalFlat) ? "" : "right",
 				size: __props.size,
 				max: __props.config.max,
 				min: __props.config.min,

package/dist/es/utils/config.js

@@ -1,7 +1,10 @@
+import { ref } from "vue";
 //#region packages/form/src/utils/config.ts
 var $MAGIC_FORM = {};
+var isGlobalFlat = ref(false);
 var setConfig = (option) => {
 	$MAGIC_FORM = option;
+	isGlobalFlat.value = option.flat ?? false;
 };
 var getConfig = (key) => $MAGIC_FORM[key];
 var fieldRegistry = /* @__PURE__ */ new Map();
@@ -12,4 +15,4 @@ var registerField = (tagName, component) => {
 var getField = (tagName) => fieldRegistry.get(tagName);
 var deleteField = (tagName) => fieldRegistry.delete(tagName);
 //#endregion
-export { deleteField, getConfig, getField, registerField, setConfig };
+export { deleteField, getConfig, getField, isGlobalFlat, registerField, setConfig };

package/dist/themes/magic-admin.css

@@ -458,6 +458,9 @@ fieldset.m-fieldset .m-form-tip {
   white-space: pre-line;
   line-height: 20px;
 }
+.m-form.m-form--magic-admin .el-form-item__content .tmagic-design-radio-group {
+  row-gap: 10px;
+}
 .m-form.m-form--magic-admin .el-form-item__content .tmagic-design-radio-group .tmagic-design-radio-button {
   margin-right: 8px;
   height: 32px;

package/dist/tmagic-form.umd.cjs

@@ -2654,8 +2654,10 @@
 	//#endregion
 	//#region packages/form/src/utils/config.ts
 	var $MAGIC_FORM = {};
+	var isGlobalFlat = (0, vue.ref)(false);
 	var setConfig = (option) => {
 		$MAGIC_FORM = option;
+		isGlobalFlat.value = option.flat ?? false;
 	};
 	var getConfig = (key) => $MAGIC_FORM[key];
 	var fieldRegistry = /* @__PURE__ */ new Map();
@@ -5854,7 +5856,6 @@
 	//#region packages/form/src/containers/table/useTableColumns.ts
 	var useTableColumns = (props, emit, currentPage, pageSize, modelName) => {
 		const mForm = (0, vue.inject)("mForm");
-		const isMagicAdmin = (0, _tmagic_design.isMagicAdminTheme)();
 		const display$1 = (fuc) => display(mForm, fuc, props);
 		const lastData = (0, vue.computed)(() => props.config.pagination ? getDataByPage(props.lastValues[modelName.value], currentPage.value, pageSize.value) : props.lastValues[modelName.value] || []);
 		const itemExtra = (fuc, index) => {
@@ -5912,10 +5913,10 @@
 				type: "selection",
 				width: 45
 			} });
-			const defaultFixed = isMagicAdmin.value ? "right" : "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 && isMagicAdmin.value ? true : props.config.flat;
+			const actionFlat = props.config.flat === void 0 && isGlobalFlat.value ? true : props.config.flat;
 			const actionColumn = {
 				props: {
 					label: "操作",
@@ -6676,7 +6677,6 @@
 		setup(__props, { emit: __emit }) {
 			const props = __props;
 			const emit = __emit;
-			const isMagicAdmin = (0, _tmagic_design.isMagicAdminTheme)();
 			const value = (0, vue.ref)();
 			(0, vue.watch)(() => props.model[props.name], (v) => {
 				value.value = v;
@@ -6696,7 +6696,7 @@
 					modelValue: value.value,
 					"onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => value.value = $event),
 					clearable: "",
-					"controls-position": (0, vue.unref)(isMagicAdmin) ? "" : "right",
+					"controls-position": (0, vue.unref)(isGlobalFlat) ? "" : "right",
 					size: __props.size,
 					max: __props.config.max,
 					min: __props.config.min,
@@ -7572,7 +7572,6 @@
 		setup(__props, { emit: __emit }) {
 			const props = __props;
 			const emit = __emit;
-			const isMagicAdmin = (0, _tmagic_design.isMagicAdminTheme)(props);
 			useAddField(props.prop);
 			const formValue = (0, vue.ref)({});
 			const editor = (0, vue.ref)();
@@ -7610,7 +7609,7 @@
 				editor.value && (editor.value.dialogVisible = false);
 			};
 			return (_ctx, _cache) => {
-				return (0, vue.unref)(isMagicAdmin) && __props.config.href && !__props.disabled ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("a", {
+				return (0, vue.unref)(isGlobalFlat) && __props.config.href && !__props.disabled ? ((0, vue.openBlock)(), (0, vue.createElementBlock)("a", {
 					key: 0,
 					target: "_blank",
 					href: href.value,

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.8.0-manmanyu.14",
+  "version": "1.8.0-manmanyu.16",
   "name": "@tmagic/form",
   "type": "module",
   "sideEffects": [
@@ -52,9 +52,9 @@
   "peerDependencies": {
     "vue": "^3.5.38",
     "typescript": "^6.0.3",
-    "@tmagic/design": "1.8.0-manmanyu.14",
-    "@tmagic/form-schema": "1.8.0-manmanyu.14",
-    "@tmagic/utils": "1.8.0-manmanyu.14"
+    "@tmagic/design": "1.8.0-manmanyu.16",
+    "@tmagic/form-schema": "1.8.0-manmanyu.16",
+    "@tmagic/utils": "1.8.0-manmanyu.16"
   },
   "peerDependenciesMeta": {
     "typescript": {

package/src/containers/table/useTableColumns.ts

@@ -2,10 +2,11 @@ import { computed, h, inject, type Ref } from 'vue';
 import { WarningFilled } from '@element-plus/icons-vue';
 import { cloneDeep } from 'lodash-es';
 
-import { isMagicAdminTheme, type TableColumnOptions, TMagicIcon, TMagicTooltip } from '@tmagic/design';
+import { type TableColumnOptions, TMagicIcon, TMagicTooltip } from '@tmagic/design';
 import type { FormItemConfig, FormState, TableColumnConfig } from '@tmagic/form-schema';
 
 import type { ContainerChangeEventData } from '../../schema';
+import { isGlobalFlat } from '../../utils/config';
 import { display as displayFunc, getDataByPage, sortArray } from '../../utils/form';
 import Container from '../Container.vue';
 
@@ -21,9 +22,6 @@ export const useTableColumns = (
   modelName: Ref<string | number>,
 ) => {
   const mForm = inject<FormState | undefined>('mForm');
-  // magic-admin 主题下「操作列」默认固定在右侧；其它主题保持原默认「左侧」。
-  // 调用方仍可通过 `config.fixed`（'left' | 'right' | false）显式覆盖。
-  const isMagicAdmin = isMagicAdminTheme();
 
   const display = (fuc: any) => displayFunc(mForm, fuc, props);
 
@@ -114,13 +112,13 @@ export const useTableColumns = (
         },
       });
     }
-    const defaultFixed: 'left' | 'right' = isMagicAdmin.value ? 'right' : 'left';
+    const defaultFixed: 'left' | 'right' = isGlobalFlat.value ? 'right' : 'left';
     let actionFixed: 'left' | 'right' | undefined = props.config.fixed === false ? undefined : defaultFixed;
     if (typeof props.config.fixed === 'string' && ['left', 'right'].includes(props.config.fixed)) {
       actionFixed = props.config.fixed;
     }
 
-    const actionFlat = props.config.flat === undefined && isMagicAdmin.value ? true : props.config.flat;
+    const actionFlat = props.config.flat === undefined && isGlobalFlat.value ? true : props.config.flat;
 
     const actionColumn = {
       props: {

package/src/fields/Link.vue

@@ -2,7 +2,7 @@
   <a
     target="_blank"
     :href="href"
-    v-if="isMagicAdmin && config.href && !disabled"
+    v-if="isGlobalFlat && config.href && !disabled"
     class="magic-admin-link"
     :style="config.css || {}"
   >
@@ -31,10 +31,11 @@
 import { computed, inject, readonly, ref } from 'vue';
 import { Notebook } from '@element-plus/icons-vue';
 
-import { isMagicAdminTheme, TMagicButton, TMagicIcon } from '@tmagic/design';
+import { TMagicButton, TMagicIcon } from '@tmagic/design';
 
 import FormDialog from '../FormDialog.vue';
 import type { FieldProps, FormState, LinkConfig } from '../schema';
+import { isGlobalFlat } from '../utils/config';
 import { useAddField } from '../utils/useAddField';
 
 defineOptions({
@@ -45,8 +46,6 @@ const props = defineProps<FieldProps<LinkConfig> & { theme?: string }>();
 
 const emit = defineEmits(['change']);
 
-const isMagicAdmin = isMagicAdminTheme(props);
-
 useAddField(props.prop);
 
 const formValue = ref({});

package/src/fields/Number.vue

@@ -3,7 +3,7 @@
     v-if="model"
     v-model="value"
     clearable
-    :controls-position="isMagicAdmin ? '' : 'right'"
+    :controls-position="isGlobalFlat ? '' : 'right'"
     :size="size"
     :max="config.max"
     :min="config.min"
@@ -18,9 +18,10 @@
 <script lang="ts" setup>
 import { inject, ref, watch } from 'vue';
 
-import { isMagicAdminTheme, TMagicInputNumber } from '@tmagic/design';
+import { TMagicInputNumber } from '@tmagic/design';
 
 import type { FieldProps, FormState, NumberConfig } from '../schema';
+import { isGlobalFlat } from '../utils/config';
 import { useAddField } from '../utils/useAddField';
 
 defineOptions({
@@ -34,9 +35,6 @@ const emit = defineEmits<{
   input: [values: number];
 }>();
 
-// magic-admin 主题下输入框走"无右侧上下箭头"的极简样式（控件位置置空回到 ElInputNumber 默认两侧布局）
-const isMagicAdmin = isMagicAdminTheme();
-
 const value = ref<number>();
 
 watch(

package/src/plugin.ts

@@ -54,6 +54,7 @@ import FormDrawer from './FormDrawer.vue';
 import './theme/index.scss';
 
 export interface FormInstallOptions {
+  flat?: boolean;
   [key: string]: any;
 }
 

package/src/theme/themes/magic-admin/index.scss

@@ -38,6 +38,7 @@
   }
   .el-form-item__content {
     .tmagic-design-radio-group {
+      row-gap: 10px;
       .tmagic-design-radio-button {
         margin-right: 8px;
         height: 32px;

package/src/utils/config.ts

@@ -17,11 +17,17 @@
  */
 
 import type { Component } from 'vue';
+import { ref } from 'vue';
 
 let $MAGIC_FORM = {} as any;
+// 用 ref 持有 flat 全局开关：const 引用本身不可变，符合 `import/no-mutable-exports`；
+// 通过 `.value` 改值仍保持模块级响应式语义，与 editor/plugin.ts、design/index.ts 里
+// 的同名变量写法对齐。
+const isGlobalFlat = ref(false);
 
 const setConfig = (option: any): void => {
   $MAGIC_FORM = option;
+  isGlobalFlat.value = option.flat ?? false;
 };
 
 const getConfig = <T = unknown>(key: string): T => $MAGIC_FORM[key];
@@ -39,4 +45,4 @@ const getField = (tagName: string): Component | undefined => fieldRegistry.get(t
 
 const deleteField = (tagName: string): boolean => fieldRegistry.delete(tagName);
 
-export { deleteField, getConfig, getField, registerField, setConfig };
+export { deleteField, getConfig, getField, isGlobalFlat, registerField, setConfig };

package/types/index.d.ts

@@ -2022,6 +2022,7 @@ declare const deleteField: (tagName: string) => boolean;
 //#endregion
 //#region temp/packages/form/src/plugin.d.ts
 interface FormInstallOptions {
+  flat?: boolean;
   [key: string]: any;
 }
 declare const _default$31: {