Skip to content

Merge branch 'main' into release/v1.4#1332

Closed
cyfung1031 wants to merge 1 commit intorelease/v1.4from
main
Closed

Merge branch 'main' into release/v1.4#1332
cyfung1031 wants to merge 1 commit intorelease/v1.4from
main

Conversation

@cyfung1031
Copy link
Copy Markdown
Collaborator

No description provided.

* 优化 nextTimeDisplay 避免cron表达式错误导致整个页面死掉

* 优化 crontabScript 错误显示

* 修正测试

* 中文

* fix: 修复 cron 错误处理中的问题

- 删除 ERROR_TEXT 哨兵常量,改用 i18n 文案 t("cron_invalid_expr")
- 移除 nextTimeDisplay 中冗余的 date 参数守卫
- script.ts 中用 extractCronExpr 替代 nextTimeDisplay 做校验,解耦展示层和解析层
- 测试改为验证不抛异常

---------

Co-authored-by: 王一之 <yz@ggnb.top>
@cyfung1031
Copy link
Copy Markdown
Collaborator Author

有 conflict 我合不了 @CodFrm

@cyfung1031 cyfung1031 closed this Apr 5, 2026
@CodFrm
Copy link
Copy Markdown
Member

CodFrm commented Apr 5, 2026

不用合并得那么频繁

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