sh-view 2.5.8 → 2.5.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sh-view",
-  "version": "2.5.8",
+  "version": "2.5.9",
   "description": "基于vxe-table二次封装",
   "main": "packages/index.js",
   "scripts": {

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

@@ -153,7 +153,8 @@ export default function (props, context, proxy, isGrid) {
 	}
 	// 获取全部数据
 	// visible为true获取视图数据
-	const getFullData = ({ visible }) => {
+	const getFullData = params => {
+		const { visible = false, deleteXid = false } = params || {}
 		let data = $vUtils.clone(tableRef.value.getTableData().fullData, true)
 		const columns = tableRef.value.getColumns()
 		let rnameColumns = columns.filter(col => col.rname)
@@ -165,6 +166,7 @@ export default function (props, context, proxy, isGrid) {
 					let { rvalue, rtext } = $vUtils.formatRender(cellValue, property, row, rname, rprops, proxy)
 					$vUtils.set(row, property, visible || ['$vMoney'].includes(rname) ? rtext : rvalue)
 				}
+				if (deleteXid) delete row._XID
 			})
 		})
 		return data
@@ -479,7 +481,7 @@ export default function (props, context, proxy, isGrid) {
 		}
 		let { row: newRow } = await tableRef.value.insertAt(addRows, index)
 		await tableRef.value.setActiveRow(newRow)
-		if (!isTool) emit('toolbaroption', 'add', newRow, tableRef.value)
+		if (isTool) emit('toolbaroption', 'add', newRow, tableRef.value)
 	}
 	// 删除行按钮
 	const handleTableDeleteRow = async (rows, isTool = false) => {
@@ -501,7 +503,7 @@ export default function (props, context, proxy, isGrid) {
 			let keyField = props.rowConfig.keyField || proxy.$vTableSetup.table.rowConfig.keyField
 			selectionRows.value = selectionRows.value.filter(sr => !deleteRows.find(dr => dr[keyField] === sr[keyField]))
 		}
-		if (!isTool) emit('toolbaroption', 'delete', deleteRows, tableRef.value)
+		if (isTool) emit('toolbaroption', 'delete', deleteRows, tableRef.value)
 	}
 
 	watch(