|
@@ -124,7 +124,7 @@
|
|
|
import { get } from 'lodash-es'
|
|
|
const slots = useSlots()
|
|
|
const route = useRoute()
|
|
|
- const emit = defineEmits(['expand'])
|
|
|
+ const emit = defineEmits(['expand', 'update:filterParam'])
|
|
|
const renderSlots = Object.keys(slots)
|
|
|
|
|
|
const props = defineProps(
|
|
@@ -194,6 +194,10 @@
|
|
|
columnSetting: false,
|
|
|
striped: false
|
|
|
})
|
|
|
+ },
|
|
|
+ filterParam: {
|
|
|
+ type: Object,
|
|
|
+ default: () => ({})
|
|
|
}
|
|
|
})
|
|
|
)
|
|
@@ -350,20 +354,21 @@
|
|
|
props.pageSize ||
|
|
|
data.localPagination.pageSize
|
|
|
},
|
|
|
- (sorter &&
|
|
|
- sorter.field && {
|
|
|
- sortField: sorter.field
|
|
|
- }) ||
|
|
|
- {},
|
|
|
- (sorter &&
|
|
|
- sorter.order && {
|
|
|
- sortOrder: sorter.order
|
|
|
- }) ||
|
|
|
- {},
|
|
|
- {
|
|
|
+ {
|
|
|
...filters
|
|
|
}
|
|
|
)
|
|
|
+
|
|
|
+ if (sorter?.order) {
|
|
|
+ parameter.sortField = sorter.field
|
|
|
+ parameter.sortOrder = sorter.order
|
|
|
+ emit('update:filterParam', {
|
|
|
+ sortField: sorter.field,
|
|
|
+ sortOrder: sorter.order
|
|
|
+ })
|
|
|
+ } else {
|
|
|
+ emit('update:filterParam', {})
|
|
|
+ }
|
|
|
// 用请求数据请求该列表的返回数据
|
|
|
const result = props.data(parameter)
|
|
|
if ((typeof result === 'object' || typeof result === 'function') && typeof result.then === 'function') {
|