@tmagic/editor 1.8.0-manmanyu.22 → 1.8.0-manmanyu.23

package/dist/es/components/CompareForm.vue_vue_type_script_setup_true_lang.js

@@ -21,6 +21,7 @@ var CompareForm_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defi
 		},
 		baseFormState: {},
 		selfDiffFieldTypes: {},
+		size: {},
 		loadConfig: {},
 		services: {}
 	},
@@ -181,13 +182,15 @@ var CompareForm_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defi
 				"label-width": __props.labelWidth,
 				"extend-state": mergedExtendState,
 				"show-diff": showDiff,
-				"self-diff-field-types": __props.selfDiffFieldTypes
+				"self-diff-field-types": __props.selfDiffFieldTypes,
+				size: __props.size
 			}, null, 8, [
 				"config",
 				"init-values",
 				"last-values",
 				"label-width",
-				"self-diff-field-types"
+				"self-diff-field-types",
+				"size"
 			])) : createCommentVNode("v-if", true)], 4);
 		};
 	}

package/dist/es/layouts/history-list/HistoryDiffDialog.vue_vue_type_script_setup_true_lang.js

@@ -28,6 +28,7 @@ var HistoryDiffDialog_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*
 		extendState: {},
 		loadConfig: {},
 		width: { default: "900px" },
+		size: {},
 		isConfirm: { type: Boolean },
 		onConfirm: {},
 		selfDiffFieldTypes: {},
@@ -258,6 +259,7 @@ var HistoryDiffDialog_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*
 						"load-config": __props.loadConfig,
 						"self-diff-field-types": __props.selfDiffFieldTypes,
 						services: props.services,
+						size: props.size,
 						height: "70vh"
 					}, null, 8, [
 						"category",
@@ -269,7 +271,8 @@ var HistoryDiffDialog_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*
 						"extend-state",
 						"load-config",
 						"self-diff-field-types",
-						"services"
+						"services",
+						"size"
 					])) : (openBlock(), createBlock(CodeEditor_default, {
 						key: 2,
 						type: "diff",

package/dist/es/layouts/history-list/useHistoryRevert.js

@@ -48,6 +48,7 @@ var mountHistoryDiffDialog = async (options) => {
 		selfDiffFieldTypes: options.selfDiffFieldTypes,
 		compareFormState: options.compareFormState,
 		width: options.width,
+		size: options.size ?? options.services?.uiService?.get("propsPanelSize"),
 		onClose: options.onClose
 	});
 	if (options.appContext) Object.assign(app._context, options.appContext);
@@ -148,7 +149,8 @@ var useHistoryRevert = (options = {}, services) => {
 			extendState,
 			services,
 			...extra,
-			width: extra?.width ?? dialogWidth
+			width: extra?.width ?? dialogWidth,
+			size: extra?.size
 		});
 		return confirmRevert();
 	};
@@ -275,7 +277,8 @@ var useHistoryRevert = (options = {}, services) => {
 		if (!await runRevert(revertOptions.diffPayload ?? null, {
 			loadConfig: revertOptions.loadConfig,
 			selfDiffFieldTypes: revertOptions.selfDiffFieldTypes,
-			width: revertOptions.width
+			width: revertOptions.width,
+			size: revertOptions.size
 		})) return null;
 		return await revertOptions.revert();
 	};
@@ -289,7 +292,8 @@ var useHistoryRevert = (options = {}, services) => {
 			extendState,
 			services,
 			...extra,
-			width: extra?.width ?? dialogWidth
+			width: extra?.width ?? dialogWidth,
+			size: extra?.size
 		});
 	};
 	return {

package/dist/themes/magic-admin.css

@@ -2788,6 +2788,7 @@ fieldset.m-fieldset .m-form-tip {
 }
 .m-editor.m-editor--magic-admin .m-editor-sidebar .m-editor-sidebar-header .m-editor-sidebar-header-item > i {
   color: #84909d;
+  font-size: 20px;
 }
 .m-editor.m-editor--magic-admin .m-editor-sidebar .m-editor-sidebar-header .m-editor-sidebar-header-item.is-active {
   background-color: var(--el-button-hover-bg-color, rgb(230, 238, 253));
@@ -2887,4 +2888,8 @@ fieldset.m-fieldset .m-form-tip {
 }
 .m-editor.m-theme--magic-admin .magic-right-panel-tabs-top > .el-tabs > .el-tabs__header .el-tabs__nav-wrap.is-top::after {
   display: none;
+}
+
+.m-editor.m-theme--magic-admin .m-editor-nav-menu .menu-item > button > i {
+  font-size: 16px;
 }

package/dist/tmagic-editor.umd.cjs

@@ -11309,6 +11309,7 @@
 				},
 				baseFormState: {},
 				selfDiffFieldTypes: {},
+				size: {},
 				loadConfig: {},
 				services: {}
 			},
