sh-view 2.5.5 → 2.5.6

package/package.json

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

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

@@ -71,12 +71,9 @@ export default function (props, context, proxy, isGrid) {
 	const tableViewData = computed(() => tableFilterData.value || props.dataSourse)
 	const tablePrevColumns = computed(() => {
 		let prevColumns = []
-		let prevFields = ['seq', 'selectType']
-		prevFields.forEach(prev => {
-			if (tableGlobalConfig.value[prev]) {
-				prevColumns.push(columnsMapDefault[prev])
-			}
-		})
+		const { seq, selectType } = tableGlobalConfig.value
+		if (seq) prevColumns.push(columnsMapDefault.seq)
+		if (selectType) prevColumns.push(columnsMapDefault[selectType])
 		return prevColumns
 	})
 	const tableColumns = computed(() => {
@@ -155,7 +152,8 @@ export default function (props, context, proxy, isGrid) {
 		return selectionRows.value || []
 	}
 	// 获取全部数据
-	const getFullData = () => {
+	// visible为true获取视图数据
+	const getFullData = ({ visible }) => {
 		let data = $vUtils.clone(tableRef.value.getTableData().fullData, true)
 		const columns = tableRef.value.getColumns()
 		let rnameColumns = columns.filter(col => col.rname)
@@ -165,7 +163,7 @@ export default function (props, context, proxy, isGrid) {
 				let cellValue = $vUtils.get(row, property)
 				if (!$vUtils.isNone(cellValue)) {
 					let { rvalue, rtext } = $vUtils.formatRender(cellValue, property, row, rname, rprops, proxy)
-					$vUtils.set(row, property, ['$vMoney'].includes(rname) ? rtext : rvalue)
+					$vUtils.set(row, property, visible || ['$vMoney'].includes(rname) ? rtext : rvalue)
 				}
 			})
 		})
@@ -397,13 +395,10 @@ export default function (props, context, proxy, isGrid) {
 					searchFields.push({ rkey: col.property, rname: renderObj.name, rprops: Object.assign({}, renderObj.props, col.rprops) })
 				}
 			})
-			filterData = $vUtils.searchTree(props.dataSourse, row => {
+			let fullVisibleData = getFullData({ visible: true })
+			filterData = $vUtils.searchTree(fullVisibleData, row => {
 				return searchFields.some(item => {
 					let cellValue = $vUtils.get(row, item.rkey)
-					if ($vxePluginNames.expendRenders && $vxePluginNames.expendRenders.includes(item.rname)) {
-						let { rtext } = $vUtils.formatRender(cellValue, item.rkey, row, item.rname, item.rprops, proxy)
-						return String(rtext).toLowerCase().indexOf(filterText) > -1
-					}
 					return $vUtils.trim(cellValue).toLowerCase().indexOf(filterText) > -1
 				})
 			})