sh-view 2.2.0 → 2.4.0

package/package.json

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

package/packages/components/global-components/sh-form/js/useForm.js

@@ -123,6 +123,7 @@ export default function (props, context, proxy, isForm) {
 			formItemsArr.forEach(item => {
 				item.visible = true
 				item.itemRender.props.disabled = false
+				item.slots = undefined
 			})
 		}
 		formOriginItems.value = $vUtils.clone(formItemsArr, true)

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

@@ -1,14 +1,5 @@
-<template>
-	<vxe-colgroup v-if="isGroup" v-bind="groupConfig">
-		<template v-for="(child, childIndex) in column.children" :key="childIndex">
-			<sh-column :column="child"></sh-column>
-		</template>
-	</vxe-colgroup>
-	<vxe-column v-else v-bind="columnConfig"></vxe-column>
-</template>
-
 <script>
-import { computed, defineComponent, getCurrentInstance, inject, ref } from 'vue'
+import { computed, defineComponent, getCurrentInstance, h, inject, ref, resolveComponent, renderSlot } from 'vue'
 import { turnColumnItemFilters } from '../js/tableMethods'
 export default defineComponent({
 	name: 'ShColumn',
@@ -41,12 +32,32 @@ export default defineComponent({
 		const groupConfig = computed(() => {
 			return $vUtils.omit(columnConfig.value, ['children', 'cellRender', 'editRender'])
 		})
+		const renderVN = () => {
+			let columnSlots = {}
+			if (props.column.slots) {
+				Object.keys(props.column.slots).map(key => {
+					columnSlots[key] = shTable.slots[props.column.slots[key]]
+				})
+			}
+			if (isGroup.value) {
+				let childrenList = props.column.children.map(child => {
+					return h(resolveComponent('sh-column'), { column: child })
+				})
+				columnSlots.default = () => childrenList
+				return h(resolveComponent('vxe-colgroup'), { ...groupConfig.value }, columnSlots)
+			}
+			return h(resolveComponent('vxe-column'), { ...columnConfig.value }, columnSlots)
+		}
 
 		return {
 			isGroup,
 			columnConfig,
-			groupConfig
+			groupConfig,
+			renderVN
 		}
+	},
+	render() {
+		return this.renderVN()
 	}
 })
 </script>

package/packages/components/global-components/sh-table/js/tableMethods.js

@@ -76,7 +76,7 @@ export const turnColumnItemFilters = (column, props) => {
 			case '$vCheckgroup':
 			case '$vRadiogroup':
 			case '$vSwitch':
-				column.filters = Array.isArray(columnRender.props && columnRender.props.options) ? columnRender.props.options : false
+				column.filters = Array.isArray(columnRender.props && columnRender.props.options) ? columnRender.props.options : []
 				column.filterMultiple = true
 				break
 			case '$vInput':

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

@@ -125,10 +125,6 @@
 			<template #empty>
 				<sh-empty :icon="emptyIcon" :content="emptyText"></sh-empty>
 			</template>
-			<template v-for="slot in tableSlots" #[slot]="scope">
-				<!-- 以之前的名字命名插槽，同时把数据原样绑定 -->
-				<slot :name="slot" v-bind="scope"></slot>
-			</template>
 		</vxe-table>
 		<div v-if="isFootSlot" ref="footSlotRef" v-resize="handleResize" class="sh-table-foot"><slot name="foot"></slot></div>
 		<div v-if="isPagerSlot" ref="pagerSlotRef" v-resize="handleResize" class="sh-table-pager">
@@ -230,7 +226,8 @@ export default defineComponent({
 
 		provide('ShTableInstance', {
 			columnObjConfig: useTableHooks.tableColumnObjConfig,
-			turnColumnItemFilters: useTableHooks.turnColumnItemFilters
+			turnColumnItemFilters: useTableHooks.turnColumnItemFilters,
+			slots: useTableHooks.slots
 		})
 
 		const handleResize = e => {