@@ -11469,13 +11470,15 @@
 						"label-width": __props.labelWidth,
 						"extend-state": mergedExtendState,
 						"show-diff": showDiff,
-						"self-diff-field-types": __props.selfDiffFieldTypes
+						"self-diff-field-types": __props.selfDiffFieldTypes,
+						size: __props.size
 					}, null, 8, [
 						"config",
 						"init-values",
 						"last-values",
 						"label-width",
-						"self-diff-field-types"
+						"self-diff-field-types",
+						"size"
 					])) : (0, vue.createCommentVNode)("v-if", true)], 4);
 				};
 			}
@@ -11520,6 +11523,7 @@
 				extendState: {},
 				loadConfig: {},
 				width: { default: "900px" },
+				size: {},
 				isConfirm: { type: Boolean },
 				onConfirm: {},
 				selfDiffFieldTypes: {},
@@ -11750,6 +11754,7 @@
 								"load-config": __props.loadConfig,
 								"self-diff-field-types": __props.selfDiffFieldTypes,
 								services: props.services,
+								size: props.size,
 								height: "70vh"
 							}, null, 8, [
 								"category",
@@ -11761,7 +11766,8 @@
 								"extend-state",
 								"load-config",
 								"self-diff-field-types",
-								"services"
+								"services",
+								"size"
 							])) : ((0, vue.openBlock)(), (0, vue.createBlock)(CodeEditor_default, {
 								key: 2,
 								type: "diff",
@@ -11840,6 +11846,7 @@
 			selfDiffFieldTypes: options.selfDiffFieldTypes,
 			compareFormState: options.compareFormState,
 			width: options.width,
+			size: options.size ?? options.services?.uiService?.get("propsPanelSize"),
 			onClose: options.onClose
 		});
 		if (options.appContext) Object.assign(app._context, options.appContext);
@@ -11940,7 +11947,8 @@
 				extendState,
 				services,
 				...extra,
-				width: extra?.width ?? dialogWidth
+				width: extra?.width ?? dialogWidth,
+				size: extra?.size
 			});
 			return confirmRevert();
 		};
@@ -12067,7 +12075,8 @@
 			if (!await runRevert(revertOptions.diffPayload ?? null, {
 				loadConfig: revertOptions.loadConfig,
 				selfDiffFieldTypes: revertOptions.selfDiffFieldTypes,
-				width: revertOptions.width
+				width: revertOptions.width,
+				size: revertOptions.size
 			})) return null;
 			return await revertOptions.revert();
 		};
@@ -12081,7 +12090,8 @@
 				extendState,
 				services,
 				...extra,
