sh-view 1.7.1 → 1.7.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sh-view",
-  "version": "1.7.1",
+  "version": "1.7.5",
   "description": "基于vxe-table、view-ui-plus二次封装",
   "main": "packages/index.js",
   "scripts": {
@@ -28,7 +28,7 @@
     "file-saver": "^2.0.5",
     "jspdf": "^2.5.1",
     "jszip": "^3.10.1",
-    "sh-tools": "^1.2.0",
+    "sh-tools": "^1.2.6",
     "tinymce": "^5.10.5",
     "view-ui-plus": "^1.3.14",
     "vue": "^3.3.4",
@@ -37,7 +37,7 @@
     "vue-ripple-directive": "^2.0.1",
     "vue-router": "^4.2.2",
     "vuex": "^4.1.0",
-    "vxe-table": "^4.5.0-beta.16",
+    "vxe-table": "^4.5.0-beta.20",
     "vxe-table-plugin-export-pdf": "^3.0.4",
     "vxe-table-plugin-export-xlsx": "^3.0.5",
     "xe-clipboard": "^1.10.2",

package/packages/assets/css/theme.scss

@@ -24,7 +24,9 @@
 	--hover-color				: #f5f7fa;
 	--title-color               : #17233d;
 	--text-color                : #515a6e;
-	--border-color              : #e8e8e8;
+	--border-color              : #e0e0e0;
+	--disabled-color            : #f1f1f1;
+	--disabled-background       : #f3f3f3;
 	--font-family: "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif;
 	--border-radius: 0px;
 }
