@tmagic/editor 1.1.0-beta.2 → 1.1.0-beta.3

package/package.json

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

package/src/layouts/sidebar/ComponentListPanel.vue

@@ -41,8 +41,7 @@ import { computed, defineComponent, inject, ref } from 'vue';
 import serialize from 'serialize-javascript';
 
 import type StageCore from '@tmagic/stage';
-import { GHOST_EL_ID_PREFIX } from '@tmagic/stage';
-import { addClassName, removeClassNameByClassName } from '@tmagic/utils';
+import { removeClassNameByClassName } from '@tmagic/utils';
 
 import MIcon from '@editor/components/Icon.vue';
 import type { ComponentGroup, ComponentItem, Services, StageOptions } from '@editor/type';
@@ -125,19 +124,9 @@ export default defineComponent({
           return;
         }
 
-        if (timeout) return;
-
-        timeout = globalThis.setTimeout(async () => {
-          if (!stageOptions || !stage.value) return;
-          const doc = stage.value.renderer.contentWindow?.document;
-          const els = stage.value.getElementsFromPoint(e);
-          for (const el of els) {
-            if (doc && !el.id.startsWith(GHOST_EL_ID_PREFIX) && (await stageOptions.isContainer(el))) {
-              addClassName(el, doc, stageOptions?.containerHighlightClassName);
-              break;
-            }
-          }
-        }, stageOptions?.containerHighlightDuration);
+        if (timeout || !stage.value) return;
+
+        timeout = stage.value.getAddContainerHighlightClassNameTimeout(e);
       },
     };
   },

package/src/services/BaseService.ts

@@ -36,18 +36,13 @@ const doAction = async (
     let beforeArgs = args;
 
     for (const beforeMethod of scope.pluginOptionsList[beforeMethodName]) {
-      let beforeReturnValue = (await beforeMethod(...beforeArgs)) || [];
+      beforeArgs = (await beforeMethod(...beforeArgs)) || [];
 
-      if (isError(beforeReturnValue)) throw beforeReturnValue;
+      if (isError(beforeArgs)) throw beforeArgs;
 
-      if (!Array.isArray(beforeReturnValue)) {
-        beforeReturnValue = [beforeReturnValue];
+      if (!Array.isArray(beforeArgs)) {
+        beforeArgs = [beforeArgs];
       }
-
-      beforeArgs = beforeArgs.map((v: any, index: number) => {
-        if (typeof beforeReturnValue[index] === 'undefined') return v;
-        return beforeReturnValue[index];
-      });
     }
 
     let returnValue: any = await fn(beforeArgs, sourceMethod.bind(scope));

package/src/services/editor.ts

@@ -40,7 +40,6 @@ import {
   isFixed,
   setLayout,
 } from '@editor/utils/editor';
-import { log } from '@editor/utils/logger';
 
 import BaseService from './BaseService';
 
@@ -90,7 +89,6 @@ class Editor extends BaseService {
    */
   public set<T = MNode>(name: keyof StoreState, value: T) {
     this.state[name] = value as any;
-    log('store set ', name, ' ', value);
 
     if (name === 'root') {
       this.state.pageLength = (value as unknown as MApp)?.items?.length || 0;
@@ -305,7 +303,7 @@ class Editor extends BaseService {
     const stage = this.get<StageCore | null>('stage');
     const root = this.get<MApp>('root');
 
-    await stage?.add({ config: cloneDeep(newNode), root: cloneDeep(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);

package/src/utils/editor.ts

@@ -223,7 +223,8 @@ export const fixNodeLeft = (config: MNode, parent: MContainer, doc?: Document) =
   const el = doc.getElementById(`${config.id}`);
   const parentEl = doc.getElementById(`${parent.id}`);
 
-  if (el && parentEl && el.offsetWidth + config.style?.left > parentEl.offsetWidth) {
+  const left = Number(config.style?.left) || 0;
+  if (el && parentEl && el.offsetWidth + left > parentEl.offsetWidth) {
     return parentEl.offsetWidth - el.offsetWidth;
   }