@leafer-ui/interface 1.6.1 → 1.6.2

package/package.json

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

package/src/IUI.ts

@@ -12,6 +12,7 @@ import { IOverflow } from './type/IType'
 import { IAnimation, IAnimate, IKeyframe, IKeyframeId, IAnimateType } from './IAnimation'
 import { ILeafer } from './app/ILeafer'
 import { IEditorConfig } from './editor/IEditor'
+import { IColorString } from './type/IStringType'
 
 // Line
 export interface ILine extends ILineAttrData, IUI {
@@ -207,6 +208,7 @@ export interface IText extends ITextAttrData, ITextStyleAttrData, IUI {
 }
 interface ITextAttrData {
     text?: string | number
+    placeholder?: string
     padding?: IFourNumber
     resizeFontSize?: boolean
     boxStyle?: IBackgroundBoxStyle
@@ -223,6 +225,7 @@ export interface ITextData extends ITextAttrData, ITextStyleComputedData, IUIDat
     __letterSpacing?: number
     __padding?: number[]
     __clipText?: boolean
+    __isPlacehold?: boolean
     __textBoxBounds?: IBoundsData
 }
 export interface ITextInputData extends ITextAttrData, ITextStyleInputData, IUIBaseInputData {
@@ -413,6 +416,8 @@ export interface IUI extends IUIAttrData, IFillAttrData, IStrokeAttrData, ICorne
     __drawAfterFill?(canvas: ILeaferCanvas, options: IRenderOptions): void
     __drawContent?(canvas: ILeaferCanvas, options: IRenderOptions): void
 
+    drawImagePlaceholder(canvas: ILeaferCanvas, image: ILeaferImage): void
+
     animate(keyframe?: IUIInputData | IKeyframe[] | IAnimation | IAnimation[], options?: ITransition, type?: IAnimateType, isTemp?: boolean): IAnimate
     killAnimate(type?: IAnimateType, nextStyle?: IUIInputData): void
 
@@ -451,6 +456,7 @@ interface IUIAttrData {
     selectedStyle?: IStateStyle
     disabledStyle?: IStateStyle
     placeholderStyle?: IStateStyle
+    placeholderColor?: IColorString
 
     editConfig?: IEditorConfig
     editOuter?: string

package/src/app/IApp.ts

@@ -6,7 +6,7 @@ import { IEditorConfig } from '../editor/IEditor'
 export interface IApp extends ILeafer {
     children: ILeafer[]
     realCanvas: boolean
-    forEach(fn: IAppForEachFn): void
+    forEach(fn: IAppForEachFunction): void
 }
 
 export interface IAppConfig extends ILeaferConfig {
@@ -16,6 +16,6 @@ export interface IAppConfig extends ILeaferConfig {
     editor?: IEditorConfig
 }
 
-export interface IAppForEachFn {
+export interface IAppForEachFunction {
     (value: ILeafer, index: number, array: ILeafer[]): void
 }

package/src/index.ts

@@ -1,6 +1,6 @@
 export * from '@leafer/interface'
 
-export { IApp, IAppConfig, IAppForEachFn } from './app/IApp'
+export { IApp, IAppConfig, IAppForEachFunction } from './app/IApp'
 export { ILeafer } from './app/ILeafer'
 
 export {

package/src/module/IPaint.ts

@@ -12,6 +12,7 @@ export interface IPaintModule {
     fill(fill: string, ui: IUI, canvas: ILeaferCanvas,): void
     fills(fills: ILeafPaint[], ui: IUI, canvas: ILeaferCanvas): void
 
+    fillPathOrText(ui: IUI, canvas: ILeaferCanvas): void
     fillText(ui: IUI, canvas: ILeaferCanvas): void
 
     stroke(stroke: string, ui: IUI, canvas: ILeaferCanvas): void
@@ -26,7 +27,7 @@ export interface IPaintModule {
 
 export interface IPaintImageModule {
     image(ui: IUI, attrName: string, paint: IImagePaint, boxBounds: IBoundsData, firstUse: boolean): ILeafPaint
-    checkImage(ui: IUI, canvas: ILeaferCanvas, paint: ILeafPaint, allowPaint?: boolean): boolean
+    checkImage(ui: IUI, canvas: ILeaferCanvas, paint: ILeafPaint, allowPaint?: boolean): boolean // 返回true表示已进行了原生绘制
     createPattern(ui: IUI, paint: ILeafPaint, pixelRatio: number): boolean
     recycleImage(attrName: IPaintAttr, data: IUIData): IBooleanMap
 

package/src/module/IState.ts

@@ -12,6 +12,7 @@ export interface IStateModule {
     isFocus(leaf: ILeaf, button?: ILeaf | boolean): boolean
     isHover(leaf: ILeaf, button?: ILeaf | boolean): boolean
     isPress(leaf: ILeaf, button?: ILeaf | boolean): boolean
+    isPlacehold(leaf: ILeaf, button?: ILeaf | boolean): boolean
 
     isDrag(leaf: ILeaf, button?: boolean | ILeaf): boolean
 

package/src/type/IType.ts

@@ -80,6 +80,7 @@ export interface IImagePaint extends IPaintBase {
 
     changeful?: boolean // 会频繁变化，不生成图案（有特殊性能优化，一般用于游戏精灵、动图场景）
     sync?: boolean // 同步显示，不走任务列表生成图案
+    showProgress?: boolean // 是否显示进度
 }
 export interface IImageFilters {
     exposure?: number // 曝光

package/types/index.d.ts

@@ -65,6 +65,7 @@ interface IImagePaint extends IPaintBase {
     repeat?: IRepeat;
     changeful?: boolean;
     sync?: boolean;
+    showProgress?: boolean;
 }
 interface IImageFilters {
     exposure?: number;
@@ -726,6 +727,7 @@ interface IText extends ITextAttrData, ITextStyleAttrData, IUI {
 }
 interface ITextAttrData {
     text?: string | number;
+    placeholder?: string;
     padding?: IFourNumber;
     resizeFontSize?: boolean;
     boxStyle?: IBackgroundBoxStyle;
@@ -739,6 +741,7 @@ interface ITextData extends ITextAttrData, ITextStyleComputedData, IUIData {
     __letterSpacing?: number;
     __padding?: number[];
     __clipText?: boolean;
+    __isPlacehold?: boolean;
     __textBoxBounds?: IBoundsData$1;
 }
 interface ITextInputData extends ITextAttrData, ITextStyleInputData, IUIBaseInputData {
@@ -890,6 +893,7 @@ interface IUI extends IUIAttrData, IFillAttrData, IStrokeAttrData, ICornerRadius
     __drawPathByBox(drawer: IPathDrawer): void;
     __drawAfterFill?(canvas: ILeaferCanvas, options: IRenderOptions): void;
     __drawContent?(canvas: ILeaferCanvas, options: IRenderOptions): void;
+    drawImagePlaceholder(canvas: ILeaferCanvas, image: ILeaferImage): void;
     animate(keyframe?: IUIInputData | IKeyframe[] | IAnimation | IAnimation[], options?: ITransition, type?: IAnimateType, isTemp?: boolean): IAnimate;
     killAnimate(type?: IAnimateType, nextStyle?: IUIInputData): void;
     export(filename: string, options?: IExportOptions | number | boolean): Promise<IExportResult>;
@@ -915,6 +919,7 @@ interface IUIAttrData {
     selectedStyle?: IStateStyle;
     disabledStyle?: IStateStyle;
     placeholderStyle?: IStateStyle;
+    placeholderColor?: IColorString;
     editConfig?: IEditorConfig;
     editOuter?: string;
     editInner?: string;
@@ -976,7 +981,7 @@ interface ILeafer extends IGroup, ILeaferAttrData, IControl {
 interface IApp extends ILeafer {
     children: ILeafer[];
     realCanvas: boolean;
-    forEach(fn: IAppForEachFn): void;
+    forEach(fn: IAppForEachFunction): void;
 }
 interface IAppConfig extends ILeaferConfig {
     ground?: ILeaferConfig;
@@ -984,7 +989,7 @@ interface IAppConfig extends ILeaferConfig {
     sky?: ILeaferConfig;
     editor?: IEditorConfig;
 }
-interface IAppForEachFn {
+interface IAppForEachFunction {
     (value: ILeafer, index: number, array: ILeafer[]): void;
 }
 
@@ -1061,6 +1066,7 @@ interface IStateModule {
     isFocus(leaf: ILeaf, button?: ILeaf | boolean): boolean;
     isHover(leaf: ILeaf, button?: ILeaf | boolean): boolean;
     isPress(leaf: ILeaf, button?: ILeaf | boolean): boolean;
+    isPlacehold(leaf: ILeaf, button?: ILeaf | boolean): boolean;
     isDrag(leaf: ILeaf, button?: boolean | ILeaf): boolean;
     setStyleName(leaf: ILeaf, styleName: IString$1, value: IBoolean$1): void;
     set(leaf: ILeaf, stateName: IString$1): void;
@@ -1080,6 +1086,7 @@ interface IPaintModule {
     compute(attrName: IPaintAttr, ui: IUI): void;
     fill(fill: string, ui: IUI, canvas: ILeaferCanvas): void;
     fills(fills: ILeafPaint[], ui: IUI, canvas: ILeaferCanvas): void;
+    fillPathOrText(ui: IUI, canvas: ILeaferCanvas): void;
     fillText(ui: IUI, canvas: ILeaferCanvas): void;
     stroke(stroke: string, ui: IUI, canvas: ILeaferCanvas): void;
     strokes(strokes: ILeafPaint[], ui: IUI, canvas: ILeaferCanvas): void;
@@ -1129,4 +1136,4 @@ interface IFilterFunction {
     (filter: IFilter, ui: IUI, bounds: IMatrixWithBoundsScaleData, currentCanvas: ILeaferCanvas, originCanvas: ILeaferCanvas, shape: ICachedShape): void;
 }
 
-export type { IAnimate, IAnimateKeyframe, IAnimateList, IAnimateType, IAnimation, IApp, IAppConfig, IAppData, IAppForEachFn, IAppInputData, IArrow, IArrowData, IArrowInputData, IArrowType, IBackgroundBoxStyle, IBlurEffect, IBox, IBoxData, IBoxInputData, ICachedShape, ICanvas, ICanvasData, ICanvasInputData, IColor, IColorConvertModule, IColorStop, IColorString, IComputedKeyframe, ICornerRadiusString, IDashPatternString, IEditBoxBase, IEditPoint, IEditPointInputData, IEditPointType, IEditToolFunction, IEditorBase, IEditorBeforeMove, IEditorBeforeRotate, IEditorBeforeScale, IEditorBeforeSelect, IEditorBeforeSkew, IEditorConfig, IEditorConfigFunction, IEditorDragStartData, IEditorMoveData, IEditorRotationData, IEditorScaleData, IEditorSelectData, IEditorSkewData, IEffect, IEffectAttrData, IEffectComputedData, IEffectInputData, IEffectModule, IEllipse, IEllipseData, IEllipseInputData, IExportModule, IFill, IFilterFunction, IFilterModule, IFilterProcessor, IFindUIMethod, IFlow, IFlowData, IFlowInputData, IFontWeight, IFontWeightNumer, IFontWeightString, IFrame, IFrameData, IFrameInputData, IFrameRenderModule, IGIF, IGIFData, IGIFInputData, IGradientPaint, IGradientType, IGrayscaleEffect, IGroup, IGroupData, IGroupInputData, IGroupRenderModule, IImage, IImageData, IImageFilters, IImageInputData, IImagePaint, IImagePaintMode, IImageRenderModule, IKeyframe, IKeyframeId, IKeyframesAnimation, ILeafFill, ILeafPaint, ILeafPaintColor, ILeafPaintPatternData, ILeafShadowEffect, ILeafStrokePaint, ILeafer, ILeaferData, ILeaferInputData, ILine, ILineData, ILineInputData, IOverflow, IPaint, IPaintAttr, IPaintBase, IPaintGradientModule, IPaintImageModule, IPaintModule, IPaintString, IPaintType, IPath, IPathArrowModule, IPathData, IPathDataArrow, IPathDataArrowMap, IPathDataArrowOffset, IPathInputData, IPen, IPenData, IPenInputData, IPercent, IPolygon, IPolygonData, IPolygonInputData, IRGB, IRGBA, IRect, IRectData, IRectInputData, IRectRenderModule, IRepeat, IRobot, IRobotActionName, IRobotActions, IRobotAnimation, IRobotComputedKeyframe, IRobotData, IRobotInputData, IRobotKeyframe, IShadowEffect, IShadowString, ISolidPaint, IStar, IStarData, IStarInputData, IStateModule, IStateName, IStateStyle, IStates, IStroke, IStrokeAlign, IStrokeAttrData, IStrokeCap, IStrokeComputedData, IStrokeInputData, IStrokeJoin, IStrokeWidthString, IStyleAnimation, IText, ITextAlign, ITextCase, ITextCharData, ITextConvertModule, ITextData, ITextDecoration, ITextDecorationData, ITextDecorationType, ITextDrawData, ITextInputData, ITextRenderModule, ITextRowData, ITextStyleAttrData, ITextStyleComputedData, ITextStyleInputData, ITextWordData, ITextWrap, ITransitionFunction, ITransitionMap, ITransitionModule, IUI, IUIBaseInputData, IUIBoundsModule, IUIData, IUIHitModule, IUIInputData, IUIJSONData, IUIRenderModule, IUITag, IVectorPath, IVerticalAlign, IVideo, IVideoData, IVideoInputData, IWritingMode };
+export type { IAnimate, IAnimateKeyframe, IAnimateList, IAnimateType, IAnimation, IApp, IAppConfig, IAppData, IAppForEachFunction, IAppInputData, IArrow, IArrowData, IArrowInputData, IArrowType, IBackgroundBoxStyle, IBlurEffect, IBox, IBoxData, IBoxInputData, ICachedShape, ICanvas, ICanvasData, ICanvasInputData, IColor, IColorConvertModule, IColorStop, IColorString, IComputedKeyframe, ICornerRadiusString, IDashPatternString, IEditBoxBase, IEditPoint, IEditPointInputData, IEditPointType, IEditToolFunction, IEditorBase, IEditorBeforeMove, IEditorBeforeRotate, IEditorBeforeScale, IEditorBeforeSelect, IEditorBeforeSkew, IEditorConfig, IEditorConfigFunction, IEditorDragStartData, IEditorMoveData, IEditorRotationData, IEditorScaleData, IEditorSelectData, IEditorSkewData, IEffect, IEffectAttrData, IEffectComputedData, IEffectInputData, IEffectModule, IEllipse, IEllipseData, IEllipseInputData, IExportModule, IFill, IFilterFunction, IFilterModule, IFilterProcessor, IFindUIMethod, IFlow, IFlowData, IFlowInputData, IFontWeight, IFontWeightNumer, IFontWeightString, IFrame, IFrameData, IFrameInputData, IFrameRenderModule, IGIF, IGIFData, IGIFInputData, IGradientPaint, IGradientType, IGrayscaleEffect, IGroup, IGroupData, IGroupInputData, IGroupRenderModule, IImage, IImageData, IImageFilters, IImageInputData, IImagePaint, IImagePaintMode, IImageRenderModule, IKeyframe, IKeyframeId, IKeyframesAnimation, ILeafFill, ILeafPaint, ILeafPaintColor, ILeafPaintPatternData, ILeafShadowEffect, ILeafStrokePaint, ILeafer, ILeaferData, ILeaferInputData, ILine, ILineData, ILineInputData, IOverflow, IPaint, IPaintAttr, IPaintBase, IPaintGradientModule, IPaintImageModule, IPaintModule, IPaintString, IPaintType, IPath, IPathArrowModule, IPathData, IPathDataArrow, IPathDataArrowMap, IPathDataArrowOffset, IPathInputData, IPen, IPenData, IPenInputData, IPercent, IPolygon, IPolygonData, IPolygonInputData, IRGB, IRGBA, IRect, IRectData, IRectInputData, IRectRenderModule, IRepeat, IRobot, IRobotActionName, IRobotActions, IRobotAnimation, IRobotComputedKeyframe, IRobotData, IRobotInputData, IRobotKeyframe, IShadowEffect, IShadowString, ISolidPaint, IStar, IStarData, IStarInputData, IStateModule, IStateName, IStateStyle, IStates, IStroke, IStrokeAlign, IStrokeAttrData, IStrokeCap, IStrokeComputedData, IStrokeInputData, IStrokeJoin, IStrokeWidthString, IStyleAnimation, IText, ITextAlign, ITextCase, ITextCharData, ITextConvertModule, ITextData, ITextDecoration, ITextDecorationData, ITextDecorationType, ITextDrawData, ITextInputData, ITextRenderModule, ITextRowData, ITextStyleAttrData, ITextStyleComputedData, ITextStyleInputData, ITextWordData, ITextWrap, ITransitionFunction, ITransitionMap, ITransitionModule, IUI, IUIBaseInputData, IUIBoundsModule, IUIData, IUIHitModule, IUIInputData, IUIJSONData, IUIRenderModule, IUITag, IVectorPath, IVerticalAlign, IVideo, IVideoData, IVideoInputData, IWritingMode };