Skip to content

forwardport: cherry-pick EE PR #635 to main [AI-resolved]#804

Merged
Rain-1214 merged 3 commits intomainfrom
forwardport/pr635/main
Mar 27, 2026
Merged

forwardport: cherry-pick EE PR #635 to main [AI-resolved]#804
Rain-1214 merged 3 commits intomainfrom
forwardport/pr635/main

Conversation

@LZS911
Copy link
Copy Markdown
Collaborator

@LZS911 LZS911 commented Mar 27, 2026

Forward-port of changes from csvw-4.2505.x (原 EE PR actiontech/dms-ui-ee#635).

来源仓库:actiontech/dms-ui-ee
来源分支:csvw-4.2505.x

变更说明

  1. AI 洞察跳转按钮添加权限判断(checkPagePermission),无权限时隐藏「查看完整报告」和「AI 性能引擎」按钮
  2. 修复顶部公告覆盖 PageHeader(fixed 模式)的问题:CompanyNoticeBanner 改为 position: fixed,通过 CSS 变量 --notice-banner-height 动态调整内容区和 PageHeader 的 top 偏移
  3. SqlRewrittenExampleDrawer 添加示例描述文字(新增 i18n key)
  4. SqlRewrittenDrawer 支持外部传入 titleReact.ReactNode

⚠️ 此 PR 包含 AI 自动解决的冲突,请仔细 review

冲突文件

  • packages/base/src/page/Home/AIBanner/index.tsx

AI 解决说明

EE 从 @actiontech/shared 导入 BasicButton/BasicTag,CE 中这两个组件位于 @actiontech/dms-kit → 已修正为从 dms-kit 导入;PERMISSIONS/usePermission 均在 CE 的 @actiontech/shared/lib/features 中存在,保持不变。

快照说明

EE 侧的 3 个 [test]: update snapshot commits 已跳过(EE mock 数据与 CE 存在差异),需开发者在本地运行以下命令更新快照:

JEST_TEST_VERSION_ENV=ce pnpm jest --testPathPattern="AIBanner" --updateSnapshot

Checker 结果

ESLint ✅ Stylelint ✅ Prettier ✅
TypeScript 有 2 个 ErrorBoundary 预先存在的错误(CE main 本身问题,与本次变更无关)。

Made with Cursor

@github-actions
Copy link
Copy Markdown

Coverage report

St.
Category Percentage Covered / Total
🟢 Statements 92.73% 19280/20791
🟡 Branches 75.62% 7607/10060
🟢 Functions 92.68% 6974/7525
🟢 Lines 93.49% 18959/20280

Test suite run success

3628 tests passing in 810 suites.

Report generated by 🧪jest coverage report action from b438eee

@Rain-1214 Rain-1214 merged commit a2065b5 into main Mar 27, 2026
9 checks passed
@Rain-1214 Rain-1214 deleted the forwardport/pr635/main branch March 27, 2026 09:13
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