sh-view 2.8.12 → 2.8.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sh-view",
-  "version": "2.8.12",
+  "version": "2.8.13",
   "description": "基于vxe-table二次封装,更包含Alert,Badge,Card,CodeEditor,Col,Corner,CountTo,Drawer,Empty,Form,Header,Icon,List,Loading,Modal,Noticebar,Poptip,Progress,PullRefresh,Query,Result,Row,Split,Grid,Table,Tabs,Tag,Toolbar,Tree,Upload,WaterFall,WaterMark等丰富组件库",
   "main": "packages/index.js",
   "typings": "types/index.d.ts",

package/packages/components/sh-date/index.vue

@@ -109,7 +109,7 @@ export default defineComponent({
 
 		const pulldownValue = ref(false)
 		const inputValue = ref(props.modelValue)
-		const rangeValue = ref(props.modelValue || [])
+		const rangeValue = ref(Array.isArray(props.modelValue) ? props.modelValue : [])
 
 		const inputConfig = computed(() => {
 			let defaultProps = {}
@@ -217,7 +217,7 @@ export default defineComponent({
 		watch(
 			() => props.modelValue,
 			(value, oldValue) => {
-				if (props.range) {
+				if (props.range && Array.isArray(value)) {
 					rangeValue.value = value
 				} else {
 					inputValue.value = value

package/packages/vxeTable/render/globalRenders.jsx

@@ -43,7 +43,7 @@ let defaultProps = {
 	$vTextArea: { placeholder: '请输入', rows: 2, transfer: true, resize: 'none', showWordCount: true },
 	$vSelect: { placeholder: '请选择', filterable: true, transfer: true, showType: 'text', tagColor: 'default', split: ',', options: [] },
 	$vTree: { placeholder: '请选择', transfer: true, split: ',', nodeKey: 'id', labelField: 'label' },
-	$vTime: { type: 'date', placeholder: '请选择时间', transfer: true, editable: false, prefixType: 'text', suffixType: 'text' },
+	$vTime: { type: 'date', placeholder: '请选择时间', transfer: true, editable: false, prefixType: 'text', suffixType: 'text', separator: '至' },
 	$vProgress: { strokeWidth: 20, strokeColor: ['#108ee9', '#87d068'], textInside: true, min: 0, max: 100, digits: 2 },
 	$vSwitch: { placeholder: '请选择', openLabel: '是', openValue: '1', closeLabel: '否', closeValue: '0' },
 	$vMoney: { type: 'number', placeholder: '请输入', transfer: true, commafy: true, digits: 2, moneyUnit: 1, min: 0, max: 1000000000000 },

package/packages/vxeTable/render/mixin/cell-hooks.js

@@ -27,6 +27,7 @@ export default function (props, context, proxy) {
 	// 初始化数据
 	const initData = () => {
 		let keyValue = $vUtils.get(props.rdata, props.rkey)
+		if (keyValue && $vUtils.isEqual(keyValue, renderValue.value)) return
 		formatValueFun(keyValue)
 	}
 
@@ -98,10 +99,18 @@ export default function (props, context, proxy) {
 			renderText.value = footerText
 			return
 		}
-		let formatObj = $vUtils.formatRender(value, props.rkey, props.rdata, props.rname, props.rprops, proxy, editable)
-		renderValue.value = ['$vMoney'].includes(props.rname) ? formatObj.rtext : formatObj.rvalue
-		renderText.value = formatObj.rtext
-		return formatObj
+		const { rvalue, rtext } = $vUtils.formatRender(value, props.rkey, props.rdata, props.rname, props.rprops, proxy, editable)
+		if (['$vMoney'].includes(props.rname)) {
+			renderValue.value = rtext
+		} else {
+			renderValue.value = rvalue
+		}
+		if (props.rname === '$vTime' && props.rprops.range && Array.isArray(rtext) && rtext.length > 0) {
+			renderText.value = `${rtext[0] || ''}${props.rprops.separator}${rtext[1] || ''}`
+		} else {
+			renderText.value = rtext
+		}
+		return { rvalue, rtext }
 	}
 	const getBillClass = bil => {
 		return { basic: bil.fullText === '元', commafy: ['千', '百万', '十亿', '兆'].includes(bil.fullText) }