@leafer-in/editor 2.3.3 → 2.3.4

package/package.json

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

package/src/Editor.ts

@@ -118,7 +118,7 @@ export class Editor extends Group implements IEditor {
     }
 
     public addItem(item: IUI): void {
-        if (!this.hasItem(item) && !item.locked) this.leafList.add(item), this.target = this.leafList.list as IUI[]
+        if (!this.hasItem(item) && !(item.locked && !this.mergedConfig.multipleSelectLocked)) this.leafList.add(item), this.target = this.leafList.list as IUI[]
     }
 
     public removeItem(item: IUI): void {

package/src/decorator/data.ts

@@ -22,7 +22,7 @@ export function targetAttr(fn: IFunction) {
 
                         const isSelect = key === 'target'
                         if (isSelect) {
-                            const { beforeSelect, skipNested } = t.config
+                            const { beforeSelect, skipNested, multipleSelectLocked } = t.config
 
                             if (isArray(value)) {
                                 if (skipNested) { // 过滤嵌套关系的元素
@@ -35,7 +35,7 @@ export function targetAttr(fn: IFunction) {
                                     }
                                 }
 
-                                if (value.length > 1 && value.some(item => item.locked || item.editable === 'single')) {
+                                if (value.length > 1 && value.some(item => (item.locked && !multipleSelectLocked) || item.editable === 'single')) {
                                     value = value.filter(item => !(item.locked || item.editable === 'single')) // 锁定、单选元素不能参与多选
                                 }
                             }

package/src/display/EditBox.ts

@@ -77,6 +77,8 @@ export class EditBox extends Group implements IEditBox {
 
     protected __eventIds: IEventListenerId[] = []
 
+    public isLocked?: boolean
+
     constructor(editor: IEditor) {
         super()
         this.editor = editor
@@ -125,13 +127,14 @@ export class EditBox extends Group implements IEditBox {
 
     public load(): void {
         const { target, mergeConfig, single, rect, circle, resizePoints, resizeLines } = this
-        const { stroke, strokeWidth, ignorePixelSnap } = mergeConfig
+        const { stroke, strokeWidth, ignorePixelSnap, multipleSelectLocked } = mergeConfig
 
         const pointsStyle = this.getPointsStyle()
         const middlePointsStyle = this.getMiddlePointsStyle()
         const resizeLinesStyle = this.getResizeLinesStyle()
 
-        this.visible = !target.locked
+        this.isLocked = target.locked || (multipleSelectLocked && this.editor.list.some(item => item.locked))
+        this.visible = !this.isLocked
 
         let resizeP: IBox
 
@@ -167,7 +170,7 @@ export class EditBox extends Group implements IEditBox {
         const { editor, target } = this
         if (!target) return
         const { x, y, scaleX, scaleY, rotation, skewX, skewY, width, height } = target.getLayoutBounds('box', editor, true)
-        this.visible = !this.target.locked
+        this.visible = !(this.target.locked || this.isLocked)
         this.set({ x, y, scaleX, scaleY, rotation, skewX, skewY })
         this.updateBounds({ x: 0, y: 0, width, height })
         this.updateWidgets()

package/src/display/EditSelect.ts

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

package/src/helper/EditSelectHelper.ts

@@ -7,20 +7,20 @@ export const EditSelectHelper = {
         return path.list.find((leaf) => leaf.editable) as IUI
     },
 
-    findByBounds(branch: IUI, bounds: IBounds, mode: 'hit' | 'includes' = 'hit'): IUI[] {
+    findByBounds(branch: IUI, bounds: IBounds, mode: 'hit' | 'includes' = 'hit', multipleSelectLocked?: boolean): IUI[] {
         const list: IUI[] = []
-        eachFind([branch], list, bounds, mode)
+        eachFind([branch], list, bounds, mode, multipleSelectLocked)
         return list
     }
 
 }
 
 
-function eachFind(children: IUI[], list: IUI[], bounds: IBounds, mode: 'hit' | 'includes'): void {
+function eachFind(children: IUI[], list: IUI[], bounds: IBounds, mode: 'hit' | 'includes', multipleSelectLocked?: boolean): 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.hittable && data.visible && !(data.locked && !multipleSelectLocked) && bounds.hit(child.__world)) {
 
             if (data.editable && data.editable !== 'single') {
                 if (child.isFrame) {
@@ -41,7 +41,7 @@ function eachFind(children: IUI[], list: IUI[], bounds: IBounds, mode: 'hit' | '
                 }
             }
 
-            if (child.isBranch) eachFind(child.children, list, bounds, mode)
+            if (child.isBranch) eachFind(child.children, list, bounds, mode, multipleSelectLocked)
 
         }
     }

package/types/index.d.ts

@@ -178,6 +178,7 @@ declare class EditBox extends Group implements IEditBox {
     get canGesture(): boolean;
     get canDragLimitAnimate(): boolean;
     protected __eventIds: IEventListenerId[];
+    isLocked?: boolean;
     constructor(editor: IEditor);
     create(): void;
     showView(): void;
@@ -454,7 +455,7 @@ declare const EditDataHelper: {
 
 declare const EditSelectHelper: {
     findOne(path: ILeafList): IUI;
-    findByBounds(branch: IUI, bounds: IBounds, mode?: "hit" | "includes"): IUI[];
+    findByBounds(branch: IUI, bounds: IBounds, mode?: "hit" | "includes", multipleSelectLocked?: boolean): 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 };