sh-view 2.8.5 → 2.8.6

package/.eslintrc.js

@@ -3,10 +3,11 @@ module.exports = {
 	env: {
 		node: true
 	},
-	extends: ['plugin:vue/vue3-essential', '@vue/typescript/recommended', 'plugin:prettier/recommended'],
+	extends: ['plugin:vue/vue3-essential', 'plugin:prettier/recommended'], // 开启typescript 需要加入 '@vue/typescript/recommended'
 	plugins: ['vue', 'prettier'],
 	parserOptions: {
-		ecmaVersion: 2020
+		parser: '@babel/eslint-parser'
+		// ecmaVersion: 2020
 	},
 	rules: {
 		'prettier/prettier': 'error',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sh-view",
-  "version": "2.8.5",
+  "version": "2.8.6",
   "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",
@@ -15,6 +15,7 @@
   "author": "神秘的sh",
   "license": "ISC",
   "dependencies": {
+    "@babel/eslint-parser": "^7.23.10",
     "@codemirror/lang-javascript": "^6.1.9",
     "@codemirror/lang-json": "^6.0.1",
     "@codemirror/lang-sql": "^6.5.2",
@@ -26,21 +27,20 @@
     "countup.js": "^2.8.0",
     "cron-parser": "^4.8.1",
     "docx-preview": "^0.1.18",
-    "exceljs": "^4.3.0",
+    "exceljs": "^4.4.0",
     "jspdf": "^2.5.1",
     "jszip": "^3.10.1",
     "lunar-typescript": "^1.6.10",
     "popper.js": "^1.16.1",
-    "sh-tools": "^2.2.6",
+    "sh-tools": "^2.2.7",
     "tinymce": "^5.10.5",
     "vue": "^3.3.4",
     "vue-masonry": "^0.16.0",
     "vue-router": "^4.2.4",
-    "vxe-table": "^4.5.13",
-    "vxe-table-plugin-export-pdf": "^3.0.4",
-    "vxe-table-plugin-export-xlsx": "^3.0.5",
-    "xe-clipboard": "^1.10.2",
-    "xe-utils": "^3.5.13"
+    "vxe-table": "^4.5.20",
+    "vxe-table-plugin-export-pdf": "^4.0.1",
+    "vxe-table-plugin-export-xlsx": "^4.0.1",
+    "xe-clipboard": "^1.10.2"
   },
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^6.9.0",

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

@@ -1,5 +1,5 @@
 import { computed, onBeforeMount, ref, watch } from 'vue'
-import { getFieldsRules } from '../../sh-table/js/tableMethods'
+import { getFieldRules } from '../../sh-table/js/tableMethods'
 
 // 表单默认配置
 const formConfigDefault = {
@@ -88,12 +88,10 @@ export default function (props, context, proxy, isForm) {
 	}
 	// 初始化表单项
 	const initFormItems = () => {
-		let rules = getFieldsRules(props.items)
-		initEditRules(rules)
-
 		let formItemsArr = props.items
 		if (props.transformitem) {
-			let { groupItemsArr, flatItemsArr } = generateFormItem(formItemsArr)
+			let { groupItemsArr, flatItemsArr, rules } = generateFormItem(formItemsArr)
+			initEditRules(rules)
 			// 表单支持分组 搜索组件不需要分组
 			formItemsArr = isForm ? groupItemsArr : flatItemsArr
 		}
@@ -140,6 +138,7 @@ export default function (props, context, proxy, isForm) {
 		let notRenderName = ['seq', 'checkbox', 'radio', '$vImg', '$vHref', '$vGlobalOption']
 		let renderItems = $vUtils.searchTree(items, item => !((item.renderName && notRenderName.includes(item.renderName)) || notRenderName.includes(item.type)))
 		let flatItemsArr = []
+		let rules = {}
 		let groupItemsArr = $vUtils.mapTree(renderItems, ori => {
 			let tar = Object.assign({}, ori)
 			if (ori.children && ori.children.length > 0) {
@@ -150,6 +149,8 @@ export default function (props, context, proxy, isForm) {
 				name: ori.renderName || '$vInput',
 				props: Object.assign({}, ori.renderProps || {})
 			}
+			// 首先提取校验配置
+			getFieldRules(ori, rules)
 			if (readonly || disabled) {
 				renderConfig.props.disabled = true
 			}
@@ -157,7 +158,7 @@ export default function (props, context, proxy, isForm) {
 			flatItemsArr.push(tar)
 			return tar
 		})
-		return { groupItemsArr, flatItemsArr }
+		return { groupItemsArr, flatItemsArr, rules }
 	}
 
 	watch(
@@ -178,8 +179,8 @@ export default function (props, context, proxy, isForm) {
 	)
 	watch(
 		() => props.rules,
-		nv => {
-			initEditRules(nv)
+		value => {
+			initEditRules(value)
 		},
 		{
 			deep: true,

package/packages/components/sh-table/css/index.scss

@@ -52,8 +52,6 @@
     .sh-table-toolbar-wrap{
         display: flex;
         flex: 0 0 auto;
-        align-items: flex-end;
-        font-size: 0;
         .sh-table-toolbar-item{
             display: inline-block;
             vertical-align: baseline;

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

@@ -57,6 +57,7 @@
 						<div v-if="slots.toolbarRight" class="sh-table-toolbar-item">
 							<slot name="toolbarRight"></slot>
 						</div>
+						<div v-if="tableMoneyConfig.enabled" class="sh-table-toolbar-item">单位：<sh-select v-model="tableMoneyUnit" v-bind="tableMoneyConfig" /></div>
 						<div v-if="tableGlobalConfig.zoom" class="sh-table-toolbar-item">
 							<vxe-button v-if="!tableIsFullscreen" v-ripple :size="size" icon="vxe-icon-zoom-out" @click="handleTableZoomBtn(true)">全屏</vxe-button>
 							<vxe-button v-else v-ripple :size="size" icon="vxe-icon-zoom-in" @click="handleTableZoomBtn(false)">退出全屏</vxe-button>

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

@@ -112,8 +112,7 @@ export default {
 		type: [Function]
 	},
 	keepSource: {
-		type: Boolean,
-		default: true
+		type: Boolean
 	},
 	emptyIcon: {
 		type: String
@@ -193,10 +192,7 @@ export default {
 		}
 	},
 	mouseConfig: {
-		type: Object,
-		default() {
-			return {}
-		}
+		type: Object
 	},
 	customConfig: {
 		type: Object,
@@ -269,6 +265,12 @@ export default {
 			return {}
 		}
 	},
+	moneyConfig: {
+		type: Object,
+		default() {
+			return {}
+		}
+	},
 	footerCalculate: {
 		type: Object,
 		default() {

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

@@ -32,11 +32,9 @@ export const columnDefaultFilterMethod = ({ column, $columnIndex }) => {
 }
 
 // 默认求底部计算方法(已改用footer渲染器，其他需要自行计算)
-export const tableFooterCompute = (columns, data, computeType, typeObj = {}) => {
-	let emptyString = ''
-	let computeName = typeObj.name || ''
-	let computeData = typeObj.data || {}
-	let textIndex = 0
+export const tableFooterCompute = (columns, fullData, computeType, typeObj = {}) => {
+	const { emptyText = '', name, data = {} } = typeObj
+	let computeName = name || ''
 	if (!computeName) {
 		switch (computeType) {
 			case 'subTotal':
@@ -52,16 +50,20 @@ export const tableFooterCompute = (columns, data, computeType, typeObj = {}) =>
 		}
 	}
 	return columns.map((column, columnIndex) => {
-		let result = null
-		if (column.type === 'seq' || column.type === 'total') {
-			result = computeName
-			textIndex = columnIndex
-		} else {
-			result = computeData[column.property] || emptyString
-			$vUtils.set(column, `rfooter.index`, textIndex)
-			$vUtils.set(column, `rfooter.${computeName}`, { computeType, result, typeObj })
+		if (['seq', 'total'].includes(column.type)) {
+			return computeName
+		}
+		let renderName = column.editRender?.name || column.cellRender?.name
+		let renderProps = column.editRender?.props || column.cellRender?.props
+		let footerValue = data[column.property] || emptyText
+		if (renderName === '$vMoney' || renderProps.calculate) {
+			if (computeType === 'subTotal') {
+				footerValue = $vUtils.sum(fullData, column.property)
+			} else if (computeType === 'mean') {
+				footerValue = $vUtils.mean(fullData, column.property)
+			}
 		}
-		return result
+		return footerValue
 	})
 }
 // 转化表头过滤配置
@@ -84,28 +86,25 @@ export const turnColumnItemFilters = (column, props) => {
 	}
 }
 // 转换表头校验规则
-export const getFieldsRules = columns => {
-	let rules = {}
-	$vUtils.eachTree(columns, column => {
-		// 首先提取校验配置
-		if (isTrue(column['renderRequire'])) {
-			// 若配置了校验参数则走校验参数，没配置则给默认校验条件
-			if (column['requireProps'] && Array.isArray(column['requireProps']) && column['requireProps'].length > 0) {
-				rules[column['field']] = column['requireProps']
-			} else {
-				let dataType = 'string'
-				let arrayType = ['$vCheckgroup', '$vUpload', '$vTable']
-				if (arrayType.includes(column['renderName']) || ((column['renderName'] === '$vSelect' || column['renderName'] === '$vTree') && isTrue(column.renderProps?.multiple))) {
-					dataType = 'array'
-				}
-				rules[column['field']] = [{ required: true, message: getDefaultMessage(column['renderName'], column['title']), type: dataType }]
-			}
+export const getFieldRules = (ori, rules) => {
+	if (isTrue(ori['renderRequire'])) {
+		let dataType = 'string'
+		let arrayType = ['$vCheckgroup', '$vUpload', '$vTable']
+		if (arrayType.includes(ori['renderName']) || (['$vSelect', '$vTree'].includes(ori['renderName']) && isTrue(ori.renderProps?.multiple))) {
+			dataType = 'array'
 		}
-	})
-	return rules
+		let defaultRuleOption = { message: getDefaultMessage(ori['renderName'], ori['title']), type: dataType, trigger: 'blur' }
+		let fieldRules = [{ required: true, ...defaultRuleOption }]
+		// 若配置了校验参数则走校验参数，没配置则给默认校验条件
+		if (ori['requireProps'] && Array.isArray(ori['requireProps']) && ori['requireProps'].length > 0) {
+			fieldRules = ori['requireProps'].map(rule => ({ ...defaultRuleOption, ...rule }))
+		}
+		rules[ori['field']] = fieldRules
+	}
 }
 // 转换生成新表头数据
 export const getTransfarFields = (oriArr = [], columnObj, isSearch) => {
+	let rules = {}
 	let columnsFlatArr = []
 	let formItemsArr = []
 	let columnsArr = $vUtils.mapTree(oriArr, ori => {
@@ -116,41 +115,38 @@ export const getTransfarFields = (oriArr = [], columnObj, isSearch) => {
 		} else {
 			let renderConfig = {
 				name: ori.renderName || '$vInput',
-				props: Object.assign({}, ori.renderProps || {})
+				props: Object.assign({}, ori.renderProps)
 			}
+			// 首先提取校验配置
+			getFieldRules(ori, rules)
+			// 初始化排序条件
+			if (Number(tar.sortable) === 0 || tar.sortable === 'false') tar.sortable = false
 			// 个性化设置
 			if (tar.renderName === '$vGlobalOption' || ['$vImg', '$vHref', '$vUpload'].includes(tar.renderName)) {
-				tar.filter = false
-				tar.sortable = false
+				Object.assign(tar, { filter: false, sortable: false })
 			}
-			if (tar.renderName === '$vGlobalOption') {
-				tar.resizable = false
-			}
-			if (tar.renderName === '$vMoney' || ['number', 'float', 'integer'].includes(renderConfig.props.type)) {
+
+			if (tar.renderName === '$vGlobalOption') tar.resizable = false
+			if (tar.renderName === '$vMoney' || ['number', 'float', 'integer'].includes(ori.renderProps?.type)) {
 				tar.cellType = 'number'
 			}
-			if (tar.renderName === '$vMoney' && renderConfig.props.bill) {
+			if (tar.renderName === '$vMoney' && ori.renderProps?.bill) {
 				tar.filter = false
 				tar.headerClassName += ' header-bill-cell'
 			}
-			// 初始化排序条件
-			if (Number(tar.sortable) === 0 || tar.sortable === 'false') {
-				tar.sortable = false
-			}
 			// 判断单元格是否可编辑
 			if (ori.readonly || ori.slots?.default || (!ori.renderName && !(tar.editRender && tar.editRender.name))) {
-				tar.cellRender = Object.assign({}, renderConfig, tar.cellRender || {})
+				tar.cellRender = Object.assign(renderConfig, tar.cellRender)
 			} else {
-				tar.editRender = Object.assign({}, renderConfig, tar.editRender || {})
+				tar.editRender = Object.assign(renderConfig, tar.editRender)
 			}
 			// 初始化表单查询配置
 			if (isSearch) {
 				let editFixedNames = ['$vImg', '$vHref', '$vUpload']
-				let formItem = Object.assign({}, tar)
-				formItem.itemRender = Object.assign({}, renderConfig, tar.editRender || {}, tar.itemRender || {})
+				let formItem = { ...tar }
+				formItem.itemRender = Object.assign({ name: '$vInput' }, renderConfig, tar.editRender, tar.itemRender)
 				delete formItem.cellRender
 				delete formItem.editRender
-				formItem.itemRender.name = formItem.itemRender.name || '$vInput'
 				// 此处修正， 对其不进行默认渲染
 				if (formItem.search && formItem.search !== '0' && !editFixedNames.includes(formItem.itemRender.name)) {
 					formItemsArr.push(formItem)
@@ -164,5 +160,5 @@ export const getTransfarFields = (oriArr = [], columnObj, isSearch) => {
 		columnsFlatArr.push(tar)
 		return tar
 	})
-	return { columnsArr, columnsFlatArr, formItemsArr }
+	return { columnsArr, columnsFlatArr, formItemsArr, rules }
 }

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

@@ -1,5 +1,5 @@
-import { computed, reactive, ref, watch } from 'vue'
-import { columnDefaultFilterMethod, tableFooterCompute, getTransfarFields, getFieldsRules, turnColumnItemFilters } from './tableMethods'
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import { columnDefaultFilterMethod, tableFooterCompute, getTransfarFields } from './tableMethods'
 
 // 记录自定义参数，传给vxe要过滤掉
 let omitProps = [
@@ -58,7 +58,7 @@ const columnsMapDefault = {
 }
 
 export default function (props, context, proxy, isGrid) {
-	const { $vUtils, $vxePluginNames } = proxy
+	const { $vUtils, $vTableSetup, $vxePluginNames } = proxy
 	const { emit, slots } = context
 
 	const tableRef = ref()
@@ -66,6 +66,7 @@ export default function (props, context, proxy, isGrid) {
 	const selectedRowKeys = ref([]) // table选中keys
 	const selectionRows = ref([]) // table选中records
 	const tableColumnsFixed = ref([]) // 表格格式化后表头
+	const tableMoneyUnit = ref(props.moneyConfig?.defaultValue || 1) // 表格金额单位
 	const tableFilterData = ref(null) // 表格全表搜索数据
 	const tableColumnsFlat = ref([]) // 多层转一维后表头
 	const tableFormItems = ref([]) // 根据表格表头生成表单项配置
@@ -120,6 +121,9 @@ 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)
+	})
 	const tableExportConfig = computed(() =>
 		Object.assign(
 			{
@@ -148,10 +152,17 @@ export default function (props, context, proxy, isGrid) {
 		Object.assign({ enabled: !props.disabled, showStatus: !props.disabled, showUpdateStatus: !props.disabled, showInsertStatus: !props.disabled }, props.editConfig)
 	)
 	const tableQueryConfig = computed(() => {
-		let otherConfig = isGrid ? { transformitem: false, items: tableFormItems.value } : { items: props.columns }
 		return Object.assign(
-			{ data: props.queryData, rules: tableEditRules.value, validConfig: props.validConfig, globalConfig: tableGlobalConfig.value, valid: false, footer: true },
-			otherConfig,
+			{
+				data: props.queryData,
+				rules: tableEditRules.value,
+				validConfig: props.validConfig,
+				globalConfig: tableGlobalConfig.value,
+				items: tableFormItems.value,
+				transformitem: false,
+				valid: false,
+				footer: true
+			},
 			tableVmConfig.value
 		)
 	})
@@ -162,9 +173,7 @@ export default function (props, context, proxy, isGrid) {
 	})
 	const tableBindConfig = computed(() => {
 		let defaultProps = { footerMethod: tableFooterMethod, footerSpanMethod: tableFooterSpanMethod }
-		let tableProps = $vUtils.omit(props, (val, key) => {
-			return omitProps.includes(key) || $vUtils.isNone(val)
-		})
+		let tableProps = $vUtils.omit(props, (val, key) => omitProps.includes(key) || $vUtils.isNone(val))
 		let shProps = {
 			data: tableViewData.value,
 			stripe: props.stripe && !tableTreeConfig.value,
@@ -175,7 +184,9 @@ export default function (props, context, proxy, isGrid) {
 			editConfig: tableEditConfig.value,
 			editRules: tableEditRules.value,
 			exportConfig: tableExportConfig.value,
-			printConfig: tablePrintConfig.value
+			printConfig: tablePrintConfig.value,
+			moneyConfig: tableMoneyConfig.value,
+			moneyUnit: tableMoneyUnit.value
 		}
 		return Object.assign(defaultProps, tableProps, shProps)
 	})
@@ -220,12 +231,13 @@ export default function (props, context, proxy, isGrid) {
 	}
 
 	// 默认求底部绑定方法vxe
-	const tableFooterMethod = ({ columns, data }) => {
+	const tableFooterMethod = ({ columns }) => {
 		const { footerCalculate } = props
+		const fullData = getFullData()
 		let footerData = []
 		let footerCalculateList = footerCalculate.calculate || []
-		footerCalculateList.forEach(key => {
-			footerData.push(tableFooterCompute(columns, data, key, footerCalculate[key]))
+		footerCalculateList.forEach(computeType => {
+			footerData.push(tableFooterCompute(columns, fullData, computeType, footerCalculate[computeType]))
 		})
 		return footerData
 	}
@@ -238,6 +250,15 @@ export default function (props, context, proxy, isGrid) {
 		}
 		return { rowspan: 1, colspan: 1 }
 	}
+	const updateSelection = rows => {
+		let selections = []
+		let radioRecord = tableRef.value && tableRef.value.getRadioRecord()
+		let checkRecords = tableRef.value && tableRef.value.getCheckboxRecords()
+		if (rows) selections = rows
+		else if (tableGlobalConfig.value.selectType === 'radio' && radioRecord) selections = [radioRecord]
+		else if (tableGlobalConfig.value.selectType === 'checkbox' && checkRecords) selections = checkRecords
+		selectionRows.value = selections
+	}
 
 	// -------- 表格
 	// 当前行变化
@@ -247,7 +268,7 @@ export default function (props, context, proxy, isGrid) {
 	}
 	// 单选框变化
 	const onRadioChange = params => {
-		selectionRows.value = [params.row]
+		updateSelection([params.row])
 		emit('radio-change', selectionRows.value, params)
 	}
 	// 复选框变化
@@ -266,7 +287,7 @@ export default function (props, context, proxy, isGrid) {
 			})
 			records = records.filter(row => !childRowsKeys.includes(row[keyField]))
 		}
-		selectionRows.value = records
+		updateSelection(records)
 		emit('selection-change', selectionRows.value, params)
 	}
 	// 单元格点击事件
@@ -328,7 +349,7 @@ export default function (props, context, proxy, isGrid) {
 	}
 	// 分页变化触发
 	const onPageChange = params => {
-		selectionRows.value = []
+		updateSelection([])
 		emit('page-change', params)
 	}
 
@@ -372,14 +393,14 @@ export default function (props, context, proxy, isGrid) {
 	}
 
 	// 初始化生成新表头数据
-	const initTableColumns = (columns = []) => {
-		let rules = getFieldsRules(columns)
-		initEditRules(rules)
-		if (isGrid) {
-			let { columnsArr, columnsFlatArr, formItemsArr } = getTransfarFields(columns, tableColumnObjConfig.value, tableGlobalConfig.value.search)
-			tableColumnsFlat.value = columnsFlatArr
-			tableFormItems.value = formItemsArr
-			tableColumnsFixed.value = $vUtils.clone(columnsArr, true)
+	const initTableColumns = () => {
+		let transResult = getTransfarFields(props.columns, tableColumnObjConfig.value, tableGlobalConfig.value.search)
+		tableColumnsFlat.value = transResult.columnsFlatArr
+		tableFormItems.value = transResult.formItemsArr
+		tableColumnsFixed.value = transResult.columnsArr
+		initEditRules(transResult.rules)
+		if (!isGrid) {
+			tableRef.value.loadColumn(tableColumns.value)
 		}
 	}
 	// 初始化验证规则
@@ -510,27 +531,27 @@ export default function (props, context, proxy, isGrid) {
 			if (!result) return
 		}
 		await tableRef.value.remove(deleteRows)
-		if (selectionRows.value && selectionRows.value.length > 0) {
-			let keyField = props.rowConfig.keyField || proxy.$vTableSetup.table.rowConfig.keyField
-			selectionRows.value = selectionRows.value.filter(sr => !deleteRows.find(dr => dr[keyField] === sr[keyField]))
-		}
+		updateSelection()
 		if (isTool) emit('toolbaroption', 'delete', deleteRows, tableRef.value)
 	}
 
+	onMounted(() => {
+		initTableColumns()
+	})
+
 	watch(
 		() => props.columns,
 		value => {
-			initTableColumns(value)
+			initTableColumns()
 		},
 		{
-			deep: true,
-			immediate: true
+			deep: true
 		}
 	)
 	watch(
 		() => props.dataSourse,
 		value => {
-			selectionRows.value = []
+			updateSelection([])
 		},
 		{
 			immediate: true
@@ -566,6 +587,8 @@ export default function (props, context, proxy, isGrid) {
 		selectionRows,
 		tableBindConfig,
 		importBindConfig,
+		tableMoneyUnit,
+		tableMoneyConfig,
 		onCurrentChange,
 		onRadioChange,
 		onSelectionChange,
@@ -597,6 +620,6 @@ export default function (props, context, proxy, isGrid) {
 		getFullData,
 		handleTableAddRow,
 		handleTableDeleteRow,
-		turnColumnItemFilters
+		initTableColumns
 	}
 }

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

@@ -31,6 +31,7 @@
 						<div v-if="slots.toolbarRight" class="sh-table-toolbar-item">
 							<slot name="toolbarRight"></slot>
 						</div>
+						<div v-if="tableMoneyConfig.enabled" @click.stop class="sh-table-toolbar-item">单位：<sh-select v-model="tableMoneyUnit" v-bind="tableMoneyConfig" /></div>
 						<template v-for="(tool, toolIndex) in tableTools" :key="toolIndex">
 							<div class="sh-table-toolbar-item">
 								<vxe-button v-ripple :size="size" v-bind="tool" @click="handleTableTool(tool)"></vxe-button>
@@ -70,14 +71,6 @@
 			<template v-if="customLayout">
 				<slot></slot>
 			</template>
-			<template v-else>
-				<template v-for="(column, columnIndex) in tablePrevColumns" :key="columnIndex">
-					<vxe-column v-bind="column"></vxe-column>
-				</template>
-				<template v-for="(column, columnIndex) in columns" :key="columnIndex">
-					<sh-column :column="column"></sh-column>
-				</template>
-			</template>
 			<template #empty>
 				<sh-empty :icon="emptyIcon" :content="emptyText"></sh-empty>
 			</template>
@@ -107,13 +100,11 @@ import { computed, defineComponent, getCurrentInstance, provide, ref, reactive }
 import './css/index.scss'
 
 import props from './js/props'
-import shColumn from './components/sh-column.vue'
 import importModal from './components/importModal.vue'
 import useTable from './js/useTable'
 export default defineComponent({
 	name: 'ShTable',
 	components: {
-		shColumn,
 		importModal
 	},
 	props: {
@@ -172,15 +163,6 @@ export default defineComponent({
 		const isPagerSlot = computed(() => useTableHooks.tablePagerConfig.value.enabled)
 		const isBottomSlot = computed(() => Boolean(slots.bottom))
 
-		provide(
-			'ShTableInstance',
-			reactive({
-				columnObjConfig: useTableHooks.tableColumnObjConfig,
-				turnColumnItemFilters: useTableHooks.turnColumnItemFilters,
-				slots: useTableHooks.slots
-			})
-		)
-
 		const handleResize = e => {
 			if (useTableHooks.wrapHeight.value === 'auto') return
 			let slotRefs = [topSlotRef, formSlotRef, toolbarSlotRef, headSlotRef, footSlotRef, pagerSlotRef, bottomSlotRef]

package/packages/vxeTable/css/variable.scss

@@ -1,5 +1,5 @@
 /*size*/
-$vxe-border-radius: 2px !default;
+$vxe-border-radius: 3px !default;
 
 /*color*/
 $vxe-font-color: #515a6e !default;

package/packages/vxeTable/index.js

@@ -2,6 +2,7 @@ import VXETable from 'vxe-table'
 import './css/index.scss'
 import VXETablePluginExportXLSX from './plugins/export'
 import VXETablePluginExportPDF from 'vxe-table-plugin-export-pdf'
+import { jsPDF } from 'jspdf'
 import XEClipboard from 'xe-clipboard'
 import ShValidators from 'sh-tools/packages/utils/validate'
 import { publicRenders, extraRenders, filterRenders, publicRendersNames } from './render/globalRenders.jsx'
@@ -154,17 +155,43 @@ let vxeOptions = {
 	loading: {
 		icon: 'vxe-icon-spinner roll',
 		text: '加载中...'
-	}
+	},
+	moneyUnitConstants: [
+		{ value: 1, label: '元', digits: 2 },
+		{ value: 1000, label: '千元', digits: 4 },
+		{ value: 10000, label: '万元', digits: 6 }
+	],
+	cnGroups: [
+		{ shortText: '兆', fullText: '兆', value: '' },
+		{ shortText: '千', fullText: '千亿', value: '' },
+		{ shortText: '百', fullText: '百亿', value: '' },
+		{ shortText: '十', fullText: '十亿', value: '' },
+		{ shortText: '亿', fullText: '亿', value: '' },
+		{ shortText: '千', fullText: '千万', value: '' },
+		{ shortText: '百', fullText: '百万', value: '' },
+		{ shortText: '十', fullText: '十万', value: '' },
+		{ shortText: '万', fullText: '万', value: '' },
+		{ shortText: '千', fullText: '千', value: '' },
+		{ shortText: '百', fullText: '百', value: '' },
+		{ shortText: '十', fullText: '十', value: '' },
+		{ shortText: '元', fullText: '元', value: '' },
+		{ shortText: '角', fullText: '角', value: '' },
+		{ shortText: '分', fullText: '分', value: '' },
+		{ shortText: '毫', fullText: '毫', value: '' },
+		{ shortText: '厘', fullText: '厘', value: '' }
+	]
 }
 
 let vxePdfOptions = {
-	// 设置全局默认字体
-	fontName: 'SourceHanSans-Normal',
-	beforeMethod: ({ $pdf, options, columns, datas }) => {}
+	jsPDF,
+	fonts: [{ fontName: 'SourceHanSansNormal' }]
 }
-
+let vxeXlsxOptions = {}
 Object.keys(ShValidators).forEach(key => {
 	VXETable.validators.add(key, {
+		itemValidatorMethod({ itemValue }) {
+			return ShValidators[key](itemValue)
+		},
 		cellValidatorMethod({ cellValue }) {
 			return ShValidators[key](cellValue)
 		}
@@ -174,15 +201,15 @@ Object.keys(ShValidators).forEach(key => {
 VXETable.renderer.mixin(publicRenders)
 VXETable.renderer.mixin(extraRenders)
 VXETable.renderer.mixin(filterRenders)
-VXETable.use(VXETablePluginExportXLSX)
-VXETable.use(VXETablePluginExportPDF)
 
 const index = {
-	install(Vue, { vxeOption = {}, vxePdfOption = {} }) {
+	install(Vue, { vxeOption = {}, vxePdfOption = {}, vxeXlsxOption }) {
 		let setupOption = Object.assign(vxeOptions, vxeOption)
+		let xlsxSetUpOption = Object.assign(vxeXlsxOptions, vxeXlsxOption)
 		let pdfSetUpOption = Object.assign(vxePdfOptions, vxePdfOption)
 		VXETable.setup(setupOption)
-		VXETablePluginExportPDF.setup(pdfSetUpOption)
+		VXETable.use(VXETablePluginExportXLSX, xlsxSetUpOption)
+		VXETable.use(VXETablePluginExportPDF, pdfSetUpOption)
 		Vue.use(VXETable)
 		Vue.config.globalProperties.$vTable = VXETable
 		Vue.config.globalProperties.$vTableSetup = setupOption

package/packages/vxeTable/render/footer/vxe-footer-input.vue

@@ -1,5 +1,5 @@
 <template>
-	<span>{{ getFooterData() }}</span>
+	<span v-html="renderText"></span>
 </template>
 
 <script>

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

@@ -5,7 +5,7 @@
 		</template>
 	</div>
 	<template v-else>
-		<span class="blue">{{ getFooterData() }}</span>
+		<span class="blue" v-html="renderText"></span>
 	</template>
 </template>
 

package/packages/vxeTable/render/globalRenders.jsx

@@ -39,7 +39,7 @@ let defaultPublicProps = {
 
 // 渲染器个性化默认配置
 let defaultProps = {
-	$vInput: { type: 'text', placeholder: '请输入', transfer: true, digits: 2, prefixType: 'text', suffixType: 'text' },
+	$vInput: { type: 'text', placeholder: '请输入', transfer: true, digits: 2, prefixType: 'text', suffixType: 'text', immediate: false },
 	$vTextArea: { placeholder: '请输入', rows: 2, transfer: true, resize: 'none', showWordCount: true },
 	$vSelect: { placeholder: '请选择', filterable: true, transfer: true, showType: 'text', tagColor: 'default', split: ',', options: [] },
 	$vTree: { placeholder: '请选择', transfer: true, split: ',', nodeKey: 'id', labelField: 'label' },
@@ -64,7 +64,7 @@ let defaultProps = {
 // 统一处理传参boolean与配置String问题
 const getFixedProp = (renderOpts, params) => {
 	let { name, props = {} } = renderOpts
-	let { column, $table } = params
+	let { column, $grid, $table } = params
 	let rturnProps = Object.assign({}, defaultPublicProps, defaultProps[name], props)
 	let transKeys = ['transfer', 'disabled', 'multiple', 'isLeaf', 'commafy', 'border', 'filterable', 'showWordCount', 'editable']
 	transKeys.forEach(key => {
@@ -72,6 +72,13 @@ const getFixedProp = (renderOpts, params) => {
 			rturnProps[key] = Boolean(+rturnProps[key])
 		}
 	})
+	const contextAttrs = $grid?.context?.attrs || $table?.context?.attrs || {}
+	if (['$vMoney'].includes(name) && contextAttrs.moneyConfig?.enabled && contextAttrs.moneyUnit && !rturnProps.bill && rturnProps.bill !== '0') {
+		let moneyOption = contextAttrs.moneyConfig?.options.find(item => item.value === contextAttrs.moneyUnit)
+		rturnProps.moneyUnit = contextAttrs.moneyUnit
+		rturnProps.moneyOption = moneyOption
+		if (moneyOption && moneyOption.digits) rturnProps.digits = moneyOption.digits
+	}
 	if (column) {
 		column.rname = name
 		column.rprops = rturnProps
@@ -106,7 +113,7 @@ const publicRenders = {
 		},
 		renderFooter(renderOpts, params) {
 			let props = getFixedProp(renderOpts, params)
-			return [<vxeFooterInput redit={false} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeFooterInput rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} />]
 		}
 	},
 	$vTextArea: {
@@ -252,11 +259,11 @@ const publicRenders = {
 		},
 		renderHeader(renderOpts, params) {
 			let props = getFixedProp(renderOpts, params)
-			return [<vxeHeaderMoney redit={false} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeHeaderMoney rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} />]
 		},
 		renderFooter(renderOpts, params) {
 			let props = getFixedProp(renderOpts, params)
-			return [<vxeFooterMoney redit={false} rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} rdata={props.rdata} />]
+			return [<vxeFooterMoney rparams={params} rname={renderOpts.name} rprops={props.rprops} rkey={props.rkey} />]
 		},
 		exportMethod({ row, column }) {
 			return utils.get(row, column.property)

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

@@ -1,7 +1,7 @@
 <template>
 	<span>
 		{{ rparams.column.title }}
-		<span v-if="moneyUnitText" class="header-money-unit-text">({{ moneyUnitText }})</span>
+		<span v-if="rprops.moneyOption?.label && !rprops.bill" class="header-money-unit-text">({{ rprops.moneyOption?.label }})</span>
 	</span>
 	<div v-if="rprops.bill" class="header-bill-box">
 		<template v-for="(bil, bilindex) in billGroups" :key="bilindex">

package/packages/vxeTable/render/mixin/cell-hooks.js

@@ -1,32 +1,7 @@
 import { computed, ref, watch } from 'vue'
 
-let moneyUnitConstants = [
-	{ value: 1, label: '元' },
-	{ value: 1000, label: '千元' },
-	{ value: 10000, label: '万元' }
-]
-let cnGroups = [
-	{ shortText: '兆', fullText: '兆', value: '' },
-	{ shortText: '千', fullText: '千亿', value: '' },
-	{ shortText: '百', fullText: '百亿', value: '' },
-	{ shortText: '十', fullText: '十亿', value: '' },
-	{ shortText: '亿', fullText: '亿', value: '' },
-	{ shortText: '千', fullText: '千万', value: '' },
-	{ shortText: '百', fullText: '百万', value: '' },
-	{ shortText: '十', fullText: '十万', value: '' },
-	{ shortText: '万', fullText: '万', value: '' },
-	{ shortText: '千', fullText: '千', value: '' },
-	{ shortText: '百', fullText: '百', value: '' },
-	{ shortText: '十', fullText: '十', value: '' },
-	{ shortText: '元', fullText: '元', value: '' },
-	{ shortText: '角', fullText: '角', value: '' },
-	{ shortText: '分', fullText: '分', value: '' },
-	{ shortText: '毫', fullText: '毫', value: '' },
-	{ shortText: '厘', fullText: '厘', value: '' }
-]
-
 export default function (props, context, proxy) {
-	const { $vUtils } = proxy
+	const { $vUtils, $vTableSetup } = proxy
 
 	const renderValue = ref(null)
 	const renderText = ref('')
@@ -37,15 +12,11 @@ export default function (props, context, proxy) {
 	const isEditAll = computed(() => {
 		return props.rparams.$table?.props?.editConfig?.enabled && reditmode.value === 'all' && props.rparams.column.editRender
 	})
-	const moneyUnitText = computed(() => {
-		let moneyConstant = moneyUnitConstants.find(item => item.value === props.rprops.moneyUnit)
-		return moneyConstant && moneyConstant.label
-	})
 	const billGroups = computed(() => {
 		let { billStart = '分', billEnd = '亿' } = props.rprops
-		let startIndex = cnGroups.findIndex(cn => cn.fullText === billEnd)
-		let endIndex = cnGroups.findIndex(cn => cn.fullText === billStart)
-		return cnGroups.slice(startIndex, endIndex)
+		let startIndex = $vTableSetup.cnGroups.findIndex(cn => cn.fullText === billEnd)
+		let endIndex = $vTableSetup.cnGroups.findIndex(cn => cn.fullText === billStart)
+		return $vTableSetup.cnGroups.slice(startIndex, endIndex + 1)
 	})
 	const psButtonConfig = computed(() => {
 		return { disabled: props.rprops.disabled, size: props.rsize, status: 'primary' }
@@ -117,51 +88,28 @@ export default function (props, context, proxy) {
 	}
 	// 格式化值formatValue
 	const formatValueFun = (value, editable) => {
+		if (props.rparams.type === 'footer') {
+			const { items, itemIndex } = props.rparams
+			const { moneyUnit, digits } = props.rprops
+			let footerText = items[itemIndex]
+			if (props.rname === '$vMoney') footerText = $vUtils.truncate($vUtils.divide(items[itemIndex], moneyUnit), digits)
+			if (props.rprops.commafy) footerText = $vUtils.commafy(footerText, { digits })
+			renderValue.value = items[itemIndex]
+			renderText.value = footerText
+			return
+		}
 		let formatObj = $vUtils.formatRender(value, props.rkey, props.rdata, props.rname, props.rprops, proxy, editable)
 		renderValue.value = ['$vMoney'].includes(props.rname) ? formatObj.rtext : formatObj.rvalue
 		renderText.value = formatObj.rtext
 		return formatObj
 	}
-	// 格式化底部值
-	const getFooterData = (qianfen = true) => {
-		let { $table, items, itemIndex, column } = props.rparams
-		let tableData = $table.internalData.afterFullData
-		let { rname, rprops, rfooter, property } = column
-		let { digits, moneyUnit, commafy, type, calculate } = rprops
-		let footerValue = items[itemIndex]
-		if (rfooter) {
-			let caculateObj = rfooter[items[rfooter.index || 0]]
-			if (caculateObj && (rname === '$vMoney' || (['number', 'float', 'integer'].includes(type) && calculate))) {
-				let tableColumnData = $vUtils.mapTree(tableData, row => row[property])
-				let { computeType, result, typeObj } = caculateObj
-				switch (computeType) {
-					case 'subTotal':
-						footerValue = $vUtils.sum(tableColumnData)
-						break
-					case 'allTotal':
-						footerValue = typeObj[property] || result
-						break
-					case 'mean':
-						footerValue = $vUtils.mean(tableColumnData)
-						break
-					default:
-						footerValue = result
-						break
-				}
-				if (rname === '$vMoney') footerValue = $vUtils.truncate($vUtils.divide(footerValue, moneyUnit), digits)
-				if (qianfen && commafy) footerValue = $vUtils.commafy(footerValue, { digits })
-			}
-		}
-		return footerValue
-	}
 	const getBillClass = bil => {
 		return { basic: bil.fullText === '元', commafy: ['千', '百万', '十亿', '兆'].includes(bil.fullText) }
 	}
 	// 获取单据值
-	const getBillValue = (index, total = false) => {
-		let value = total ? getFooterData(false) : renderValue.value
-		if (!value) return ''
-		let fullValue = $vUtils.formatMoneyPad(value)
+	const getBillValue = index => {
+		if (!renderValue.value) return ''
+		let fullValue = $vUtils.formatMoneyPad(renderValue.value)
 		let fullList = fullValue.replace('.', '').split('')
 		return fullList[index]
 	}
@@ -171,6 +119,10 @@ export default function (props, context, proxy) {
 		() => initData(),
 		{ deep: true, immediate: true }
 	)
+	watch(
+		() => props.rprops,
+		() => initData()
+	)
 
 	return {
 		renderValue,
@@ -178,7 +130,6 @@ export default function (props, context, proxy) {
 		rsize,
 		rform,
 		isEditAll,
-		moneyUnitText,
 		billGroups,
 		psButtonConfig,
 		prefixButton,
@@ -190,7 +141,6 @@ export default function (props, context, proxy) {
 		vxeRadioCallBack,
 		vxeCheckCallBack,
 		vxeBlurCallback,
-		getFooterData,
 		getBillClass,
 		getBillValue,
 		setRenderValue