@tmagic/editor 1.0.0-rc.9 → 1.0.2

package/dist/types/src/Editor.vue.d.ts

@@ -62,9 +62,6 @@ declare const _default: DefineComponent<{
     /** 画布中组件选中框的移动范围 */
     moveableOptions: {
         type: PropType<MoveableOptions | ((core?: StageCore | undefined) => MoveableOptions)>;
-        default: () => (core?: StageCore | undefined) => {
-            container: HTMLElement | null | undefined;
-        };
     };
     /** 编辑器初始化时默认选中的组件ID */
     defaultSelected: {
@@ -142,9 +139,6 @@ declare const _default: DefineComponent<{
     /** 画布中组件选中框的移动范围 */
     moveableOptions: {
         type: PropType<MoveableOptions | ((core?: StageCore | undefined) => MoveableOptions)>;
-        default: () => (core?: StageCore | undefined) => {
-            container: HTMLElement | null | undefined;
-        };
     };
     /** 编辑器初始化时默认选中的组件ID */
     defaultSelected: {
@@ -178,7 +172,6 @@ declare const _default: DefineComponent<{
     propsConfigs: Record<string, FormConfig>;
     propsValues: Record<string, MNode>;
     eventMethodList: Record<string, any>;
-    moveableOptions: MoveableOptions | ((core?: StageCore | undefined) => MoveableOptions);
     canSelect: (el: HTMLElement) => boolean | Promise<boolean>;
 }>;
 export default _default;

package/dist/types/src/services/editor.d.ts

@@ -23,21 +23,24 @@ declare class Editor extends BaseService {
     /**
      * 根据id获取组件、组件的父组件以及组件所属的页面节点
      * @param {number | string} id 组件id
+     * @param {boolean} raw 是否使用toRaw
      * @returns {EditorNodeInfo}
      */
-    getNodeInfo(id: Id): EditorNodeInfo;
+    getNodeInfo(id: Id, raw?: boolean): EditorNodeInfo;
     /**
      * 根据ID获取指点节点配置
      * @param id 组件ID
+     * @param {boolean} raw 是否使用toRaw
      * @returns 组件节点配置
      */
-    getNodeById(id: Id): MNode | undefined;
+    getNodeById(id: Id, raw?: boolean): MNode | undefined;
     /**
      * 根据ID获取指点节点的父节点配置
      * @param id 组件ID
+     * @param {boolean} raw 是否使用toRaw
      * @returns 指点组件的父节点配置
      */
-    getParentById(id: Id): MContainer | undefined;
+    getParentById(id: Id, raw?: boolean): MContainer | undefined;
     /**
      * 只有容器拥有布局
      */

package/dist/types/src/type.d.ts

@@ -206,3 +206,5 @@ export declare enum Layout {
 export declare enum Keys {
     ESCAPE = "Space"
 }
+export declare const H_GUIDE_LINE_STORAGE_KEY = "$MagicStageHorizontalGuidelinesData";
+export declare const V_GUIDE_LINE_STORAGE_KEY = "$MagicStageVerticalGuidelinesData";

package/dist/types/src/utils/editor.d.ts

@@ -37,3 +37,4 @@ export declare const initPosition: (node: MNode, layout: Layout, parentNode: MNo
 export declare const setLayout: (node: MNode, layout: Layout) => MNode;
 export declare const change2Fixed: (node: MNode, root: MApp) => MNode;
 export declare const Fixed2Other: (node: MNode, root: MApp, getLayout: (parent: MNode, node?: MNode | undefined) => Promise<Layout>) => Promise<MNode>;
+export declare const getGuideLineFromCache: (key: string) => number[];

package/dist/types/src/utils/props.d.ts

@@ -44,6 +44,7 @@ export declare const DEFAULT_CONFIG: FormConfig;
 export declare const getDefaultPropsValue: (type: string, id: string) => {
     type: string;
     id: string;
+    layout: string;
     style: {};
     name: string;
     items: never[];
@@ -52,5 +53,6 @@ export declare const getDefaultPropsValue: (type: string, id: string) => {
     id: string;
     style: {};
     name: string;
+    layout?: undefined;
     items?: undefined;
 };

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-rc.9",
+  "version": "1.0.2",
   "name": "@tmagic/editor",
   "sideEffects": [
     "dist/*",
@@ -43,11 +43,11 @@
   "dependencies": {
     "@babel/core": "^7.18.0",
     "@element-plus/icons": "0.0.11",
-    "@tmagic/core": "1.0.0-rc.9",
-    "@tmagic/form": "1.0.0-rc.9",
-    "@tmagic/schema": "1.0.0-rc.9",
-    "@tmagic/stage": "1.0.0-rc.9",
-    "@tmagic/utils": "1.0.0-rc.9",
+    "@tmagic/core": "1.0.2",
+    "@tmagic/form": "1.0.2",
+    "@tmagic/schema": "1.0.2",
+    "@tmagic/stage": "1.0.2",
+    "@tmagic/utils": "1.0.2",
     "buffer": "^6.0.3",
     "color": "^3.1.3",
     "element-plus": "^2.2.0",
@@ -60,7 +60,7 @@
     "vue": "^3.2.0"
   },
   "peerDependencies": {
-    "@tmagic/form": "1.0.0-rc.9",
+    "@tmagic/form": "1.0.2",
     "element-plus": "^2.2.0",
     "monaco-editor": "^0.32.1",
     "vue": "^3.2.0"

package/src/Editor.vue

@@ -10,8 +10,8 @@
       </slot>
     </template>
 
-    <template #workspace :editorService="editorService">
-      <slot name="workspace">
+    <template #workspace>
+      <slot name="workspace" :editorService="editorService">
         <workspace>
           <template #workspace-content><slot name="workspace-content" :editorService="editorService"></slot></template>
           <template #page-bar-title="{ page }"><slot name="page-bar-title" :page="page"></slot></template>
@@ -130,9 +130,6 @@ export default defineComponent({
     /** 画布中组件选中框的移动范围 */
     moveableOptions: {
       type: [Object, Function] as PropType<MoveableOptions | ((core?: StageCore) => MoveableOptions)>,
-      default: () => (core?: StageCore) => ({
-        container: core?.renderer?.contentWindow?.document.getElementById('app'),
-      }),
     },
 
     /** 编辑器初始化时默认选中的组件ID */

package/src/layouts/workspace/Stage.vue

@@ -36,11 +36,18 @@ import {
 import { cloneDeep } from 'lodash-es';
 
 import type { MApp, MNode, MPage } from '@tmagic/schema';
-import type { Runtime, SortEventData, UpdateEventData } from '@tmagic/stage';
-import StageCore from '@tmagic/stage';
+import StageCore, { GuidesType, Runtime, SortEventData, UpdateEventData } from '@tmagic/stage';
 
 import ScrollViewer from '@editor/components/ScrollViewer.vue';
-import { Layout, Services, StageOptions, StageRect } from '@editor/type';
+import {
+  H_GUIDE_LINE_STORAGE_KEY,
+  Layout,
+  Services,
+  StageOptions,
+  StageRect,
+  V_GUIDE_LINE_STORAGE_KEY,
+} from '@editor/type';
+import { getGuideLineFromCache } from '@editor/utils';
 
 import ViewerMenu from './ViewerMenu.vue';
 
@@ -70,6 +77,8 @@ export default defineComponent({
     let stage: StageCore | null = null;
     let runtime: Runtime | null = null;
 
+    const getGuideLineKey = (key: string) => `${key}_${root.value?.id}_${page.value?.id}`;
+
     watchEffect(() => {
       if (stage) return;
 
@@ -99,6 +108,11 @@ export default defineComponent({
 
       stage?.mount(stageContainer.value);
 
+      stage.mask.setGuides([
+        getGuideLineFromCache(getGuideLineKey(H_GUIDE_LINE_STORAGE_KEY)),
+        getGuideLineFromCache(getGuideLineKey(V_GUIDE_LINE_STORAGE_KEY)),
+      ]);
+
       stage?.on('select', (el: HTMLElement) => {
         services?.editorService.select(el.id);
       });
@@ -115,15 +129,26 @@ export default defineComponent({
         services?.editorService.sort(ev.src, ev.dist);
       });
 
-      stage?.on('changeGuides', () => {
+      stage?.on('changeGuides', (e) => {
         services?.uiService.set('showGuides', true);
+
+        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));
+        } else {
+          globalThis.localStorage.removeItem(storageKey);
+        }
       });
 
       if (!node.value?.id) return;
       stage?.on('runtime-ready', (rt) => {
         runtime = rt;
         // toRaw返回的值是一个引用而非快照，需要cloneDeep
-        root.value && runtime?.updateRootConfig(cloneDeep(toRaw(root.value)));
+        root.value && runtime?.updateRootConfig?.(cloneDeep(toRaw(root.value)));
         page.value?.id && runtime?.updatePageId?.(page.value.id);
         setTimeout(() => {
           node.value && stage?.select(toRaw(node.value.id));
@@ -138,7 +163,7 @@ export default defineComponent({
 
     watch(root, (root) => {
       if (runtime && root) {
-        runtime.updateRootConfig(cloneDeep(toRaw(root)));
+        runtime.updateRootConfig?.(cloneDeep(toRaw(root)));
       }
     });
 

package/src/services/editor.ts

@@ -108,10 +108,14 @@ class Editor extends BaseService {
   /**
    * 根据id获取组件、组件的父组件以及组件所属的页面节点
    * @param {number | string} id 组件id
+   * @param {boolean} raw 是否使用toRaw
    * @returns {EditorNodeInfo}
    */
-  public getNodeInfo(id: Id): EditorNodeInfo {
-    const root = toRaw(this.get<MApp | null>('root'));
+  public getNodeInfo(id: Id, raw = true): EditorNodeInfo {
+    let root = this.get<MApp | null>('root');
+    if (raw) {
+      root = toRaw(root);
+    }
     if (!root) return {};
 
     if (id === root.id) {
@@ -141,21 +145,23 @@ class Editor extends BaseService {
   /**
    * 根据ID获取指点节点配置
    * @param id 组件ID
+   * @param {boolean} raw 是否使用toRaw
    * @returns 组件节点配置
    */
-  public getNodeById(id: Id): MNode | undefined {
-    const { node } = this.getNodeInfo(id);
+  public getNodeById(id: Id, raw = true): MNode | undefined {
+    const { node } = this.getNodeInfo(id, raw);
     return node;
   }
 
   /**
    * 根据ID获取指点节点的父节点配置
    * @param id 组件ID
+   * @param {boolean} raw 是否使用toRaw
    * @returns 指点组件的父节点配置
    */
-  public getParentById(id: Id): MContainer | undefined {
+  public getParentById(id: Id, raw = true): MContainer | undefined {
     if (!this.get<MApp | null>('root')) return;
-    const { parent } = this.getNodeInfo(id);
+    const { parent } = this.getNodeInfo(id, raw);
     return parent;
   }
 
@@ -279,7 +285,7 @@ class Editor extends BaseService {
     } else if (curNode.items) {
       parentNode = curNode;
     } else {
-      parentNode = this.getParentById(curNode.id);
+      parentNode = this.getParentById(curNode.id, false);
     }
 
     if (!parentNode) throw new Error('未找到父元素');
@@ -332,7 +338,7 @@ class Editor extends BaseService {
 
     if (!root) throw new Error('没有root');
 
-    const { parent, node: curNode } = this.getNodeInfo(node.id);
+    const { parent, node: curNode } = this.getNodeInfo(node.id, false);
 
     if (!parent || !curNode) throw new Error('找不要删除的节点');
 
@@ -384,7 +390,7 @@ class Editor extends BaseService {
   public async update(config: MNode): Promise<MNode> {
     if (!config?.id) throw new Error('没有配置或者配置缺少id值');
 
-    const info = this.getNodeInfo(config.id);
+    const info = this.getNodeInfo(config.id, false);
 
     if (!info.node) throw new Error(`获取不到id为${config.id}的节点`);
 

package/src/services/ui.ts

@@ -26,7 +26,9 @@ import type { GetColumnWidth, SetColumnWidth, StageRect, UiState } from '@editor
 import BaseService from './BaseService';
 
 const DEFAULT_LEFT_COLUMN_WIDTH = 310;
+const MIN_LEFT_COLUMN_WIDTH = 45;
 const DEFAULT_RIGHT_COLUMN_WIDTH = 480;
+const MIN_RIGHT_COLUMN_WIDTH = 1;
 
 const COLUMN_WIDTH_STORAGE_KEY = '$MagicEditorColumnWidthData';
 
@@ -117,11 +119,11 @@ class Ui extends BaseService {
     };
 
     if (left) {
-      columnWidth.left = left;
+      columnWidth.left = Math.max(left, MIN_LEFT_COLUMN_WIDTH);
     }
 
     if (right) {
-      columnWidth.right = right;
+      columnWidth.right = Math.max(right, MIN_RIGHT_COLUMN_WIDTH);
     }
 
     if (!center || center === 'auto') {

package/src/theme/page-bar.scss

@@ -25,6 +25,7 @@
     justify-items: center;
     align-items: center;
     background-color: #f3f3f3;
+    white-space: nowrap;
 
     &.active {
       background-color: #fff;

package/src/type.ts

@@ -263,3 +263,6 @@ export enum Layout {
 export enum Keys {
   ESCAPE = 'Space',
 }
+
+export const H_GUIDE_LINE_STORAGE_KEY = '$MagicStageHorizontalGuidelinesData';
+export const V_GUIDE_LINE_STORAGE_KEY = '$MagicStageVerticalGuidelinesData';

package/src/utils/editor.ts

@@ -204,3 +204,18 @@ export const Fixed2Other = async (
 
   return toRelative(node);
 };
+
+export const getGuideLineFromCache = (key: string): number[] => {
+  if (!key) return [];
+
+  const guideLineCacheData = globalThis.localStorage.getItem(key);
+  if (guideLineCacheData) {
+    try {
+      return JSON.parse(guideLineCacheData) || [];
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  return [];
+};

package/src/utils/props.ts

@@ -248,6 +248,7 @@ export const getDefaultPropsValue = (type: string, id: string) =>
     ? {
         type,
         id,
+        layout: 'absolute',
         style: {},
         name: type,
         items: [],