sh-tools 2.1.3 → 2.1.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sh-tools",
-  "version": "2.1.3",
+  "version": "2.1.5",
   "description": "基于xe-ajax和xe-utils二次封装",
   "main": "packages/index.js",
   "scripts": {

package/packages/utils/other.js

@@ -198,7 +198,8 @@ export default {
 				break
 			case '$vTime':
 				format = format ? format.replace('YYYY', 'yyyy').replace('DD', 'dd').replace('hh', 'HH') : defaultDateFormat[type]
-				if (!$vUtils.isNone(value) && format) rvalue = $vUtils.toDateString(value, format)
+				if ($vUtils.isNumber(value)) value = String(value)
+				if (!$vUtils.isNone(value) && format) $vUtils.toDateString(value, format)
 				break
 			case '$vSelect':
 			case '$vCheckgroup':
@@ -206,11 +207,11 @@ export default {
 			case '$vUpload':
 			case '$vTree':
 				let prefixKey = key.endsWith('Id') ? String(key).replace('Id', '') : key
-				let isMutiple = multiple || ['$vCheckgroup', '$vUpload'].includes(type)
+				let isMutiple = multiple || ['$vCheckgroup', '$vUpload'].includes(rname)
 				let optionValue = 'value'
 				let optionLabel = 'label'
-				if (type === '$vTree') {
-					optionValue = nodeKey
+				if (rname === '$vTree') {
+					optionValue = nodeKey || 'id'
 					if (labelField) optionLabel = labelField
 				}
 				if (isMutiple) {
@@ -230,9 +231,11 @@ export default {
 					}
 					rvalue = oriArray
 				} else {
-					let valueOption = options.find(option => $vUtils.isEqual(option[optionValue], value))
-					rtext = valueOption ? valueOption[optionLabel] : ''
-					rvalue = type === '$vTree' ? (value ? [value] : []) : value
+					if (options && options.length) {
+						let valueOption = options.find(option => $vUtils.isEqual(option[optionValue], value))
+						rtext = valueOption ? valueOption[optionLabel] : ''
+					}
+					rvalue = rname === '$vTree' ? (value ? [value] : []) : value
 				}
 				if (format) {
 					let dataformat = format.replace(/@/gi, prefixKey)