sh-view 2.6.0 → 2.6.2

package/packages/vxeTable/render/cell/vxe-render-time.vue

@@ -1,44 +1,41 @@
-<template>
-	<span class="vxe-render--inner" :class="{ 'form-render': rform, 'td-render': !rform }">
-		<template v-if="redit || isEditAll">
-			<vxe-input v-model="renderValue" v-bind="rprops" :size="rsize" :disabled-method="vxeDisabledMethod" @change="vxeChangeCallBack"></vxe-input>
-		</template>
-		<template v-else>
-			<span v-html="renderText"></span>
-		</template>
-	</span>
-</template>
-
-<script>
-import { defineComponent, getCurrentInstance } from 'vue'
-import cellProps from '../mixin/cell-props'
-import cellHooks from '../mixin/cell-hooks'
-export default defineComponent({
-	name: 'VxeRenderTime',
-	props: cellProps,
-	setup(props, context) {
-		const { proxy } = getCurrentInstance()
-		const { $vUtils } = proxy
-		const useCell = cellHooks(props, context, proxy)
-
-		// 禁用事件
-		const vxeDisabledMethod = ({ date, viewType }) => {
-			let { startTime, endTime } = props.rprops
-			if (startTime) {
-				startTime = $vUtils.format(startTime, props.rdata)
-				let { done, time } = $vUtils.getDateDiff(startTime, date)
-				return startTime ? !done : false
-			} else if (endTime) {
-				endTime = $vUtils.format(endTime, props.rdata)
-				let { done, time } = $vUtils.getDateDiff(endTime, date)
-				return done
-			}
-		}
-
-		return {
-			...useCell,
-			vxeDisabledMethod
-		}
-	}
-})
-</script>
+<template>
+	<span class="vxe-render--inner" :class="{ 'form-render': rform, 'td-render': !rform }">
+		<template v-if="redit || isEditAll">
+			<vxe-input v-model="renderValue" v-bind="rprops" :size="rsize" :disabled-method="vxeDisabledMethod" @change="vxeChangeCallBack"></vxe-input>
+		</template>
+		<template v-else>
+			<span v-html="renderText"></span>
+		</template>
+	</span>
+</template>
+
+<script>
+import { defineComponent, getCurrentInstance } from 'vue'
+import cellProps from '../mixin/cell-props'
+import cellHooks from '../mixin/cell-hooks'
+export default defineComponent({
+	name: 'VxeRenderTime',
+	props: cellProps,
+	setup(props, context) {
+		const { proxy } = getCurrentInstance()
+		const { $vUtils } = proxy
+		const useCell = cellHooks(props, context, proxy)
+
+		// 禁用事件
+		const vxeDisabledMethod = ({ date, viewType }) => {
+			let { startTime, endTime } = props.rprops
+			if (startTime) {
+				startTime = $vUtils.format(startTime, props.rdata)
+				let { done, time } = $vUtils.getDateDiff(startTime, date)
+				return startTime ? !done : false
+			} else if (endTime) {
+				endTime = $vUtils.format(endTime, props.rdata)
+				let { done, time } = $vUtils.getDateDiff(endTime, date)
+				return done
+			}
+		}
+
+		return Object.assign({}, useCell, { vxeDisabledMethod })
+	}
+})
+</script>

package/packages/vxeTable/render/cell/vxe-render-tree.vue

@@ -54,10 +54,7 @@ export default defineComponent({
 			useCell.setRenderValue(selectedKeys, true)
 		}
 
-		return {
-			...useCell,
-			vxeTreeCallback
-		}
+		return Object.assign({}, useCell, { vxeTreeCallback })
 	}
 })
 </script>

package/packages/vxeTable/render/cell/vxe-render-upload.vue

@@ -1,28 +1,26 @@
-<template>
-	<span class="vxe-render--inner" :class="{ 'form-render': rform, 'td-render': !rform }">
-		<template v-if="redit || isEditAll">
-			<sh-upload v-model="renderValue" v-bind="rprops" :size="rsize" @input="vxeChangeCallBack({ value: $event })"></sh-upload>
-		</template>
-		<template v-else>
-			<sh-upload :model-value="renderText" v-bind="rprops" :disabled="true" :size="rsize"></sh-upload>
-		</template>
-	</span>
-</template>
-
-<script>
-import { defineComponent, getCurrentInstance } from 'vue'
-import cellProps from '../mixin/cell-props'
-import cellHooks from '../mixin/cell-hooks'
-export default defineComponent({
-	name: 'VxeRenderUpload',
-	props: cellProps,
-	setup(props, context) {
-		const { proxy } = getCurrentInstance()
-		const useCell = cellHooks(props, context, proxy)
-
-		return {
-			...useCell
-		}
-	}
-})
-</script>
+<template>
+	<span class="vxe-render--inner" :class="{ 'form-render': rform, 'td-render': !rform }">
+		<template v-if="redit || isEditAll">
+			<sh-upload v-model="renderValue" v-bind="rprops" :size="rsize" @input="vxeChangeCallBack({ value: $event })"></sh-upload>
+		</template>
+		<template v-else>
+			<sh-upload :model-value="renderText" v-bind="rprops" :disabled="true" :size="rsize"></sh-upload>
+		</template>
+	</span>
+</template>
+
+<script>
+import { defineComponent, getCurrentInstance } from 'vue'
+import cellProps from '../mixin/cell-props'
+import cellHooks from '../mixin/cell-hooks'
+export default defineComponent({
+	name: 'VxeRenderUpload',
+	props: cellProps,
+	setup(props, context) {
+		const { proxy } = getCurrentInstance()
+		const useCell = cellHooks(props, context, proxy)
+
+		return Object.assign({}, useCell)
+	}
+})
+</script>

package/packages/vxeTable/render/filters/vxe-filter-input.vue

@@ -17,9 +17,7 @@ export default defineComponent({
 		const { proxy } = getCurrentInstance()
 		const useFilter = filterHooks(props, context, proxy)
 
-		return {
-			...useFilter
-		}
+		return Object.assign({}, useFilter)
 	}
 })
 </script>

package/packages/vxeTable/render/footer/vxe-footer-input.vue

@@ -13,9 +13,7 @@ export default defineComponent({
 		const { proxy } = getCurrentInstance()
 		const useCell = cellHooks(props, context, proxy)
 
-		return {
-			...useCell
-		}
+		return Object.assign({}, useCell)
 	}
 })
 </script>

package/packages/vxeTable/render/footer/vxe-footer-money.vue

@@ -20,9 +20,7 @@ export default defineComponent({
 		const { proxy } = getCurrentInstance()
 		const useCell = cellHooks(props, context, proxy)
 
-		return {
-			...useCell
-		}
+		return Object.assign({}, useCell)
 	}
 })
 </script>

package/packages/vxeTable/render/header/vxe-header-money.vue

@@ -21,9 +21,7 @@ export default defineComponent({
 		const { proxy } = getCurrentInstance()
 		const useCell = cellHooks(props, context, proxy)
 
-		return {
-			...useCell
-		}
+		return Object.assign({}, useCell)
 	}
 })
 </script>