Skip to content

Commit 9889d23

Browse files
committed
feat: 重构风险表格-修改表格过滤 --bug=155108931
1 parent 1786075 commit 9889d23

File tree

5 files changed

+24
-6
lines changed

5 files changed

+24
-6
lines changed

src/frontend/src/components/tdesign-list/index.vue

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@
137137
interface Props {
138138
columns: any[],
139139
reverseSortFields?: Array<string>, // 颠倒排序的字段数组
140+
secondarySortField?: string, // 次级排序字段
140141
dataSource: (params: any) => Promise<IRequestResponsePaginationData<any>>,
141142
paginationValidator?: (pagination: IPagination) => boolean,
142143
isNeedHideClearSearchTip?: boolean,
@@ -167,6 +168,7 @@
167168
168169
const props = withDefaults(defineProps<Props>(), {
169170
reverseSortFields: () => [],
171+
secondarySortField: '',
170172
needEmptySearchTip: true,
171173
paginationValidator: undefined,
172174
border: true,
@@ -574,12 +576,24 @@
574576
575577
// 同时兼容两种后端参数形式:order_field/order_type 和 sort 数组
576578
const sortPrefix = orderType === 'desc' ? '-' : '';
577-
paramsMemo = {
578-
...paramsMemo,
579-
order_field: firstSort.sortBy,
580-
order_type: orderType,
581-
sort: [`${sortPrefix}${firstSort.sortBy}`],
582-
};
579+
const sortArray = [`${sortPrefix}${firstSort.sortBy}`];
580+
581+
const nextParams = { ...paramsMemo };
582+
583+
if (props.secondarySortField) {
584+
if (firstSort.sortBy !== props.secondarySortField.replace(/^-/, '')) {
585+
sortArray.push(props.secondarySortField);
586+
}
587+
delete nextParams.order_field;
588+
delete nextParams.order_type;
589+
nextParams.sort = sortArray;
590+
} else {
591+
nextParams.order_field = firstSort.sortBy;
592+
nextParams.order_type = orderType;
593+
nextParams.sort = sortArray;
594+
}
595+
596+
paramsMemo = nextParams;
583597
}
584598
isLoading.value = true;
585599
fetchListData();

src/frontend/src/views/attention-manege/index.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
:data-source="dataSource"
3232
need-empty-search-tip
3333
row-key="risk_id"
34+
secondary-sort-field="-event_time"
3435
:settings="settings"
3536
@clear-search="handleClearSearch"
3637
@on-setting-change="handleSettingChange"

src/frontend/src/views/handle-manage/index.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
:data-source="dataSource"
3333
need-empty-search-tip
3434
row-key="risk_id"
35+
secondary-sort-field="-event_time"
3536
:settings="settings"
3637
@clear-search="handleClearSearch"
3738
@on-setting-change="handleSettingChange"

src/frontend/src/views/processed-manage/index.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
:height="tableHeight"
3232
need-empty-search-tip
3333
row-key="risk_id"
34+
secondary-sort-field="-event_time"
3435
:settings="settings"
3536
@clear-search="handleClearSearch"
3637
@on-setting-change="handleSettingChange"

src/frontend/src/views/risk-manage/list/index.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
:data-source="dataSource"
4141
need-empty-search-tip
4242
row-key="risk_id"
43+
secondary-sort-field="-event_time"
4344
:settings="settings"
4445
@clear-search="handleClearSearch"
4546
@on-setting-change="handleSettingChange"

0 commit comments

Comments
 (0)