sh-tools 2.3.3 → 2.3.5

package/package.json

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

package/packages/expr/index.js

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

package/packages/index.js

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

package/packages/utils/number.js

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

package/packages/utils/other.js

@@ -8,7 +8,6 @@ const defaultDateFormat = {
 	year: 'yyyy'
 }
 const endStrs = ['Id', '_id']
-const numberTypes = ['integer', 'number', 'float']
 const dateReplaceMap = { YYYY: 'yyyy', DD: 'dd', hh: 'HH' }
 
 export default {
@@ -159,8 +158,7 @@ export default {
 		// editable: 是否对返回值进行修正 默认 否
 		let rvalue, rtext, rname
 		let { $vUtils } = renderContext
-		let { min, max, digits, type, multiple, split, options, format, range, nodeKey, labelField, moneyUnit, openValue, openLabel, closeValue, closeLabel, defaultValue, separator } =
-			renderProps || {}
+		let { min, max, digits, type, multiple, split, options, format, range, nodeKey, labelField, openValue, openLabel, closeValue, closeLabel, defaultValue, separator } = renderProps || {}
 		let field = key
 		if (renderName === '$vRowCell') {
 			field = rowData[key + 'field'] || key
@@ -181,9 +179,11 @@ export default {
 		// 自定渲染器进行解析与重新赋值
 		switch (rname) {
 			case '$vInput':
+				rtext = format ? $vUtils.format(format, rowData) : rvalue
+				break
+			case '$vNumber':
 			case '$vMoney':
-				let isNumberType = rname === '$vMoney' || numberTypes.includes(type)
-				if (editable && isNumberType && !$vUtils.isNone(value)) {
+				if (editable && !$vUtils.isNone(value)) {
 					if ($vUtils.isNumber(+max) && +value > +max) {
 						value = +max
 					} else if ($vUtils.isNumber(+min) && +value < +min) {
@@ -192,16 +192,10 @@ export default {
 				}
 				if (!$vUtils.isNone(value) && type === 'integer') {
 					rvalue = $vUtils.toInteger(value)
-				} else if (!$vUtils.isNone(value) && numberTypes.includes(type)) {
+				} else if (!$vUtils.isNone(value)) {
 					rvalue = $vUtils.truncate(value, digits)
 				}
-				if (rname === '$vMoney' && !$vUtils.isNone(rvalue)) {
-					rtext = $vUtils.truncate($vUtils.divide(rvalue, moneyUnit), digits)
-				} else if (rname === '$vInput' && format) {
-					rtext = $vUtils.format(format, rowData)
-				} else {
-					rtext = rvalue
-				}
+				rtext = rvalue
 				break
 			case '$vTime':
 				format = format ? format.replace(dateReplaceMap, match => dateReplaceMap[match]) : defaultDateFormat[type]