sh-view 2.8.9 → 2.8.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sh-view",
-  "version": "2.8.9",
+  "version": "2.8.11",
   "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-table/grid.vue

@@ -82,10 +82,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-grid>
 		<!--导入弹窗-->
 		<importModal v-if="importBindConfig.modalConfig.modelValue" v-bind="importBindConfig" @confirm="setImportData"></importModal>

package/packages/components/sh-table/js/props.js

@@ -252,7 +252,6 @@ export default {
 		type: Boolean, // 表格是否可编辑，默认不可编辑
 		default: true
 	},
-	customLayout: Boolean,
 	columnObj: {
 		type: Object,
 		default() {

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

@@ -32,7 +32,7 @@ export const columnDefaultFilterMethod = ({ column, $columnIndex }) => {
 }
 
 // 默认求底部计算方法(已改用footer渲染器，其他需要自行计算)
-export const tableFooterCompute = (columns, fullData, computeType, typeObj = {}) => {
+export const tableFooterCompute = (columns, tableData, computeType, typeObj = {}) => {
 	const { emptyText = '', name, data = {} } = typeObj
 	let computeName = name || ''
 	if (!computeName) {
@@ -58,9 +58,9 @@ export const tableFooterCompute = (columns, fullData, computeType, typeObj = {})
 		let footerValue = data[column.property] || emptyText
 		if (renderName === '$vMoney' || renderProps.calculate) {
 			if (computeType === 'subTotal') {
-				footerValue = $vUtils.sum(fullData, column.property)
+				footerValue = $vUtils.sum(tableData, column.property)
 			} else if (computeType === 'mean') {
-				footerValue = $vUtils.mean(fullData, column.property)
+				footerValue = $vUtils.mean(tableData, column.property)
 			}
 		}
 		return footerValue
@@ -103,12 +103,21 @@ export const getFieldRules = (ori, rules) => {
 	}
 }
 // 转换生成新表头数据
-export const getTransfarFields = (oriArr = [], columnObj, isSearch) => {
+export const getTransfarFields = (oriArr = [], { slots, columnObj, isSearch }) => {
 	let rules = {}
 	let columnsFlatArr = []
 	let formItemsArr = []
 	let columnsArr = $vUtils.mapTree(oriArr, ori => {
-		let tar = Object.assign({}, columnObj, ori)
+		let slotObj = {}
+		// 将插槽转换为函数式
+		if (slots && ori.slots) {
+			Object.keys(ori.slots).forEach(slotKey => {
+				if ($vUtils.isString(ori.slots[slotKey])) {
+					$vUtils.set(slotObj, `slots.${slotKey}`, slots[ori.slots[slotKey]])
+				}
+			})
+		}
+		let tar = Object.assign({}, columnObj, ori, slotObj)
 		if (ori.children && ori.children.length > 0) {
 			tar.sortable = false
 			tar.filter = false

package/packages/components/sh-table/js/useTable.js

@@ -168,7 +168,7 @@ export default function (props, context, proxy, isGrid) {
 	})
 	const tableFilterConfig = computed(() => Object.assign({ clearable: true, type: 'search', placeholder: '全局关键字搜索' }, tableVmConfig.value))
 	const tableSlots = computed(() => {
-		let disSlots = ['head', 'form', 'formLeft', 'formRight', 'toolbar', 'toolbarLeft', 'toolbarRight', 'pagerLeft', 'pagerRight']
+		let disSlots = ['top', 'head', 'foot', 'form', 'toolbar', 'formLeft', 'formRight', 'toolbarLeft', 'toolbarRight', 'pagerLeft', 'pagerRight']
 		return Object.keys(slots).filter(key => !disSlots.includes(key))
 	})
 	const tableBindConfig = computed(() => {
@@ -231,13 +231,12 @@ export default function (props, context, proxy, isGrid) {
 	}
 
 	// 默认求底部绑定方法vxe
-	const tableFooterMethod = ({ columns }) => {
+	const tableFooterMethod = ({ columns, data }) => {
 		const { footerCalculate } = props
-		const fullData = getFullData()
 		let footerData = []
 		let footerCalculateList = footerCalculate.calculate || []
 		footerCalculateList.forEach(computeType => {
-			footerData.push(tableFooterCompute(columns, fullData, computeType, footerCalculate[computeType]))
+			footerData.push(tableFooterCompute(columns, data, computeType, footerCalculate[computeType]))
 		})
 		return footerData
 	}
@@ -260,7 +259,7 @@ export default function (props, context, proxy, isGrid) {
 		selectionRows.value = selections
 	}
 	const updateExpended = () => {
-		if (tableRef.value && tableTreeConfig.value.expandAll) {
+		if (tableRef.value && tableTreeConfig.value && tableTreeConfig.value.expandAll) {
 			setTimeout(() => {
 				tableRef.value.setAllTreeExpand(true)
 			})
@@ -405,7 +404,7 @@ export default function (props, context, proxy, isGrid) {
 
 	// 初始化生成新表头数据
 	const initTableColumns = () => {
-		let transResult = getTransfarFields(props.columns, tableColumnObjConfig.value, tableGlobalConfig.value.search)
+		let transResult = getTransfarFields(props.columns, { slots, columnObj: tableColumnObjConfig.value, isSearch: tableGlobalConfig.value.search })
 		tableColumnsFlat.value = transResult.columnsFlatArr
 		tableFormItems.value = transResult.formItemsArr
 		tableColumnsFixed.value = transResult.columnsArr

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

@@ -1,5 +1,5 @@
 <template>
-	<div ref="tableWrapRef" class="sh-vxe-table" :class="{ 'sh-table-ghost': tableGlobalConfig.ghost, 'is--loading': tableBindConfig.loading }" :style="{ height: wrapHeight }">
+	<div ref="tableWrapRef" v-resize="handleResize" class="sh-vxe-table" :class="{ 'sh-table-ghost': tableGlobalConfig.ghost, 'is--loading': tableBindConfig.loading }" :style="{ height: wrapHeight }">
 		<div v-if="isTopSlot" ref="topSlotRef" v-resize="handleResize" class="sh-table-top"><slot name="top"></slot></div>
 		<div v-if="isFormSlot" ref="formSlotRef" v-resize="handleResize" class="sh-table-form">
 			<slot name="form">
@@ -68,9 +68,6 @@
 			@toolbar-button-click="onToolbarButtonClick"
 			@toolbar-tool-click="onToolbarToolClick"
 			@option-click="handleGoptionClick">
-			<template v-if="customLayout">
-				<slot></slot>
-			</template>
 			<template #empty>
 				<sh-empty :icon="emptyIcon" :content="emptyText"></sh-empty>
 			</template>