Skip to content

Commit 82b1fb1

Browse files
authored
Merge pull request #12 from GeorgeZhang2035/revert-11-perf/sheet
Revert "temp storage"
2 parents 77dc64f + eb233f9 commit 82b1fb1

File tree

2 files changed

+11
-25
lines changed

2 files changed

+11
-25
lines changed

src/components/editor/operator/sheet/sheetGroup/SheetGroupItem.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,6 @@ export const SheetGroupItem: FC<SheetGroupItemProp> = ({
180180
{groupInfo.opers?.length
181181
? groupInfo.opers?.map((item) => (
182182
<OperatorInGroupItem
183-
key={item.name}
184183
operatorInfo={item}
185184
onOperatorSkillChange={onOperatorSkillChange}
186185
/>

src/components/editor/operator/sheet/sheetGroup/SheetOperatorEditor.tsx

Lines changed: 11 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,16 @@ interface SheetOperatorEditorFormProp {
6060
opers?: Group['opers']
6161
}
6262

63+
type FormHTMLElement = DetailedHTMLProps<
64+
React.FormHTMLAttributes<HTMLFormElement>,
65+
HTMLFormElement
66+
>
67+
6368
const SheetOperatorEditorForm: FC<SheetOperatorEditorFormProp> = ({
6469
name,
6570
opers = [],
6671
}) => {
67-
const { existedOperators, existedGroups, removeOperator, submitGroup } =
68-
useSheet()
72+
const { existedOperators, existedGroups } = useSheet()
6973
const [selectedOperators, setSelectedOperators] = useState<
7074
OperatorInSheetOperatorEditor[]
7175
>(
@@ -75,29 +79,13 @@ const SheetOperatorEditorForm: FC<SheetOperatorEditorFormProp> = ({
7579
})),
7680
)
7781

78-
const onSubmit: DetailedHTMLProps<
79-
React.FormHTMLAttributes<HTMLFormElement>,
80-
HTMLFormElement
81-
>['onSubmit'] = (e) => {
82+
const onSubmit: FormHTMLElement['onSubmit'] = (e) => {
8283
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-
})
9884
}
9985

100-
const onReset = () => {
86+
const onReset: FormHTMLElement['onReset'] = (e) => {
87+
// e.preventDefault()
88+
console.log('111')
10189
setSelectedOperators(
10290
opers.map(({ name: operName }) => ({
10391
groupName: name,
@@ -108,7 +96,7 @@ const SheetOperatorEditorForm: FC<SheetOperatorEditorFormProp> = ({
10896

10997
return (
11098
<SheetContainerSkeleton title="选择干员" icon="select">
111-
<form className="mt-3" onSubmit={onSubmit}>
99+
<form className="mt-3" onSubmit={onSubmit} onReset={onReset}>
112100
<div className="max-h-96 overflow-y-auto overflow-x-hidden">
113101
<OperatorSelectorSkeleton
114102
icon="person"
@@ -187,7 +175,6 @@ const SheetOperatorEditorForm: FC<SheetOperatorEditorFormProp> = ({
187175
<Button
188176
type="reset"
189177
text="继续"
190-
onClick={onReset}
191178
className={clsx(Classes.POPOVER_DISMISS, 'mx-1')}
192179
/>
193180
<Button text="取消" className={Classes.POPOVER_DISMISS} />

0 commit comments

Comments
 (0)