sh-tools 2.3.1 → 2.3.3

package/package.json

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

package/packages/utils/other.js

@@ -1,4 +1,15 @@
 import XEUtils from 'xe-utils'
+const defaultDateFormat = {
+	date: 'yyyy-MM-dd',
+	time: 'HH:mm:ss',
+	datetime: 'yyyy-MM-dd HH:mm:ss',
+	month: 'yyyy-MM',
+	week: 'yyyy-MM-dd',
+	year: 'yyyy'
+}
+const endStrs = ['Id', '_id']
+const numberTypes = ['integer', 'number', 'float']
+const dateReplaceMap = { YYYY: 'yyyy', DD: 'dd', hh: 'HH' }
 
 export default {
 	toDateDiffText(date) {
@@ -147,27 +158,18 @@ export default {
 	formatRender(value, key, rowData, renderName, renderProps, renderContext, editable) {
 		// editable: 是否对返回值进行修正 默认 否
 		let rvalue, rtext, rname
-		let { $vUtils, $vxePluginNames } = renderContext
+		let { $vUtils } = renderContext
 		let { min, max, digits, type, multiple, split, options, format, range, nodeKey, labelField, moneyUnit, openValue, openLabel, closeValue, closeLabel, defaultValue, separator } =
 			renderProps || {}
-		let defaultDateFormat = {
-			date: 'yyyy-MM-dd',
-			time: 'HH:mm:ss',
-			datetime: 'yyyy-MM-dd HH:mm:ss',
-			month: 'yyyy-MM',
-			week: 'yyyy-MM-dd',
-			year: 'yyyy'
-		}
+		let field = key
 		if (renderName === '$vRowCell') {
-			let field = rowData[key + 'field'] || key
+			field = rowData[key + 'field'] || key
 			rname = rowData[field + 'RenderName'] || '$vInput'
 		} else {
 			rname = renderName
 		}
 		// 对于多选获取数组类型值进行解析 赋值
 		let oriArray = []
-		// 配置公式，优先取解析后的嵌套公式
-		let formula = $vUtils.get(renderProps, `formulaMap.${key}`) || renderProps.formula
 		// 进行默认赋值 若没有任何解析原数返回
 		rvalue = value
 		if (!$vUtils.isNone(defaultValue) && $vUtils.isNone(value)) {
@@ -180,7 +182,7 @@ export default {
 		switch (rname) {
 			case '$vInput':
 			case '$vMoney':
-				let isNumberType = rname === '$vMoney' || ['integer', 'number', 'float'].includes(type)
+				let isNumberType = rname === '$vMoney' || numberTypes.includes(type)
 				if (editable && isNumberType && !$vUtils.isNone(value)) {
 					if ($vUtils.isNumber(+max) && +value > +max) {
 						value = +max
@@ -188,12 +190,9 @@ export default {
 						value = +min
 					}
 				}
-				// 首先提取公式进行公式计算
-				if (formula) {
-					rvalue = $vUtils.calculate(formula, rowData)
-				} else if (!$vUtils.isNone(value) && ['integer'].includes(type)) {
+				if (!$vUtils.isNone(value) && type === 'integer') {
 					rvalue = $vUtils.toInteger(value)
-				} else if (!$vUtils.isNone(value) && ['number', 'float'].includes(type)) {
+				} else if (!$vUtils.isNone(value) && numberTypes.includes(type)) {
 					rvalue = $vUtils.truncate(value, digits)
 				}
 				if (rname === '$vMoney' && !$vUtils.isNone(rvalue)) {
@@ -205,7 +204,7 @@ export default {
 				}
 				break
 			case '$vTime':
-				format = format ? format.replace('YYYY', 'yyyy').replace('DD', 'dd').replace('hh', 'HH') : defaultDateFormat[type]
+				format = format ? format.replace(dateReplaceMap, match => dateReplaceMap[match]) : defaultDateFormat[type]
 				if ($vUtils.isNumber(value)) value = String(value)
 				if (range && Array.isArray(value) && format) {
 					rvalue = value.map(item => $vUtils.toDateString(item || '', format))
@@ -223,15 +222,16 @@ export default {
 			case '$vUpload':
 			case '$vTree':
 				let prefixKey = key
-				const endStrs = ['Id', '_id']
-				endStrs.forEach(end => {
+				for (const end of endStrs) {
 					if (String(key).endsWith(end)) {
 						prefixKey = key.replace(end, '')
+						break
 					}
-				})
+				}
 				let isMutiple = multiple || ['$vCheckgroup', '$vUpload'].includes(rname)
 				let optionValue = 'value'
 				let optionLabel = 'label'
+				let hasOptions = options && options.length > 0
 				if (rname === '$vTree') {
 					optionValue = nodeKey || 'id'
 					if (labelField) optionLabel = labelField
@@ -243,7 +243,7 @@ export default {
 						oriArray = String(value).split(split)
 					}
 					oriArray = oriArray.filter(item => !$vUtils.isNone(item))
-					if (options && options.length) {
+					if (hasOptions) {
 						let rns = oriArray.map(orv => {
 							let valueOption = options.find(option => $vUtils.isEqual(option[optionValue], orv))
 							return valueOption ? valueOption[optionLabel] : ''
@@ -254,7 +254,7 @@ export default {
 					}
 					rvalue = oriArray
 				} else {
-					if (options && options.length) {
+					if (hasOptions) {
 						let valueOption = options.find(option => $vUtils.isEqual(option[optionValue], value))
 						rtext = valueOption ? valueOption[optionLabel] : ''
 					} else {
@@ -282,6 +282,6 @@ export default {
 			default:
 				rtext = rvalue
 		}
-		return { rvalue, rtext }
+		return { rvalue, rtext, rname }
 	}
 }