sh-tools 2.2.16 → 2.2.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sh-tools",
-  "version": "2.2.16",
+  "version": "2.2.18",
   "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, callvalue, 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',
@@ -201,7 +202,10 @@ export default {
 			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)
 				}
 				break
@@ -265,9 +269,6 @@ export default {
 		if ($vUtils.isString(rvalue)) {
 			rvalue = $vUtils.replaceNutrim(rvalue)
 		}
-		if (formula && !callvalue) {
-			$vUtils.set(rowData, key, rvalue)
-		}
 		if ($vUtils.isNone(rtext) && !$vUtils.isNone(rvalue)) {
 			rtext = rvalue
 		}