Merge pull request #246 from hmydgz/dev

✨ feat(EditorOperatorName): 调整动作序列中的干员选择列表排序，已选择的排在前面

Author: guansss

src/components/editor/action/EditorActionAdd.tsx

@@ -65,6 +65,7 @@ export const EditorActionAdd = ({
 }: EditorActionAddProps) => {
   const isNew = !editingAction
   const operatorGroups = useWatch({ control: operationControl, name: 'groups' })
+  const operators = useWatch({ control: operationControl, name: 'opers' })
 
   const {
     control,
@@ -163,7 +164,7 @@ export const EditorActionAdd = ({
     setValue(
       'skillTimes',
       skillUsage === CopilotDocV1.SkillUsageType.ReadyToUseTimes
-        ? (action as CopilotDocV1.ActionSkillUsage)?.skillTimes ?? 1
+        ? (editingAction as CopilotDocV1.ActionSkillUsage)?.skillTimes ?? 1
         : undefined,
     )
   }, [skillUsage])
@@ -248,6 +249,7 @@ export const EditorActionAdd = ({
               <EditorOperatorName
                 shouldUnregister
                 groups={operatorGroups}
+                operators={operators}
                 control={control}
                 name="name"
                 rules={{

src/components/editor/operator/EditorOperator.tsx

@@ -32,9 +32,11 @@ export const EditorOperatorName = <T extends FieldValues>({
   name,
   control,
   rules,
+  operators,
   ...controllerProps
 }: EditorFieldProps<T, string> & {
   groups?: CopilotDocV1.Group[]
+  operators?: CopilotDocV1.Operator[]
 }) => {
   const entityName = useMemo(() => (groups ? '干员或干员组' : '干员'), [groups])
 
@@ -48,10 +50,25 @@ export const EditorOperatorName = <T extends FieldValues>({
     ...controllerProps,
   })
 
-  const items: PerformerItem[] = useMemo(
-    () => [...(groups || []), ...OPERATORS],
-    [groups],
-  )
+  const items: PerformerItem[] = useMemo(() => {
+    const _selectOperators: CopilotDocV1.Operator[] = operators || []
+    if (!_selectOperators.length) return [...(groups || []), ...OPERATORS]
+    // 已选择的名称做 set
+    const _selectedOperatorsNameSet = new Set<string>()
+    _selectOperators.forEach((v) => {
+      _selectedOperatorsNameSet.add(v.name)
+    })
+    // 已选择的
+    const _selectedOperators: OperatorInfo[] = []
+    // 过滤出未加入干员列表的干员，顺便插入已选择的列表
+    const _OPERATORS = OPERATORS.filter((v) => {
+      const has = _selectedOperatorsNameSet.has(v.name)
+      if (has) _selectedOperators.push(v)
+      return !has
+    })
+    // 干员组和已选择的放前面
+    return [...(groups || []), ..._selectedOperators, ..._OPERATORS]
+  }, [groups, operators])
 
   const fuse = useMemo(
     () =>

src/styles/blueprint.less

@@ -237,6 +237,7 @@ body {
 
 .bp4-dark {
   .docs-content-wrapper {
+    @apply min-h-screen;
     background-color: #2f343c;
   }
   .bp4-tag{