Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
jinfa-platform
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
shenshaokai
jinfa-platform
Commits
40ba31c6
Commit
40ba31c6
authored
Apr 26, 2022
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 品类属性值名称添加不能以数字开头和不包含特殊字符校验
parent
3c5b0556
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
44 additions
and
1 deletion
+44
-1
classAndProperty.ts
src/locales/en-US/classAndProperty.ts
+6
-0
classAndProperty.ts
src/locales/ko-KR/classAndProperty.ts
+6
-0
classAndProperty.ts
src/locales/zh-CN/classAndProperty.ts
+6
-0
addAttribute.tsx
src/pages/classAndProperty/attribute/addAttribute.tsx
+9
-1
index.ts
src/pages/classAndProperty/class/schema/index.ts
+17
-0
No files found.
src/locales/en-US/classAndProperty.ts
View file @
40ba31c6
...
@@ -53,6 +53,10 @@ export default {
...
@@ -53,6 +53,10 @@ export default {
'classAndProperty.attribute.addAttribute.form.name.message'
:
'Enter the attribute name!'
,
'classAndProperty.attribute.addAttribute.form.name.message'
:
'Enter the attribute name!'
,
'classAndProperty.attribute.addAttribute.form.name.placeholder'
:
'classAndProperty.attribute.addAttribute.form.name.placeholder'
:
'Enter the attribute name'
,
'Enter the attribute name'
,
'classAndProperty.attribute.addAttribute.form.name.placeholder.error1'
:
'Cannot start with a number'
,
'classAndProperty.attribute.addAttribute.form.name.placeholder.error2'
:
'Cannot contain special characters'
,
'classAndProperty.attribute.addAttribute.form.type'
:
'Display Method'
,
'classAndProperty.attribute.addAttribute.form.type'
:
'Display Method'
,
'classAndProperty.attribute.addAttribute.form.type.message'
:
'classAndProperty.attribute.addAttribute.form.type.message'
:
'The display method is a must!'
,
'The display method is a must!'
,
...
@@ -178,6 +182,8 @@ export default {
...
@@ -178,6 +182,8 @@ export default {
'classAndProperty.class.classSchema.name'
:
'Category name'
,
'classAndProperty.class.classSchema.name'
:
'Category name'
,
'classAndProperty.class.classSchema.name.placeholder'
:
'Please enter the category name'
,
'classAndProperty.class.classSchema.name.placeholder'
:
'Please enter the category name'
,
'classAndProperty.class.classSchema.name.placeholder.error1'
:
'Cannot start with a number'
,
'classAndProperty.class.classSchema.name.placeholder.error2'
:
'Cannot contain special characters'
,
'classAndProperty.class.classSchema.type'
:
'Category Type'
,
'classAndProperty.class.classSchema.type'
:
'Category Type'
,
'classAndProperty.class.classSchema.type.placeholder'
:
'Please select category type'
,
'classAndProperty.class.classSchema.type.placeholder'
:
'Please select category type'
,
'classAndProperty.class.classSchema.type.value.1'
:
'Physical goods'
,
'classAndProperty.class.classSchema.type.value.1'
:
'Physical goods'
,
...
...
src/locales/ko-KR/classAndProperty.ts
View file @
40ba31c6
...
@@ -53,6 +53,10 @@ export default {
...
@@ -53,6 +53,10 @@ export default {
'classAndProperty.attribute.addAttribute.form.name.message'
:
'속성 이름을 입력하십시오!'
,
'classAndProperty.attribute.addAttribute.form.name.message'
:
'속성 이름을 입력하십시오!'
,
'classAndProperty.attribute.addAttribute.form.name.placeholder'
:
'classAndProperty.attribute.addAttribute.form.name.placeholder'
:
'속성 이름 입력'
,
'속성 이름 입력'
,
'classAndProperty.attribute.addAttribute.form.name.placeholder.error1'
:
'숫자로 시작하면 안 된다'
,
'classAndProperty.attribute.addAttribute.form.name.placeholder.error2'
:
'특수 문자를 포함할 수 없습니다'
,
'classAndProperty.attribute.addAttribute.form.type'
:
'전시 방식'
,
'classAndProperty.attribute.addAttribute.form.type'
:
'전시 방식'
,
'classAndProperty.attribute.addAttribute.form.type.message'
:
'classAndProperty.attribute.addAttribute.form.type.message'
:
'전시 방식은 필수!'
,
'전시 방식은 필수!'
,
...
@@ -179,6 +183,8 @@ export default {
...
@@ -179,6 +183,8 @@ export default {
'classAndProperty.class.classSchema.name'
:
'품목 이름'
,
'classAndProperty.class.classSchema.name'
:
'품목 이름'
,
'classAndProperty.class.classSchema.name.placeholder'
:
'품목 이름을 입력하십시오.'
,
'classAndProperty.class.classSchema.name.placeholder'
:
'품목 이름을 입력하십시오.'
,
'classAndProperty.class.classSchema.name.placeholder.error1'
:
'숫자로 시작할 수 없다'
,
'classAndProperty.class.classSchema.name.placeholder.error2'
:
'특수 문자를 포함할 수 없습니다'
,
'classAndProperty.class.classSchema.type'
:
'품목 유형'
,
'classAndProperty.class.classSchema.type'
:
'품목 유형'
,
'classAndProperty.class.classSchema.type.placeholder'
:
'품목 유형 선택'
,
'classAndProperty.class.classSchema.type.placeholder'
:
'품목 유형 선택'
,
'classAndProperty.class.classSchema.type.value.1'
:
'실물 상품'
,
'classAndProperty.class.classSchema.type.value.1'
:
'실물 상품'
,
...
...
src/locales/zh-CN/classAndProperty.ts
View file @
40ba31c6
...
@@ -53,6 +53,10 @@ export default {
...
@@ -53,6 +53,10 @@ export default {
'classAndProperty.attribute.addAttribute.form.name.message'
:
'输入属性名称!'
,
'classAndProperty.attribute.addAttribute.form.name.message'
:
'输入属性名称!'
,
'classAndProperty.attribute.addAttribute.form.name.placeholder'
:
'classAndProperty.attribute.addAttribute.form.name.placeholder'
:
'输入属性名称'
,
'输入属性名称'
,
'classAndProperty.attribute.addAttribute.form.name.placeholder.error1'
:
'不能以数字开头'
,
'classAndProperty.attribute.addAttribute.form.name.placeholder.error2'
:
'不能包含特殊字符'
,
'classAndProperty.attribute.addAttribute.form.type'
:
'展示方式'
,
'classAndProperty.attribute.addAttribute.form.type'
:
'展示方式'
,
'classAndProperty.attribute.addAttribute.form.type.message'
:
'classAndProperty.attribute.addAttribute.form.type.message'
:
'展示方式为必须项!'
,
'展示方式为必须项!'
,
...
@@ -179,6 +183,8 @@ export default {
...
@@ -179,6 +183,8 @@ export default {
'classAndProperty.class.classSchema.name'
:
'品类名称'
,
'classAndProperty.class.classSchema.name'
:
'品类名称'
,
'classAndProperty.class.classSchema.name.placeholder'
:
'请输入品类名称'
,
'classAndProperty.class.classSchema.name.placeholder'
:
'请输入品类名称'
,
'classAndProperty.class.classSchema.name.placeholder.error1'
:
'不能数字开头'
,
'classAndProperty.class.classSchema.name.placeholder.error2'
:
'不能包含特殊字符'
,
'classAndProperty.class.classSchema.type'
:
'品类类型'
,
'classAndProperty.class.classSchema.type'
:
'品类类型'
,
'classAndProperty.class.classSchema.type.placeholder'
:
'请选择品类类型'
,
'classAndProperty.class.classSchema.type.placeholder'
:
'请选择品类类型'
,
'classAndProperty.class.classSchema.type.value.1'
:
'实物商品'
,
'classAndProperty.class.classSchema.type.value.1'
:
'实物商品'
,
...
...
src/pages/classAndProperty/attribute/addAttribute.tsx
View file @
40ba31c6
...
@@ -214,8 +214,16 @@ const AddAtttribute: React.FC<{}> = () => {
...
@@ -214,8 +214,16 @@ const AddAtttribute: React.FC<{}> = () => {
message
:
intl
.
formatMessage
({
id
:
'classAndProperty.attribute.addAttribute.form.name.message'
}),
message
:
intl
.
formatMessage
({
id
:
'classAndProperty.attribute.addAttribute.form.name.message'
}),
},
},
{
{
pattern
:
/^
(?![
0-9
])
/
,
message
:
intl
.
formatMessage
({
id
:
'classAndProperty.attribute.addAttribute.form.name.placeholder.error1'
}),
},
{
pattern
:
/^
[^
`~!@#$%^&*()_
\-
+=<>?:"{}|,.
\/
;'
\\
[
\]
·~!@#¥%……&*()——
\-
+={}|《》?:“”【】、;‘',。、
]
*$/
,
message
:
intl
.
formatMessage
({
id
:
'classAndProperty.attribute.addAttribute.form.name.placeholder.error2'
}),
},
{
validator
:
(
r
,
v
,
c
)
=>
validatorByte
(
r
,
v
,
c
,
20
)
validator
:
(
r
,
v
,
c
)
=>
validatorByte
(
r
,
v
,
c
,
20
)
}
}
,
]
}
]
}
>
>
<
Input
placeholder=
{
intl
.
formatMessage
({
id
:
'classAndProperty.attribute.addAttribute.form.name.placeholder'
})
}
disabled=
{
isSee
}
/>
<
Input
placeholder=
{
intl
.
formatMessage
({
id
:
'classAndProperty.attribute.addAttribute.form.name.placeholder'
})
}
disabled=
{
isSee
}
/>
...
...
src/pages/classAndProperty/class/schema/index.ts
View file @
40ba31c6
...
@@ -35,9 +35,26 @@ export const classSchema: ISchema = {
...
@@ -35,9 +35,26 @@ export const classSchema: ISchema = {
message
:
getIntl
().
formatMessage
({
id
:
'classAndProperty.class.classSchema.name.placeholder'
}),
message
:
getIntl
().
formatMessage
({
id
:
'classAndProperty.class.classSchema.name.placeholder'
}),
},
},
{
{
// false 报错
pattern
:
/^
(?![
0-9
])
/
,
message
:
getIntl
().
formatMessage
({
id
:
'classAndProperty.class.classSchema.name.placeholder.error1'
}),
},
{
pattern
:
/^
[^
`~!@#$%^&*()_
\-
+=<>?:"{}|,.
\/
;'
\\
[
\]
·~!@#¥%……&*()——
\-
+={}|《》?:“”【】、;‘',。、
]
*$/
,
message
:
getIntl
().
formatMessage
({
id
:
'classAndProperty.class.classSchema.name.placeholder.error2'
}),
},
{
limitByte
:
true
,
limitByte
:
true
,
maxByte
:
16
,
maxByte
:
16
,
},
},
// {
// pattern: /^(?![0-9])/,
// message: getIntl().formatMessage({ id: 'classAndProperty.class.classSchema.name.placeholder.error1' }),
// },
// {
// pattern: /(?![`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~!@#¥%……&*()——\-+={}|《》?:“”【】、;‘',。、])/,
// message: getIntl().formatMessage({ id: 'classAndProperty.class.classSchema.name.placeholder.error2' }),
// },
],
],
},
},
type
:
{
type
:
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment