@leafer-ui/data 1.6.1 → 1.6.3

package/package.json

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

package/src/ImageData.ts

@@ -15,7 +15,6 @@ export class ImageData extends RectData implements IImageData {
     }
 
     public __setImageFill(value: string): void {
-        if (this.__leaf.image) this.__leaf.image = null;
         (this as IImageInputData).fill = value ? { type: 'image', mode: 'stretch', url: value } : undefined
     }
 

package/src/TextData.ts

@@ -1,6 +1,6 @@
 import { UICreator } from '@leafer/core'
 
-import { IFontWeight, ITextData, IUI, IText, IObject, IBackgroundBoxStyle } from '@leafer-ui/interface'
+import { IFontWeight, ITextData, IUI, IText, IObject, IBackgroundBoxStyle, IFontWeightNumer } from '@leafer-ui/interface'
 
 import { UIData } from "./UIData"
 
@@ -27,11 +27,9 @@ export class TextData extends UIData implements ITextData {
     setFontWeight(value: IFontWeight): void {
         if (typeof value === 'string') {
             this.__setInput('fontWeight', value)
-            this._fontWeight = fontWeightMap[value] || 400
-        } else {
-            if (this.__input) this.__removeInput('fontWeight')
-            this._fontWeight = value
-        }
+            value = fontWeightMap[value] as IFontWeightNumer || 400
+        } else if (this.__input) this.__removeInput('fontWeight')
+        this._fontWeight = value
     }
 
     setBoxStyle(value: IUI) {

package/src/UIData.ts

@@ -1,11 +1,12 @@
 import { INumber, IValue, IBoolean, IPathCommandData, IPathString, IPointData, IPathCommandObject, IObject, IFilter } from '@leafer/interface'
-import { PathConvert, LeafData, Debug } from '@leafer/core'
+import { PathConvert, DataHelper, LeafData, Debug } from '@leafer/core'
 
 import { IUI, IUIData, ILeafPaint } from '@leafer-ui/interface'
-import { Paint, PaintImage } from '@leafer-ui/external'
+import { Paint, PaintImage, ColorConvert } from '@leafer-ui/external'
 
 
 const { parse, objectToCanvasData } = PathConvert
+const { stintSet } = DataHelper, { hasTransparent } = ColorConvert
 const emptyPaint: ILeafPaint = {}
 const debug = Debug.get('UIData')
 export class UIData extends LeafData implements IUIData {
@@ -37,8 +38,11 @@ export class UIData extends LeafData implements IUIData {
         return t.fill && this.__hasStroke
     }
 
-    public __pixelFill?: boolean // png / svg / webp
-    public __pixelStroke?: boolean
+    public __isAlphaPixelFill?: boolean // png / svg / webp
+    public __isAlphaPixelStroke?: boolean
+
+    public __isTransparentFill?: boolean  // 半透明的 
+    public __isTransparentStroke?: boolean
 
     public get __clipAfterFill(): boolean { const t = this as IUIData; return (t.cornerRadius || t.innerShadow || t.__pathInputed) as unknown as boolean } // 用于 __drawAfterFill()
     public get __hasSurface(): boolean { const t = this as IUIData; return (t.fill || t.stroke) as unknown as boolean }
@@ -91,37 +95,21 @@ export class UIData extends LeafData implements IUIData {
     protected setFill(value: IValue) {
         if (this.__naturalWidth) this.__removeNaturalSize()
         if (typeof value === 'string' || !value) {
-            if (this.__isFills) {
-                this.__removeInput('fill')
-                PaintImage.recycleImage('fill', this)
-                this.__isFills = false
-                this.__pixelFill && (this.__pixelFill = false)
-            }
+            stintSet(this, '__isTransparentFill', hasTransparent(value as string))
+            this.__isFills && this.__removePaint('fill', true)
             this._fill = value
         } else if (typeof value === 'object') {
-            this.__setInput('fill', value)
-            const layout = this.__leaf.__layout
-            layout.boxChanged || layout.boxChange()
-            this.__isFills = true
-            this._fill || (this._fill = emptyPaint)
+            this.__setPaint('fill', value)
         }
     }
 
     protected setStroke(value: IValue) {
         if (typeof value === 'string' || !value) {
-            if (this.__isStrokes) {
-                this.__removeInput('stroke')
-                PaintImage.recycleImage('stroke', this)
-                this.__isStrokes = false
-                this.__pixelStroke && (this.__pixelStroke = false)
-            }
+            stintSet(this, '__isTransparentStroke', hasTransparent(value as string))
+            this.__isStrokes && this.__removePaint('stroke', true)
             this._stroke = value
         } else if (typeof value === 'object') {
-            this.__setInput('stroke', value)
-            const layout = this.__leaf.__layout
-            layout.boxChanged || layout.boxChange()
-            this.__isStrokes = true
-            this._stroke || (this._stroke = emptyPaint)
+            this.__setPaint('stroke', value)
         }
     }
 
@@ -157,9 +145,32 @@ export class UIData extends LeafData implements IUIData {
         const { fill, stroke } = this.__input
         if (fill) Paint.compute('fill', this.__leaf)
         if (stroke) Paint.compute('stroke', this.__leaf)
-        this.__needComputePaint = false
+        this.__needComputePaint = undefined
+    }
+
+    public __setPaint(attrName: 'fill' | 'stroke', value: IValue): void {
+        this.__setInput(attrName, value)
+        const layout = this.__leaf.__layout
+        layout.boxChanged || layout.boxChange()
+        if (value instanceof Array && !value.length) {
+            this.__removePaint(attrName)
+        } else {
+            if (attrName === 'fill') this.__isFills = true, this._fill || (this._fill = emptyPaint)
+            else this.__isStrokes = true, this._stroke || (this._stroke = emptyPaint)
+        }
     }
 
+    public __removePaint(attrName: 'fill' | 'stroke', removeInput?: boolean): void {
+        if (removeInput) this.__removeInput(attrName)
+        PaintImage.recycleImage(attrName, this)
+        if (attrName === 'fill') {
+            stintSet(this, '__isAlphaPixelFill', undefined)
+            this._fill = this.__isFills = undefined
+        } else {
+            stintSet(this, '__isAlphaPixelStroke', undefined)
+            this._stroke = this.__isStrokes = undefined
+        }
+    }
 }
 
 
@@ -167,7 +178,7 @@ function setArray(data: IUIData, key: string, value: IValue) {
     data.__setInput(key, value)
     if (value instanceof Array) {
         if (value.some((item: IFilter) => item.visible === false)) value = value.filter((item: IFilter) => item.visible !== false)
-        value.length || (value = null)
-    } else value = value && (value as IFilter).visible !== false ? [value] : null;
+        value.length || (value = undefined)
+    } else value = value && (value as IFilter).visible !== false ? [value] : undefined;
     (data as IObject)['_' + key] = value
 }

package/types/index.d.ts

@@ -12,8 +12,10 @@ declare class UIData extends LeafData implements IUIData {
     get __hasStroke(): boolean;
     get __hasHalf(): number;
     get __hasMultiPaint(): boolean;
-    __pixelFill?: boolean;
-    __pixelStroke?: boolean;
+    __isAlphaPixelFill?: boolean;
+    __isAlphaPixelStroke?: boolean;
+    __isTransparentFill?: boolean;
+    __isTransparentStroke?: boolean;
     get __clipAfterFill(): boolean;
     get __hasSurface(): boolean;
     __needComputePaint: boolean;
@@ -39,6 +41,8 @@ declare class UIData extends LeafData implements IUIData {
     protected setInnerShadow(value: IValue): void;
     protected setFilter(value: IValue): void;
     __computePaint(): void;
+    __setPaint(attrName: 'fill' | 'stroke', value: IValue): void;
+    __removePaint(attrName: 'fill' | 'stroke', removeInput?: boolean): void;
 }
 
 declare class GroupData extends UIData implements IGroupData {