@tmagic/editor 1.7.10 → 1.7.12

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

@@ -42,6 +42,7 @@ var DisplayConds_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ d
 			name: props.name,
 			titlePrefix: props.config.titlePrefix,
 			expandAll: true,
+			enableToggleMode: false,
 			items: [{
 				type: "table",
 				name: "cond",

package/dist/es/hooks/use-stage.js

@@ -42,7 +42,10 @@ var useStage = (stageOptions) => {
 		if (disabledMultiSelect) stage.disableMultiSelect();
 		else stage.enableMultiSelect();
 	});
-	stage.mask?.setGuides([getGuideLineFromCache(getGuideLineKey(H_GUIDE_LINE_STORAGE_KEY)), getGuideLineFromCache(getGuideLineKey(V_GUIDE_LINE_STORAGE_KEY))]);
+	const hGuidesCache = getGuideLineFromCache(getGuideLineKey(H_GUIDE_LINE_STORAGE_KEY));
+	const vGuidesCache = getGuideLineFromCache(getGuideLineKey(V_GUIDE_LINE_STORAGE_KEY));
+	stage.mask?.setGuides([hGuidesCache, vGuidesCache]);
+	ui_default.set("hasGuides", hGuidesCache.length > 0 || vGuidesCache.length > 0);
 	stage.on("page-el-update", () => {
 		editor_default.set("stageLoading", false);
 	});
@@ -96,6 +99,7 @@ var useStage = (stageOptions) => {
 	});
 	stage.on("change-guides", (e) => {
 		ui_default.set("showGuides", true);
+		ui_default.set("hasGuides", (stage.mask?.horizontalGuidelines.length ?? 0) > 0 || (stage.mask?.verticalGuidelines.length ?? 0) > 0);
 		if (!root.value || !page.value) return;
 		const storageKey = getGuideLineKey(e.type === GuidesType.HORIZONTAL ? H_GUIDE_LINE_STORAGE_KEY : V_GUIDE_LINE_STORAGE_KEY);
 		if (e.guides.length) globalThis.localStorage.setItem(storageKey, JSON.stringify(e.guides));

package/dist/es/layouts/NavMenu.vue_vue_type_script_setup_true_lang.js

@@ -18,6 +18,7 @@ var NavMenu_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ define
 		const columnWidth = computed(() => uiService.get("columnWidth"));
 		const keys = Object.values(ColumnLayout);
 		const showGuides = computed(() => uiService.get("showGuides"));
+		const hasGuides = computed(() => uiService.get("hasGuides"));
 		const showRule = computed(() => uiService.get("showRule"));
 		const zoom = computed(() => uiService.get("zoom"));
 		const ctrl = /mac os x/.test(navigator.userAgent.toLowerCase()) ? "Command" : "Ctrl";
@@ -113,6 +114,7 @@ var NavMenu_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ define
 					});
 					break;
 				case "guides":
+					if (!hasGuides.value) break;
 					config.push({
 						type: "button",
 						className: "guides",

package/dist/es/services/props.js

@@ -22,7 +22,9 @@ var Props = class extends BaseService_default {
 		propsConfigMap: {},
 		propsValueMap: {},
 		relateIdMap: {},
+		/** 禁用数据源 */
 		disabledDataSource: false,
+		/** 禁用代码块 */
 		disabledCodeBlock: false
 	});
 	constructor() {

package/dist/es/services/ui.js

@@ -24,6 +24,7 @@ var state = shallowReactive({
 		right: storage_default.getItem("$MagicEditorRightColumnWidthData", { protocol: Protocol.NUMBER }) || 480
 	},
 	showGuides: true,
+	hasGuides: false,
 	showRule: true,
 	propsPanelSize: "small",
 	showAddPageButton: true,

package/dist/es/utils/data-source/index.js

@@ -1,9 +1,8 @@
 import base_default from "./formConfigs/base.js";
 import http_default from "./formConfigs/http.js";
-import { defineFormItem } from "@tmagic/form";
 import { dataSourceTemplateRegExp, getKeysArray, isNumber } from "@tmagic/utils";
 //#region packages/editor/src/utils/data-source/index.ts
-var dataSourceFormConfig = defineFormItem({
+var dataSourceFormConfig = {
 	type: "tab",
 	items: [
 		{
@@ -65,7 +64,7 @@ var dataSourceFormConfig = defineFormItem({
 			}]
 		}
 	]
-});
+};
 var fillConfig = (config) => [
 	...base_default(),
 	...config,

package/dist/es/utils/props.js

@@ -98,7 +98,8 @@ var styleTabConfig = {
 			"borderLeftColor",
 			"borderWidth",
 			"borderStyle",
-			"borderColor"
+			"borderColor",
+			"opacity"
 		] }, {
 			name: "transform",
 			defaultValue: () => ({})

package/dist/tmagic-editor.umd.cjs

@@ -44,15 +44,15 @@
 		enumerable: true
 	}) : target, mod));
 	//#endregion
