sh-view 1.7.6 → 2.0.1

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

@@ -85,10 +85,7 @@ const vxeEvents = {
 	},
 	// 分页变化触发
 	onPageChange(params) {
-		let { currentPage, pageSize } = params
 		this.selectionRows = []
-		this.tablePagerConfig.currentPage = currentPage
-		this.tablePagerConfig.pageSize = pageSize
 		this.$emit('page-change', params)
 	},
 
@@ -106,12 +103,10 @@ const vxeEvents = {
 const vxeFormEvents = {
 	// 表单展开全部/收起切换事件
 	onFormCollapsed(value) {
-		const that = this
-		if (that.tableVitualScroll) {
-			setTimeout(() => {
-				that.tableRef().recalculate(true)
-			}, 200)
-		}
+		const { tableRef } = this
+		setTimeout(() => {
+			tableRef().recalculate(true)
+		})
 	},
 	// -------- 搜索
 	onFormSubmit() {
@@ -161,14 +156,14 @@ const vxeMethods = {
 				data = this.getSelectionData()
 			} else {
 				data = this.$vUtils.clone(this.tableRef().getTableData().fullData, true)
-				let rnameColumns = columns.map(col => col.rname)
+				let rnameColumns = columns.filter(col => col.rname)
 				rnameColumns.forEach(col => {
 					let { property, rname, rprops } = col
 					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)
+							let { rvalue, rtext } = this.$vUtils.formatRender(cellValue, property, row, rname, rprops, this)
+							this.$vUtils.set(row, property, rtext)
 						}
 					})
 				})
@@ -243,35 +238,23 @@ const vxeMethods = {
 const shMethods = {
 	// 初始化
 	initCreated() {},
-	// 初始化分页配置
-	initPagerConfig() {
-		if (this.pagerConfig === false || this.reverse) {
-			this.tablePagerConfig = { enabled: false }
-		} else {
-			this.tablePagerConfig = Object.assign({}, this.pagerConfigDefault, this.pagerConfig)
-		}
-	},
 	// 初始化生成新表头数据
 	initTableColumns(columns = []) {
 		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 {
-			this.tableColumnsFixed = this.getReverseColumn(this.columns)
-		}
+		this.tableColumnsFixed = this.$vUtils.clone(columnsArr, true)
 	},
 	// 初始化验证规则
 	initEditRules(rules) {
-		const { tableEditRules, $vUtils } = this
+		const { $vUtils } = this
 		if (rules && $vUtils.isPlainObject(rules)) {
 			Object.keys(rules).forEach(key => {
-				if (tableEditRules[key]) {
-					tableEditRules[key] = Array.from(new Set(tableEditRules[key].concat(rules[key])))
+				if (this.tableEditRules[key]) {
+					this.tableEditRules[key] = Array.from(new Set(this.tableEditRules[key].concat(rules[key])))
 				} else {
-					tableEditRules[key] = rules[key]
+					this.tableEditRules[key] = rules[key]
 				}
 			})
 		}
@@ -298,61 +281,6 @@ const shMethods = {
 			})
 		}
 	},
-	// 反转表格-反转表头及数据
-	getReverseColumn(oriColumns) {
-		const { reverseConfig, disabled, columnObjDefault, dataSourse } = this
-		let columns = []
-		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}` }, columnObjDefault),
-					Object.assign({ field: `${keyPrefix}value${i}`, title: `数值${i}` }, columnObjDefault, valueRenderObj)
-				)
-			}
-		} else {
-			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 { reverseConfig, columns, $vUtils } = this
-		let data = []
-		let columnsNum = reverseConfig.num
-		let keyPrefix = reverseConfig.keyPrefix || 'reversePre'
-		if (columnsNum) {
-			// 将表头平均分组
-			let chunkColumns = $vUtils.chunk(columns, columnsNum)
-			chunkColumns.forEach((colGroup, colGroupIndex) => {
-				let item = {}
-				colGroup.forEach((column, columnIndex) => {
-					item[`${keyPrefix}title${columnIndex + 1}`] = column.title
-					item[`${keyPrefix}value${columnIndex + 1}`] = oriData[colGroupIndex][column.field] || ''
-					item[`${keyPrefix}value${columnIndex + 1}field`] = column.field || ''
-					column.field ? (item[`${column.field}RenderName`] = column.renderName || '') : ''
-				})
-				data.push(item)
-			})
-		} else {
-			data = columns.map(column => {
-				const item = { [`${keyPrefix}title`]: column.title }
-				oriData.forEach((row, index) => {
-					item[`${keyPrefix}value${index + 1}`] = row[column.field] || ''
-					item[`${keyPrefix}value${index + 1}field`] = column.field || ''
-					column.field ? (item[`${column.field}RenderName`] = column.renderName || '') : ''
-				})
-				return item
-			})
-		}
-		return data
-	},
 	// 转换生成新表头数据
 	getTransfarColumn(oriArr = []) {
 		const { columnObjDefault, columnObj, tableGlobalConfig, isTrue, getDefaultMessage, turnColumnItemFilters, $vUtils } = this
@@ -515,6 +443,26 @@ const shMethods = {
 	refreshRender() {
 		this.renderKey++
 	},
+	// 表格工具按钮点击
+	handleTableTool({ code }) {
+		switch (code) {
+			case 'addRow':
+				this.handleTableAddRow(null, undefined, true)
+				break
+			case 'deleteRow':
+				this.handleTableDeleteRow(null, true)
+				break
+			case 'import':
+				this.handleTableImportBtn()
+				break
+			case 'export':
+				this.handleTableExportBtn()
+				break
+			case 'print':
+				this.handleTablePrintBtn()
+				break
+		}
+	},
 	// 表格导出按钮
 	handleTableExportBtn(options) {
 		if (typeof this.onExportMethod === 'function') {
@@ -545,10 +493,7 @@ const shMethods = {
 	// 自定义操作列点击事件
 	async handleGoptionClick(btnObj, dataObj) {
 		if (btnObj.code === 'delete' || btnObj.idConfirm) {
-			await this.msgconfirm({
-				content: btnObj.ConfirmContent || `确定${btnObj.content}吗？`
-			})
-		} else {
+			await this.msgconfirm({ content: btnObj.ConfirmContent || `确定${btnObj.content}吗？` })
 		}
 		this.$emit('globaloption', btnObj, dataObj)
 	},