openxiangda-cli 2.0.0-alpha.89 → 2.0.0-alpha.90

package/template/apps/web/e2e/field-protocol.spec.ts

@@ -23,13 +23,32 @@ test.describe('Field Kit protocol acceptance', () => {
         },
       });
     });
+    await page.route('**/files/*/content?*', async route => {
+      await route.fulfill({
+        body: Buffer.from(
+          'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNk+A8AAQUBAScY42YAAAAASUVORK5CYII=',
+          'base64'
+        ),
+        contentType: 'image/png',
+        status: 200,
+      });
+    });
   });
 
   test('renders and operates every desktop edit/read component', async ({ page }) => {
+    const pageErrors: string[] = [];
+    const addressRequests: string[] = [];
+    page.on('pageerror', error => pageErrors.push(error.message));
+    page.on('request', request => {
+      if (request.url().includes('/china-divisions/')) {
+        addressRequests.push(request.url());
+      }
+    });
     await page.setViewportSize({ width: 1440, height: 1100 });
     await page.goto('/field-protocol.e2e.html');
     await expect(page.locator('[data-field-code]')).toHaveCount(fieldCount);
     await expect(page.locator('[data-read-field]')).toHaveCount(fieldCount);
+    await expect(page.locator('[data-audit-field]')).toHaveCount(fieldCount);
     await expect(page.locator('[data-field-code="静态单选下拉"] .ant-select')).toBeVisible();
     await expect(page.locator('[data-field-code="单选按钮"] .ant-radio-group')).toBeVisible();
     await expect(page.locator('[data-field-code="复选框"] .ant-checkbox-group')).toBeVisible();
@@ -37,6 +56,22 @@ test.describe('Field Kit protocol acceptance', () => {
     await expect(page.locator('[data-field-code="精确定位"] input')).toHaveCount(0);
     await expect(page.locator('[data-field-code="精确定位"]')).not.toContainText('手工');
     await expect(page.locator('.ant-alert-error')).toHaveCount(0);
+    await expect.poll(() => addressRequests.length).toBeGreaterThan(0);
+    expect(addressRequests.every(url => new URL(url).pathname.startsWith('/service/china-divisions/'))).toBe(true);
+
+    await page.getByRole('button', { name: '验证表单' }).click();
+    await expect(page.locator('[data-field-code="UUID"] .ant-form-item-has-error')).toHaveCount(0);
+
+    await expect(page.locator('[data-read-field="图片"] img.oxa-file-thumbnail')).toHaveAttribute('src', /blob:/);
+    await expect(page.locator('[data-read-field="富文本"] img')).toHaveAttribute('src', /blob:/);
+    expect(await page.locator('[data-read-field="图片"] img.oxa-file-thumbnail').evaluate(
+      image => (image as HTMLImageElement).naturalWidth
+    )).toBeGreaterThan(0);
+    expect(await page.locator('[data-read-field="富文本"] img').evaluate(
+      image => (image as HTMLImageElement).naturalWidth
+    )).toBeGreaterThan(0);
+    await expect(page.locator('[aria-label="当前协议字段变更记录"]')).not.toContainText('[object Object]');
+    await expect(page.locator('[data-audit-digest="rich-text"]')).toContainText('大值摘要');
 
     await page.locator('[data-field-code="精确定位"]').getByRole('button', { name: '浏览器定位' }).click();
     await expect(page.locator('[data-field-code="精确定位"]')).toContainText('120.123456');
@@ -78,12 +113,63 @@ test.describe('Field Kit protocol acceptance', () => {
     await saveSignature.click();
     await expect(page.locator('[data-field-code="业务签名"]')).not.toContainText('尚未签名');
 
+    expect(pageErrors).toEqual([]);
+
     expect(
       await page.evaluate(() => document.documentElement.scrollWidth <= window.innerWidth)
     ).toBe(true);
     await page.screenshot({ fullPage: true, path: 'test-results/field-protocol-desktop.png' });
   });
 
+  test('resource selectors query once when selection changes', async ({ page }) => {
+    const requestCounts = new Map<string, number>();
+    await page.route('**/source/query', async route => {
+      const match = new URL(route.request().url()).pathname.match(/\/fields\/([^/]+)\/source\/query$/);
+      const fieldCode = decodeURIComponent(match?.[1] || 'unknown');
+      requestCounts.set(fieldCode, (requestCounts.get(fieldCode) || 0) + 1);
+      const body = route.request().postDataJSON() as { operation?: 'create' | 'update' };
+      await route.fulfill({
+        contentType: 'application/json',
+        json: {
+          schemaVersion: 'openxiangda.data-field-source-page/v2',
+          environment: {
+            id: 'field-protocol-environment',
+            key: 'preproduction',
+            activeAppVersionId: 'field-protocol-version',
+            headRevision: 1,
+            authzRevisionId: 'field-protocol-authz',
+            authzVersion: 1,
+            scopeDataVersion: 'field-protocol-scope',
+          },
+          resourceCode: 'field-records',
+          fieldCode,
+          sourceResourceCode: 'field-lookups',
+          operation: body.operation || 'create',
+          items: [{
+            label: `候选-${fieldCode}`,
+            value: `candidate-${fieldCode}`,
+            resourceCode: 'field-lookups',
+            snapshot: { code: `code-${fieldCode}` },
+          }],
+          nextCursor: null,
+        },
+      });
+    });
+
+    await page.goto('/field-protocol.e2e.html');
+    for (const fieldCode of ['资源单选', '资源多选']) {
+      await page.locator(`[data-field-code="${fieldCode}"]`).getByRole('combobox').click();
+      await expect.poll(() => requestCounts.get(fieldCode) || 0).toBe(1);
+      await page
+        .locator('.ant-select-dropdown:visible .oxa-selector-option')
+        .filter({ hasText: `候选-${fieldCode}` })
+        .click();
+      await page.waitForTimeout(500);
+      expect(requestCounts.get(fieldCode)).toBe(1);
+      await page.keyboard.press('Escape');
+    }
+  });
+
   test('renders every mobile control without horizontal overflow', async ({ page }) => {
     await page.setViewportSize({ width: 390, height: 844 });
     await page.goto('/field-protocol.e2e.html?mode=mobile');

package/template/apps/web/e2e/resources.spec.ts

@@ -21,119 +21,26 @@ const definitions = resourceDefinitions as Record<string, DeclaredResource>;
 const allCapabilities = [...capabilities] as string[];
 const runtimeBase = `/view/${appCode}`;
 
-const roleSubjects = [
-  {
-    subjectKey: 'membership:college-admin',
-    subjectKind: 'membership',
-    role: {
-      code: 'college_admin',
-      name: '学院管理员',
-      source: 'package',
-      description: '管理本学院业务数据',
-    },
-    revision: 1,
-    scopeDimensionCount: 1,
-    scopeSummary: [],
-    scopeSummaryTruncated: false,
-    validFrom: null,
-    validTo: null,
-  },
-  {
-    subjectKey: 'membership:instrument-admin',
-    subjectKind: 'membership',
-    role: {
-      code: 'instrument_admin',
-      name: '仪器管理员',
-      source: 'package',
-      description: '管理分配的仪器',
-    },
-    revision: 1,
-    scopeDimensionCount: 0,
-    scopeSummary: [],
-    scopeSummaryTruncated: false,
-    validFrom: null,
-    validTo: null,
-  },
-] as const;
-
-function roleContext(subjectKey: string, authorized: boolean) {
-  const subject = roleSubjects.find(item => item.subjectKey === subjectKey)!;
-  const roleSessionId = `role-session-${subject.role.code}`;
+function runtimeAuthorization(authorized: boolean) {
   return {
-    schemaVersion: 'openxiangda.role-session-context/v2',
+    schemaVersion: 'openxiangda.runtime-authorization/v2',
     state: 'active',
     environment: {
       id: 'preproduction-id',
       key: 'preproduction',
-      kind: 'preproduction',
       activeAppVersionId: 'app-version-1',
       headRevision: 1,
+      authzRevisionId: 'authz-1',
       authzVersion: 1,
-      roleSubjectSetVersion: 'subjects-1',
-    },
-    identityScope: `preproduction-id:${subjectKey}:1`,
-    subjectProfile: {
-      schemaVersion: 'openxiangda.subject-profile/v2',
-      userId: 'acceptance-user',
-      displayName: '验收用户',
-      avatarUrl: null,
-      jobNumber: null,
-      affiliatedDepartment: { id: 'department-1', name: '实验中心' },
-    },
-    currentRoleSubject: subject,
-    roleSubjectPage: {
-      schemaVersion: 'openxiangda.role-subject-page/v2',
-      items: roleSubjects,
-      total: roleSubjects.length,
-      nextCursor: null,
-      roleSubjectSetVersion: 'subjects-1',
-    },
-    roleSession: {
-      schemaVersion: 'openxiangda.native-role-session/v2',
-      id: roleSessionId,
-      environmentId: 'preproduction-id',
-      environmentKey: 'preproduction',
-      loginSessionId: 'login-session-1',
-      userId: 'acceptance-user',
-      selectionKey: subjectKey,
-      subjectKind: 'membership',
-      activeRoleCode: subject.role.code,
-      activeRoleSource: 'package',
-      activeRoleMembershipId: subjectKey.slice('membership:'.length),
-      activeAuthzRevisionId: 'authz-1',
-      activeAuthzVersion: 1,
-      activeAppVersionId: 'app-version-1',
-      activeEnvironmentHeadRevision: 1,
-      activeMembershipRevision: 1,
-      status: 'active',
-      issuedAt: '2026-08-23T00:00:00.000Z',
-      expiresAt: '2099-08-23T00:00:00.000Z',
-      lastUsedAt: '2026-08-23T00:00:00.000Z',
+      scopeDataVersion: 'scope-1',
     },
     principal: {
-      schemaVersion: 'openxiangda.native-principal/v2',
-      tenantId: 'tenant-1',
-      appCode,
-      environmentId: 'preproduction-id',
-      environmentKey: 'preproduction',
-      activeAppVersionId: 'app-version-1',
-      environmentHeadRevision: 1,
-      principalType: 'user',
-      subjectId: 'acceptance-user',
+      type: 'user_union',
       userId: 'acceptance-user',
-      loginSessionId: 'login-session-1',
-      roleSessionId,
-      subjectKind: 'membership',
-      activeRoleCode: subject.role.code,
-      activeRoleSource: 'package',
-      activeRoleMembershipId: subjectKey.slice('membership:'.length),
-      activeMembershipRevision: 1,
-      authzRevisionId: 'authz-1',
-      authzVersion: 1,
-      scopeDataVersion: 'scope-1',
+      roleCodes: ['college_admin', 'instrument_admin'],
+      capabilityCodes: authorized ? allCapabilities : [],
       isAppSuperAdmin: false,
-      capabilities: authorized ? allCapabilities : [],
-      expiresAt: null,
+      identityScope: 'user-union:preproduction-id:acceptance-user:authz-1',
     },
   };
 }
@@ -143,10 +50,8 @@ async function mockPlatform(
   authorized = true,
   targetRuntimeBase = runtimeBase,
 ) {
-  let activeSubjectKey = roleSubjects[0].subjectKey;
   let contextReads = 0;
   const observed: Array<{ path: string; roleSessionId: string }> = [];
-  const switches: Array<Record<string, unknown>> = [];
   await page.route(`**${targetRuntimeBase}/**`, async route => {
     if (route.request().resourceType() !== 'document') return route.continue();
     const response = await route.fetch();
@@ -162,42 +67,13 @@ async function mockPlatform(
     const url = new URL(route.request().url());
     const request = route.request();
     const roleSessionId = request.headers()['x-openxiangda-role-session-id'] || '';
-    if (url.pathname.endsWith('/native/authz/role-session/context/role-subjects')) {
-      return route.fulfill({
-        contentType: 'application/json',
-        body: JSON.stringify({
-          code: 200,
-          data: {
-            schemaVersion: 'openxiangda.role-subject-page/v2',
-            items: roleSubjects,
-            total: roleSubjects.length,
-            nextCursor: null,
-            roleSubjectSetVersion: 'subjects-1',
-          },
-        }),
-      });
-    }
-    if (url.pathname.endsWith('/native/authz/role-session/context/switch')) {
-      const body = request.postDataJSON() as Record<string, unknown>;
-      switches.push(body);
-      if (roleSubjects.some(item => item.subjectKey === body.targetRoleSubjectKey)) {
-        activeSubjectKey = String(body.targetRoleSubjectKey) as typeof activeSubjectKey;
-      }
-      return route.fulfill({
-        contentType: 'application/json',
-        body: JSON.stringify({
-          code: 200,
-          data: roleContext(activeSubjectKey, authorized),
-        }),
-      });
-    }
-    if (url.pathname.endsWith('/native/authz/role-session/context')) {
+    if (url.pathname.endsWith('/native/authz/current')) {
       contextReads += 1;
       return route.fulfill({
         contentType: 'application/json',
         body: JSON.stringify({
           code: 200,
-          data: roleContext(activeSubjectKey, authorized),
+          data: runtimeAuthorization(authorized),
         }),
       });
     }
@@ -262,7 +138,6 @@ async function mockPlatform(
   });
   return {
     observed,
-    switches,
     get contextReads() {
       return contextReads;
     },
@@ -314,7 +189,7 @@ test('opens the stable admin entry under the preproduction gateway mount', async
   await expect(page).toHaveURL(`${devRuntimeBase}/${codes[0]}`);
 });
 
-test('binds Data, Directory, App API, and role switching to one active RoleSession', async ({ page }) => {
+test('uses the current user role union without exposing a RoleSession header', async ({ page }) => {
   const platform = await mockPlatform(page);
   await page.goto(`${runtimeBase}/admin`);
   if (codes.length) {
@@ -324,7 +199,7 @@ test('binds Data, Directory, App API, and role switching to one active RoleSessi
   }
 
   await page.evaluate(async () => {
-    const client = await import('/src/platform-client.ts');
+    const client = await import('/e2e/client-fixture.ts');
     await client.searchResource('acceptance-resource', 'name', {
       keyword: '显微镜',
     });
@@ -332,55 +207,19 @@ test('binds Data, Directory, App API, and role switching to one active RoleSessi
     await client.requestApplicationApi('/health/current-user');
   });
 
-  const initialSession = 'role-session-college_admin';
-  expect(
-    platform.observed.filter(item =>
-      /\/native\/data(?:-resources)?\/|\/directory\/|\/openxiangda-app-api\/v2\//.test(
-        item.path
-      )
+  const protectedRequests = platform.observed.filter(item =>
+    /\/native\/data(?:-resources)?\/|\/directory\/|\/openxiangda-app-api\/v2\//.test(
+      item.path
     )
-  ).toEqual(
-    expect.arrayContaining([
-      expect.objectContaining({ roleSessionId: initialSession }),
-      expect.objectContaining({ roleSessionId: initialSession }),
-      expect.objectContaining({ roleSessionId: initialSession }),
-    ])
   );
-
-  await page.locator('.oxa-current-user').click();
-  await page.getByText('切换应用角色', { exact: true }).click();
-  await page.getByRole('combobox', { name: '选择应用角色' }).click();
-  await page.getByText('仪器管理员', { exact: true }).click();
-  await page.getByRole('button', { name: '切换角色' }).click();
-
-  await expect.poll(() => platform.switches.length).toBe(1);
-  expect(platform.switches[0]).toMatchObject({
-    targetRoleSubjectKey: 'membership:instrument-admin',
-    expectedRoleSessionId: initialSession,
-    environmentKey: 'preproduction',
-  });
-  await expect.poll(() => platform.contextReads).toBeGreaterThan(1);
+  expect(protectedRequests.length).toBeGreaterThanOrEqual(3);
+  expect(protectedRequests.every(item => item.roleSessionId === '')).toBe(true);
+  expect(platform.contextReads).toBe(1);
   await page.locator('.oxa-current-user').click();
   await expect(page.locator('.oxa-user-dropdown-roles')).toContainText(
-    '仪器管理员'
+    'college_admin、instrument_admin'
   );
-  await page.keyboard.press('Escape');
-  await page.evaluate(async () => {
-    const client = await import('/src/platform-client.ts');
-    await client.searchResource('acceptance-resource', 'name', {
-      keyword: '光谱仪',
-    });
-  });
-  await expect
-    .poll(
-      () =>
-        platform.observed.filter(
-          item =>
-            item.path.includes('/native/data-resources/') &&
-            item.roleSessionId === 'role-session-instrument_admin'
-        ).length
-    )
-    .toBeGreaterThan(0);
+  await expect(page.getByText('切换应用角色', { exact: true })).toHaveCount(0);
 });
 
 test('renders platform mobile controls from declared field widgets', async ({ page }) => {

package/template/apps/web/field-protocol.e2e.html

@@ -3,6 +3,9 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="openxiangda-runtime-base" content="/" />
+    <meta name="openxiangda-app-code" content="field-protocol-fixture" />
+    <meta name="openxiangda-environment" content="preproduction" />
     <title>Field protocol acceptance</title>
   </head>
   <body>

package/template/apps/web/package.json

@@ -14,13 +14,10 @@
     "@ant-design/icons": "6.2.3",
     "@refinedev/core": "5.0.12",
     "antd": "6.4.3",
-    "dayjs": "1.11.18",
-    "docx-preview": "0.3.7",
-    "openxiangda-contracts": "2.0.0-alpha.43",
+    "openxiangda": "2.0.0-alpha.2",
     "react": "19.2.8",
     "react-dom": "19.2.8",
-    "react-router-dom": "7.8.2",
-    "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.3/xlsx-0.20.3.tgz"
+    "react-router-dom": "7.8.2"
   },
   "devDependencies": {
     "@playwright/test": "1.62.1",

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

@@ -1,67 +1,19 @@
-import { Refine } from '@refinedev/core';
 import React from 'react';
 import ReactDOM from 'react-dom/client';
-import { BrowserRouter, Navigate, Route, Routes } from 'react-router-dom';
-import { resourceDefinitions } from '../../../packages/contracts/src/generated.js';
-import { applicationProvider } from './data-provider';
-import { AppearanceProvider } from './appearance';
-import { GeneratedResourcePage } from './components/resource/GeneratedResourceCrud';
-import { FilePreviewPage } from './FilePreviewPage';
-import { EmptyApplicationPage } from './Shell';
-import { RuntimeBoundary } from './runtime';
-import { applicationBasename } from './runtime-meta';
-import { useGlobalRequestLoading } from './platform-client';
-import './styles.css';
-
-const codes = Object.keys(resourceDefinitions);
-const firstPath = codes[0] ? `/${codes[0]}` : '/';
-const adminEntry = codes.length ? (
-  <Navigate replace to={firstPath} />
-) : (
-  <EmptyApplicationPage />
-);
-
-function GlobalRequestLoading() {
-  const loading = useGlobalRequestLoading();
-  return loading ? (
-    <div
-      aria-label="页面请求进行中"
-      aria-valuetext="正在加载"
-      className="oxa-global-request-loading"
-      role="progressbar"
-    >
-      <span />
-    </div>
-  ) : null;
-}
-
-const resourceRoutes = codes.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" />} />,
-]);
+import { OpenXiangdaApplication } from 'openxiangda/react';
+import {
+  appCode,
+  appName,
+  resourceDefinitions,
+} from '../../../packages/contracts/src/generated.js';
+import 'openxiangda/react/styles.css';
 
 ReactDOM.createRoot(document.getElementById('root')!).render(
   <React.StrictMode>
-    <AppearanceProvider>
-      <GlobalRequestLoading />
-      <RuntimeBoundary>
-        <BrowserRouter basename={applicationBasename()}>
-          <Refine dataProvider={applicationProvider} resources={codes.map(code => ({ name: code, list: `/${code}`, create: `/${code}/new`, edit: `/${code}/:id/edit`, show: `/${code}/:id` }))}>
-            <Routes>
-              <Route path="/" element={adminEntry} />
-              <Route path="/admin" element={adminEntry} />
-              <Route path="/files/:resourceCode/:fileId/preview" element={<FilePreviewPage />} />
-              {resourceRoutes}
-            </Routes>
-          </Refine>
-        </BrowserRouter>
-      </RuntimeBoundary>
-    </AppearanceProvider>
+    <OpenXiangdaApplication
+      appCode={appCode}
+      appName={appName}
+      resourceDefinitions={resourceDefinitions}
+    />
   </React.StrictMode>,
 );