Skip to content
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

feat(front): 配置文件-文件拥有者、用户组支持连字符和下划线(closed #269) #274

Open
wants to merge 1 commit into
base: v1.0.24-rc
Choose a base branch
from
Open

feat(front): 配置文件-文件拥有者、用户组支持连字符和下划线(closed #269) #274

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion web/src/language/lang/en.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ export default {
'用户组名称，操作系统必须存在此用户组': 'User group name, operating system must exist this user group',
'文件的权限设置，如0775': 'File permission settings such as 0775',
文件权限设置提示: 'Please enter the complete file permissions, including sticky permissions. Such as: 0755',
'请输入英文字母或数字，且必须以英文字母开头': 'Please input letters or numbers, and must start with an letter',
'请输入英文字母、数字、连字符和下划线，且必须以英文字母开头': 'Please input letters, numbers, hyphens and underscores, and must start with an English letter',
请选择文件输出格式: 'Please select the file output format',
'路径格式非法，请检查绝对路径格式是否正确': 'The path format is illegal, please check if the absolute path format is correct',
版本详情: 'Version detail',
Expand Down
2 changes: 1 addition & 1 deletion web/src/language/lang/zh.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ export default {
'用户组名称，操作系统必须存在此用户组': '用户组名称，操作系统必须存在此用户组',
'文件的权限设置，如0775': '文件的权限设置，如0775',
文件权限设置提示: '请输入完整的文件权限位，包括粘滞位权限（sticky）。如：0755',
'请输入英文字母或数字，且必须以英文字母开头': '请输入英文字母或数字，且必须以英文字母开头',
'请输入英文字母、数字、连字符和下划线，且必须以英文字母开头': '请输入英文字母、数字、连字符和下划线，且必须以英文字母开头',
请选择文件输出格式: '请选择文件输出格式',
'路径格式非法，请检查绝对路径格式是否正确': '路径格式非法，请检查绝对路径格式是否正确',
版本详情: '版本详情',
Expand Down
8 changes: 4 additions & 4 deletions web/src/views/ConfigFile/Template/List/CreateTemplate/BasicInfo.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,13 @@ export default {
trigger: 'blur',
}],
owner: [required, {
validator: val => val.match(/^[a-zA-Z][a-zA-Z0-9]*$/),
message: this.$t('请输入英文字母或数字，且必须以英文字母开头'),
validator: val => val.match(/^[a-zA-Z][a-zA-Z0-9-_]*$/),
message: this.$t('请输入英文字母、数字、连字符和下划线，且必须以英文字母开头'),
trigger: 'blur',
}],
group: [required, {
validator: val => val.match(/^[a-zA-Z][a-zA-Z0-9]*$/),
message: this.$t('请输入英文字母或数字，且必须以英文字母开头'),
validator: val => val.match(/^[a-zA-Z][a-zA-Z0-9-_]*$/),
message: this.$t('请输入英文字母、数字、连字符和下划线，且必须以英文字母开头'),
trigger: 'blur',
}],
filemode: [required, {
Expand Down
8 changes: 4 additions & 4 deletions web/src/views/ConfigFile/Template/Version/List/TemplateField.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,12 @@ export default {
message: this.$t('路径格式非法，请检查绝对路径格式是否正确'),
},
owner: {
validator: val => val.match(/^[a-zA-Z][a-zA-Z0-9]*$/),
message: this.$t('请输入英文字母或数字，且必须以英文字母开头'),
validator: val => val.match(/^[a-zA-Z][a-zA-Z0-9-_]*$/),
message: this.$t('请输入英文字母、数字、连字符和下划线，且必须以英文字母开头'),
},
group: {
validator: val => val.match(/^[a-zA-Z][a-zA-Z0-9]*$/),
message: this.$t('请输入英文字母或数字，且必须以英文字母开头'),
validator: val => val.match(/^[a-zA-Z][a-zA-Z0-9-_]*$/),
message: this.$t('请输入英文字母、数字、连字符和下划线，且必须以英文字母开头'),
},
filemode: {
validator: val => val.match(/^[0-7]{4}$/),
Expand Down