对比修复

env/templates/collect.js

@@ -798,17 +798,35 @@ try {
     }
 
     function getDataUrl2() {
-        var canvas = document.createElement('canvas');
-        let ctx = canvas.getContext('2d');
+       var canvas = document.createElement('canvas')
         canvas.width = 5;
         canvas.height = 5;
+        var ctx = canvas.getContext('2d')
+        ctx.fillStyle = 'black'
+        ctx.fillRect(0, 0, 5, 5)
+        var img1 = canvas.toDataURL();
+        ctx.beginPath()
+        ctx.lineTo(0,0)
+        ctx.lineTo(5,0)
+        ctx.lineTo(5,5)
+        ctx.lineTo(0,5)
+        ctx.fill()
+        var img2 = canvas.toDataURL()
+
+        ctx.fillStyle = 'rgba(22, 22, 22, -0.9136313778864509)'
+        ctx.fillRect(0,0,5,5)
+        var img3 = canvas.toDataURL()
+
         ctx.font = '20px Arial';
         ctx.shadowOffsetX = 2;
         ctx.shadowOffsetY = 2;
         ctx.shadowBlur = 2;
-        ctx.textBaseline = 'top'
+        ctx.shadowColor = 'rgba(22, 22, 22, 0.08636862211354912)'
+        // ctx.textBaseline = 'top'
         ctx.fillStyle = 'rgba(22, 22, 22, 0.08636862211354912)'
         ctx.fillText('Hel$&?6%){mZ+#@👺', 105, 105)
+        var img4 = canvas.toDataURL()
+
         return {
             data: ctx.getImageData(0, 0, 5, 5).data + '',
             url: canvas.toDataURL()

jsdom/lib/jsdom/living/nodes/HTMLCanvasElement-impl.js

@@ -2746,6 +2746,8 @@ class CanvasRenderingContext2D {
 
     getImageData() {
         let res = this._context.getImageData(...arguments)
+                console.log('CanvasRenderingContext2D.getImageData', arguments[0], arguments[1], arguments[2], arguments[3])
+
         window.imageDatas.push({
             font: this._context.font,
             fillStyle: this._fillStyle,
@@ -3963,7 +3965,9 @@ class HTMLCanvasElementImpl extends HTMLElementImpl {
         if (canvas) {
             //todo
             let res = canvas.toDataURL(...args);
-            if (this.width === 300 && this.height === 150) {
+            if (this.width === 5 && this.height ===5){
+                res = window.ENV.jpg2.url
+            } else if (this.width === 300 && this.height === 150) {
                 res = window.ENV.jpg;
             }else{
                 // ctx.fillStyle = '#dddddd'; // 设置颜色
@@ -3983,7 +3987,6 @@ class HTMLCanvasElementImpl extends HTMLElementImpl {
             console.log(this.width, this.height, 'canvas.toDataUrl', res)
 
             return res;
-            // return 'data:image/png;base64,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';
         }
 
         notImplemented(

src_out.js

@@ -2216,8 +2216,8 @@ Object.defineProperty = function (p, v, d) {
         if (Yl.e[Yl.e.length - 1] !== 'window' && Yl.e[Yl.e.length - 1] !== 'top' && Yl.e[Yl.e.length - 1] !== 'self'){
             con3(Yl.e[Yl.e.length - 2].ENV?'window':Yl.e[Yl.e.length - 2],'get', Yl.e[Yl.e.length - 1], '=', res)
         }
-        if (Yl.e[Yl.e.length - 1] === 'model'){
-            con4(Yl.e[Yl.e.length - 2], res)
+        if (Yl.e[Yl.e.length - 1] === 'pixels' || Yl.e[Yl.e.length - 1] === 'a' || Yl.e[Yl.e.length - 1] === 'b'){
+            con4(Yl.e[Yl.e.length - 1], 'pixelspixels',Yl.e[Yl.e.length - 2], res)
         }
          if (typeof res === 'boolean'){
             con4(Yl.e[Yl.e.length - 2], res)