openxiangda-cli 2.0.0-alpha.120 → 2.0.0-alpha.122

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openxiangda-cli",
-  "version": "2.0.0-alpha.120",
+  "version": "2.0.0-alpha.122",
   "description": "Thin application-level CLI for OpenXiangda 2.0.",
   "type": "module",
   "main": "./dist/index.js",
@@ -24,7 +24,7 @@
     "openxiangda-contracts": "2.0.0-alpha.58",
     "openxiangda-devkit-core": "2.0.0-alpha.76",
     "openxiangda-mcp": "2.0.0-alpha.76",
-    "openxiangda-skill-kit": "2.0.0-alpha.95"
+    "openxiangda-skill-kit": "2.0.0-alpha.97"
   },
   "devDependencies": {
     "tsx": "4.23.12",

package/template/apps/server/package.json

@@ -15,7 +15,7 @@
     "@nestjs/common": "11.1.29",
     "@nestjs/core": "11.1.29",
     "@nestjs/platform-fastify": "11.1.29",
-    "openxiangda": "2.0.0-alpha.34",
+    "openxiangda": "2.0.0-alpha.36",
     "reflect-metadata": "0.2.2",
     "rxjs": "7.8.2"
   },

package/template/apps/web/e2e/resource-experience-fixture.tsx

@@ -24,6 +24,36 @@ const field = (
 });
 
 const fields: DataResourceSurface['fields'] = {
+  departmentMultiple: field('构成部门', 'department.multiple', 'directory-department', {
+    list: true,
+    section: '组织信息',
+  }),
+  departmentSingle: field('牵头部门', 'department.single', 'directory-department', {
+    list: true,
+    section: '组织信息',
+  }),
+  userMultiple: field('小组成员', 'user.multiple', 'directory-user', {
+    list: true,
+    section: '组织信息',
+  }),
+  resourceMultiple: field('关联资源', 'resource-ref.multiple', 'resource', {
+    list: true,
+    section: '组织信息',
+    source: {
+      kind: 'resource',
+      resourceCode: 'resource-01',
+      labelField: 'name',
+      searchFields: ['name'],
+    },
+  }),
+  enabled: field('启用状态', 'boolean', 'switch', {
+    list: true,
+    section: '组织信息',
+  }),
+  displayOrder: field('显示顺序', 'number.integer', 'number', {
+    list: true,
+    section: '组织信息',
+  }),
   description: field('栏目说明', 'text.long', 'textarea', {
     section: '栏目设置',
   }),
@@ -107,6 +137,11 @@ const surface: DataResourceSurface = {
   mobile: { enabled: true },
 };
 
+const { enabled, displayOrder, ...remainingFields } = fields;
+const acceptanceSurface = new URLSearchParams(location.search).get('primary') === 'falsy'
+  ? { ...surface, fields: { enabled, displayOrder, ...remainingFields } }
+  : surface;
+
 const names = [
   '内容栏目',
   '内容文章',
@@ -135,7 +170,7 @@ const resourceDefinitions = Object.fromEntries(
           update: `app:openxiangda-application:data:${code}:update`,
           delete: `app:openxiangda-application:data:${code}:delete`,
         },
-        surface,
+        surface: acceptanceSurface,
       },
     ];
   })

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

@@ -21,6 +21,27 @@ const definitions = resourceDefinitions as Record<string, DeclaredResource>;
 const allCapabilities = [...capabilities] as string[];
 const runtimeBase = `/view/${appCode}`;
 