@@ -41,12 +43,14 @@
 .sh-theme-pink{  --theme-color: #ff5d7a; --theme-weak-color: #ffccd6; }            		// 少女
 
 .sh-dark-mode{
-	--body-background: #141414;
-	--main-background: #0a0a0a;
-	--theme-weak-color: #222222;
-	--header-color: #222222;
-	--stripe-color: #040404;
-	--hover-color: #555555;
-	--border-color: #333;
-	--text-color: #999;
+	--body-background: 		#141414;
+	--main-background: 		#0a0a0a;
+	--theme-weak-color: 	#222222;
+	--header-color: 		#222222;
+	--stripe-color: 		#040404;
+	--hover-color: 			#555555;
+	--border-color: 		#454545;
+	--disabled-color: 		#212121;
+	--disabled-background: 	#232323;
+	--text-color: 			#999999;
 }

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

@@ -52,7 +52,6 @@ export default {
 		},
 		wrap: {
 			type: Boolean,
-			default: true
 		},
 		tab: {
 			type: Boolean

package/packages/components/global-components/sh-vxe-table/index.vue

@@ -9,6 +9,7 @@
 			:data="tableFilterData || dataSourse"
 			:width="width"
 			:height="height"
+			:min-height="minHeight"
 			:max-height="maxHeight"
 			:auto-resize="autoResize"
 			:sync-resize="syncResize"

package/packages/components/global-components/sh-vxe-table/js/methods.js

@@ -18,11 +18,12 @@ const vxeEvents = {
 		this.isAllChecked = this.tableRef().isAllCheckboxChecked()
 		this.isIndeterminate = this.tableRef().isAllCheckboxIndeterminate()
 		if (this.tableTreeConfig && this.tableTreeConfig?.transform) {
-			let keyField = this.rowConfig.keyField || '_XID'
+			let keyField = this.tableTreeConfig?.rowField || this.rowConfig.keyField || '_XID'
+			let keyRowChild = '_X_ROW_CHILD'
 			let childRowsKeys = []
 			this.$vUtils.eachTree(records, row => {
-				if (row._X_ROW_CHILD && row._X_ROW_CHILD.length > 0) {
-					row._X_ROW_CHILD.forEach(child => {
+				if (row[keyRowChild] && row[keyRowChild].length > 0) {
+					row[keyRowChild].forEach(child => {
 						childRowsKeys.push(child[keyField])
 					})
 				}
@@ -66,7 +67,7 @@ const vxeEvents = {
 		let { row, column } = params
 		let { property, model, rname, rprops } = column
 		if ((model.update || model.change) && rname) {
-			let { rvalue, rtext } = that.$vUtils.formatRender(model.value, property, row, rname, rprops, that)
+			let { rvalue, rtext } = that.$vUtils.formatRender(model.value, property, row, rname, rprops, that, true)
 			that.$vUtils.set(row, column.property, rvalue)
 			model.change = false
 		}
@@ -163,23 +164,21 @@ const vxeMethods = {
 				data = this.getSelectionData()
 			} else {
 				data = this.$vUtils.clone(this.tableRef().getTableData().fullData, true)
-				columns.forEach(col => {
+				let rnameColumns = columns.map(col => col.rname)
+				rnameColumns.forEach(col => {
 					let { property, rname, rprops } = col
-					if (rname) {
-						data.forEach(row => {
-							if (!this.$vUtils.isNone(row[property])) {
-								row[property] = this.$vUtils.formatRender(row[property], property, row, rname, rprops, this)
-							}
-						})
-					}
+					data.forEach(row => {
+						let cellValue = this.$vUtils.get(row, property)
+						if (!this.$vUtils.isNone(cellValue)) {
+							let formatValue = this.$vUtils.formatRender(cellValue, property, row, rname, rprops, this)
+							this.$vUtils.set(row, property, formatValue)
+						}
+					})
 				})
 			}
 			options.data = data
 		}
-		if (type === 'print') {
-			return content
-		}
-		return obj
+		return type === 'print' ? content : obj
 	},
 	// 表格导出-自定义工作簿
 	exportSheetMethod({ options, workbook, worksheet }) {},
@@ -565,7 +564,7 @@ const shMethods = {
 		const that = this
 		let tableRowDefaultData = Object.assign({}, that.tableRowDefaultData)
 		let addRows = rows ? that.$vUtils.clone(rows, true) : tableRowDefaultData
-		if (!isTool && typeof that.onToolbarBtnAddBefore === 'function') {
+		if (typeof that.onToolbarBtnAddBefore === 'function') {
 			addRows = await that.onToolbarBtnAddBefore(addRows)
 		}
 		// 删除主键，以防排序冲突
@@ -587,13 +586,11 @@ const shMethods = {
 		let deleteRows = rows
 		if (isTool) {
 			let selectedRows = that.getSelectionData()
-			if (selectedRows.length < 1) {
-				that.msgwarning('请选择要删除的行！')
-				return
-			}
+			if (selectedRows.length < 1) return that.msgwarning('请选择要删除的行！')
 			deleteRows = selectedRows
 			await that.msgconfirm({ content: `确定删除吗？` })
-		} else if (typeof that.onToolbarBtnDeleteBefore === 'function') {
+		}
+		if (typeof that.onToolbarBtnDeleteBefore === 'function') {
 			let result = await that.onToolbarBtnDeleteBefore(deleteRows)
 			if (!result) return
 		}

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

@@ -21,6 +21,9 @@ export default {
 	height: {
 		type: [Number, String]
 	},
+	minHeight: {
+		type: [Number, String]
+	},
 	maxHeight: {
 		type: [Number, String]
 	},
@@ -33,8 +36,7 @@ export default {
 		default: true
 	},
 	stripe: {
-		type: Boolean,
-		default: true
+		type: Boolean
 	},
 	border: {
 		type: [Boolean, String],

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

@@ -37,9 +37,6 @@ export default {
 				return {}
 			}
 		},
-		isSelect: {
-			type: Boolean
-		},
 		loading: {
 			type: Boolean
 		},
@@ -86,7 +83,7 @@ export default {
 			return this.parentProps.multiple || false
 		},
 		tableConfigIn() {
-			return Object.assign({ rowId: this.parentProps.nodeKey, showHeader: !!(this.globalConfig.hasAll && this.multiple) }, this.tableConfigDefault, this.globalConfig.tableConfig)
+			return Object.assign({ showHeader: !!(this.globalConfig.hasAll && this.multiple) }, this.tableConfigDefault, this.globalConfig.tableConfig)
 		},
 		pagerConfigIn() {
 			return Object.assign({ enabled: false }, this.globalConfig.pagerConfig)
@@ -104,19 +101,16 @@ export default {
 			return Object.assign({ rowField: this.parentProps.nodeKey, transform: this.globalConfig.transform }, this.globalConfig.treeConfig)
 		},
 		tableColumns() {
-			let { globalConfig, isSelect, multiple, checkboxConfigIn, radioConfigIn, parentProps } = this
-			let colWidth = globalConfig.columns ? (isSelect ? 280 : '70%') : 0
-			let defaultColumns = [
-				{
-					field: multiple ? checkboxConfigIn.labelField : radioConfigIn.labelField,
-					title: parentProps.labelTitle || (multiple ? '全部' : ''),
-					type: parentProps.disabled ? 'html' : multiple ? 'checkbox' : 'radio',
-					treeNode: true,
-					width: colWidth,
-					slots: { default: 'treeNodeCell' }
-				}
-			]
-			return defaultColumns.concat(globalConfig.columns || [])
+			let { globalConfig, multiple, checkboxConfigIn, radioConfigIn, parentProps } = this
+			let defaultColumn = {
+				field: multiple ? checkboxConfigIn.labelField : radioConfigIn.labelField,
+				title: parentProps.labelTitle || (multiple ? '全部' : ''),
+				type: parentProps.disabled ? 'html' : multiple ? 'checkbox' : 'radio',
+				treeNode: true,
+				width: globalConfig.columns ? globalConfig?.defaultWidth || 150 : '100%',
+				slots: { default: 'treeNodeCell' }
+			}
+			return [defaultColumn].concat(globalConfig.columns || [])
 		}
 	},
 	watch: {
@@ -151,18 +145,6 @@ export default {
 				if (that.selectedKeys && that.selectedKeys.length > 0) {
 					that.tableRef().scrollToRow({ [nodeKey]: that.selectedKeys[0] })
 				}
-				// // 初始化单选还是多选
-				// if (that.multiple) {
-				// 	let records = that.tableRef().getCheckboxRecords()
-				// 	if (records && records.length > 0) {
-				// 		that.onSelectionChange({ records: records })
-				// 	}
-				// } else {
-				// 	let records = that.tableRef().getRadioRecord()
-				// 	if (records) {
-				// 		that.onSelectionChange({ records: [records] })
-				// 	}
-				// }
 			})
 		},
 		// 单选框变化

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

@@ -40,7 +40,7 @@ export default {
 			return this.height === '100%' || this.height === 'auto' ? '100%' : 'auto'
 		},
 		treeGlobalConfig() {
-			return Object.assign({ treeFilter: true }, this.globalConfig)
+			return Object.assign({ treeFilter: true, initServer: !this.isSelect }, this.globalConfig)
 		}
 	},
 	watch: {

package/packages/components/global-components/sh-vxe-tree/js/treeMethods.js

@@ -1,7 +1,7 @@
 const shMethods = {
 	// 加载初始化
 	initMounted() {
-		if (!this.initServer) {
+		if (this.globalConfig?.initServer) {
 			// 初始化获取服务配置数据
 			this.getServerConfigDataSourse()
 		}
@@ -68,52 +68,50 @@ const shMethods = {
 	},
 	// 获取请求配置数据
 	async getServerConfigDataSourse() {
-		const that = this
-		if (!that.serverConfig.url) {
-			that.treeServerComplate = true
+		const { serverConfig, serverParams, parseParams, queryCacheParams, serverCache, valueData, globalConfig, multiple, nodeKey, labelField, $vUtils, $http } = this
+		if (!serverConfig.url) {
+			this.treeServerComplate = true
 			return
 		}
-		let serverParams = that.$vUtils.clone(that.serverParams, true)
-		if (typeof that.parseParams === 'function') {
-			serverParams = that.parseParams(serverParams)
+		let params = $vUtils.clone(serverParams, true)
+		if (parseParams && typeof parseParams === 'function') {
+			params = parseParams(params)
 		}
-		let serveFormatConditions = ''
-		Object.keys(serverParams).forEach(key => {
-			if (that.$vUtils.getFormatKeys(key).length > 0) {
-				serverParams[key] = that.$vUtils.format(serverParams[key], that.valueData)
-				serveFormatConditions += serverParams[key]
+		Object.keys(params).forEach(key => {
+			if ($vUtils.getFormatKeys(params[key]).length > 0) {
+				params[key] = $vUtils.format(params[key], valueData)
 			}
 		})
-		if (that.queryConditions !== serveFormatConditions) {
-			that.treeServerComplate = false
+		if (!$vUtils.isEqual(queryCacheParams, params)) {
+			this.treeServerComplate = false
 		}
-		if (that.serverCache && that.treeServerComplate) {
+		if (serverCache && this.treeServerComplate) {
 			return
 		}
-		that.queryErrorText = null
-		that.queryConditions = serveFormatConditions
-		that.treeLoading = true
+		this.queryErrorText = null
+		this.queryCacheParams = params
+		this.treeLoading = true
 		let reqOptions = {
-			baseURL: that.serverConfig.baseURL
+			baseURL: serverConfig.baseURL
 		}
 		try {
-			let method = that.serverConfig?.type ? that.serverConfig.type.toLowerCase() : 'post'
-			let treeRes = await that.$http[method](that.serverConfig.url, serverParams, reqOptions)
-			if (treeRes && (treeRes.code === '100000' || +treeRes.code === 10000)) {
-				let treeAllNode = that.globalConfig.hasAll && !that.multiple ? [{ [this.nodeKey]: '', [this.labelField]: '全部', isleaf: 1, code: '' }] : []
+			let method = serverConfig?.type ? serverConfig.type.toLowerCase() : 'post'
+			let treeRes = await $http[method](serverConfig.url, params, reqOptions)
+			if (treeRes && [10000, 100000].includes(+treeRes.code)) {
+				let treeAllNode = globalConfig?.hasAll && !multiple ? [{ [nodeKey]: 0, [labelField]: '全部', isleaf: 1, code: '' }] : []
 				let treeData = treeAllNode.concat(treeRes.data)
-				if (that.globalConfig.transform) {
-					treeData = that.$vUtils.toTreeArray(treeData, { clear: true })
+				if (globalConfig.transform) {
+					treeData = $vUtils.toTreeArray(treeData, { clear: true })
 				}
-				that.treeData = treeData
+				this.treeData = treeData
 			} else {
 				throw new Error(`树节点信息获取失败：${treeRes?.message}`)
 			}
 		} catch (e) {
-			that.queryErrorText = e.message || e
+			this.queryErrorText = e.message || e
 		}
-		that.treeLoading = false
-		that.treeServerComplate = true
+		this.treeLoading = false
+		this.treeServerComplate = true
 	}
 }
 
@@ -153,7 +151,7 @@ const toolMethods = {
 	// 根据选中值返回选中节点信息
 	getSelectRowsByValue(value) {
 		const that = this
-		let childKey = (that.globalConfig.treeConfig && that.globalConfig.treeConfig.children) || 'children'
+		let childKey = (that.globalConfig.treeConfig && that.globalConfig.treeConfig.childrenField) || 'children'
 		let records = this.getDataJsonToLine(that.nodeKey, childKey, that.treeData)
 		let selectRows = []
 		records.forEach(node => {

package/packages/components/global-components/sh-vxe-tree/mixin/defaultData.js

@@ -23,7 +23,7 @@ export default {
 	},
 	// 树组件表格全局配置
 	tableConfigDefault: {
-		autoResize: false,
+		autoResize: true,
 		syncResize: true,
 		stripe: false,
 		size: 'small', //  medium / small / mini
@@ -31,6 +31,12 @@ export default {
 		showFooter: false,
 		showOverflow: true,
 		pagerConfig: false,
+		resizeConfig: {
+			refreshDelay: 50
+		},
+		columnConfig: {
+			width: 120
+		},
 		scrollX: {
 			enabled: true,
 			gt: 20

package/packages/components/global-components/sh-vxe-tree/vxe-direct-tree.vue

@@ -134,13 +134,14 @@ export default {
 	data() {
 		return {
 			...defaultData,
+			// 树公共属性
 			treeServerComplate: false,
 			treeLoading: false,
 			treeData: this.options,
-			filterTextIn: '',
+			filterTextIn: this.filterText,
 			treeSelectValue: '',
 			treeSelectedData: [],
-			queryConditions: null,
+			queryCacheParams: null,
 			queryErrorText: null
 		}
 	},

package/packages/components/global-components/sh-vxe-tree/vxe-select-tree.vue

@@ -20,13 +20,12 @@
 					<div v-if="treeFilterShow && treeServerComplate" class="sh-vxe-tree-select-dropdown-input">
 						<vxe-input ref="vxeTreeDropdownFilter" v-model="filterTextIn" class="select-filter-input" v-bind="filterInputConfigIn" :disabled="disabled"></vxe-input>
 					</div>
-					<div class="sh-vxe-tree-select-dropdown-content" :style="selectDropContentStyle">
+					<div class="sh-vxe-tree-select-dropdown-content">
 						<sh-loading v-if="treeLoading" fix loading></sh-loading>
 						<sh-result v-if="queryErrorText" class="sh-vxe-tree-result" type="error" :text="queryErrorText"></sh-result>
 						<table-tree
 							v-else-if="treeServerComplate"
 							ref="vxeTreeTable"
-							is-select
 							:parent-props="$props"
 							:loading="loading"
 							:size="size"
@@ -174,12 +173,10 @@ export default {
 			filterTextIn: this.filterText,
 			treeSelectValue: '',
 			treeSelectedData: [],
-			queryConditions: null,
+			queryCacheParams: null,
 			queryErrorText: null,
 			// 下拉专属属性
-			pulldownDrop: false,
-			initServer: true,
-			selfClientRect: {}
+			pulldownDrop: false
 		}
 	},
 	computed: {
@@ -197,9 +194,6 @@ export default {
 		},
 		filterInputConfigIn() {
 			return Object.assign({}, this.filterInputConfigDefault, this.globalConfig.filterInputConfig)
-		},
-		selectDropContentStyle() {
-			return { width: `${this.selfClientRect.width}px` }
 		}
 	},
 	watch: {
@@ -210,6 +204,13 @@ export default {
 			deep: true,
 			immediate: true
 		},
+		filterText: {
+			handler(newvalue, oldValue) {
+				this.filterTextIn = newvalue
+			},
+			deep: true,
+			immediate: true
+		},
 		options: {
 			handler(newvalue, oldValue) {
 				this.treeData = newvalue
@@ -232,7 +233,6 @@ export default {
 			let windowHeight = window.document.body.clientHeight
 			let selfClientRect = this.$refs.vxeTreeSelectInputBox.getBoundingClientRect()
 			if (selfClientRect) {
-				this.selfClientRect = selfClientRect
 				let { bottom } = selfClientRect
 				let selfOffsetBottom = windowHeight - bottom
 				if (selfOffsetBottom < 265) this.selectConfigDefault.placement = 'top'

package/packages/vxeTable/css/index.scss

@@ -3,7 +3,7 @@ $theme-color: var(--theme-color);
 $theme-weak-color: var(--theme-weak-color);
 
 @import "variable.scss";
-@import 'vxe-table/styles/index.scss';
+@import 'vxe-table/styles/all.scss';
 
 input:focus, textarea:focus,
 .vxe-form--item .vxe-input input.vxe-input--inner:focus,
@@ -232,10 +232,6 @@ button:focus, .vxe-button.type--button:not(.is--disabled):focus{
         .vxe-cell--sort{
             font-size: .9em;
         }
-        .vxe-body--row.row--new > .vxe-body--column:before{
-            top: calc(var(--vxe-table-cell-dirty-width) * -1);
-            left: calc(var(--vxe-table-cell-dirty-width) * -1)
-        }
     }
 }
 

package/packages/vxeTable/css/variable.scss

@@ -1,9 +1,5 @@
-$theme-color: var(--theme-color);
-$theme-weak-color: var(--theme-weak-color);
-
 /*font*/
 $vxe-font-family: -apple-system,BlinkMacSystemFont,Segoe UI,PingFang SC,Hiragino Sans GB,Microsoft YaHei,Helvetica Neue,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol !default;
-$vxe-font-color: #606266 !default;
 $vxe-font-size: 1rem !default;
 $vxe-font-size-medium: 1rem !default;
 $vxe-font-size-small: 0.9285rem !default;
@@ -17,25 +13,44 @@ $vxe-icon-font-family: Verdana,Arial,Tahoma !default;
 $vxe-icon-background-color: var(--body-background) !default;
 
 /*color*/
+$vxe-font-color: #606266 !default;
 $vxe-primary-color: #409eff !default;
 $vxe-success-color: #67c23a !default;
 $vxe-info-color: #909399 !default;
 $vxe-warning-color: #e6a23c !default;
 $vxe-danger-color: #f56c6c !default;
-$vxe-disabled-color: #BFBFBF !default;
-$vxe-primary-disabled-color: #c0c4cc !default;
+
+$vxe-font-lighten-color: lighten($vxe-font-color, 10%) !default;
+$vxe-primary-lighten-color: lighten($vxe-primary-color, 10%) !default;
+$vxe-success-lighten-color: lighten($vxe-success-color, 10%) !default;
+$vxe-info-lighten-color: lighten($vxe-info-color, 10%) !default;
+$vxe-warning-lighten-color: lighten($vxe-warning-color, 10%) !default;
+$vxe-danger-lighten-color: lighten($vxe-danger-color, 10%) !default;
+
+$vxe-font-darken-color: darken($vxe-font-color, 10%) !default;
+$vxe-primary-darken-color: darken($vxe-primary-color, 10%) !default;
+$vxe-success-darken-color: darken($vxe-success-color, 10%) !default;
+$vxe-info-darken-color: darken($vxe-info-color, 10%) !default;
+$vxe-warning-darken-color: darken($vxe-warning-color, 10%) !default;
+$vxe-danger-darken-color: darken($vxe-danger-color, 10%) !default;
+
+$vxe-font-disabled-color: #BFBFBF !default;
+$vxe-primary-disabled-color: lighten($vxe-primary-color, 20%) !default;
+$vxe-success-disabled-color: lighten($vxe-success-color, 20%) !default;
+$vxe-info-disabled-color: lighten($vxe-info-color, 20%) !default;
+$vxe-warning-disabled-color: lighten($vxe-warning-color, 20%) !default;
+$vxe-danger-disabled-color: lighten($vxe-danger-color, 20%) !default;
 
 /*input/radio/checkbox*/
 $vxe-input-border-color: var(--border-color) !default;
-$vxe-input-disabled-color: var(--border-color) !default;
-$vxe-input-disabled-background-color: #f3f3f3 !default;
+$vxe-input-disabled-color: var(--disabled-color) !default;
+$vxe-input-disabled-background-color: var(--disabled-background) !default;
 $vxe-input-placeholder-color: #C0C4CC !default;
 
 /*popup*/
 $vxe-table-popup-border-color: var(--border-color) !default;
 
 /*table*/
-$vxe-table-font-color: $vxe-font-color !default;
 $vxe-table-header-font-color: $vxe-font-color !default;
 $vxe-table-footer-font-color: $vxe-font-color !default;
 $vxe-table-border-radius: $vxe-border-radius !default;
@@ -100,8 +115,8 @@ $vxe-table-checkbox-range-border-width: 1px !default;
 $vxe-table-checkbox-range-border-color: #006af1 !default;
 $vxe-table-checkbox-range-background-color: rgba(50,128,252,0.2) !default;
 
-$vxe-table-fixed-left-scrolling-box-shadow: 4px 3px 4px 0px rgba(0, 0, 0, 0.12) !default;
-$vxe-table-fixed-right-scrolling-box-shadow: -4px 3px 4px 0px rgba(0, 0, 0, 0.12) !default;
+$vxe-table-fixed-left-scrolling-box-shadow: 8px 0px 10px -5px rgba(0, 0, 0, 0.12) !default;
+$vxe-table-fixed-right-scrolling-box-shadow: -8px 0px 10px -5px rgba(0, 0, 0, 0.12) !default;
 
 /*filter*/
 $vxe-table-filter-panel-background-color: var(--body-background) !default;
@@ -111,14 +126,13 @@ $vxe-table-menu-item-width: 178px !default;
 $vxe-table-menu-background-color: var(--body-background) !default;
 
 /*loading*/
-$vxe-loading-color: $theme-color !default;
+$vxe-loading-color: var(--theme-color) !default;
 $vxe-loading-background-color: rgba(255, 255, 255, 0.5) !default;
 $vxe-loading-z-index: 999 !default;
 
 /*validate*/
 $vxe-table-validate-error-color: #f56c6c !default;
-$vxe-table-validate-tooltip-error-color: var(--body-background) !default;
-$vxe-table-validate-tooltip-error-background-color: $vxe-table-validate-error-color !default;
+$vxe-table-validate-error-background-color: $vxe-table-body-background-color !default;
 
 /*grid*/
 $vxe-grid-maximize-background-color: var(--body-background) !default;
@@ -132,8 +146,6 @@ $vxe-toolbar-panel-background-color: var(--body-background) !default;
 $vxe-tooltip-dark-color: #fff !default;
 $vxe-tooltip-dark-background-color: #303133 !default;
 $vxe-tooltip-light-background-color: #fff !default;
-$vxe-tooltip-validate-error-color: #fff !default;
-$vxe-tooltip-validate-error-background-color: #f56c6c !default;
 
 /*pager*/
 $vxe-pager-background-color: var(--body-background) !default;
@@ -173,8 +185,8 @@ $vxe-radio-button-default-background-color: var(--body-background) !default;
 
 /*button*/
 $vxe-button-max-width: 500px !default;
-$vxe-button-default-background-color: #fff !default;
-$vxe-button-dropdown-panel-background-color: #fff !default;
+$vxe-button-default-background-color: var(--body-background) !default;
+$vxe-button-dropdown-panel-background-color: $vxe-button-default-background-color !default;
 $vxe-button-height-default: 34px !default;
 $vxe-button-height-medium: 32px !default;
 $vxe-button-height-small: 30px !default;

package/packages/vxeTable/index.js

@@ -23,6 +23,7 @@ let vxeOptions = {
 		border: 'full',
 		round: false,
 		keepSource: false,
+		minHeight: 80,
 		rowConfig: {
 			useKey: false,
 			keyField: '_XID',
@@ -51,14 +52,15 @@ let vxeOptions = {
 		},
 		treeConfig: {
 			indent: 20,
-			line: false,
+			showLine: false,
 			expandAll: false,
 			expandRowKeys: [],
 			accordion: true,
 			showIcon: true,
-			children: 'children',
+			childrenField: 'children',
 			// 若为平行数据结构不是嵌套结构则使用下面配置 transform 需要为true
 			transform: false,
+			rowField: 'id',
 			parentField: 'parentId'
 		},
 		mouseConfig: {

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

@@ -130,7 +130,7 @@ export default {
 		// form回调赋值
 		setFormValue(value) {
 			if (['$vMoney'].includes(this.rname) && value !== '') value = this.$vUtils.multiply(value, this.rprops.moneyUnit || 1)
-			let { rvalue } = this.formatValueFun(value)
+			let { rvalue } = this.formatValueFun(value, true)
 			let { data, $form } = this.rparams
 			this.$vUtils.set(data, this.rkey, rvalue)
 			$form.context.emit('edit-closed', this.rparams, this)
@@ -144,8 +144,8 @@ export default {
 			model.value = value
 		},
 		// 格式化值formatValue
-		formatValueFun(value) {
-			let rObj = this.$vUtils.formatRender(value, this.rkey, this.rdata, this.rname, this.rprops, this)
+		formatValueFun(value, editable) {
+			let rObj = this.$vUtils.formatRender(value, this.rkey, this.rdata, this.rname, this.rprops, this, editable)
 			this.renderValue = ['$vMoney'].includes(this.rname) ? rObj.rtext : rObj.rvalue
 			return rObj
 		},