-	_tmagic_form = __toESM(_tmagic_form);
-	_tmagic_table = __toESM(_tmagic_table);
-	_tmagic_stage = __toESM(_tmagic_stage);
-	_tmagic_design = __toESM(_tmagic_design);
-	serialize_javascript = __toESM(serialize_javascript);
-	gesto = __toESM(gesto);
-	sortablejs = __toESM(sortablejs);
-	moveable = __toESM(moveable);
-	keycon = __toESM(keycon);
+	_tmagic_form = __toESM(_tmagic_form, 1);
+	_tmagic_table = __toESM(_tmagic_table, 1);
+	_tmagic_stage = __toESM(_tmagic_stage, 1);
+	_tmagic_design = __toESM(_tmagic_design, 1);
+	serialize_javascript = __toESM(serialize_javascript, 1);
+	gesto = __toESM(gesto, 1);
+	sortablejs = __toESM(sortablejs, 1);
+	moveable = __toESM(moveable, 1);
+	keycon = __toESM(keycon, 1);
 	//#region packages/editor/src/type.ts
 	var ColumnLayout = /* @__PURE__ */ function(ColumnLayout) {
 		ColumnLayout["LEFT"] = "left";
@@ -2297,7 +2297,8 @@
 	* @param {Array} [entries] The key-value pairs to cache.
 	*/
 	function Stack(entries) {
-		this.size = (this.__data__ = new ListCache(entries)).size;
+		var data = this.__data__ = new ListCache(entries);
+		this.size = data.size;
 	}
 	Stack.prototype.clear = stackClear;
 	Stack.prototype["delete"] = stackDelete;
@@ -4602,7 +4603,8 @@
 				"borderLeftColor",
 				"borderWidth",
 				"borderStyle",
-				"borderColor"
+				"borderColor",
+				"opacity"
 			] }, {
 				name: "transform",
 				defaultValue: () => ({})
@@ -4753,7 +4755,9 @@
 			propsConfigMap: {},
 			propsValueMap: {},
 			relateIdMap: {},
+			/** 禁用数据源 */
 			disabledDataSource: false,
+			/** 禁用代码块 */
 			disabledCodeBlock: false
 		});
 		constructor() {
@@ -6565,6 +6569,7 @@
 			right: storage_default.getItem("$MagicEditorRightColumnWidthData", { protocol: Protocol.NUMBER }) || 480
 		},
 		showGuides: true,
+		hasGuides: false,
 		showRule: true,
 		propsPanelSize: "small",
 		showAddPageButton: true,
@@ -6687,7 +6692,10 @@
 			if (disabledMultiSelect) stage.disableMultiSelect();
 			else stage.enableMultiSelect();
 		});
-		stage.mask?.setGuides([getGuideLineFromCache(getGuideLineKey(H_GUIDE_LINE_STORAGE_KEY)), getGuideLineFromCache(getGuideLineKey(V_GUIDE_LINE_STORAGE_KEY))]);
+		const hGuidesCache = getGuideLineFromCache(getGuideLineKey(H_GUIDE_LINE_STORAGE_KEY));
+		const vGuidesCache = getGuideLineFromCache(getGuideLineKey(V_GUIDE_LINE_STORAGE_KEY));
+		stage.mask?.setGuides([hGuidesCache, vGuidesCache]);
+		ui_default.set("hasGuides", hGuidesCache.length > 0 || vGuidesCache.length > 0);
 		stage.on("page-el-update", () => {
 			editor_default.set("stageLoading", false);
 		});
