@leafer-ui/data 1.0.1 → 1.0.3

package/package.json

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

package/src/CanvasData.ts

@@ -1,8 +1,13 @@
-import { ICanvasData } from '@leafer-ui/interface'
+import { ICanvas, ICanvasData, ICanvasInputData, IObject } from '@leafer-ui/interface'
 
 import { RectData } from './RectData'
 
 
 export class CanvasData extends RectData implements ICanvasData {
 
+    public __getInputData(): IObject {
+        const data: ICanvasInputData = super.__getInputData()
+        data.url = (this.__leaf as ICanvas).canvas.toDataURL('image/png') as string
+        return data
+    }
 }

package/src/ImageData.ts

@@ -16,7 +16,7 @@ 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: 'strench', url: value } : undefined
+        (this as IImageInputData).fill = value ? { type: 'image', mode: 'stretch', url: value } : undefined
     }
 
     public __getData(): IObject {

package/src/LeaferData.ts

@@ -1,8 +1,14 @@
-import { ILeaferData } from '@leafer-ui/interface'
+import { canvasSizeAttrs } from '@leafer/core'
 
-import { GroupData } from './GroupData'
+import { ILeaferData, IObject } from '@leafer-ui/interface'
 
+import { GroupData } from './GroupData'
 
 export class LeaferData extends GroupData implements ILeaferData {
 
+    public __getInputData(): IObject {
+        const data = super.__getInputData()
+        canvasSizeAttrs.forEach(key => delete (data as IObject)[key])
+        return data
+    }
 }

package/src/UIData.ts

@@ -1,4 +1,4 @@
-import { INumber, IValue, IBoolean, IPathCommandData, IPathString } from '@leafer/interface'
+import { INumber, IValue, IBoolean, IPathCommandData, IPathString, IPointData } from '@leafer/interface'
 import { PathConvert, LeafData, Debug } from '@leafer/core'
 
 import { IShadowEffect, IUI, IUIData, IUnitData, ILeafPaint } from '@leafer-ui/interface'
@@ -12,6 +12,8 @@ export class UIData extends LeafData implements IUIData {
 
     declare public __leaf: IUI
 
+    public get scale(): INumber | IPointData { const { scaleX, scaleY } = this as IUIData; return scaleX !== scaleY ? { x: scaleX, y: scaleY } : scaleX }
+
     public __blendLayer?: boolean // 非元素属性必须以两个下划线开头
 
     public __isFills?: boolean
@@ -52,9 +54,12 @@ export class UIData extends LeafData implements IUIData {
     public get __autoSide() { return !this._width || !this._height }
     public get __autoSize() { return !this._width && !this._height }
 
+
     protected setVisible(value: IBoolean) {
-        if (this.__leaf.leafer) this.__leaf.leafer.watcher.hasVisible = true
         this._visible = value
+
+        const { leafer } = this.__leaf
+        if (leafer) leafer.watcher.hasVisible = true
     }
 
     protected setWidth(value: INumber) {

package/types/index.d.ts

@@ -1,9 +1,10 @@
-import { IBoolean, INumber, IValue, IPathCommandData, IPathString } from '@leafer/interface';
+import { INumber, IPointData, IBoolean, IValue, IPathCommandData, IPathString } from '@leafer/interface';
 import { LeafData } from '@leafer/core';
-import { IUIData, IUI, IUnitData, IGroupData, IBoxData, ILeaferData, IFrameData, ILineData, IRectData, IEllipseData, IPolygonData, IStarData, IPathData, IPenData, ITextData, IFontWeight, IImageData, IImage, IObject, ICanvasData } from '@leafer-ui/interface';
+import { IUIData, IUI, IUnitData, IGroupData, IBoxData, ILeaferData, IObject, IFrameData, ILineData, IRectData, IEllipseData, IPolygonData, IStarData, IPathData, IPenData, ITextData, IFontWeight, IImageData, IImage, ICanvasData } from '@leafer-ui/interface';
 
 declare class UIData extends LeafData implements IUIData {
     __leaf: IUI;
+    get scale(): INumber | IPointData;
     __blendLayer?: boolean;
     __isFills?: boolean;
     __isStrokes?: boolean;
@@ -45,6 +46,7 @@ declare class BoxData extends GroupData implements IBoxData {
 }
 
 declare class LeaferData extends GroupData implements ILeaferData {
+    __getInputData(): IObject;
 }
 
 declare class FrameData extends BoxData implements IFrameData {
@@ -89,6 +91,7 @@ declare class ImageData extends RectData implements IImageData {
 }
 
 declare class CanvasData extends RectData implements ICanvasData {
+    __getInputData(): IObject;
 }
 
 export { BoxData, CanvasData, EllipseData, FrameData, GroupData, ImageData, LeaferData, LineData, PathData, PenData, PolygonData, RectData, StarData, TextData, UIData, UnitConvert };