From 660da94ea381d3edf14f16a983d1ab672fa78e97 Mon Sep 17 00:00:00 2001 From: CPPAlien Date: Mon, 21 Jun 2021 12:26:51 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=AD=A3=E5=88=99=E8=A1=A8=E8=BE=BE?= =?UTF-8?q?=E5=8C=B9=E9=85=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- painter.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/painter.js b/painter.js index 4146bf4..0dac8cb 100644 --- a/painter.js +++ b/painter.js @@ -860,10 +860,10 @@ function setStringPrototype(screenK, scale) { if (this === '0') { return 0; } - const REG = /-?[0-9]+([.]{1}[0-9]+){0,1}(rpx|px|%)/g; + const REG = /-?[0-9]+(\.[0-9]+)?(rpx|px|%)/; const parsePx = origin => { - const results = REG.exec(origin); + const results = new RegExp(REG).exec(origin); if (!origin || !results) { console.error(`The size: ${origin} is illegal`); return 0; @@ -889,7 +889,7 @@ function setStringPrototype(screenK, scale) { return relativeViewRect[id][attr] } ); - const afterTwo = afterOne.replace(REG, parsePx); + const afterTwo = afterOne.replace(new RegExp(REG, 'g'), parsePx); return calc(afterTwo); } else { return parsePx(this);