@leafer-ui/data 1.7.0 → 1.9.0

package/package.json

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

package/src/BoxData.ts

@@ -1,4 +1,4 @@
-import { IBoxData } from '@leafer-ui/interface'
+import { IBox, IBoxData } from '@leafer-ui/interface'
 
 import { GroupData } from "./GroupData"
 
@@ -7,9 +7,9 @@ export class BoxData extends GroupData implements IBoxData {
 
     public get __boxStroke(): boolean { return !(this as IBoxData).__pathInputed }
 
-    // 路径与圆角直接当溢出处理
-    public get __drawAfterFill(): boolean { const t = this as IBoxData; return (t.overflow === 'hide' && (t.__clipAfterFill || t.innerShadow) && t.__leaf.children.length) as unknown as boolean }
+    // 当成整体处理
+    public get __drawAfterFill(): boolean { const t = this as IBoxData; return t.__single || t.__clipAfterFill }
 
-    public get __clipAfterFill(): boolean { return this.__leaf.isOverflow || super.__clipAfterFill }
+    public get __clipAfterFill(): boolean { const t = this as IBoxData; return t.overflow === 'hide' && t.__leaf.children.length && ((t.__leaf as IBox).isOverflow || super.__clipAfterFill) as unknown as boolean }
 
 }

package/src/TextData.ts

@@ -1,4 +1,4 @@
-import { UICreator } from '@leafer/core'
+import { UICreator, isString } from '@leafer/core'
 
 import { IFontWeight, ITextData, IUI, IText, IObject, IBackgroundBoxStyle, IFontWeightNumer } from '@leafer-ui/interface'
 