@@ -6741,6 +6749,7 @@
 		});
 		stage.on("change-guides", (e) => {
 			ui_default.set("showGuides", true);
+			ui_default.set("hasGuides", (stage.mask?.horizontalGuidelines.length ?? 0) > 0 || (stage.mask?.verticalGuidelines.length ?? 0) > 0);
 			if (!root.value || !page.value) return;
 			const storageKey = getGuideLineKey(e.type === _tmagic_stage.GuidesType.HORIZONTAL ? H_GUIDE_LINE_STORAGE_KEY : V_GUIDE_LINE_STORAGE_KEY);
 			if (e.guides.length) globalThis.localStorage.setItem(storageKey, JSON.stringify(e.guides));
@@ -7091,7 +7100,7 @@
 	]);
 	//#endregion
 	//#region packages/editor/src/utils/data-source/index.ts
-	var dataSourceFormConfig = (0, _tmagic_form.defineFormItem)({
+	var dataSourceFormConfig = {
 		type: "tab",
 		items: [
 			{
@@ -7153,7 +7162,7 @@
 				}]
 			}
 		]
-	});
+	};
 	var fillConfig$1 = (config) => [
 		...base_default(),
 		...config,
@@ -8649,6 +8658,7 @@
 			const columnWidth = (0, vue.computed)(() => uiService.get("columnWidth"));
 			const keys = Object.values(ColumnLayout);
 			const showGuides = (0, vue.computed)(() => uiService.get("showGuides"));
+			const hasGuides = (0, vue.computed)(() => uiService.get("hasGuides"));
 			const showRule = (0, vue.computed)(() => uiService.get("showRule"));
 			const zoom = (0, vue.computed)(() => uiService.get("zoom"));
 			const ctrl = /mac os x/.test(navigator.userAgent.toLowerCase()) ? "Command" : "Ctrl";
@@ -8744,6 +8754,7 @@
 						});
 						break;
 					case "guides":
