Skip to content

[CLOSE] fix: Fix the . dot in the regex not matching \n#5158

Closed
wangliang181230 wants to merge 10 commits into1Panel-dev:v2from
wangliang181230:PR/fix-DOTALL
Closed

[CLOSE] fix: Fix the . dot in the regex not matching \n#5158
wangliang181230 wants to merge 10 commits into1Panel-dev:v2from
wangliang181230:PR/fix-DOTALL

Conversation

@wangliang181230
Copy link
Copy Markdown
Contributor

What this PR does / why we need it?

fix: Fix the . dot in the regex not matching \n

Summary of your change

修复正则表达式中的点未匹配换行符的问题

Please indicate you've done the following:

  • Made sure tests are passing and test coverage is added if needed.
  • Made sure commit message follow the rule of Conventional Commits specification.
  • Considered the docs impact and opened a new docs issue or PR with docs changes if needed.

@f2c-ci-robot
Copy link
Copy Markdown

f2c-ci-robot Bot commented Apr 24, 2026

Adding the "do-not-merge/release-note-label-needed" label because no release-note block was detected, please follow our release note process to remove it.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@f2c-ci-robot
Copy link
Copy Markdown

f2c-ci-robot Bot commented Apr 24, 2026

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

file = QuerySet(File).filter(id=r).first()
if file is None:
break
continue
Copy link
Copy Markdown
Contributor Author

@wangliang181230 wangliang181230 Apr 24, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

顺便修复:所有图片处理完

text = re.sub(r'\s+', ' ', text)
# 去除表单渲染
re.sub(r'<form_rander>[\s\S]*?<\/form_rander>', '', text)
text = re.sub(r'<form_rander>[\d\D]*?</form_rander>', '', text)
Copy link
Copy Markdown
Contributor Author

@wangliang181230 wangliang181230 Apr 24, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

遗漏了 text =

if model is None:
raise AppApiException(500, _('Model does not exist'))
if model is None:
raise AppApiException(500, _('Model does not exist'))
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

顺便优化:if with_valid 未进入时,model 也为 None,也要抛出该异常,所以移到 if with_valid 之外。

return simple_trigger_handler.undeploy(trigger, **kwargs)
if simple_trigger_handler.support(trigger, **kwargs):
return simple_trigger_handler.undeploy(trigger, **kwargs)
raise Exception("不支持的触发器类型")
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

顺便优化:遗漏了判断。

@shaohuzhang1
Copy link
Copy Markdown
Contributor

感谢你的代码贡献。

经过初步检查,这个 PR 里包含了多个独立的功能点。按照我们的协作规范,建议将一个功能对应一个 PR,这样有助于:

每个 PR 聚焦单一职责

Code Review 更容易

部分功能可以先合并上线

可以请你把这个 PR 拆成几个独立的 PR 吗?每个 PR 只改动一个功能。完成后我们立即开始 Review。

感谢理解!

@wangliang181230
Copy link
Copy Markdown
Contributor Author

好的。

@wangliang181230 wangliang181230 changed the title fix: Fix the . dot in the regex not matching \n [WIP] fix: Fix the . dot in the regex not matching \n Apr 27, 2026
@wangliang181230
Copy link
Copy Markdown
Contributor Author

@shaohuzhang1 see the new PR #5179

@wangliang181230 wangliang181230 changed the title [WIP] fix: Fix the . dot in the regex not matching \n [CLOSE] fix: Fix the . dot in the regex not matching \n Apr 27, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants