sh-view 2.6.1 → 2.6.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sh-view",
-  "version": "2.6.1",
+  "version": "2.6.2",
   "description": "基于vxe-table二次封装",
   "main": "packages/index.js",
   "scripts": {

package/packages/components/global-components/sh-form/form.vue

@@ -43,9 +43,7 @@ export default defineComponent({
 		const { proxy } = getCurrentInstance()
 		const useFormHooks = useForm(props, context, proxy, true)
 
-		return {
-			...useFormHooks
-		}
+		return Object.assign({}, useFormHooks)
 	}
 })
 </script>

package/packages/components/global-components/sh-form/query.vue

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

package/packages/components/global-components/sh-table/components/sh-column.vue

@@ -48,9 +48,9 @@ export default defineComponent({
 					return h(resolveComponent('sh-column'), { column: child })
 				})
 				columnSlots.default = () => childrenList
-				return h(resolveComponent('vxe-colgroup'), { ...groupConfig.value }, columnSlots)
+				return h(resolveComponent('vxe-colgroup'), groupConfig.value, columnSlots)
 			}
-			return h(resolveComponent('vxe-column'), { ...columnConfig.value }, columnSlots)
+			return h(resolveComponent('vxe-column'), columnConfig.value, columnSlots)
 		}
 
 		return {

package/packages/components/global-components/sh-table/grid.vue

@@ -150,11 +150,10 @@ export default defineComponent({
 			}
 		}
 
-		return {
-			...useTableHooks,
+		return Object.assign({}, useTableHooks, {
 			tableIsFullscreen,
 			handleTableZoomBtn
-		}
+		})
 	}
 })
 </script>

package/packages/components/global-components/sh-table/table.vue

@@ -193,8 +193,7 @@ export default defineComponent({
 			tableHeight.value = parentHeight - otherHeight
 		}
 
-		return {
-			...useTableHooks,
+		return Object.assign({}, useTableHooks, {
 			tableWrapRef,
 			topSlotRef,
 			formSlotRef,
@@ -212,7 +211,7 @@ export default defineComponent({
 			isPagerSlot,
 			isBottomSlot,
 			handleResize
-		}
+		})
 	}
 })
 </script>

package/packages/components/other-components/sh-cron-modal/mixin/cron-hooks.js

@@ -37,16 +37,14 @@ export default function (props, context, proxy, state) {
 		}
 	})
 	const typeRangeAttrs = computed(() => {
-		return {
-			...inputNumberAttrs.value,
+		return Object.assign(inputNumberAttrs.value, {
 			disabled: type.value !== TypeEnum.range || props.disabled
-		}
+		})
 	})
 	const typeLoopAttrs = computed(() => {
-		return {
-			...inputNumberAttrs.value,
+		return Object.assign(inputNumberAttrs.value, {
 			disabled: type.value !== TypeEnum.loop || props.disabled
-		}
+		})
 	})
 	const typeSpecifyAttrs = computed(() => {
 		return {

package/packages/components/other-components/sh-cron-modal/tabs/cron-day-box.vue

@@ -77,10 +77,9 @@ export default defineComponent({
 
 		const disabledChoice = computed(() => (props.week && props.week !== '?') || props.disabled)
 		const typeWorkAttrs = computed(() => {
-			return {
-				...useCron.inputNumberAttrs,
+			return Object.assign(useCron.inputNumberAttrs, {
 				disabled: useCron.type.value !== useCron.TypeEnum.work || props.disabled || disabledChoice.value
-			}
+			})
 		})
 
 		watch(
@@ -90,10 +89,9 @@ export default defineComponent({
 			}
 		)
 
-		return {
-			...useCron,
+		return Object.assign({}, useCron, {
 			typeWorkAttrs
-		}
+		})
 	}
 })
 </script>

package/packages/components/other-components/sh-cron-modal/tabs/cron-hour-box.vue

@@ -58,9 +58,7 @@ export default defineComponent({
 			valueLoop: { start: 0, interval: 1 }
 		})
 
-		return {
-			...useCron
-		}
+		return Object.assign({}, useCron)
 	}
 })
 </script>

