@leafer/image 1.4.0 → 1.4.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer/image",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "@leafer/image",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,11 +22,11 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/task": "1.4.0",
-    "@leafer/file": "1.4.0",
-    "@leafer/platform": "1.4.0"
+    "@leafer/task": "1.4.1",
+    "@leafer/file": "1.4.1",
+    "@leafer/platform": "1.4.1"
   },
   "devDependencies": {
-    "@leafer/interface": "1.4.0"
+    "@leafer/interface": "1.4.1"
   }
 }

package/src/ImageManager.ts

@@ -1,27 +1,18 @@
 import { IImageManager, ILeaferImageConfig, ILeaferImage, IExportFileType } from '@leafer/interface'
 import { Creator } from '@leafer/platform'
-import { FileHelper } from '@leafer/file'
+import { FileHelper, Resource } from '@leafer/file'
 import { TaskProcessor } from '@leafer/task'
 
 
 export const ImageManager: IImageManager = {
 
-    map: {},
-
     recycledList: [],
 
-    tasker: new TaskProcessor(),
-
     patternTasker: new TaskProcessor(),
 
-    get isComplete() { return I.tasker.isComplete },
-
     get(config: ILeaferImageConfig): ILeaferImage {
-        let image = I.map[config.url]
-        if (!image) {
-            image = Creator.image(config)
-            I.map[config.url] = image
-        }
+        let image: ILeaferImage = Resource.get(config.url)
+        if (!image) Resource.set(config.url, image = Creator.image(config))
         image.use++
         return image
     },
@@ -36,7 +27,7 @@ export const ImageManager: IImageManager = {
         if (list.length > 100) { // cache 100
             list.forEach(image => {
                 if (!image.use && image.url) {
-                    delete I.map[image.url]
+                    Resource.remove(image.url)
                     image.destroy()
                 }
             })
@@ -61,7 +52,6 @@ export const ImageManager: IImageManager = {
     },
 
     destroy(): void {
-        I.map = {}
         I.recycledList = []
     }
 

package/src/LeaferImage.ts

@@ -1,5 +1,6 @@
 import { ILeaferImage, ILeaferImageConfig, IFunction, IObject, InnerId, IMatrixData, ICanvasPattern, ILeaferImageCacheCanvas, ILeaferImagePatternPaint } from '@leafer/interface'
 import { Platform } from '@leafer/platform'
+import { Resource } from '@leafer/file'
 import { IncrementId } from '@leafer/math'
 
 import { ImageManager } from './ImageManager'
@@ -36,21 +37,20 @@ export class LeaferImage implements ILeaferImage {
 
     constructor(config: ILeaferImageConfig) {
         this.innerId = create(IMAGE)
-        this.config = config || { url: '' }
-        this.isSVG = ImageManager.isFormat('svg', config)
-        this.hasOpacityPixel = ImageManager.hasOpacityPixel(config)
+        this.config = config || (config = { url: '' })
+        if (config.view) {
+            const { view } = config
+            this.setView(view.config ? view.view : view)
+        }
+
+        ImageManager.isFormat('svg', config) && (this.isSVG = true)
+        ImageManager.hasOpacityPixel(config) && (this.hasOpacityPixel = true)
     }
 
     public load(onSuccess?: IFunction, onError?: IFunction): number {
         if (!this.loading) {
             this.loading = true
-            ImageManager.tasker.add(async () => await Platform.origin.loadImage(this.url).then((img) => {
-                this.ready = true
-                this.width = img.naturalWidth || img.width
-                this.height = img.naturalHeight || img.height
-                this.view = img
-                this.onComplete(true)
-            }).catch((e) => {
+            Resource.tasker.add(async () => await Platform.origin.loadImage(this.url as string).then(img => this.setView(img)).catch((e) => {
                 this.error = e
                 this.onComplete(false)
             }))
@@ -68,6 +68,14 @@ export class LeaferImage implements ILeaferImage {
         l[index] = l[index + 1] = undefined
     }
 
+    protected setView(img: any): void {
+        this.ready = true
+        this.width = img.naturalWidth || img.width
+        this.height = img.naturalHeight || img.height
+        this.view = img
+        this.onComplete(true)
+    }
+
     protected onComplete(isSuccess: boolean): void {
         let odd: number
         this.waitComplete.forEach((item, index) => {
@@ -84,6 +92,10 @@ export class LeaferImage implements ILeaferImage {
         this.loading = false
     }
 
+    public getFull(_filters?: IObject): any {
+        return this.view
+    }
+
     public getCanvas(width: number, height: number, opacity?: number, _filters?: IObject): any {
         width || (width = this.width)
         height || (height = this.height)

package/types/index.d.ts

@@ -19,7 +19,9 @@ declare class LeaferImage implements ILeaferImage {
     constructor(config: ILeaferImageConfig);
     load(onSuccess?: IFunction, onError?: IFunction): number;
     unload(index: number, stopEvent?: boolean): void;
+    protected setView(img: any): void;
     protected onComplete(isSuccess: boolean): void;
+    getFull(_filters?: IObject): any;
     getCanvas(width: number, height: number, opacity?: number, _filters?: IObject): any;
     getPattern(canvas: any, repeat: string | null, transform?: IMatrixData, paint?: ILeaferImagePatternPaint): ICanvasPattern;
     destroy(): void;