Skip to content

forwardport: cherry-pick PR #669 from csvw-4.2505.x-ee to main#823

Merged
Rain-1214 merged 3 commits intomainfrom
forwardport/pr669/main
Apr 29, 2026
Merged

forwardport: cherry-pick PR #669 from csvw-4.2505.x-ee to main#823
Rain-1214 merged 3 commits intomainfrom
forwardport/pr669/main

Conversation

@LZS911
Copy link
Copy Markdown
Collaborator

@LZS911 LZS911 commented Apr 29, 2026

Forward-port of changes from csvw-4.2505.x (EE) to CE main.

link https://github.com/actiontech/dms-ui-ee/pull/669

Cherry-pick was clean (1 conflict auto-resolved, see below).

变更内容

  1. 将步骤解析从"按位置"改为"按类型"提取:
    • review 节点按 type 过滤
    • execute 节点按 type 过滤
  2. 对 review 节点按 number 升序排序后再渲染,确保前端展示稳定为 review -> review -> execute 语义顺序
  3. 覆盖 workflow 与 data_export 两类流程
  4. 新增/更新单元测试,验证乱序输入下仍能正确提取 execute/review 节点

冲突解决说明

  • UpdateWorkflowTemplate/index.tsx:EE 版本从 @actiontech/shared 导入 BasicButton/BasicResult/PageHeader,CE 版本从 @actiontech/dms-kit 导入。解决方案:保留 CE 的导入结构,仅移除多余的 useTypedParams

需要关注

  • 快照文件(__snapshots__/index.test.tsx.snap)已还原为 CE 原始版本,新增测试用例的快照需在 CI 运行 --updateSnapshot 后自动生成。

Made with Cursor

@github-actions
Copy link
Copy Markdown

Coverage report

St.
Category Percentage Covered / Total
🟢 Statements 80.69% 29240/36237
🟡 Branches 62.92% 10897/17318
🟢 Functions 84.06% 9854/11722
🟢 Lines 84.69% 27937/32989

Test suite run success

3655 tests passing in 811 suites.

Report generated by 🧪jest coverage report action from 1aa6335

@Rain-1214 Rain-1214 merged commit 17d6c73 into main Apr 29, 2026
8 checks passed
@Rain-1214 Rain-1214 deleted the forwardport/pr669/main branch April 29, 2026 10:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants