@leafer-ui/data 1.5.2 → 1.6.0

package/package.json

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

package/src/TextData.ts

@@ -1,4 +1,6 @@
-import { IFontWeight, ITextData } from '@leafer-ui/interface'
+import { UICreator } from '@leafer/core'
+
+import { IFontWeight, ITextData, IUI, IText, IObject, IBackgroundBoxStyle } from '@leafer-ui/interface'
 
 import { UIData } from "./UIData"
 
@@ -20,6 +22,7 @@ export class TextData extends UIData implements ITextData {
     public get __useNaturalRatio() { return false }
 
     protected _fontWeight?: number
+    protected _boxStyle?: IBackgroundBoxStyle
 
     setFontWeight(value: IFontWeight): void {
         if (typeof value === 'string') {
@@ -31,4 +34,30 @@ export class TextData extends UIData implements ITextData {
         }
     }
 
+    setBoxStyle(value: IUI) {
+        let t = this.__leaf as IText, box = t.__box
+
+        if (value) {
+
+            const { boxStyle } = this as ITextData
+            if (box) for (let key in boxStyle) (box as IObject)[key] = undefined
+            else box = t.__box = UICreator.get('Rect', 0 as any) as IUI // 传递 0 可以优化内存占用
+
+            const layout = t.__layout, boxLayout = box.__layout
+            if (!boxStyle) box.parent = t as any, box.__world = t.__world, boxLayout.boxBounds = layout.boxBounds
+
+            box.set(value)
+            if (boxLayout.strokeChanged) layout.strokeChange()
+            if (boxLayout.renderChanged) layout.renderChange()
+            box.__updateChange()
+
+        } else if (box) {
+            t.__box = box.parent = null
+            box.destroy()
+        }
+
+        this._boxStyle = value
+
+    }
+
 }

package/src/UIData.ts

@@ -30,6 +30,7 @@ export class UIData extends LeafData implements IUIData {
     }
 
     public get __hasStroke(): boolean { return (this as IUIData).stroke && (this as IUIData).strokeWidth as unknown as boolean }
+    public get __hasHalf(): number { const t = this as IUIData; return (t.stroke && t.strokeAlign === 'center' && t.strokeWidth % 2) || undefined }
     public get __hasMultiPaint(): boolean { // fix: opacity
         const t = this as IUIData
         if ((t.__isFills && t.fill.length > 1) || (t.__isStrokes && t.stroke.length > 1) || t.__useEffect) return true
@@ -94,12 +95,13 @@ export class UIData extends LeafData implements IUIData {
                 this.__removeInput('fill')
                 PaintImage.recycleImage('fill', this)
                 this.__isFills = false
-                if (this.__pixelFill) this.__pixelFill = false
+                this.__pixelFill && (this.__pixelFill = false)
             }
             this._fill = value
         } else if (typeof value === 'object') {
             this.__setInput('fill', value)
-            this.__leaf.__layout.boxChanged || this.__leaf.__layout.boxChange()
+            const layout = this.__leaf.__layout
+            layout.boxChanged || layout.boxChange()
             this.__isFills = true
             this._fill || (this._fill = emptyPaint)
         }
@@ -111,12 +113,13 @@ export class UIData extends LeafData implements IUIData {
                 this.__removeInput('stroke')
                 PaintImage.recycleImage('stroke', this)
                 this.__isStrokes = false
-                if (this.__pixelStroke) this.__pixelStroke = false
+                this.__pixelStroke && (this.__pixelStroke = false)
             }
             this._stroke = value
         } else if (typeof value === 'object') {
             this.__setInput('stroke', value)
-            this.__leaf.__layout.boxChanged || this.__leaf.__layout.boxChange()
+            const layout = this.__leaf.__layout
+            layout.boxChanged || layout.boxChange()
             this.__isStrokes = true
             this._stroke || (this._stroke = emptyPaint)
         }

package/types/index.d.ts

@@ -1,6 +1,6 @@
 import { INumber, IPointData, IBoolean, IValue, IPathCommandData, IPathCommandObject, IPathString } from '@leafer/interface';
 import { LeafData } from '@leafer/core';
-import { IUIData, IUI, IGroupData, IBoxData, ILeaferData, IObject, IJSONOptions, IFrameData, ILineData, IRectData, IEllipseData, IPolygonData, IStarData, IPathData, IPenData, ITextData, IFontWeight, IImageData, IImage, ICanvasData } from '@leafer-ui/interface';
+import { IUIData, IUI, IGroupData, IBoxData, ILeaferData, IObject, IJSONOptions, IFrameData, ILineData, IRectData, IEllipseData, IPolygonData, IStarData, IPathData, IPenData, ITextData, IBackgroundBoxStyle, IFontWeight, IImageData, IImage, ICanvasData } from '@leafer-ui/interface';
 
 declare class UIData extends LeafData implements IUIData {
     __leaf: IUI;
@@ -10,6 +10,7 @@ declare class UIData extends LeafData implements IUIData {
     __isStrokes?: boolean;
     get __strokeWidth(): number;
     get __hasStroke(): boolean;
+    get __hasHalf(): number;
     get __hasMultiPaint(): boolean;
     __pixelFill?: boolean;
     __pixelStroke?: boolean;
@@ -83,7 +84,9 @@ declare class PenData extends GroupData implements IPenData {
 declare class TextData extends UIData implements ITextData {
     get __useNaturalRatio(): boolean;
     protected _fontWeight?: number;
+    protected _boxStyle?: IBackgroundBoxStyle;
     setFontWeight(value: IFontWeight): void;
+    setBoxStyle(value: IUI): void;
 }
 
 declare class ImageData extends RectData implements IImageData {