sh-tools 2.2.17 → 2.2.19

package/package.json

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

package/packages/utils/other.js

@@ -148,7 +148,8 @@ export default {
 		// editable: 是否对返回值进行修正 默认 否
 		let rvalue, rtext, rname
 		let { $vUtils, $vxePluginNames } = renderContext
-		let { min, max, digits, type, multiple, split, options, format, nodeKey, labelField, moneyUnit, openValue, openLabel, closeValue, closeLabel, defaultValue } = renderProps || {}
+		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',
@@ -172,6 +173,9 @@ export default {
 		if (!$vUtils.isNone(defaultValue) && $vUtils.isNone(value)) {
 			rvalue = defaultValue
 		}
+		if ($vUtils.isString(rvalue)) {
+			rvalue = $vUtils.replaceNutrim(rvalue)
+		}
 		// 自定渲染器进行解析与重新赋值
 		switch (rname) {
 			case '$vInput':
@@ -196,13 +200,21 @@ export default {
 					rtext = $vUtils.truncate($vUtils.divide(rvalue, moneyUnit), digits)
 				} else if (rname === '$vInput' && format) {
 					rtext = $vUtils.format(format, rowData)
+				} else {
+					rtext = rvalue
 				}
 				break
 			case '$vTime':
 				format = format ? format.replace('YYYY', 'yyyy').replace('DD', 'dd').replace('hh', 'HH') : defaultDateFormat[type]
 				if ($vUtils.isNumber(value)) value = String(value)
-				if (!$vUtils.isNone(value) && format) {
+				if (range && Array.isArray(value) && format) {
+					rvalue = value.map(item => $vUtils.toDateString(item || '', format))
+					rtext = rvalue.join(separator)
+				} else if (!$vUtils.isNone(value) && format) {
 					rvalue = $vUtils.toDateString(value, format)
+					rtext = rvalue
+				} else {
+					rtext = rvalue
 				}
 				break
 			case '$vSelect':
@@ -228,22 +240,25 @@ export default {
 					if (Array.isArray(value)) {
 						oriArray = value
 					} else if (!$vUtils.isNone(value)) {
-						oriArray = String(value)
-							.split(split)
-							.filter(_ => _ && _ !== 'undefined')
+						oriArray = String(value).split(split)
 					}
+					oriArray = oriArray.filter(item => !$vUtils.isNone(item))
 					if (options && options.length) {
 						let rns = oriArray.map(orv => {
 							let valueOption = options.find(option => $vUtils.isEqual(option[optionValue], orv))
 							return valueOption ? valueOption[optionLabel] : ''
 						})
 						rtext = rns.join(split)
+					} else {
+						rtext = oriArray.join(split)
 					}
 					rvalue = oriArray
 				} else {
 					if (options && options.length) {
 						let valueOption = options.find(option => $vUtils.isEqual(option[optionValue], value))
 						rtext = valueOption ? valueOption[optionLabel] : ''
+					} else {
+						rtext = rvalue
 					}
 				}
 				if (format) {
@@ -252,7 +267,10 @@ export default {
 				}
 				break
 			case '$vProgress':
-				if (!$vUtils.isNone(value)) rvalue = $vUtils.truncate(value, digits)
+				if (!$vUtils.isNone(value)) {
+					rvalue = $vUtils.truncate(value, digits)
+				}
+				rtext = rvalue
 				break
 			case '$vSwitch':
 				if ($vUtils.isEqual(value, openValue)) {
@@ -261,12 +279,8 @@ export default {
 					rtext = closeLabel
 				}
 				break
-		}
-		if ($vUtils.isString(rvalue)) {
-			rvalue = $vUtils.replaceNutrim(rvalue)
-		}
-		if ($vUtils.isNone(rtext) && !$vUtils.isNone(rvalue)) {
-			rtext = rvalue
+			default:
+				rtext = String(rvalue)
 		}
 		return { rvalue, rtext }
 	}