diff --git a/frontend/src/components/pure/ms-table/base-table.vue b/frontend/src/components/pure/ms-table/base-table.vue index 1a1629d22a..8a1ffc36fa 100644 --- a/frontend/src/components/pure/ms-table/base-table.vue +++ b/frontend/src/components/pure/ms-table/base-table.vue @@ -883,6 +883,7 @@ .arco-table-cell-with-filter { float: left; .arco-table-th-title { + border-radius: 2px; background: rgb(var(--primary-1)) content-box; .filter-icon { color: rgb(var(--primary-5)) !important; diff --git a/frontend/src/components/pure/ms-table/useTable.ts b/frontend/src/components/pure/ms-table/useTable.ts index f031931b30..bdad3a4a6c 100644 --- a/frontend/src/components/pure/ms-table/useTable.ts +++ b/frontend/src/components/pure/ms-table/useTable.ts @@ -161,8 +161,8 @@ export default function useTableProps( }; // 设置请求参数,如果出了分页参数还有搜索参数,在模板页面调用此方法,可以加入参数 - const loadListParams = ref({}); - const setLoadListParams = (params?: object) => { + const loadListParams = ref({}); + const setLoadListParams = (params?: TableQueryParams) => { loadListParams.value = params || {}; }; // 设置keyword @@ -201,11 +201,15 @@ export default function useTableProps( current, pageSize: currentPageSize, sort: sortItem.value, - filter: filterItem.value, + keyword: keyword.value, combine: advanceFilter.combine, searchMode: advanceFilter.accordBelow, ...loadListParams.value, + filter: { + ...filterItem.value, + ...loadListParams.value.filter, + }, }; const data = await loadListFunc(tableQueryParams.value); const tmpArr = data.list || data.data.list; diff --git a/frontend/src/utils/index.ts b/frontend/src/utils/index.ts index f2084d21a7..2188dd94a5 100644 --- a/frontend/src/utils/index.ts +++ b/frontend/src/utils/index.ts @@ -877,7 +877,7 @@ export function customFieldDataToTableData(customFieldData: Record[ // 后端返回来的数据这个字段没值 field.type = customField.type; if (selectExcludes.includes(field.type) && Array.isArray(field.options)) { - tableData[field.id] = field.options.find((option) => option.value === field.value)?.text; + tableData[`custom_single_${field.id}`] = field.options.find((option) => option.value === field.value)?.text; } else if (field.type === 'MULTIPLE_INPUT' && field.value) { // 处理标签形式 tableData[field.id] = JSON.parse(field.value).join(',') || '-'; @@ -885,7 +885,7 @@ export function customFieldDataToTableData(customFieldData: Record[ // 多值的类型后端返回的是json字符串 try { field.value = JSON.parse(field.value); - tableData[field.id] = field.value + tableData[`custom_multiple_${field.id}`] = field.value .map((val: string) => field.options.find((option: { value: string }) => option.value === val)?.text) .join(','); } catch (e) { diff --git a/frontend/src/views/bug-management/index.vue b/frontend/src/views/bug-management/index.vue index 4e736a891b..7e5e0ec9da 100644 --- a/frontend/src/views/bug-management/index.vue +++ b/frontend/src/views/bug-management/index.vue @@ -67,80 +67,8 @@ {{ record.relationCaseCount }} - - - - - - - - - -