sh-view 1.7.3 → 1.7.6

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

@@ -7,7 +7,7 @@
 		v-bind="queryFormConfig"
 		:items="formItems"
 		:data="data"
-		:rules="rules"
+		:rules="valid ? formRules : {}"
 		:valid-config="validConfig"
 		@submit="onFormSubmit"
 		@reset="onFormReset"
@@ -88,6 +88,9 @@ export default {
 		transformitem: {
 			type: Boolean,
 			default: true
+		},
+		valid: {
+			type: Boolean
 		}
 	},
 	emits: ['submit', 'reset', 'edit-closed', 'submit-invalid', 'collapsed'],
@@ -103,6 +106,8 @@ export default {
 			formOriginItems: [],
 			// 表单渲染项
 			formItems: [],
+			// 表单校验规则
+			formRules: {},
 			// 表格高级搜索默认配置
 			formConfigDefault: {
 				titleWidth: 100,
@@ -138,6 +143,13 @@ export default {
 			},
 			deep: true,
 			immediate: false
+		},
+		rules: {
+			handler(newvalue, oldValue) {
+				this.initEditRules(newvalue)
+			},
+			deep: true,
+			immediate: true
 		}
 	},
 	created() {
@@ -153,54 +165,66 @@ export default {
 		},
 		// 初始化表单字段
 		initFormData() {
-			const that = this
-			let formItems = that.items.filter(item => item.search && item.search !== '0')
-			that.$vUtils.eachTree(formItems, item => {
+			const { items, data, $vUtils } = this
+			let queryItems = items.filter(item => item.search && item.search !== '0')
+			$vUtils.eachTree(queryItems, item => {
 				let renderProps = item.renderProps || item.itemRender?.props || {}
-				if (!that.$vUtils.has(that.data, item.field)) {
-					that.$vUtils.set(that.data, item.field, renderProps.defaultValue || null)
+				if (!$vUtils.isNone(renderProps?.defaultValue) && $vUtils.isNone($vUtils.get(data, item.field))) {
+					$vUtils.set(data, item.field, renderProps.defaultValue)
 				}
 			})
 		},
 		// 初始化搜索表单
 		initFormItems() {
-			const that = this
 			let formItemsArr = [] // 表单项
-			let formItems = that.items.filter(item => item.search && item.search !== '0')
+			let formItems = this.items.filter(item => item.search && item.search !== '0')
 			if (this.transformitem) {
-				let { itemsArr, itemsRules } = that.generateFormItem(formItems)
+				let { itemsArr, rules } = this.generateFormItem(formItems)
 				formItemsArr = itemsArr
+				this.initEditRules(rules)
 			} else {
 				formItemsArr = formItems
+				this.initEditRules(this.rules)
 			}
 			formItemsArr.forEach(item => {
 				item.visible = true
 				item.itemRender.props.disabled = false
 			})
-			that.formOriginItems = formItemsArr
-			that.formItems = formItemsArr
-			if (formItemsArr.length > that.globalConfig.formToggleNum && that.globalConfig.formToggle) {
-				that.formToggleBtnShow = true // 显示展开全部按钮
-				that.formBtnCollapsed(false)
+			this.formOriginItems = formItemsArr
+			this.formItems = formItemsArr
+			if (formItemsArr.length > this.globalConfig.formToggleNum && this.globalConfig.formToggle) {
+				this.formToggleBtnShow = true // 显示展开全部按钮
+				this.formBtnCollapsed(false)
 			}
 			this.initFormData()
 		},
+		// 初始化验证规则
+		initEditRules(rules) {
+			const { formRules, $vUtils } = this
+			if (rules && $vUtils.isPlainObject(rules)) {
+				Object.keys(rules).forEach(key => {
+					if (formRules[key]) {
+						formRules[key] = Array.from(new Set(formRules[key].concat(rules[key])))
+					} else {
+						formRules[key] = rules[key]
+					}
+				})
+			}
+		},
 		// 表单展开全部/收起切换事件
 		formBtnCollapsed(value) {
-			const that = this
-			that.formCollapsed = value
-			that.formItems = value ? that.formOriginItems : that.formOriginItems.slice(0, that.globalConfig.formToggleNum)
+			this.formCollapsed = value
+			this.formItems = value ? this.formOriginItems : this.formOriginItems.slice(0, this.globalConfig.formToggleNum)
 			this.$emit('collapsed', value)
 		},
 		// -------- 搜索
 		async onFormSubmit() {
-			let that = this
-			let errMap = await that.queryFormRef().validate()
-			let data = that.data
+			let { data } = this
+			let errMap = await this.queryFormRef().validate()
 			if (!errMap) {
-				that.$emit('submit', data)
+				this.$emit('submit', data)
 			} else {
-				that.onFormSubmitInvalid({ data, errMap })
+				this.onFormSubmitInvalid({ data, errMap })
 			}
 		},
 		// 表单重置
@@ -223,31 +247,31 @@ export default {
 		},
 		// 自动生成表单渲染项
 		generateFormItem(items = []) {
-			const that = this
 			let itemsArr = []
-			let itemsRules = {}
-			that.$vUtils.mapTree(items, ori => {
-				let tar = Object.assign({}, that.itemConfigDefault, ori)
+			let rules = {}
+			const { itemConfigDefault, readonly, disabled, isTrue, getDefaultMessage, $vUtils } = this
+			$vUtils.eachTree(items, ori => {
+				let tar = Object.assign({}, itemConfigDefault, ori)
 				let renderConfig = {
 					name: ori.renderName || '$vInput',
 					props: Object.assign({}, ori.renderProps || {})
 				}
-				if (that.readonly || that.disabled) {
+				if (readonly || disabled) {
 					renderConfig.props.disabled = true
 				}
 				tar.itemRender = Object.assign({}, renderConfig, ori.itemRender || {})
 				// 首先提取校验配置
-				if (that.isTrue(ori['renderRequire'])) {
+				if (isTrue(ori['renderRequire'])) {
 					// 若配置了校验参数则走校验参数，没配置则给默认校验条件
 					if (ori['requireProps'] && Array.isArray(ori['requireProps']) && ori['requireProps'].length > 0) {
-						itemsRules[ori['field']] = ori['requireProps']
+						rules[ori['field']] = ori['requireProps']
 					} else {
 						let dataType = 'string'
 						let arrayType = ['$vCheckgroup', '$vUpload', '$vTable']
-						if (arrayType.includes(ori['renderName']) || ((ori['renderName'] === '$vSelect' || ori['renderName'] === '$vTree') && that.isTrue(renderConfig.props.multiple))) {
+						if (arrayType.includes(ori['renderName']) || ((ori['renderName'] === '$vSelect' || ori['renderName'] === '$vTree') && isTrue(renderConfig.props.multiple))) {
 							dataType = 'array'
 						}
-						itemsRules[ori['field']] = [{ required: true, message: that.getDefaultMessage(ori['renderName'], ori['title']), type: dataType }]
+						rules[ori['field']] = [{ required: true, message: getDefaultMessage(ori['renderName'], ori['title']), type: dataType }]
 					}
 				}
 				// 表单不支持编辑渲染过滤
@@ -256,7 +280,7 @@ export default {
 					itemsArr.push(tar)
 				}
 			})
-			return { itemsArr, itemsRules }
+			return { itemsArr, rules }
 		}
 	}
 }

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

@@ -7,10 +7,9 @@ const vxeEvents = {
 	},
 	// 单选框变化
 	onRadioChange(params) {
-		const that = this
 		var { row } = params
-		that.selectionRows = [row]
-		that.$emit('radio-change', that.selectionRows, params)
+		this.selectionRows = [row]
+		this.$emit('radio-change', this.selectionRows, params)
 	},
 	// 复选框变化
 	onSelectionChange(params) {
@@ -63,15 +62,14 @@ const vxeEvents = {
 	},
 	// 只对 edit-config 配置时有效，单元格编辑状态下被关闭时会触发该事件
 	async onEditClosed(params) {
-		const that = this
 		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, true)
-			that.$vUtils.set(row, column.property, rvalue)
+			let { rvalue, rtext } = this.$vUtils.formatRender(model.value, property, row, rname, rprops, this, true)
+			this.$vUtils.set(row, column.property, rvalue)
 			model.change = false
 		}
-		that.$emit('edit-closed', params)
+		this.$emit('edit-closed', params)
 	},
 	// 只对 edit-config 配置时有效，单元格被激活编辑时会触发该事件
 	async onEditActived(params) {
@@ -137,10 +135,9 @@ const vxeMethods = {
 	// // vxe组件方法可通过 this.tableRef() 调用
 	// 表格全选
 	setSelectionAll() {
-		const that = this
-		that.isAllChecked = !that.isAllChecked
-		that.tableRef().setAllCheckboxRow(that.isAllChecked)
-		that.selectionRows = that.tableRef().getCheckboxRecords()
+		this.isAllChecked = !this.isAllChecked
+		this.tableRef().setAllCheckboxRow(this.isAllChecked)
+		this.selectionRows = this.tableRef().getCheckboxRecords()
 	},
 	// 表格打印、导出统一过滤列
 	columnDefaultFilterMethod({ column, $columnIndex }) {
@@ -188,11 +185,11 @@ const vxeMethods = {
 	},
 	// 默认求底部绑定方法vxe
 	tableFooterMethod({ columns, data }) {
-		let that = this
+		const { footerCalculate, tableFooterCompute } = this
 		let footerData = []
-		let footerCalculateList = that.footerCalculate.calculate || []
+		let footerCalculateList = footerCalculate.calculate || []
 		footerCalculateList.forEach(key => {
-			footerData.push(that.tableFooterCompute(columns, data, key, that.footerCalculate[key]))
+			footerData.push(tableFooterCompute(columns, data, key, footerCalculate[key]))
 		})
 		return footerData
 	},
@@ -230,8 +227,8 @@ const vxeMethods = {
 		})
 	},
 	tableFooterSpanMethod({ $rowIndex, column, $columnIndex, data }) {
-		let that = this
-		let defaultColumns = that.columnsConfigDefault.filter(item => that.tableGlobalConfig[item.type])
+		const { columnsConfigDefault, tableGlobalConfig } = this
+		let defaultColumns = columnsConfigDefault.filter(item => tableGlobalConfig[item.type])
 		let colspan = defaultColumns.length || 1
 		if (column.type === 'seq') {
 			return { rowspan: 1, colspan: colspan }
@@ -256,47 +253,46 @@ const shMethods = {
 	},
 	// 初始化生成新表头数据
 	initTableColumns(columns = []) {
-		let that = this
-		let { columnsArr, columnsFlatArr, formItemsArr, rules } = that.getTransfarColumn(columns)
-		that.tableColumnsFlat = columnsFlatArr
-		that.tableFormItems = formItemsArr
-		that.initEditRules(rules)
-		if (!that.tableReverse) {
-			that.tableColumnsFixed = that.$vUtils.clone(columnsArr, true)
+		let { columnsArr, columnsFlatArr, formItemsArr, rules } = this.getTransfarColumn(columns)
+		this.tableColumnsFlat = columnsFlatArr
+		this.tableFormItems = formItemsArr
+		this.initEditRules(rules)
+		if (!this.tableReverse) {
+			this.tableColumnsFixed = this.$vUtils.clone(columnsArr, true)
 		} else {
-			that.tableColumnsFixed = that.getReverseColumn(that.columns)
+			this.tableColumnsFixed = this.getReverseColumn(this.columns)
 		}
 	},
 	// 初始化验证规则
 	initEditRules(rules) {
-		const that = this
-		if (rules && that.$vUtils.isPlainObject(rules)) {
+		const { tableEditRules, $vUtils } = this
+		if (rules && $vUtils.isPlainObject(rules)) {
 			Object.keys(rules).forEach(key => {
-				if (that.tableEditRules[key]) {
-					that.tableEditRules[key] = Array.from(new Set(that.tableEditRules[key].concat(rules[key])))
+				if (tableEditRules[key]) {
+					tableEditRules[key] = Array.from(new Set(tableEditRules[key].concat(rules[key])))
 				} else {
-					that.tableEditRules[key] = rules[key]
+					tableEditRules[key] = rules[key]
 				}
 			})
 		}
 	},
 	// 初始化表头配置默认值
 	initColsDefaultValue() {
-		const that = this
+		const { tableColumnsFlat, dataSourse, $vUtils } = this
 		let colsDefaultValue = {}
-		that.$vUtils.eachTree(that.tableColumnsFlat, item => {
+		$vUtils.eachTree(tableColumnsFlat, item => {
 			let renderObj = item.editRender || item.cellRender || {}
 			let noRenderArr = ['$vGlobalOption']
-			if (!noRenderArr.includes(renderObj.name) && !that.$vUtils.isNone(renderObj.props?.defaultValue)) {
-				that.$vUtils.set(colsDefaultValue, item.field, renderObj.props?.defaultValue)
+			if (!noRenderArr.includes(renderObj.name) && !$vUtils.isNone(renderObj.props?.defaultValue)) {
+				$vUtils.set(colsDefaultValue, item.field, renderObj.props?.defaultValue)
 			}
 		})
-		that.tableRowDefaultData = colsDefaultValue
-		if (Array.isArray(that.dataSourse) && Object.keys(colsDefaultValue).length > 0) {
-			that.dataSourse.forEach(row => {
+		this.tableRowDefaultData = colsDefaultValue
+		if (Array.isArray(dataSourse) && Object.keys(colsDefaultValue).length > 0) {
+			dataSourse.forEach(row => {
 				Object.keys(colsDefaultValue).forEach(field => {
-					if (that.$vUtils.isNone(that.$vUtils.get(row, field))) {
-						that.$vUtils.set(row, field, that.$vUtils.get(colsDefaultValue, field))
+					if ($vUtils.isNone($vUtils.get(row, field))) {
+						$vUtils.set(row, field, $vUtils.get(colsDefaultValue, field))
 					}
 				})
 			})
@@ -304,36 +300,36 @@ const shMethods = {
 	},
 	// 反转表格-反转表头及数据
 	getReverseColumn(oriColumns) {
-		const that = this
+		const { reverseConfig, disabled, columnObjDefault, dataSourse } = this
 		let columns = []
-		let columnsNum = that.reverseConfig.num
-		let keyPrefix = that.reverseConfig.keyPrefix || 'reversePre'
-		let titPrefix = that.reverseConfig.titPrefix || ''
-		let valueRenderObj = that.disabled ? { cellRender: { name: '$vRowCell' } } : { editRender: { name: '$vRowCell' } }
+		let columnsNum = reverseConfig.num
+		let keyPrefix = reverseConfig.keyPrefix || 'reversePre'
+		let titPrefix = reverseConfig.titPrefix || ''
+		let valueRenderObj = disabled ? { cellRender: { name: '$vRowCell' } } : { editRender: { name: '$vRowCell' } }
 		if (columnsNum) {
 			for (let i = 1; i <= columnsNum; i++) {
 				columns.push(
-					Object.assign({ field: `${keyPrefix}title${i}`, title: `名称${i}` }, that.columnObjDefault),
-					Object.assign({ field: `${keyPrefix}value${i}`, title: `数值${i}` }, that.columnObjDefault, valueRenderObj)
+					Object.assign({ field: `${keyPrefix}title${i}`, title: `名称${i}` }, columnObjDefault),
+					Object.assign({ field: `${keyPrefix}value${i}`, title: `数值${i}` }, columnObjDefault, valueRenderObj)
 				)
 			}
 		} else {
-			columns.push(Object.assign({ field: `${keyPrefix}title`, title: '名称', fixed: 'left' }, that.columnObjDefault))
-			that.dataSourse.forEach((item, index) => {
-				columns.push(Object.assign({ field: `${keyPrefix}value${index + 1}`, title: `${titPrefix}${index + 1}` }, that.columnObjDefault, valueRenderObj))
+			columns.push(Object.assign({ field: `${keyPrefix}title`, title: '名称', fixed: 'left' }, columnObjDefault))
+			dataSourse.forEach((item, index) => {
+				columns.push(Object.assign({ field: `${keyPrefix}value${index + 1}`, title: `${titPrefix}${index + 1}` }, columnObjDefault, valueRenderObj))
 			})
 		}
 		return columns
 	},
 	// 反转表格-反转配置生成数据
 	getReverseData(oriData = []) {
-		const that = this
+		const { reverseConfig, columns, $vUtils } = this
 		let data = []
-		let columnsNum = that.reverseConfig.num
-		let keyPrefix = that.reverseConfig.keyPrefix || 'reversePre'
+		let columnsNum = reverseConfig.num
+		let keyPrefix = reverseConfig.keyPrefix || 'reversePre'
 		if (columnsNum) {
 			// 将表头平均分组
-			let chunkColumns = that.$vUtils.chunk(that.columns, columnsNum)
+			let chunkColumns = $vUtils.chunk(columns, columnsNum)
 			chunkColumns.forEach((colGroup, colGroupIndex) => {
 				let item = {}
 				colGroup.forEach((column, columnIndex) => {
@@ -345,7 +341,7 @@ const shMethods = {
 				data.push(item)
 			})
 		} else {
-			data = that.columns.map(column => {
+			data = columns.map(column => {
 				const item = { [`${keyPrefix}title`]: column.title }
 				oriData.forEach((row, index) => {
 					item[`${keyPrefix}value${index + 1}`] = row[column.field] || ''
@@ -359,12 +355,12 @@ const shMethods = {
 	},
 	// 转换生成新表头数据
 	getTransfarColumn(oriArr = []) {
-		let that = this
+		const { columnObjDefault, columnObj, tableGlobalConfig, isTrue, getDefaultMessage, turnColumnItemFilters, $vUtils } = this
 		let columnsFlatArr = []
 		let formItemsArr = []
 		let rules = {}
-		let columnsArr = that.$vUtils.mapTree(oriArr, ori => {
-			let tar = Object.assign({}, that.columnObjDefault, that.columnObj, ori)
+		let columnsArr = $vUtils.mapTree(oriArr, ori => {
+			let tar = Object.assign({}, columnObjDefault, columnObj, ori)
 			if (ori.children && ori.children.length > 0) {
 				tar.sortable = false
 				tar.filter = false
@@ -374,17 +370,17 @@ const shMethods = {
 					props: Object.assign({}, ori.renderProps || {})
 				}
 				// 首先提取校验配置
-				if (that.isTrue(tar['renderRequire'])) {
+				if (isTrue(tar['renderRequire'])) {
 					// 若配置了校验参数则走校验参数，没配置则给默认校验条件
 					if (tar['requireProps'] && Array.isArray(tar['requireProps']) && tar['requireProps'].length > 0) {
 						rules[tar['field']] = tar['requireProps']
 					} else {
 						let dataType = 'string'
 						let arrayType = ['$vCheckgroup', '$vUpload', '$vTable']
-						if (arrayType.includes(ori['renderName']) || ((ori['renderName'] === '$vSelect' || ori['renderName'] === '$vTree') && that.isTrue(renderConfig.props.multiple))) {
+						if (arrayType.includes(ori['renderName']) || ((ori['renderName'] === '$vSelect' || ori['renderName'] === '$vTree') && isTrue(renderConfig.props.multiple))) {
 							dataType = 'array'
 						}
-						rules[tar['field']] = [{ required: true, message: that.getDefaultMessage(tar['renderName'], tar['title']), type: dataType }]
+						rules[tar['field']] = [{ required: true, message: getDefaultMessage(tar['renderName'], tar['title']), type: dataType }]
 					}
 				}
 				// 个性化设置
@@ -413,7 +409,7 @@ const shMethods = {
 					tar.editRender = Object.assign({}, renderConfig, tar.editRender || {})
 				}
 				// 初始化表单查询配置
-				if (that.tableGlobalConfig.search) {
+				if (tableGlobalConfig.search) {
 					let editFixedNames = ['$vImg', '$vHref', '$vUpload']
 					let formItem = Object.assign({}, tar)
 					formItem.itemRender = Object.assign({}, renderConfig, tar.editRender || {}, tar.itemRender || {})
@@ -427,7 +423,7 @@ const shMethods = {
 				}
 				// 初始化过滤条件
 				if (tar.filter === true || Number(tar.filter) === 1) {
-					that.turnColumnItemFilters(tar, renderConfig.props)
+					turnColumnItemFilters(tar, renderConfig.props)
 				}
 			}
 			columnsFlatArr.push(tar)
@@ -547,28 +543,24 @@ const shMethods = {
 		}
 	},
 	// 自定义操作列点击事件
-	handleGoptionClick(btnObj, dataObj) {
-		const that = this
+	async handleGoptionClick(btnObj, dataObj) {
 		if (btnObj.code === 'delete' || btnObj.idConfirm) {
-			that.msgconfirm({
+			await this.msgconfirm({
 				content: btnObj.ConfirmContent || `确定${btnObj.content}吗？`
-			}).then(() => {
-				that.$emit('globaloption', btnObj, dataObj)
 			})
 		} else {
-			that.$emit('globaloption', btnObj, dataObj)
 		}
+		this.$emit('globaloption', btnObj, dataObj)
 	},
 	// 新增行按钮
 	async handleTableAddRow(rows, index = -1, isTool = false) {
-		const that = this
-		let tableRowDefaultData = Object.assign({}, that.tableRowDefaultData)
-		let addRows = rows ? that.$vUtils.clone(rows, true) : tableRowDefaultData
-		if (typeof that.onToolbarBtnAddBefore === 'function') {
-			addRows = await that.onToolbarBtnAddBefore(addRows)
+		const { tableRowDefaultData, onToolbarBtnAddBefore, rowConfig, $vUtils, tableRef } = this
+		let addRows = rows ? $vUtils.clone(rows, true) : tableRowDefaultData
+		if (!isTool && typeof onToolbarBtnAddBefore === 'function') {
+			addRows = await onToolbarBtnAddBefore(addRows)
 		}
 		// 删除主键，以防排序冲突
-		let mainKeyField = that.rowConfig?.keyField || '_XID'
+		let mainKeyField = rowConfig?.keyField || '_XID'
 		if (Array.isArray(addRows)) {
 			addRows.forEach(item => {
 				delete item[mainKeyField]
@@ -576,30 +568,31 @@ const shMethods = {
 		} else {
 			delete addRows[mainKeyField]
 		}
-		let { row: newRow } = await that.tableRef().insertAt(addRows, index)
-		await that.tableRef().setActiveRow(newRow)
-		if (!isTool) that.$emit('toolbaroption', 'add', newRow, that.tableRef())
+		let { row: newRow } = await tableRef().insertAt(addRows, index)
+		await tableRef().setActiveRow(newRow)
+		if (!isTool) this.$emit('toolbaroption', 'add', newRow, tableRef())
 	},
 	// 删除行按钮
 	async handleTableDeleteRow(rows, isTool = false) {
-		const that = this
 		let deleteRows = rows
 		if (isTool) {
-			let selectedRows = that.getSelectionData()
-			if (selectedRows.length < 1) return that.msgwarning('请选择要删除的行！')
+			let selectedRows = this.getSelectionData()
+			if (selectedRows.length < 1) {
+				this.msgwarning('请选择要删除的行！')
+				return
+			}
 			deleteRows = selectedRows
-			await that.msgconfirm({ content: `确定删除吗？` })
-		}
-		if (typeof that.onToolbarBtnDeleteBefore === 'function') {
-			let result = await that.onToolbarBtnDeleteBefore(deleteRows)
+			await this.msgconfirm({ content: `确定删除吗？` })
+		} else if (typeof this.onToolbarBtnDeleteBefore === 'function') {
+			let result = await this.onToolbarBtnDeleteBefore(deleteRows)
 			if (!result) return
 		}
-		await that.tableRef().remove(deleteRows)
-		if (that.selectionRows && that.selectionRows.length > 0) {
-			let keyField = that.rowConfig.keyField || that.$vTableSetup.table.rowConfig.keyField
-			that.selectionRows = that.selectionRows.filter(sr => !deleteRows.find(dr => dr[keyField] === sr[keyField]))
+		await this.tableRef().remove(deleteRows)
+		if (this.selectionRows && this.selectionRows.length > 0) {
+			let keyField = this.rowConfig.keyField || this.$vTableSetup.table.rowConfig.keyField
+			this.selectionRows = this.selectionRows.filter(sr => !deleteRows.find(dr => dr[keyField] === sr[keyField]))
 		}
-		if (!isTool) that.$emit('toolbaroption', 'delete', deleteRows, that.tableRef())
+		if (!isTool) this.$emit('toolbaroption', 'delete', deleteRows, this.tableRef())
 	}
 }
 

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

@@ -104,12 +104,12 @@ export default {
 		},
 		rightBtns() {
 			let rBtns = []
-			let { rightConfig } = this
+			let { rightConfig, relation, leftActive } = this
 			if (rightConfig && Array.isArray(rightConfig)) {
 				rBtns = rightConfig
 			}
-			if (this.relation) {
-				rBtns = rBtns.filter(item => item.code && item.code.split(',').includes(this.leftActive))
+			if (relation) {
+				rBtns = rBtns.filter(item => item.code && item.code.split(',').includes(leftActive))
 			}
 			return rBtns
 		},

package/packages/vxeTable/index.js

@@ -96,13 +96,12 @@ let vxeOptions = {
 					return $$seq
 				} else if (tablePage) {
 					const { pagerConfig } = grid.props
-					const pageStart = seqConfig?.startIndex || (pagerConfig.pageSize > 0 ? pagerConfig.pageSize : 50) * ((pagerConfig.currentPage > 0 ? pagerConfig.currentPage : 1) - 1)
-					return !treeConfig || (treeConfig && ($seq === '' || $seq === undefined)) ? Number(pageStart) + seq : Number(pageStart) + Number($seq) + '.' + seq
-				} else if (!tablePage && treeConfig) {
-					return $seq === '' || $seq === undefined ? seq : $seq + '.' + seq
-				} else {
-					return seq === -1 ? $rowIndex + (seqConfig.startIndex || 1) : seq
+					const pageStart = seqConfig?.startIndex || (+pagerConfig.pageSize || 50) * ((+pagerConfig.currentPage || 1) - 1)
+					return treeConfig && $seq ? Number(pageStart) + Number($seq) + '.' + seq : Number(pageStart) + Number(seq)
+				} else if (treeConfig) {
+					return $seq ? $seq + '.' + seq : seq
 				}
+				return seq === -1 ? $rowIndex + (seqConfig.startIndex || 1) : seq
 			}
 		},
 		resizeConfig: {

package/packages/components/global-components/sh-upload/components/u-img.vue

@@ -1,63 +0,0 @@
-<template>
-	<img :src="imgsrc" />
-</template>
-
-<script>
-export default {
-	name: 'UImg',
-	props: {
-		src: {
-			type: String
-		},
-		file: {
-			type: Object
-		},
-		baseUrl: {
-			type: String
-		}
-	},
-	data() {
-		return {
-			imgsrc: ''
-		}
-	},
-	watch: {
-		file: {
-			handler: function (val, oldVal) {
-				this.initMounted()
-			},
-			immediate: false,
-			deep: true
-		}
-	},
-	mounted() {
-		this.initMounted()
-	},
-	methods: {
-		// 初始化渲染
-		async initMounted() {
-			if (!this.src) {
-				this.imgsrc = this.file ? await this.getImagePreviewData(this.file) : ''
-			} else {
-				this.imgsrc = this.src.startsWith('http') ? this.src : this.baseUrl || this.$config.baseUrl.pro + this.src
-			}
-		},
-		// 生成预览图片列表
-		async getImagePreviewData(file) {
-			let fileReader = new FileReader()
-			return new Promise((resolve, reject) => {
-				try {
-					fileReader.readAsDataURL(file)
-					fileReader.onload = function (e) {
-						resolve(e.target.result)
-					}
-				} catch (e) {
-					reject(e)
-				}
-			})
-		}
-	}
-}
-</script>
-
-<style scoped></style>