@tmagic/editor 1.1.0-beta.10 → 1.1.0-beta.13

package/src/layouts/workspace/Workspace.vue

@@ -1,18 +1,20 @@
 <template>
   <div class="m-editor-workspace" tabindex="1" ref="workspace">
-    <magic-stage :key="page?.id"></magic-stage>
+    <slot name="stage">
+      <MagicStage :key="page?.id"></MagicStage>
+    </slot>
 
     <slot name="workspace-content"></slot>
 
-    <page-bar>
+    <PageBar>
       <template #page-bar-title="{ page }"><slot name="page-bar-title" :page="page"></slot></template>
       <template #page-bar-popover="{ page }"><slot name="page-bar-popover" :page="page"></slot></template>
-    </page-bar>
+    </PageBar>
   </div>
 </template>
 
-<script lang="ts">
-import { computed, defineComponent, inject, onMounted, onUnmounted, ref } from 'vue';
+<script lang="ts" setup>
+import { computed, inject, onMounted, onUnmounted, ref } from 'vue';
 import KeyController from 'keycon';
 
 import type { MNode, MPage } from '@tmagic/schema';
@@ -23,140 +25,133 @@ import type { Services } from '../../type';
 import PageBar from './PageBar.vue';
 import MagicStage from './Stage.vue';
 