package/packages/components/other-components/sh-cron-modal/tabs/cron-minute-box.vue

@@ -58,9 +58,7 @@ export default defineComponent({
 			valueLoop: { start: 0, interval: 1 }
 		})
 
-		return {
-			...useCron
-		}
+		return Object.assign({}, useCron)
 	}
 })
 </script>

package/packages/components/other-components/sh-cron-modal/tabs/cron-month-box.vue

@@ -58,9 +58,7 @@ export default defineComponent({
 			valueLoop: { start: 1, interval: 1 }
 		})
 
-		return {
-			...useCron
-		}
+		return Object.assign({}, useCron)
 	}
 })
 </script>

package/packages/components/other-components/sh-cron-modal/tabs/cron-second-box.vue

@@ -58,9 +58,7 @@ export default defineComponent({
 			valueLoop: { start: 0, interval: 1 }
 		})
 
-		return {
-			...useCron
-		}
+		return Object.assign({}, useCron)
 	}
 })
 </script>

package/packages/components/other-components/sh-cron-modal/tabs/cron-week-box.vue

@@ -113,12 +113,11 @@ export default defineComponent({
 			}
 		)
 
-		return {
-			...useCron,
+		return Object.assign({}, useCron, {
 			weekOptions,
 			typeRangeSelectAttrs,
 			typeLoopSelectAttrs
-		}
+		})
 	}
 })
 </script>

package/packages/components/other-components/sh-cron-modal/tabs/cron-year-box.vue

@@ -49,9 +49,7 @@ export default defineComponent({
 			valueLoop: { start: nowYear, interval: 1 }
 		})
 
-		return {
-			...useCron
-		}
+		return Object.assign({}, useCron)
 	}
 })
 </script>

package/packages/components/other-components/sh-preview/components/sh-excel.vue

@@ -156,9 +156,7 @@ export default defineComponent({
 			domRender
 		})
 
-		return {
-			...useData
-		}
+		return Object.assign({}, useData)
 	}
 })
 </script>

package/packages/components/other-components/sh-preview/components/sh-word.vue

@@ -52,9 +52,7 @@ export default defineComponent({
 			domRender
 		})
 
-		return {
-			...useData
-		}
+		return Object.assign({}, useData)
 	}
 })
 </script>

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

@@ -1,28 +1,26 @@
-<template>
-	<span class="vxe-render--inner" :class="{ 'vxe-render--inner--readonly': !redit, 'form-render': rform, 'td-render': !rform }">
-		<template v-if="redit || isEditAll">
-			<vxe-checkbox v-model="renderValue" v-bind="rprops" :size="rsize" @change="vxeCheckCallBack" />
-		</template>
-		<template v-else>
-			<vxe-checkbox :model-value="renderText" :disabled="true" :size="rsize" v-bind="rprops" />
-		</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: 'VxeRenderCheckbox',
-	props: cellProps,
-	setup(props, context) {
-		const { proxy } = getCurrentInstance()
-		const useCell = cellHooks(props, context, proxy)
-
-		return {
-			...useCell
-		}
-	}
-})
-</script>
+<template>
+	<span class="vxe-render--inner" :class="{ 'vxe-render--inner--readonly': !redit, 'form-render': rform, 'td-render': !rform }">
+		<template v-if="redit || isEditAll">
+			<vxe-checkbox v-model="renderValue" v-bind="rprops" :size="rsize" @change="vxeCheckCallBack" />
+		</template>
+		<template v-else>
+			<vxe-checkbox :model-value="renderText" :disabled="true" :size="rsize" v-bind="rprops" />
+		</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: 'VxeRenderCheckbox',
+	props: cellProps,
+	setup(props, context) {
+		const { proxy } = getCurrentInstance()
+		const useCell = cellHooks(props, context, proxy)
+
+		return Object.assign({}, useCell)
+	}
+})
+</script>

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

