From 2c47995540ec62a1bca42590472aca6677d7ef48 Mon Sep 17 00:00:00 2001 From: xuying <33517362+tangying1027@users.noreply.github.com> Date: Thu, 13 Feb 2025 19:19:52 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E4=BF=AE=E5=A4=8Dci=20(#315)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore(release): release * chore: 修复ci --------- Co-authored-by: xuying.xu --- .github/workflows/ci.yml | 2 +- packages/f-my/src/adapter.ts | 8 +++----- packages/f-my/src/web.tsx | 36 ++++++++++++++---------------------- 3 files changed, 18 insertions(+), 28 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 21a5189..6802f07 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: strategy: matrix: - node_version: ['18', '19'] + node_version: ['18'] # Steps represent a sequence of tasks that will be executed as part of the job steps: diff --git a/packages/f-my/src/adapter.ts b/packages/f-my/src/adapter.ts index 7027197..87e88ec 100644 --- a/packages/f-my/src/adapter.ts +++ b/packages/f-my/src/adapter.ts @@ -139,9 +139,7 @@ export function createCanvasAdapter(canvasContext: any) { function bindDrawRunnable(fn: any, canvasContext: IMiniProgramCanvasContext_v1, addCallIdAction: () => void) { return function (this: any, ...args: unknown[]) { try { - fn.apply(this, arguments); - } catch(ex) {debugger - throw ex; + fn.apply(this, args); } finally { canvasContext.draw(true); addCallIdAction(); @@ -317,11 +315,11 @@ class SimulatedCanvasContext { public addCallIdActions(): void { const { linearGradient, radialGradient } = this._callIdCache; this._enableCacheCallId = false; - for (let item of linearGradient ) { + for (const item of linearGradient ) { const gradient = this.ctx.createLinearGradient(0, 0, 0, 0); Object.assign(gradient, item); } - for (let item of radialGradient ) { + for (const item of radialGradient ) { const gradient = this.ctx.createRadialGradient(0, 0, 0, 0, 0, 0); Object.assign(gradient, item); } diff --git a/packages/f-my/src/web.tsx b/packages/f-my/src/web.tsx index a78fb45..bf4bd39 100644 --- a/packages/f-my/src/web.tsx +++ b/packages/f-my/src/web.tsx @@ -88,7 +88,6 @@ Component({ .select(`#${id}`) .boundingClientRect() .exec((res) => { - if (!res[0]) { return; } @@ -105,29 +104,22 @@ Component({ height: height * pixelRatio, }, () => { - const { - element: canvas, - context - } = createCanvasAdapter(my.createCanvasContext(id)); - try { - const fCanvas = this.createCanvas({ - width, - height, - pixelRatio, - context, - createImage: canvas.createImage.bind(canvas), - requestAnimationFrame: canvas.requestAnimationFrame.bind(canvas), - cancelAnimationFrame: canvas.cancelAnimationFrame.bind(canvas), - }); - fCanvas.render().catch((error) => {debugger - this.catchError(error); - }); - } catch(ex) { - debugger - } + const { element: canvas, context } = createCanvasAdapter(my.createCanvasContext(id)); + const fCanvas = this.createCanvas({ + width, + height, + pixelRatio, + context, + createImage: canvas.createImage.bind(canvas), + requestAnimationFrame: canvas.requestAnimationFrame.bind(canvas), + cancelAnimationFrame: canvas.cancelAnimationFrame.bind(canvas), + }); + fCanvas.render().catch((error) => { + this.catchError(error); + }); }, ); - }); + }); }, catchError(error) {