sh-tools 2.3.5 → 2.3.6

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "sh-tools",
-	"version": "2.3.5",
+	"version": "2.3.6",
 	"description": "基于fetch和xe-utils二次封装，支持宏公式计算",
 	"main": "packages/index.js",
 	"scripts": {
@@ -12,7 +12,7 @@
 	"author": "神秘的sh",
 	"license": "ISC",
 	"dependencies": {
-		"expr-eval": "^2.0.2",
+		"hot-formula-parser": "^4.0.0",
 		"xe-utils": "^3.8.2"
 	},
 	"devDependencies": {

package/packages/index.js

@@ -1,5 +1,5 @@
 import http from './api'
 import utils from './utils'
-import expr from './expr'
+import parser from './parser'
 
-export { http, utils, expr }
+export { http, utils, parser }

package/packages/parser/index.js

@@ -0,0 +1,4 @@
+import { Parser } from 'hot-formula-parser'
+const formulaParser = new Parser()
+
+export default formulaParser

package/packages/utils/number.js

@@ -1,6 +1,6 @@
 import XEUtils from 'xe-utils'
 import stringUtil from './string'
-import expParser from '../expr'
+import formulaParser from '../parser'
 
 export default {
 	truncate(num, digits) {
@@ -17,7 +17,7 @@ export default {
 		if (data && XEUtils.isPlainObject(data)) {
 			formula = stringUtil.format(formula, data, true)
 		}
-		const expr = expParser.parse(formula)
-		return expr.evaluate(data)
+		let { result } = formulaParser.parse(formula)
+		return result
 	}
 }

package/packages/expr/index.js

@@ -1,5 +0,0 @@
-import { Parser } from 'expr-eval'
-
-const parser = new Parser()
-
-export default parser