openxiangda-cli 2.0.0-alpha.66 → 2.0.0-alpha.67

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openxiangda-cli",
-  "version": "2.0.0-alpha.66",
+  "version": "2.0.0-alpha.67",
   "description": "Thin application-level CLI for OpenXiangda 2.0.",
   "type": "module",
   "main": "./dist/index.js",

package/template/apps/web/src/components/resource/GeneratedResourceCrud.tsx

@@ -247,15 +247,21 @@ function AuditEntry({ entry, surface }: { entry: DataAuditEntry; surface: DataRe
 
 function useGeneratedList(definition: GeneratedDefinition) {
   const { code, surface } = definition;
-  const defaultSort = surface.list?.defaultSort || {
-    field: Object.keys(surface.fields)[0] || 'id',
-    order: 'asc' as const,
-  };
+  const defaultSortField = surface.list?.defaultSort?.field || Object.keys(surface.fields)[0] || 'id';
+  const defaultSortOrder = surface.list?.defaultSort?.order || 'asc';
+  const defaultPageSize = surface.list?.defaultPageSize || 20;
   const [page, setPage] = useState(1);
-  const [pageSize, setPageSize] = useState(surface.list?.defaultPageSize || 20);
+  const [pageSize, setPageSize] = useState(defaultPageSize);
   const [draft, setDraft] = useState<Partial<GenericResourceQuery>>({});
   const [query, setQuery] = useState<Partial<GenericResourceQuery>>({});
-  const [sort, setSort] = useState({ field: defaultSort.field, order: defaultSort.order || 'asc' as const });
+  const [sort, setSort] = useState({ field: defaultSortField, order: defaultSortOrder as 'asc' | 'desc' });
+  useEffect(() => {
+    setPage(1);
+    setPageSize(defaultPageSize);
+    setDraft({});
+    setQuery({});
+    setSort({ field: defaultSortField, order: defaultSortOrder as 'asc' | 'desc' });
+  }, [code, defaultPageSize, defaultSortField, defaultSortOrder]);
   const list = useList<ResourceRecord>({
     resource: code,
     pagination: { currentPage: page, pageSize },
@@ -278,9 +284,10 @@ export function GeneratedResourcePage({
   if (!definition || definition.surface.generated === false) {
     return <Result status="404" title="未声明可生成的资源页面" />;
   }
-  if (mode === 'list') return <GeneratedResourceListPage definition={definition} variant={variant} />;
-  if (mode === 'detail') return <GeneratedResourceDetailPage definition={definition} variant={variant} />;
-  return <GeneratedResourceFormPage definition={definition} mode={mode} variant={variant} />;
+  const pageKey = `${variant}:${mode}:${resourceCode}`;
+  if (mode === 'list') return <GeneratedResourceListPage key={pageKey} definition={definition} variant={variant} />;
+  if (mode === 'detail') return <GeneratedResourceDetailPage key={pageKey} definition={definition} variant={variant} />;
+  return <GeneratedResourceFormPage key={pageKey} definition={definition} mode={mode} variant={variant} />;
 }
 
 function GeneratedResourceListPage({ definition, variant }: { definition: GeneratedDefinition; variant: 'desktop' | 'mobile' }) {

package/template/apps/web/src/platform-client.ts

@@ -201,7 +201,11 @@ export function createNativeResourceClient(code: string, surface: DataResourceSu
     }
     for (const [fieldCode, value] of Object.entries(query.filters || {})) {
       if (value === undefined || value === null || value === '') continue;
-      const field = surface.fields[assertField(fieldCode)];
+      // A list state can outlive a resource route during client-side navigation.
+      // Ignore filters from the previous resource instead of constructing an
+      // invalid Native Data query for the current resource.
+      if (!declaredFields.has(fieldCode)) continue;
+      const field = surface.fields[fieldCode];
       if (Array.isArray(value) && value.length === 2 && ['date', 'datetime', 'number', 'money', 'percent'].includes(field?.widget || '')) {
         if (value[0] !== undefined && value[0] !== null && value[0] !== '') filters.push({ field: fieldCode, operator: 'gte', value: value[0] });
         if (value[1] !== undefined && value[1] !== null && value[1] !== '') filters.push({ field: fieldCode, operator: 'lte', value: value[1] });
@@ -215,8 +219,10 @@ export function createNativeResourceClient(code: string, surface: DataResourceSu
   };
   return {
     async list(query: GenericResourceQuery) {
-      const sort = query.sort || surface.list?.defaultSort || { field: Object.keys(surface.fields)[0] || 'id', order: 'asc' as const };
-      const body: DataQuery = { schemaVersion: SCHEMA_VERSIONS.dataQuery, filters: filtersFor(query), order: [{ field: assertField(sort.field), direction: sort.order || 'asc' }], limit: query.pageSize, offset: (query.page - 1) * query.pageSize };
+      const fallbackSort = surface.list?.defaultSort || { field: Object.keys(surface.fields)[0] || 'id', order: 'asc' as const };
+      const requestedSort = query.sort || fallbackSort;
+      const sort = declaredFields.has(requestedSort.field) ? requestedSort : fallbackSort;
+      const body: DataQuery = { schemaVersion: SCHEMA_VERSIONS.dataQuery, filters: filtersFor(query), order: [{ field: sort.field, direction: sort.order || 'asc' }], limit: query.pageSize, offset: (query.page - 1) * query.pageSize };
       const page = await request<DataPage<Record<string, unknown>>>(`${base}/query`, { method: 'POST', body: JSON.stringify({ ...body, environmentKey: currentEnvironmentKey() }) });
       return { rows: page.items, total: page.total };
     },

package/template/apps/web/test/contracts.test.ts

@@ -35,6 +35,11 @@ test('standard surfaces keep authoritative directory/resource selectors and mobi
   assert.match(crud, /text\/csv;charset=utf-8/);
   assert.match(crud, /数据读取失败/);
   assert.match(crud, /state\.list\.query\.refetch/);
+  assert.match(crud, /key=\{pageKey\}/);
+  assert.match(crud, /setQuery\(\{\}\)/);
+  const client = readFileSync(new URL('../src/platform-client.ts', import.meta.url), 'utf8');
+  assert.match(client, /declaredFields\.has\(requestedSort\.field\)/);
+  assert.match(client, /if \(!declaredFields\.has\(fieldCode\)\) continue/);
 });
 
 test('runtime metadata stays mount-scoped', () => {

package/template/package.json

@@ -21,7 +21,7 @@
     "build": "pnpm --recursive build"
   },
   "devDependencies": {
-    "openxiangda-cli": "2.0.0-alpha.66",
+    "openxiangda-cli": "2.0.0-alpha.67",
     "openxiangda-contracts": "2.0.0-alpha.31",
     "openxiangda-devkit-core": "2.0.0-alpha.41",
     "typescript": "5.9.3"