diff --git a/frontend/src/components/business/ms-user-selector/index.vue b/frontend/src/components/business/ms-user-selector/index.vue index f778c1ea41..85a25c74f1 100644 --- a/frontend/src/components/business/ms-user-selector/index.vue +++ b/frontend/src/components/business/ms-user-selector/index.vue @@ -65,7 +65,7 @@ } ); - const currentValue = defineModel({ default: [] }); + const currentValue = defineModel<(string | number)[] | string>({ default: [] }); const loading = ref(true); const loadList = async (params: Record) => { diff --git a/frontend/src/components/pure/ms-table/base-table.vue b/frontend/src/components/pure/ms-table/base-table.vue index 87686fff93..ecaa5c1e28 100644 --- a/frontend/src/components/pure/ms-table/base-table.vue +++ b/frontend/src/components/pure/ms-table/base-table.vue @@ -67,7 +67,10 @@ :filterable="item.filterable" :cell-class="item.cellClass" :header-cell-class="`${ - item.headerCellClass || (item.filterConfig && isHighlightFilterBackground) ? 'header-cell-filter' : '' + item.headerCellClass || + (item.filterConfig && isHighlightFilterBackground && activeDataIndex === item.dataIndex) + ? 'header-cell-filter' + : '' }`" :body-cell-class="item.bodyCellClass" :summary-cell-class="item.summaryCellClass" @@ -104,9 +107,11 @@ v-else-if="item.filterConfig" class="ml-[4px]" :options="item.filterConfig.options" + :data-index="item.dataIndex" + v-bind="item.filterConfig" @handle-confirm="(v) => handleFilterConfirm(v, item.dataIndex as string, item.isCustomParam || false)" - @show="showFilter(true)" - @hide="showFilter(false)" + @show="showFilter(true, item.dataIndex)" + @hide="showFilter(false, item.dataIndex)" > -