@tmagic/editor 1.2.0-beta.20 → 1.2.0-beta.21

package/package.json

@@ -1,18 +1,19 @@
 {
-  "version": "1.2.0-beta.20",
+  "version": "1.2.0-beta.21",
   "name": "@tmagic/editor",
+  "type": "module",
   "sideEffects": [
     "dist/*",
     "src/theme/*"
   ],
-  "main": "dist/tmagic-editor.umd.js",
-  "module": "dist/tmagic-editor.mjs",
+  "main": "dist/tmagic-editor.umd.cjs",
+  "module": "dist/tmagic-editor.js",
   "style": "dist/style.css",
   "types": "types/index.d.ts",
   "exports": {
     ".": {
-      "import": "./dist/tmagic-editor.mjs",
-      "require": "./dist/tmagic-editor.umd.js"
+      "import": "./dist/tmagic-editor.js",
+      "require": "./dist/tmagic-editor.umd.cjs"
     },
     "./dist/style.css": {
       "import": "./dist/style.css",
@@ -45,12 +46,12 @@
   "dependencies": {
     "@babel/core": "^7.18.0",
     "@element-plus/icons-vue": "^2.0.9",
-    "@tmagic/core": "1.2.0-beta.20",
-    "@tmagic/design": "1.2.0-beta.20",
-    "@tmagic/form": "1.2.0-beta.20",
-    "@tmagic/schema": "1.2.0-beta.20",
-    "@tmagic/stage": "1.2.0-beta.20",
-    "@tmagic/utils": "1.2.0-beta.20",
+    "@tmagic/core": "1.2.0-beta.21",
+    "@tmagic/design": "1.2.0-beta.21",
+    "@tmagic/form": "1.2.0-beta.21",
+    "@tmagic/schema": "1.2.0-beta.21",
+    "@tmagic/stage": "1.2.0-beta.21",
+    "@tmagic/utils": "1.2.0-beta.21",
     "buffer": "^6.0.3",
     "color": "^3.1.3",
     "events": "^3.3.0",
@@ -62,8 +63,8 @@
     "vue": "^3.2.37"
   },
   "peerDependencies": {
-    "@tmagic/design": "1.2.0-beta.20",
-    "@tmagic/form": "1.2.0-beta.20",
+    "@tmagic/design": "1.2.0-beta.21",
+    "@tmagic/form": "1.2.0-beta.21",
     "monaco-editor": "^0.34.0",
     "vue": "^3.2.37"
   },

package/src/Editor.vue

@@ -316,13 +316,12 @@ export default defineComponent({
     );
 
     onUnmounted(() => {
-      editorService.destroy();
-      historyService.destroy();
-      propsService.destroy();
-      uiService.destroy();
-      componentListService.destroy();
-      storageService.destroy();
-      codeBlockService.destroy();
+      editorService.resetState();
+      historyService.resetState();
+      propsService.resetState();
+      uiService.resetState();
+      componentListService.resetState();
+      codeBlockService.resetState();
     });
 
     const services: Services = {

package/src/components/Layout.vue

@@ -48,7 +48,7 @@ const props = withDefaults(
 const el = ref<HTMLElement>();
 
 const hasLeft = computed(() => typeof props.left !== 'undefined');
-const hasRight = computed(() => typeof props.left !== 'undefined');
+const hasRight = computed(() => typeof props.right !== 'undefined');
 
 const getCenterWidth = (clientWidth: number, left: number, right: number) => {
   let center = clientWidth - left - right;

package/src/services/BaseService.ts

@@ -169,6 +169,11 @@ export default class extends EventEmitter {
     });
   }
 
+  public removeAllPlugins() {
+    this.pluginOptionsList = {};
+    this.middleware = {};
+  }
+
   private async doTask() {
     this.doingTask = true;
     let task = this.taskList.shift();

package/src/services/codeBlock.ts

@@ -344,7 +344,7 @@ class CodeBlock extends BaseService {
     this.setCodeDsl(codeDsl);
   }
 
-  public destroy(): void {
+  public resetState() {
     this.state.isShowCodeEditor = false;
     this.state.codeDsl = null;
     this.state.id = '';
@@ -354,6 +354,12 @@ class CodeBlock extends BaseService {
     this.state.undeletableList = [];
   }
 
+  public destroy(): void {
+    this.resetState();
+    this.removeAllListeners();
+    this.removeAllPlugins();
+  }
+
   /**
    * 删除组件时 如果是容器 需要遍历删除其包含节点的绑定信息
    * @param {MNode} node 节点信息

package/src/services/componentList.ts

@@ -42,9 +42,14 @@ class ComponentList extends BaseService {
     return this.state.list;
   }
 
-  public destroy() {
+  public resetState() {
     this.state.list = [];
+  }
+
+  public destroy() {
+    this.resetState();
     this.removeAllListeners();
+    this.removeAllPlugins();
   }
 }
 

package/src/services/editor.ts

@@ -207,7 +207,7 @@ class Editor extends BaseService {
     if (page) {
       historyService.changePage(toRaw(page));
     } else {
-      historyService.empty();
+      historyService.resetState();
     }
 
     if (node?.id) {
@@ -762,8 +762,7 @@ class Editor extends BaseService {
     });
   }
 
-  public destroy() {
-    this.removeAllListeners();
+  public resetState() {
     this.set('root', null);
     this.set('node', null);
     this.set('nodes', []);
@@ -775,6 +774,12 @@ class Editor extends BaseService {
     this.set('pageLength', new Map());
   }
 
+  public destroy() {
+    this.removeAllListeners();
+    this.resetState();
+    this.removeAllPlugins();
+  }
+
   public resetModifiedNodeId() {
     this.get<Map<Id, Id>>('modifiedNodeIds').clear();
   }

package/src/services/events.ts

@@ -76,10 +76,15 @@ class Events extends BaseService {
     return cloneDeep(methodMap[type] || DEFAULT_METHODS);
   }
 
-  public destroy() {
+  public resetState() {
     eventMap = reactive({});
     methodMap = reactive({});
+  }
+
+  public destroy() {
+    this.resetState();
     this.removeAllListeners();
+    this.removeAllPlugins();
   }
 }
 

package/src/services/history.ts

@@ -68,7 +68,7 @@ class History extends BaseService {
     this.emit('page-change', this.state.pageSteps[this.state.pageId]);
   }
 
-  public empty(): void {
+  public resetState(): void {
     this.state.pageId = undefined;
     this.state.pageSteps = {};
     this.state.canRedo = false;
@@ -100,8 +100,9 @@ class History extends BaseService {
   }
 
   public destroy(): void {
-    this.empty();
+    this.resetState();
     this.removeAllListeners();
+    this.removeAllPlugins();
   }
 
   private getUndoRedo() {

package/src/services/props.ts

@@ -171,10 +171,15 @@ class Props extends BaseService {
         };
   }
 
-  public destroy() {
+  public resetState() {
     this.state.propsConfigMap = {};
     this.state.propsValueMap = {};
+  }
+
+  public destroy() {
+    this.resetState();
     this.removeAllListeners();
+    this.removeAllPlugins();
   }
 
   /**

package/src/services/storage.ts

@@ -109,6 +109,7 @@ export class WebStorage extends BaseService {
 
   public destroy() {
     this.removeAllListeners();
+    this.removeAllPlugins();
   }
 
   private getValueAndProtocol(value: string | null) {

package/src/services/ui.ts

@@ -97,8 +97,20 @@ class Ui extends BaseService {
     return Math.min((width - 60) / stageWidth || 1, (height - 80) / stageHeight || 1);
   }
 
+  public resetState() {
+    this.set('showSrc', false);
+    this.set('uiSelectMode', false);
+    this.set('zoom', 1);
+    this.set('stageContainerRect', {
+      width: 0,
+      height: 0,
+    });
+  }
+
   public destroy() {
+    this.resetState();
     this.removeAllListeners();
+    this.removeAllPlugins();
   }
 
   private async setStageRect(value: StageRect) {

package/types/services/BaseService.d.ts

@@ -55,5 +55,6 @@ export default class extends EventEmitter {
     constructor(methods?: string[], serialMethods?: string[]);
     use(options: Record<string, Function>): void;
     usePlugin(options: Record<string, Function>): void;
+    removeAllPlugins(): void;
     private doTask;
 }

package/types/services/codeBlock.d.ts

@@ -155,6 +155,7 @@ declare class CodeBlock extends BaseService {
      * @returns void
      */
     deleteCompsInRelation(node: MNode): Promise<void>;
+    resetState(): void;
     destroy(): void;
     /**
      * 删除组件时 如果是容器 需要遍历删除其包含节点的绑定信息

package/types/services/componentList.d.ts

@@ -8,6 +8,7 @@ declare class ComponentList extends BaseService {
      */
     setList(componentGroupList: ComponentGroup[]): void;
     getList(): ComponentGroup[];
+    resetState(): void;
     destroy(): void;
 }
 export declare type ComponentListService = ComponentList;

package/types/services/editor.d.ts

@@ -133,6 +133,7 @@ declare class Editor extends BaseService {
      */
     redo(): Promise<StepValue | null>;
     move(left: number, top: number): Promise<void>;
+    resetState(): void;
     destroy(): void;
     resetModifiedNodeId(): void;
     /**

package/types/services/events.d.ts

@@ -10,6 +10,7 @@ declare class Events extends BaseService {
     setMethods(methods: Record<string, EventOption[]>): void;
     setMethod(type: string, method: EventOption[]): void;
     getMethod(type: string): EventOption[];
+    resetState(): void;
     destroy(): void;
 }
 export declare type EventsService = Events;

package/types/services/history.d.ts

@@ -12,7 +12,7 @@ declare class History extends BaseService {
     constructor();
     reset(): void;
     changePage(page: MPage): void;
-    empty(): void;
+    resetState(): void;
     push(state: StepValue): StepValue | null;
     undo(): StepValue | null;
     redo(): StepValue | null;

package/types/services/props.d.ts

@@ -97,6 +97,7 @@ declare class Props extends BaseService {
         layout?: undefined;
         items?: undefined;
     }>;
+    resetState(): void;
     destroy(): void;
     /**
      * 生成指定位数的GUID，无【-】格式

package/types/services/ui.d.ts

@@ -28,6 +28,7 @@ declare class Ui extends BaseService {
     get<T>(name: keyof typeof state): T;
     zoom(zoom: number): Promise<void>;
     calcZoom(): Promise<number>;
+    resetState(): void;
     destroy(): void;
     private setStageRect;
 }