Skip to content

forwardport: cherry-pick EE PR #636 to main [AI-resolved]#803

Merged
Rain-1214 merged 2 commits intomainfrom
forwardport/pr636/main
Mar 27, 2026
Merged

forwardport: cherry-pick EE PR #636 to main [AI-resolved]#803
Rain-1214 merged 2 commits intomainfrom
forwardport/pr636/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#636).

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

变更说明

缺陷修复:initialValues={getFormInitialValues()} 在每次父组件重渲染时生成新对象引用,导致 RangePicker 用户输入被 form.setFieldsValue 覆盖。

修复方式:将 setFieldsValue 逻辑提升到 CompanyNoticeModal,通过 useEffect([visible, canEdit, noticeData]) 触发;移除 CompanyNoticeForminitialValues prop;用 form.getFieldValue('validPeriod')?.[0] 替换 startTimeRef

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

冲突文件

  • CompanyNoticeModal/CompanyNoticeForm/index.tsx

AI 解决说明

EE 从 @actiontech/shared 导入组件,CE 从 @actiontech/dms-kit 导入 → 保留 CE 包路径,移除不再需要的 Dayjs 类型导入(startTimeRef 已删除)。

快照说明

EE 快照中的 mock 数据(这是一条公告信息)与 CE 不同(notice),未同步 EE 快照;已在本分支运行测试并更新快照为 CE 正确值。

Made with Cursor

@github-actions
Copy link
Copy Markdown

Coverage report

St.
Category Percentage Covered / Total
🟢 Statements 92.73% 19271/20782
🟡 Branches 75.6% 7602/10055
🟢 Functions 92.67% 6969/7520
🟢 Lines 93.48% 18950/20271

Test suite run success

3627 tests passing in 810 suites.

Report generated by 🧪jest coverage report action from 0e871ed

@Rain-1214 Rain-1214 merged commit 0f5b957 into main Mar 27, 2026
9 checks passed
@Rain-1214 Rain-1214 deleted the forwardport/pr636/main branch March 27, 2026 08:35
@LZS911 LZS911 restored the forwardport/pr636/main branch March 27, 2026 09:15
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