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
4ddee05d
Commit
4ddee05d
authored
Nov 15, 2020
by
vben
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(form): fix form inputNumber verification error
parent
abb0cfae
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
4 deletions
+19
-4
CHANGELOG.zh_CN.md
CHANGELOG.zh_CN.md
+4
-0
FormItem.tsx
src/components/Form/src/FormItem.tsx
+5
-2
useMessage.tsx
src/hooks/web/useMessage.tsx
+1
-2
index.vue
src/views/demo/form/index.vue
+9
-0
No files found.
CHANGELOG.zh_CN.md
View file @
4ddee05d
...
...
@@ -9,6 +9,10 @@
-
更新 antdv 到
`2.0.0-rc.1`
### 🐛 Bug Fixes
-
修复表单 inputNumber 校验错误
## 2.0.0-rc.10 (2020-11-13)
### ✨ Refactor
...
...
src/components/Form/src/FormItem.tsx
View file @
4ddee05d
...
...
@@ -122,10 +122,10 @@ export default defineComponent({
}
=
props
.
schema
;
if
(
isFunction
(
dynamicRules
))
{
return
dynamicRules
(
unref
(
getValuesRef
));
return
dynamicRules
(
unref
(
getValuesRef
))
as
ValidationRule
[]
;
}
let
rules
:
ValidationRule
[]
=
cloneDeep
(
defRules
);
let
rules
:
ValidationRule
[]
=
cloneDeep
(
defRules
)
as
ValidationRule
[]
;
if
((
!
rules
||
rules
.
length
===
0
)
&&
required
)
{
rules
=
[{
required
}];
...
...
@@ -157,6 +157,9 @@ export default defineComponent({
if
(
component
.
includes
(
'
RangePicker
'
))
{
rule
.
type
=
'
array
'
;
}
if
(
component
.
includes
(
'
InputNumber
'
))
{
rule
.
type
=
'
number
'
;
}
}
}
...
...
src/hooks/web/useMessage.tsx
View file @
4ddee05d
import
type
{
ModalFunc
,
ModalFuncProps
}
from
'
ant-design-vue/lib/modal/Modal
'
;
import
type
{
MessageApi
}
from
'
ant-design-vue/lib/message
'
;
import
{
Modal
,
message
as
Message
,
notification
}
from
'
ant-design-vue
'
;
import
{
InfoCircleFilled
,
CheckCircleFilled
,
CloseCircleFilled
}
from
'
@ant-design/icons-vue
'
;
...
...
@@ -100,7 +99,7 @@ notification.config({
*/
export
function
useMessage
()
{
return
{
createMessage
:
Message
as
MessageApi
,
createMessage
:
Message
,
notification
:
notification
as
NotifyApi
,
createConfirm
:
createConfirm
,
createSuccessModal
,
...
...
src/views/demo/form/index.vue
View file @
4ddee05d
...
...
@@ -208,6 +208,15 @@
],
},
},
{
field
:
'
field20
'
,
component
:
'
InputNumber
'
,
label
:
'
字段20
'
,
required
:
true
,
colProps
:
{
span
:
8
,
},
},
];
export
default
defineComponent
({
...
...
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