Merge branch 'dev' into editor2

guansss · web-flow · commit f26f273f3f4c · 2025-05-22T08:20:17.000+08:00
diff --git a/scripts/shared.ts b/scripts/shared.ts
@@ -1,5 +1,5 @@
 import { access } from 'fs/promises'
-import { uniq, uniqBy } from 'lodash-es'
+import { capitalize, uniq, uniqBy } from 'lodash-es'
 import fetch from 'node-fetch'
 import { pinyin } from 'pinyin'
 import simplebig from 'simplebig'
@@ -111,7 +111,7 @@ export async function getOperators() {
         if (!prof) {
           const enSubProfName =
             subProfDictEN?.[op.subProfessionId]?.subProfessionName ||
-            subProfDictCN[op.subProfessionId].subProfessionName
+            capitalize(op.subProfessionId)
 
           professions.push({
             id: op.profession,
@@ -129,7 +129,7 @@ export async function getOperators() {
         } else if (!prof.sub.find((p) => p.id === op.subProfessionId)) {
           const enSubProfName =
             subProfDictEN?.[op.subProfessionId]?.subProfessionName ||
-            subProfDictCN[op.subProfessionId].subProfessionName
+            capitalize(op.subProfessionId)
 
           prof.sub.push({
             id: op.subProfessionId,
diff --git a/src/components/editor/DetailedSelect.tsx b/src/components/editor/DetailedSelect.tsx
@@ -14,9 +14,12 @@ import { FCC } from 'types'
 
 import { Select } from '../Select'
 
-export type DetailedSelectItem =
-  | DetailedSelectChoice
-  | { type: 'header'; header: ReactNode }
+export type DetailedSelectItem = DetailedSelectHeader | DetailedSelectChoice
+export type DetailedSelectHeader = {
+  type: 'header'
+  header: ReactNode | (() => ReactNode)
+}
+
 export interface DetailedSelectChoice {
   type: 'choice'
   icon?: IconName
@@ -47,7 +50,11 @@ export const DetailedSelect: FCC<
         if (action.type === 'header') {
           return (
             <li key={'header_' + action.header} className={Classes.MENU_HEADER}>
-              <H6>{action.header}</H6>
+              <H6>
+                {typeof action.header === 'function'
+                  ? action.header()
+                  : action.header}
+              </H6>
             </li>
           )
         }
diff --git a/src/components/editor/action/EditorActionTypeSelect.tsx b/src/components/editor/action/EditorActionTypeSelect.tsx
@@ -31,12 +31,12 @@ export const EditorActionTypeSelect = (
 
   const menuItems = useMemo<DetailedSelectItem[]>(
     () =>
-      Object.entries(groupBy(ACTION_TYPES, 'group')).flatMap(
-        ([group, items]) => [
-          { type: 'header' as const, header: group },
-          ...items,
-        ],
-      ),
+      Object.values(
+        groupBy(ACTION_TYPES, (item) => item.group.toString()),
+      ).flatMap((items) => [
+        { type: 'header' as const, header: items[0].group },
+        ...items,
+      ]),
     [],
   )
   const selectedAction = findActionType(value)
diff --git a/src/components/editor/operator/sheet/sheetOperator/ProfClassificationWithFilters.tsx b/src/components/editor/operator/sheet/sheetOperator/ProfClassificationWithFilters.tsx
@@ -2,11 +2,12 @@ import { Button, Divider, H4, H5 } from '@blueprintjs/core'
 import { Popover2 } from '@blueprintjs/popover2'
 
 import clsx from 'clsx'
+import { useAtomValue } from 'jotai'
 import { FC, ImgHTMLAttributes, useEffect, useMemo } from 'react'
 
 import { PROFESSIONS } from 'models/operator'
 
-import { useTranslation } from '../../../../../i18n/i18n'
+import { languageAtom, useTranslation } from '../../../../../i18n/i18n'
 import {
   DEFAULTPROFID,
   DEFAULTSUBPROFID,
@@ -25,6 +26,7 @@ export const ProfClassificationWithFilters: FC<
   ProfClassificationWithFiltersProp
 > = ({ toTop }) => {
   const t = useTranslation()
+  const language = useAtomValue(languageAtom)
   const {
     useProfFilterState: [{ selectedProf }, setProfFilter],
     usePaginationFilterState: [_, setPaginationFilter],
@@ -36,19 +38,31 @@ export const ProfClassificationWithFilters: FC<
         id: DEFAULTPROFID.ALL,
         name: t.components.editor.operator.sheet.sheetOperator
           .ProfClassificationWithFilters.all,
+        name_en:
+          t.components.editor.operator.sheet.sheetOperator
+            .ProfClassificationWithFilters.all,
         sub: [],
       },
       {
         id: DEFAULTPROFID.FAV,
         name: t.components.editor.operator.sheet.sheetOperator
           .ProfClassificationWithFilters.favorites,
+        name_en:
+          t.components.editor.operator.sheet.sheetOperator
+            .ProfClassificationWithFilters.favorites,
         sub: [],
       },
-      ...PROFESSIONS,
+      ...PROFESSIONS.map((profession) => ({
+        ...profession,
+        name_en: profession.name_en || profession.name,
+      })),
       {
         id: DEFAULTPROFID.OTHERS,
         name: t.components.editor.operator.sheet.sheetOperator
           .ProfClassificationWithFilters.others,
+        name_en:
+          t.components.editor.operator.sheet.sheetOperator
+            .ProfClassificationWithFilters.others,
         sub: [],
       },
     ],
@@ -60,11 +74,17 @@ export const ProfClassificationWithFilters: FC<
         id: DEFAULTSUBPROFID.ALL,
         name: t.components.editor.operator.sheet.sheetOperator
           .ProfClassificationWithFilters.all,
+        name_en:
+          t.components.editor.operator.sheet.sheetOperator
+            .ProfClassificationWithFilters.all,
       },
       {
         id: DEFAULTSUBPROFID.SELECTED,
         name: t.components.editor.operator.sheet.sheetOperator
           .ProfClassificationWithFilters.selected,
+        name_en:
+          t.components.editor.operator.sheet.sheetOperator
+            .ProfClassificationWithFilters.selected,
       },
       ...(formattedProfessions.find(({ id }) => id === selectedProf[0])?.sub ||
         []),
@@ -95,16 +115,16 @@ export const ProfClassificationWithFilters: FC<
   return (
     <div className="flex flex-row-reverse relative h-full">
       <ul className="h-full flex flex-col w-6 sm:w-12">
-        {formattedProfessions.map(({ id, name }) => (
+        {formattedProfessions.map((prof) => (
           <ProfIcon
-            key={id}
-            profId={id}
-            name={name}
-            selected={selectedProf.includes(id)}
+            key={prof.id}
+            profId={prof.id}
+            name={language === 'en' && prof.name_en ? prof.name_en : prof.name}
+            selected={selectedProf.includes(prof.id)}
             onProfClick={() =>
               setProfFilter((prev) => ({
                 ...prev,
-                selectedProf: [id, DEFAULTSUBPROFID.ALL],
+                selectedProf: [prof.id, DEFAULTSUBPROFID.ALL],
               }))
             }
           />
@@ -113,22 +133,27 @@ export const ProfClassificationWithFilters: FC<
       <Divider className="mr-0" />
       <div className="h-full flex flex-col justify-center items-end absolute right-full sm:relative sm:left-0">
         <ul>
-          {subProfs.map(({ id, name }) => (
-            <li key={id}>
+          {subProfs.map((subProf) => (
+            <li key={subProf.id}>
               <H4
                 className={clsx(
                   'truncate cursor-pointer my-3 opacity-50 hover:underline hover:opacity-90',
-                  selectedProf.includes(id) && '!opacity-100 underline',
-                  name.length > 3 && '!text-base',
+                  selectedProf.includes(subProf.id) && '!opacity-100 underline',
+                  (language === 'en' && subProf.name_en
+                    ? subProf.name_en
+                    : subProf.name
+                  ).length > 3 && '!text-base',
                 )}
                 onClick={() =>
                   setProfFilter(({ selectedProf, ...rest }) => ({
-                    selectedProf: [selectedProf[0], id],
+                    selectedProf: [selectedProf[0], subProf.id],
                     ...rest,
                   }))
                 }
               >
-                {name}
+                {language === 'en' && subProf.name_en
+                  ? subProf.name_en
+                  : subProf.name}
               </H4>
             </li>
           ))}
diff --git a/src/components/entity/ELevel.tsx b/src/components/entity/ELevel.tsx
@@ -26,8 +26,12 @@ export const NeoELevel: FC<{
       <div className="flex items-center">
         <div className="flex whitespace-pre">
           <span className="inline-block font-bold my-auto">{catThree}</span>
-          {' | '}
-          <span className="text-xs">{catTwo}</span>
+          {catTwo && (
+            <>
+              {' | '}
+              <span className="text-xs">{catTwo}</span>
+            </>
+          )}
           {' | '}
           <span className="text-xs">{catOne}</span>
         </div>
diff --git a/src/hooks/useLinks.tsx b/src/hooks/useLinks.tsx
@@ -1,6 +1,9 @@
+import { useTranslation } from '../i18n/i18n'
 import { NAV_CONFIG, SOCIAL_CONFIG } from '../links'
 
 export const useLinks = () => {
+  useTranslation()
+
   const NAV_LINKS = NAV_CONFIG.map(({ to, labelKey, icon }) => ({
     to,
     label: labelKey(),
diff --git a/src/i18n/i18n.ts b/src/i18n/i18n.ts
@@ -126,6 +126,9 @@ function createDeferredProxy(path: string) {
       if (Object.prototype.hasOwnProperty.call(target, prop)) {
         return target[prop]
       }
+      if (typeof prop === 'symbol') {
+        return undefined
+      }
       target[prop] = createDeferredProxy(
         (path ? path + '.' : '') + String(prop),
       )
diff --git a/src/models/generated/operators.json b/src/models/generated/operators.json
@@ -4868,7 +4868,7 @@
         { "id": "librator", "name": "解放者", "name_en": "Liberator" },
         { "id": "fighter", "name": "斗士", "name_en": "Fighter" },
         { "id": "hammer", "name": "撼地者", "name_en": "Earthshaker" },
-        { "id": "primguard", "name": "本源近卫", "name_en": "本源近卫" }
+        { "id": "primguard", "name": "本源近卫", "name_en": "Primguard" }
       ]
     },
     {
@@ -4974,7 +4974,7 @@
         { "id": "phalanx", "name": "阵法术师", "name_en": "Phalanx Caster" },
         { "id": "blastcaster", "name": "轰击术师", "name_en": "Blast Caster" },
         { "id": "primcaster", "name": "本源术师", "name_en": "Primal Caster" },
-        { "id": "soulcaster", "name": "塑灵术师", "name_en": "塑灵术师" }
+        { "id": "soulcaster", "name": "塑灵术师", "name_en": "Soulcaster" }
       ]
     }
   ]

Original file line number	Diff line number	Diff line change
`@@ -126,6 +126,9 @@ function createDeferredProxy(path: string) {`
`126`	`126`	`if (Object.prototype.hasOwnProperty.call(target, prop)) {`
`127`	`127`	`return target[prop]`
`128`	`128`	`}`
	`129`	`+ if (typeof prop === 'symbol') {`
	`130`	`+ return undefined`
	`131`	`+ }`
`129`	`132`	`target[prop] = createDeferredProxy(`
`130`	`133`	`(path ? path + '.' : '') + String(prop),`
`131`	`134`	`)`
Original file line number	Diff line number	Diff line change
`@@ -4868,7 +4868,7 @@`
`4868`	`4868`	`{ "id": "librator", "name": "解放者", "name_en": "Liberator" },`
`4869`	`4869`	`{ "id": "fighter", "name": "斗士", "name_en": "Fighter" },`
`4870`	`4870`	`{ "id": "hammer", "name": "撼地者", "name_en": "Earthshaker" },`
`4871`		`- { "id": "primguard", "name": "本源近卫", "name_en": "本源近卫" }`
	`4871`	`+ { "id": "primguard", "name": "本源近卫", "name_en": "Primguard" }`
`4872`	`4872`	`]`
`4873`	`4873`	`},`
`4874`	`4874`	`{`
`@@ -4974,7 +4974,7 @@`
`4974`	`4974`	`{ "id": "phalanx", "name": "阵法术师", "name_en": "Phalanx Caster" },`
`4975`	`4975`	`{ "id": "blastcaster", "name": "轰击术师", "name_en": "Blast Caster" },`
`4976`	`4976`	`{ "id": "primcaster", "name": "本源术师", "name_en": "Primal Caster" },`
`4977`		`- { "id": "soulcaster", "name": "塑灵术师", "name_en": "塑灵术师" }`
	`4977`	`+ { "id": "soulcaster", "name": "塑灵术师", "name_en": "Soulcaster" }`
`4978`	`4978`	`]`
`4979`	`4979`	`}`
`4980`	`4980`	`]`