sh-tools 2.3.2 → 2.3.4

package/package.json

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

package/packages/utils/other.js

@@ -157,10 +157,9 @@ export default {
 	// 封装 系统内对渲染器格式化方法
 	formatRender(value, key, rowData, renderName, renderProps, renderContext, editable) {
 		// editable: 是否对返回值进行修正 默认 否
-		let rvalue, rtext, rname, rcaculate
+		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
@@ -170,22 +169,6 @@ export default {
 		}
 		// 对于多选获取数组类型值进行解析 赋值
 		let oriArray = []
-		// 配置公式，优先取解析后的嵌套公式
-		let formula = renderProps.formula
-		let formulaList = $vUtils.get(renderProps, 'formulaList') || []
-		let caculateConfig = $vUtils.get(renderProps, 'caculateConfig') || {}
-		let caculateEnable = caculateConfig.enabled && (caculateConfig.type === 'all' || (caculateConfig.type === 'edit' && editable))
-		if (caculateEnable && formulaList.length > 0) {
-			for (let i = 0; i < formulaList.length; i++) {
-				let item = formulaList[i]
-				if (!item.content || !item.field) continue
-				rcaculate = $vUtils.calculate(item.content, rowData)
-				$vUtils.set(rowData, item.field, rcaculate)
-				if (item.field === field) break
-			}
-		} else if (caculateEnable && formula) {
-			rcaculate = $vUtils.calculate(formula, rowData)
-		}
 		// 进行默认赋值 若没有任何解析原数返回
 		rvalue = value
 		if (!$vUtils.isNone(defaultValue) && $vUtils.isNone(value)) {
@@ -206,17 +189,12 @@ export default {
 						value = +min
 					}
 				}
-				// 首先提取公式进行公式计算
-				if (rcaculate !== undefined) {
-					rvalue = rcaculate
-				} else if (!$vUtils.isNone(value) && type === 'integer') {
+				if (!$vUtils.isNone(value) && type === 'integer') {
 					rvalue = $vUtils.toInteger(value)
 				} else if (!$vUtils.isNone(value) && numberTypes.includes(type)) {
 					rvalue = $vUtils.truncate(value, digits)
 				}
-				if (rname === '$vMoney' && !$vUtils.isNone(rvalue)) {
-					rtext = $vUtils.truncate($vUtils.divide(rvalue, moneyUnit), digits)
-				} else if (rname === '$vInput' && format) {
+				if (rname === '$vInput' && format) {
 					rtext = $vUtils.format(format, rowData)
 				} else {
 					rtext = rvalue
@@ -301,6 +279,6 @@ export default {
 			default:
 				rtext = rvalue
 		}
-		return { rvalue, rtext, rcaculate, rname }
+		return { rvalue, rtext, rname }
 	}
 }