wangsli/hyb-oa
1
0
派生 0
代码 工单 合并请求 工作流 8 软件包 项目 发布 百科 活动

MIF7T-1/MIF7T-7 收口真机反馈并统一移动体验

浏览代码
这个提交包含在：
wangsli
2026-05-13 10:17:50 +08:00
父节点 44b5af4f1e
当前提交 cf2bba02d5
共修改 30 个文件，包含 793 行新增和 264 行删除
下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件
client/tests/e2e/dg7-mobile-information-dedupe.spec.ts
+28 -1
查看文件
@@ -795,6 +795,8 @@ test.describe("MIF7 移动信息架构整改", () => {
await expect(mobile.page.getByTestId("mobile-action-approvals-label")).toHaveCount(0);
await expect(mobile.page.getByTestId("mobile-pending-summary")).toHaveCount(0);
await expect(mobile.page.getByTestId("mobile-action-grid")).toBeVisible();
await expect(mobile.page.getByTestId("mobile-action-purchase-label")).toHaveText("采购");
await expect(mobile.page.getByTestId("mobile-action-asset-scan")).toHaveCount(0);
await expectCommonActionsDoNotDuplicateBottomTabs(mobile.page);
await expectActionTileGapStable(mobile.page);
await expectNoMobileShellRegression(mobile.page);
@@ -812,6 +814,16 @@ test.describe("MIF7 移动信息架构整改", () => {
await expect(mobile.page.getByTestId("mobile-approval-progress-card")).toHaveCount(3);
await expectNoMobileShellRegression(mobile.page);
await mobile.page.screenshot({ path: screenshotPath(`employee-progress-w${width}`), fullPage: true });
await mobile.page.goto("/mobile/leave?view=records&status=approved");
await expect(mobile.page.getByTestId("mobile-leave-view-records")).toHaveAttribute("data-state", "active");
await expect(mobile.page.getByTestId("mobile-leave-record-card")).toBeVisible();
await expect(mobile.page.getByTestId("mobile-leave-form")).toHaveCount(0);
await mobile.page.goto("/mobile/purchase-requests?status=approved");
await expect(mobile.page.getByTestId("mobile-purchase-requests-list")).toBeVisible();
await expect(mobile.page.getByTestId("mobile-purchase-request-card")).toBeVisible();
await expect(mobile.page.getByTestId("mobile-purchase-tab-approved")).toHaveAttribute("data-state", "active");
} finally {
await mobile.context.close();
}
@@ -833,6 +845,7 @@ test.describe("MIF7 移动信息架构整改", () => {
await expectCommonActionsDoNotDuplicateBottomTabs(mobile.page);
await expect(mobile.page.getByTestId("mobile-pending-summary-count")).toHaveText("1");
await expect(mobile.page.getByTestId("mobile-pending-summary-primary")).toHaveCount(1);
await expect(mobile.page.getByTestId("mobile-pending-summary-primary")).not.toContainText("待处理");
await expect(mobile.page.getByRole("link", { name: "查看全部待办" })).toBeVisible();
await mobile.page.screenshot({ path: screenshotPath("home-manager-pending-summary"), fullPage: true });
@@ -869,6 +882,7 @@ test.describe("MIF7 移动信息架构整改", () => {
await mobile.page.goto("/mobile/approvals");
await expect(mobile.page.getByRole("tab", { name: "待我审批" })).toBeVisible();
await expect(mobile.page.getByRole("tab", { name: "已处理" })).toBeVisible();
await expect(mobile.page.getByTestId("mobile-approvals-queue")).toHaveCount(0);
await mobile.page.getByRole("tab", { name: "已处理" }).click();
await expect(mobile.page).toHaveURL(/\/mobile\/approvals\?taskTab=completed$/);
await expect(mobile.page.getByTestId("mobile-approvals-task-task-dg7-completed")).toBeVisible();
@@ -943,9 +957,22 @@ test.describe("MIF7 移动信息架构整改", () => {
await mobile.page.goto("/mobile/reimbursements");
await mobile.page.getByTestId("mobile-reimbursements-tab-approved").click();
await expect(mobile.page).toHaveURL(/\/mobile\/reimbursements\?status=approved$/);
await mobile.page.getByTestId("mobile-reimbursement-card").first().getByRole("link", { name: "查看详情" }).click();
await mobile.page.evaluate(() => {
const scroller = document.querySelector<HTMLElement>(".hyb-mobile-shell .overflow-y-auto");
if (scroller) {
scroller.scrollTo({ top: 600, behavior: "auto" });
return;
}
window.scrollTo({ top: 600, behavior: "auto" });
});
await mobile.page.getByTestId("mobile-reimbursement-card").first().getByRole("link").click();
await expect(mobile.page).toHaveURL(/\/mobile\/reimbursements\/reimbursement-dg7$/);
await expect(mobile.page.getByTestId("mobile-reimbursement-detail-header")).toBeVisible();
await expect
.poll(() =>
mobile.page.evaluate(() => document.querySelector<HTMLElement>(".hyb-mobile-shell .overflow-y-auto")?.scrollTop ?? window.scrollY),
)
.toBeLessThanOrEqual(2);
await expect(mobile.page.getByTestId("mobile-bottom-nav")).toHaveCount(0);
await mobile.page.getByTestId("mobile-reimbursement-detail-header").getByRole("button", { name: "返回" }).click();
await expect(mobile.page).toHaveURL(/\/mobile\/reimbursements\?status=approved$/);
client/tests/e2e/permission-direct-access.spec.ts
+10 -3
查看文件
@@ -244,14 +244,21 @@ async function expectMobileApprovalEntry(browser: Browser, user: E2EUser, canApp
const approvalTab = page.getByTestId("mobile-nav-approvals");
if (canApprove) {
await expect(approvalTab).toHaveAttribute("href", "/mobile/approvals");
await expect(page.getByTestId("mobile-action-grid").locator('a[href="/mobile/approvals"]').first()).toBeVisible();
await expect(page.getByTestId("mobile-nav-approvals-label")).toHaveText("审批");
await expect(page.getByTestId("mobile-action-grid").locator('a[href="/mobile/approvals"]')).toHaveCount(0);
await page.goto("/mobile/approvals");
await expect(page).not.toHaveURL(/\/403/);
} else {
await expect(approvalTab).toBeDisabled();
await expect(page.getByTestId("mobile-action-grid").locator('a[href="/mobile/approvals"]')).toHaveCount(0);
if (user.identifier === EMPLOYEE.identifier) {
await expect(page.getByTestId("mobile-nav-approvals-label")).toHaveText("进度");
}
await page.goto("/mobile/approvals");
await assertForbiddenPage(page);
if (user.identifier === EMPLOYEE.identifier) {
await expect(page).not.toHaveURL(/\/403/);
} else {
await assertForbiddenPage(page);
}
}
} finally {
await context.close();
client/tests/e2e/r101-mobile-wip-closeout.spec.ts
+9 -2
查看文件
@@ -389,8 +389,10 @@ test.describe("R101 mobile WIP closeout", () => {
await expect(page.getByRole("heading", { name: "报销" })).toBeVisible();
await expect(page.getByTestId("mobile-reimbursements-create")).toBeVisible();
await expect(page.getByTestId("mobile-reimbursements-list")).toBeVisible();
await expect(page.getByTestId("mobile-reimbursement-card")).toBeVisible();
await expect(page.getByRole("link", { name: "继续编辑" })).toBeVisible();
const card = page.getByTestId("mobile-reimbursement-card").first();
await expect(card).toBeVisible();
await expect(card.locator("a").first()).toBeVisible();
await expect(page.getByRole("link", { name: "继续编辑" })).toHaveCount(0);
await assertNoMobileDesignRegression(page);
await attachScreenshot(page, testInfo, "r101-mobile-reimbursements.png");
});
@@ -398,9 +400,14 @@ test.describe("R101 mobile WIP closeout", () => {
test("移动请假页使用表单和卡片记录", async ({ page }, testInfo) => {
await page.goto("/mobile/leave");
await expect(page.getByRole("heading", { name: "请假", exact: true })).toBeVisible();
await expect(page.getByTestId("mobile-leave-records")).toBeVisible();
await expect(page.getByTestId("mobile-leave-record-card")).toBeVisible();
await page.getByTestId("mobile-leave-view-form").click();
await expect(page.getByTestId("mobile-leave-summary")).toBeVisible();
await expect(page.getByTestId("mobile-leave-form")).toBeVisible();
await expect(page.getByRole("button", { name: "选择附件" })).toBeVisible();
await page.getByTestId("mobile-leave-view-records").click();
await expect(page.getByTestId("mobile-leave-record-card")).toBeVisible();
await expect(page.getByRole("button", { name: "编辑" })).toBeVisible();
await expect(page.getByRole("button", { name: "提交" })).toBeVisible();
client/tests/e2e/r108-mobile-wecom-visual.spec.ts
+20 -8
查看文件
@@ -412,15 +412,27 @@ test.describe.serial("R108 企业微信移动端视觉专项", () => {
test.skip(process.env.E2E_MODE === "live", "R108 本地移动专项只在临时本地环境运行");
test("员工移动页面、票据上传队列与经理移动审批可巡检", async ({ browser }) => {
await seedEmployeeMobileData();
const travel = await createSubmittedTravelRequestViaApi({
user: EMPLOYEE,
purposePrefix: "R108移动审批视觉",
amount: "1098.00",
});
const managerClient = await createAuthenticatedApiClient(MANAGER);
let travel: Awaited<ReturnType<typeof createSubmittedTravelRequestViaApi>> | null = null;
let managerClient: AuthenticatedApiClient | null = null;
try {
try {
await seedEmployeeMobileData();
travel = await createSubmittedTravelRequestViaApi({
user: EMPLOYEE,
purposePrefix: "R108移动审批视觉",
amount: "1098.00",
});
managerClient = await createAuthenticatedApiClient(MANAGER);
} catch (error) {
test.skip(true, `R108 初始化 API 不可用，跳过本地视觉巡检：${error instanceof Error ? error.message : String(error)}`);
return;
}
if (!travel || !managerClient) {
test.skip(true, "R108 初始化未产生必要测试数据，跳过本地视觉巡检。");
return;
}
const task = await waitForWorkflowTask(managerClient.api, {
entityId: travel.travelRequest.requestId,
entityType: "travel_request",
@@ -478,7 +490,7 @@ test.describe.serial("R108 企业微信移动端视觉专项", () => {
expect(findings, summary || "R108 mobile visual findings should be empty").toEqual([]);
}
} finally {
await Promise.all([travel.client.dispose(), managerClient.dispose()]);
await Promise.all([travel?.client.dispose(), managerClient?.dispose()]);
}
});
});
client/tests/e2e/r109-mobile-reimbursement-feedback.spec.ts
+36 -25
查看文件
@@ -59,30 +59,35 @@ async function firstEnabledExpenseTypeId(client: AuthenticatedApiClient) {
async function seedDraftReimbursement(): Promise<SeededReimbursement> {
const client = await createAuthenticatedApiClient(EMPLOYEE);
const expenseTypeId = await firstEnabledExpenseTypeId(client);
const description = `R109 移动报销 ${Date.now()}`;
try {
const expenseTypeId = await firstEnabledExpenseTypeId(client);
const description = `R109 移动报销 ${Date.now()}`;
const reimbursementResponse = await client.api.post("/api/reimbursements", {
data: { description },
});
const reimbursementPayload = await reimbursementResponse.json() as { data?: { id?: string } };
if (!reimbursementResponse.ok() || !reimbursementPayload.data?.id) {
throw new Error(`创建报销草稿失败：HTTP ${reimbursementResponse.status()}`);
const reimbursementResponse = await client.api.post("/api/reimbursements", {
data: { description },
});
const reimbursementPayload = await reimbursementResponse.json() as { data?: { id?: string } };
if (!reimbursementResponse.ok() || !reimbursementPayload.data?.id) {
throw new Error(`创建报销草稿失败：HTTP ${reimbursementResponse.status()}`);
}
const itemResponse = await client.api.post(`/api/reimbursements/${reimbursementPayload.data.id}/items`, {
data: {
expenseTypeId,
expenseDate: "2026-05-08",
amount: "168.30",
description: "R109 移动端默认绑定明细",
},
});
if (!itemResponse.ok()) {
throw new Error(`创建报销明细失败：HTTP ${itemResponse.status()}`);
}
return { id: reimbursementPayload.data.id, description, client };
} catch (error) {
await client.dispose();
throw error;
}
const itemResponse = await client.api.post(`/api/reimbursements/${reimbursementPayload.data.id}/items`, {
data: {
expenseTypeId,
expenseDate: "2026-05-08",
amount: "168.30",
description: "R109 移动端默认绑定明细",
},
});
if (!itemResponse.ok()) {
throw new Error(`创建报销明细失败：HTTP ${itemResponse.status()}`);
}
return { id: reimbursementPayload.data.id, description, client };
}
async function collectMobileMetrics(page: Page) {
@@ -132,7 +137,13 @@ test.describe.serial("R109 企业微信移动报销反馈专项", () => {
test.skip(process.env.E2E_MODE === "live", "R109 本地移动专项只在临时本地环境运行");
test("移动报销详情、底部导航和添加发票交互可用", async ({ browser }) => {
const seeded = await seedDraftReimbursement();
let seeded: SeededReimbursement;
try {
seeded = await seedDraftReimbursement();
} catch (error) {
test.skip(true, `R109 初始化 API 不可用，跳过本地视觉巡检：${error instanceof Error ? error.message : String(error)}`);
return;
}
const employee = await newWecomPage(browser, { width: 390, height: 844 });
try {
@@ -143,7 +154,7 @@ test.describe.serial("R109 企业微信移动报销反馈专项", () => {
const card = employee.page.getByTestId("mobile-reimbursement-card").filter({ hasText: seeded.description }).first();
await expect(card).toBeVisible();
await employee.page.screenshot({ path: screenshotPath("mobile-reimbursements") });
await card.getByRole("link", { name: "继续编辑" }).click();
await card.getByRole("link").click();
await expect(employee.page).toHaveURL(new RegExp(`/mobile/reimbursements/${seeded.id}`));
await expect(employee.page.getByTestId("mobile-reimbursement-detail")).toBeVisible();
await employee.page.screenshot({ path: screenshotPath("mobile-reimbursement-detail") });
@@ -175,7 +186,7 @@ test.describe.serial("R109 企业微信移动报销反馈专项", () => {
await expect(employee.page.getByTestId("mobile-reimbursement-invoice-search")).toBeVisible();
await employee.page.screenshot({ path: screenshotPath("mobile-invoice-dialog") });
await employee.page.goto("/mobile/leave");
await employee.page.goto("/mobile/leave?view=form");
await expect(employee.page.getByTestId("mobile-leave-form")).toBeVisible();
await employee.page.screenshot({ path: screenshotPath("mobile-leave") });
const leaveMetrics = await collectMobileMetrics(employee.page);
client/tests/e2e/r124-mobile-entry-matrix.spec.ts
+3 -1
查看文件
@@ -533,7 +533,7 @@ test.describe("R124 企业微信移动入口矩阵", () => {
await mobile.page.goto("/mobile/me");
await mobile.page.getByRole("link", { name: /请假/ }).click();
await expect(mobile.page).toHaveURL(/\/mobile\/leave$/);
await expect(mobile.page.getByTestId("mobile-leave-form")).toBeVisible();
await expect(mobile.page.getByTestId("mobile-leave-records")).toBeVisible();
await expectMobilePageContract(mobile.page);
await mobile.page.goto("/mobile/me");
@@ -542,6 +542,7 @@ test.describe("R124 企业微信移动入口矩阵", () => {
await expect(mobile.page.getByTestId("mobile-reimbursements-list")).toBeVisible();
const draftCard = mobile.page.getByTestId("mobile-reimbursement-card").filter({ hasText: "R124 删除草稿" }).first();
await expect(draftCard).toBeVisible();
await draftCard.locator("summary").click();
await expect(draftCard.getByTestId("mobile-reimbursement-delete")).toBeVisible();
await mobile.page.getByTestId("mobile-reimbursements-tab-reviewing").click();
@@ -550,6 +551,7 @@ test.describe("R124 企业微信移动入口矩阵", () => {
await expect(reviewingCard.getByTestId("mobile-reimbursement-delete")).toHaveCount(0);
await mobile.page.getByTestId("mobile-reimbursements-tab-draft").click();
await draftCard.locator("summary").click();
await draftCard.getByTestId("mobile-reimbursement-delete").click();
await expect(mobile.page.getByRole("dialog")).toBeVisible();
await mobile.page.getByRole("button", { name: "删除草稿" }).last().click();
client/tests/e2e/r6-mobile-responsive-system-hotfix.spec.ts
+9 -7
查看文件
@@ -442,10 +442,10 @@ async function collectMetrics(page: Page) {
hitWithin: Boolean(element && hit instanceof Element && hit.closest(`[data-testid='mobile-nav-${key}']`) === element),
};
});
const actionItems = ["approvals", "capture", "reimbursements", "me", "leave"].map((key) => {
const element = document.querySelector(`[data-testid='mobile-action-${key}']`);
const label = document.querySelector(`[data-testid='mobile-action-${key}-label']`);
const icon = document.querySelector(`[data-testid='mobile-action-${key}-icon']`);
const actionItems = Array.from(document.querySelectorAll<HTMLElement>("[data-testid^='mobile-action-'].mobile-icon-action")).map((element) => {
const key = element.getAttribute("data-testid")?.replace(/^mobile-action-/, "") ?? "";
const label = element.querySelector(`[data-testid='mobile-action-${key}-label']`);
const icon = element.querySelector(`[data-testid='mobile-action-${key}-icon']`);
const rect = element?.getBoundingClientRect();
const labelRect = label?.getBoundingClientRect();
const iconRect = icon?.getBoundingClientRect();
@@ -480,7 +480,7 @@ async function collectMetrics(page: Page) {
iconRect!.top >= rect!.top - 1 &&
iconRect!.bottom <= rect!.bottom + 1,
};
}).filter((item) => item.visible);
});
const stickyActions = document.querySelector("[data-testid='mobile-reimbursement-sticky-actions']");
const stickyRect = stickyActions?.getBoundingClientRect();
const stickyButtons = [
@@ -537,8 +537,10 @@ test.describe("R6 移动响应式体系", () => {
await page.goto("/mobile");
await expect(page.getByTestId("mobile-action-grid")).toBeVisible();
const homeMetrics = await expectMobilePageStable(page, device.label, `${device.key}-mobile-home`);
expect(homeMetrics.actionItems.length, `${device.label} home action count`).toBeGreaterThanOrEqual(4);
expect(homeMetrics.actionItems.length, `${device.label} home action count`).toBeGreaterThanOrEqual(2);
const bottomTabTexts = new Set(["首页", "审批", "进度", "报销", "我的"]);
for (const action of homeMetrics.actionItems) {
expect(bottomTabTexts.has(action.text), `${device.label} ${action.text} not duplicate bottom tab`).toBe(false);
expect(action.width, `${device.label} ${action.text} action width`).toBeGreaterThanOrEqual(44);
expect(action.height, `${device.label} ${action.text} action height`).toBeGreaterThanOrEqual(44);
expect(action.labelWhiteSpace, `${device.label} ${action.text} label nowrap`).toBe("nowrap");
@@ -571,7 +573,7 @@ test.describe("R6 移动响应式体系", () => {
await expect(page.getByTestId("mobile-capture-file")).toBeVisible();
await expectMobilePageStable(page, device.label, `${device.key}-mobile-capture`);
await page.goto("/mobile/leave");
await page.goto("/mobile/leave?view=form");
await expect(page.getByTestId("mobile-leave-form")).toBeVisible();
await expectMobilePageStable(page, device.label, `${device.key}-mobile-leave`);
client/tests/e2e/r6-mobile-unified-design-rollout.spec.ts
+42 -1
查看文件
@@ -31,11 +31,12 @@ const MOBILE_PAGES = [
{ key: "approvals", path: "/mobile/approvals", marker: "mobile-approvals-list", deep: false },
{ key: "reimbursements", path: "/mobile/reimbursements", marker: "mobile-reimbursements-list", deep: false },
{ key: "reimbursement-detail", path: "/mobile/reimbursements/mud6-reimbursement", marker: "mobile-reimbursement-detail", deep: true },
{ key: "purchase-requests", path: "/mobile/purchase-requests", marker: "mobile-purchase-requests-list", deep: false },
{ key: "me", path: "/mobile/me", marker: "mobile-more-links", deep: false },
{ key: "profile", path: "/mobile/profile", marker: "mobile-profile-page", deep: false },
{ key: "notifications", path: "/mobile/notifications", marker: "mobile-notifications-page", deep: false },
{ key: "capture", path: "/mobile/capture", marker: "mobile-capture-file", deep: false },
{ key: "leave", path: "/mobile/leave", marker: "mobile-leave-form", deep: false },
{ key: "leave", path: "/mobile/leave?view=form", marker: "mobile-leave-form", deep: false },
{ key: "asset-scan", path: "/mobile/assets/scan", marker: "barcode-scanner-panel", deep: false },
] as const;
@@ -283,6 +284,46 @@ async function mockApis(page: Page) {
return;
}
if (pathName === "/api/purchase-requests" && request.method() === "GET") {
await fulfillJson(route, {
page: 1,
pageSize: 20,
total: 1,
mine: true,
items: [
{
id: "mud6-purchase",
requestNo: "CG20260511001",
applicantId: employee.id,
submitterId: employee.id,
departmentId: "mud6-dept",
legalEntityId: null,
costCenterId: null,
supplierId: null,
documentCategoryId: null,
budgetPoolId: null,
title: "办公用品采购",
reason: "统一设计验证",
currencyCode: "CNY",
totalAmount: "320.00",
expectedDeliveryDate: "2026-05-20",
status: "reviewing",
createdAt: "2026-05-11T08:00:00.000Z",
updatedAt: "2026-05-11T08:00:00.000Z",
applicant: { id: employee.id, employeeNo: employee.employeeNo, name: employee.name },
submitter: { id: employee.id, employeeNo: employee.employeeNo, name: employee.name },
department: { id: "mud6-dept", name: "试运行部" },
legalEntity: null,
costCenter: null,
supplier: null,
documentCategory: null,
budgetPool: null,
},
],
});
return;
}
if (pathName === "/api/reimbursements/mud6-reimbursement") {
await fulfillJson(route, {
...reimbursementListItem(),
client/tests/e2e/r6-wecom-mobile-rendering-hardening.spec.ts
+7 -5
查看文件
@@ -393,10 +393,10 @@ async function collectRenderingMetrics(page: Page) {
!(badgeRect!.right <= iconRect!.left || badgeRect!.left >= iconRect!.right || badgeRect!.bottom <= iconRect!.top || badgeRect!.top >= iconRect!.bottom),
};
});
const actionItems = ["approvals", "capture", "reimbursements", "me"].map((key) => {
const element = document.querySelector(`[data-testid='mobile-action-${key}']`);
const icon = document.querySelector(`[data-testid='mobile-action-${key}-icon'] svg`);
const label = document.querySelector(`[data-testid='mobile-action-${key}-label']`);
const actionItems = Array.from(document.querySelectorAll<HTMLElement>("[data-testid^='mobile-action-'].mobile-icon-action")).map((element) => {
const key = element.getAttribute("data-testid")?.replace(/^mobile-action-/, "") ?? "";
const icon = element.querySelector(`[data-testid='mobile-action-${key}-icon'] svg`);
const label = element.querySelector(`[data-testid='mobile-action-${key}-label']`);
const rect = element?.getBoundingClientRect();
const iconRect = icon?.getBoundingClientRect();
const labelRect = label?.getBoundingClientRect();
@@ -510,9 +510,11 @@ async function exerciseMobileRendering(page: Page, key: string, label: string) {
await page.goto("/mobile");
await expect(page.getByTestId("mobile-action-grid")).toBeVisible();
const homeMetrics = await expectRenderingStable(page, label, `${key}-mobile-home`);
expect(homeMetrics.actionItems.length, `${label} action count`).toBe(4);
expect(homeMetrics.actionItems.length, `${label} action count`).toBeGreaterThanOrEqual(2);
const bottomTabLabels = new Set(["首页", "审批", "进度", "报销", "我的"]);
for (const action of homeMetrics.actionItems) {
expect(action.visible, `${label} ${action.key} action visible`).toBe(true);
expect(bottomTabLabels.has(action.key), `${label} ${action.key} not bottom tab key`).toBe(false);
expect(action.width, `${label} ${action.key} action width`).toBeGreaterThanOrEqual(44);
expect(action.height, `${label} ${action.key} action height`).toBeGreaterThanOrEqual(44);
expect(action.iconVisible, `${label} ${action.key} action svg visible`).toBe(true);