Skip to content

Commit 240d78f

Browse files
authored
Revert "Revert "temp storage""
1 parent 82b1fb1 commit 240d78f

File tree

2 files changed

+25
-11
lines changed

2 files changed

+25
-11
lines changed

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

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

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

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

63-
type FormHTMLElement = DetailedHTMLProps<
64-
React.FormHTMLAttributes<HTMLFormElement>,
65-
HTMLFormElement
66-
>
67-
6863
const SheetOperatorEditorForm: FC<SheetOperatorEditorFormProp> = ({
6964
name,
7065
opers = [],
7166
}) => {
72-
const { existedOperators, existedGroups } = useSheet()
67+
const { existedOperators, existedGroups, removeOperator, submitGroup } =
68+
useSheet()
7369
const [selectedOperators, setSelectedOperators] = useState<
7470
OperatorInSheetOperatorEditor[]
7571
>(
@@ -79,13 +75,29 @@ const SheetOperatorEditorForm: FC<SheetOperatorEditorFormProp> = ({
7975
})),
8076
)
8177

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

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

97109
return (
98110
<SheetContainerSkeleton title="选择干员" icon="select">
99-
<form className="mt-3" onSubmit={onSubmit} onReset={onReset}>
111+
<form className="mt-3" onSubmit={onSubmit}>
100112
<div className="max-h-96 overflow-y-auto overflow-x-hidden">
101113
<OperatorSelectorSkeleton
102114
icon="person"
@@ -175,6 +187,7 @@ const SheetOperatorEditorForm: FC<SheetOperatorEditorFormProp> = ({
175187
<Button
176188
type="reset"
177189
text="继续"
190+
onClick={onReset}
178191
className={clsx(Classes.POPOVER_DISMISS, 'mx-1')}
179192
/>
180193
<Button text="取消" className={Classes.POPOVER_DISMISS} />

0 commit comments

Comments
 (0)