diff --git a/src/hooks/useTableSelectionWithPagination.ts b/src/hooks/useTableSelectionWithPagination.ts index 10bef01..ebc6b22 100644 --- a/src/hooks/useTableSelectionWithPagination.ts +++ b/src/hooks/useTableSelectionWithPagination.ts @@ -22,31 +22,28 @@ export function useTableSelectionWithPagination(options: UseTableSelectionWithPa const rowKey = options.rowKey || 'id'; const selectedRowKeys = ref>([]); - const selectedRows = ref([]); + const selectedRows = ref>([]); const pageInfo = ref(merge({}, DEFAULT_PAGE_INFO, options.pageInfo)); const dataSource = ref([]); // 单行选择 - const handleSelect = (selectedKeys: (string | number)[], rowKeyValue: string | number, record: any) => { - const select = selectedKeys.includes(rowKeyValue); - selectedRowKeys.value = selectedKeys; - - console.log('handleSelect', selectedKeys, rowKeyValue, record); + const handleSelect = (record: any, select: boolean) => { + const _targetKey = record[rowKey]; if (select) { - if (!selectedRows.value.some((v) => v[rowKey] === record[rowKey])) { - selectedRows.value.push(record); - } + selectedRows.value.push(record); + selectedRowKeys.value.push(_targetKey); } else { - selectedRows.value = selectedRows.value.filter((v) => v[rowKey] !== record[rowKey]); + selectedRows.value = selectedRows.value.filter((v) => v[rowKey] !== _targetKey); + selectedRowKeys.value = selectedRowKeys.value.filter((key) => key !== _targetKey); } + options.onSelectChange?.(); }; // 全选/取消全选 const handleSelectAll = (checked: boolean) => { - console.log('handleSelectAll', checked) const currentPageRows = dataSource.value; const currentPageKeys = currentPageRows.map((v) => v[rowKey]); @@ -63,7 +60,7 @@ export function useTableSelectionWithPagination(options: UseTableSelectionWithPa options.onSelectChange?.(); }; - const onPageChange = (page: number, pageSize:number) => { + const onPageChange = (page: number, pageSize: number) => { // console.log('onPageChange', page, pageSize); pageInfo.value.page = page; pageInfo.value.page_size = pageSize; @@ -76,8 +73,8 @@ export function useTableSelectionWithPagination(options: UseTableSelectionWithPa // options.onPageSizeChange?.(size); }; const resetPageInfo = () => { - pageInfo.value = cloneDeep(DEFAULT_PAGE_INFO) - } + pageInfo.value = cloneDeep(DEFAULT_PAGE_INFO); + }; const rowSelection = computed(() => ({ type: 'checkbox', diff --git a/src/layouts/components/navbar/components/task-center-modal/components/export-task/index.vue b/src/layouts/components/navbar/components/task-center-modal/components/export-task/index.vue index cd887a9..9aefc8c 100644 --- a/src/layouts/components/navbar/components/task-center-modal/components/export-task/index.vue +++ b/src/layouts/components/navbar/components/task-center-modal/components/export-task/index.vue @@ -15,8 +15,6 @@ import DeleteTaskModal from './delete-task-modal.vue'; import icon1 from '@/assets/img/media-account/icon-delete.png'; import { showExportNotification, showFailExportNotification } from '@/utils/arcoD'; - - export default { setup(props, { emit, expose }) { const { @@ -25,8 +23,6 @@ export default { dataSource, pageInfo, onPageChange, - onPageSizeChange, - rowSelection, handleSelect, handleSelectAll, DEFAULT_PAGE_INFO, @@ -34,9 +30,6 @@ export default { onPageChange: () => { getData(); }, - onPageSizeChange: () => { - getData(); - }, }); let queryTaskTimer = null; @@ -281,8 +274,8 @@ export default { rowKey="id" rowSelection={{ selectedRowKeys: selectedRowKeys.value, - onChange: (keys, rows) => handleSelect(keys, rows), - onSelectAll: (selected, rows, changeRows) => handleSelectAll(selected, rows, changeRows) + onSelect: handleSelect, + onSelectAll: handleSelectAll, }} pagination={false} scroll={{ x: '100%', y: '100%' }} @@ -346,13 +339,7 @@ export default { onClick={() => handleDelete(record)} /> {record.status !== enumTaskStatus.Exporting && ( - )} @@ -373,7 +360,6 @@ export default { current={pageInfo.value.page} pageSize={pageInfo.value.page_size} onChange={onPageChange} - onShowSizeChange={onPageSizeChange} /> )} diff --git a/src/layouts/components/navbar/components/task-center-modal/components/import-task/index.vue b/src/layouts/components/navbar/components/task-center-modal/components/import-task/index.vue index ffbbe3e..71f4df2 100644 --- a/src/layouts/components/navbar/components/task-center-modal/components/import-task/index.vue +++ b/src/layouts/components/navbar/components/task-center-modal/components/import-task/index.vue @@ -21,8 +21,6 @@ export default { dataSource, pageInfo, onPageChange, - onPageSizeChange, - rowSelection, handleSelect, handleSelectAll, DEFAULT_PAGE_INFO, @@ -30,9 +28,6 @@ export default { onPageChange: () => { getData(); }, - onPageSizeChange: () => { - getData(); - }, }); const query = ref({ ...INITIAL_FORM }); @@ -126,8 +121,8 @@ export default { rowKey="id" rowSelection={{ selectedRowKeys: selectedRowKeys.value, - onChange: (keys, rows) => handleSelect(keys, rows), - onSelectAll: (selected, rows, changeRows) => handleSelectAll(selected, rows, changeRows) + onSelect: handleSelect, + onSelectAll: handleSelectAll, }} pagination={false} scroll={{ x: '100%', y: '100%' }} @@ -212,7 +207,6 @@ export default { current={pageInfo.value.page} pageSize={pageInfo.value.page_size} onChange={onPageChange} - onShowSizeChange={onPageSizeChange} /> )} diff --git a/src/styles/components/ant-table.scss b/src/styles/components/ant-table.scss index 2d60573..a53d7a6 100644 --- a/src/styles/components/ant-table.scss +++ b/src/styles/components/ant-table.scss @@ -1,4 +1,9 @@ .ant-table-wrapper { + .ant-spin-nested-loading, + .ant-spin-container, + .ant-table{ + height: 100%; + } .ant-table { border-radius: 0; font-family: $font-family-regular; diff --git a/src/views/components/dataEngine/keyWord.vue b/src/views/components/dataEngine/keyWord.vue index 619f1ee..ac96744 100644 --- a/src/views/components/dataEngine/keyWord.vue +++ b/src/views/components/dataEngine/keyWord.vue @@ -269,7 +269,7 @@