-				width: extra?.width ?? dialogWidth
+				width: extra?.width ?? dialogWidth,
+				size: extra?.size
 			});
 		};
 		return {

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.8.0-manmanyu.22",
+  "version": "1.8.0-manmanyu.23",
   "name": "@tmagic/editor",
   "type": "module",
   "sideEffects": [
@@ -58,11 +58,11 @@
     "moveable": "^0.53.0",
     "serialize-javascript": "^7.0.0",
     "sortablejs": "^1.15.6",
-    "@tmagic/form": "1.8.0-manmanyu.22",
-    "@tmagic/table": "1.8.0-manmanyu.22",
-    "@tmagic/stage": "1.8.0-manmanyu.22",
-    "@tmagic/utils": "1.8.0-manmanyu.22",
-    "@tmagic/design": "1.8.0-manmanyu.22"
+    "@tmagic/design": "1.8.0-manmanyu.23",
+    "@tmagic/form": "1.8.0-manmanyu.23",
+    "@tmagic/table": "1.8.0-manmanyu.23",
+    "@tmagic/utils": "1.8.0-manmanyu.23",
+    "@tmagic/stage": "1.8.0-manmanyu.23"
   },
   "devDependencies": {
     "@types/events": "^3.0.3",
@@ -76,7 +76,7 @@
     "type-fest": "^5.2.0",
     "typescript": "^6.0.3",
     "vue": "^3.5.38",
-    "@tmagic/core": "1.8.0-manmanyu.22"
+    "@tmagic/core": "1.8.0-manmanyu.23"
   },
   "peerDependenciesMeta": {
     "typescript": {

package/src/components/CompareForm.vue

@@ -13,6 +13,7 @@
       :extend-state="mergedExtendState"
       :show-diff="showDiff"
       :self-diff-field-types="selfDiffFieldTypes"
+      :size="size"
     ></MForm>
   </div>
 </template>
@@ -22,6 +23,7 @@ import { computed, inject, provide, type Ref, ref, type ShallowRef, useTemplateR
 import { isEqual } from 'lodash-es';
 
 import { type CodeBlockContent, type DataSourceSchema, HookType, type MNode } from '@tmagic/core';
+import { type FieldSize } from '@tmagic/design';
 import { type FormConfig, type FormState, type FormValue, MForm } from '@tmagic/form';
 
 import type { CompareCategory, CompareFormLoadConfig, Services } from '@editor/type';
@@ -68,6 +70,11 @@ const props = withDefaults(
     baseFormState?: FormState;
     /** 需要走 self diff 的字段类型（例如 mod-cond）。 */
     selfDiffFieldTypes?: string[];
+    /**
+     * 表单内组件的尺寸（透传给 MForm 的 `size`），可选 'large' | 'default' | 'small'。
+     * 缺省时使用 MForm 内置默认尺寸。
+     */
+    size?: FieldSize;
     /**
      * 自定义 FormConfig 加载逻辑。传入后将接管内置的按 `category`(node/data-source/code-block)
      * 取配置逻辑，调用方可根据业务自行返回（或异步返回）表单配置。可通过

package/src/layouts/history-list/HistoryDiffDialog.vue

@@ -48,6 +48,7 @@
         :load-config="loadConfig"
         :self-diff-field-types="selfDiffFieldTypes"
         :services="props.services"
+        :size="props.size"
         height="70vh"
       />
 
@@ -77,7 +78,14 @@
 import { computed, ref, watch } from 'vue';
 import { isEqual } from 'lodash-es';
 
-import { TMagicButton, TMagicDialog, TMagicRadioButton, TMagicRadioGroup, TMagicTag } from '@tmagic/design';
+import {
+  type FieldSize,
+  TMagicButton,
+  TMagicDialog,
+  TMagicRadioButton,
+  TMagicRadioGroup,
+  TMagicTag,
+} from '@tmagic/design';
 import type { FormState } from '@tmagic/form';
 
 import CompareForm from '@editor/components/CompareForm.vue';
@@ -104,6 +112,8 @@ const props = withDefaults(
      */
     loadConfig?: CompareFormLoadConfig;
     width?: string;
+    /** 差异对比表单内组件的尺寸（透传给 CompareForm 的 `size`），可选 'large' | 'default' | 'small'。 */
+    size?: FieldSize;
     isConfirm?: boolean;
     onConfirm?: () => void;
     selfDiffFieldTypes?: string[];

package/src/layouts/history-list/useHistoryRevert.ts

@@ -95,6 +95,7 @@ const mountHistoryDiffDialog = async (
     selfDiffFieldTypes: options.selfDiffFieldTypes,
     compareFormState: options.compareFormState,
     width: options.width,
+    size: options.size ?? options.services?.uiService?.get('propsPanelSize'),
     onClose: options.onClose,
   });
   if (options.appContext) {
@@ -223,6 +224,7 @@ export const useHistoryRevert = (options: UseHistoryRevertOptions = {}, services
         services,
         ...extra,
         width: extra?.width ?? dialogWidth,
+        size: extra?.size,
       });
     }
     return confirmRevert();
@@ -382,6 +384,7 @@ export const useHistoryRevert = (options: UseHistoryRevertOptions = {}, services
       loadConfig: revertOptions.loadConfig,
       selfDiffFieldTypes: revertOptions.selfDiffFieldTypes,
       width: revertOptions.width,
+      size: revertOptions.size,
     });
     if (!confirmed) return null;
     return await revertOptions.revert();
@@ -399,6 +402,7 @@ export const useHistoryRevert = (options: UseHistoryRevertOptions = {}, services
         services,
         ...extra,
         width: extra?.width ?? dialogWidth,
+        size: extra?.size,
       });
   };
 

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

@@ -50,6 +50,7 @@
         }
         > i {
           color: #84909d;
+          font-size: 20px;
         }
         &.is-active {
           background-color: var(--el-button-hover-bg-color, rgb(230, 238, 253));
@@ -181,3 +182,15 @@
     }
   }
 }
+
+.m-editor.m-theme--magic-admin {
+  .m-editor-nav-menu {
+    .menu-item {
+      > button {
+        > i {
+          font-size: 16px;
+        }
+      }
+    }
+  }
+}

