sh-view 2.9.14 → 2.9.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sh-view",
-  "version": "2.9.14",
+  "version": "2.9.15",
   "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-tree/components/table-tree.vue

@@ -113,7 +113,9 @@ export default defineComponent({
 						tableRef.value.setRadioRow(checkRows[0])
 					}
 				}
-				tableRef.value.scrollToRow({ [nodeKey]: modelValue[0] })
+				setTimeout(() => {
+					tableRef.value.scrollToRow({ [nodeKey]: modelValue[0] })
+				})
 			})
 		}
 		// 单选框变化
@@ -148,7 +150,7 @@ export default defineComponent({
 			let searchData = null
 			if (filterText) {
 				let noSearchArr = ['$vGlobalOption', '$vImg', '$vCheckbox', '$vRadio', '$vUpload', '$vCode', 'seq', 'checkbox', 'radio']
-				const searchProps = [{ rkey: labelField, rname: '', rprops: {}, format: labelFormat }]
+				const searchProps = [{ rkey: labelField, rname: '$vTree', rprops: { format: labelFormat } }]
 				let tableColumnsAll = tableRef.value.getColumns()
 				tableColumnsAll.forEach(col => {
 					let renderObj = col.cellRender || col.editRender || col.itemRender

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

@@ -3,6 +3,7 @@
     width: 100%;
     display: block;
     padding: 0;
+    overflow: hidden;
     &.direct{
         height: 100%;
     }

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

@@ -41,12 +41,15 @@ export default defineComponent({
 		tableTree
 	},
 	props: {
-		...mixinProps
+		...mixinProps,
+		http: {
+			type: Object
+		}
 	},
 	emits: ['update:modelValue', 'change', 'focus', 'blur'],
 	setup(props, context) {
 		const { proxy } = getCurrentInstance()
-		const { $vUtils, $http } = proxy
+		const { $vUtils } = proxy
 		const { emit, slots } = context
 
 		const treeSelectRef = ref()
@@ -68,6 +71,7 @@ export default defineComponent({
 
 		const wrapHeight = computed(() => ([100, '100%', 'auto'].includes(props.height) ? '100%' : 'auto'))
 		const checkConfig = computed(() => ({ disabled: props.disabled, size: props.size }))
+		const selectValue = computed(() => (props.multiple ? selectedKeys.value : selectedKeys.value[0] || ''))
 		const selectLabels = computed(() => {
 			let { multiple, format, split, labelField } = props
 			if (selectedKeys.value && Array.isArray(selectedKeys.value) && selectedKeys.value.length > 0) {
@@ -133,8 +137,12 @@ export default defineComponent({
 				baseURL: serverConfig.baseURL
 			}
 			try {
+				const httpMethod = props.http || proxy.$http
+				if (!httpMethod) {
+					throw `暂未配置请求方法请检查！`
+				}
 				let method = serverConfig?.type ? serverConfig.type.toLowerCase() : 'post'
-				let treeRes = await $http[method](serverConfig.url, params, reqOptions)
+				let treeRes = await httpMethod[method](serverConfig.url, params, reqOptions)
 				if (treeRes && [10000, 100000].includes(+treeRes.code)) {
 					let treeAllNode = globalConfig?.hasAll && !multiple ? [{ [nodeKey]: 0, [labelField]: '全部', isleaf: 1, code: '' }] : []
 					let treeResData = treeAllNode.concat(treeRes.data)
@@ -233,11 +241,11 @@ export default defineComponent({
 				return
 			}
 			emitValue()
-			emit('change', selectedKeys.value, selectedData.value)
+			emit('change', selectValue.value, selectedData.value)
 		}
 		// 回调blur事件
 		const emitBlur = () => {
-			emit('blur', selectedKeys.value, selectedData.value)
+			emit('blur', selectValue.value, selectedData.value)
 		}
 		// 回调双向绑定
 		const emitValue = () => {
@@ -265,7 +273,7 @@ export default defineComponent({
 					$vUtils.set(valueData, toKey, fromvalue)
 				})
 			}
-			emit('update:modelValue', selectedKeys.value)
+			emit('update:modelValue', selectValue.value)
 		}
 
 		onMounted(() => {

package/packages/vxeTable/index.js

@@ -171,7 +171,7 @@ let tableOptions = {
 		},
 		customConfig: {
 			enabled: true,
-			storage: true
+			storage: false
 		},
 		seqConfig: {
 			startIndex: 1

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

@@ -31,12 +31,7 @@ export default defineComponent({
 
 		// 输入框回调
 		const vxeTreeCallback = (selectedKeys, selectedRows) => {
-			let { valueKeys, multiple } = useCell.rprops.value
-			let rvalue = selectedKeys
-			if (!multiple) {
-				rvalue = selectedKeys[0] || ''
-			}
-			useCell.setRenderValue(rvalue)
+			useCell.setRenderValue(selectedKeys)
 		}
 
 		return {