feat: func ready

Author: gemini2035

src/components/editor/operator/EditorSheet.tsx

@@ -6,9 +6,9 @@ import { CopilotDocV1 } from 'models/copilot.schema'
 
 import { SheetGroupContainer } from './sheet/SheetGroup'
 import { SheetOperatorContainer } from './sheet/SheetOperator'
-import { SheetContextValue, SheetProvider } from './sheet/SheetProvider'
+import { SheetProvider, SheetProviderProp } from './sheet/SheetProvider'
 
-type EditorSheetProps = SheetContextValue
+type EditorSheetProps = Omit<SheetProviderProp, 'children'>
 export type Group = CopilotDocV1.Group
 export type Operator = CopilotDocV1.Operator
 

src/components/editor/operator/sheet/SheetGroup.tsx

@@ -28,7 +28,7 @@ export interface GroupListModifyProp {
 const EditorGroupName: FC = () => {
   const [groupName, setGroupName] = useState('')
 
-  const { submitGroup } = useSheet()
+  const { submitGroupInSheet } = useSheet()
 
   const addGroupHandle = () => {
     const name = groupName.trim()
@@ -38,7 +38,7 @@ const EditorGroupName: FC = () => {
         intent: Intent.DANGER,
       })
     } else {
-      submitGroup({ name }, undefined, true)
+      submitGroupInSheet({ name })
       setGroupName('')
     }
   }

src/components/editor/operator/sheet/SheetOperatorItem.tsx

@@ -15,15 +15,30 @@ export interface SheetProviderProp {
   children: ReactNode
 }
 
-export type SheetContextValue = Omit<SheetProviderProp, 'children'>
+export type SheetContextValue = {
+  existedOperators: SheetProviderProp['existedOperators']
+  existedGroups: SheetProviderProp['existedGroups']
+  removeOperator: SheetProviderProp['removeOperator']
+  removeGroup: SheetProviderProp['removeGroup']
+  submitOperatorInSheet: (value: Operator) => void
+  submitGroupInSheet: (value: Group) => void
+}
 
 const SheetContext = createContext<SheetContextValue>({} as SheetContextValue)
 
 export const SheetProvider: FC<SheetProviderProp> = ({
   children,
-  ...providerValue
+  submitGroup,
+  submitOperator,
+  ...restValueField
 }) => (
-  <SheetContext.Provider value={{ ...providerValue }}>
+  <SheetContext.Provider
+    value={{
+      submitOperatorInSheet: (value) => submitOperator(value, undefined, true),
+      submitGroupInSheet: (value) => submitGroup(value, undefined, true),
+      ...restValueField,
+    }}
+  >
     {children}
   </SheetContext.Provider>
 )

src/components/editor/operator/sheet/SheetProvider.tsx

@@ -205,7 +205,7 @@ const useSheetGroupItemController = ({
   groupInfo: { name, opers = [], ...rest },
   itemType,
 }: SheetGroupItemProp): SheetGroupItemController => {
-  const { submitGroup, removeGroup, existedGroups } = useSheet()
+  const { submitGroupInSheet, removeGroup, existedGroups } = useSheet()
   const [favGroup, setFavGroup] = useAtom(favGroupAtom)
 
   switch (itemType) {
@@ -228,7 +228,7 @@ const useSheetGroupItemController = ({
       return {
         selected: true,
         onGroupNameChange: (name: string) =>
-          submitGroup({ opers, ...rest, name }, undefined, true),
+          submitGroupInSheet({ opers, ...rest, name }),
         defaultOperatorCollapseOpen: true,
         onOperatorSkillChange: (operator: Operator) => {
           opers.splice(
@@ -238,7 +238,7 @@ const useSheetGroupItemController = ({
             1,
             operator,
           )
-          submitGroup({ opers, name, ...rest }, undefined, true)
+          submitGroupInSheet({ opers, name, ...rest })
         },
         ActionList: (
           <>
@@ -272,7 +272,7 @@ const useSheetGroupItemController = ({
               minimal
               icon="arrow-left"
               title="添加干员组"
-              onClick={() => submitGroup({ name, opers }, undefined, true)}
+              onClick={() => submitGroupInSheet({ name, opers })}
             />
           </>
         ),
@@ -329,7 +329,7 @@ const useSheetGroupItemController = ({
                     : '检测到同名干员组'
                   : '使用该推荐分组'
               }
-              onClick={() => submitGroup({ name, opers }, undefined, true)}
+              onClick={() => submitGroupInSheet({ name, opers })}
             />
             <GroupPinOption pinned onPinChange={onPinChange} />
           </>

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

@@ -67,8 +67,12 @@ const SheetOperatorEditorForm: FC<SheetOperatorEditorFormProp> = ({
   name,
   opers = [],
 }) => {
-  const { existedOperators, existedGroups, removeOperator, submitGroup } =
-    useSheet()
+  const {
+    existedOperators,
+    existedGroups,
+    removeOperator,
+    submitGroupInSheet,
+  } = useSheet()
   const [selectedOperators, setSelectedOperators] = useState<
     OperatorInSheetOperatorEditor[]
   >(
@@ -90,40 +94,54 @@ const SheetOperatorEditorForm: FC<SheetOperatorEditorFormProp> = ({
     React.FormHTMLAttributes<HTMLFormElement>,
     HTMLFormElement
   >['onSubmit'] = (e) => {
-    console.log(selectedOperators)
     e.preventDefault()
-    const targetGroup = existedGroups.find(
-      ({ name: exsitedName }) => exsitedName === name,
-    ) || { name, opers: [] }
-    const deleteArray: number[] = []
-    // const needModifyGroup: Record<Group['name']>
-    const opers = selectedOperators.map(({ groupName, operName }) => {
-      if (groupName) {
-        const { opers: otherGroupOpers, ...rest } = existedGroups.find(
-          ({ name }) => name === groupName,
-        ) || { name: groupName, opers: [] }
-        const targetIndex =
-          otherGroupOpers?.findIndex(
-            ({ name: otherOpersName }) => otherOpersName === operName,
-          ) || -1
-        const target = otherGroupOpers?.splice(
-          Math.max(targetIndex - 1, 0),
-          1,
-        )[0]
-        console.log(target)
-        console.log(otherGroupOpers)
-        submitGroup({ ...rest, opers: otherGroupOpers }, undefined, true)
-        return target
+    const needModifyGroups = selectedOperators.reduce(
+      (acc, { groupName, operName }) => {
+        const key = groupName || 'noneGrouped'
+        if (acc[key]) acc[key].push(operName)
+        else acc[key] = [operName]
+        return acc
+      },
+      {} as Record<Group['name'], OperatorInSheetOperatorEditor['operName'][]>,
+    )
+    let newOpers: Group['opers'] = []
+    Object.entries(needModifyGroups).forEach(([key, value]) => {
+      if (key === 'noneGrouped') {
+        removeOperator(
+          value.map((name) => {
+            const index = existedOperators.findIndex(
+              ({ name: existedName }) => existedName === name,
+            )
+            newOpers?.push(existedOperators[index])
+            return index
+          }),
+        )
       } else {
-        const index = existedOperators.findIndex(
-          ({ name }) => name === operName,
+        const { opers: otherGroupOpers, ...groupRestField } =
+          existedGroups.find(
+            ({ name: existedGroups }) => existedGroups === key,
+          )!
+        newOpers = newOpers?.concat(
+          value.map(
+            (name) =>
+              otherGroupOpers?.find(
+                ({ name: existedName }) => existedName === name,
+              )!,
+          ),
         )
-        deleteArray.push(index)
-        removeOperator(deleteArray)
-        return existedOperators[index]
+        if (key !== name)
+          submitGroupInSheet({
+            ...groupRestField,
+            opers: otherGroupOpers?.filter(({ name }) => !value.includes(name)),
+          })
       }
-    }) as Group['opers']
-    submitGroup({ ...targetGroup, opers }, undefined, true)
+    })
+
+    console.log(newOpers)
+    submitGroupInSheet({
+      ...existedGroups.find(({ name: existedName }) => existedName === name)!,
+      opers: newOpers,
+    })
   }
 
   const onReset = () => {

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

@@ -20,8 +20,12 @@ export interface SheetOperatorItemProp {
 }
 
 export const SheetOperatorItem: FC<SheetOperatorItemProp> = ({ name }) => {
-  const { existedOperators, existedGroups, submitOperator, removeOperator } =
-    useSheet()
+  const {
+    existedOperators,
+    existedGroups,
+    submitOperatorInSheet,
+    removeOperator,
+  } = useSheet()
   const [favOperators, setFavOperators] = useAtom(favOperatorAtom)
 
   const operatorNoneGroupedIndex = existedOperators.findIndex(
@@ -58,7 +62,7 @@ export const SheetOperatorItem: FC<SheetOperatorItemProp> = ({ name }) => {
     else {
       if (selected) {
         removeOperator(operatorNoneGroupedIndex)
-      } else submitOperator(operator, undefined, true)
+      } else submitOperatorInSheet(operator)
     }
   }
 
@@ -77,7 +81,7 @@ export const SheetOperatorItem: FC<SheetOperatorItemProp> = ({ name }) => {
       ...[...favOperators].filter(({ name }) => name !== formattedValue.name),
       { ...formattedValue },
     ])
-    submitOperator(formattedValue, undefined, true)
+    submitOperatorInSheet(formattedValue)
   }
 
   const onPinnedChange = () => {
@@ -151,7 +155,7 @@ export const SheetOperatorItem: FC<SheetOperatorItemProp> = ({ name }) => {
         <SkillAboutTrigger
           {...{
             operator,
-            onSkillChange: (value) => submitOperator(value, undefined, true),
+            onSkillChange: (value) => submitOperatorInSheet(value),
             disabled: grouped,
           }}
         />

src/components/editor/operator/sheet/sheetOperator/SheetOperatorItem.tsx

@@ -11,7 +11,7 @@ export const OperatorMutipleSelect: FC<OperatorMutipleSelectProp> = () => {
   const {
     operatorFiltered: { data: operatorFilteredData },
   } = useOperatorFilterProvider()
-  const { existedOperators, submitOperator, removeOperator } = useSheet()
+  const { existedOperators, submitOperatorInSheet, removeOperator } = useSheet()
 
   const { cancelAllDisabled, selectAllDisabled } = useMemo(() => {
     const existedOperatorsNames = existedOperators.map(({ name }) => name)
@@ -27,7 +27,7 @@ export const OperatorMutipleSelect: FC<OperatorMutipleSelectProp> = () => {
 
   const selectAll = () =>
     operatorFilteredData.forEach((item) => {
-      submitOperator(item, () => {})
+      submitOperatorInSheet(item)
     })
 
   const cancelAll = () => {