openxiangda-cli 2.0.0-alpha.59 → 2.0.0-alpha.61

package/template/apps/web/src/main.tsx

@@ -4,8 +4,9 @@ import zhCN from 'antd/locale/zh_CN';
 import React from 'react';
 import ReactDOM from 'react-dom/client';
 import { BrowserRouter, Navigate, Route, Routes } from 'react-router-dom';
-import { instrumentProvider } from './data-provider';
+import { applicationProvider } from './data-provider';
 import { CollegePage } from './CollegePage';
+import { GeneratedResourcePage } from './components/resource/GeneratedResourceCrud';
 import { FilePreviewPage } from './FilePreviewPage';
 import { InstrumentDetailPage } from './InstrumentDetailPage';
 import { InstrumentFormPage } from './InstrumentFormPage';
@@ -13,6 +14,7 @@ import { InstrumentListPage } from './InstrumentListPage';
 import { RuntimeBoundary } from './runtime';
 import { applicationBasename } from './runtime-meta';
 import './styles.css';
+import { resourceDefinitions } from '../../../packages/contracts/src/generated.js';
 
 ReactDOM.createRoot(document.getElementById('root')!).render(
   <React.StrictMode>
@@ -37,7 +39,7 @@ ReactDOM.createRoot(document.getElementById('root')!).render(
         <RuntimeBoundary>
           <BrowserRouter basename={applicationBasename()}>
             <Refine
-              dataProvider={instrumentProvider}
+              dataProvider={applicationProvider}
               resources={[
                 {
                   name: 'instruments',
@@ -51,6 +53,10 @@ ReactDOM.createRoot(document.getElementById('root')!).render(
               <Routes>
                 <Route path="/" element={<Navigate replace to="/instruments" />} />
                 <Route path="/instruments" element={<InstrumentListPage />} />
+                <Route
+                  path="/m/instruments"
+                  element={<InstrumentListPage variant="mobile" />}
+                />
                 <Route path="/colleges" element={<CollegePage />} />
                 <Route
                   path="/files/:resourceCode/:fileId/preview"
@@ -68,6 +74,30 @@ ReactDOM.createRoot(document.getElementById('root')!).render(
                   path="/instruments/:id"
                   element={<InstrumentDetailPage />}
                 />
+                <Route
+                  path="/m/instruments/:id"
+                  element={<InstrumentDetailPage variant="mobile" />}
+                />
+                <Route
+                  path="/m/instruments/new"
+                  element={<InstrumentFormPage mode="create" variant="mobile" />}
+                />
+                <Route
+                  path="/m/instruments/:id/edit"
+                  element={<InstrumentFormPage mode="edit" variant="mobile" />}
+                />
+                {Object.entries(resourceDefinitions)
+                  .filter(([, definition]) => definition.surface.generated !== false)
+                  .flatMap(([resourceCode]) => [
+                    <Route key={`${resourceCode}-list`} path={`/${resourceCode}`} element={<GeneratedResourcePage resourceCode={resourceCode} />} />,
+                    <Route key={`${resourceCode}-new`} path={`/${resourceCode}/new`} element={<GeneratedResourcePage mode="create" resourceCode={resourceCode} />} />,
+                    <Route key={`${resourceCode}-detail`} path={`/${resourceCode}/:id`} element={<GeneratedResourcePage mode="detail" resourceCode={resourceCode} />} />,
+                    <Route key={`${resourceCode}-edit`} path={`/${resourceCode}/:id/edit`} element={<GeneratedResourcePage mode="edit" resourceCode={resourceCode} />} />,
+                    <Route key={`${resourceCode}-mobile-list`} path={`/m/${resourceCode}`} element={<GeneratedResourcePage resourceCode={resourceCode} variant="mobile" />} />,
+                    <Route key={`${resourceCode}-mobile-new`} path={`/m/${resourceCode}/new`} element={<GeneratedResourcePage mode="create" resourceCode={resourceCode} variant="mobile" />} />,
+                    <Route key={`${resourceCode}-mobile-detail`} path={`/m/${resourceCode}/:id`} element={<GeneratedResourcePage mode="detail" resourceCode={resourceCode} variant="mobile" />} />,
+                    <Route key={`${resourceCode}-mobile-edit`} path={`/m/${resourceCode}/:id/edit`} element={<GeneratedResourcePage mode="edit" resourceCode={resourceCode} variant="mobile" />} />,
+                  ])}
               </Routes>
             </Refine>
           </BrowserRouter>

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

@@ -11,9 +11,10 @@ import {
   type DirectoryResolveRequest,
   type NativeScopeValuePage,
   type NativeScopeValueResolveRequest,
+  type DataResourceSurface,
 } from 'openxiangda-contracts/browser';
 import type { InstrumentListQuery, InstrumentRecord } from './instrument';
-import { isInstrumentResourceField } from './fields';
+import { instrumentSurface, isInstrumentResourceField } from './fields';
 import { applicationCode, runtimeMount } from './runtime-meta';
 
 const resourceCode = 'instruments';
@@ -273,7 +274,11 @@ export const instrumentDataApi: InstrumentDataApiAdapter = {
     // The current DataQuery contract has AND filters but no grouped OR. Keep
     // this honest single-field search until the platform adds a native OR AST.
     if (query.keyword?.trim()) {
-      filters.push({ field: 'chineseName', operator: 'ilike', value: `%${query.keyword.trim()}%` });
+      const searchableFields = instrumentSurface.list?.searchableFields || [];
+      const field = searchableFields.includes(query.searchField || '')
+        ? query.searchField!
+        : searchableFields[0] || 'chineseName';
+      filters.push({ field, operator: 'ilike', value: `%${query.keyword.trim()}%` });
     }
     if (query.collegeId) filters.push({ field: 'collegeId', operator: 'eq', value: query.collegeId });
     if (query.instrumentAdminId) filters.push({ field: 'instrumentAdminIds', operator: 'cs', value: [query.instrumentAdminId] });
@@ -378,6 +383,94 @@ export const instrumentDataApi: InstrumentDataApiAdapter = {
   },
 };
 
+export interface GenericResourceQuery {
+  page: number;
+  pageSize: number;
+  keyword?: string;
+  searchField?: string;
+  filters?: Record<string, unknown>;
+  sort?: { field: string; order: 'asc' | 'desc' };
+}
+
+/** Native CRUD adapter used by resources that opt into generated pages. */
+export function createNativeResourceClient(
+  code: string,
+  surface: DataResourceSurface
+) {
+  const base = dataBase(code);
+  const declaredFields = new Set(Object.keys(surface.fields));
+  const assertField = (field: string) => {
+    if (!declaredFields.has(field)) {
+      throw new Error(`OPENXIANGDA_RESOURCE_QUERY_FIELD_NOT_DECLARED:${code}:${field}`);
+    }
+    return field;
+  };
+  const filtersFor = (query: GenericResourceQuery) => {
+    const filters: NonNullable<DataQuery['filters']> = [];
+    if (query.keyword?.trim()) {
+      const searchable = surface.list?.searchableFields || [];
+      const field = searchable.includes(query.searchField || '') ? query.searchField! : searchable[0];
+      if (field) filters.push({ field: assertField(field), operator: 'ilike', value: `%${query.keyword.trim()}%` });
+    }
+    for (const [fieldCode, value] of Object.entries(query.filters || {})) {
+      if (value === undefined || value === null || value === '') continue;
+      const field = surface.fields[assertField(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] });
+      } else if (Array.isArray(value) && ['multi', 'directory-user', 'directory-department'].includes(field?.widget || '')) {
+        filters.push({ field: fieldCode, operator: 'cs', value });
+      } else {
+        filters.push({ field: fieldCode, operator: 'eq', value });
+      }
+    }
+    return filters;
+  };
+  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 page = await request<DataPage<Record<string, unknown>>>(`${base}/query`, {
+        method: 'POST',
+        body: JSON.stringify({ ...body, environmentKey: currentEnvironmentKey() }),
+      });
+      return { rows: page.items, total: page.total };
+    },
+    async get(id: string) {
+      const record = await request<DataRecord<Record<string, unknown>>>(`${base}/records/${encodeURIComponent(id)}?environmentKey=${encodeURIComponent(currentEnvironmentKey())}`);
+      return record.data;
+    },
+    async audit(id: string) {
+      return await request<DataAuditPage>(`${base}/records/${encodeURIComponent(id)}/audit?limit=10&offset=0&environmentKey=${encodeURIComponent(currentEnvironmentKey())}`);
+    },
+    async create(data: Record<string, unknown>) {
+      const record = await request<DataRecord<Record<string, unknown>>>(`${base}/records`, { method: 'POST', body: JSON.stringify({ environmentKey: currentEnvironmentKey(), data }) });
+      return record.data;
+    },
+    async update(id: string, expectedRevision: number, data: Record<string, unknown>) {
+      const record = await request<DataRecord<Record<string, unknown>>>(`${base}/records/${encodeURIComponent(id)}/update`, { method: 'POST', body: JSON.stringify({ environmentKey: currentEnvironmentKey(), expectedRevision, data }) });
+      return record.data;
+    },
+    async remove(id: string, expectedRevision: number) {
+      const record = await request<DataRecord<Record<string, unknown>>>(`${base}/records/${encodeURIComponent(id)}/delete`, { method: 'POST', body: JSON.stringify({ environmentKey: currentEnvironmentKey(), expectedRevision }) });
+      return record.data;
+    },
+    async upload(fieldCode: string, file: File, recordId?: string) {
+      assertField(fieldCode);
+      const plan = await request<DataFileUploadPlan>(`${base}/files/uploads/initiate`, { method: 'POST', body: JSON.stringify({ environmentKey: currentEnvironmentKey(), fieldCode, fileName: file.name, fileSize: file.size, contentType: file.type || 'application/octet-stream', ...(recordId ? { recordId } : {}) }) });
+      const uploaded = await fetch(plan.uploadUrl, { method: plan.uploadMethod, headers: plan.headers, body: file });
+      if (!uploaded.ok) throw new Error(`FILE_UPLOAD_FAILED: HTTP_${uploaded.status}`);
+      return await request<DataFileRef>(`${base}/files/${encodeURIComponent(plan.file.id)}/complete`, { method: 'POST', body: JSON.stringify({ environmentKey: currentEnvironmentKey() }) });
+    },
+  };
+}
+
 export function dataFileContentUrl(
   resource: string,
   fileId: string,

package/template/apps/web/src/styles.css

@@ -218,6 +218,103 @@ body {
   font-size: 12px;
 }
 
+.oxa-mobile-page {
+  min-height: 100vh;
+  box-sizing: border-box;
+  background: #f3f7fd;
+  padding: 16px;
+}
+
+.oxa-mobile-header {
+  display: grid;
+  gap: 6px;
+  margin-bottom: 14px;
+}
+
+.oxa-mobile-header .ant-typography {
+  margin: 0;
+}
+
+.oxa-mobile-form {
+  margin-top: 14px;
+}
+
+.oxa-mobile-field .ant-form-item-control-input-content {
+  min-height: 44px;
+}
+
+.oxa-mobile-input {
+  width: 100%;
+  min-height: 42px;
+  box-sizing: border-box;
+  border: 1px solid #d9e2f0;
+  border-radius: 8px;
+  background: #fff;
+  padding: 9px 11px;
+  color: #172033;
+  font: inherit;
+}
+
+.oxa-mobile-input:focus {
+  border-color: #1677ff;
+  outline: 2px solid rgb(22 119 255 / 15%);
+}
+
+.oxa-mobile-filter,
+.oxa-mobile-pagination,
+.oxa-mobile-record-heading,
+.oxa-mobile-record-fields {
+  display: grid;
+  gap: 10px;
+}
+
+.oxa-mobile-filter {
+  margin: 14px 0;
+}
+
+.oxa-mobile-record-list {
+  display: grid;
+  gap: 12px;
+  margin-top: 14px;
+}
+
+.oxa-mobile-record-card {
+  border-color: #dfe6ef;
+}
+
+.oxa-mobile-record-heading {
+  grid-template-columns: minmax(0, 1fr) auto;
+  align-items: center;
+}
+
+.oxa-mobile-record-heading a {
+  overflow: hidden;
+  color: #1677ff;
+  font-size: 16px;
+  font-weight: 650;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.oxa-mobile-record-fields {
+  grid-template-columns: repeat(2, minmax(0, 1fr));
+  margin: 12px 0;
+}
+
+.oxa-mobile-record-fields > div {
+  min-width: 0;
+}
+
+.oxa-mobile-pagination {
+  grid-template-columns: 1fr auto 1fr;
+  align-items: center;
+  margin-top: 14px;
+}
+
+.oxa-mobile-pagination .ant-btn:last-child {
+  justify-self: end;
+}
+
 .oxa-current-user-chevron {
   color: #65748a;
   font-size: 12px;

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

@@ -5,7 +5,7 @@ import {
   instrumentFieldAllowed,
   sanitizeInstrumentValues,
 } from '../src/InstrumentForm';
-import { instrumentFields } from '../src/fields';
+import { instrumentFields, instrumentSurface } from '../src/fields';
 import {
   browseDepartmentTree,
   browseDepartmentUsers,
@@ -49,6 +49,43 @@ test('the golden module exposes exactly 30 fields and five restricted fields', (
   );
 });
 
+test('the instrument list, search, and filters are declared by the resource surface', () => {
+  assert.deepEqual(
+    Object.entries(instrumentSurface.fields)
+      .filter(([, field]) => field.list)
+      .map(([key]) => key)
+      .sort(),
+    [
+      'chineseName',
+      'collegeId',
+      'image',
+      'instrumentAdminIds',
+      'instrumentCode',
+      'instrumentStatus',
+      'openToOutside',
+      'specModel',
+      'assetCode',
+    ].sort()
+  );
+  assert.deepEqual(instrumentSurface.list?.searchableFields, [
+    'chineseName',
+    'instrumentCode',
+    'assetCode',
+  ]);
+  assert.ok(instrumentSurface.list?.filterFields?.includes('assetValue'));
+  const list = readFileSync(
+    new URL('../src/InstrumentListPage.tsx', import.meta.url),
+    'utf8'
+  );
+  const client = readFileSync(
+    new URL('../src/platform-client.ts', import.meta.url),
+    'utf8'
+  );
+  assert.match(list, /listSurfaceFields/);
+  assert.match(list, /searchableFields/);
+  assert.match(client, /query\.searchField/);
+});
+
 test('application shell and instrument surfaces match the approved navigation model', () => {
   const shell = readFileSync(new URL('../src/Shell.tsx', import.meta.url), 'utf8');
   const list = readFileSync(
@@ -60,6 +97,10 @@ test('application shell and instrument surfaces match the approved navigation mo
     new URL('../src/InstrumentForm.tsx', import.meta.url),
     'utf8'
   );
+  const formPage = readFileSync(
+    new URL('../src/InstrumentFormPage.tsx', import.meta.url),
+    'utf8'
+  );
   const colleges = readFileSync(
     new URL('../src/CollegePage.tsx', import.meta.url),
     'utf8'
@@ -72,10 +113,22 @@ test('application shell and instrument surfaces match the approved navigation mo
     new URL('../src/components/platform-fields/AttachmentFileList.tsx', import.meta.url),
     'utf8'
   );
+  const surfaceFields = readFileSync(
+    new URL('../src/components/resource/SurfaceFields.tsx', import.meta.url),
+    'utf8'
+  );
   const preview = readFileSync(
     new URL('../src/FilePreviewPage.tsx', import.meta.url),
     'utf8'
   );
+  const standardPages = readFileSync(
+    new URL('../src/components/resource/StandardResourcePages.tsx', import.meta.url),
+    'utf8'
+  );
+  const generatedCrud = readFileSync(
+    new URL('../src/components/resource/GeneratedResourceCrud.tsx', import.meta.url),
+    'utf8'
+  );
   for (const marker of [
     '仪器资源管理',
     '工作台',
@@ -94,15 +147,35 @@ test('application shell and instrument surfaces match the approved navigation mo
   assert.doesNotMatch(shell, /验证本地 Nest|roleCodes\.join|environment\.key/);
   assert.doesNotMatch(list, /<Drawer|surface="drawer"/);
   assert.match(routes, /path="\/instruments\/new"[\s\S]*<InstrumentFormPage mode="create"/);
+  assert.match(routes, /path="\/m\/instruments\/new"[\s\S]*variant="mobile"/);
+  assert.match(routes, /path="\/m\/instruments"[\s\S]*variant="mobile"/);
+  assert.match(routes, /path="\/m\/instruments\/:id"[\s\S]*variant="mobile"/);
+  assert.match(routes, /path="\/m\/instruments\/:id\/edit"[\s\S]*variant="mobile"/);
   assert.match(colleges, /<Drawer/);
   assert.match(colleges, /size=\{520\}/);
   assert.match(directory, /width=\{kind === 'user' \? 980 : 760\}/);
   assert.match(directory, /browseDepartmentTree|browseDepartmentUsers/);
   assert.match(directory, /选择成员|选择部门|组织架构|已选/);
   assert.match(form, /oxa-form-full/);
-  assert.match(form, /PlatformDirectoryPicker/);
-  assert.match(form, /oxa-file-dropzone/);
+  assert.match(form, /SurfaceFieldControl/);
+  assert.match(surfaceFields, /PlatformDirectoryPicker/);
+  assert.match(surfaceFields, /oxa-file-dropzone/);
   assert.match(form, /oxa-detail-layout/);
+  assert.match(list, /<ResourceListPage/);
+  assert.match(formPage, /ResourceFormPage/);
+  assert.match(formPage, /MobileResourceFormPage/);
+  assert.match(list, /MobileResourceListPage/);
+  assert.match(surfaceFields, /SurfaceFilterControl/);
+  assert.match(form, /MobileSurfaceFieldControl/);
+  assert.match(
+    readFileSync(new URL('../src/InstrumentDetailPage.tsx', import.meta.url), 'utf8'),
+    /<ResourceDetailPage/
+  );
+  assert.match(standardPages, /批量事务合同落地后启用/);
+  assert.match(standardPages, /DataResourceSurface/);
+  assert.match(generatedCrud, /resourceDefinitions/);
+  assert.match(generatedCrud, /createNativeResourceClient/);
+  assert.match(generatedCrud, /MobileResourceDetailPage/);
   assert.match(routes, /path="\/files\/:resourceCode\/:fileId\/preview"/);
   assert.match(attachment, /Image\.PreviewGroup/);
   assert.match(attachment, /attachmentPreviewPath/);
@@ -125,7 +198,10 @@ test('college, user, and department selectors have authoritative owners only', (
     new URL('../../../platform/data/colleges.ts', import.meta.url),
     'utf8'
   );
-  const fields = readFileSync(new URL('../src/fields.ts', import.meta.url), 'utf8');
+  const fields = readFileSync(
+    new URL('../../../platform/data/instrument-surface.ts', import.meta.url),
+    'utf8'
+  );
   assert.match(appConfig, /valueType:\s*'uuid'/);
   assert.match(appConfig, /kind:\s*'native_resource'/);
   assert.match(appConfig, /resourceCode:\s*'colleges'/);

package/template/package.json

@@ -21,9 +21,9 @@
     "build": "pnpm --recursive build"
   },
   "devDependencies": {
-    "openxiangda-cli": "2.0.0-alpha.59",
-    "openxiangda-contracts": "2.0.0-alpha.28",
-    "openxiangda-devkit-core": "2.0.0-alpha.35",
+    "openxiangda-cli": "2.0.0-alpha.61",
+    "openxiangda-contracts": "2.0.0-alpha.29",
+    "openxiangda-devkit-core": "2.0.0-alpha.37",
     "typescript": "5.9.3"
   }
 }