@@ -1,43 +1,42 @@
-<template>
-	<span class="vxe-render--inner" :class="{ 'form-render': rform, 'td-render': !rform }">
-		<template v-if="redit || isEditAll">
-			<vxe-checkbox-group v-model="renderValue" v-bind="rprops" :size="rsize" @change="vxeCheckCallBack">
-				<vxe-checkbox v-for="checkitem in rprops.options" :key="checkitem.value" :label="checkitem.value" :content="checkitem.label" />
-			</vxe-checkbox-group>
-		</template>
-		<template v-else-if="!redit && showType">
-			<div v-for="roption in rprops.options" :key="roption">
-				<sh-tag v-if="roptionShow(roption)" :color="roption.tagColor || rprops.tagColor" :type="roption.tagType || rprops.tagType">{{ roption.label }}</sh-tag>
-			</div>
-		</template>
-		<template v-else>
-			<span v-html="renderText"></span>
-		</template>
-	</span>
-</template>
-
-<script>
-import { computed, defineComponent, getCurrentInstance } from 'vue'
-import cellProps from '../mixin/cell-props'
-import cellHooks from '../mixin/cell-hooks'
-export default defineComponent({
-	name: 'VxeRenderCheckgroup',
-	props: cellProps,
-	setup(props, context) {
-		const { proxy } = getCurrentInstance()
-		const useCell = cellHooks(props, context, proxy)
-
-		const showType = computed(() => props.rprops.showType === 'tag')
-
-		const roptionShow = roption => {
-			return useCell.renderText.value.split(props.rprops.split).includes(roption.label)
-		}
-
-		return {
-			...useCell,
-			showType,
-			roptionShow
-		}
-	}
-})
-</script>
+<template>
+	<span class="vxe-render--inner" :class="{ 'form-render': rform, 'td-render': !rform }">
+		<template v-if="redit || isEditAll">
+			<vxe-checkbox-group v-model="renderValue" v-bind="rprops" :size="rsize" @change="vxeCheckCallBack">
+				<vxe-checkbox v-for="checkitem in rprops.options" :key="checkitem.value" :label="checkitem.value" :content="checkitem.label" />
+			</vxe-checkbox-group>
+		</template>
+		<template v-else-if="!redit && showType">
+			<div v-for="roption in rprops.options" :key="roption">
+				<sh-tag v-if="roptionShow(roption)" :color="roption.tagColor || rprops.tagColor" :type="roption.tagType || rprops.tagType">{{ roption.label }}</sh-tag>
+			</div>
+		</template>
+		<template v-else>
+			<span v-html="renderText"></span>
+		</template>
+	</span>
+</template>
+
+<script>
+import { computed, defineComponent, getCurrentInstance } from 'vue'
+import cellProps from '../mixin/cell-props'
+import cellHooks from '../mixin/cell-hooks'
+export default defineComponent({
+	name: 'VxeRenderCheckgroup',
+	props: cellProps,
+	setup(props, context) {
+		const { proxy } = getCurrentInstance()
+		const useCell = cellHooks(props, context, proxy)
+
+		const showType = computed(() => props.rprops.showType === 'tag')
+
+		const roptionShow = roption => {
+			return useCell.renderText.value.split(props.rprops.split).includes(roption.label)
+		}
+
+		return Object.assign({}, useCell, {
+			showType,
+			roptionShow
+		})
+	}
+})
+</script>

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

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

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

@@ -92,13 +92,12 @@ export default defineComponent({
 			tableComponent.context.emit('option-click', renderBtnObj, props.rparams)
 		}
 
-		return {
-			...useCell,
+		return Object.assign({}, useCell, {
 			renderBtns,
 			isBtnRender,
 			getBtnContent,
 			vxeBtnCallback
-		}
+		})
 	}
 })
 </script>

