@leafer-in/editor 2.2.2 → 2.2.4

package/package.json

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

package/src/decorator/data.ts

@@ -31,7 +31,10 @@ export function targetAttr(fn: IFunction) {
 
                             if (t.hasDimOthers) t.cancelDimOthers()
 
-                            if (isArray(value) && value.length > 1 && value[0].locked) value.splice(0, 1) // fix: 单个锁定 + shift多选
+                            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/EditSelect.ts

@@ -169,7 +169,7 @@ export class EditSelect extends Group implements IEditSelect {
             const total = e.getInnerTotal(this)
 
             const dragBounds = this.bounds.clone().unsign()
-            const list = new LeafList(findByBounds(editor.app, dragBounds))
+            const list = new LeafList(findByBounds(editor.app, dragBounds, editor.mergedConfig.boxSelect === 'includes' ? 'includes' : 'hit'))
 
             this.bounds.width = total.x
             this.bounds.height = total.y

package/src/helper/EditSelectHelper.ts

@@ -7,34 +7,41 @@ export const EditSelectHelper = {
         return path.list.find((leaf) => leaf.editable) as IUI
     },
 
-    findByBounds(branch: IUI, bounds: IBounds): IUI[] {
+    findByBounds(branch: IUI, bounds: IBounds, mode: 'hit' | 'includes' = 'hit'): IUI[] {
         const list: IUI[] = []
-        eachFind([branch], list, bounds)
+        eachFind([branch], list, bounds, mode)
         return list
     }
 
 }
 
 
-function eachFind(children: IUI[], list: IUI[], bounds: IBounds): void {
-    let child: IUI, data: IUIData
+function eachFind(children: IUI[], list: IUI[], bounds: IBounds, mode: 'hit' | 'includes'): void {
+    let child: IUI, data: IUIData, isFind: boolean
     for (let i = 0, len = children.length; i < len; i++) {
         child = children[i], data = child.__
         if (data.hittable && data.visible && !data.locked && bounds.hit(child.__world)) {
 
-            if (data.editable) {
-                if (child.isBranch && !data.hitChildren) {
-                    if (data.hitSelf) list.push(child)
-                    continue
-                } else if (child.isFrame) {
+            if (data.editable && data.editable !== 'single') {
+                if (child.isFrame) {
                     if (bounds.includes(child.__layout.boxBounds, child.__world)) {
                         list.push(child)
                         continue
                     }
-                } else if (bounds.hit(child.__layout.boxBounds, child.__world) && data.hitSelf) list.push(child)
+                } else {
+
+                    isFind = bounds[mode](child.__layout.boxBounds, child.__world) && data.hitSelf
+
+                    if (child.isBranch) {
+                        if (!data.hitChildren) {
+                            if (isFind) list.push(child)
+                            continue
+                        }
+                    } else if (isFind) list.push(child)
+                }
             }
 
-            if (child.isBranch) eachFind(child.children, list, bounds)
+            if (child.isBranch) eachFind(child.children, list, bounds, mode)
 
         }
     }

package/src/tool/LineEditTool.ts

@@ -112,7 +112,8 @@ export class LineEditTool extends EditTool {
             const { from, to } = fromTo
             line.innerToWorld(from, from, false, editBox)
             line.innerToWorld(to, to, false, editBox)
-            rect.pen.clearPath().moveTo(from.x, from.y).lineTo(to.x, to.y)
+            const { x, y } = editBox.rectBounds
+            rect.pen.clearPath().moveTo(from.x - x, from.y - y).lineTo(to.x - x, to.y - y)
             copy(resizePoints[7] as IPointData, from)
             copy(rotatePoints[7] as IPointData, from)
             copy(resizePoints[3] as IPointData, to)

package/types/index.d.ts

@@ -429,7 +429,7 @@ declare const EditDataHelper: {
 
 declare const EditSelectHelper: {
     findOne(path: ILeafList): IUI;
-    findByBounds(branch: IUI, bounds: IBounds): IUI[];
+    findByBounds(branch: IUI, bounds: IBounds, mode?: "hit" | "includes"): IUI[];
 };
 
 export { EditBox, EditDataHelper, EditPoint, EditSelect, EditSelectHelper, EditTool, EditToolCreator, Editor, EditorEvent, EditorGroupEvent, EditorHelper, EditorMoveEvent, EditorRotateEvent, EditorScaleEvent, EditorSkewEvent, InnerEditor, InnerEditorEvent, LineEditTool, SelectArea, Stroker, TransformTool, editToolMergeConfigAttr, registerEditTool, registerInnerEditor };