@leafer-in/editor 1.9.2 → 1.9.4

package/package.json

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

package/src/Editor.ts

@@ -141,11 +141,22 @@ export class Editor extends Group implements IEditor {
         this.unloadEditTool()
 
         if (this.editing) {
-            const name = this.element.editOuter || 'EditTool'
-            const tool = this.editTool = this.editToolList[name] = this.editToolList[name] || EditToolCreator.get(name, this)
-            this.editBox.load()
-            tool.load()
-            this.update()
+            const target = this.element
+            let name = target.editOuter || 'EditTool'
+
+            const { beforeEditOuter } = this.mergeConfig
+            if (beforeEditOuter) {
+                const check = beforeEditOuter({ target, name })
+                if (isString(check)) name = check
+                else if (check === false) return
+            }
+
+            if (EditToolCreator.list[name]) {
+                const tool = this.editTool = this.editToolList[name] = this.editToolList[name] || EditToolCreator.get(name, this)
+                this.editBox.load()
+                tool.load()
+                this.update()
+            }
         }
     }
 
@@ -274,13 +285,21 @@ export class Editor extends Group implements IEditor {
         if (target && select) this.target = target
 
         if (this.single) {
-            const editTarget = target || this.element
-            name || (name = editTarget.editInner)
-            if (name && EditToolCreator.list[name]) {
+            if (!target) target = this.element
+            if (!name) name = target.editInner
+
+            const { beforeEditInner } = this.mergeConfig
+            if (beforeEditInner) {
+                const check = beforeEditInner({ target, name })
+                if (isString(check)) name = check
+                else if (check === false) return
+            }
+
+            if (EditToolCreator.list[name]) {
                 this.editTool.unload()
                 this.innerEditing = true
                 this.innerEditor = this.editToolList[name] = this.editToolList[name] || EditToolCreator.get(name, this)
-                this.innerEditor.editTarget = editTarget
+                this.innerEditor.editTarget = target
 
                 this.emitInnerEvent(InnerEditorEvent.BEFORE_OPEN)
                 this.innerEditor.load()

package/src/decorator/data.ts

@@ -1,6 +1,7 @@
 import { IFunction, ILeaf, IObject, IUI, } from '@leafer-ui/interface'
+import { defineKey, isNull, isArray, isObject, isUndefined } from '@leafer-ui/draw'
+
 import { IEditor } from '@leafer-in/interface'
-import { defineKey, isNull, isArray, isObject } from '@leafer-ui/draw'
 
 import { EditorEvent } from '../event/EditorEvent'
 
@@ -45,7 +46,7 @@ export function mergeConfigAttr() {
     return (target: IEditor, key: string) => {
         defineKey(target, key, {
             get() {
-                const { config, element, dragPoint, editBox } = this, mergeConfig = { ...config } // 实时合并，后期可优化
+                const { config, element, dragPoint, editBox, app } = this, mergeConfig = { ...config } // 实时合并，后期可优化
                 if (element && element.editConfig) Object.assign(mergeConfig, element.editConfig) // 元素上的配置
                 if (editBox.config) Object.assign(mergeConfig, editBox.config) // EditBox 上的配置
                 if (dragPoint) {
@@ -56,6 +57,7 @@ export function mergeConfigAttr() {
                         isNull(mergeConfig.lockRatio) && (mergeConfig.lockRatio = true)
                     }
                 }
+                if (isUndefined(mergeConfig.dragLimitAnimate)) mergeConfig.dragLimitAnimate = app && app.config.pointer.dragLimitAnimate
                 return (this as IObject).mergedConfig = mergeConfig
             }
         } as ThisType<IEditor>)

package/src/display/EditBox.ts

@@ -307,7 +307,7 @@ export class EditBox extends Group implements IEditBox {
     }
 
     protected onDragEnd(e: DragEvent): void {
-        if (this.moving) this.transformTool.onMove(e)
+        if (this.moving && this.mergeConfig.dragLimitAnimate && this.target.dragBounds) this.transformTool.onMove(e)
 
         this.dragPoint = null
         this.resetDoing()

package/src/helper/EditDataHelper.ts

@@ -6,7 +6,7 @@ import { IEditorScaleEvent, IEditorSkewEvent, IEditorRotateEvent } from '@leafer
 
 const { topLeft, top, topRight, right, bottomRight, bottom, bottomLeft, left } = Direction9
 const { toPoint } = AroundHelper
-const { within } = MathHelper
+const { within, sign } = MathHelper
 
 export const EditDataHelper = {
 
@@ -25,8 +25,8 @@ export const EditDataHelper = {
         // 获取已经改变的比例
         const originChangedScaleX = target.scaleX / startBounds.scaleX
         const originChangedScaleY = target.scaleY / startBounds.scaleY
-        const signX = originChangedScaleX < 0 ? -1 : 1
-        const signY = originChangedScaleY < 0 ? -1 : 1
+        const signX = sign(originChangedScaleX)
+        const signY = sign(originChangedScaleY)
 
         const changedScaleX = scaleMode ? originChangedScaleX : signX * boxBounds.width / width
         const changedScaleY = scaleMode ? originChangedScaleY : signY * boxBounds.height / height
@@ -142,8 +142,8 @@ export const EditDataHelper = {
         }
 
         // 防止小于1px
-        if (useScaleX && Math.abs(scaleX * worldBoxBounds.width) < 1) scaleX = (scaleX < 0 ? -1 : 1) / worldBoxBounds.width
-        if (useScaleY && Math.abs(scaleY * worldBoxBounds.height) < 1) scaleY = (scaleY < 0 ? -1 : 1) / worldBoxBounds.height
+        if (useScaleX && Math.abs(scaleX * worldBoxBounds.width) < 1) scaleX = sign(scaleX) / worldBoxBounds.width
+        if (useScaleY && Math.abs(scaleY * worldBoxBounds.height) < 1) scaleY = sign(scaleY) / worldBoxBounds.height
 
         if (lockRatio && scaleX !== scaleY) scaleY = scaleX = Math.min(scaleX, scaleY)
 

package/src/tool/TransformTool.ts

@@ -1,5 +1,5 @@
 import { IEvent, IPointData, IAlign, IAxis, IFunction, IMatrix, IUI } from '@leafer-ui/interface'
-import { MathHelper, Matrix, LeafHelper, AroundHelper, isObject, isString, isNumber, isUndefined } from '@leafer-ui/draw'
+import { MathHelper, Matrix, LeafHelper, AroundHelper, isObject, isString, isNumber } from '@leafer-ui/draw'
 import { DragEvent, RotateEvent, ZoomEvent, MoveEvent } from '@leafer-ui/core'
 
 import { IEditBox, IEditPoint, IEditTool, IEditorScaleEvent, ISimulateElement, IEditorMoveEvent, IEditorRotateEvent, IEditorSkewEvent } from '@leafer-in/interface'
@@ -23,12 +23,10 @@ export class TransformTool implements ITransformTool { // Editor use
 
     public onMove(e: DragEvent | MoveEvent): void {
 
-        const { target, mergeConfig, dragStartData, app } = this.editBox
+        const { target, mergeConfig, dragStartData } = this.editBox
 
         let move: IPointData, { dragLimitAnimate } = mergeConfig
 
-        if (isUndefined(dragLimitAnimate)) dragLimitAnimate = app && app.config.pointer.dragLimitAnimate
-
         const isMoveEnd = e.type === MoveEvent.END || e.type === DragEvent.END
         const axisDrag = isString(target.draggable)
         const checkLimitMove = !dragLimitAnimate || isMoveEnd || axisDrag