package/src/type.ts

@@ -33,6 +33,7 @@ import type {
   MPage,
   MPageFragment,
 } from '@tmagic/core';
+import type { FieldSize } from '@tmagic/design';
 import type { ChangeRecord, FormConfig, FormState, TableColumnConfig, TypeFunction } from '@tmagic/form';
 import type StageCore from '@tmagic/stage';
 import type {
@@ -1454,6 +1455,11 @@ export interface CustomDiffFormOptions {
    * 如 `'1200px'` / `'80%'`。缺省时使用弹窗内置默认宽度（900px）。
    */
   width?: string;
+  /**
+   * 差异 / 确认回滚弹窗内 form 表单的尺寸（透传给 CompareForm 的 `size`），
+   * 可选 `'large' | 'default' | 'small'`，缺省时使用表单内置默认尺寸。
+   */
+  size?: FieldSize;
 }
 
 /**

package/types/index.d.ts

@@ -1,7 +1,7 @@
 import formPlugin, { CascaderOption, ChangeRecord, CodeSelectColConfig, CodeSelectConfig, CondOpSelectConfig, ContainerChangeEventData, DataSourceFieldSelectConfig, DataSourceFieldsConfig, DataSourceInputConfig, DataSourceMethodSelectConfig, DataSourceMethodsConfig, DataSourceMocksConfig, DataSourceSelect, DisplayCondsConfig, EventSelectConfig, FieldProps, FormConfig, FormInstallOptions, FormState, FormValue, KeyValueConfig, MForm, PageFragmentSelectConfig, TabPaneConfig, TableColumnConfig, TypeFunction } from "@tmagic/form";
 import tablePlugin from "@tmagic/table";
 import StageCore, { CanDropIn, ContainerHighlightType, CustomizeMoveableOptions, GuidesOptions, RenderType, UpdateDragEl, default as StageCore$1 } from "@tmagic/stage";
-import designPlugin, { ButtonProps, DesignPluginOptions } from "@tmagic/design";
+import designPlugin, { ButtonProps, DesignPluginOptions, FieldSize } from "@tmagic/design";
 import Gesto, { OnDrag, OnDrag as OnDrag$1 } from "gesto";
 import { CodeBlockContent, CodeBlockDSL, DataSchema, DataSourceFieldType, DataSourceSchema, DepData, DepExtendedData, DepTargetType, DepTargetType as DepTargetType$1, DisplayCond, EventOption, Id, MApp, MContainer, MNode, MPage, MPageFragment, NodeType, Target, TargetOptions } from "@tmagic/core";
 import { App, AppContext, CSSProperties, Component, ComputedRef, Ref, ShallowRef } from "vue";
@@ -2686,6 +2686,11 @@ interface CustomDiffFormOptions {
    * 如 `'1200px'` / `'80%'`。缺省时使用弹窗内置默认宽度（900px）。
    */
   width?: string;
+  /**
+   * 差异 / 确认回滚弹窗内 form 表单的尺寸（透传给 CompareForm 的 `size`），
+   * 可选 `'large' | 'default' | 'small'`，缺省时使用表单内置默认尺寸。
+   */
+  size?: FieldSize;
 }
 /**
  * 业务自有历史复用「单步回滚」交互（{@link useHistoryRevert} 的 `confirmAndRevert`）的入参。
@@ -6123,6 +6128,11 @@ type __VLS_Props$8 = {
    */
   baseFormState?: FormState; /** 需要走 self diff 的字段类型（例如 mod-cond）。 */
   selfDiffFieldTypes?: string[];
+  /**
+   * 表单内组件的尺寸（透传给 MForm 的 `size`），可选 'large' | 'default' | 'small'。
+   * 缺省时使用 MForm 内置默认尺寸。
+   */
+  size?: FieldSize;
   /**
    * 自定义 FormConfig 加载逻辑。传入后将接管内置的按 `category`(node/data-source/code-block)
    * 取配置逻辑，调用方可根据业务自行返回（或异步返回）表单配置。可通过
@@ -6267,7 +6277,8 @@ type __VLS_Props$7 = {
    * 取配置逻辑，可通过 `ctx.defaultLoadConfig()` 复用默认结果再做二次加工。
    */
   loadConfig?: CompareFormLoadConfig;
-  width?: string;
+  width?: string; /** 差异对比表单内组件的尺寸（透传给 CompareForm 的 `size`），可选 'large' | 'default' | 'small'。 */
+  size?: FieldSize;
   isConfirm?: boolean;
   onConfirm?: () => void;
   selfDiffFieldTypes?: string[];