@tmagic/editor 1.2.0-beta.18 → 1.2.0-beta.19

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.2.0-beta.18",
+  "version": "1.2.0-beta.19",
   "name": "@tmagic/editor",
   "sideEffects": [
     "dist/*",
@@ -45,12 +45,12 @@
   "dependencies": {
     "@babel/core": "^7.18.0",
     "@element-plus/icons-vue": "^2.0.9",
-    "@tmagic/core": "1.2.0-beta.18",
-    "@tmagic/design": "1.2.0-beta.18",
-    "@tmagic/form": "1.2.0-beta.18",
-    "@tmagic/schema": "1.2.0-beta.18",
-    "@tmagic/stage": "1.2.0-beta.18",
-    "@tmagic/utils": "1.2.0-beta.18",
+    "@tmagic/core": "1.2.0-beta.19",
+    "@tmagic/design": "1.2.0-beta.19",
+    "@tmagic/form": "1.2.0-beta.19",
+    "@tmagic/schema": "1.2.0-beta.19",
+    "@tmagic/stage": "1.2.0-beta.19",
+    "@tmagic/utils": "1.2.0-beta.19",
     "buffer": "^6.0.3",
     "color": "^3.1.3",
     "events": "^3.3.0",
@@ -62,8 +62,8 @@
     "vue": "^3.2.37"
   },
   "peerDependencies": {
-    "@tmagic/design": "1.2.0-beta.18",
-    "@tmagic/form": "1.2.0-beta.18",
+    "@tmagic/design": "1.2.0-beta.19",
+    "@tmagic/form": "1.2.0-beta.19",
     "monaco-editor": "^0.34.0",
     "vue": "^3.2.37"
   },
@@ -80,6 +80,6 @@
     "typescript": "^4.7.4",
     "vite": "^3.1.3",
     "vite-plugin-vue-setup-extend": "^0.4.0",
-    "vue-tsc": "^1.0.8"
+    "vue-tsc": "^1.0.10"
   }
 }

package/src/Editor.vue

