Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
najiu-admin-template
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
najiu-frontend
najiu-admin-template
Commits
28590676
Commit
28590676
authored
Nov 05, 2020
by
vben
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(from): add required in schema
parent
b6d5e5c9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
5 deletions
+13
-5
FormItem.tsx
src/components/Form/src/FormItem.tsx
+7
-1
form.ts
src/components/Form/src/types/form.ts
+2
-0
RuleForm.vue
src/views/demo/form/RuleForm.vue
+4
-4
No files found.
src/components/Form/src/FormItem.tsx
View file @
28590676
...
...
@@ -102,13 +102,19 @@ export default defineComponent({
rulesMessageJoinLabel
,
label
,
dynamicRules
,
required
,
}
=
props
.
schema
;
if
(
isFunction
(
dynamicRules
))
{
return
dynamicRules
(
unref
(
getValuesRef
));
}
const
rules
:
ValidationRule
[]
=
cloneDeep
(
defRules
);
let
rules
:
ValidationRule
[]
=
cloneDeep
(
defRules
);
if
((
!
rules
||
rules
.
length
===
0
)
&&
required
)
{
rules
=
[{
required
}];
}
const
requiredRuleIndex
:
number
=
rules
.
findIndex
(
(
rule
)
=>
Reflect
.
has
(
rule
,
'
required
'
)
&&
!
Reflect
.
has
(
rule
,
'
validator
'
)
);
...
...
src/components/Form/src/types/form.ts
View file @
28590676
...
...
@@ -112,6 +112,8 @@ export interface FormSchema {
component
:
ComponentType
;
// 组件参数
componentProps
?:
any
;
// 必填
required
?:
boolean
;
// 校验规则
rules
?:
RuleObject
[];
...
...
src/views/demo/form/RuleForm.vue
View file @
28590676
...
...
@@ -24,7 +24,7 @@
colProps
:
{
span
:
8
,
},
r
ules
:
[{
required
:
true
}]
,
r
equired
:
true
,
},
{
field
:
'
field2
'
,
...
...
@@ -33,7 +33,7 @@
colProps
:
{
span
:
8
,
},
r
ules
:
[{
required
:
true
}]
,
r
equired
:
true
,
},
{
field
:
'
field3
'
,
...
...
@@ -42,7 +42,7 @@
colProps
:
{
span
:
8
,
},
r
ules
:
[{
required
:
true
}]
,
r
equired
:
true
,
},
{
field
:
'
field4
'
,
...
...
@@ -65,7 +65,7 @@
},
],
},
rules
:
[{
required
:
true
}],
rules
:
[{
required
:
true
,
message
:
'
请输入aa
'
}],
},
{
field
:
'
field5
'
,
...
...
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