package/packages/vxeTable/render/cell/vxe-render-href.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/cell/vxe-render-input.vue

@@ -43,11 +43,10 @@ export default defineComponent({
 			useCell.setRenderValue(value)
 		}
 
-		return {
-			...useCell,
+		return Object.assign({}, useCell, {
 			controlButton,
 			vxeControlClick
-		}
+		})
 	}
 })
 </script>

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

@@ -1,33 +1,31 @@
-<template>
-	<span class="vxe-render--inner" :class="{ 'form-render': rform, 'td-render': !rform, 'td-all': rprops.bill }">
-		<template v-if="redit || isEditAll">
-			<vxe-input v-model="renderValue" type="number" v-bind="rprops" :size="rsize" @change="vxeInputChange" @blur="vxeBlurCallback" @clear="vxeBlurCallback" />
-		</template>
-		<template v-else-if="rprops.bill">
-			<template v-for="(bil, bilindex) in billGroups" :key="bilindex">
-				<span class="cell-bill-number" :class="getBillClass(bil)">{{ getBillValue(bilindex) }}</span>
-			</template>
-		</template>
-		<template v-else>
-			<span class="blue" v-html="renderText"></span>
-		</template>
-	</span>
-</template>
-
-<script>
-import { computed, defineComponent, getCurrentInstance } from 'vue'
-import cellProps from '../mixin/cell-props'
-import cellHooks from '../mixin/cell-hooks'
-export default defineComponent({
-	name: 'VxeRenderMoney',
-	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, 'td-all': rprops.bill }">
+		<template v-if="redit || isEditAll">
+			<vxe-input v-model="renderValue" type="number" v-bind="rprops" :size="rsize" @change="vxeInputChange" @blur="vxeBlurCallback" @clear="vxeBlurCallback" />
+		</template>
+		<template v-else-if="rprops.bill">
+			<template v-for="(bil, bilindex) in billGroups" :key="bilindex">
+				<span class="cell-bill-number" :class="getBillClass(bil)">{{ getBillValue(bilindex) }}</span>
+			</template>
+		</template>
+		<template v-else>
+			<span class="blue" v-html="renderText"></span>
+		</template>
+	</span>
+</template>
+
+<script>
+import { computed, defineComponent, getCurrentInstance } from 'vue'
+import cellProps from '../mixin/cell-props'
+import cellHooks from '../mixin/cell-hooks'
+export default defineComponent({
+	name: 'VxeRenderMoney',
+	props: cellProps,
+	setup(props, context) {
+		const { proxy } = getCurrentInstance()
+		const useCell = cellHooks(props, context, proxy)
+
+		return Object.assign({}, useCell)
+	}
+})
+</script>

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

@@ -1,28 +1,26 @@
-<template>
-	<span class="vxe-render--inner" :class="{ 'form-render': rform, 'td-render': !rform }">
-		<template v-if="redit || isEditAll">
-			<vxe-input v-model="renderValue" type="number" v-bind="rprops" :size="rsize" @change="vxeInputChange" @blur="vxeBlurCallback" @clear="vxeBlurCallback" />
-		</template>
-		<template v-else>
-			<sh-progress :percent="renderText" v-bind="rprops" />
-		</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: 'VxeRenderPropgress',
-	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">
+			<vxe-input v-model="renderValue" type="number" v-bind="rprops" :size="rsize" @change="vxeInputChange" @blur="vxeBlurCallback" @clear="vxeBlurCallback" />
+		</template>
+		<template v-else>
+			<sh-progress :percent="renderText" v-bind="rprops" />
+		</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: 'VxeRenderPropgress',
+	props: cellProps,
+	setup(props, context) {
+		const { proxy } = getCurrentInstance()
+		const useCell = cellHooks(props, context, proxy)
+
+		return Object.assign({}, useCell)
+	}
+})
+</script>

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

