@leafer-in/editor 2.2.11 → 2.3.1

package/package.json

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

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

@@ -586,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())
     }

package/types/index.d.ts

@@ -218,6 +218,7 @@ 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;