renxiaodong/lingji-work-fe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into feature/v1.2灵机空间-项目管理_rxd

Browse Source 
# Conflicts:
#	src/api/all/common.ts
#	src/components/_base/navbar/index.vue
#	src/hooks/useTableSelectionWithPagination.ts
#	src/router/routes/modules/propertyMarketing.ts
#	src/stores/modules/side-bar/constants.ts
#	src/views/property-marketing/media-account/account-manage/components/account-table/index.vue
#	src/views/property-marketing/media-account/account-manage/components/add-account-modal/index.vue
#	src/views/property-marketing/put-account/account-data/components/filter-block/index.vue
#	src/views/property-marketing/put-account/account-manage/components/account-table/index.vue
#	src/views/property-marketing/put-account/account-manage/components/add-account-modal/index.vue
#	src/views/property-marketing/put-account/account-manage/components/filter-block/index.vue
#	src/views/property-marketing/put-account/components/status-select/constants.ts
This commit is contained in:
rd
2025-07-23 15:22:46 +08:00
parent 9e6082eb76 8dd4247e6b
commit b9a552bad8
66 changed files with 2144 additions and 673 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/hooks/useTableSelectionWithPagination.ts
View File

@ -77,6 +77,7 @@ export function useTableSelectionWithPagination(options: UseTableSelectionWithPa
const rowSelection = computed(() => ({
type: 'checkbox',
showCheckedAll: true,
width: 48,
}));
return {
@ -89,6 +90,7 @@ export function useTableSelectionWithPagination(options: UseTableSelectionWithPa
rowSelection,
handleSelect,
handleSelectAll,
resetPageInfo
resetPageInfo,
DEFAULT_PAGE_INFO,
};
}