@leafer/miniapp-core 2.0.8 → 2.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer/miniapp-core",
-  "version": "2.0.8",
+  "version": "2.1.0",
   "description": "@leafer/miniapp-core",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -24,10 +24,10 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/core": "2.0.8",
-    "@leafer/canvas-miniapp": "2.0.8",
-    "@leafer/image-miniapp": "2.0.8",
-    "@leafer/partner": "2.0.8",
-    "@leafer/interface": "2.0.8"
+    "@leafer/core": "2.1.0",
+    "@leafer/canvas-miniapp": "2.1.0",
+    "@leafer/image-miniapp": "2.1.0",
+    "@leafer/partner": "2.1.0",
+    "@leafer/interface": "2.1.0"
   }
 }

package/src/index.ts

@@ -3,7 +3,7 @@ export * from '@leafer/core'
 export * from '@leafer/canvas-miniapp'
 export * from '@leafer/image-miniapp'
 
-import { ICanvasType, ICreator, IExportFileType, IExportImageType, IResponseType, IFunction, IObject, IMiniappSelect, IMiniappSizeView, IBoundsData, IImageCrossOrigin, ILeaferImage } from '@leafer/interface'
+import { ICanvasType, ICreator, IExportFileType, ILeaferCanvas, IExportImageType, IResponseType, IFunction, IObject, IMiniappSelect, IMiniappSizeView, IBoundsData, IImageCrossOrigin, ILeaferImage } from '@leafer/interface'
 import { Platform, Creator, FileHelper, defineKey } from '@leafer/core'
 
 import { LeaferCanvas } from '@leafer/canvas-miniapp'
@@ -60,7 +60,7 @@ export function useCanvas(_canvasType: ICanvasType, app?: IObject): void {
         },
         loadImage(src: string, _crossOrigin?: IImageCrossOrigin, _leaferImage?: ILeaferImage): Promise<HTMLImageElement> {
             return new Promise((resolve, reject) => {
-                const img = Platform.canvas.view.createImage()
+                const img = Platform.getCanvas().view.createImage()  // 抖音小程序 Platform.canvas 图片无法加载，需使用 Platform.renderCanvas
                 img.onload = () => { resolve(img) }
                 img.onerror = (error: any) => { reject(error) }
                 img.src = Platform.image.getRealURL(src)
@@ -140,11 +140,20 @@ export function useCanvas(_canvasType: ICanvasType, app?: IObject): void {
 
     Platform.canvas = Creator.canvas()
     Platform.conicGradientSupport = !!Platform.canvas.context.createConicGradient
+
+    defineKey(Platform, 'devicePixelRatio', { get() { return Math.max(1, app.getWindowInfo ? app.getWindowInfo().pixelRatio : app.getSystemInfoSync().pixelRatio) } })
 }
 
+
 Platform.name = 'miniapp'
+
+Platform.getCanvas = function (): ILeaferCanvas {
+    const { renderCanvas } = Platform
+    return (renderCanvas && renderCanvas.view) ? renderCanvas : Platform.canvas
+}
+
 Platform.requestRender = function (render: IFunction): void {
-    const { view } = Platform.renderCanvas || Platform.canvas
+    const { view } = Platform.getCanvas()
     view.requestAnimationFrame ? view.requestAnimationFrame(render) : setTimeout(render, 16) // fix 抖音小程序
 }
-defineKey(Platform, 'devicePixelRatio', { get() { return Math.max(1, wx.getWindowInfo ? wx.getWindowInfo().pixelRatio : wx.getSystemInfoSync().pixelRatio) } })
+