@@ -1,28 +1,26 @@
-<template>
-	<span class="vxe-render--inner" :class="{ 'vxe-render--inner--readonly': !redit, 'form-render': rform, 'td-render': !rform }">
-		<template v-if="redit || isEditAll">
-			<vxe-radio v-model="renderValue" v-bind="rprops" :size="rsize" @change="vxeRadioCallBack" />
-		</template>
-		<template v-else>
-			<vxe-radio :model-value="renderText" :disabled="true" v-bind="rprops" :size="rsize" />
-		</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: 'VxeRenderRadio',
-	props: cellProps,
-	setup(props, context) {
-		const { proxy } = getCurrentInstance()
-		const useCell = cellHooks(props, context, proxy)
-
-		return {
-			...useCell
-		}
-	}
-})
-</script>
+<template>
+	<span class="vxe-render--inner" :class="{ 'vxe-render--inner--readonly': !redit, 'form-render': rform, 'td-render': !rform }">
+		<template v-if="redit || isEditAll">
+			<vxe-radio v-model="renderValue" v-bind="rprops" :size="rsize" @change="vxeRadioCallBack" />
+		</template>
+		<template v-else>
+			<vxe-radio :model-value="renderText" :disabled="true" v-bind="rprops" :size="rsize" />
+		</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: 'VxeRenderRadio',
+	props: cellProps,
+	setup(props, context) {
+		const { proxy } = getCurrentInstance()
+		const useCell = cellHooks(props, context, proxy)
+
+		return Object.assign({}, useCell)
+	}
+})
+</script>

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

@@ -1,43 +1,42 @@
-<template>
-	<span class="vxe-render--inner" :class="{ 'form-render': rform, 'td-render': !rform }">
-		<template v-if="redit || isEditAll">
-			<vxe-radio-group v-model="renderValue" v-bind="rprops" :size="rsize" @change="vxeRadioCallBack">
-				<vxe-radio v-for="checkitem in rprops.options" :key="checkitem.value" :label="checkitem.value" :content="checkitem.label" />
-			</vxe-radio-group>
-		</template>
-		<template v-else-if="!redit && showType">
-			<div v-for="roption in rprops.options" :key="roption">
-				<sh-tag v-if="roptionShow(roption)" :color="roption.tagColor || rprops.tagColor" :type="roption.tagType || rprops.tagType">{{ roption.label }}</sh-tag>
-			</div>
-		</template>
-		<template v-else>
-			<span v-html="renderText"></span>
-		</template>
-	</span>
-</template>
-
-<script>
-import { computed, defineComponent, getCurrentInstance } from 'vue'
-import cellProps from '../mixin/cell-props'
-import cellHooks from '../mixin/cell-hooks'
-export default defineComponent({
-	name: 'VxeRenderRadiogroup',
-	props: cellProps,
-	setup(props, context) {
-		const { proxy } = getCurrentInstance()
-		const useCell = cellHooks(props, context, proxy)
-
-		const showType = computed(() => props.rprops.showType === 'tag')
-
-		const roptionShow = roption => {
-			return useCell.renderText.value.split(props.rprops.split).includes(roption.label)
-		}
-
-		return {
-			...useCell,
-			showType,
-			roptionShow
-		}
-	}
-})
-</script>
+<template>
+	<span class="vxe-render--inner" :class="{ 'form-render': rform, 'td-render': !rform }">
+		<template v-if="redit || isEditAll">
+			<vxe-radio-group v-model="renderValue" v-bind="rprops" :size="rsize" @change="vxeRadioCallBack">
+				<vxe-radio v-for="checkitem in rprops.options" :key="checkitem.value" :label="checkitem.value" :content="checkitem.label" />
+			</vxe-radio-group>
+		</template>
+		<template v-else-if="!redit && showType">
+			<div v-for="roption in rprops.options" :key="roption">
+				<sh-tag v-if="roptionShow(roption)" :color="roption.tagColor || rprops.tagColor" :type="roption.tagType || rprops.tagType">{{ roption.label }}</sh-tag>
+			</div>
+		</template>
+		<template v-else>
+			<span v-html="renderText"></span>
+		</template>
+	</span>
+</template>
+
+<script>
+import { computed, defineComponent, getCurrentInstance } from 'vue'
+import cellProps from '../mixin/cell-props'
+import cellHooks from '../mixin/cell-hooks'
+export default defineComponent({
+	name: 'VxeRenderRadiogroup',
+	props: cellProps,
+	setup(props, context) {
+		const { proxy } = getCurrentInstance()
+		const useCell = cellHooks(props, context, proxy)
+
+		const showType = computed(() => props.rprops.showType === 'tag')
+
+		const roptionShow = roption => {
+			return useCell.renderText.value.split(props.rprops.split).includes(roption.label)
+		}
+
+		return Object.assign({}, useCell, {
+			showType,
+			roptionShow
+		})
+	}
+})
+</script>

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

