|
@@ -159,22 +159,22 @@ const stageIm = (function () {
|
|
}
|
|
}
|
|
|
|
|
|
function CheckPeg(text) {
|
|
function CheckPeg(text) {
|
|
- const pegReg = /[a-zA-Z]?[kK][0-9]+[++][0-9]{3}([.][0-9]+)?/;
|
|
|
|
|
|
+ const pegReg = /[a-zA-Z]*[kK][0-9]+[++][0-9]{3}([.][0-9]+)?/;
|
|
return pegReg.test(text);
|
|
return pegReg.test(text);
|
|
}
|
|
}
|
|
|
|
|
|
function getPegStr(text) {
|
|
function getPegStr(text) {
|
|
- const pegReg1 = /[a-zA-Z]?[kK][0-9]+[++][0-9]{3}([.][0-9]+)?[~~—][a-zA-Z]?[kK][0-9]+[++][0-9]{3}([.][0-9]+)?/;
|
|
|
|
|
|
+ const pegReg1 = /[a-zA-Z]*[kK][0-9]+[++][0-9]{3}([.][0-9]+)?[~~—][a-zA-Z]*[kK][0-9]+[++][0-9]{3}([.][0-9]+)?/;
|
|
const result1 = text.match(pegReg1);
|
|
const result1 = text.match(pegReg1);
|
|
if (result1) {
|
|
if (result1) {
|
|
return result1[0];
|
|
return result1[0];
|
|
} else {
|
|
} else {
|
|
- const pegReg2 = /[a-zA-Z]?[kK][0-9]+[++][0-9]{3}([.][0-9]+)?-[a-zA-Z]?[kK][0-9]+[++][0-9]{3}([.][0-9]+)?/;
|
|
|
|
|
|
+ const pegReg2 = /[a-zA-Z]*[kK][0-9]+[++][0-9]{3}([.][0-9]+)?-[a-zA-Z]*[kK][0-9]+[++][0-9]{3}([.][0-9]+)?/;
|
|
const result2 = text.match(pegReg2);
|
|
const result2 = text.match(pegReg2);
|
|
if (result2) {
|
|
if (result2) {
|
|
return result2[0];
|
|
return result2[0];
|
|
} else {
|
|
} else {
|
|
- const pegReg3 = /[a-zA-Z]?[kK][0-9]+[++][0-9]{3}([.][0-9]+)?/;
|
|
|
|
|
|
+ const pegReg3 = /[a-zA-Z]*[kK][0-9]+[++][0-9]{3}([.][0-9]+)?/;
|
|
const result3 = text.match(pegReg3);
|
|
const result3 = text.match(pegReg3);
|
|
return result3 ? result3[0] : '';
|
|
return result3 ? result3[0] : '';
|
|
}
|
|
}
|