sh-tools 2.3.11 → 2.3.12

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "sh-tools",
-	"version": "2.3.11",
+	"version": "2.3.12",
 	"description": "基于fetch和xe-utils二次封装，支持宏公式计算",
 	"main": "packages/index.js",
 	"scripts": {
@@ -13,7 +13,7 @@
 	"author": "神秘的sh",
 	"license": "ISC",
 	"dependencies": {
-		"xe-utils": "^3.8.4"
+		"xe-utils": "^4.0.0"
 	},
 	"devDependencies": {
 		"@babel/core": "^7.12.16",

package/packages/utils/other.js

@@ -1,15 +1,3 @@
-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 dateReplaceMap = { YYYY: 'yyyy', DD: 'dd', hh: 'HH' }
-
 export default {
 	ioToFile(io, fileName = 'download', type = 'blob') {
 		return new Promise((resolve, reject) => {
@@ -131,130 +119,5 @@ export default {
 		let intFixed = intValue.padStart(cnIntRadice.length, ' ')
 		let decFixed = decValue.padEnd(cnDecUnits.length, '0')
 		return intFixed + '.' + decFixed
-	},
-	// 封装 系统内对渲染器格式化方法
-	formatRender(value, key, rowData, renderName, renderProps, renderContext, editable) {
-		// editable: 是否对返回值进行修正 默认 否
-		let rvalue, rtext, rname
-		let { $vUtils } = renderContext
-		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
-			rname = rowData[field + 'RenderName'] || '$vInput'
-		} else {
-			rname = renderName
-		}
-		// 对于多选获取数组类型值进行解析 赋值
-		let oriArray = []
-		// 进行默认赋值 若没有任何解析原数返回
-		rvalue = value
-		if (!$vUtils.isNone(defaultValue) && $vUtils.isNone(value)) {
-			rvalue = defaultValue
-		}
-		if ($vUtils.isString(rvalue)) {
-			rvalue = $vUtils.replaceNutrim(rvalue)
-		}
-		// 自定渲染器进行解析与重新赋值
-		switch (rname) {
-			case '$vInput':
-				rtext = format ? $vUtils.format(format, rowData) : rvalue
-				break
-			case '$vNumber':
-			case '$vMoney':
-				if (editable && !$vUtils.isNone(value)) {
-					if ($vUtils.isNumber(+max) && +value > +max) {
-						value = +max
-					} else if ($vUtils.isNumber(+min) && +value < +min) {
-						value = +min
-					}
-				}
-				if (!$vUtils.isNone(value) && type === 'integer') {
-					rvalue = $vUtils.toInteger(value)
-				} else if (!$vUtils.isNone(value)) {
-					rvalue = $vUtils.truncate(value, digits)
-				}
-				rtext = rvalue
-				break
-			case '$vTime':
-				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))
-					rtext = rvalue.join(separator)
-				} else if (!$vUtils.isNone(value) && format) {
-					rvalue = $vUtils.toDateString(value, format)
-					rtext = rvalue
-				} else {
-					rtext = rvalue
-				}
-				break
-			case '$vSelect':
-			case '$vCheckgroup':
-			case '$vRadiogroup':
-			case '$vUpload':
-			case '$vTree':
-				let prefixKey = key
-				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
-				}
-				if (isMutiple) {
-					if (Array.isArray(value)) {
-						oriArray = value
-					} else if (!$vUtils.isNone(value)) {
-						oriArray = String(value).split(split)
-					}
-					oriArray = oriArray.filter(item => !$vUtils.isNone(item))
-					if (hasOptions) {
-						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 (hasOptions) {
-						let valueOption = options.find(option => $vUtils.isEqual(option[optionValue], value))
-						rtext = valueOption ? valueOption[optionLabel] : ''
-					} else {
-						rtext = rvalue
-					}
-				}
-				if (format) {
-					let dataformat = format.replace(/@/gi, prefixKey)
-					rtext = $vUtils.format(dataformat, rowData)
-				}
-				break
-			case '$vProgress':
-				if (!$vUtils.isNone(value)) {
-					rvalue = $vUtils.truncate(value, digits)
-				}
-				rtext = rvalue
-				break
-			case '$vSwitch':
-				if ($vUtils.isEqual(value, openValue)) {
-					rtext = openLabel
-				} else if ($vUtils.isEqual(value, closeValue)) {
-					rtext = closeLabel
-				}
-				break
-			default:
-				rtext = rvalue
-		}
-		return { rvalue, rtext, rname }
 	}
 }