+						if (!hasGuides.value) break;
 						config.push({
 							type: "button",
 							className: "guides",
@@ -16955,6 +16966,7 @@
 				name: props.name,
 				titlePrefix: props.config.titlePrefix,
 				expandAll: true,
+				enableToggleMode: false,
 				items: [{
 					type: "table",
 					name: "cond",

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.7.10",
+  "version": "1.7.12",
   "name": "@tmagic/editor",
   "type": "module",
   "sideEffects": [
@@ -58,11 +58,11 @@
     "moveable": "^0.53.0",
     "serialize-javascript": "^7.0.0",
     "sortablejs": "^1.15.6",
-    "@tmagic/design": "1.7.10",
-    "@tmagic/form": "1.7.10",
-    "@tmagic/table": "1.7.10",
-    "@tmagic/stage": "1.7.10",
-    "@tmagic/utils": "1.7.10"
+    "@tmagic/design": "1.7.12",
+    "@tmagic/form": "1.7.12",
+    "@tmagic/stage": "1.7.12",
+    "@tmagic/utils": "1.7.12",
+    "@tmagic/table": "1.7.12"
   },
   "devDependencies": {
     "@types/events": "^3.0.3",
@@ -74,9 +74,9 @@
   "peerDependencies": {
     "monaco-editor": "^0.55.1 ",
     "type-fest": "^5.2.0",
-    "typescript": "^6.0.2",
-    "vue": "^3.5.24",
-    "@tmagic/core": "1.7.10"
+    "typescript": "^6.0.3",
+    "vue": "^3.5.33",
+    "@tmagic/core": "1.7.12"
   },
   "peerDependenciesMeta": {
     "typescript": {

package/src/fields/DisplayConds.vue

@@ -67,6 +67,7 @@ const config = computed<GroupListConfig>(() => ({
   name: props.name,
   titlePrefix: props.config.titlePrefix,
   expandAll: true,
+  enableToggleMode: false,
   items: [
     {
       type: 'table',

package/src/hooks/use-stage.ts

@@ -59,10 +59,12 @@ export const useStage = (stageOptions: StageOptions) => {
     },
   );
 
-  stage.mask?.setGuides([
-    getGuideLineFromCache(getGuideLineKey(H_GUIDE_LINE_STORAGE_KEY)),
-    getGuideLineFromCache(getGuideLineKey(V_GUIDE_LINE_STORAGE_KEY)),
-  ]);
+  const hGuidesCache = getGuideLineFromCache(getGuideLineKey(H_GUIDE_LINE_STORAGE_KEY));
+  const vGuidesCache = getGuideLineFromCache(getGuideLineKey(V_GUIDE_LINE_STORAGE_KEY));
+
+  stage.mask?.setGuides([hGuidesCache, vGuidesCache]);
+
+  uiService.set('hasGuides', hGuidesCache.length > 0 || vGuidesCache.length > 0);
 
   stage.on('page-el-update', () => {
     editorService.set('stageLoading', false);
@@ -124,6 +126,11 @@ export const useStage = (stageOptions: StageOptions) => {
   stage.on('change-guides', (e) => {
     uiService.set('showGuides', true);
 
+    uiService.set(
+      'hasGuides',
+      (stage.mask?.horizontalGuidelines.length ?? 0) > 0 || (stage.mask?.verticalGuidelines.length ?? 0) > 0,
+    );
+
     if (!root.value || !page.value) return;
 
     const storageKey = getGuideLineKey(

package/src/layouts/NavMenu.vue

@@ -37,6 +37,7 @@ const columnWidth = computed(() => uiService.get('columnWidth'));
 const keys = Object.values(ColumnLayout);
 
 const showGuides = computed((): boolean => uiService.get('showGuides'));
+const hasGuides = computed((): boolean => uiService.get('hasGuides'));
 const showRule = computed((): boolean => uiService.get('showRule'));
 const zoom = computed((): number => uiService.get('zoom'));
 
@@ -143,6 +144,7 @@ const getConfig = (item: MenuItem): (MenuButton | MenuComponent)[] => {
       });
       break;
     case 'guides':
+      if (!hasGuides.value) break;
       config.push({
         type: 'button',
         className: 'guides',

package/src/services/ui.ts

@@ -55,6 +55,7 @@ const state = shallowReactive<UiState>({
       DEFAULT_RIGHT_COLUMN_WIDTH,
   },
   showGuides: true,
+  hasGuides: false,
   showRule: true,
   propsPanelSize: 'small',
   showAddPageButton: true,

package/src/type.ts

@@ -253,6 +253,8 @@ export interface UiState {
   columnWidth: GetColumnWidth;
   /** 是否显示画布参考线，true: 显示，false: 不显示，默认为true */
   showGuides: boolean;
+  /** 画布上是否存在参考线 */
+  hasGuides: boolean;
   /** 是否显示标尺，true: 显示，false: 不显示，默认为true */
   showRule: boolean;
   /** 用于控制该属性配置表单内组件的尺寸 */

package/src/utils/data-source/index.ts

@@ -1,11 +1,11 @@
 import type { DataSchema, DataSourceFieldType, DataSourceSchema } from '@tmagic/core';
-import { type CascaderOption, defineFormItem, type FormConfig } from '@tmagic/form';
+import { type CascaderOption, type FormConfig, type TabConfig } from '@tmagic/form';
 import { dataSourceTemplateRegExp, getKeysArray, isNumber } from '@tmagic/utils';
 
 import BaseFormConfig from './formConfigs/base';
 import HttpFormConfig from './formConfigs/http';
 
-const dataSourceFormConfig = defineFormItem({
+const dataSourceFormConfig: TabConfig = {
   type: 'tab',
   items: [
     {
@@ -73,9 +73,13 @@ const dataSourceFormConfig = defineFormItem({
       ],
     },
   ],
-});
+};
 
-const fillConfig = (config: FormConfig): FormConfig => [...BaseFormConfig(), ...config, dataSourceFormConfig];
+const fillConfig = <T = never>(config: FormConfig<T>): FormConfig<T> => [
+  ...BaseFormConfig(),
+  ...config,
+  dataSourceFormConfig,
+];
 
 export const getFormConfig = (type: string, configs: Record<string, FormConfig>): FormConfig => {
   switch (type) {

package/src/utils/props.ts

@@ -106,6 +106,7 @@ export const styleTabConfig: TabPaneConfig = {
             'borderWidth',
             'borderStyle',
             'borderColor',
+            'opacity',
           ],
         } as unknown as ChildConfig,
         {