@leafer-in/editor 1.0.0-rc.27 → 1.0.0-rc.28

package/src/Editor.ts

@@ -18,6 +18,7 @@ import { onTarget, onHover } from './editor/target'
 import { targetAttr } from './decorator/data'
 import { EditorHelper } from './helper/EditorHelper'
 import { EditDataHelper } from './helper/EditDataHelper'
+import { simulate } from './editor/simulate'
 import { updateCursor } from './editor/cursor'
 import { EditToolCreator } from './tool/EditToolCreator'
 import { InnerEditorEvent } from './event/InnerEditorEvent'
@@ -27,7 +28,11 @@ import { EditorGroupEvent } from './event/EditorGroupEvent'
 export class Editor extends Group implements IEditor {
 
     public config = config
-    public mergeConfig = config // 实际使用
+
+    public get mergeConfig(): IEditorConfig {
+        const { element, config } = this
+        return this.single && element.editConfig ? { ...config, ...element.editConfig } : config // 实时合并，后期可优化
+    }
 
     @targetAttr(onHover)
     public hoverTarget: IUI
@@ -116,6 +121,11 @@ export class Editor extends Group implements IEditor {
         }
     }
 
+    public updateEditBox(): void {
+        if (this.multiple) simulate(this)
+        this.update()
+    }
+
     public updateEditTool(): void {
         const tool = this.editTool
         if (tool) {
@@ -127,8 +137,6 @@ export class Editor extends Group implements IEditor {
         if (this.editing) {
             const tag = this.single ? this.list[0].editOuter as string : 'EditTool'
             this.editTool = this.editToolList[tag] = this.editToolList[tag] || EditToolCreator.get(tag, this)
-            const { editConfig } = this.element
-            this.mergeConfig = this.single && editConfig ? { ...this.mergeConfig, ...editConfig } : this.config
             this.editBox.load()
             this.editTool.load()
         }

package/types/index.d.ts

@@ -41,7 +41,7 @@ declare class EditSelect extends Group implements IEditSelect {
 
 declare class Editor extends Group implements IEditor {
     config: IEditorConfig;
-    mergeConfig: IEditorConfig;
+    get mergeConfig(): IEditorConfig;
     hoverTarget: IUI;
     target: IUI | IUI[];
     get list(): IUI[];
@@ -71,6 +71,7 @@ declare class Editor extends Group implements IEditor {
     removeItem(item: IUI): void;
     shiftItem(item: IUI): void;
     update(): void;
+    updateEditBox(): void;
     updateEditTool(): void;
     getEditSize(_ui: IUI): IEditSize;
     onMove(e: DragEvent): void;
@@ -291,7 +292,7 @@ declare const EditorHelper: {
 };
 
 declare const EditDataHelper: {
-    getScaleData(bounds: IBoundsData, direction: Direction9, pointMove: IPointData, lockRatio: boolean | 'corner', around: IAround): IEditorScaleEvent;
+    getScaleData(bounds: IBoundsData, direction: Direction9, pointMove: IPointData, lockRatio: boolean | "corner", around: IAround): IEditorScaleEvent;
     getRotateData(bounds: IBoundsData, direction: Direction9, current: IPointData, last: IPointData, around: IAround): IEditorRotateEvent;
     getSkewData(bounds: IBoundsData, direction: Direction9, move: IPointData, around: IAround): IEditorSkewEvent;
     getAround(around: IAround, altKey: boolean): IAround;