open/PainterCore
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 正则表达匹配问题

Browse Source
This commit is contained in:
CPPAlien 2021-06-21 12:26:51 +08:00
parent 25bb201c9e
commit 660da94ea3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
painter.js
View File

@ -860,10 +860,10 @@ function setStringPrototype(screenK, scale) {
if (this === '0') { if (this === '0') {
return 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 parsePx = origin => {
const results = REG.exec(origin); const results = new RegExp(REG).exec(origin);
if (!origin || !results) { if (!origin || !results) {
console.error(`The size: ${origin} is illegal`); console.error(`The size: ${origin} is illegal`);
return 0; return 0;
@ -889,7 +889,7 @@ function setStringPrototype(screenK, scale) {
return relativeViewRect[id][attr] return relativeViewRect[id][attr]
} }
); );
const afterTwo = afterOne.replace(REG, parsePx); const afterTwo = afterOne.replace(new RegExp(REG, 'g'), parsePx);
return calc(afterTwo); return calc(afterTwo);
} else { } else {
return parsePx(this); return parsePx(this);