Skip to content

fix(grid): ObjectGrid 真正的服务端分页 (#2212) - #1913

Merged
os-zhuang merged 1 commit into
mainfrom
fix/2212-server-pagination
Jun 22, 2026
Merged

fix(grid): ObjectGrid 真正的服务端分页 (#2212)#1913
os-zhuang merged 1 commit into
mainfrom
fix/2212-server-pagination

Conversation

@baozhoutao

Copy link
Copy Markdown
Contributor

配合框架修复 objectstack-ai/objectstack#2212(findData 返回真实 total/hasMore)。

后端报对了匹配总数与 hasMore 之后,前端还必须真正用上它:按页用 $skip 取数、翻页时重新请求,而不是一次取一批后在内存里切片——后者会让第一批之后的记录永远翻不到。

改动

  • ObjectGrid (packages/plugin-grid/src/ObjectGrid.tsx):新增 serverPage/serverPageSize 状态;以 $top + $skip = (page-1)*size 取数;对象/筛选/排序变化时重置到第 1 页。对扁平的服务端列表(非内联数据、非分组视图),以 manual 模式驱动 DataTable:rowCount = 真实总数,onPageChange/onPageSizeChange 触发服务端重新取数。
  • DataTable (packages/components/src/renderers/complex/data-table.tsx):新增 manualPagination/rowCount/page/onPageChange/onPageSizeChange。manual 模式下把 data 当作当前页原样渲染、不做客户端切片,并按 rowCount 计算总页数。
  • data-objectstack 适配器 (packages/data-objectstack/src/index.ts):优先采用服务端 hasMore,缺失时才退化为页内估计。
  • types (packages/types/src/data-display.ts):声明 DataTable 的 manual 分页属性。

测试

  • 新增 data-table-manual-pagination.test.tsx(3 例):按 rowCount 推总页数、不做客户端切片、onPageChange 上报翻页。
  • 新增 plugin-grid/.../serverPagination.test.tsx(4 例):渲染真实 ObjectGrid + mock 服务端,断言首页 $skip=0、翻页 $skip>0 重新取数、总页数取自真实 total、改页大小重新取数并回到第 1 页。
  • 全量套件通过:4227 passed | 24 skipped(301 文件)

后端配套 PR:objectstack-ai/objectstack#2222

Pairs with the framework findData fix (objectstack-ai/objectstack#2212). Once
the backend reports the real match `total`/`hasMore`, the grid must actually
USE it: fetch one page at a time with $skip and refetch on navigation, rather
than fetching a single batch and slicing it in memory (which left records
beyond the first batch unreachable).
- ObjectGrid: add serverPage/serverPageSize state; fetch with
$top + $skip = (page-1)*size; reset to page 1 when object/filter/sort
changes. For the flat server-fetched list (not inline data, not grouped),
drive DataTable in manual mode with rowCount = real total and
onPageChange/onPageSizeChange refetching from the server.
- DataTable: add manualPagination/rowCount/page/onPageChange/onPageSizeChange.
In manual mode it renders `data` as the current page WITHOUT client slicing
and derives total pages from rowCount.
- data-objectstack adapter: prefer the server's `hasMore`, falling back to the
page-local estimate only when absent.
- types: declare the new DataTable manual-pagination props.
Tests: new data-table-manual-pagination.test.tsx (3) and ObjectGrid
serverPagination.test.tsx (4, renders the real ObjectGrid against a mock
server and asserts $skip refetch + true page count). Full suite green
(4227 passed | 24 skipped).
@vercel

vercelBot commented Jun 22, 2026

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

1 Skipped Deployment
ProjectDeploymentActionsUpdated (UTC)
objectuiIgnoredIgnoredJun 22, 2026 3:38pm

Request Review

@github-actions

Copy link
Copy Markdown
Contributor

✅ Console Performance Budget

MetricValueBudget
Main entry (gzip)58.9 KB350 KB
Entry fileindex-CPyt6HwK.js
StatusPASS

📦 Bundle Size Report

PackageSizeGzipped
app-shell (index.js)6.25KB2.18KB
app-shell (runtime-config.js)4.72KB1.69KB
app-shell (types.js)0.01KB0.04KB
auth (AuthContext.js)0.31KB0.24KB
auth (AuthGuard.js)1.17KB0.53KB
auth (AuthProvider.js)17.16KB3.44KB
auth (AuthShell.js)3.49KB1.40KB
auth (ForgotPasswordForm.js)4.79KB1.88KB
auth (LoginForm.js)5.11KB1.92KB
auth (PreviewBanner.js)0.90KB0.50KB
auth (RegisterForm.js)6.63KB2.15KB
auth (SocialSignInButtons.js)8.89KB3.61KB
auth (UserMenu.js)3.40KB1.22KB
auth (authStyles.js)5.04KB1.72KB
auth (createAuthClient.js)24.74KB6.00KB
auth (createAuthenticatedFetch.js)3.33KB1.32KB
auth (index.js)1.75KB0.76KB
auth (types.js)0.59KB0.35KB
auth (useAuth.js)4.01KB0.79KB
auth (useIsWorkspaceAdmin.js)1.28KB0.70KB
collaboration (CommentThread.js)18.38KB4.49KB
collaboration (LiveCursors.js)3.17KB1.27KB
collaboration (PresenceAvatars.js)3.65KB1.42KB
collaboration (PresenceProvider.js)2.42KB0.96KB
collaboration (index.js)1.25KB0.53KB
collaboration (useCommentSearch.js)1.98KB0.88KB
collaboration (useConflictResolution.js)7.75KB1.86KB
collaboration (useMentionNotifications.js)1.81KB0.68KB
collaboration (usePresence.js)6.33KB1.84KB
collaboration (useRealtimeSubscription.js)7.91KB2.01KB
components (index.js)415.31KB88.29KB
core (index.js)1.52KB0.55KB
create-plugin (index.js)9.28KB2.98KB
data-objectstack (index.js)97.73KB24.27KB
fields (index.js)166.21KB40.08KB
i18n (LocalizationContext.js)1.76KB0.96KB
i18n (currency.js)1.22KB0.64KB
i18n (i18n.js)4.32KB1.77KB
i18n (index.js)2.46KB0.96KB
i18n (pickLocalized.js)1.31KB0.67KB
i18n (provider.js)5.37KB1.72KB
i18n (useObjectLabel.js)21.15KB4.68KB
i18n (useSafeTranslation.js)2.68KB0.98KB
layout (index.js)36.30KB10.04KB
mobile (MobileProvider.js)0.92KB0.49KB
mobile (ResponsiveContainer.js)0.94KB0.38KB
mobile (breakpoints.js)1.51KB0.70KB
mobile (createOfflineDataSource.js)5.61KB1.74KB
mobile (index.js)1.50KB0.62KB
mobile (offlineQueue.js)3.91KB1.35KB
mobile (pwa.js)0.97KB0.49KB
mobile (serviceWorker.js)1.48KB0.62KB
mobile (serviceWorkerSource.js)3.41KB1.48KB
mobile (useBreakpoint.js)1.54KB0.65KB
mobile (useGesture.js)4.42KB1.27KB
mobile (useOfflineSync.js)1.99KB0.72KB
mobile (usePullToRefresh.js)2.53KB0.85KB
mobile (useResponsive.js)0.71KB0.42KB
mobile (useResponsiveConfig.js)1.36KB0.63KB
mobile (useSpecGesture.js)1.77KB0.77KB
mobile (useTouchTarget.js)1.01KB0.54KB
permissions (MePermissionsProvider.js)4.87KB1.77KB
permissions (PermissionContext.js)0.31KB0.25KB
permissions (PermissionGuard.js)0.89KB0.45KB
permissions (PermissionProvider.js)3.11KB0.87KB
permissions (evaluator.js)4.00KB1.23KB
permissions (index.js)0.91KB0.41KB
permissions (store.js)0.91KB0.42KB
permissions (useFieldPermissions.js)1.28KB0.52KB
permissions (usePermissions.js)1.42KB0.68KB
plugin-ai (index.js)15.71KB3.79KB
plugin-calendar (index.js)45.98KB12.65KB
plugin-charts (index.js)42.60KB12.02KB
plugin-chatbot (index.js)150.06KB36.49KB
plugin-dashboard (index.js)104.62KB26.04KB
plugin-designer (index.js)213.42KB42.94KB
plugin-detail (index.js)195.59KB47.19KB
plugin-editor (index.js)2.38KB1.06KB
plugin-form (index.js)93.24KB22.71KB
plugin-gantt (index.js)133.11KB32.92KB
plugin-grid (index.js)115.01KB30.89KB
plugin-kanban (index.js)48.82KB13.13KB
plugin-list (index.js)93.76KB22.06KB
plugin-map (index.js)16.02KB4.98KB
plugin-markdown (index.js)13.58KB4.64KB
plugin-report (index.js)35.93KB9.50KB
plugin-timeline (index.js)25.37KB7.20KB
plugin-tree (index.js)8.04KB2.70KB
plugin-view (index.js)84.45KB20.36KB
providers (DataSourceProvider.js)0.75KB0.39KB
providers (MetadataProvider.js)1.37KB0.59KB
providers (ThemeProvider.js)1.55KB0.67KB
providers (UploadProvider.js)11.71KB3.53KB
providers (index.js)0.44KB0.22KB
providers (types.js)0.01KB0.04KB
react (LazyPluginLoader.js)3.77KB1.33KB
react (SchemaRenderer.js)17.06KB5.59KB
react (index.js)0.76KB0.42KB
tenant (TenantContext.js)0.31KB0.25KB
tenant (TenantGuard.js)1.04KB0.43KB
tenant (TenantProvider.js)2.76KB0.98KB
tenant (TenantScopedQuery.js)0.77KB0.44KB
tenant (index.js)0.75KB0.38KB
tenant (resolver.js)2.64KB0.76KB
tenant (useTenant.js)0.50KB0.32KB
tenant (useTenantBranding.js)0.62KB0.39KB
types (ai.js)0.20KB0.17KB
types (api-types.js)0.20KB0.18KB
types (app.js)2.87KB0.99KB
types (base.js)0.20KB0.18KB
types (blocks.js)0.20KB0.18KB
types (complex.js)0.20KB0.18KB
types (crud.js)0.20KB0.18KB
types (data-display.js)0.20KB0.18KB
types (data-protocol.js)0.20KB0.19KB
types (data.js)0.20KB0.18KB
types (designer.js)0.77KB0.41KB
types (disclosure.js)0.20KB0.18KB
types (feedback.js)0.20KB0.18KB
types (field-types.js)0.20KB0.18KB
types (form.js)0.20KB0.18KB
types (index.js)1.54KB0.68KB
types (layout.js)0.20KB0.18KB
types (mobile.js)0.20KB0.18KB
types (navigation.js)0.20KB0.18KB
types (objectql.js)0.20KB0.18KB
types (overlay.js)0.20KB0.18KB
types (permissions.js)0.20KB0.18KB
types (plugin-scope.js)0.20KB0.18KB
types (record-components.js)0.20KB0.19KB
types (registry.js)0.20KB0.18KB
types (reports.js)0.20KB0.18KB
types (spec-report.js)5.26KB1.96KB
types (tenant.js)0.20KB0.18KB
types (theme.js)0.20KB0.18KB
types (ui-action.js)0.75KB0.46KB
types (views.js)0.20KB0.18KB
types (widget.js)0.20KB0.18KB

Size Limits

  • ✅ Core packages should be < 50KB gzipped
  • ✅ Component packages should be < 100KB gzipped
  • ⚠️ Plugin packages should be < 150KB gzipped

@os-zhuang
os-zhuang merged commit 28b39cc into mainJun 22, 2026
10 checks passed
@os-zhuang
os-zhuang deleted the fix/2212-server-pagination branch June 22, 2026 15:48
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@baozhoutao@os-zhuang