@@ -206,12 +206,7 @@ function UserAdminContainer(): JSX.Element {
206206 } else if ( data ) {
207207 // 查看或修改,需设置表单各控件的值为当前所选中行的数据
208208 form . setFieldsValue ( {
209- formConditions : data . conditions ,
210- formDesc : data . desc ,
211- formUsername : data . username ,
212- formPhone : data . phone ,
213- formEmail : data . email ,
214- formPassword : data . password ,
209+ ...data ,
215210 } ) ;
216211 }
217212 } ) ;
@@ -229,12 +224,12 @@ function UserAdminContainer(): JSX.Element {
229224 modalLoading : true ,
230225 } ) ;
231226 const params : UserBasicInfoParam = {
232- username : values . formUsername ,
233- password : values . formPassword ,
234- phone : values . formPhone ,
235- email : values . formEmail ,
236- desc : values . formDesc ,
237- conditions : values . formConditions ,
227+ username : values . username ,
228+ password : values . password ,
229+ phone : values . phone ,
230+ email : values . email ,
231+ desc : values . desc ,
232+ conditions : values . conditions ,
238233 } ;
239234 if ( modal . operateType === "add" ) {
240235 // 新增
@@ -549,23 +544,24 @@ function UserAdminContainer(): JSX.Element {
549544 } }
550545 />
551546 </ div >
547+ 552548 { /* 新增&修改&查看 模态框 */ }
553549 < Modal
554550 title = { { add : "新增" , up : "修改" , see : "查看" } [ modal . operateType ] }
555- open = { modal . modalShow }
551+ visible = { modal . modalShow }
556552 onOk = { onOk }
557553 onCancel = { onClose }
558554 confirmLoading = { modal . modalLoading }
559555 >
560556 < Form
561557 form = { form }
562558 initialValues = { {
563- formConditions : 1 ,
559+ conditions : 1 ,
564560 } }
565561 >
566562 < Form . Item
567563 label = "用户名"
568- name = "formUsername "
564+ name = "username "
569565 { ...formItemLayout }
570566 rules = { [
571567 { required : true , whitespace : true , message : "必填" } ,
@@ -579,23 +575,22 @@ function UserAdminContainer(): JSX.Element {
579575 </ Form . Item >
580576 < Form . Item
581577 label = "密码"
582- name = "formPassword "
578+ name = "password "
583579 { ...formItemLayout }
584580 rules = { [
585581 { required : true , whitespace : true , message : "必填" } ,
586582 { min : 6 , message : "最少输入6位字符" } ,
587583 { max : 18 , message : "最多输入18位字符" } ,
588584 ] }
589585 >
590- < Input
591- type = "password"
586+ < Input . Password
592587 placeholder = "请输入密码"
593588 disabled = { modal . operateType === "see" }
594589 />
595590 </ Form . Item >
596591 < Form . Item
597592 label = "电话"
598- name = "formPhone "
593+ name = "phone "
599594 { ...formItemLayout }
600595 rules = { [
601596 ( ) => ( {
@@ -619,7 +614,7 @@ function UserAdminContainer(): JSX.Element {
619614 </ Form . Item >
620615 < Form . Item
621616 label = "邮箱"
622- name = "formEmail "
617+ name = "email "
623618 { ...formItemLayout }
624619 rules = { [
625620 ( ) => ( {
@@ -642,7 +637,7 @@ function UserAdminContainer(): JSX.Element {
642637 </ Form . Item >
643638 < Form . Item
644639 label = "描述"
645- name = "formDesc "
640+ name = "desc "
646641 { ...formItemLayout }
647642 rules = { [ { max : 100 , message : "最多输入100个字符" } ] }
648643 >
@@ -654,7 +649,7 @@ function UserAdminContainer(): JSX.Element {
654649 </ Form . Item >
655650 < Form . Item
656651 label = "状态"
657- name = "formConditions "
652+ name = "conditions "
658653 { ...formItemLayout }
659654 rules = { [ { required : true , message : "请选择状态" } ] }
660655 >
@@ -669,6 +664,7 @@ function UserAdminContainer(): JSX.Element {
669664 </ Form . Item >
670665 </ Form >
671666 </ Modal >
667+ 672668 < RoleTree
673669 title = { "分配角色" }
674670 data = { role . roleData }
0 commit comments