Skip to content

refactor(admin): 允许字典名称包含下划线 #115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
walkor merged 1 commit into from
Apr 21, 2025
Merged

refactor(admin): 允许字典名称包含下划线 #115

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/plugin/admin/app/controller/DictController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ public function insert(Request $request): Response
if (Dict::get($name)) {
return $this->json(1, '字典已经存在');
}
if (!preg_match('/^[a-zA-Z0-9]+$/', $name)) {
return $this->json(2, '字典名称只能是字母数字的组合');
if (!preg_match('/^[a-zA-Z0-9_]+$/', $name)) {
return $this->json(2, '字典名称只能是字母数字下划线的组合');
}
$values = (array)$request->post('value', []);
Dict::save($name, $values);
Expand All @@ -88,8 +88,8 @@ public function update(Request $request): Response
if (!Dict::get($name)) {
return $this->json(1, '字典不存在');
}
if (!preg_match('/^[a-zA-Z0-9]+$/', $name)) {
return $this->json(2, '字典名称只能是字母数字的组合');
if (!preg_match('/^[a-zA-Z0-9_]+$/', $name)) {
return $this->json(2, '字典名称只能是字母数字下划线的组合');
}
Dict::save($name, $request->post('value'));
}
Expand Down