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

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

@@ -21,11 +21,132 @@ 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}`;
+  return {
+    schemaVersion: 'openxiangda.role-session-context/v2',
+    state: 'active',
+    environment: {
+      id: 'preproduction-id',
+      key: 'preproduction',
+      kind: 'preproduction',
+      activeAppVersionId: 'app-version-1',
+      headRevision: 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',
+    },
+    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',
+      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',
+      isAppSuperAdmin: false,
+      capabilities: authorized ? allCapabilities : [],
+      expiresAt: null,
+    },
+  };
+}
+
 async function mockPlatform(
   page: Page,
   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();
@@ -39,36 +160,69 @@ async function mockPlatform(
   });
   await page.route('**/service/**', async route => {
     const url = new URL(route.request().url());
-    if (url.pathname.endsWith('/native/current-user')) {
+    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')) {
+      contextReads += 1;
+      return route.fulfill({
+        contentType: 'application/json',
+        body: JSON.stringify({
+          code: 200,
+          data: roleContext(activeSubjectKey, authorized),
+        }),
+      });
+    }
+    const sourceQuery = url.pathname.match(
+      /\/native\/data-resources\/([^/]+)\/fields\/([^/]+)\/source\/query$/
+    );
+    if (sourceQuery) {
+      observed.push({ path: url.pathname, roleSessionId });
       return route.fulfill({
         contentType: 'application/json',
         body: JSON.stringify({
           code: 200,
           data: {
-            schemaVersion: 'openxiangda.current-user/v2',
-            appCode,
-            environment: {
-              id: 'preproduction-id',
-              key: 'preproduction',
-              activeAppVersionId: 'app-version-1',
-              headRevision: 1,
-              authzRevisionId: 'authz-1',
-              authzVersion: 1,
-              scopeDataVersion: 'scope-1',
-            },
-            principal: {
-              type: 'user',
-              userId: 'acceptance-user',
-              roleCodes: [],
-              capabilityCodes: authorized ? allCapabilities : [],
-              isAppSuperAdmin: authorized,
-            },
+            schemaVersion: 'openxiangda.data-field-source-page/v2',
+            resourceCode: decodeURIComponent(sourceQuery[1]),
+            fieldCode: decodeURIComponent(sourceQuery[2]),
+            items: [],
+            nextCursor: null,
           },
         }),
       });
     }
     const query = url.pathname.match(/\/native\/data\/([^/]+)\/query$/);
     if (query) {
+      observed.push({ path: url.pathname, roleSessionId });
       return route.fulfill({
         contentType: 'application/json',
         body: JSON.stringify({
@@ -86,18 +240,33 @@ async function mockPlatform(
         }),
       });
     }
-    if (url.pathname.includes('/native/directory/')) {
+    if (url.pathname.includes('/directory/')) {
+      observed.push({ path: url.pathname, roleSessionId });
       return route.fulfill({
         contentType: 'application/json',
         body: JSON.stringify({ code: 200, data: { items: [], nextCursor: null } }),
       });
     }
+    if (url.pathname.includes('/openxiangda-app-api/v2/')) {
+      observed.push({ path: url.pathname, roleSessionId });
+      return route.fulfill({
+        contentType: 'application/json',
+        body: JSON.stringify({ code: 200, data: { status: 'ok' } }),
+      });
+    }
     return route.fulfill({
       status: 404,
       contentType: 'application/json',
       body: JSON.stringify({ code: 404, message: 'not mocked' }),
     });
   });
+  return {
+    observed,
+    switches,
+    get contextReads() {
+      return contextReads;
+    },
+  };
 }
 
 test('renders the compiled desktop resource contract and shared workbench', async ({ page }) => {
@@ -145,6 +314,75 @@ 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 }) => {
+  const platform = await mockPlatform(page);
+  await page.goto(`${runtimeBase}/admin`);
+  if (codes.length) {
+    await expect(page.locator('.oxa-list-surface')).toBeVisible();
+  } else {
+    await expect(page.getByText('还没有声明数据资源')).toBeVisible();
+  }
+
+  await page.evaluate(async () => {
+    const client = await import('/src/platform-client.ts');
+    await client.searchResource('acceptance-resource', 'name', {
+      keyword: '显微镜',
+    });
+    await client.searchDirectory('user', { keyword: '老师' });
+    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
+      )
+    )
+  ).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);
+  await page.locator('.oxa-current-user').click();
+  await expect(page.locator('.oxa-user-dropdown-roles')).toContainText(
+    '仪器管理员'
+  );
+  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);
+});
+
 test('renders platform mobile controls from declared field widgets', async ({ page }) => {
   const candidate = codes
     .map(code => ({ code, definition: definitions[code] }))

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

@@ -0,0 +1,12 @@
+<!doctype html>
+<html lang="zh-CN">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Field protocol acceptance</title>
+  </head>
+  <body>
+    <div id="root"></div>
+    <script type="module" src="/e2e/field-protocol-fixture.tsx"></script>
+  </body>
+</html>

package/template/apps/web/package.json

@@ -16,7 +16,7 @@
     "antd": "6.4.3",
     "dayjs": "1.11.18",
     "docx-preview": "0.3.7",
-    "openxiangda-contracts": "2.0.0-alpha.39",
+    "openxiangda-contracts": "2.0.0-alpha.43",
     "react": "19.2.8",
     "react-dom": "19.2.8",
     "react-router-dom": "7.8.2",

package/template/apps/web/playwright.config.ts

@@ -16,7 +16,9 @@ export default defineConfig({
         env: {
           OPENXIANGDA_WEB_PORT: String(e2ePort),
           OPENXIANGDA_ENVIRONMENT_KEY: 'production',
-          OPENXIANGDA_DEV_PROXY: 'http://127.0.0.1:7001',
+          OPENXIANGDA_DEV_PROXY:
+            process.env.OPENXIANGDA_E2E_PLATFORM_URL ||
+            'http://127.0.0.1:7001',
         },
       },
 });

package/template/apps/web/scripts/check.mjs

@@ -14,10 +14,11 @@ visit(join(root, 'src'));
 const lines = files.reduce((total, file) => total + readFileSync(file, 'utf8').split(/\r?\n/).length, 0);
 // The shared Surface renderer is deliberately counted as application source;
 // keep its small budget explicit instead of hiding it in generated output.
-if (files.length > 20) throw new Error(`WEB_SOURCE_FILE_BUDGET_EXCEEDED:${files.length}>20`);
-// Mobile shells, Surface filters, generated resource CRUD, atomic batch actions,
-// and import preview are shared application infrastructure.
-if (lines > 6_000) throw new Error(`WEB_BUSINESS_LOC_BUDGET_EXCEEDED:${lines}>6000`);
+// Field Kit families are separate modules so a semantic field does not add a
+// branch to one universal renderer. Keep explicit ceilings while allowing the
+// complete 30-field standard kit to remain decomposed.
+if (files.length > 36) throw new Error(`WEB_SOURCE_FILE_BUDGET_EXCEEDED:${files.length}>36`);
+if (lines > 10_000) throw new Error(`WEB_BUSINESS_LOC_BUDGET_EXCEEDED:${lines}>10000`);
 const source = files.map((file) => readFileSync(file, 'utf8')).join('\n');
 for (const marker of [
   '@umijs/',
@@ -26,7 +27,9 @@ for (const marker of [
   'instrument_query',
   'instrument_save',
   'function.invoke',
-  'role' + '-session',
+  'authorization' + '-mode',
+  'focused' + '_role',
+  '/native/current' + '-user',
   'college-' + 'am',
   'user-' + 'wang',
   'dept-' + 'am-test',

package/template/apps/web/scripts/verify-build.mjs

@@ -13,7 +13,7 @@ const gzip = javascript.reduce(
   (bytes, file) => bytes + gzipSync(readFileSync(file), { level: 9 }).byteLength,
   0
 );
-if (gzip > 750_000) throw new Error(`WEB_JS_GZIP_BUDGET_EXCEEDED:${gzip}>750000`);
+if (gzip > 800_000) throw new Error(`WEB_JS_GZIP_BUDGET_EXCEEDED:${gzip}>800000`);
 if (names.some(name => name.endsWith('.map'))) throw new Error('WEB_SOURCE_MAP_FORBIDDEN');
 const html = readFileSync(join(dist, 'index.html'), 'utf8');
 if (!html.includes('<div id="root"></div>')) throw new Error('WEB_ROOT_MISSING');