@leafer-in/editor 2.2.10 → 2.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer-in/editor",
-  "version": "2.2.10",
+  "version": "2.3.0",
   "description": "@leafer-in/editor",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -34,10 +34,10 @@
     "leaferjs"
   ],
   "peerDependencies": {
-    "@leafer-ui/draw": "^2.2.10",
-    "@leafer-ui/core": "^2.2.10",
-    "@leafer-in/resize": "^2.2.10",
-    "@leafer-ui/interface": "^2.2.10",
-    "@leafer-in/interface": "^2.2.10"
+    "@leafer-ui/draw": "^2.3.0",
+    "@leafer-ui/core": "^2.3.0",
+    "@leafer-in/resize": "^2.3.0",
+    "@leafer-ui/interface": "^2.3.0",
+    "@leafer-in/interface": "^2.3.0"
   }
 }

package/src/decorator/data.ts

@@ -1,5 +1,5 @@
 import { IFunction, ILeaf, IObject, IUI, } from '@leafer-ui/interface'
-import { defineKey, isNull, isArray, isObject, isUndefined, DataHelper } from '@leafer-ui/draw'
+import { defineKey, isNull, isArray, isObject, isUndefined, DataHelper, LeafHelper } from '@leafer-ui/draw'
 
 import { IEditor, IInnerEditor } from '@leafer-in/interface'
 