@@ -42,11 +42,10 @@ export default defineComponent({
 			return options.filter(option => String(option.value) === String(renderValue))
 		})
 
-		return {
-			...useCell,
+		return Object.assign({}, useCell, {
 			showType,
 			showTags
-		}
+		})
 	}
 })
 </script>

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

@@ -1,28 +1,26 @@
-<template>
-	<span class="vxe-render--inner" :class="{ 'vxe-render--inner--readonly': !redit, 'form-render': rform, 'td-render': !rform }">
-		<template v-if="redit || isEditAll">
-			<vxe-switch v-model="renderValue" v-bind="rprops" :size="rsize" @change="vxeChangeCallBack" />
-		</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: 'VxeRenderSwitch',
-	props: cellProps,
-	setup(props, context) {
-		const { proxy } = getCurrentInstance()
-		const useCell = cellHooks(props, context, proxy)
-
-		return {
-			...useCell
-		}
-	}
-})
-</script>
+<template>
+	<span class="vxe-render--inner" :class="{ 'vxe-render--inner--readonly': !redit, 'form-render': rform, 'td-render': !rform }">
+		<template v-if="redit || isEditAll">
+			<vxe-switch v-model="renderValue" v-bind="rprops" :size="rsize" @change="vxeChangeCallBack" />
+		</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: 'VxeRenderSwitch',
+	props: cellProps,
+	setup(props, context) {
+		const { proxy } = getCurrentInstance()
+		const useCell = cellHooks(props, context, proxy)
+
+		return Object.assign({}, useCell)
+	}
+})
+</script>

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

@@ -40,12 +40,11 @@ export default defineComponent({
 			useCell.setRenderValue(fullData(), true)
 		}
 
-		return {
-			...useCell,
+		return Object.assign({}, useCell, {
 			shTableRef,
 			vxeInputCallback,
 			onToolbaroption
-		}
+		})
 	}
 })
 </script>

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

@@ -1,28 +1,26 @@
-<template>
-	<span class="vxe-render--inner" :class="{ 'form-render': rform, 'td-render': !rform }">
-		<template v-if="redit || isEditAll">
-			<vxe-textarea v-model="renderValue" v-bind="rprops" :size="rsize" @change="vxeInputChange" @blur="vxeBlurCallback" @clear="vxeBlurCallback" />
-		</template>
-		<template v-else>
-			<span>{{ 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: 'VxeRenderTextarea',
-	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">
+			<vxe-textarea v-model="renderValue" v-bind="rprops" :size="rsize" @change="vxeInputChange" @blur="vxeBlurCallback" @clear="vxeBlurCallback" />
+		</template>
+		<template v-else>
+			<span>{{ 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: 'VxeRenderTextarea',
+	props: cellProps,
+	setup(props, context) {
+		const { proxy } = getCurrentInstance()
+		const useCell = cellHooks(props, context, proxy)
+
+		return Object.assign({}, useCell)
+	}
+})
+</script>

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>