openxiangda-cli 2.0.0-alpha.177 → 2.0.0-alpha.178

package/package.json

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

package/template/apps/web/e2e/workflow-entry.spec.ts

@@ -17,7 +17,7 @@ const correctionFields = {
 async function workflowEntryPlatform(page: Page) {
   await mockPlatform(page, false, undefined, true);
   const state = {
-    admin: true,
+    admin: true, instanceStatus: 'approved',
     record: { id: 'record-1', revision: 8, title: '原业务申请', amount: 28600, decision: '已同意', internalNote: '不得显示', systemValue: '内部标识', attachments: [], richText: '<p>原说明</p>' },
     complexFields: false, uploads: [] as any[], childQueries: [] as any[], auditReads: 0,
     children: [
@@ -61,7 +61,7 @@ async function workflowEntryPlatform(page: Page) {
     if (path.endsWith(`/workflow/records/${resourceCode}/${state.record.id}/detail`)) {
       const childFields = { name: { label: '品名', type: 'text.short', widget: 'text', ...fieldCapabilities }, quantity: { label: '数量', type: 'number.integer', widget: 'number', ...fieldCapabilities }, detailNote: { label: '仅详情说明', type: 'text.short', widget: 'text', ...fieldCapabilities } };
       const fields = { ...correctionFields, decision: { label: '审批结论', type: 'text.short', widget: 'readonly', ...fieldCapabilities }, ...(state.complexFields ? { items: { label: '采购明细', type: 'subtable', widget: 'subtable', subtable: { resourceCode: 'purchase-lines', foreignKey: 'purchaseId', orderField: 'sortOrder', maxRows: 20 }, ...fieldCapabilities } } : {}) };
-      const instance = { id: instanceId, appCode, environmentKey: 'preproduction', status: 'approved', outcome: 'approved', startedAt: '2026-09-06T01:00:00Z', completedAt: '2026-09-06T02:38:00Z', dataRef: { resourceCode, recordId: state.record.id } };
+      const instance = { id: instanceId, appCode, environmentKey: 'preproduction', status: state.instanceStatus, outcome: state.instanceStatus === 'approved' ? 'approved' : null, startedAt: '2026-09-06T01:00:00Z', completedAt: state.instanceStatus === 'approved' ? '2026-09-06T02:38:00Z' : null, dataRef: { resourceCode, recordId: state.record.id } };
       const surface = { schemaVersion: 'openxiangda.workflow-surface/v2', protocolVersion: 'workflow_surface_v2', engineVersion: '2.0', surfaceRevision: 'a'.repeat(64), instanceSequence: 4, instance, task: null, operations: [],
         detailNavigation: { desktopPath: `/admin/purchases/${state.record.id}`, mobilePath: `/m/admin/purchases/${state.record.id}`, custom: false },
         presentation: { summary: { title: '采购申请', initiatorDisplayName: '陈晨', departmentDisplayName: '办公室', submittedAt: instance.startedAt }, businessDetail: {
@@ -538,3 +538,19 @@ test('mobile child editing selects form fields while readonly details retain the
     { operation: 'update', resourceCode: 'purchase-lines', id: 'line-1', expectedRevision: 3, data: { name: '移动明细修改' } },
   ]);
 });
+
+for (const mobile of [false, true]) {
+  test(`${mobile ? 'mobile' : 'desktop'} workflow editing is only offered after completion`, async ({ page }) => {
+    const state = await workflowEntryPlatform(page);
+    await page.setViewportSize(mobile ? { width: 390, height: 600 } : { width: 1440, height: 900 });
+    for (const status of ['running', 'returned', 'approved']) {
+      state.instanceStatus = status;
+      await page.goto(`/workflow-entry.e2e.html?mode=${mobile ? 'mobile' : 'desktop'}-detail`);
+      await expect(page.locator('.oxa-record-detail-header')).toBeVisible();
+      await expect(page.locator('.oxa-record-detail-header').getByRole('button', { name: '编辑', exact: true })).toHaveCount(status === 'approved' ? 1 : 0);
+      await expect(page.locator('.oxa-record-detail-footer').getByRole('button', { name: /关\s*闭/ })).toHaveCount(0);
+      await expect(page.locator('.oxa-workflow-current-node')).toHaveCount(0);
+    }
+    expect(state.correctionReads).toBe(0);
+  });
+}

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

@@ -816,46 +816,88 @@ test('renders a paged desktop work center from the current-user role union', asy
   }
 });
 
-test('a current task handler can send CC with the Surface instance command and multiple directory users', async ({ page }) => {
+for (const mobile of [false, true]) {
+for (const multiple of [false, true]) {
+test(`${mobile ? 'mobile' : 'desktop'} ${multiple ? 'CC' : 'transfer'} uses the standard member picker`, async ({ page }) => {
+  await page.setViewportSize(mobile ? { width: 320, height: 480 } : { width: 1440, height: 900 });
   await mockWorkflow(page);
   const current = detail();
+  const key = multiple ? 'cc' : 'transfer';
+  const label = multiple ? '抄送' : '转交';
+  const field = multiple ? 'userIds' : 'userId';
   const cc = {
-    key: 'cc', kind: 'workflow_command', label: '抄送', group: 'instance_control', audience: 'participant',
+    key, kind: 'workflow_command', label, group: 'instance_control', audience: 'participant',
     placement: 'overflow', emphasis: 'neutral', tone: 'neutral', visible: true, enabled: true,
-    inputSchema: { type: 'object', additionalProperties: false, required: ['userIds'], properties: {
-      userIds: { type: 'array', title: '抄送给', minItems: 1, maxItems: 20, uniqueItems: true, items: { type: 'string' } },
+    inputSchema: { type: 'object', additionalProperties: false, required: [field], properties: {
+      [field]: multiple ? { type: 'array', title: '抄送给', minItems: 1, maxItems: 20, uniqueItems: true, items: { type: 'string' } } : { type: 'string', title: '转交给' },
       comment: { type: 'string', title: '留言', maxLength: 4000 },
     } },
-    uiSchema: { presentation: 'dialog', confirmText: '确认抄送', properties: { userIds: { component: 'user_select', mode: 'multiple' } } },
-    execute: { method: 'POST', href: `/openxiangda-api/v2/applications/${appCode}/workflow/instances/${instanceId}/commands/cc`, idempotencyRequired: true },
+    uiSchema: { presentation: 'dialog', confirmText: `确认${label}`, properties: { [field]: { component: 'user_select', mode: multiple ? 'multiple' : 'single' } } },
+    execute: { method: 'POST', href: `/openxiangda-api/v2/applications/${appCode}/workflow/${multiple ? `instances/${instanceId}` : `tasks/${taskId}`}/commands/${key}`, idempotencyRequired: true },
     refresh: ['surface', 'timeline', 'work_center'],
   };
-  const augmented = { ...current, operations: [...current.operations, cc], surface: { ...current.surface, operations: [...current.surface.operations, cc] } };
+  const augmented = { ...current, operations: [...current.operations.filter(item => item.key !== key), cc], surface: { ...current.surface, operations: [...current.surface.operations.filter(item => item.key !== key), cc] } };
   await page.route('**/workflow/tasks/*/detail', route => route.fulfill({ json: envelope(augmented) }));
-  await page.route('**/directory/users?**', route => route.fulfill({ json: envelope({ items: [{ id: 'cc-user-1', label: '陈老师' }, { id: 'cc-user-2', label: '李老师' }], nextCursor: null }) }));
+  await page.route('**/directory/**', route => {
+    const tree = new URL(route.request().url()).pathname.endsWith('/tree');
+    const items = tree ? [] : ['陈老师', '李老师'].map((label, index) => ({ kind: 'user', id: `cc-user-${index + 1}`, label, selectable: true, snapshot: { value: `cc-user-${index + 1}`, label } }));
+    return route.fulfill({ json: envelope({ schemaVersion: 'openxiangda.directory-entry-page/v2', kind: tree ? 'department' : 'user', items, nextCursor: null }) });
+  });
   let writes = 0;
-  await page.route('**/workflow/instances/*/commands/cc', async route => {
+  await page.route(`**/commands/${key}`, async route => {
     writes += 1;
-    expect(route.request().postDataJSON()).toMatchObject({ commandToken: current.surface.commandToken, input: { userIds: ['cc-user-1', 'cc-user-2'], comment: '请查阅' } });
+    expect(route.request().postDataJSON()).toMatchObject({ commandToken: current.surface.commandToken, input: { [field]: multiple ? ['cc-user-1', 'cc-user-2'] : 'cc-user-1', comment: '请查阅' } });
     expect(route.request().postDataJSON().idempotencyKey).toBeTruthy();
     expect(route.request().headers()['x-openxiangda-csrf-token']).toBe('workflow-csrf-1');
     await route.fulfill({ json: envelope({ status: 'completed', advanced: false, instanceId }) });
   });
-  await page.goto(workflowFixtureUrl(`/tasks/${taskId}`));
+  await page.goto(workflowFixtureUrl(`${mobile ? '/m' : ''}/tasks/${taskId}`));
+  const footer = page.locator('.oxa-record-detail-footer');
+  await expect(footer).toBeVisible();
+  await expect(footer.getByRole('button', { name: /关\s*闭|编\s*辑/ })).toHaveCount(0);
+  if (mobile) {
+    const boxes = await footer.locator('.oxa-workflow-actions > button').evaluateAll(elements => elements.map(element => element.getBoundingClientRect().y));
+    expect(boxes).toHaveLength(3);
+    expect(Math.max(...boxes) - Math.min(...boxes)).toBeLessThan(2);
+  }
   await page.getByRole('button', { name: '更多操作' }).click();
-  await page.getByRole('button', { name: '抄送', exact: true }).click();
-  await page.getByRole('button', { name: '确认抄送' }).click();
+  await page.getByRole('button', { name: label, exact: true }).click();
+  await page.getByRole('button', { name: `确认${label}` }).click();
+  expect(writes).toBe(0);
+  await expect(page.getByRole('combobox')).toHaveCount(0);
+  if (mobile) {
+    const bounds = await page.locator('.oxa-workflow-operation-drawer .ant-drawer-content-wrapper').boundingBox();
+    expect(bounds!.y).toBeGreaterThanOrEqual(0);
+    expect(bounds!.y + bounds!.height).toBeLessThanOrEqual(481);
+    await expect(page.getByRole('button', { name: `确认${label}` })).toBeInViewport();
+  }
+  const trigger = page.locator(mobile ? '.oxa-mobile-choice-field button' : '.oxa-directory-trigger').first();
+  await trigger.click();
+  if (mobile) {
+    await expect(page.locator('.oxa-mobile-selection-sheet')).toBeInViewport();
+    await expect(page.getByRole('button', { name: '关闭', exact: true }).last()).toBeInViewport();
+    await expect(page.getByRole('button', { name: '确定', exact: true })).toBeInViewport();
+  }
+  await page.getByPlaceholder(mobile ? /搜索/ : '搜索成员姓名或工号').fill('老师');
+  await page.getByText('陈老师', { exact: true }).click();
+  await page.getByRole('button', { name: mobile ? '关闭' : /取\s*消/, exact: true }).last().click();
+  await page.getByRole('button', { name: `确认${label}` }).click();
   expect(writes).toBe(0);
-  const select = page.getByRole('dialog').getByRole('combobox');
-  await select.fill('老师');
-  await page.getByTitle('陈老师', { exact: true }).click();
-  await page.getByTitle('李老师', { exact: true }).click();
+  await trigger.click();
+  await page.getByPlaceholder(mobile ? /搜索/ : '搜索成员姓名或工号').fill('老师');
+  await page.getByText('陈老师', { exact: true }).click();
+  if (multiple) await page.getByText('李老师', { exact: true }).click();
+  await page.getByRole('button', { name: mobile ? `确定（${multiple ? 2 : 1}）` : /确\s*定/, exact: true }).last().click();
   await page.getByLabel('留言').fill('请查阅');
-  await page.getByRole('button', { name: '确认抄送' }).click();
+  await page.getByRole('button', { name: `确认${label}` }).click();
   await expect.poll(() => writes).toBe(1);
   await expect(page.getByRole('button', { name: /同\s*意/ })).toBeVisible();
 });
 
+}
+
+}
+
 test('renders the generic desktop and mobile application todo center without a second router', async ({
   page,
 }) => {

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.104",
+    "openxiangda": "2.0.0-alpha.105",
     "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.104",
+    "openxiangda": "2.0.0-alpha.105",
     "typescript": "5.9.3"
   }
 }