+const semanticResourceItem = {
+  id: 'group-1',
+  revision: 1,
+  updated_at: '2026-08-28T01:00:00.000Z',
+  departmentMultiple: [
+    { label: '信息技术部', value: 'department-it' },
+    { label: '人文艺术部', value: 'department-humanities' },
+  ],
+  departmentSingle: { label: '校工会', value: 'department-union' },
+  userMultiple: [
+    { label: '周明远', value: 'user-zhou', employeeNo: 'T1001' },
+    { label: '沈书雅', value: 'user-shen', employeeNo: 'T1002' },
+  ],
+  resourceMultiple: [
+    { label: '教职工之家', value: 'resource-home', resourceCode: 'resource-01' },
+    { label: '文体活动室', value: 'resource-activity', resourceCode: 'resource-01' },
+  ],
+  enabled: false,
+  displayOrder: 0,
+};
+
 function runtimeAuthorization(authorized: boolean, superAdmin = false) {
   return {
     schemaVersion: 'openxiangda.runtime-authorization/v2',
@@ -62,6 +83,7 @@ async function mockPlatform(
   authorized = true,
   targetRuntimeBase = runtimeBase,
   superAdmin = false,
+  queryItemsByResource: Record<string, Array<Record<string, unknown>>> = {},
 ) {
   let contextReads = 0;
   let avatarCompletes = 0;
@@ -162,6 +184,8 @@ async function mockPlatform(
     }
     const query = url.pathname.match(/\/native\/data\/([^/]+)\/query$/);
     if (query) {
+      const resourceCode = decodeURIComponent(query[1]);
+      const items = queryItemsByResource[resourceCode] || [];
       observed.push({ path: url.pathname, perspectiveCode });
       return route.fulfill({
         contentType: 'application/json',
@@ -169,11 +193,11 @@ async function mockPlatform(
           code: 200,
           data: {
             schemaVersion: 'openxiangda.native-data-page/v2',
-            resourceCode: decodeURIComponent(query[1]),
+            resourceCode,
             appVersionId: 'app-version-1',
             environmentHeadRevision: 1,
-            items: [],
-            total: 0,
+            items,
+            total: items.length,
             limit: 500,
             offset: 0,
           },
@@ -379,6 +403,82 @@ test('keeps the user portal and namespaced generated admin resource in one route
   await expect(page.locator('.oxa-sider')).toHaveCount(1);
 });
 
+test('renders canonical semantic labels in the real generated resource list', async ({ page }) => {
+  const resourceCode = 'resource-01';
+  await mockPlatform(page, true, runtimeBase, true, {
+    [resourceCode]: [semanticResourceItem],
+  });
+  await page.goto('/resource-experience.e2e.html');
+  await expect(page).toHaveURL(`/admin/resources/${resourceCode}`);
+  const row = page.getByRole('row').filter({ hasText: '信息技术部' });
+  await expect(row).toHaveCount(1);
+  for (const label of [
+    '信息技术部',
+    '人文艺术部',
+    '校工会',
+    '周明远',
+    '沈书雅',
+    '教职工之家',
+    '文体活动室',
+  ]) {
+    await expect(row).toContainText(label);
+  }
+  await expect(row).not.toContainText('[object Object]');
+  await expect(row.getByRole('cell').nth(5)).toHaveText('否');
+  await expect(row.getByRole('cell').nth(6)).toHaveText('0');
+  await page.screenshot({
+    fullPage: true,
+    path: 'test-results/generated-resource-semantic-values-desktop.png',
+  });
+  await row.getByText('信息技术部', { exact: true }).click();
+  await expect(page).toHaveURL(`/admin/resources/${resourceCode}/group-1`);
+});
+
+test('renders the canonical first field on the mobile generated list', async ({ page }) => {
+  const resourceCode = 'resource-01';
+  await mockPlatform(page, true, runtimeBase, true, {
+    [resourceCode]: [semanticResourceItem],
+  });
+  await page.setViewportSize({ width: 390, height: 844 });
+  await page.goto('/resource-experience.e2e.html');
+  await page.evaluate(resource => {
+    history.pushState({}, '', `/m/admin/resources/${resource}`);
+    window.dispatchEvent(new PopStateEvent('popstate'));
+  }, resourceCode);
+  const card = page.locator('.oxa-mobile-record-card').filter({ hasText: '信息技术部' });
+  await expect(card).toHaveCount(1);
+  await expect(card).toContainText('人文艺术部');
+  await expect(card).toContainText('校工会');
+  await expect(card).toContainText('周明远');
+  await expect(card).toContainText('教职工之家');
+  await expect(card).not.toContainText('[object Object]');
+  await page.screenshot({
+    fullPage: true,
+    path: 'test-results/generated-resource-semantic-values-mobile.png',
+  });
+  await card.getByText('信息技术部', { exact: true }).click();
+  await expect(page).toHaveURL(`/m/admin/resources/${resourceCode}/group-1`);
+});
+
+test('preserves false and zero when they lead the mobile generated list', async ({ page }) => {
+  const resourceCode = 'resource-01';
+  await mockPlatform(page, true, runtimeBase, true, {
+    [resourceCode]: [semanticResourceItem],
+  });
+  await page.setViewportSize({ width: 390, height: 844 });
+  await page.goto('/resource-experience.e2e.html?primary=falsy');
+  await page.evaluate(resource => {
+    history.pushState({}, '', `/m/admin/resources/${resource}`);
+    window.dispatchEvent(new PopStateEvent('popstate'));
+  }, resourceCode);
+  const card = page.locator('.oxa-mobile-record-card');
+  await expect(card).toHaveCount(1);
+  await expect(card.locator('.oxa-mobile-record-heading')).toHaveText('否');
+  await expect(card.locator('.oxa-mobile-record-fields > div').filter({ hasText: '显示顺序' })).toContainText('0');
+  await card.locator('.oxa-mobile-record-heading').getByText('否', { exact: true }).click();
+  await expect(page).toHaveURL(`/m/admin/resources/${resourceCode}/group-1`);
+});
+
 test('fails closed on a direct operation route without its capability', async ({ page }) => {
   await mockPlatform(page, false, runtimeBase, false);
   await page.goto('/resource-experience.e2e.html');

package/template/apps/web/package.json

@@ -14,7 +14,7 @@
     "@ant-design/icons": "6.2.3",
     "@refinedev/core": "5.0.12",
     "antd": "6.4.3",
-    "openxiangda": "2.0.0-alpha.34",
+    "openxiangda": "2.0.0-alpha.36",
     "react": "19.2.8",
     "react-dom": "19.2.8",
     "react-router-dom": "7.8.2"

package/template/package.json

@@ -22,7 +22,7 @@
     "build": "pnpm --recursive build"
   },
   "devDependencies": {
-    "openxiangda": "2.0.0-alpha.34",
+    "openxiangda": "2.0.0-alpha.36",
     "typescript": "5.9.3"
   }
 }