@tmagic/editor 1.1.0-beta.7 → 1.1.0-beta.8

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.1.0-beta.7",
+  "version": "1.1.0-beta.8",
   "name": "@tmagic/editor",
   "sideEffects": [
     "dist/*",
@@ -45,11 +45,11 @@
   "dependencies": {
     "@babel/core": "^7.18.0",
     "@element-plus/icons-vue": "^2.0.6",
-    "@tmagic/core": "1.1.0-beta.7",
-    "@tmagic/form": "1.1.0-beta.7",
-    "@tmagic/schema": "1.1.0-beta.7",
-    "@tmagic/stage": "1.1.0-beta.7",
-    "@tmagic/utils": "1.1.0-beta.7",
+    "@tmagic/core": "1.1.0-beta.8",
+    "@tmagic/form": "1.1.0-beta.8",
+    "@tmagic/schema": "1.1.0-beta.8",
+    "@tmagic/stage": "1.1.0-beta.8",
+    "@tmagic/utils": "1.1.0-beta.8",
     "buffer": "^6.0.3",
     "color": "^3.1.3",
     "element-plus": "^2.2.6",
@@ -62,7 +62,7 @@
     "vue": "^3.2.37"
   },
   "peerDependencies": {
-    "@tmagic/form": "1.1.0-beta.7",
+    "@tmagic/form": "1.1.0-beta.8",
     "element-plus": "^2.2.6",
     "monaco-editor": "^0.32.1",
     "vue": "^3.2.37"

package/src/components/Icon.vue

@@ -1,6 +1,6 @@
 <template>
   <el-icon v-if="!icon"><edit></edit></el-icon>
-  <img v-else-if="typeof icon === 'string' && icon.startsWith('http')" :src="icon" />
+  <el-icon v-else-if="typeof icon === 'string' && icon.startsWith('http')"><img :src="icon" /></el-icon>
   <i v-else-if="typeof icon === 'string'" :class="icon"></i>
   <el-icon v-else><component :is="toRaw(icon)"></component></el-icon>
 </template>

package/src/layouts/workspace/ViewerMenu.vue

@@ -3,7 +3,7 @@
 </template>
 
 <script lang="ts" setup>
-import { computed, inject, markRaw, onMounted, reactive, ref, watch } from 'vue';
+import { computed, inject, markRaw, reactive, ref, watch } from 'vue';
 import { Bottom, Delete, DocumentCopy, Top } from '@element-plus/icons-vue';
 
 import { MNode, NodeType } from '@tmagic/schema';
@@ -133,11 +133,6 @@ const menuData = reactive<MenuItem[]>([
   ...stageContentMenu,
 ]);
 
-onMounted(async () => {
-  const data = await storageService.getItem(COPY_STORAGE_KEY);
-  canPaste.value = data !== 'undefined' && !!data;
-});
-
 watch(
   parent,
   async () => {
@@ -152,8 +147,10 @@ watch(
   { immediate: true },
 );
 
-const show = (e: MouseEvent) => {
+const show = async (e: MouseEvent) => {
   menu.value?.show(e);
+  const data = await storageService.getItem(COPY_STORAGE_KEY);
+  canPaste.value = data !== 'undefined' && !!data;
 };
 
 defineExpose({ show });

package/src/layouts/workspace/Workspace.vue

@@ -72,7 +72,7 @@ export default defineComponent({
         })
         .keydown([ctrl, 'v'], (e) => {
           e.inputEvent.preventDefault();
-          nodes.value && services?.editorService.paste();
+          nodes.value && services?.editorService.paste({ offsetX: 10, offsetY: 10 });
         })
         .keydown([ctrl, 'x'], (e) => {
           e.inputEvent.preventDefault();

package/src/services/editor.ts

@@ -32,14 +32,16 @@ import {
   change2Fixed,
   COPY_STORAGE_KEY,
   Fixed2Other,
+  fixNodePosition,
   getInitPositionStyle,
   getNodeIndex,
   isFixed,
   setLayout,
 } from '../utils/editor';
-import { beforeAdd, beforePaste, beforeRemove, notifyAddToStage } from '../utils/operator';
+import { beforePaste, beforeRemove, getAddParent } from '../utils/operator';
 
 import BaseService from './BaseService';
+import propsService from './props';
 
 class Editor extends BaseService {
   public state: StoreState = reactive({
@@ -60,6 +62,7 @@ class Editor extends BaseService {
       [
         'getLayout',
         'select',
+        'doAdd',
         'add',
         'remove',
         'update',
@@ -281,34 +284,30 @@ class Editor extends BaseService {
     this.set('nodes', nodes);
   }
 
-  /**
-   * 批量向容器添加节点
-   * @param configs 将要添加的节点数组
-   * @returns 添加后的节点
-   */
-  public async multiAdd(configs: MNode[]): Promise<MNode[]> {
+  public async doAdd(node: MNode, parent: MContainer): Promise<MNode> {
+    const root = this.get<MApp>('root');
+    const curNode = this.get<MNode>('node');
     const stage = this.get<StageCore | null>('stage');
-    const newNodes: MNode[] = await Promise.all(
-      configs.map(async (configItem: MNode): Promise<MNode> => {
-        // 新增元素到配置
-        const { parentNode, newNode, layout } = await beforeAdd(configItem as AddMNode);
-        // 将新增元素事件通知到stage以更新渲染
-        await notifyAddToStage(parentNode, newNode, layout);
-        return newNode;
-      }),
-    );
-    const newNodeIds: Id[] = newNodes.map((node) => node.id);
 
-    // 增加历史记录 多选不可能选中page
-    this.addModifiedNodeId(newNodeIds.join('-'));
-    this.pushHistoryState();
+    if ((parent?.type === NodeType.ROOT || curNode.type === NodeType.ROOT) && node.type !== NodeType.PAGE) {
+      throw new Error('app下不能添加组件');
+    }
+
+    const layout = await this.getLayout(toRaw(parent), node as MNode);
+    node.style = getInitPositionStyle(node.style, layout);
+
+    await stage?.add({ config: cloneDeep(node), parent: cloneDeep(parent), root: cloneDeep(root) });
 
-    // 触发选中样式
-    stage?.multiSelect(newNodeIds);
+    node.style = fixNodePosition(node, parent, stage);
 
-    this.emit('multiAdd', newNodes);
+    await stage?.update({ config: cloneDeep(node), root: cloneDeep(root) });
 
-    return newNodes;
+    // 新增节点添加到配置中
+    parent?.items?.push(node);
+
+    this.addModifiedNodeId(node.id);
+
+    return node;
   }
 
   /**
@@ -317,30 +316,47 @@ class Editor extends BaseService {
    * @param parent 要添加到的容器组件节点配置，如果不设置，默认为当前选中的组件的父节点
    * @returns 添加后的节点
    */
-  public async add(addNode: AddMNode, parent?: MContainer | null): Promise<MNode> {
+  public async add(addNode: AddMNode | MNode[], parent?: MContainer | null): Promise<MNode | MNode[]> {
     const stage = this.get<StageCore | null>('stage');
-    // 新增元素到配置
-    const { parentNode, newNode, layout, isPage } = await beforeAdd(addNode, parent);
-    // 将新增元素事件通知到stage以更新渲染
-    await notifyAddToStage(parentNode, newNode, layout);
-    // 更新编辑器选中元素
-    await this.select(newNode);
-    // 增加历史记录
-    this.addModifiedNodeId(newNode.id);
-    if (!isPage) {
-      this.pushHistoryState();
+
+    const parentNode = parent && typeof parent !== 'function' ? parent : getAddParent(addNode);
+    if (!parentNode) throw new Error('未找到父元素');
+
+    // 新增多个组件只存在于粘贴多个组件,粘贴的是一个完整的config,所以不再需要getPropsValue
+    const addNodes = [];
+    if (!Array.isArray(addNode)) {
+      const { type, inputEvent, ...config } = addNode;
+
+      if (!type) throw new Error('组件类型不能为空');
+
+      addNodes.push({ ...toRaw(await propsService.getPropsValue(type, config)) });
+    } else {
+      addNodes.push(...addNode);
     }
 
-    if (isPage) {
-      this.state.pageLength += 1;
+    const newNodes = await Promise.all(addNodes.map((node) => this.doAdd(node, parentNode)));
+
+    if (newNodes.length > 1) {
+      const newNodeIds = newNodes.map((node) => node.id);
+      // 触发选中样式
+      stage?.multiSelect(newNodeIds);
+      await this.multiSelect(newNodeIds);
     } else {
-      // 新增页面，这个时候页面还有渲染出来，此时select会出错，在runtime-ready的时候回去select
-      stage?.select(newNode.id);
+      await this.select(newNodes[0]);
+
+      if (isPage(newNodes[0])) {
+        this.state.pageLength += 1;
+      } else {
+        // 新增页面，这个时候页面还有渲染出来，此时select会出错，在runtime-ready的时候回去select
+        stage?.select(newNodes[0].id);
+      }
     }
 
-    this.emit('add', newNode);
+    this.pushHistoryState();
+
+    this.emit('add', newNodes);
 
-    return newNode;
+    return newNodes.length > 1 ? newNodes[0] : newNodes;
   }
 
   /**
@@ -492,14 +508,14 @@ class Editor extends BaseService {
    * @param position 粘贴的坐标
    * @returns 添加后的组件节点配置
    */
-  public async paste(position: PastePosition = {}): Promise<MNode[] | void> {
-    const config = await storageService.getItem(COPY_STORAGE_KEY);
+  public async paste(position: PastePosition = {}): Promise<MNode | MNode[] | void> {
+    const config: MNode[] = await storageService.getItem(COPY_STORAGE_KEY);
 
-    if (!config) return;
+    if (!Array.isArray(config)) return;
 
     const pasteConfigs = await beforePaste(position, config);
 
-    return await this.multiAdd(pasteConfigs);
+    return this.add(pasteConfigs);
   }
 
   /**
@@ -590,7 +606,7 @@ class Editor extends BaseService {
           return srcValue;
         }
       });
-      newConfig.style = getInitPositionStyle(newConfig.style, layout, target, stage);
+      newConfig.style = getInitPositionStyle(newConfig.style, layout);
 
       target.items.push(newConfig);
 
@@ -633,7 +649,7 @@ class Editor extends BaseService {
     const node = toRaw(this.get('node'));
     if (!node || isPage(node)) return;
 
-    const { style, id } = node;
+    const { style, id, type } = node;
     if (!style || style.position !== 'absolute') return;
 
     if (top && !isNumber(style.top)) return;
@@ -641,6 +657,7 @@ class Editor extends BaseService {
 
     this.update({
       id,
+      type,
       style: {
         ...style,
         left: Number(style.left) + left,

package/src/theme/component-list-panel.scss

@@ -86,6 +86,11 @@
         }
       }
 
+      img {
+        max-width: 100%;
+        max-height: 100%;
+      }
+
       span {
         font-size: 12px;
         text-align: center;

package/src/utils/editor.ts

@@ -88,10 +88,10 @@ export const getRelativeStyle = (style: Record<string, any> = {}): Record<string
   left: 0,
 });
 
-const getMiddleTop = (style: Record<string, any> = {}, parentNode: MNode, stage: StageCore) => {
-  let height = style.height || 0;
+const getMiddleTop = (node: MNode, parentNode: MNode, stage: StageCore | null) => {
+  let height = node.style?.height || 0;
 
-  if (!stage || typeof style.top !== 'undefined' || !parentNode.style) return style.top;
+  if (!stage || typeof node.style?.top !== 'undefined' || !parentNode.style) return node.style?.top;
 
   if (!isNumber(height)) {
     height = 0;
@@ -103,20 +103,15 @@ const getMiddleTop = (style: Record<string, any> = {}, parentNode: MNode, stage:
     const { scrollTop = 0, wrapperHeight } = stage.mask;
     return (wrapperHeight - height) / 2 + scrollTop;
   }
+
   return (parentHeight - height) / 2;
 };
 
-export const getInitPositionStyle = (
-  style: Record<string, any> = {},
-  layout: Layout,
-  parentNode: MNode,
-  stage: StageCore,
-) => {
+export const getInitPositionStyle = (style: Record<string, any> = {}, layout: Layout) => {
   if (layout === Layout.ABSOLUTE) {
     return {
       ...style,
       position: 'absolute',
-      top: getMiddleTop(style, parentNode, stage),
     };
   }
 
@@ -230,3 +225,15 @@ export const fixNodeLeft = (config: MNode, parent: MContainer, doc?: Document) =
 
   return config.style.left;
 };
+
+export const fixNodePosition = (config: MNode, parent: MContainer, stage: StageCore | null) => {
+  if (config.style?.position !== 'absolute') {
+    return config.style;
+  }
+
+  return {
+    ...(config.style || {}),
+    top: getMiddleTop(config, parent, stage),
+    left: fixNodeLeft(config, parent, stage?.renderer.contentWindow?.document),
+  };
+};

package/src/utils/operator.ts

@@ -8,8 +8,8 @@ import { isPage } from '@tmagic/utils';
 import editorService from '../services/editor';
 import historyService from '../services/history';
 import propsService from '../services/props';
-import { AddMNode, Layout, PastePosition } from '../type';
-import { fixNodeLeft, generatePageNameByApp, getInitPositionStyle, getNodeIndex } from '../utils/editor';
+import { AddMNode, PastePosition } from '../type';
+import { generatePageNameByApp, getInitPositionStyle, getNodeIndex } from '../utils/editor';
 
 /**
  * 粘贴前置操作：返回分配了新id以及校准了坐标的配置
@@ -17,7 +17,7 @@ import { fixNodeLeft, generatePageNameByApp, getInitPositionStyle, getNodeIndex
  * @param config 待粘贴的元素配置(复制时保存的那份配置)
  * @returns
  */
-export const beforePaste = async (position: PastePosition, config: MNode[]) => {
+export const beforePaste = async (position: PastePosition, config: MNode[]): Promise<MNode[]> => {
   if (!config[0]?.style) return config;
   const curNode = editorService.get<MContainer>('node');
   // 将数组中第一个元素的坐标作为参照点
@@ -69,54 +69,6 @@ export const beforePaste = async (position: PastePosition, config: MNode[]) => {
   return pasteConfigs;
 };
 
-/**
- * 新增元素前置操作，实现了在编辑器中新增元素节点，并返回新增元素信息以供stage更新
- * @param addNode 待添加元素的配置
- * @param parent 父级容器（可选）
- * @returns 新增的元素，父级元素，布局方式，是否为根页面
- */
-export const beforeAdd = async (
-  addNode: AddMNode,
-  parent?: MContainer | null,
-): Promise<{ parentNode: MContainer; newNode: MNode; layout: Layout; isPage: boolean }> => {
-  // 加入inputEvent是为给业务扩展时可以获取到更多的信息，只有在使用拖拽添加组件时才有改对象
-  const { type, inputEvent, ...config } = addNode;
-  const curNode = editorService.get<MContainer>('node');
-
-  let parentNode: MContainer | undefined;
-  const isPage = type === NodeType.PAGE;
-
-  if (isPage) {
-    parentNode = editorService.get<MApp>('root');
-    // 由于支持中间件扩展，在parent参数为undefined时，parent会变成next函数
-  } else if (parent && typeof parent !== 'function') {
-    parentNode = parent;
-  } else if (curNode.items) {
-    parentNode = curNode;
-  } else {
-    parentNode = editorService.getParentById(curNode.id, false);
-  }
-
-  if (!parentNode) throw new Error('未找到父元素');
-
-  const layout = await editorService.getLayout(toRaw(parentNode), addNode as MNode);
-  const newNode = { ...toRaw(await propsService.getPropsValue(type, config)) };
-  newNode.style = getInitPositionStyle(newNode.style, layout, parentNode, editorService.get<StageCore>('stage'));
-
-  if ((parentNode?.type === NodeType.ROOT || curNode.type === NodeType.ROOT) && newNode.type !== NodeType.PAGE) {
-    throw new Error('app下不能添加组件');
-  }
-  // 新增节点添加到配置中
-  parentNode?.items?.push(newNode);
-  // 返回新增信息以供stage更新
-  return {
-    parentNode,
-    newNode,
-    layout,
-    isPage,
-  };
-};
-
 /**
  * 将元素粘贴到容器内时，将相对于画布坐标转换为相对于容器的坐标
  * @param position PastePosition 粘贴时相对于画布的坐标
@@ -135,27 +87,6 @@ export const getPositionInContainer = (position: PastePosition = {}, id: Id) =>
   };
 };
 
-/**
- * 将新增元素事件通知到stage以更新渲染
- * @param parentNode 父元素
- * @param newNode 当前新增元素
- * @param layout 布局方式
- */
-export const notifyAddToStage = async (parentNode: MContainer, newNode: MNode, layout: Layout) => {
-  const stage = editorService.get<StageCore | null>('stage');
-  const root = editorService.get<MApp>('root');
-
-  await stage?.add({ config: cloneDeep(newNode), parent: cloneDeep(parentNode), root: cloneDeep(root) });
-
-  if (layout === Layout.ABSOLUTE) {
-    const fixedLeft = fixNodeLeft(newNode, parentNode, stage?.renderer.contentWindow?.document);
-    if (typeof fixedLeft !== 'undefined' && newNode.style) {
-      newNode.style.left = fixedLeft;
-      await stage?.update({ config: cloneDeep(newNode), root: cloneDeep(root) });
-    }
-  }
-};
-
 /**
  * 删除前置操作：实现了在编辑器中删除元素节点，并返回父级元素信息以供stage更新
  * @param node 待删除的节点
@@ -208,3 +139,25 @@ export const beforeRemove = async (node: MNode): Promise<MContainer | void> => {
   }
   return parent;
 };
+
+export const getAddParent = (addNode: AddMNode | MNode[]) => {
+  const curNode = editorService.get<MContainer>('node');
+
+  let parentNode;
+  if (!Array.isArray(addNode) && isPage(addNode as MNode)) {
+    parentNode = editorService.get<MApp>('root');
+  } else if (curNode.items) {
+    parentNode = curNode;
+  } else {
+    parentNode = editorService.getParentById(curNode.id, false);
+  }
+  return parentNode;
+};
+
+export const getDefaultConfig = async (addNode: AddMNode, parentNode: MContainer) => {
+  const { type, inputEvent, ...config } = addNode;
+  const layout = await editorService.getLayout(toRaw(parentNode), addNode as MNode);
+  const newNode = { ...toRaw(await propsService.getPropsValue(type, config)) };
+  newNode.style = getInitPositionStyle(newNode.style, layout);
+  return newNode;
+};

package/types/layouts/workspace/ViewerMenu.vue.d.ts

@@ -27,7 +27,7 @@ declare const _default: {
         }>, {
             isMultiSelect: boolean;
         }>>>, {
-            show: (e: MouseEvent) => void;
+            show: (e: MouseEvent) => Promise<void>;
         }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, {
             isMultiSelect: boolean;
         }> & {
@@ -55,7 +55,7 @@ declare const _default: {
     }>, {
         isMultiSelect: boolean;
     }>>> & import("vue").ShallowUnwrapRef<{
-        show: (e: MouseEvent) => void;
+        show: (e: MouseEvent) => Promise<void>;
     }> & {} & import("vue").ComponentCustomProperties;
     __isFragment?: undefined;
     __isTeleport?: undefined;
@@ -65,7 +65,7 @@ declare const _default: {
 }>, {
     isMultiSelect: boolean;
 }>>>, {
-    show: (e: MouseEvent) => void;
+    show: (e: MouseEvent) => Promise<void>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, {
     isMultiSelect: boolean;
 }> & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps & (new () => {

package/types/services/editor.d.ts

@@ -65,19 +65,14 @@ declare class Editor extends BaseService {
      * @returns 加入多选的节点配置
      */
     multiSelect(ids: Id[]): void;
-    /**
-     * 批量向容器添加节点
-     * @param configs 将要添加的节点数组
-     * @returns 添加后的节点
-     */
-    multiAdd(configs: MNode[]): Promise<MNode[]>;
+    doAdd(node: MNode, parent: MContainer): Promise<MNode>;
     /**
      * 向指点容器添加组件节点
      * @param addConfig 将要添加的组件节点配置
      * @param parent 要添加到的容器组件节点配置，如果不设置，默认为当前选中的组件的父节点
      * @returns 添加后的节点
      */
-    add(addNode: AddMNode, parent?: MContainer | null): Promise<MNode>;
+    add(addNode: AddMNode | MNode[], parent?: MContainer | null): Promise<MNode | MNode[]>;
     /**
      * 删除组件
      * @param {Object} node
@@ -114,7 +109,7 @@ declare class Editor extends BaseService {
      * @param position 粘贴的坐标
      * @returns 添加后的组件节点配置
      */
-    paste(position?: PastePosition): Promise<MNode[] | void>;
+    paste(position?: PastePosition): Promise<MNode | MNode[] | void>;
     /**
      * 将指点节点设置居中
      * @param config 组件节点配置

package/types/utils/editor.d.ts

@@ -33,7 +33,7 @@ export declare const generatePageNameByApp: (app: MApp) => string;
 export declare const isFixed: (node: MNode) => boolean;
 export declare const getNodeIndex: (node: MNode, parent: MContainer | MApp) => number;
 export declare const getRelativeStyle: (style?: Record<string, any>) => Record<string, any>;
-export declare const getInitPositionStyle: (style: Record<string, any> | undefined, layout: Layout, parentNode: MNode, stage: StageCore) => Record<string, any>;
+export declare const getInitPositionStyle: (style: Record<string, any> | undefined, layout: Layout) => Record<string, any>;
 export declare const setLayout: (node: MNode, layout: Layout) => MNode;
 export declare const change2Fixed: (node: MNode, root: MApp) => {
     left: number;
@@ -42,3 +42,6 @@ export declare const change2Fixed: (node: MNode, root: MApp) => {
 export declare const Fixed2Other: (node: MNode, root: MApp, getLayout: (parent: MNode, node?: MNode) => Promise<Layout>) => Promise<Record<string, any>>;
 export declare const getGuideLineFromCache: (key: string) => number[];
 export declare const fixNodeLeft: (config: MNode, parent: MContainer, doc?: Document) => any;
+export declare const fixNodePosition: (config: MNode, parent: MContainer, stage: StageCore | null) => {
+    [key: string]: any;
+} | undefined;

package/types/utils/operator.d.ts

@@ -1,5 +1,5 @@
 import { Id, MContainer, MNode } from '@tmagic/schema';
-import { AddMNode, Layout, PastePosition } from '../type';
+import { AddMNode, PastePosition } from '../type';
 /**
  * 粘贴前置操作：返回分配了新id以及校准了坐标的配置
  * @param position 粘贴的坐标
@@ -7,18 +7,6 @@ import { AddMNode, Layout, PastePosition } from '../type';
  * @returns
  */
 export declare const beforePaste: (position: PastePosition, config: MNode[]) => Promise<MNode[]>;
-/**
- * 新增元素前置操作，实现了在编辑器中新增元素节点，并返回新增元素信息以供stage更新
- * @param addNode 待添加元素的配置
- * @param parent 父级容器（可选）
- * @returns 新增的元素，父级元素，布局方式，是否为根页面
- */
-export declare const beforeAdd: (addNode: AddMNode, parent?: MContainer | null) => Promise<{
-    parentNode: MContainer;
-    newNode: MNode;
-    layout: Layout;
-    isPage: boolean;
-}>;
 /**
  * 将元素粘贴到容器内时，将相对于画布坐标转换为相对于容器的坐标
  * @param position PastePosition 粘贴时相对于画布的坐标
@@ -29,16 +17,11 @@ export declare const getPositionInContainer: (position: PastePosition | undefine
     left: number;
     top: number;
 };
-/**
- * 将新增元素事件通知到stage以更新渲染
- * @param parentNode 父元素
- * @param newNode 当前新增元素
- * @param layout 布局方式
- */
-export declare const notifyAddToStage: (parentNode: MContainer, newNode: MNode, layout: Layout) => Promise<void>;
 /**
  * 删除前置操作：实现了在编辑器中删除元素节点，并返回父级元素信息以供stage更新
  * @param node 待删除的节点
  * @returns 父级元素，root根元素
  */
 export declare const beforeRemove: (node: MNode) => Promise<MContainer | void>;
+export declare const getAddParent: (addNode: AddMNode | MNode[]) => MContainer | undefined;
+export declare const getDefaultConfig: (addNode: AddMNode, parentNode: MContainer) => Promise<any>;