forwardport: cherry-pick EE PR #636 to main [AI-resolved]#803
Merged
forwardport: cherry-pick EE PR #636 to main [AI-resolved]#803
Conversation
Made-with: Cursor
Coverage report
Test suite run success3627 tests passing in 810 suites. Report generated by 🧪jest coverage report action from 0e871ed |
Rain-1214
approved these changes
Mar 27, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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])触发;移除CompanyNoticeForm的initialValuesprop;用form.getFieldValue('validPeriod')?.[0]替换startTimeRef。冲突文件
CompanyNoticeModal/CompanyNoticeForm/index.tsxAI 解决说明
EE 从
@actiontech/shared导入组件,CE 从@actiontech/dms-kit导入 → 保留 CE 包路径,移除不再需要的Dayjs类型导入(startTimeRef已删除)。快照说明
EE 快照中的 mock 数据(
这是一条公告信息)与 CE 不同(notice),未同步 EE 快照;已在本分支运行测试并更新快照为 CE 正确值。Made with Cursor