@@ -22,7 +22,24 @@ export function targetAttr(fn: IFunction) {
 
                         const isSelect = key === 'target'
                         if (isSelect) {
-                            const { beforeSelect } = t.config
+                            const { beforeSelect, skipNested } = t.config
+
+                            if (isArray(value)) {
+                                if (skipNested) { // 过滤嵌套关系的元素
+                                    const first = value[0]
+                                    if (value.some(item => item.__level !== first.__level)) {
+                                        value.sort((a, b) => a.__level - b.__level) // 顺序
+                                        const firstLevel = value[0].__level, filterValue: IUI[] = []
+                                        value.forEach(item => { if (!filterValue.length || !filterValue.some(parent => LeafHelper.hasParent(item, parent, firstLevel))) filterValue.push(item) })
+                                        value = filterValue
+                                    }
+                                }
+
+                                if (value.length > 1 && value.some(item => item.locked || item.editable === 'single')) {
+                                    value = value.filter(item => !(item.locked || item.editable === 'single')) // 锁定、单选元素不能参与多选
+                                }
+                            }
+
                             if (beforeSelect) {
                                 const check = beforeSelect({ target: value })
                                 if (isObject(check)) value = check
@@ -31,10 +48,6 @@ export function targetAttr(fn: IFunction) {
 
                             if (t.hasDimOthers) t.cancelDimOthers()
 
-                            if (isArray(value) && value.length > 1 && value.some(item => item.locked || item.editable === 'single')) {
-                                value = value.filter(item => !(item.locked || item.editable === 'single')) // 锁定、单选元素不能参与多选
-                            }
-
                             if (t.single) {
                                 delete t.element.syncEventer // 重置 EditBox.load() 同步事件设置
                                 delete t.element.__world.ignorePixelSnap // 重置 EditBox.load() 忽略对齐像素设置

package/src/display/EditBox.ts

@@ -354,6 +354,7 @@ export class EditBox extends Group implements IEditBox {
             // alt复制钩子
             if (e.altKey && onCopy && onCopy() && this.editor.single) this.app.interaction.replaceDownTarget(this.target)
             moveable && (this.moving = true)
+            if (this.moving) this.widgetsMoveStart(e)
         } else {
             if (pointType.includes('rotate') || this.isHoldRotateKey(e) || !resizeable) {
                 rotateable && (this.rotating = true)
@@ -370,6 +371,7 @@ export class EditBox extends Group implements IEditBox {
         const { transformTool, moving, resizing, rotating, skewing } = this
         if (moving) {
             transformTool.onMove(e)
+            this.widgetsMove(e)
         } else if (resizing || rotating || skewing) {
             const point = e.current as IEditPoint
             if (point.pointType) this.enterPoint = point// 防止变化
@@ -381,6 +383,7 @@ export class EditBox extends Group implements IEditBox {
     }
 
     public onDragEnd(e: DragEvent): void {
+        if (this.moving) this.widgetsMoveEnd(e)
         this.onTransformEnd(e)
         this.dragPoint = null
     }
@@ -418,9 +421,9 @@ export class EditBox extends Group implements IEditBox {
             if (isString(this.mergedConfig.moveable)) {
                 this.gesturing = this.moving = true
                 switch (e.type) {
-                    case MoveEvent.START: this.onTransformStart(e); break
-                    case MoveEvent.END: this.onTransformEnd(e); break
-                    default: this.transformTool.onMove(e)
+                    case MoveEvent.START: this.onTransformStart(e), this.widgetsMoveStart(e); break
+                    case MoveEvent.END: this.onTransformEnd(e), this.widgetsMoveEnd(e); break
+                    default: this.transformTool.onMove(e), this.widgetsMove(e)
                 }
             }
         }
@@ -583,6 +586,10 @@ export class EditBox extends Group implements IEditBox {
         Object.values(EditBox.WidgetList).forEach(item => { this.widgets.push(new item(this)) })
     }
 
+    public getWidget(name: string): IEditBoxWidget {
+        return this.widgets.find(item => item.tag === name)
+    }
+
     protected loadWidgets(): void {
         this.widgets.forEach(item => item.onLoad())
     }
@@ -595,6 +602,18 @@ export class EditBox extends Group implements IEditBox {
         this.widgets.forEach(item => item.onUnload())
     }
 
+    protected widgetsMoveStart(e: DragEvent | MoveEvent): void {
+        this.widgets.forEach(item => item.onMove && item.onMoveStart(e))
+    }
+
+    protected widgetsMove(e: DragEvent | MoveEvent): void {
+        this.widgets.forEach(item => item.onMove && item.onMove(e))
+    }
+
+    protected widgetsMoveEnd(e: DragEvent | MoveEvent): void {
+        this.widgets.forEach(item => item.onMove && item.onMoveEnd(e))
+    }
+
     protected destroyWidgets(): void {
         this.widgets.forEach(item => item.onDestroy())
     }

package/src/tool/EditTool.ts

@@ -19,8 +19,9 @@ export class EditTool extends InnerEditor implements IEditTool {
     // 操作
 
     public onMove(e: IEditorMoveEvent): void {
-        if (this.isMotionElement) return this.onMoveMotion(e)
-        else if (this.isFlowElement) return this.onMoveFlow(e)
+        if (this.isMotionElement && this.onMoveMotion(e)) return
+        if (this.isFlowElement && this.onMoveFlow(e)) return
+
         const { moveX, moveY, editor } = e
         const { app, list } = editor
         app.lockLayout()
@@ -29,6 +30,8 @@ export class EditTool extends InnerEditor implements IEditTool {
     }
 
     public onScale(e: IEditorScaleEvent): void {
+        if (this.isFlowElement && this.onScaleFlow(e)) return
+
         const { scaleX, scaleY, transform, worldOrigin, editor } = e
         const { app, list } = editor
         app.lockLayout()
@@ -41,6 +44,8 @@ export class EditTool extends InnerEditor implements IEditTool {
     }
 
     public onRotate(e: IEditorRotateEvent): void {
+        if (this.isFlowElement && this.onRotateFlow(e)) return
+
         const { rotation, transform, worldOrigin, editor } = e
         const { app, list } = editor
         app.lockLayout()
@@ -53,6 +58,8 @@ export class EditTool extends InnerEditor implements IEditTool {
     }
 
     public onSkew(e: IEditorSkewEvent): void {
+        if (this.isFlowElement && this.onSkewFlow(e)) return
+
         const { skewX, skewY, transform, worldOrigin, editor } = e
         const { app, list } = editor
         app.lockLayout()
@@ -89,6 +96,9 @@ export interface EditTool {
     readonly isMotionElement?: boolean
     readonly isFlowElement?: boolean
 
-    onMoveMotion(e: IEditorMoveEvent): void
-    onMoveFlow(e: IEditorMoveEvent): void
+    onMoveMotion(e: IEditorMoveEvent): boolean
+    onMoveFlow(e: IEditorMoveEvent): boolean
+    onScaleFlow(e: IEditorScaleEvent): boolean
+    onRotateFlow(e: IEditorRotateEvent): boolean
+    onSkewFlow(e: IEditorSkewEvent): boolean
 }

package/types/index.d.ts

@@ -218,9 +218,13 @@ declare class EditBox extends Group implements IEditBox {
     protected widgets: IEditBoxWidget[];
     static registerWidget(Widget: IObject): void;
     protected createWidgets(): void;
+    getWidget(name: string): IEditBoxWidget;
     protected loadWidgets(): void;
     protected updateWidgets(): void;
     protected unloadWidgets(): void;
+    protected widgetsMoveStart(e: DragEvent | MoveEvent): void;
+    protected widgetsMove(e: DragEvent | MoveEvent): void;
+    protected widgetsMoveEnd(e: DragEvent | MoveEvent): void;
     protected destroyWidgets(): void;
     destroy(): void;
 }
@@ -386,8 +390,11 @@ declare class EditTool extends InnerEditor implements IEditTool {
 interface EditTool {
     readonly isMotionElement?: boolean;
     readonly isFlowElement?: boolean;
-    onMoveMotion(e: IEditorMoveEvent): void;
-    onMoveFlow(e: IEditorMoveEvent): void;
+    onMoveMotion(e: IEditorMoveEvent): boolean;
+    onMoveFlow(e: IEditorMoveEvent): boolean;
+    onScaleFlow(e: IEditorScaleEvent): boolean;
+    onRotateFlow(e: IEditorRotateEvent): boolean;
+    onSkewFlow(e: IEditorSkewEvent): boolean;
 }
 
 declare class LineEditTool extends EditTool {