@leafer/decorator 1.5.0 → 1.5.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer/decorator",
-  "version": "1.5.0",
+  "version": "1.5.2",
   "description": "@leafer/decorator",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,11 +22,11 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/platform": "1.5.0",
-    "@leafer/data": "1.5.0",
-    "@leafer/debug": "1.5.0"
+    "@leafer/platform": "1.5.2",
+    "@leafer/data": "1.5.2",
+    "@leafer/debug": "1.5.2"
   },
   "devDependencies": {
-    "@leafer/interface": "1.5.0"
+    "@leafer/interface": "1.5.2"
   }
 }

package/src/data.ts

@@ -1,4 +1,5 @@
 import { ILeafData, ILeaf, IObject, IValue, ILeafAttrDescriptor, ILeafAttrDescriptorFn, IValueFunction } from '@leafer/interface'
+import { DataHelper, isEmptyData } from '@leafer/data'
 import { Debug } from '@leafer/debug'
 
 import { defineKey, getDescriptor } from './object'
@@ -275,30 +276,36 @@ export function defineDataProcessor(target: ILeaf, key: string, defaultValue?: I
     } else if (typeof defaultValue === 'function') {
         property.get = function () {
             let v = this[computedKey]
-            if (v === undefined) this[computedKey] = v = defaultValue((this as ILeafData).__leaf)
-            return v
+            return v === undefined ? defaultValue((this as ILeafData).__leaf) : v
+        }
+    } else if (typeof defaultValue === 'object') {
+        const isEmpty = isEmptyData(defaultValue)
+        property.get = function () {
+            let v = this[computedKey]
+            return v === undefined ? this[computedKey] = isEmpty ? {} : DataHelper.clone(defaultValue) : v
         }
     }
 
+    const isBox = target.isBranchLeaf // 仅用于 width / height
     if (key === 'width') {
         property.get = function () {
             const v = this[computedKey]
             if (v === undefined) {
-                const t = this as ILeafData
-                return (t as IObject)._height && t.__naturalWidth && t.__useNaturalRatio ? (t as IObject)._height * t.__naturalWidth / t.__naturalHeight : t.__naturalWidth || defaultValue
-            } else {
-                return v
-            }
+                const t = this as ILeafData, naturalWidth = t.__naturalWidth, leaf = t.__leaf
+                if (!defaultValue || leaf.pathInputed) return leaf.boxBounds.width
+                if (naturalWidth) return (t as IObject)._height && t.__useNaturalRatio ? (t as IObject)._height * naturalWidth / t.__naturalHeight : naturalWidth
+                return (isBox && leaf.children.length) ? leaf.boxBounds.width : defaultValue // 返回 Box / Group / Text 等的实际宽度
+            } else return v
         }
     } else if (key === 'height') {
         property.get = function () {
             const v = this[computedKey]
             if (v === undefined) {
-                const t = this as ILeafData
-                return (t as IObject)._width && t.__naturalHeight && t.__useNaturalRatio ? (t as IObject)._width * t.__naturalHeight / t.__naturalWidth : t.__naturalHeight || defaultValue
-            } else {
-                return v
-            }
+                const t = this as ILeafData, naturalHeight = t.__naturalHeight, leaf = t.__leaf
+                if (!defaultValue || leaf.pathInputed) return leaf.boxBounds.height
+                if (naturalHeight) return (t as IObject)._width && t.__useNaturalRatio ? (t as IObject)._width * naturalHeight / t.__naturalWidth : naturalHeight
+                return (isBox && leaf.children.length) ? leaf.boxBounds.height : defaultValue // 返回 Box / Group / Text 等的实际高度
+            } else return v
         }
     }