-export default defineComponent({
-  name: 'm-editor-workspace',
-
-  components: {
-    PageBar,
-    MagicStage,
-  },
-
-  setup() {
-    const services = inject<Services>('services');
-    const workspace = ref<HTMLDivElement>();
-    const nodes = computed(() => services?.editorService.get<MNode[]>('nodes'));
-    let keycon: KeyController;
-
-    const mouseenterHandler = () => {
-      workspace.value?.focus();
-    };
-
-    const mouseleaveHandler = () => {
-      workspace.value?.blur();
-    };
-
-    onMounted(() => {
-      workspace.value?.addEventListener('mouseenter', mouseenterHandler);
-      workspace.value?.addEventListener('mouseleave', mouseleaveHandler);
-
-      keycon = new KeyController(workspace.value);
-
-      const isMac = /mac os x/.test(navigator.userAgent.toLowerCase());
-
-      const ctrl = isMac ? 'meta' : 'ctrl';
-
-      keycon
-        .keyup('delete', (e) => {
-          e.inputEvent.preventDefault();
-          if (!nodes.value || isPage(nodes.value[0])) return;
-          services?.editorService.remove(nodes.value);
-        })
-        .keyup('backspace', (e) => {
-          e.inputEvent.preventDefault();
-          if (!nodes.value || isPage(nodes.value[0])) return;
-          services?.editorService.remove(nodes.value);
-        })
-        .keydown([ctrl, 'c'], (e) => {
-          e.inputEvent.preventDefault();
-          nodes.value && services?.editorService.copy(nodes.value);
-        })
-        .keydown([ctrl, 'v'], (e) => {
-          e.inputEvent.preventDefault();
-          nodes.value && services?.editorService.paste({ offsetX: 10, offsetY: 10 });
-        })
-        .keydown([ctrl, 'x'], (e) => {
-          e.inputEvent.preventDefault();
-          if (!nodes.value || isPage(nodes.value[0])) return;
-          services?.editorService.copy(nodes.value);
-          services?.editorService.remove(nodes.value);
-        })
-        .keydown([ctrl, 'z'], (e) => {
-          e.inputEvent.preventDefault();
-          services?.editorService.undo();
-        })
-        .keydown([ctrl, 'shift', 'z'], (e) => {
-          e.inputEvent.preventDefault();
-          services?.editorService.redo();
-        })
-        .keydown('up', (e) => {
-          e.inputEvent.preventDefault();
-          services?.editorService.move(0, -1);
-        })
-        .keydown('down', (e) => {
-          e.inputEvent.preventDefault();
-          services?.editorService.move(0, 1);
-        })
-        .keydown('left', (e) => {
-          e.inputEvent.preventDefault();
-          services?.editorService.move(-1, 0);
-        })
-        .keydown('right', (e) => {
-          e.inputEvent.preventDefault();
-          services?.editorService.move(1, 0);
-        })
-        .keydown([ctrl, 'up'], (e) => {
-          e.inputEvent.preventDefault();
-          services?.editorService.move(0, -10);
-        })
-        .keydown([ctrl, 'down'], (e) => {
-          e.inputEvent.preventDefault();
-          services?.editorService.move(0, 10);
-        })
-        .keydown([ctrl, 'left'], (e) => {
-          e.inputEvent.preventDefault();
-          services?.editorService.move(-10, 0);
-        })
-        .keydown([ctrl, 'right'], (e) => {
-          e.inputEvent.preventDefault();
-          services?.editorService.move(10, 0);
-        })
-        .keydown('tab', (e) => {
-          e.inputEvent.preventDefault();
-          services?.editorService.selectNextNode();
-        })
-        .keydown([ctrl, 'tab'], (e) => {
-          e.inputEvent.preventDefault();
-          services?.editorService.selectNextPage();
-        })
-        .keydown([ctrl, '='], (e) => {
-          e.inputEvent.preventDefault();
-          services?.uiService.zoom(0.1);
-        })
-        .keydown([ctrl, 'numpadplus'], (e) => {
-          e.inputEvent.preventDefault();
-          services?.uiService.zoom(0.1);
-        })
-        .keydown([ctrl, '-'], (e) => {
-          e.inputEvent.preventDefault();
-          services?.uiService.zoom(-0.1);
-        })
-        .keydown([ctrl, 'numpad-'], (e) => {
-          e.inputEvent.preventDefault();
-          services?.uiService.zoom(-0.1);
-        });
+const services = inject<Services>('services');
+const workspace = ref<HTMLDivElement>();
+const nodes = computed(() => services?.editorService.get<MNode[]>('nodes'));
+const page = computed(() => services?.editorService.get<MPage>('page'));
+
+const mouseenterHandler = () => {
+  workspace.value?.focus();
+};
+
+const mouseleaveHandler = () => {
+  workspace.value?.blur();
+};
+
+let keycon: KeyController;
+
+onMounted(() => {
+  workspace.value?.addEventListener('mouseenter', mouseenterHandler);
+  workspace.value?.addEventListener('mouseleave', mouseleaveHandler);
+
+  keycon = new KeyController(workspace.value);
+
+  const isMac = /mac os x/.test(navigator.userAgent.toLowerCase());
+
+  const ctrl = isMac ? 'meta' : 'ctrl';
+
+  keycon
+    .keyup('delete', (e) => {
+      e.inputEvent.preventDefault();
+      if (!nodes.value || isPage(nodes.value[0])) return;
+      services?.editorService.remove(nodes.value);
+    })
+    .keyup('backspace', (e) => {
+      e.inputEvent.preventDefault();
+      if (!nodes.value || isPage(nodes.value[0])) return;
+      services?.editorService.remove(nodes.value);
+    })
+    .keydown([ctrl, 'c'], (e) => {
+      e.inputEvent.preventDefault();
+      nodes.value && services?.editorService.copy(nodes.value);
+    })
+    .keydown([ctrl, 'v'], (e) => {
+      e.inputEvent.preventDefault();
+      nodes.value && services?.editorService.paste({ offsetX: 10, offsetY: 10 });
+    })
+    .keydown([ctrl, 'x'], (e) => {
+      e.inputEvent.preventDefault();
+      if (!nodes.value || isPage(nodes.value[0])) return;
+      services?.editorService.copy(nodes.value);
+      services?.editorService.remove(nodes.value);
+    })
+    .keydown([ctrl, 'z'], (e) => {
+      e.inputEvent.preventDefault();
+      services?.editorService.undo();
+    })
+    .keydown([ctrl, 'shift', 'z'], (e) => {
+      e.inputEvent.preventDefault();
+      services?.editorService.redo();
+    })
+    .keydown('up', (e) => {
+      e.inputEvent.preventDefault();
+      services?.editorService.move(0, -1);
+    })
+    .keydown('down', (e) => {
+      e.inputEvent.preventDefault();
+      services?.editorService.move(0, 1);
+    })
+    .keydown('left', (e) => {
+      e.inputEvent.preventDefault();
+      services?.editorService.move(-1, 0);
+    })
+    .keydown('right', (e) => {
+      e.inputEvent.preventDefault();
+      services?.editorService.move(1, 0);
+    })
+    .keydown([ctrl, 'up'], (e) => {
+      e.inputEvent.preventDefault();
+      services?.editorService.move(0, -10);
+    })
+    .keydown([ctrl, 'down'], (e) => {
+      e.inputEvent.preventDefault();
+      services?.editorService.move(0, 10);
+    })
+    .keydown([ctrl, 'left'], (e) => {
+      e.inputEvent.preventDefault();
+      services?.editorService.move(-10, 0);
+    })
+    .keydown([ctrl, 'right'], (e) => {
+      e.inputEvent.preventDefault();
+      services?.editorService.move(10, 0);
+    })
+    .keydown('tab', (e) => {
+      e.inputEvent.preventDefault();
+      services?.editorService.selectNextNode();
+    })
+    .keydown([ctrl, 'tab'], (e) => {
+      e.inputEvent.preventDefault();
+      services?.editorService.selectNextPage();
+    })
+    .keydown([ctrl, '='], (e) => {
+      e.inputEvent.preventDefault();
+      services?.uiService.zoom(0.1);
+    })
+    .keydown([ctrl, 'numpadplus'], (e) => {
+      e.inputEvent.preventDefault();
+      services?.uiService.zoom(0.1);
+    })
+    .keydown([ctrl, '-'], (e) => {
+      e.inputEvent.preventDefault();
+      services?.uiService.zoom(-0.1);
+    })
+    .keydown([ctrl, 'numpad-'], (e) => {
+      e.inputEvent.preventDefault();
+      services?.uiService.zoom(-0.1);
+    })
+    .keydown([ctrl, '0'], (e) => {
+      e.inputEvent.preventDefault();
+      services?.uiService.set('zoom', services.uiService.calcZoom());
+    })
+    .keydown([ctrl, '1'], (e) => {
+      e.inputEvent.preventDefault();
+      services?.uiService.set('zoom', 1);
     });
+});
 
-    onUnmounted(() => {
-      workspace.value?.removeEventListener('mouseenter', mouseenterHandler);
-      workspace.value?.removeEventListener('mouseleave', mouseleaveHandler);
-      keycon.destroy();
-    });
-
-    return {
-      workspace,
-
-      page: computed(() => services?.editorService.get<MPage>('page')),
-    };
-  },
+onUnmounted(() => {
+  workspace.value?.removeEventListener('mouseenter', mouseenterHandler);
+  workspace.value?.removeEventListener('mouseleave', mouseleaveHandler);
+  keycon.destroy();
 });
 </script>

package/src/services/editor.ts

@@ -71,6 +71,7 @@ class Editor extends BaseService {
         'sort',
         'copy',
         'paste',
+        'doPaste',
         'duAlignCenter',
         'alignCenter',
         'moveLayer',
@@ -367,7 +368,7 @@ class Editor extends BaseService {
 
     this.emit('add', newNodes);
 
-    return newNodes.length > 1 ? newNodes[0] : newNodes;
+    return Array.isArray(addNode) ? newNodes : newNodes[0];
   }
 
   public async doRemove(node: MNode): Promise<void> {
@@ -503,7 +504,7 @@ class Editor extends BaseService {
 
     this.emit('update', newNodes);
 
-    return newNodes.length > 1 ? newNodes[0] : newNodes;
+    return Array.isArray(config) ? newNodes : newNodes[0];
   }
 
   /**
@@ -556,11 +557,16 @@ class Editor extends BaseService {
 
     if (!Array.isArray(config)) return;
 
-    const pasteConfigs = await beforePaste(position, config);
+    const pasteConfigs = await this.doPaste(config, position);
 
     return this.add(pasteConfigs);
   }
 
+  public async doPaste(config: MNode[], position: PastePosition = {}): Promise<MNode[]> {
+    const pasteConfigs = await beforePaste(position, cloneDeep(config));
+    return pasteConfigs;
+  }
+
   public async doAlignCenter(config: MNode): Promise<MNode> {
     const parent = this.getParentById(config.id);
 
@@ -614,7 +620,7 @@ class Editor extends BaseService {
    */
   public async moveLayer(offset: number | LayerOffset): Promise<void> {
     const parent = this.get<MContainer>('parent');
-    const node = this.get('node');
+    const node = this.get<MNode>('node');
     const brothers: MNode[] = parent?.items || [];
     const index = brothers.findIndex((item) => `${item.id}` === `${node?.id}`);
 
@@ -626,11 +632,15 @@ class Editor extends BaseService {
       brothers.splice(index + parseInt(`${offset}`, 10), 0, brothers.splice(index, 1)[0]);
     }
 
+    const grandparent = this.getParentById(parent.id);
     this.get<StageCore | null>('stage')?.update({
       config: cloneDeep(toRaw(parent)),
-      parentId: parent.id,
+      parentId: grandparent?.id,
       root: cloneDeep(this.get<MApp>('root')),
     });
+
+    this.addModifiedNodeId(parent.id);
+    this.pushHistoryState();
   }
 
   /**
@@ -664,7 +674,8 @@ class Editor extends BaseService {
 
       await stage.select(targetId);
 
-      await stage.update({ config: cloneDeep(target), parentId: parent.id, root });
+      const targetParent = this.getParentById(target.id);
+      await stage.update({ config: cloneDeep(target), parentId: targetParent?.id, root });
 
       await this.select(newConfig);
       stage.select(newConfig.id);

package/src/services/props.ts

@@ -20,12 +20,11 @@ import { reactive } from 'vue';
 import { cloneDeep, mergeWith } from 'lodash-es';
 
 import type { FormConfig } from '@tmagic/form';
-import type { Id, MComponent, MNode, MPage } from '@tmagic/schema';
-import { NodeType } from '@tmagic/schema';
-import { isPop, toLine } from '@tmagic/utils';
+import type { MComponent, MNode } from '@tmagic/schema';
+import { toLine } from '@tmagic/utils';
 
 import type { PropsState } from '../type';
-import { DEFAULT_CONFIG, fillConfig } from '../utils/props';
+import { fillConfig } from '../utils/props';
 
 import BaseService from './BaseService';
 
@@ -43,6 +42,7 @@ class Props extends BaseService {
       'getPropsValue',
       'createId',
       'setNewItemId',
+      'fillConfig',
       'getDefaultPropsValue',
     ]);
   }
@@ -54,13 +54,17 @@ class Props extends BaseService {
     this.emit('props-configs-change');
   }
 
+  public async fillConfig(config: FormConfig) {
+    return fillConfig(config);
+  }
+
   /**
    * 为指定类型组件设置组件属性表单配置
    * @param type 组件类型
    * @param config 组件属性表单配置
    */
-  public setPropsConfig(type: string, config: FormConfig) {
-    this.state.propsConfigMap[type] = fillConfig(Array.isArray(config) ? config : [config]);
+  public async setPropsConfig(type: string, config: FormConfig) {
+    this.state.propsConfigMap[type] = await this.fillConfig(Array.isArray(config) ? config : [config]);
   }
 
   /**
@@ -73,7 +77,7 @@ class Props extends BaseService {
       return await this.getPropsConfig('button');
     }
 
-    return cloneDeep(this.state.propsConfigMap[type] || DEFAULT_CONFIG);
+    return cloneDeep(this.state.propsConfigMap[type] || (await this.fillConfig([])));
   }
 
   public setPropsValues(values: Record<string, MNode>) {
@@ -125,19 +129,6 @@ class Props extends BaseService {
     };
   }
 
-  /**
-   * 生成指定位数的GUID，无【-】格式
-   * @param digit 位数，默认值8
-   * @returns
-   */
-  guid(digit = 8): string {
-    return 'x'.repeat(digit).replace(/[xy]/g, (c) => {
-      const r = (Math.random() * 16) | 0;
-      const v = c == 'x' ? r : (r & 0x3) | 0x8;
-      return v.toString(16);
-    });
-  }
-
   public async createId(type: string | number): Promise<string> {
     return `${type}_${this.guid()}`;
   }
@@ -147,19 +138,12 @@ class Props extends BaseService {
    * @param {Object} config 组件配置
    */
   /* eslint no-param-reassign: ["error", { "props": false }] */
-  public async setNewItemId(config: MNode, parent?: MPage) {
-    const oldId = config.id;
-
+  public async setNewItemId(config: MNode) {
     config.id = await this.createId(config.type || 'component');
 
-    // 只有弹窗在页面下的一级子元素才有效
-    if (isPop(config) && parent?.type === NodeType.PAGE) {
-      updatePopId(oldId, config.id, parent);
-    }
-
     if (config.items && Array.isArray(config.items)) {
       for (const item of config.items) {
-        await this.setNewItemId(item, config as MPage);
+        await this.setNewItemId(item);
       }
     }
 
@@ -186,31 +170,20 @@ class Props extends BaseService {
           name: type,
         };
   }
-}
 
-/**
- * 复制页面时，需要把组件下关联的弹窗id换测复制出来的弹窗的id
- * @param {number} oldId 复制的源弹窗id
- * @param {number} popId 新的弹窗id
- * @param {Object} pageConfig 页面配置
- */
-const updatePopId = (oldId: Id, popId: Id, pageConfig: MPage) => {
-  pageConfig.items?.forEach((config) => {
-    if (config.pop === oldId) {
-      config.pop = popId;
-      return;
-    }
-
-    if (config.popId === oldId) {
-      config.popId = popId;
-      return;
-    }
-
-    if (Array.isArray(config.items)) {
-      updatePopId(oldId, popId, config as MPage);
-    }
-  });
-};
+  /**
+   * 生成指定位数的GUID，无【-】格式
+   * @param digit 位数，默认值8
+   * @returns
+   */
+  private guid(digit = 8): string {
+    return 'x'.repeat(digit).replace(/[xy]/g, (c) => {
+      const r = (Math.random() * 16) | 0;
+      const v = c === 'x' ? r : (r & 0x3) | 0x8;
+      return v.toString(16);
+    });
+  }
+}
 
 export type PropsService = Props;
 

package/src/services/ui.ts

@@ -98,10 +98,6 @@ class Ui extends BaseService {
     }
 
     (state as any)[name] = value;
-
-    if (name === 'stageContainerRect') {
-      state.zoom = this.calcZoom();
-    }
   }
 
   public get<T>(name: keyof typeof state): T {
@@ -113,6 +109,22 @@ class Ui extends BaseService {
     if (this.get<number>('zoom') < 0.1) this.set('zoom', 0.1);
   }
 
+  public calcZoom() {
+    const { stageRect, stageContainerRect } = state;
+    const { height, width } = stageContainerRect;
+    if (!width || !height) return 1;
+
+    // 30为标尺的大小
+    const stageWidth = stageRect.width + 30;
+    const stageHeight = stageRect.height + 30;
+
+    if (width > stageWidth && height > stageHeight) {
+      return 1;
+    }
+    // 60/80是为了不要让画布太过去贴住四周（这样好看些）
+    return Math.min((width - 60) / stageWidth || 1, (height - 80) / stageHeight || 1);
+  }
+
   private setColumnWidth({ left, center, right }: SetColumnWidth) {
     const columnWidth = {
       ...toRaw(this.get<GetColumnWidth>('columnWidth')),
@@ -150,22 +162,6 @@ class Ui extends BaseService {
     };
     state.zoom = this.calcZoom();
   }
-
-  private calcZoom() {
-    const { stageRect, stageContainerRect } = state;
-    const { height, width } = stageContainerRect;
-    if (!width || !height) return 1;
-
-    // 30为标尺的大小
-    const stageWidth = stageRect.width + 30;
-    const stageHeight = stageRect.height + 30;
-
-    if (width > stageWidth && height > stageHeight) {
-      return 1;
-    }
-    // 60/80是为了不要让画布太过去贴住四周（这样好看些）
-    return Math.min((width - 60) / stageWidth || 1, (height - 80) / stageHeight || 1);
-  }
 }
 
 export type UiService = Ui;

package/src/theme/nav-menu.scss

@@ -69,5 +69,11 @@
     .menu-item-text {
       color: $--nav-color;
     }
+
+    &.rule {
+      .el-icon {
+        transform: rotate(-90deg);
+      }
+    }
   }
 }

package/src/type.ts

@@ -82,16 +82,22 @@ export interface ComponentGroupState {
   list: ComponentGroup[];
 }
 
+export enum ColumnLayout {
+  LEFT = 'left',
+  CENTER = 'center',
+  RIGHT = 'right',
+}
+
 export interface SetColumnWidth {
-  left?: number;
-  center?: number | 'auto';
-  right?: number;
+  [ColumnLayout.LEFT]?: number;
+  [ColumnLayout.CENTER]?: number | 'auto';
+  [ColumnLayout.RIGHT]?: number;
 }
 
 export interface GetColumnWidth {
-  left: number;
-  center: number;
-  right: number;
+  [ColumnLayout.LEFT]: number;
+  [ColumnLayout.CENTER]: number;
+  [ColumnLayout.RIGHT]: number;
 }
 
 export interface StageRect {
@@ -174,6 +180,7 @@ export interface MenuButton {
   /** type为button/dropdown时点击运行的方法 */
   handler?: (data: Services, event: MouseEvent) => Promise<any> | any;
   /** type为dropdown时，下拉的菜单列表， 或者有子菜单时 */
+  className?: string;
   items?: MenuButton[];
 }
 
@@ -187,6 +194,7 @@ export interface MenuComponent {
   listeners?: Record<string, Function>;
   slots?: Record<string, any>;
   /** 是否显示，默认为true */
+  className?: string;
   display?: boolean | ((data?: Services) => Promise<boolean> | boolean);
 }
 
@@ -209,16 +217,17 @@ export type MenuItem =
   | 'guides'
   | 'rule'
   | MenuButton
-  | MenuComponent;
+  | MenuComponent
+  | string;
 
 /** 工具栏 */
 export interface MenuBarData {
   /** 顶部工具栏左边项 */
-  left?: MenuItem[];
+  [ColumnLayout.LEFT]?: MenuItem[];
   /** 顶部工具栏中间项 */
-  center?: MenuItem[];
+  [ColumnLayout.CENTER]?: MenuItem[];
   /** 顶部工具栏右边项 */
-  right?: MenuItem[];
+  [ColumnLayout.RIGHT]?: MenuItem[];
 }
 
 export interface SideComponent extends MenuComponent {
@@ -287,3 +296,10 @@ export enum Keys {
 
 export const H_GUIDE_LINE_STORAGE_KEY = '$MagicStageHorizontalGuidelinesData';
 export const V_GUIDE_LINE_STORAGE_KEY = '$MagicStageVerticalGuidelinesData';
+
+export interface ScrollViewerEvent {
+  scrollLeft: number;
+  scrollTop: number;
+  scrollHeight: number;
+  scrollWidth: number;
+}

package/src/utils/index.ts

@@ -20,3 +20,4 @@ export * from './config';
 export * from './props';
 export * from './logger';
 export * from './editor';
+export * from './stage';