|
|
@@ -293,13 +293,13 @@ $(document).ready(() => {
|
|
|
} else if (/^[a-z]/.test(expr[i])) {
|
|
|
if (num !== '') {
|
|
|
param.push({type: 'num', value: num});
|
|
|
- base = '';
|
|
|
+ num = '';
|
|
|
}
|
|
|
base = base + expr[i];
|
|
|
} else if (expr[i] === '(') {
|
|
|
if (num !== '') {
|
|
|
param.push({type: 'num', value: num});
|
|
|
- base = '';
|
|
|
+ num = '';
|
|
|
}
|
|
|
if (base !== '') {
|
|
|
param.push({type: 'base', value: base});
|
|
|
@@ -309,7 +309,7 @@ $(document).ready(() => {
|
|
|
} else if (expr[i] === ')') {
|
|
|
if (num !== '') {
|
|
|
param.push({type: 'num', value: num});
|
|
|
- base = '';
|
|
|
+ num = '';
|
|
|
}
|
|
|
if (base !== '') {
|
|
|
param.push({type: 'base', value: base});
|
|
|
@@ -319,7 +319,7 @@ $(document).ready(() => {
|
|
|
} else if (/^[\+\-*\/]/.test(expr[i])) {
|
|
|
if (num !== '') {
|
|
|
param.push({type: 'num', value: num});
|
|
|
- base = '';
|
|
|
+ num = '';
|
|
|
}
|
|
|
if (base !== '') {
|
|
|
param.push({type: 'base', value: base});
|
|
|
@@ -332,7 +332,7 @@ $(document).ready(() => {
|
|
|
}
|
|
|
if (num !== '') {
|
|
|
param.push({type: 'num', value: num});
|
|
|
- base = '';
|
|
|
+ num = '';
|
|
|
}
|
|
|
if (base !== '') {
|
|
|
param.push({type: 'base', value: base});
|
|
|
@@ -373,7 +373,7 @@ $(document).ready(() => {
|
|
|
return [false, '输入的表达式非法：不存在计算基数' + p.value];
|
|
|
if (invalidParam && invalidParam.indexOf(p.value) >= 0)
|
|
|
return [false, '不可使用计算基数' + p.value];
|
|
|
- if (i > 0 && param[i - 1].type === 'calc')
|
|
|
+ if (i > 0 && param[i - 1].type !== 'calc')
|
|
|
return [false, '输入的表达式非法：' + p.value + '前应有运算符'];
|
|
|
}
|
|
|
if (p.type === 'left') {
|
