sh-view 2.8.8 → 2.8.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sh-view",
-  "version": "2.8.8",
+  "version": "2.8.10",
   "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/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

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

@@ -122,7 +122,7 @@ export default function (props, context, proxy, isGrid) {
 		}
 	})
 	const tableMoneyConfig = computed(() => {
-		return Object.assign({ enabled: true, options: $vTableSetup.moneyUnitConstants, style: { width: '60px' } }, props.moneyConfig, tableVmConfig.value)
+		return Object.assign({ style: { width: '60px' } }, $vTableSetup.moneyConfig, props.moneyConfig, tableVmConfig.value)
 	})
 	const tableExportConfig = computed(() =>
 		Object.assign(
@@ -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
 	}
@@ -259,6 +258,17 @@ export default function (props, context, proxy, isGrid) {
 		else if (tableGlobalConfig.value.selectType === 'checkbox' && checkRecords) selections = checkRecords
 		selectionRows.value = selections
 	}
+	const updateExpended = () => {
+		if (tableRef.value && tableTreeConfig.value.expandAll) {
+			setTimeout(() => {
+				tableRef.value.setAllTreeExpand(true)
+			})
+		} else if (tableRef.value && props.expandConfig && props.expandConfig.expandAll) {
+			setTimeout(() => {
+				tableRef.value.setAllRowExpand(true)
+			})
+		}
+	}
 
 	// -------- 表格
 	// 当前行变化
@@ -552,6 +562,7 @@ export default function (props, context, proxy, isGrid) {
 		() => props.dataSourse,
 		value => {
 			updateSelection([])
+			updateExpended()
 		},
 		{
 			immediate: true

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,12 +68,13 @@
 			@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>
+			<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">

package/packages/vxeTable/index.js

@@ -156,11 +156,14 @@ let vxeOptions = {
 		icon: 'vxe-icon-spinner roll',
 		text: '加载中...'
 	},
-	moneyUnitConstants: [
-		{ value: 1, label: '元', digits: 2 },
-		{ value: 1000, label: '千元', digits: 4 },
-		{ value: 10000, label: '万元', digits: 6 }
-	],
+	moneyConfig: {
+		enabled: false,
+		options: [
+			{ value: 1, label: '元', digits: 2 },
+			{ value: 1000, label: '千元', digits: 4 },
+			{ value: 10000, label: '万元', digits: 6 }
+		]
+	},
 	cnGroups: [
 		{ shortText: '兆', fullText: '兆', value: '' },
 		{ shortText: '千', fullText: '千亿', value: '' },

package/packages/vxeTable/render/globalRenders.jsx

@@ -504,7 +504,7 @@ const filterRenders = {
 				case 'has':
 					return String(rtext).indexOf(valueSt) > -1
 				case 'eq':
-					return utils.isEqual(rvalue, valueSt)
+					return utils.isEqual(String(rvalue), valueSt)
 				case 'gt':
 					return isDate ? utils.getDateDiff(valueSt, rvalue).done : Number(rvalue) > Number(valueSt)
 				case 'lt':