@leafer-in/editor 2.0.2 → 2.0.3

package/package.json

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

package/src/decorator/data.ts

@@ -28,8 +28,11 @@ export function targetAttr(fn: IFunction) {
                                 else if (check === false) return
                             }
 
-                            t.setDimOthers(false)
-                            t.setBright(false)
+                            const { dimOthers, bright } = t.editBox.mergedConfig || t.config // 没有配置时不强制取消bright
+                            if (!isUndefined(dimOthers) || !isUndefined(bright)) {
+                                t.setDimOthers(false)
+                                t.setBright(false)
+                            }
 
                             if (isArray(value) && value.length > 1 && value[0].locked) value.splice(0, 1) // fix: 单个锁定 + shift多选
                             if (t.single) {
@@ -54,7 +57,11 @@ export function mergeConfigAttr() {
     return (target: IEditor, key: string) => {
         defineKey(target, key, {
             get() {
-                const { config, element, dragPoint, editBox, app } = this, mergeConfig = { ...config } // 实时合并，后期可优化
+                const { config, element, dragPoint, editBox, editTool, innerEditor, app } = this, mergeConfig = { ...config } // 实时合并，后期可优化
+
+                if (innerEditor) innerEditor.editConfig && Object.assign(mergeConfig, innerEditor.editConfig) // innerEditor 上的配置
+                else if (editTool) editTool.editConfig && Object.assign(mergeConfig, editTool.editConfig) // editTool 上的配置
+
                 if (element && element.editConfig) {
                     let { editConfig } = element
                     if (editConfig.hover || editConfig.hoverStyle) { // 元素的hover样式，不能覆盖到总配置里

package/src/display/EditBox.ts

@@ -1,5 +1,5 @@
 import { IRect, IEventListenerId, IBoundsData, IPointData, IKeyEvent, IGroup, IBox, IBoxInputData, IAlign, IUI, IEditorConfig, IEditorDragStartData, ITransformTool, IUIEvent, IEditPointInputData } from '@leafer-ui/interface'
-import { Group, Text, AroundHelper, Direction9, ResizeEvent, BoundsHelper, DataHelper, isArray, isString, isNumber, isNull, getPointData } from '@leafer-ui/draw'
+import { Group, Text, AroundHelper, Direction9, ResizeEvent, BoundsHelper, DataHelper, isArray, isString, isNumber, isNull, getPointData, isUndefined } from '@leafer-ui/draw'
 import { DragEvent, PointerEvent, KeyEvent, RotateEvent, ZoomEvent, MoveEvent } from '@leafer-ui/core'
 
 import { IEditBox, IEditor, IEditPoint, IEditPointType } from '@leafer-in/interface'
@@ -171,8 +171,10 @@ export class EditBox extends Group implements IEditBox {
 
         editMask.visible = mask ? true : 0
 
-        editor.setDimOthers(dimOthers)
-        editor.setBright(!!dimOthers || bright)
+        if (!isUndefined(dimOthers) || !isUndefined(bright)) {  // 没有配置时不强制bright
+            editor.setDimOthers(dimOthers)
+            editor.setBright(!!dimOthers || bright)
+        }
 
         if (spread) BoundsHelper.spread(bounds, spread)
 
@@ -201,7 +203,8 @@ export class EditBox extends Group implements IEditBox {
                     resizeL.set(point)
 
                     resizeL.visible = resizeP.visible && !hideResizeLines
-                    resizeP.visible = rotateP.visible = showPoints && !!middlePoint
+                    if (resizeP.visible) resizeP.visible = !!middlePoint
+                    if (rotateP.visible) rotateP.visible = !!middlePoint
 
                     if (((i + 1) / 2) % 2) { // top, bottom
                         resizeL.width = width + resizeL.height

package/src/tool/InnerEditor.ts

@@ -1,4 +1,4 @@
-import { IGroup, IEventListenerId, IUI, IObject } from '@leafer-ui/interface'
+import { IGroup, IEventListenerId, IUI, IObject, IEditorConfig } from '@leafer-ui/interface'
 import { IInnerEditor, IEditor, IEditBox, IInnerEditorMode } from '@leafer-in/interface'
 
 import { Group } from '@leafer-ui/draw'
@@ -19,6 +19,8 @@ export class InnerEditor implements IInnerEditor {
 
     public config: IObject
 
+    public editConfig?: IEditorConfig
+
     public editor: IEditor
 
     protected _editBox: IEditBox

package/types/index.d.ts

@@ -321,6 +321,7 @@ declare class InnerEditor implements IInnerEditor {
     get mode(): IInnerEditorMode;
     editTarget: IUI;
     config: IObject;
+    editConfig?: IEditorConfig$1;
     editor: IEditor;
     protected _editBox: IEditBox;
     get editBox(): IEditBox;