@@ -25,7 +25,7 @@ export class TextData extends UIData implements ITextData {
     protected _boxStyle?: IBackgroundBoxStyle
 
     setFontWeight(value: IFontWeight): void {
-        if (typeof value === 'string') {
+        if (isString(value)) {
             this.__setInput('fontWeight', value)
             value = fontWeightMap[value] as IFontWeightNumer || 400
         } else if (this.__input) this.__removeInput('fontWeight')

package/src/UIData.ts

@@ -1,7 +1,7 @@
 import { INumber, IValue, IBoolean, IPathCommandData, IPathString, IPointData, IPathCommandObject, IObject, IFilter } from '@leafer/interface'
-import { PathConvert, DataHelper, LeafData, Debug } from '@leafer/core'
+import { PathConvert, DataHelper, LeafData, Debug, isArray, isObject, isString, isUndefined } from '@leafer/core'
 
-import { IUI, IUIData, ILeafPaint } from '@leafer-ui/interface'
+import { IUI, IUIData, ILeafPaint, IStrokeComputedStyle } from '@leafer-ui/interface'
 import { Paint, PaintImage, ColorConvert } from '@leafer-ui/external'
 
 
@@ -20,20 +20,13 @@ export class UIData extends LeafData implements IUIData {
     public __isFills?: boolean
     public __isStrokes?: boolean
 
-    public get __strokeWidth(): number {
-        const { strokeWidth, strokeWidthFixed } = this as IUIData
-        if (strokeWidthFixed) {
-            const ui = this.__leaf
-            let { scaleX } = ui.__nowWorld || ui.__world
-            if (scaleX < 0) scaleX = -scaleX
-            return scaleX > 1 ? strokeWidth / scaleX : strokeWidth
-        } else return strokeWidth
-    }
+    public get __strokeWidth(): number { return this.__getRealStrokeWidth() }
 
-    public get __hasMultiPaint(): boolean { // fix: opacity
-        const t = this as IUIData
-        return (t.fill && this.__useStroke) || (t.__isFills && t.fill.length > 1) || (t.__isStrokes && t.stroke.length > 1) || t.__useEffect
-    }
+    public get __maxStrokeWidth(): number { const t = this as IUIData; return t.__hasMultiStrokeStyle ? Math.max(t.__hasMultiStrokeStyle, t.strokeWidth) : t.strokeWidth }
+
+    public __hasMultiStrokeStyle?: number // 是否存在多个不同的描述样式（同时存储多个描边样式中的最大宽度用于运算）
+
+    public get __hasMultiPaint(): boolean { const t = this as IUIData; return (t.fill && this.__useStroke) || (t.__isFills && t.fill.length > 1) || (t.__isStrokes && t.stroke.length > 1) || t.__useEffect } // fix: opacity
 
     public __isAlphaPixelFill?: boolean // png / svg / webp
     public __isAlphaPixelStroke?: boolean
@@ -41,7 +34,7 @@ export class UIData extends LeafData implements IUIData {
     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 __clipAfterFill(): boolean { const t = this as IUIData; return (t.cornerRadius || t.innerShadow || t.__pathInputed) as unknown as boolean } // 用于 (Box | Canvas | Robot) __drawAfterFill() 时裁剪内容
     public get __hasSurface(): boolean { const t = this as IUIData; return (t.fill || t.stroke) as unknown as boolean }
 
     public __needComputePaint: boolean
@@ -91,31 +84,31 @@ export class UIData extends LeafData implements IUIData {
 
     protected setFill(value: IValue) {
         if (this.__naturalWidth) this.__removeNaturalSize()
-        if (typeof value === 'string' || !value) {
+        if (isString(value) || !value) {
             stintSet(this, '__isTransparentFill', hasTransparent(value as string))
             this.__isFills && this.__removePaint('fill', true)
             this._fill = value
-        } else if (typeof value === 'object') {
+        } else if (isObject(value)) {
             this.__setPaint('fill', value)
         }
     }
 
     protected setStroke(value: IValue) {
-        if (typeof value === 'string' || !value) {
+        if (isString(value) || !value) {
             stintSet(this, '__isTransparentStroke', hasTransparent(value as string))
             this.__isStrokes && this.__removePaint('stroke', true)
             this._stroke = value
-        } else if (typeof value === 'object') {
+        } else if (isObject(value)) {
             this.__setPaint('stroke', value)
         }
     }
 
 
     protected setPath(value: IPathCommandData | IPathCommandObject[] | IPathString) {
-        const isString = typeof value === 'string'
-        if (isString || (value && typeof value[0] === 'object')) {
+        const isStr = isString(value)
+        if (isStr || (value && isObject(value[0]))) {
             this.__setInput('path', value)
-            this._path = isString ? parse(value) : objectToCanvasData(value as IPathCommandObject[])
+            this._path = isStr ? parse(value) : objectToCanvasData(value as IPathCommandObject[])
         } else {
             if (this.__input) this.__removeInput('path')
             this._path = value as IPathCommandData
@@ -145,11 +138,25 @@ export class UIData extends LeafData implements IUIData {
         this.__needComputePaint = undefined
     }
 
+
+    public __getRealStrokeWidth(childStyle?: IStrokeComputedStyle): number {
+        let { strokeWidth, strokeWidthFixed } = this as IUIData
+        if (childStyle) {
+            if (childStyle.strokeWidth) strokeWidth = childStyle.strokeWidth
+            if (!isUndefined(childStyle.strokeWidthFixed)) strokeWidthFixed = childStyle.strokeWidthFixed
+        }
+        if (strokeWidthFixed) {
+            const scale = this.__leaf.getClampRenderScale()
+            return scale > 1 ? strokeWidth / scale : strokeWidth
+        } else return strokeWidth
+    }
+
+
     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) {
+        if (isArray(value) && !value.length) {
             this.__removePaint(attrName)
         } else {
             if (attrName === 'fill') this.__isFills = true, this._fill || (this._fill = emptyPaint)
@@ -165,6 +172,7 @@ export class UIData extends LeafData implements IUIData {
             this._fill = this.__isFills = undefined
         } else {
             stintSet(this, '__isAlphaPixelStroke', undefined)
+            stintSet(this, '__hasMultiStrokeStyle', undefined)
             this._stroke = this.__isStrokes = undefined
         }
     }
@@ -173,7 +181,7 @@ export class UIData extends LeafData implements IUIData {
 
 function setArray(data: IUIData, key: string, value: IValue) {
     data.__setInput(key, value)
-    if (value instanceof Array) {
+    if (isArray(value)) {
         if (value.some((item: IFilter) => item.visible === false)) value = value.filter((item: IFilter) => item.visible !== false)
         value.length || (value = undefined)
     } else value = value && (value as IFilter).visible !== false ? [value] : undefined;

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, IBackgroundBoxStyle, IFontWeight, IImageData, IImage, ICanvasData } from '@leafer-ui/interface';
+import { IUIData, IUI, IStrokeComputedStyle, 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;
@@ -9,6 +9,8 @@ declare class UIData extends LeafData implements IUIData {
     __isFills?: boolean;
     __isStrokes?: boolean;
     get __strokeWidth(): number;
+    get __maxStrokeWidth(): number;
+    __hasMultiStrokeStyle?: number;
     get __hasMultiPaint(): boolean;
     __isAlphaPixelFill?: boolean;
     __isAlphaPixelStroke?: boolean;
@@ -39,6 +41,7 @@ declare class UIData extends LeafData implements IUIData {
     protected setInnerShadow(value: IValue): void;
     protected setFilter(value: IValue): void;
     __computePaint(): void;
+    __getRealStrokeWidth(childStyle?: IStrokeComputedStyle): number;
     __setPaint(attrName: 'fill' | 'stroke', value: IValue): void;
     __removePaint(attrName: 'fill' | 'stroke', removeInput?: boolean): void;
 }