@leafer/miniapp 1.0.0-rc.8 → 1.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer/miniapp",
-  "version": "1.0.0-rc.8",
+  "version": "1.0.0",
   "description": "@leafer/miniapp",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,13 +22,11 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/core": "1.0.0-rc.8",
-    "@leafer/partner": "1.0.0-rc.8",
-    "@leafer/canvas-miniapp": "1.0.0-rc.8",
-    "@leafer/image-miniapp": "1.0.0-rc.8",
-    "@leafer/interaction-miniapp": "1.0.0-rc.8"
+    "@leafer/core": "1.0.0",
+    "@leafer/canvas-miniapp": "1.0.0",
+    "@leafer/image-miniapp": "1.0.0"
   },
   "devDependencies": {
-    "@leafer/interface": "1.0.0-rc.8"
+    "@leafer/interface": "1.0.0"
   }
 }

package/src/index.ts

@@ -1,16 +1,13 @@
 export * from '@leafer/core'
-export * from '@leafer/partner'
 
 export * from '@leafer/canvas-miniapp'
 export * from '@leafer/image-miniapp'
-export * from '@leafer/interaction-miniapp'
 
 import { ICanvasType, ICreator, IExportFileType, IExportImageType, IFunction, IObject, IMiniappSelect, IMiniappSizeView, IBoundsData } from '@leafer/interface'
 import { Platform, Creator, FileHelper } from '@leafer/core'
 
 import { LeaferCanvas } from '@leafer/canvas-miniapp'
 import { LeaferImage } from '@leafer/image-miniapp'
-import { Interaction } from '@leafer/interaction-miniapp'
 
 
 const { mineType, fileType } = FileHelper
@@ -18,10 +15,7 @@ const { mineType, fileType } = FileHelper
 
 Object.assign(Creator, {
     canvas: (options?, manager?) => new LeaferCanvas(options, manager),
-    image: (options) => new LeaferImage(options),
-    hitCanvas: (options?, manager?) => new LeaferCanvas(options, manager),
-
-    interaction: (target, canvas, selector, options?) => { return new Interaction(target, canvas, selector, options) }
+    image: (options) => new LeaferImage(options)
 } as ICreator)
 
 
@@ -32,9 +26,12 @@ export function useCanvas(_canvasType: ICanvasType, app?: IObject): void {
             canvasToDataURL: (canvas: IObject, type?: IExportImageType, quality?: number) => canvas.toDataURL(mineType(type), quality),
             canvasToBolb: (canvas: IObject, type?: IExportFileType, quality?: number) => canvas.toBuffer(type, { quality }),
             canvasSaveAs: (canvas: IObject, filePath: string, quality?: any) => {
+                let data: string = canvas.toDataURL(mineType(fileType(filePath)), quality)
+                data = data.substring(data.indexOf('64,') + 3)
+                return Platform.origin.download(data, filePath)
+            },
+            download(data: string, filePath: string): Promise<void> {
                 return new Promise((resolve, reject) => {
-                    let data: string = canvas.toDataURL(mineType(fileType(filePath)), quality)
-                    data = data.substring(data.indexOf('64,') + 3)
                     let toAlbum: boolean
                     if (!filePath.includes('/')) {
                         filePath = `${app.env.USER_DATA_PATH}/` + filePath
@@ -49,9 +46,12 @@ export function useCanvas(_canvasType: ICanvasType, app?: IObject): void {
                             if (toAlbum) {
                                 Platform.miniapp.saveToAlbum(filePath).then(() => {
                                     fs.unlink({ filePath })
+                                    resolve()
                                 })
+                            } else {
+                                resolve()
                             }
-                            resolve()
+
                         },
                         fail(error: any) {
                             reject(error)
@@ -59,12 +59,12 @@ export function useCanvas(_canvasType: ICanvasType, app?: IObject): void {
                     })
                 })
             },
-            loadImage(url: string): Promise<HTMLImageElement> {
+            loadImage(src: string): Promise<HTMLImageElement> {
                 return new Promise((resolve, reject) => {
                     const img = Platform.canvas.view.createImage()
                     img.onload = () => { resolve(img) }
                     img.onerror = (error: any) => { reject(error) }
-                    img.src = url
+                    img.src = Platform.image.getRealURL(src)
                 })
             },
             noRepeat: 'repeat-x' // fix: 微信小程序 createPattern 直接使用 no-repeat 有bug，导致无法显示

package/types/index.d.ts

@@ -1,8 +1,6 @@
 export * from '@leafer/core';
-export * from '@leafer/partner';
 export * from '@leafer/canvas-miniapp';
 export * from '@leafer/image-miniapp';
-export * from '@leafer/interaction-miniapp';
 import { ICanvasType, IObject } from '@leafer/interface';
 
 declare function useCanvas(_canvasType: ICanvasType, app?: IObject): void;