sh-view 2.10.8 → 2.10.10

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "sh-view",
-	"version": "2.10.8",
+	"version": "2.10.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",
@@ -38,11 +38,11 @@
 		"lunar-typescript": "^1.8.6",
 		"popper.js": "^1.16.1",
 		"sh-tools": "^2.3.12",
-		"vue": "^3.5.20",
+		"vue": "^3.5.29",
 		"vue-masonry": "^0.16.0",
 		"vue-router": "^4.6.4",
-		"vxe-pc-ui": "^4.12.30",
-		"vxe-table": "^4.17.48"
+		"vxe-pc-ui": "^4.13.0",
+		"vxe-table": "^4.17.49"
 	},
 	"devDependencies": {
 		"@typescript-eslint/eslint-plugin": "^6.21.0",

package/packages/components/sh-code-editor/index.vue

@@ -6,7 +6,7 @@
 </template>
 
 <script>
-import { defineComponent, ref, computed, watch, onMounted, onUnmounted, nextTick, getCurrentInstance } from 'vue'
+import { defineComponent, ref, computed, watch, onMounted, onUnmounted, nextTick, getCurrentInstance, reactive } from 'vue'
 import { basicSetup } from 'codemirror'
 import { keymap, placeholder, EditorView } from '@codemirror/view'
 import { Compartment, EditorState, StateEffect } from '@codemirror/state'
@@ -147,6 +147,10 @@ export default defineComponent({
 		const codeEditor = ref(null)
 		const codeError = ref(null)
 		const codeRef = ref()
+		const reactData = reactive({
+			isComposed: false,
+			isActivated: false
+		})
 
 		const styles = computed(() => {
 			return {
@@ -247,7 +251,8 @@ export default defineComponent({
 				tabSize.of(EditorState.tabSize.of(props.indent)),
 				EditorState.allowMultipleSelections.of(props.multipleSelection),
 				EditorView.editable.of(!disabled),
-				customKeymap()
+				customKeymap(),
+				domEventHandlers
 			]
 			// 括号自动补全
 			if (autoclose) innerExtensions.push(closeBrackets())
@@ -283,10 +288,9 @@ export default defineComponent({
 
 		const codeRender = async () => {
 			const docValue = getTransformValue(props.modelValue)
-			let editExtensions = [EditorView.focusChangeEffect.of(focusListener), EditorView.updateListener.of(updateListener)].concat(codeExtensions.value)
 			const codeState = EditorState.create({
 				doc: docValue,
-				extensions: editExtensions
+				extensions: codeExtensions.value
 			})
 			codeEditor.value = new EditorView({
 				parent: codeRef.value,
@@ -296,21 +300,42 @@ export default defineComponent({
 			dispatchEvent('loaded', props.modelValue)
 		}
 
-		const focusListener = (state, focusing) => {
-			const valueStr = state.doc.toString()
-			if (focusing) {
+		const domEventHandlers = EditorView.domEventHandlers({
+			focus: (event, view) => {
+				reactData.isActivated = true
+				const valueStr = view.state.doc.toString()
 				dispatchEvent('focus', valueStr)
-			} else {
+				return false
+			},
+			blur: (event, view) => {
+				reactData.isActivated = false
+				const valueStr = view.state.doc.toString()
 				dispatchValue(valueStr)
 				dispatchEvent('blur', valueStr)
+				return false
+			},
+			input: (event, view) => {
+				if (reactData.isComposed) {
+					return
+				}
+				const valueStr = view.state.doc.toString()
+				dispatchEvent('change', valueStr)
+				return false
+			},
+			compositionstart: (event, view) => {
+				reactData.isComposed = true
+				return false
+			},
+			compositionend: (event, view) => {
+				if (!reactData.isComposed) {
+					return
+				}
+				reactData.isComposed = false
+				const valueStr = view.state.doc.toString()
+				dispatchEvent('change', valueStr)
+				return false
 			}
-		}
-
-		const updateListener = ({ state, changes, docChanged }) => {
-			if (changes.empty || !docChanged) return
-			const valueStr = state.doc.toString()
-			dispatchEvent('change', valueStr)
-		}
+		})
 
 		const focus = () => {
 			codeEditor.value && codeEditor.value.focus()

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

@@ -75,7 +75,7 @@ export default defineComponent({
 		prefixIcon: String,
 		suffixIcon: String,
 		placement: String,
-		transfer: Boolean,
+		transfer: { type: Boolean, default: true },
 		// 个性化参数
 		range: Boolean,
 		autoBlur: { type: Boolean, default: true },

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

@@ -5,7 +5,10 @@ export default {
 			return {}
 		}
 	},
-	loading: Boolean,
+	loading: {
+		type: Boolean,
+		default: null
+	},
 	span: {
 		type: [Number, String],
 		default: 6
@@ -18,9 +21,15 @@ export default {
 		type: String,
 		default: 'center'
 	},
-	border: Boolean,
+	border: {
+		type: Boolean,
+		default: null
+	},
 	size: String,
-	titleBackground: Boolean,
+	titleBackground: {
+		type: Boolean,
+		default: null
+	},
 	titleAlign: {
 		type: String,
 		default: 'right'
@@ -31,11 +40,11 @@ export default {
 	},
 	titleColon: {
 		type: Boolean,
-		default: true
+		default: null
 	},
 	titleAsterisk: {
 		type: Boolean,
-		default: true
+		default: null
 	},
 	titleOverflow: {
 		type: String,
@@ -43,17 +52,26 @@ export default {
 	},
 	padding: {
 		type: Boolean,
-		default: true
+		default: null
 	},
 	readonly: {
 		type: Boolean,
-		default: false
+		default: null
+	},
+	vertical: {
+		type: Boolean,
+		default: null
 	},
-	vertical: Boolean,
 	className: String,
 	// disabled: Boolean, // 弃用
-	collapseStatus: Boolean,
-	collapseLayout: Boolean,
+	collapseStatus: {
+		type: Boolean,
+		default: null
+	},
+	collapseLayout: {
+		type: Boolean,
+		default: null
+	},
 	items: {
 		type: Array,
 		default() {
@@ -66,9 +84,9 @@ export default {
 			return {}
 		}
 	},
-	preventsubmit: {
+	preventSubmit: {
 		type: Boolean,
-		default: true
+		default: false
 	},
 	validConfig: {
 		type: Object,
@@ -88,7 +106,8 @@ export default {
 
 	// 扩展配置
 	editable: {
-		type: Boolean // 表格是否可编辑，默认不可编辑，弃用原表格的 disabled，为了统一自定义渲染器
+		type: Boolean, // 表格是否可编辑，默认不可编辑，弃用原表格的 disabled，为了统一自定义渲染器
+		default: null
 	},
 	caculateConfig: {
 		type: Object,

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

@@ -39,10 +39,11 @@ export default function (props, context, proxy, isForm) {
 		})
 		return formulaReplaceAll(formulaList)
 	})
+	const formEditable = computed(() => ($vUtils.isNone(props.editable) ? $vUiSetup.form.editable : props.editable))
 	const formBindConfig = computed(() => {
-		let formProps = $vUtils.omit(props, (val, key) => omitProps.includes(key))
+		let formProps = $vUtils.omit(props, (val, key) => omitProps.includes(key) || $vUtils.isNone(val))
 		let shProps = {
-			disabled: !props.editable,
+			disabled: !formEditable.value,
 			items: formItems.value,
 			rules: props.valid ? formFullRules.value : {},
 			formulaList: formFormulaList.value,
@@ -145,7 +146,7 @@ export default function (props, context, proxy, isForm) {
 		const { isItemTitle } = props
 		// 表单不支持编辑渲染过滤
 		let notRenderName = ['seq', 'checkbox', 'radio', '$vImg', '$vHref', '$vOparate']
-		let renderItems = $vUtils.searchTree(items, item => !((item.renderName && notRenderName.includes(item.renderName)) || notRenderName.includes(item.type)))
+		let renderItems = $vUtils.searchTree(items, item => !((item.renderName && notRenderName.includes(item.renderName)) || notRenderName.includes(item.type)), { isEvery: true })
 		let flatItemsArr = []
 		let rules = {}
 		let renderDefaultProps = $vTableSetup.renderConfig || {}

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

@@ -1,3 +1,6 @@
+@use "./default/icons" as default-icons;
+@use "./font/icons"  as font-icons;
+
 @font-face {
   font-family: 'Ionicons';
   src: url("./default/ionicons.woff2") format("woff2"),
@@ -24,8 +27,6 @@
   text-align: center;
 }
 
-@import "./default/icons";
-
 @font-face {
   font-family: "iconfont";
   src: url('./font/iconfont.woff2?t=1661513291946') format('woff2'),
@@ -39,6 +40,4 @@
   font-style: normal;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
-}
-
-@import "./font/icons";
+}

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

@@ -56,6 +56,7 @@ export default defineComponent({
 		const inputRef = ref()
 
 		const reactData = reactive({
+			isComposed: false,
 			isActivated: false,
 			inputValue: props.modelValue
 		})
@@ -131,6 +132,12 @@ export default defineComponent({
 			triggerEvent(evnt)
 		}
 		const inputEvent = evnt => {
+			if (reactData.isComposed) {
+				return
+			}
+			const inputElem = evnt.target
+			const value = inputElem.value
+			handleChange(value, evnt)
 			triggerEvent(evnt)
 		}
 		const changeEvent = evnt => {
@@ -148,9 +155,14 @@ export default defineComponent({
 			triggerEvent(evnt)
 		}
 		const compositionStart = evnt => {
+			reactData.isComposed = true
 			triggerEvent(evnt)
 		}
 		const compositionEnd = evnt => {
+			if (!reactData.isComposed) {
+				return
+			}
+			reactData.isComposed = false
 			const inputElem = evnt.target
 			const value = inputElem.value
 			handleChange(value, evnt)

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

@@ -31,11 +31,11 @@ export default {
 		type: Boolean
 	},
 	syncResize: {
-		type: [Boolean, String, Number],
-		default: true
+		type: [Boolean, String, Number]
 	},
 	stripe: {
-		type: Boolean
+		type: Boolean,
+		default: null
 	},
 	border: {
 		type: [Boolean, String],
@@ -43,7 +43,7 @@ export default {
 	},
 	round: {
 		type: Boolean,
-		default: false
+		default: null
 	},
 	size: {
 		type: String,
@@ -51,7 +51,7 @@ export default {
 	},
 	loading: {
 		type: Boolean,
-		default: false
+		default: null
 	},
 	align: {
 		type: String,
@@ -85,7 +85,7 @@ export default {
 	},
 	showFooter: {
 		type: Boolean,
-		default: false
+		default: null
 	},
 	footerMethod: {
 		type: Function
@@ -106,7 +106,7 @@ export default {
 	},
 	showFooterOverflow: {
 		type: [Boolean, String],
-		default: false
+		default: null
 	},
 	footerSpanMethod: {
 		type: [Function]

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

@@ -461,11 +461,7 @@ export default function (props, context, proxy, isGrid) {
 	// -------- 搜索
 	// 表单展开全部/收起切换事件
 	const onFormCollapsed = value => {
-		if (isGrid) {
-			setTimeout(() => {
-				tableRef.value.recalculate(true)
-			})
-		}
+		tableRef.value.recalculate(true)
 	}
 	const onFormSubmit = () => {
 		emit('form-submit', props.queryData)
@@ -572,13 +568,17 @@ export default function (props, context, proxy, isGrid) {
 					searchFields.push({ rkey: col.property, rname: renderObj.name, rprops: Object.assign({}, renderObj.props, col.rprops) })
 				}
 			})
-			filterData = $vUtils.searchTree(props.dataSourse, row => {
-				return searchFields.some(item => {
-					let cellValue = $vUtils.get(row, item.rkey)
-					let { rtext } = $vUtils.formatRender(cellValue, item.rkey, row, item.rname, item.rprops, proxy)
-					return $vUtils.trim(rtext).toLowerCase().indexOf(filterText) > -1
-				})
-			})
+			filterData = $vUtils.searchTree(
+				props.dataSourse,
+				row => {
+					return searchFields.some(item => {
+						let cellValue = $vUtils.get(row, item.rkey)
+						let { rtext } = $vUtils.formatRender(cellValue, item.rkey, row, item.rname, item.rprops, proxy)
+						return $vUtils.trim(rtext).toLowerCase().indexOf(filterText) > -1
+					})
+				},
+				{ isEvery: true, children: tableBindConfig.value.treeConfig?.childrenField }
+			)
 		}
 		if (tableFilterData.value === null && !filterText) {
 			return
@@ -700,8 +700,8 @@ export default function (props, context, proxy, isGrid) {
 		updateSelection()
 		return newRow
 	}
-	// 复制行按钮
-	const handleToolCopy = async (rows, index) => {
+	// 复制行按钮  isNext复制到目标行的 上面还是下面，默认到下面
+	const handleToolCopy = async (rows, isNext = true) => {
 		let selectedRows = getSelectionData()
 		let copyRows = $vUtils.clone(rows || selectedRows, true)
 		if (copyRows.length < 1) {
@@ -711,7 +711,8 @@ export default function (props, context, proxy, isGrid) {
 		if (typeof props.onToolbarCopyBefore === 'function') {
 			copyRows = await props.onToolbarCopyBefore(copyRows)
 		}
-		let insertList = copyRows.map(row => tableRef.value.insertAt(Object.assign(row, { [keyField.value]: undefined }), index ? index : row))
+		let insertType = isNext ? 'insertNextAt' : 'insertAt'
+		let insertList = copyRows.map(row => tableRef.value[insertType](Object.assign({}, row, { [keyField.value]: undefined }), row))
 		let insertRes = await Promise.all(insertList)
 		let insertRows = insertRes.map(item => item.row)
 		updateSelection()

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

@@ -1,16 +1,14 @@
 <template>
 	<vxe-table
 		ref="tableRef"
-		v-resize="offetChangeDebounce"
 		:class="{ 'sh-vxe-tree-table': true, 'is--hidecheck': globalConfig.checkHide }"
 		v-bind="tableConfigIn"
-		:syncResize="syncResize"
 		@radio-change="onRadioChange"
 		@checkbox-change="onSelectionChange"
 		@checkbox-all="onSelectionChange">
 		<vxe-column :field="labelField" :title="labelTitle || multiple ? '全部' : ''" :width="checkWidth" :type="multiple ? 'checkbox' : 'radio'" treeNode>
 			<template #default="scoped">
-				<span>{{ getTreeNodeCellContent(scoped) }}</span>
+				<span>{{ treeNodeContent(scoped) }}</span>
 			</template>
 		</vxe-column>
 		<template v-if="globalConfig.columns && globalConfig.columns.length > 0">
@@ -59,7 +57,7 @@ export default defineComponent({
 				rowConfig: { keyField: treeNodeKey.value },
 				radioConfig: { labelField: props.labelField, checkMethod: tableCheckMethods },
 				checkboxConfig: { labelField: props.labelField, checkMethod: tableCheckMethods },
-				treeConfig: { rowField: treeNodeKey.value },
+				treeConfig: { rowField: treeNodeKey.value, expandAll: props.globalConfig?.expandAll },
 				editConfig: { enabled: false }
 			}
 			if (props.multiple && props.globalConfig.hasAll) resultConfig.showHeader = true
@@ -147,10 +145,14 @@ export default defineComponent({
 			if (filterText) {
 				const tableTreeData = treeFullList.value
 				const tableTreeColumn = tableRef.value.getColumnByField(labelField)
-				searchData = $vUtils.searchTree(tableTreeData, row => {
-					let cellText = getTreeNodeCellContent({ row, column: tableTreeColumn })
-					return $vUtils.trim(cellText).indexOf(filterText) > -1
-				})
+				searchData = $vUtils.searchTree(
+					tableTreeData,
+					row => {
+						let cellText = treeNodeContent({ row, column: tableTreeColumn })
+						return $vUtils.trim(cellText).indexOf(filterText) > -1
+					},
+					{ isEvery: true, children: treeChildKey.value }
+				)
 				if (treeIstransform.value) {
 					searchData = $vUtils.toTreeArray(searchData, transformOption.value)
 				}
@@ -161,32 +163,21 @@ export default defineComponent({
 			filterData.value = searchData
 			tableRef.value.setAllTreeExpand(true)
 		}
-		// 获取选中的数据
-		const getSelectionData = () => {
-			return tableRef.value.getCheckboxRecords()
-		}
 		const tableCheckMethods = ({ row, $table }) => {
 			if (props.isLeaf && !props.multiple) {
 				return (row[treeChildKey.value] || []).length < 1
 			}
 			return true
 		}
-		const getTreeNodeCellContent = ({ row, column }) => {
+		const treeNodeContent = ({ row, column }) => {
 			if (props.labelFormat) {
 				return $vUtils.format(props.labelFormat, row)
 			}
 			return $vUtils.get(row, column.property)
 		}
-		const handleOffsetChange = () => {
-			syncResize.value = true
-			setTimeout(() => {
-				syncResize.value = false
-			})
-		}
 
 		const initChangeDebounce = $vUtils.debounce(initSelection, 200)
 		const filterChangeDebounce = $vUtils.debounce(handleMyTableFilter, 500)
-		const offetChangeDebounce = $vUtils.debounce(handleOffsetChange, tableConfigIn.value.resizeConfig?.refreshDelay || 300)
 
 		onMounted(() => {
 			initChangeDebounce()
@@ -213,10 +204,8 @@ export default defineComponent({
 			tableConfigIn,
 			onRadioChange,
 			onSelectionChange,
-			getTreeNodeCellContent,
-			getSelectionData,
-			initSelection,
-			offetChangeDebounce
+			treeNodeContent,
+			initSelection
 		}
 	}
 })

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

@@ -8,7 +8,7 @@
 					</div>
 				</template>
 				<template #dropdown>
-					<div v-if="filter" class="sh-tree-filter">
+					<div v-if="propsConfig.filter" class="sh-tree-filter">
 						<sh-input ref="filterInputRef" v-model="filterTextIn" class="sh-tree-filter-input" v-bind="filterInputConfigIn"></sh-input>
 					</div>
 					<div class="sh-tree-select-dropdown">
@@ -19,7 +19,7 @@
 			</vxe-pulldown>
 		</template>
 		<template v-else>
-			<div v-if="filter" class="sh-tree-filter">
+			<div v-if="propsConfig.filter" class="sh-tree-filter">
 				<sh-input ref="filterInputRef" v-model="filterTextIn" class="sh-tree-filter-input" v-bind="filterInputConfigIn"></sh-input>
 			</div>
 			<div class="sh-tree-content" :class="{ 'has-filter': filter }">
@@ -35,6 +35,8 @@ import { defineComponent, computed, onMounted, getCurrentInstance, ref, watch }
 import './css/index.scss'
 import mixinProps from './mixin/treeProps'
 import tableTree from './components/table-tree.vue'
+
+let pickProps = ['nodeKey', 'valueKeys', 'filter', 'format', 'split', 'labelField', 'labelTitle', 'labelFormat', 'emptyIcon', 'emptyText']
 export default defineComponent({
 	name: 'ShTree',
 	components: {
@@ -73,18 +75,15 @@ export default defineComponent({
 		const checkConfig = computed(() => ({ disabled: props.disabled, size: props.size }))
 		const selectValue = computed(() => (props.multiple ? selectedKeys.value : selectedKeys.value[0] || ''))
 		const propsConfig = computed(() => {
+			let treeProps = $vUtils.pick(props, (val, key) => pickProps.includes(key) && !$vUtils.isNone(val))
+			let setupProps = $vUtils.pick(treeSetupConfig, (val, key) => pickProps.includes(key) && !$vUtils.isNone(val))
+			let vxeSetupConfig = $vUtils.clone({ treeConfig: $vTableSetup.table.treeConfig }, true)
+			let shSetupConfig = $vUtils.clone($vUiSetup.shtree.tableConfig, true)
 			return {
-				nodeKey: props.nodeKey || treeSetupConfig.nodeKey,
-				valueKeys: props.valueKeys || treeSetupConfig.valueKeys,
-				format: props.format || treeSetupConfig.format,
-				split: props.split || treeSetupConfig.split,
-				labelField: props.labelField || treeSetupConfig.labelField,
-				labelTitle: props.labelTitle || treeSetupConfig.labelTitle,
-				labelFormat: props.labelFormat || treeSetupConfig.labelFormat,
-				emptyIcon: props.emptyIcon || treeSetupConfig.emptyIcon,
-				emptyText: props.emptyText || treeSetupConfig.emptyText,
+				...setupProps,
+				...treeProps,
 				globalConfig: Object.assign({}, treeSetupConfig.globalConfig, props.globalConfig),
-				tableConfig: Object.assign({ treeConfig: $vTableSetup.table.treeConfig }, $vUiSetup.shtree.tableConfig, props.tableConfig)
+				tableConfig: $vUtils.merge(vxeSetupConfig, shSetupConfig, props.tableConfig)
 			}
 		})
 
@@ -109,11 +108,7 @@ export default defineComponent({
 			return Object.assign({ transfer: true }, propsConfig.value.globalConfig?.selectConfig, checkConfig.value)
 		})
 		const selectInputConfigIn = computed(() => {
-			return Object.assign(
-				{ clearable: true, controls: false, transfer: false, editable: false, suffixIcon: 'vxe-icon-caret-down', placeholder: props.placeholder },
-				propsConfig.value.globalConfig?.inputConfig,
-				checkConfig.value
-			)
+			return Object.assign({ clearable: true, readonly: true, suffixIcon: 'vxe-icon-caret-down', placeholder: props.placeholder }, propsConfig.value.globalConfig?.inputConfig, checkConfig.value)
 		})
 		const filterInputConfigIn = computed(() => {
 			return Object.assign({ prefixIcon: 'vxe-icon-search', placeholder: '搜索', clearable: true }, propsConfig.value.globalConfig?.filterInputConfig)
@@ -206,15 +201,14 @@ export default defineComponent({
 		// 树节点获取焦点事件
 		const onFocus = async obj => {
 			emitFocus()
-			treeSelectInputRef.value.blur()
 			await treeSelectRef.value.togglePanel()
 			pulldownDrop.value = true
-			if (filterInputRef.value) filterInputRef.value.focus()
+			if (filterInputRef.value) {
+				filterInputRef.value.focus()
+			}
 			// 初始化获取服务配置数据
 			await getServerConfigDataSourse()
-			if (tableTreeRef.value) {
-				tableTreeRef.value.initSelection(true)
-			}
+			tableTreeRef.value && tableTreeRef.value.initSelection(true)
 		}
 		// 树节点选择变换事件
 		const onChange = async (keys, rows, obj) => {

package/packages/components/sh-tree/mixin/treeProps.js

@@ -6,7 +6,8 @@ export default {
 		}
 	},
 	isSelect: {
-		type: Boolean
+		type: Boolean,
+		default: null
 	},
 	nodeKey: {
 		type: String,
@@ -28,10 +29,12 @@ export default {
 		type: String
 	},
 	isLeaf: {
-		type: Boolean
+		type: Boolean,
+		default: null
 	},
 	disabled: {
-		type: Boolean
+		type: Boolean,
+		default: null
 	},
 	level: {
 		type: Number,
@@ -66,16 +69,18 @@ export default {
 	},
 	loading: {
 		type: Boolean,
-		default: false
+		default: null
 	},
 	filter: {
-		type: Boolean
+		type: Boolean,
+		default: null
 	},
 	filterText: {
 		type: String
 	},
 	multiple: {
-		type: Boolean
+		type: Boolean,
+		default: null
 	},
 	globalConfig: {
 		type: Object

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

@@ -83,14 +83,16 @@ export default defineComponent({
 			resetExpand(activeName.value, true)
 		}
 		const resetExpand = (menuName, mount) => {
+			let activeMenus = []
 			let parentNames = []
 			$vUtils.eachTree(props.options, (item, index, obj, paths, parent, nodes) => {
-				if (item.name === menuName && parent) {
-					parentNames = parent.map(pat => pat.name)
+				if (item.name === menuName) {
+					activeMenus = item.name
+					parentNames = nodes.map(n => n.name)
 				}
 			})
 			if (mount) {
-				activeNames.value = setActiveNames
+				activeNames.value = activeMenus
 				if (props.collapsed || props.mode !== 'vertical') return
 			}
 			if (!props.accordion) parentNames = Array.from(new Set(openedNames.value.concat(parentNames)))

package/packages/vxeTable/index.js

@@ -18,7 +18,7 @@ import '@vxe-ui/plugin-menu/dist/style.css'
 import VxeUIPluginRenderWangEditor from '@vxe-ui/plugin-render-wangeditor'
 
 import { utils } from 'sh-tools'
-import { publicRenders, extraRenders, filterRenders } from './render/globalRenders.jsx'
+import { publicRenders, extraRenders, filterRenders } from './render/globalRenders.js'
 import renderUtils from './render/utils'
 
 utils.mixin(renderUtils)
@@ -61,9 +61,10 @@ let uiOptions = {
 		}
 	},
 	form: {
+		editable: true,
 		titleColon: true,
 		titleAsterisk: true,
-		padding: false,
+		padding: true,
 		customLayout: false
 	},
 	modal: {
@@ -82,13 +83,12 @@ let uiOptions = {
 	shtree: {
 		nodeKey: 'id',
 		valueKeys: null,
+		filter: true,
 		format: '',
 		split: ',',
 		labelField: 'label',
 		labelTitle: '',
 		labelFormat: '',
-		emptyIcon: '',
-		emptyText: '',
 		globalConfig: {},
 		tableConfig: {
 			autoResize: false,
@@ -99,7 +99,6 @@ let uiOptions = {
 			showHeader: false,
 			showFooter: false,
 			showOverflow: true,
-			resizeConfig: { refreshDelay: 300 },
 			cellConfig: { padding: false, height: 32, verticalAlign: 'center' },
 			columnConfig: { width: 120 },
 			virtualXConfig: { enabled: true, gt: 20 },
@@ -160,6 +159,8 @@ let tableOptions = {
 		stripe: false,
 		border: 'full',
 		round: false,
+		autoResize: true,
+		syncResize: true,
 		keepSource: false,
 		minHeight: 30,
 		rowConfig: {
@@ -266,7 +267,7 @@ let tableOptions = {
 			startIndex: 1
 		},
 		resizeConfig: {
-			refreshDelay: 200
+			refreshDelay: 100
 		},
 		exportConfig: {
 			mode: 'current',
@@ -360,7 +361,7 @@ let tableOptions = {
 		$vNumber: { type: 'number', placeholder: '请输入', transfer: true, digits: 2, prefixType: 'text', suffixType: 'text' },
 		$vTextArea: { placeholder: '请输入', rows: 2, transfer: true, resize: 'none', showWordCount: true },
 		$vSelect: { placeholder: '请选择', clearable: true, filterable: true, transfer: true, showType: 'text', tagColor: 'default', split: ',', options: [] },
-		$vTree: { placeholder: '请选择', isSelect: true, filter: true, transfer: true, split: ',', nodeKey: 'id', labelField: 'label' },
+		$vTree: { placeholder: '请选择', isSelect: true, transfer: true, split: ',', nodeKey: 'id', labelField: 'label' },
 		$vTime: { type: 'date', placeholder: '请选择时间', transfer: true, editable: false, prefixType: 'text', suffixType: 'text', separator: '至' },
 		$vProgress: { strokeWidth: 20, strokeColor: ['#108ee9', '#87d068'], textInside: true, min: 0, max: 100, digits: 2 },
 		$vSwitch: { placeholder: '请选择', openLabel: '是', openValue: '1', closeLabel: '否', closeValue: '0' },

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

@@ -7,7 +7,7 @@
 			:size="rsize"
 			:data-sourse="renderValue"
 			@edit-closed="vxeTableCallback"
-			@toolbar-btn-click="onToolbaroption"></sh-table>
+			@toolbar-btn-click="onToolbarBtnClick"></sh-table>
 	</span>
 </template>
 
@@ -27,7 +27,7 @@ export default defineComponent({
 		const vxeTableCallback = params => {}
 
 		// 新增、删除行回调
-		const onToolbaroption = (code, data, $table) => {
+		const onToolbarBtnClick = (code, data, $table) => {
 			driveBackData()
 		}
 
@@ -41,7 +41,7 @@ export default defineComponent({
 			...useCell,
 			shTableRef,
 			vxeTableCallback,
-			onToolbaroption
+			onToolbarBtnClick
 		}
 	}
 })

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

@@ -65,7 +65,8 @@ export default function (props, context, proxy) {
 	// 初始化数据
 	const initData = () => {
 		let keyValue = $vUtils.get(rdata.value, rkey.value)
-		formatValueFun(keyValue)
+		let formatFuncMethod = proxy.formatValueFun || formatValueFun
+		formatFuncMethod(keyValue)
 	}
 
 	// 输入框前缀点击事件