sh-view 2.6.0 → 2.6.2

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>