sh-tools 2.2.11 → 2.2.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sh-tools",
-  "version": "2.2.11",
+  "version": "2.2.13",
   "description": "基于fetch和xe-utils二次封装，支持宏公式计算，及notification提示窗",
   "main": "packages/index.js",
   "scripts": {

package/packages/utils/other.js

@@ -168,7 +168,7 @@ export default {
 		//  是否需要对原值进行重写 默认为false
 		let resetValue = false
 		// 配置公式，优先取解析后的嵌套公式
-		let formula = $vUtils.get(renderProps, `formulaMap[${key}]`) || renderProps.formula
+		let formula = $vUtils.get(renderProps, `formulaMap.${key}`) || renderProps.formula
 		// 进行默认赋值 若没有任何解析原数返回
 		rvalue = value
 		if (!$vUtils.isNone(defaultValue) && $vUtils.isNone(value)) {
@@ -178,7 +178,8 @@ export default {
 		switch (rname) {
 			case '$vInput':
 			case '$vMoney':
-				if (editable && (rname === '$vMoney' || ['integer', 'number', 'float'].includes(type)) && !$vUtils.isNone(value)) {
+				let isNumberType = rname === '$vMoney' || ['integer', 'number', 'float'].includes(type)
+				if (editable && isNumberType && !$vUtils.isNone(value)) {
 					if ($vUtils.isNumber(+max) && +value > +max) {
 						value = +max
 					} else if ($vUtils.isNumber(+min) && +value < +min) {
@@ -193,13 +194,12 @@ export default {
 				} else if (!$vUtils.isNone(value) && ['number', 'float'].includes(type)) {
 					rvalue = $vUtils.truncate(value, digits)
 				}
-				if ($vUtils.isString(rvalue)) rvalue = $vUtils.replaceNutrim(rvalue)
 				if (rname === '$vMoney' && !$vUtils.isNone(rvalue)) {
 					rtext = $vUtils.truncate($vUtils.divide(rvalue, moneyUnit), digits)
 				}else if(rname === '$vInput' && format) {
 					rtext = $vUtils.format(format, rowData)
 				}
-				if (commafy && !bill && bill !== '0') rtext = $vUtils.commafy(rtext, { digits })
+				if (commafy && !bill && bill !== '0') rtext = $vUtils.commafy(rtext, { digits }).replace(/0+$/, '')
 				break
 			case '$vTime':
 				format = format ? format.replace('YYYY', 'yyyy').replace('DD', 'dd').replace('hh', 'HH') : defaultDateFormat[type]