sh-view 2.9.21 → 2.9.22

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "sh-view",
-	"version": "2.9.21",
+	"version": "2.9.22",
 	"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",
@@ -28,9 +28,9 @@
 		"babel-polyfill": "^6.26.0",
 		"codemirror": "^6.0.2",
 		"core-js": "^3.32.2",
-		"countup.js": "^2.8.0",
+		"countup.js": "^2.9.0",
 		"cron-parser": "^4.8.1",
-		"docx-preview": "^0.1.18",
+		"docx-preview": "^0.1.20",
 		"exceljs": "^4.4.0",
 		"jspdf": "^3.0.4",
 		"jszip": "^3.10.1",
@@ -40,8 +40,8 @@
 		"vue": "^3.5.20",
 		"vue-masonry": "^0.16.0",
 		"vue-router": "^4.5.1",
-		"vxe-pc-ui": "^4.9.6",
-		"vxe-table": "^4.16.1"
+		"vxe-pc-ui": "^4.11.24",
+		"vxe-table": "^4.17.36"
 	},
 	"devDependencies": {
 		"@typescript-eslint/eslint-plugin": "^6.9.0",

package/packages/components/sh-calendar/index.vue

@@ -431,7 +431,7 @@ export default defineComponent({
 						break
 				}
 			} catch (e) {
-				proxy.msgwarning(e.message)
+				proxy.$vMessage.warning(e.message)
 			}
 		}
 		const emitValue = (value, evnt) => {

package/packages/components/sh-date/index.vue

@@ -21,7 +21,7 @@
 			</vxe-pulldown>
 		</template>
 		<template v-else>
-			<vxe-input
+			<vxe-date-picker
 				v-model="inputValue"
 				v-bind="inputConfig"
 				@input="dispatch('input', $event)"
@@ -38,7 +38,7 @@
 				@suffix-click="dispatch('suffix-click', $event)"
 				@date-prev="dispatch('date-prev', $event)"
 				@date-today="dispatch('date-today', $event)"
-				@date-next="dispatch('date-next', $event)"></vxe-input>
+				@date-next="dispatch('date-next', $event)"></vxe-date-picker>
 		</template>
 	</div>
 </template>

package/packages/components/sh-form/query.vue

@@ -33,7 +33,7 @@ import useForm from './js/useForm'
 export default defineComponent({
 	name: 'ShQuery',
 	props: props,
-	emits: ['submit', 'reset', 'edit-closed', 'submit-invalid', 'collapse', 'prefix-click', 'suffix-click'],
+	emits: ['submit', 'reset', 'edit-closed', 'submit-invalid', 'collapse', 'prefix-click', 'suffix-click', 'collapsed'],
 	setup(props, context) {
 		const { proxy } = getCurrentInstance()
 		const useFormHooks = useForm(props, context, proxy)

package/packages/components/sh-progress/index.vue

@@ -31,6 +31,10 @@ export default defineComponent({
 			type: Number,
 			default: 0
 		},
+		successAuto: {
+			type: Boolean,
+			default: true
+		},
 		status: {
 			type: String,
 			default: 'normal' // normal', 'active', 'wrong', 'success'
@@ -97,11 +101,11 @@ export default defineComponent({
 			if (isDown) {
 				currentStatus.value = 'normal'
 				emit('status-change', 'normal')
-			} else {
-				if (parseInt(props.percent, 10) === 100) {
+			} else if (parseInt(props.percent, 10) === 100) {
+				if (props.successAuto) {
 					currentStatus.value = 'success'
-					emit('status-change', 'success')
 				}
+				emit('status-change', 'success')
 			}
 		}
 

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

@@ -136,13 +136,13 @@ export default defineComponent({
 		const handleImportDataBtn = async (type = 'all') => {
 			let importData = type === 'all' ? importTableData.value : shtable.value.getSelectionData()
 			if (!importData || !Array.isArray(importData) || importData.length < 1) {
-				proxy.msginfo('未导入数据')
+				proxy.$vMessage.info('未导入数据')
 				return false
 			}
 			if (props.needValidate) {
 				let validateErrMap = await handleImportDataValidate(importData)
 				if (validateErrMap) {
-					proxy.msgerror('导入校验失败，请检查数据')
+					proxy.$vMessage.error('导入校验失败，请检查数据')
 					return validateErrMap
 				}
 			}
@@ -180,7 +180,7 @@ export default defineComponent({
 			if (typeof props.downloadTemplateFinished === 'function') {
 				props.downloadTemplateFinished(options)
 			}
-			proxy.msgsuccess('下载模板完成！')
+			proxy.$vMessage.success('下载模板完成！')
 		}
 		// 选择导入文件按钮
 		const handleImportFileBtn = async () => {
@@ -201,9 +201,9 @@ export default defineComponent({
 				if (typeof props.importFileFinished === 'function') {
 					props.importFileFinished(options)
 				}
-				proxy.msgsuccess('导入完成！')
+				proxy.$vMessage.success('导入完成！')
 			} catch (e) {
-				proxy.msgerror(e.message || e)
+				proxy.$vMessage.error(e.message || e)
 			}
 		}
 		// 读取文件

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

@@ -36,7 +36,7 @@
         left: 0;
         width: 100%;
         height: 100%;
-        padding: 0.5em 1em;
+        padding: 8px;
         background-color: var(--bg-layout-color);
     }
     .sh-table-footer{

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

@@ -150,7 +150,7 @@ export default function (props, context, proxy, isGrid) {
 		return Object.assign({ seqMethod: obj => seqMethod(obj, pagerConfig) }, props.seqConfig)
 	})
 	const tableMoneyConfig = computed(() => {
-		return Object.assign({ style: { width: '60px' } }, $vTableSetup.moneyConfig, props.moneyConfig, tableVmConfig.value)
+		return Object.assign({ style: { width: '70px' } }, $vTableSetup.moneyConfig, props.moneyConfig, tableVmConfig.value)
 	})
 	const tableExportConfig = computed(() =>
 		Object.assign(
@@ -582,7 +582,7 @@ export default function (props, context, proxy, isGrid) {
 	// 自定义操作列点击事件
 	const handleGoptionClick = async (btnObj, dataObj) => {
 		if (btnObj.code === 'delete' || btnObj.idConfirm) {
-			await proxy.msgconfirm({ content: btnObj.ConfirmContent || `确定${btnObj.content}吗？` })
+			await proxy.$vMessage.confirm({ content: btnObj.ConfirmContent || `确定${btnObj.content}吗？` })
 		}
 		emit('globaloption', btnObj, dataObj)
 	}
@@ -611,11 +611,11 @@ export default function (props, context, proxy, isGrid) {
 		if (isTool) {
 			let selectedRows = getSelectionData()
 			if (selectedRows.length < 1) {
-				proxy.msgwarning('请选择要删除的行！')
+				proxy.$vMessage.warning('请选择要删除的行！')
 				return
 			}
 			deleteRows = selectedRows
-			await proxy.msgconfirm({ content: `确定删除吗？` })
+			await proxy.$vMessage.confirm({ content: `确定删除吗？` })
 		} else if (typeof props.onToolbarBtnDeleteBefore === 'function') {
 			let result = await props.onToolbarBtnDeleteBefore(deleteRows)
 			if (!result) return

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

@@ -165,6 +165,9 @@ export default defineComponent({
 			slotRefs.forEach(slotRef => {
 				otherHeight += slotRef.value?.offsetHeight || 0
 			})
+			if (useTableHooks.zoomStatus.value) {
+				otherHeight += 16
+			}
 			tableHeight.value = parentHeight - otherHeight
 		}
 

package/packages/components/sh-tabs/index.vue

@@ -11,9 +11,9 @@
 						<template v-for="(tab, tabIndex) in tabList" :key="tabIndex">
 							<div v-bind="getTabItemBind(tab, tabIndex)" @click="handleChange(tab)">
 								<slot name="tabItem" v-bind="{ ...tab, isActive: tab[labelKey] === activeKey }">
-									<div v-if="tab.icon" class="sh-tab-icon"><sh-icon :type="tab.icon"></sh-icon></div>
+									<div v-if="tab.icon" class="sh-tab-icon"><sh-icon :type="tab.icon" :size="iconSize"></sh-icon></div>
 									<div v-if="tab[labelField]" class="sh-tab-label">{{ tab[labelField] }}</div>
-									<div v-if="getTabIsClosable(tab)" class="sh-tab-close" @click.stop="handleClose(tab)"><sh-icon type="ios-close"></sh-icon></div>
+									<div v-if="getTabIsClosable(tab)" class="sh-tab-close" @click.stop="handleClose(tab)"><sh-icon type="ios-close" :size="iconSize"></sh-icon></div>
 								</slot>
 							</div>
 						</template>
@@ -108,6 +108,10 @@ export default defineComponent({
 		const isHorizontal = computed(() => ['left', 'right'].includes(props.placement))
 		const hasContent = computed(() => props.isContent && activeKey.value && props.options.map(item => item[props.labelKey]).includes(activeKey.value))
 		const vmSize = computed(() => props.size || $vUiSetup.size)
+		const iconSize = computed(() => {
+			if (['small', 'mini'].includes(vmSize.value)) return 12
+			return 14
+		})
 		const tabClass = computed(() => {
 			return {
 				'sh-tabs-card': props.type === 'card',
@@ -269,6 +273,7 @@ export default defineComponent({
 			activeKey,
 			hasContent,
 			contentStyle,
+			iconSize,
 			scrollPrev,
 			scrollNext,
 			handleScroll,
@@ -287,7 +292,7 @@ export default defineComponent({
 	width: 100%;
 	position: relative;
 	display: flex;
-	line-height: 2.3em;
+	line-height: 2.4em;
 	&-size {
 		&-medium {
 			font-size: 1.25em;
@@ -303,6 +308,7 @@ export default defineComponent({
 		display: inline-flex;
 		align-items: center;
 		font-size: 1.4em;
+		padding: 0 0.1em;
 		&:hover {
 			background-color: rgba(0, 0, 0, 0.1);
 		}

package/packages/components/sh-toolbar/index.vue

@@ -153,6 +153,7 @@ export default defineComponent({
 
 		return {
 			leftActive,
+			vmSize,
 			toolBtns,
 			leftBtns,
 			rightBtns,

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

@@ -90,34 +90,36 @@ export default defineComponent({
 			return Object.assign(resultConfig, tableProps.value)
 		})
 
-		const initSelection = () => {
-			let { modelValue, multiple } = props
+		const initSelection = async isForce => {
+			let { modelValue, multiple, isSelect } = props
 			let nodeKey = props.nodeKey || 'id'
-			setTimeout(() => {
-				if (!tableRef.value || !modelValue?.length) return
-				let tableFullData = tableRef.value.getTableData().fullData
-				let checkRows = []
-				$vUtils.eachTree(tableFullData, item => {
-					if (props.modelValue.includes(item[nodeKey])) {
-						checkRows.push(item)
-					}
-				})
-				// 找到第一个选中节点的所有父级，进行展开
-				if (checkRows.length > 0) {
-					let expendNode = checkRows[0]
-					let checkParent = $vUtils.findTree(tableFullData, item => item[nodeKey] === expendNode[nodeKey])
-					let parentNodes = checkParent.nodes.filter(item => item[nodeKey] !== expendNode[nodeKey])
-					tableRef.value.setTreeExpand(parentNodes, true)
-					if (multiple) {
-						tableRef.value.setCheckboxRow(checkRows, true)
-					} else {
-						tableRef.value.setRadioRow(checkRows[0])
-					}
+			if (!tableRef.value) return
+			if (!isForce && $vUtils.isEqual(modelValue, treeValue.value)) {
+				// 非强制更新，如果两次值相等，返回
+				return
+			}
+			let tableFullData = tableRef.value.getTableData().fullData
+			let checkRows = []
+			$vUtils.eachTree(tableFullData, item => {
+				if (props.modelValue.includes(item[nodeKey])) {
+					checkRows.push(item)
 				}
-				setTimeout(() => {
-					tableRef.value.scrollToRow({ [nodeKey]: modelValue[0] })
-				})
 			})
+			// 找到第一个选中节点的所有父级，进行展开
+			if (checkRows.length > 0) {
+				let expendNode = checkRows[0]
+				let checkParent = $vUtils.findTree(tableFullData, item => item[nodeKey] === expendNode[nodeKey])
+				let parentNodes = checkParent.nodes.filter(item => item[nodeKey] !== expendNode[nodeKey])
+				await tableRef.value.setTreeExpand(parentNodes, true)
+				await tableRef.value.scrollToRow(checkRows[0])
+				if (multiple) {
+					await tableRef.value.setCheckboxRow(checkRows, true)
+				} else {
+					await tableRef.value.setRadioRow(checkRows[0])
+				}
+			} else {
+				await tableRef.value.clearAll()
+			}
 		}
 		// 单选框变化
 		const onRadioChange = obj => {
@@ -198,13 +200,14 @@ export default defineComponent({
 			})
 		}
 
-		const filterChangeDebounce = $vUtils.debounce(handleMyTableFilter, 500)
+		const initChangeDebounce = $vUtils.debounce(initSelection, 100)
+		const filterChangeDebounce = $vUtils.debounce(handleMyTableFilter, 300)
 		const offetChangeDebounce = $vUtils.debounce(handleOffsetChange, tableConfigIn.value.resizeConfig?.refreshDelay || 100)
 
 		watch(
 			() => props.modelValue,
 			() => {
-				initSelection(true)
+				initChangeDebounce()
 			}
 		)
 		watch(

package/packages/components/sh-tree/index.vue

@@ -194,7 +194,7 @@ export default defineComponent({
 			// 初始化获取服务配置数据
 			await getServerConfigDataSourse()
 			if (tableTreeRef.value) {
-				tableTreeRef.value.initSelection()
+				tableTreeRef.value.initSelection(true)
 			}
 		}
 		// 树节点选择变换事件

package/packages/components/sh-upload/index.vue

@@ -367,18 +367,18 @@ export default defineComponent({
 				const checked = fileFormat.value.some(item => item.toLocaleLowerCase() === _file_format)
 				if (!checked) {
 					let errorMsg = `格式不正确，请上传 ${fileFormat.value.join(' ')} 格式文件`
-					props.onFormatError ? props.onFormatError(file, errorMsg, fileList.value) : proxy.msginfo(errorMsg)
+					props.onFormatError ? props.onFormatError(file, errorMsg, fileList.value) : proxy.$vMessage.info(errorMsg)
 					return
 				}
 			}
 			// check maxSize
 			if (maxSize && file.size > maxSize * 1024) {
 				let errorMsg = `文件大小不能超过 ${maxSize / 1024} M`
-				props.onExceededSize ? props.onExceededSize(file, errorMsg, fileList.value) : proxy.msginfo(errorMsg)
+				props.onExceededSize ? props.onExceededSize(file, errorMsg, fileList.value) : proxy.$vMessage.info(errorMsg)
 				return
 			}
 			if (!action) {
-				proxy.msginfo('上传地址不能为空')
+				proxy.$vMessage.info('上传地址不能为空')
 				return
 			}
 			return true

package/packages/css/main.scss

@@ -205,3 +205,35 @@ input[type="number"]{  -moz-appearance: textfield; }
     }
 }
 
+// 全局通用提醒个性化样式
+.sh-message-box{
+    &.type--confirm{
+        .vxe-modal--box{
+        }
+    }
+    &.status--success{
+        .vxe-modal--box{
+            background-color: #edfff3;
+            border-color: var(--success-color);
+        }
+    }
+    &.status--warning{
+        .vxe-modal--box{
+            background-color: #fff9e6;
+            border-color: var(--warning-color);
+        }
+    }
+    &.status--error{
+        .vxe-modal--box{
+            background-color: #ffefe6;
+            border-color: var(--danger-color);
+        }
+    }
+    &.status--info{
+        .vxe-modal--box{
+            background-color: #f0faff;
+            border-color: var(--info-color);
+        }
+    }
+}
+

package/packages/mixin/index.js

@@ -1,41 +1,5 @@
-const msgDefault = {
-	title: '',
-	className: 'globalMessageBox',
-	draggable: false
-}
-
 const mixin = {
 	methods: {
-		// 全局msg提示方法
-		msg(options) {
-			return this.$vTable.modal.message(options)
-		},
-		msginfo(options) {
-			let opts = Object.assign({}, msgDefault, typeof options === 'string' ? { content: options, status: 'info' } : options)
-			return this.msg(opts)
-		},
-		msgsuccess(options) {
-			let opts = Object.assign({}, msgDefault, typeof options === 'string' ? { content: options, status: 'success' } : options)
-			return this.msg(opts)
-		},
-		msgwarning(options) {
-			let opts = Object.assign({}, msgDefault, typeof options === 'string' ? { content: options, status: 'warning' } : options)
-			return this.msg(opts)
-		},
-		msgerror(options) {
-			let opts = Object.assign({}, msgDefault, typeof options === 'string' ? { content: options, status: 'error' } : options)
-			return this.msg(opts)
-		},
-		msgconfirm(options) {
-			return new Promise(async resolve => {
-				let opts = Object.assign({}, typeof options === 'string' ? { content: options } : options)
-				let type = await this.$vTable.modal.confirm({
-					showHeader: Boolean(opts.title),
-					...opts
-				})
-				if (type === 'confirm') resolve(type)
-			})
-		},
 		// 全局路由跳
 		routerTo(route) {
 			let { name, params, query } = {}
@@ -45,8 +9,11 @@ const mixin = {
 				params = route.params
 				query = route.query
 			}
-			if (name.indexOf('isTurnByHref_') > -1) {
-				window.open(name.split('_')[1])
+			if (String(name).startsWith('http')) {
+				window.open(name)
+				return
+			} else if (String(name).startsWith('href:')) {
+				window.open(String(name).replace('href:', ''))
 				return
 			}
 			try {
@@ -56,24 +23,13 @@ const mixin = {
 			}
 		},
 		// 全局路由返回上一页
-		routerback() {
-			this.$router.back()
+		routerBack() {
+			return this.$router.back()
 		},
 		// 全局判断是否有子节点
 		hasChildren(item, name = 'children') {
 			return item && item[name] && Array.isArray(item[name]) && item[name].length > 0
 		},
-		// 全局格式化名称
-		formatTitle(item) {
-			let { title, __titleIsFunction__ } = item.meta || {}
-			if (!title) return false
-			if (this.$config.useI18n) {
-				if (title.includes('{{') && title.includes('}}')) title = title.replace(/({{[\s\S]+?}})/, (m, str) => str.replace(/{{([\s\S]*)}}/, (m, _) => this.$t(_.trim())))
-				else if (__titleIsFunction__) title = item.meta.title
-				else title = this.$t(item.name)
-			} else title = (item.meta && item.meta.title) || item.name
-			return title
-		},
 		// 配置继承方法
 		getExtendConfig(config = {}, name, module) {
 			let moduleConfig = config[module] || config.default || {}

package/packages/other/sh-preview/components/sh-excel.vue

@@ -154,6 +154,7 @@ export default defineComponent({
 <style lang="scss">
 .sh-office-excel {
 	position: relative;
+	height: 100%;
 	.wolf-table-scrollbar {
 		&.vertical {
 			opacity: 1 !important;

package/packages/other/sh-preview/components/sh-image.vue

@@ -0,0 +1,19 @@
+<script>
+import { defineComponent, computed, getCurrentInstance } from 'vue'
+import dataProps from '../js/data-props'
+export default defineComponent({
+	name: 'ShImage',
+	props: dataProps,
+	emits: ['rendered', 'error'],
+	setup(props, context) {
+		const { proxy } = getCurrentInstance()
+		return {}
+	}
+})
+</script>
+
+<template>
+	<vxe-image ref="rootRef" :src="src" v-bind="options"></vxe-image>
+</template>
+
+<style lang="scss" scoped></style>

package/packages/other/sh-preview/index.vue

@@ -1,6 +1,6 @@
 <template>
-	<div class="sh-preview">
-		<component :is="componentName" v-bind="componentProps" :style="componentStyles" @rendered="onRendered" @error="onError" />
+	<div class="sh-preview" :style="styles">
+		<component :is="componentName" v-bind="componentProps" @rendered="onRendered" @error="onError" />
 	</div>
 </template>
 
@@ -41,6 +41,8 @@ export default defineComponent({
 		const componentName = computed(() => {
 			if (!props.url || !previewType.value) {
 				return 'div'
+			} else if (['jpg', 'jpeg', 'jpe', 'png', 'gif'].includes(previewType.value)) {
+				return defineAsyncComponent(() => import('./components/sh-image.vue'))
 			} else if (['word', 'doc', 'docx'].includes(previewType.value)) {
 				return defineAsyncComponent(() => import('./components/sh-word.vue'))
 			} else if (['excel', 'xlsx'].includes(previewType.value)) {
@@ -51,19 +53,25 @@ export default defineComponent({
 		const componentProps = computed(() => {
 			let srcPrefix = props.base || ''
 			let srcProps = {
-				src: srcPrefix + props.url,
-				frameborder: 0
+				src: srcPrefix + props.url
 			}
 			if (componentName.value === 'iframe') {
+				srcProps.frameborder = 0
+				srcProps.width = props.width
+				srcProps.height = props.height
 				srcProps.src += '#scrollbars=0&toolbar=0&statusbar=0'
 			}
 			return srcProps
 		})
-		const componentStyles = computed(() => {
-			return {
+		const styles = computed(() => {
+			let resultStyle = {
 				width: props.width,
-				height: props.height
+				maxWidth: '100%'
 			}
+			if (componentName.value !== 'iframe') {
+				resultStyle.height = props.height
+			}
+			return resultStyle
 		})
 
 		const onRendered = data => {
@@ -74,9 +82,9 @@ export default defineComponent({
 		}
 
 		return {
+			styles,
 			componentName,
 			componentProps,
-			componentStyles,
 			onRendered,
 			onError
 		}
@@ -88,5 +96,6 @@ export default defineComponent({
 .sh-preview {
 	position: relative;
 	overflow: auto;
+	max-width: 100%;
 }
 </style>

package/packages/vxeTable/css/index.scss

@@ -94,6 +94,12 @@ button:focus, .vxe-button.type--button:not(.is--disabled):focus{
 .vxe-modal--wrapper{
     width: calc(100%);
     height: calc(100%);
+    .vxe-modal--box{
+        .vxe-modal--footer{
+            border-top: 1px solid var(--border-color);
+            padding: 0.6em;
+        }
+    }
     &.vxe-modal--preview{
         .vxe-modal--box{
             .vxe-modal--content{
@@ -102,20 +108,18 @@ button:focus, .vxe-button.type--button:not(.is--disabled):focus{
         }
     }
     &.type--modal {
-        .vxe-modal--header{
-            background-color: var(--primary-weak-color);
-        }
-        .vxe-modal--footer{
-            border-top: 1px solid var(--border-color);
-            padding-top: 0.5rem;
-            padding-bottom: 0.5em;
+        .vxe-modal--box{
+            .vxe-modal--header{
+                background-color: var(--primary-weak-color);
+            }
         }
     }
     &.type--confirm {
         .vxe-modal--box{
-            width: 320px;
+            width: 340px;
+            min-height: 130px;
+            max-width: 96%;
             .vxe-modal--body{
-                padding: 10px;
             }
         }
     }

package/packages/vxeTable/index.js

@@ -74,7 +74,8 @@ let uiOptions = {
 	loading: {
 		icon: 'vxe-icon-spinner roll',
 		text: '加载中...'
-	}
+	},
+	message: { title: '', className: 'sh-message-box', draggable: false }
 }
 
 let tableOptions = {
@@ -250,6 +251,30 @@ VXETable.renderer.mixin(publicRenders)
 VXETable.renderer.mixin(extraRenders)
 VXETable.renderer.mixin(filterRenders)
 
+// 便捷化全局提示
+const statusList = ['info', 'success', 'warning', 'error']
+const vModal = VXEUI.modal
+let vMessage = {
+	confirm: options => {
+		return new Promise(async resolve => {
+			let opts = Object.assign({}, uiOptions.message, typeof options === 'string' ? { content: options } : options)
+			let type = await vModal.confirm({ showHeader: Boolean(opts.title), ...opts })
+			if (type === 'confirm') resolve(type)
+		})
+	}
+}
+let vNotice = {}
+statusList.forEach(status => {
+	vMessage[status] = options => {
+		let opts = Object.assign({ status }, uiOptions.message, typeof options === 'string' ? { content: options } : options)
+		return vModal.message(opts)
+	}
+	vNotice[status] = options => {
+		let opts = Object.assign({ status }, uiOptions.message, typeof options === 'string' ? { content: options } : options)
+		return vModal.notification(opts)
+	}
+})
+
 const index = {
 	install(Vue, { uiOption, tableOption, pdfOption, xlsxOption, menuOption, editorOption }) {
 		let vuiOption = utils.merge(uiOptions, uiOption)
@@ -268,7 +293,9 @@ const index = {
 		Vue.use(VXETable)
 
 		Vue.config.globalProperties.$vUtils = utils
-		Vue.config.globalProperties.$vModal = VXEUI.modal
+		Vue.config.globalProperties.$vModal = vModal
+		Vue.config.globalProperties.$vMessage = vMessage
+		Vue.config.globalProperties.$vNotice = vNotice
 		Vue.config.globalProperties.$vUi = VXEUI
 		Vue.config.globalProperties.$vTable = VXETable
 		Vue.config.globalProperties.$vUiSetup = vuiOption

package/packages/vxeTable/render/cell/vxe-render-goption.vue

@@ -3,8 +3,7 @@
 		<template v-for="renderBtn in renderBtns" :key="renderBtn.code">
 			<vxe-button
 				v-if="isBtnRender(renderBtn)"
-				v-ripple
-				:type="rprops.type"
+				:mode="rprops.type"
 				:size="rsize"
 				:icon="getBtnContent(renderBtn).icon"
 				:status="getBtnContent(renderBtn).status"
@@ -47,7 +46,7 @@ export default defineComponent({
 		const isBtnRender = renderBtn => {
 			if ($vUtils.has(renderBtn, 'condition')) {
 				let condition = $vUtils.get(renderBtn, 'condition')
-				return $vUtils.calculate(condition, props.rdata)
+				return $vUtils.calculate(condition, useCell.rdata.value)
 			}
 			return true
 		}

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

@@ -6,7 +6,15 @@
 				<span v-else @click="vxeInputPrefixClick">{{ rprops.prefixText }}</span>
 			</span>
 			<span v-else-if="controlButton" class="control-btn before" @click="vxeControlClick(false)">-</span>
-			<vxe-input v-model="renderValue" v-bind="rprops" :size="rsize" :immediate="false" @change="vxeInputChange" @input="vxeBlurCallback"></vxe-input>
+			<component
+				:is="inputComponent"
+				v-model="renderValue"
+				v-bind="rprops"
+				:size="rsize"
+				:immediate="false"
+				@change="vxeInputChange"
+				@blur="vxeBlurCallback"
+				@clear="vxeClearCallback"></component>
 			<span v-if="rprops.suffixText && rform" class="suffix">
 				<vxe-button v-if="suffixButton" v-bind="psButtonConfig" @click="vxeInputSuffixClick">{{ rprops.suffixText }}</vxe-button>
 				<span v-else @click="vxeInputSuffixClick">{{ rprops.suffixText }}</span>
@@ -33,7 +41,14 @@ export default defineComponent({
 		const { $vUtils } = proxy
 		const useCell = cellHooks(props, context, proxy)
 
-		const controlButton = computed(() => useCell.rprops.value.control && ['number', 'float', 'integer'].includes(useCell.rprops.value.type))
+		const isNumberInput = computed(() => ['number', 'float', 'integer'].includes(useCell.rprops.value.type))
+		const inputComponent = computed(() => {
+			if (isNumberInput.value) {
+				return 'vxe-number-input'
+			}
+			return 'vxe-input'
+		})
+		const controlButton = computed(() => useCell.rprops.value.control && isNumberInput.value)
 
 		// 输入框数字加减控制
 		const vxeControlClick = bol => {
@@ -45,6 +60,8 @@ export default defineComponent({
 
 		return {
 			...useCell,
+			isNumberInput,
+			inputComponent,
 			controlButton,
 			vxeControlClick
 		}

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

@@ -1,7 +1,7 @@
 <template>
 	<span class="vxe-render--inner" :class="{ 'form-render': rform, 'td-render': !rform, 'td-all': rprops.bill }">
 		<template v-if="redit || isEditAll">
-			<vxe-number-input v-model="renderText" v-bind="rprops" :size="rsize" :immediate="false" @change="vxeInputChange" @input="vxeMoneyCallback" />
+			<vxe-number-input v-model="renderText" v-bind="rprops" :size="rsize" :immediate="false" @change="vxeInputChange" @blur="vxeMoneyBlur" @clear="vxeMoneyClear" />
 		</template>
 		<template v-else-if="rprops.bill">
 			<template v-for="(bil, bilindex) in billGroups" :key="bilindex">
@@ -34,15 +34,23 @@ export default defineComponent({
 			return cellValue
 		})
 
-		const vxeMoneyCallback = async ({ value, $event }) => {
+		const vxeMoneyBlur = async ({ value, $event }) => {
 			let cellValue = $vUtils.multiply(value, useCell.rprops.value.moneyUnit || 1)
 			useCell.setRenderValue(cellValue)
 		}
 
+		const vxeMoneyClear = async ({ value, $event }) => {
+			let cellValue = $vUtils.multiply(value, useCell.rprops.value.moneyUnit || 1)
+			setTimeout(() => {
+				useCell.setRenderValue(cellValue)
+			}, 50)
+		}
+
 		return {
 			...useCell,
 			cellFormatValue,
-			vxeMoneyCallback
+			vxeMoneyBlur,
+			vxeMoneyClear
 		}
 	}
 })

package/packages/vxeTable/render/cell/vxe-render-progress.vue

@@ -1,6 +1,6 @@
 <template>
 	<template v-if="redit || isEditAll">
-		<vxe-input v-model="renderValue" type="number" v-bind="rprops" :size="rsize" @change="vxeInputChange" @input="vxeBlurCallback" />
+		<vxe-input v-model="renderValue" type="number" v-bind="rprops" :size="rsize" :immediate="false" @change="vxeInputChange" @blur="vxeBlurCallback" @clear="vxeClearCallback" />
 	</template>
 	<template v-else>
 		<sh-progress :percent="renderText" v-bind="rprops" />

package/packages/vxeTable/render/cell/vxe-render-textarea.vue

@@ -1,6 +1,6 @@
 <template>
 	<template v-if="redit || isEditAll">
-		<vxe-textarea v-model="renderValue" v-bind="rprops" :size="rsize" @change="vxeInputChange" @input="vxeBlurCallback" />
+		<vxe-textarea v-model="renderValue" v-bind="rprops" :size="rsize" :immediate="false" @change="vxeInputChange" @blur="vxeBlurCallback" @clear="vxeClearCallback" />
 	</template>
 	<template v-else>
 		<span>{{ renderText }}</span>

package/packages/vxeTable/render/cell/vxe-render-time.vue

@@ -1,6 +1,6 @@
 <template>
 	<template v-if="redit || isEditAll">
-		<sh-date v-model="renderValue" v-bind="rprops" :size="rsize" :disabled-method="vxeDisabledMethod" @input="vxeChangeCallBack"></sh-date>
+		<sh-date v-model="renderValue" v-bind="rprops" :size="rsize" :disabled-method="vxeDisabledMethod" @change="vxeChangeCallBack" @clear="vxeChangeCallBack"></sh-date>
 	</template>
 	<template v-else>
 		<span v-html="renderText"></span>

package/packages/vxeTable/render/globalRenders.jsx

@@ -34,7 +34,7 @@ import vxeFilterComplex from './filters/vxe-filter-complex.vue'
 // 全局渲染器
 const publicRenders = {
 	$vInput: {
-		autofocus: '.td-render .vxe-input--inner',
+		autofocus: '.vxe-input--inner, .vxe-number-input--input',
 		autoselect: true,
 		renderCell(renderOpts, params) {
 			return [<vxeRenderInput rparams={params} roptions={renderOpts} />]
@@ -50,7 +50,7 @@ const publicRenders = {
 		}
 	},
 	$vTextArea: {
-		autofocus: '.td-render .vxe-textarea--inner',
+		autofocus: '.vxe-textarea--inner',
 		autoselect: true,
 		renderCell(renderOpts, params) {
 			return [<vxeRenderTextarea rparams={params} roptions={renderOpts} />]
@@ -63,7 +63,7 @@ const publicRenders = {
 		}
 	},
 	$vSelect: {
-		autofocus: '.td-render .vxe-input--inner',
+		autofocus: '.vxe-input--inner',
 		autoselect: true,
 		renderCell(renderOpts, params) {
 			return [<vxeRenderSelect rparams={params} roptions={renderOpts} />]
@@ -76,7 +76,7 @@ const publicRenders = {
 		}
 	},
 	$vTree: {
-		autofocus: '.td-render .vxe-input--inner',
+		autofocus: '.vxe-input--inner',
 		autoselect: true,
 		renderCell(renderOpts, params) {
 			return [<vxeRenderTree rparams={params} roptions={renderOpts} />]
@@ -89,7 +89,7 @@ const publicRenders = {
 		}
 	},
 	$vTime: {
-		autofocus: '.td-render .vxe-input--inner',
+		autofocus: '.vxe-date-picker--inner',
 		autoselect: true,
 		renderCell(renderOpts, params) {
 			return [<vxeRenderTime rparams={params} roptions={renderOpts} />]
@@ -102,7 +102,7 @@ const publicRenders = {
 		}
 	},
 	$vProgress: {
-		autofocus: '.td-render .vxe-input--inner',
+		autofocus: '.vxe-input--inner',
 		autoselect: true,
 		renderCell(renderOpts, params) {
 			return [<vxeRenderProgress rparams={params} roptions={renderOpts} />]
@@ -130,7 +130,7 @@ const publicRenders = {
 		}
 	},
 	$vMoney: {
-		autofocus: '.td-render .vxe-input--inner',
+		autofocus: '.vxe-number-input--input',
 		autoselect: true,
 		renderCell(renderOpts, params) {
 			return [<vxeRenderMoney rparams={params} roptions={renderOpts} />]

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

@@ -1,4 +1,4 @@
-import { computed, ref, watch } from 'vue'
+import { computed, ref, watch, nextTick } from 'vue'
 
 export default function (props, context, proxy) {
 	const { $vUtils, $vTableSetup } = proxy
@@ -73,6 +73,12 @@ export default function (props, context, proxy) {
 	const vxeBlurCallback = async ({ value, $event }) => {
 		setRenderValue(value)
 	}
+	// 输入框失去焦点回调
+	const vxeClearCallback = async ({ value, $event }) => {
+		setTimeout(() => {
+			setRenderValue(value)
+		}, 50)
+	}
 	// 回调赋值
 	const setRenderValue = value => {
 		let cellValue = !$vUtils.isNone(value) ? value : renderValue.value
@@ -147,6 +153,7 @@ export default function (props, context, proxy) {
 		vxeRadioCallBack,
 		vxeCheckCallBack,
 		vxeBlurCallback,
+		vxeClearCallback,
 		getBillClass,
 		getBillValue,
 		setRenderValue