@@ -60,12 +60,16 @@ interface SheetOperatorEditorFormProp {
60
60
opers ?: Group [ 'opers' ]
61
61
}
62
62
63
+ type FormHTMLElement = DetailedHTMLProps <
64
+ React . FormHTMLAttributes < HTMLFormElement > ,
65
+ HTMLFormElement
66
+ >
67
+
63
68
const SheetOperatorEditorForm : FC < SheetOperatorEditorFormProp > = ( {
64
69
name,
65
70
opers = [ ] ,
66
71
} ) => {
67
- const { existedOperators, existedGroups, removeOperator, submitGroup } =
68
- useSheet ( )
72
+ const { existedOperators, existedGroups } = useSheet ( )
69
73
const [ selectedOperators , setSelectedOperators ] = useState <
70
74
OperatorInSheetOperatorEditor [ ]
71
75
> (
@@ -75,29 +79,13 @@ const SheetOperatorEditorForm: FC<SheetOperatorEditorFormProp> = ({
75
79
} ) ) ,
76
80
)
77
81
78
- const onSubmit : DetailedHTMLProps <
79
- React . FormHTMLAttributes < HTMLFormElement > ,
80
- HTMLFormElement
81
- > [ 'onSubmit' ] = ( e ) => {
82
+ const onSubmit : FormHTMLElement [ 'onSubmit' ] = ( e ) => {
82
83
e . preventDefault ( )
83
- const deleteArray : number [ ] = [ ]
84
- const opers = selectedOperators . map ( ( { groupName, operName } ) => {
85
- if ( groupName ) {
86
- const targetGroup = existedGroups . find ( ( { name } ) => name === groupName )
87
- return existedGroups
88
- . find ( ( { name } ) => name === groupName )
89
- ?. opers ?. find ( ( { name } ) => name === operName )
90
- } else {
91
- const index = existedOperators . findIndex (
92
- ( { name } ) => name === operName ,
93
- )
94
- deleteArray . push ( index )
95
- return existedOperators [ index ]
96
- }
97
- } )
98
84
}
99
85
100
- const onReset = ( ) => {
86
+ const onReset : FormHTMLElement [ 'onReset' ] = ( e ) => {
87
+ // e.preventDefault()
88
+ console . log ( '111' )
101
89
setSelectedOperators (
102
90
opers . map ( ( { name : operName } ) => ( {
103
91
groupName : name ,
@@ -108,7 +96,7 @@ const SheetOperatorEditorForm: FC<SheetOperatorEditorFormProp> = ({
108
96
109
97
return (
110
98
< SheetContainerSkeleton title = "选择干员" icon = "select" >
111
- < form className = "mt-3" onSubmit = { onSubmit } >
99
+ < form className = "mt-3" onSubmit = { onSubmit } onReset = { onReset } >
112
100
< div className = "max-h-96 overflow-y-auto overflow-x-hidden" >
113
101
< OperatorSelectorSkeleton
114
102
icon = "person"
@@ -187,7 +175,6 @@ const SheetOperatorEditorForm: FC<SheetOperatorEditorFormProp> = ({
187
175
< Button
188
176
type = "reset"
189
177
text = "继续"
190
- onClick = { onReset }
191
178
className = { clsx ( Classes . POPOVER_DISMISS , 'mx-1' ) }
192
179
/>
193
180
< Button text = "取消" className = { Classes . POPOVER_DISMISS } />
0 commit comments