@@ -69,8 +69,13 @@ import { defineComponent, onUnmounted, PropType, provide, reactive, toRaw, watch
 import { EventOption } from '@tmagic/core';
 import type { FormConfig } from '@tmagic/form';
 import type { MApp, MNode } from '@tmagic/schema';
-import type StageCore from '@tmagic/stage';
-import { CONTAINER_HIGHLIGHT_CLASS, ContainerHighlightType, MoveableOptions } from '@tmagic/stage';
+import StageCore, {
+  CONTAINER_HIGHLIGHT_CLASS_NAME,
+  ContainerHighlightType,
+  CustomizeMoveableOptionsCallbackConfig,
+  MoveableOptions,
+  UpdateDragEl,
+} from '@tmagic/stage';
 
 import Framework from './layouts/Framework.vue';
 import NavMenu from './layouts/NavMenu.vue';
@@ -117,25 +122,27 @@ export default defineComponent({
       type: Object as PropType<SideBarData>,
     },
 
+    /** 顶部工具栏配置 */
+    menu: {
+      type: Object as PropType<MenuBarData>,
+      default: () => ({ left: [], right: [] }),
+    },
+
+    /** 组件树右键菜单 */
     layerContentMenu: {
       type: Array as PropType<(MenuButton | MenuComponent)[]>,
       default: () => [],
     },
 
+    /** 画布右键菜单 */
     stageContentMenu: {
       type: Array as PropType<(MenuButton | MenuComponent)[]>,
       default: () => [],
     },
 
-    /** 顶部工具栏配置 */
-    menu: {
-      type: Object as PropType<MenuBarData>,
-      default: () => ({ left: [], right: [] }),
-    },
-
     /** 中间工作区域中画布渲染的内容 */
     render: {
-      type: Function as PropType<() => HTMLDivElement>,
+      type: Function as PropType<(stage: StageCore) => HTMLDivElement | Promise<HTMLDivElement>>,
     },
 
     /** 中间工作区域中画布通过iframe渲染时的页面url */
@@ -158,13 +165,15 @@ export default defineComponent({
 
     /** 组件联动事件选项列表 */
     eventMethodList: {
-      type: Object,
+      type: Object as PropType<Record<string, { events: EventOption[]; methods: EventOption[] }>>,
       default: () => ({}),
     },
 
     /** 画布中组件选中框的移动范围 */
     moveableOptions: {
-      type: [Object, Function] as PropType<MoveableOptions | ((core?: StageCore) => MoveableOptions)>,
+      type: [Object, Function] as PropType<
+        MoveableOptions | ((config?: CustomizeMoveableOptionsCallbackConfig) => MoveableOptions)
+      >,
     },
 
     /** 编辑器初始化时默认选中的组件ID */
@@ -184,7 +193,7 @@ export default defineComponent({
 
     containerHighlightClassName: {
       type: String,
-      default: CONTAINER_HIGHLIGHT_CLASS,
+      default: CONTAINER_HIGHLIGHT_CLASS_NAME,
     },
 
     containerHighlightDuration: {
@@ -207,7 +216,7 @@ export default defineComponent({
     },
 
     updateDragEl: {
-      type: Function as PropType<(el: HTMLDivElement, target: HTMLElement) => void>,
+      type: Function as PropType<UpdateDragEl>,
     },
   },
 

package/src/layouts/workspace/Stage.vue

@@ -27,7 +27,7 @@
 </template>
 
 <script lang="ts" setup name="MEditorStage">
-import { computed, inject, markRaw, onMounted, onUnmounted, ref, toRaw, watch, watchEffect } from 'vue';
+import { computed, inject, markRaw, nextTick, onMounted, onUnmounted, ref, toRaw, watch, watchEffect } from 'vue';
 import { cloneDeep } from 'lodash-es';
 
 import type { MApp, MContainer, MNode, MPage } from '@tmagic/schema';
@@ -96,6 +96,15 @@ watch(root, (root) => {
   }
 });
 
+watch(page, (page) => {
+  if (runtime && page) {
+    runtime.updatePageId?.(page.id);
+    nextTick(() => {
+      stage?.select(page.id);
+    });
+  }
+});
+
 const resizeObserver = new ResizeObserver((entries) => {
   for (const { contentRect } of entries) {
     services?.uiService.set('stageContainerRect', {

package/src/layouts/workspace/Workspace.vue

@@ -3,7 +3,7 @@
     <Breadcrumb></Breadcrumb>
 
     <slot name="stage">
-      <MagicStage :key="page?.id" :stage-content-menu="stageContentMenu"></MagicStage>
+      <MagicStage v-if="page" :stage-content-menu="stageContentMenu"></MagicStage>
     </slot>
 
     <slot name="workspace-content"></slot>

package/src/services/editor.ts

@@ -25,9 +25,9 @@ import StageCore from '@tmagic/stage';
 import { getNodePath, isNumber, isPage, isPop } from '@tmagic/utils';
 
 import codeBlockService from '../services/codeBlock';
-import historyService, { StepValue } from '../services/history';
+import historyService from '../services/history';
 import storageService, { Protocol } from '../services/storage';
-import type { AddMNode, EditorNodeInfo, PastePosition, StoreState } from '../type';
+import type { AddMNode, EditorNodeInfo, PastePosition, StepValue, StoreState } from '../type';
 import { LayerOffset, Layout } from '../type';
 import {
   change2Fixed,
@@ -91,9 +91,8 @@ class Editor extends BaseService {
 
   /**
    * 设置当前指点节点配置
-   * @param name 'root' | 'page' | 'parent' | 'node' | 'highlightNode' | 'nodes'
+   * @param name 'root' | 'page' | 'parent' | 'node' | 'highlightNode' | 'nodes' | 'stage' | 'modifiedNodeIds' | 'pageLength'
    * @param value MNode
-   * @returns MNode
    */
   public set<T = MNode>(name: keyof StoreState, value: T) {
     this.state[name] = value as any;
@@ -109,7 +108,7 @@ class Editor extends BaseService {
 
   /**
    * 获取当前指点节点配置
-   * @param name  'root' | 'page' | 'parent' | 'node' | 'highlightNode' | 'nodes'
+   * @param name  'root' | 'page' | 'parent' | 'node' | 'highlightNode' | 'nodes' | 'stage' | 'modifiedNodeIds' | 'pageLength'
    * @returns MNode
    */
   public get<T = MNode>(name: keyof StoreState): T {
@@ -432,7 +431,6 @@ class Editor extends BaseService {
   /**
    * 删除组件
    * @param {Object} node
-   * @return {Object} 删除的组件配置
    */
   public async remove(nodeOrNodeList: MNode | MNode[]): Promise<void> {
     const nodes = Array.isArray(nodeOrNodeList) ? nodeOrNodeList : [nodeOrNodeList];

package/src/services/history.ts

@@ -18,25 +18,13 @@
 
 import { reactive } from 'vue';
 
-import type { Id, MPage } from '@tmagic/schema';
+import type { MPage } from '@tmagic/schema';
 
+import { HistoryState, StepValue } from '../type';
 import { UndoRedo } from '../utils/undo-redo';
 
 import BaseService from './BaseService';
 
-export interface StepValue {
-  data: MPage;
-  modifiedNodeIds: Map<Id, Id>;
-  nodeId: Id;
-}
-
-export interface HistoryState {
-  pageId?: Id;
-  pageSteps: Record<Id, UndoRedo<StepValue>>;
-  canRedo: boolean;
-  canUndo: boolean;
-}
-
 class History extends BaseService {
   public state = reactive<HistoryState>({
     pageSteps: {},
@@ -76,6 +64,8 @@ class History extends BaseService {
     }
 
     this.setCanUndoRedo();
+
+    this.emit('page-change', this.state.pageSteps[this.state.pageId]);
   }
 
   public empty(): void {

package/src/services/props.ts

@@ -91,7 +91,7 @@ class Props extends BaseService {
    * @param type 组件类型
    * @param value 组件初始值
    */
-  public setPropsValue(type: string, value: MNode) {
+  public async setPropsValue(type: string, value: MNode) {
     this.state.propsValueMap[type] = value;
   }
 

package/src/type.ts

@@ -21,7 +21,12 @@ import type { Component } from 'vue';
 import type { FormConfig } from '@tmagic/form';
 import type { CodeBlockContent, CodeBlockDSL, Id, MApp, MContainer, MNode, MPage } from '@tmagic/schema';
 import type StageCore from '@tmagic/stage';
-import type { ContainerHighlightType, MoveableOptions } from '@tmagic/stage';
+import type {
+  ContainerHighlightType,
+  CustomizeMoveableOptionsCallbackConfig,
+  MoveableOptions,
+  UpdateDragEl,
+} from '@tmagic/stage';
 
 import type { CodeBlockService } from './services/codeBlock';
 import type { ComponentListService } from './services/componentList';
@@ -31,6 +36,7 @@ import type { HistoryService } from './services/history';
 import type { PropsService } from './services/props';
 import type { StorageService } from './services/storage';
 import type { UiService } from './services/ui';
+import type { UndoRedo } from './utils/undo-redo';
 
 export type BeforeAdd = (config: MNode, parent: MContainer) => Promise<MNode> | MNode;
 export type GetConfig = (config: FormConfig) => Promise<FormConfig> | FormConfig;
@@ -56,11 +62,11 @@ export interface StageOptions {
   containerHighlightClassName: string;
   containerHighlightDuration: number;
   containerHighlightType: ContainerHighlightType;
-  render: () => HTMLDivElement;
-  moveableOptions: MoveableOptions | ((core?: StageCore) => MoveableOptions);
+  render: (stage: StageCore) => HTMLDivElement | Promise<HTMLDivElement>;
+  moveableOptions: MoveableOptions | ((config?: CustomizeMoveableOptionsCallbackConfig) => MoveableOptions);
   canSelect: (el: HTMLElement) => boolean | Promise<boolean>;
   isContainer: (el: HTMLElement) => boolean | Promise<boolean>;
-  updateDragEl: (el: HTMLDivElement) => void;
+  updateDragEl: UpdateDragEl;
 }
 
 export interface StoreState {
@@ -164,18 +170,17 @@ export interface MenuButton {
    * 按钮类型
    * button: 只有文字不带边框的按钮
    * text: 纯文本
+   * divider: 分割线
    * dropdown: 下拉菜单
-   * divider: 分隔线
-   * zoom: 放大缩小
    */
-  type: 'button' | 'dropdown' | 'text' | 'divider' | 'zoom';
+  type: 'button' | 'text' | 'divider' | 'dropdown';
   /** 当type为divider时有效，分割线方向, 默认vertical */
   direction?: 'horizontal' | 'vertical';
   /** 展示的文案 */
   text?: string;
   /** 鼠标悬浮是显示的气泡中的文案 */
   tooltip?: string;
-  /** element-plus icon class */
+  /** Vue组件或url */
   icon?: string | Component<{}, {}, any>;
   /** 是否置灰，默认为false */
   disabled?: boolean | ((data?: Services) => boolean);
@@ -183,8 +188,8 @@ export interface MenuButton {
   display?: boolean | ((data?: Services) => boolean);
   /** type为button/dropdown时点击运行的方法 */
   handler?: (data: Services, event: MouseEvent) => Promise<any> | any;
-  /** type为dropdown时，下拉的菜单列表， 或者有子菜单时 */
   className?: string;
+  /** type为dropdown时，下拉的菜单列表， 或者有子菜单时 */
   items?: MenuButton[];
 }
 
@@ -208,8 +213,13 @@ export interface MenuComponent {
  * 'delete': 删除按钮
  * 'undo': 撤销按钮
  * 'redo': 恢复按钮
+ * 'zoom': 'zoom-in', 'zoom-out', 'scale-to-original', 'scale-to-fit' 的集合
  * 'zoom-in': 放大按钮
  * 'zoom-out': 缩小按钮
+ * 'guides': 显示隐藏参考线
+ * 'rule': 显示隐藏标尺
+ * 'scale-to-original': 缩放到实际大小
+ * 'scale-to-fit': 缩放以适应
  */
 export type MenuItem =
   | '/'
@@ -221,6 +231,8 @@ export type MenuItem =
   | 'zoom-out'
   | 'guides'
   | 'rule'
+  | 'scale-to-original'
+  | 'scale-to-fit'
   | MenuButton
   | MenuComponent
   | string;
@@ -238,13 +250,14 @@ export interface MenuBarData {
 export interface SideComponent extends MenuComponent {
   /** 显示文案 */
   text: string;
-  /** element-plus icon class */
+  /** vue组件或url */
   icon: Component<{}, {}, any>;
 }
 
 /**
  * component-list: 组件列表
  * layer: 已选组件树
+ * code-block: 代码块
  */
 export type SideItem = 'component-list' | 'layer' | 'code-block' | SideComponent;
 
@@ -263,8 +276,9 @@ export interface ComponentItem {
   text: string;
   /** 组件类型 */
   type: string;
-  /** element-plus icon class */
-  icon?: string | Component;
+  /** Vue组件或url */
+  icon?: string | Component<{}, {}, any>;
+  /** 新增组件时需要透传到组价节点上的数据 */
   data?: {
     [key: string]: any;
   };
@@ -390,3 +404,16 @@ export interface CodeParamStatement {
   /** 参数类型 */
   type?: string;
 }
+
+export interface StepValue {
+  data: MPage;
+  modifiedNodeIds: Map<Id, Id>;
+  nodeId: Id;
+}
+
+export interface HistoryState {
+  pageId?: Id;
+  pageSteps: Record<Id, UndoRedo<StepValue>>;
+  canRedo: boolean;
+  canUndo: boolean;
+}

package/src/utils/stage.ts

@@ -54,7 +54,7 @@ export const useStage = (stageOptions: StageOptions) => {
     editorService.highlight(el.id);
   });
 
-  stage.on('multiSelect', (els: HTMLElement[]) => {
+  stage.on('multi-select', (els: HTMLElement[]) => {
     editorService.multiSelect(els.map((el) => el.id));
   });
 
@@ -79,7 +79,7 @@ export const useStage = (stageOptions: StageOptions) => {
     editorService.get<StageCore>('stage').select(parent.id);
   });
 
-  stage.on('changeGuides', (e) => {
+  stage.on('change-guides', (e) => {
     uiService.set('showGuides', true);
 
     if (!root.value || !page.value) return;

package/types/Editor.vue.d.ts

@@ -1,8 +1,8 @@
 import { PropType } from 'vue';
+import { EventOption } from '@tmagic/core';
 import type { FormConfig } from '@tmagic/form';
 import type { MApp, MNode } from '@tmagic/schema';
-import type StageCore from '@tmagic/stage';
-import { ContainerHighlightType, MoveableOptions } from '@tmagic/stage';
+import StageCore, { ContainerHighlightType, CustomizeMoveableOptionsCallbackConfig, MoveableOptions, UpdateDragEl } from '@tmagic/stage';
 import type { ComponentGroup, MenuBarData, MenuButton, MenuComponent, Services, SideBarData, StageRect } from './type';
 declare const _default: import("vue").DefineComponent<{
     /** 页面初始值 */
@@ -20,14 +20,6 @@ declare const _default: import("vue").DefineComponent<{
     sidebar: {
         type: PropType<SideBarData>;
     };
-    layerContentMenu: {
-        type: PropType<(MenuButton | MenuComponent)[]>;
-        default: () => never[];
-    };
-    stageContentMenu: {
-        type: PropType<(MenuButton | MenuComponent)[]>;
-        default: () => never[];
-    };
     /** 顶部工具栏配置 */
     menu: {
         type: PropType<MenuBarData>;
@@ -36,9 +28,19 @@ declare const _default: import("vue").DefineComponent<{
             right: never[];
         };
     };
+    /** 组件树右键菜单 */
+    layerContentMenu: {
+        type: PropType<(MenuButton | MenuComponent)[]>;
+        default: () => never[];
+    };
+    /** 画布右键菜单 */
+    stageContentMenu: {
+        type: PropType<(MenuButton | MenuComponent)[]>;
+        default: () => never[];
+    };
     /** 中间工作区域中画布渲染的内容 */
     render: {
-        type: PropType<() => HTMLDivElement>;
+        type: PropType<(stage: StageCore) => HTMLDivElement | Promise<HTMLDivElement>>;
     };
     /** 中间工作区域中画布通过iframe渲染时的页面url */
     runtimeUrl: StringConstructor;
@@ -56,12 +58,15 @@ declare const _default: import("vue").DefineComponent<{
     };
     /** 组件联动事件选项列表 */
     eventMethodList: {
-        type: ObjectConstructor;
+        type: PropType<Record<string, {
+            events: EventOption[];
+            methods: EventOption[];
+        }>>;
         default: () => {};
     };
     /** 画布中组件选中框的移动范围 */
     moveableOptions: {
-        type: PropType<MoveableOptions | ((core?: StageCore) => MoveableOptions)>;
+        type: PropType<MoveableOptions | ((config?: CustomizeMoveableOptionsCallbackConfig) => MoveableOptions)>;
     };
     /** 编辑器初始化时默认选中的组件ID */
     defaultSelected: {
@@ -95,7 +100,7 @@ declare const _default: import("vue").DefineComponent<{
         default: () => {};
     };
     updateDragEl: {
-        type: PropType<(el: HTMLDivElement, target: HTMLElement) => void>;
+        type: PropType<UpdateDragEl>;
     };
 }, Services, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("update:modelValue" | "props-panel-mounted")[], "update:modelValue" | "props-panel-mounted", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     /** 页面初始值 */
@@ -113,14 +118,6 @@ declare const _default: import("vue").DefineComponent<{
     sidebar: {
         type: PropType<SideBarData>;
     };
-    layerContentMenu: {
-        type: PropType<(MenuButton | MenuComponent)[]>;
-        default: () => never[];
-    };
-    stageContentMenu: {
-        type: PropType<(MenuButton | MenuComponent)[]>;
-        default: () => never[];
-    };
     /** 顶部工具栏配置 */
     menu: {
         type: PropType<MenuBarData>;
@@ -129,9 +126,19 @@ declare const _default: import("vue").DefineComponent<{
             right: never[];
         };
     };
+    /** 组件树右键菜单 */
+    layerContentMenu: {
+        type: PropType<(MenuButton | MenuComponent)[]>;
+        default: () => never[];
+    };
+    /** 画布右键菜单 */
+    stageContentMenu: {
+        type: PropType<(MenuButton | MenuComponent)[]>;
+        default: () => never[];
+    };
     /** 中间工作区域中画布渲染的内容 */
     render: {
-        type: PropType<() => HTMLDivElement>;
+        type: PropType<(stage: StageCore) => HTMLDivElement | Promise<HTMLDivElement>>;
     };
     /** 中间工作区域中画布通过iframe渲染时的页面url */
     runtimeUrl: StringConstructor;
@@ -149,12 +156,15 @@ declare const _default: import("vue").DefineComponent<{
     };
     /** 组件联动事件选项列表 */
     eventMethodList: {
-        type: ObjectConstructor;
+        type: PropType<Record<string, {
+            events: EventOption[];
+            methods: EventOption[];
+        }>>;
         default: () => {};
     };
     /** 画布中组件选中框的移动范围 */
     moveableOptions: {
-        type: PropType<MoveableOptions | ((core?: StageCore) => MoveableOptions)>;
+        type: PropType<MoveableOptions | ((config?: CustomizeMoveableOptionsCallbackConfig) => MoveableOptions)>;
     };
     /** 编辑器初始化时默认选中的组件ID */
     defaultSelected: {
@@ -188,7 +198,7 @@ declare const _default: import("vue").DefineComponent<{
         default: () => {};
     };
     updateDragEl: {
-        type: PropType<(el: HTMLDivElement, target: HTMLElement) => void>;
+        type: PropType<UpdateDragEl>;
     };
 }>> & {
     "onUpdate:modelValue"?: ((...args: any[]) => any) | undefined;
@@ -203,7 +213,10 @@ declare const _default: import("vue").DefineComponent<{
     autoScrollIntoView: boolean;
     propsConfigs: Record<string, FormConfig>;
     propsValues: Record<string, MNode>;
-    eventMethodList: Record<string, any>;
+    eventMethodList: Record<string, {
+        events: EventOption[];
+        methods: EventOption[];
+    }>;
     canSelect: (el: HTMLElement) => boolean | Promise<boolean>;
     isContainer: (el: HTMLElement) => boolean | Promise<boolean>;
     containerHighlightClassName: string;

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

@@ -1,3 +1,4 @@
+import { nextTick } from 'vue';
 import { MenuButton, MenuComponent } from '../../type';
 declare const _default: {
     new (...args: any[]): {
@@ -39,7 +40,7 @@ declare const _default: {
             errorCaptured?: (((err: unknown, instance: import("vue").ComponentPublicInstance<{}, {}, {}, {}, {}, {}, {}, {}, false, import("vue").ComponentOptionsBase<any, any, any, any, any, any, any, any, any, {}>> | null, info: string) => boolean | void) | ((err: unknown, instance: import("vue").ComponentPublicInstance<{}, {}, {}, {}, {}, {}, {}, {}, false, import("vue").ComponentOptionsBase<any, any, any, any, any, any, any, any, any, {}>> | null, info: string) => boolean | void)[]) | undefined;
         };
         $forceUpdate: () => void;
-        $nextTick: typeof import("vue").nextTick;
+        $nextTick: typeof nextTick;
         $watch(source: string | Function, cb: Function, options?: import("vue").WatchOptions<boolean> | undefined): import("vue").WatchStopHandle;
     } & Readonly<import("vue").ExtractPropTypes<__VLS_TypePropsToRuntimeProps<{
         stageContentMenu: (MenuButton | MenuComponent)[];

package/types/services/editor.d.ts

@@ -1,6 +1,5 @@
 import type { CodeBlockDSL, Id, MContainer, MNode } from '@tmagic/schema';
-import { StepValue } from '../services/history';
-import type { AddMNode, EditorNodeInfo, PastePosition, StoreState } from '../type';
+import type { AddMNode, EditorNodeInfo, PastePosition, StepValue, StoreState } from '../type';
 import { LayerOffset, Layout } from '../type';
 import BaseService from './BaseService';
 declare class Editor extends BaseService {
@@ -9,14 +8,13 @@ declare class Editor extends BaseService {
     constructor();
     /**
      * 设置当前指点节点配置
-     * @param name 'root' | 'page' | 'parent' | 'node' | 'highlightNode' | 'nodes'
+     * @param name 'root' | 'page' | 'parent' | 'node' | 'highlightNode' | 'nodes' | 'stage' | 'modifiedNodeIds' | 'pageLength'
      * @param value MNode
-     * @returns MNode
      */
     set<T = MNode>(name: keyof StoreState, value: T): void;
     /**
      * 获取当前指点节点配置
-     * @param name  'root' | 'page' | 'parent' | 'node' | 'highlightNode' | 'nodes'
+     * @param name  'root' | 'page' | 'parent' | 'node' | 'highlightNode' | 'nodes' | 'stage' | 'modifiedNodeIds' | 'pageLength'
      * @returns MNode
      */
     get<T = MNode>(name: keyof StoreState): T;
@@ -77,7 +75,6 @@ declare class Editor extends BaseService {
     /**
      * 删除组件
      * @param {Object} node
-     * @return {Object} 删除的组件配置
      */
     remove(nodeOrNodeList: MNode | MNode[]): Promise<void>;
     doUpdate(config: MNode): Promise<MNode>;

package/types/services/history.d.ts

@@ -1,21 +1,11 @@
-import type { Id, MPage } from '@tmagic/schema';
+import type { MPage } from '@tmagic/schema';
+import { StepValue } from '../type';
 import { UndoRedo } from '../utils/undo-redo';
 import BaseService from './BaseService';
-export interface StepValue {
-    data: MPage;
-    modifiedNodeIds: Map<Id, Id>;
-    nodeId: Id;
-}
-export interface HistoryState {
-    pageId?: Id;
-    pageSteps: Record<Id, UndoRedo<StepValue>>;
-    canRedo: boolean;
-    canUndo: boolean;
-}
 declare class History extends BaseService {
     state: {
-        pageId?: Id | undefined;
-        pageSteps: Record<Id, UndoRedo<StepValue>>;
+        pageId?: import("@tmagic/schema").Id | undefined;
+        pageSteps: Record<import("@tmagic/schema").Id, UndoRedo<StepValue>>;
         canRedo: boolean;
         canUndo: boolean;
     };

package/types/services/props.d.ts

@@ -66,7 +66,7 @@ declare class Props extends BaseService {
      * @param type 组件类型
      * @param value 组件初始值
      */
-    setPropsValue(type: string, value: MNode): void;
+    setPropsValue(type: string, value: MNode): Promise<void>;
     /**
      * 获取指定类型的组件初始值
      * @param type 组件类型