From fc820c0d16e1a744de12c0d9de564eb610cbe1ca Mon Sep 17 00:00:00 2001
From: tsukumi <tsukumijima@users.noreply.github.com>
Date: Fri, 3 Jan 2025 06:33:52 +0900
Subject: [PATCH] =?UTF-8?q?Add:=20=E8=BE=9E=E6=9B=B8=E7=99=BB=E9=8C=B2?=
 =?UTF-8?q?=E6=99=82=E3=83=BB=E7=B7=A8=E9=9B=86=E6=99=82=E3=81=AB=E5=93=81?=
 =?UTF-8?q?=E8=A9=9E=E3=81=AE=E7=A8=AE=E9=A1=9E=E3=82=92=E8=A8=AD=E5=AE=9A?=
 =?UTF-8?q?=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E3=81=97?=
 =?UTF-8?q?=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

エンジン側には実装されてたのに UI になってなくてもったいなかったため
---
 .../Dialog/DictionaryManageDialog.vue         | 51 ++++++++++++++++++-
 src/store/dictionary.ts                       |  6 ++-
 src/store/type.ts                             |  3 ++
 3 files changed, 56 insertions(+), 4 deletions(-)

diff --git a/src/components/Dialog/DictionaryManageDialog.vue b/src/components/Dialog/DictionaryManageDialog.vue
index 361ae041..cad03564 100644
--- a/src/components/Dialog/DictionaryManageDialog.vue
+++ b/src/components/Dialog/DictionaryManageDialog.vue
@@ -188,6 +188,22 @@
                   </div>
                 </div>
               </div>
+              <div class="row q-pl-md q-mt-lg text-h6">品詞</div>
+              <div class="row q-pl-md q-mt-sm q-mb-md desc-row">
+                登録する単語の品詞を選択してください。
+              </div>
+              <div class="row q-pl-md q-pr-md">
+                <QSelect
+                  v-model="wordType"
+                  class="word-input"
+                  outlined
+                  :options="Object.entries(wordTypeLabels).map(([value, label]) => ({ value, label }))"
+                  :disable="uiLocked"
+                  dense
+                  emitValue
+                  mapOptions
+                />
+              </div>
               <div class="row q-pl-md q-mt-lg text-h6">単語優先度</div>
               <div class="row q-pl-md q-mt-sm q-mb-lg desc-row">
                 単語を登録しても反映されない場合は優先度を高くしてください。
@@ -265,19 +281,20 @@
 
 <script setup lang="ts">
 import { computed, ref, watch } from "vue";
-import { QInput } from "quasar";
+import { QInput, QSelect } from "quasar";
 import AudioAccent from "@/components/Talk/AudioAccent.vue";
 import ContextMenu from "@/components/Menu/ContextMenu/Container.vue";
 import { useRightClickContextMenu } from "@/composables/useRightClickContextMenu";
 import { useStore } from "@/store";
 import type { FetchAudioResult } from "@/store/type";
-import { AccentPhrase, UserDictWord } from "@/openapi";
+import { AccentPhrase, UserDictWord, WordTypes } from "@/openapi";
 import {
   convertHiraToKana,
   convertLongVowel,
   createKanaRegex,
 } from "@/domain/japanese";
 
+const defaultWordType = WordTypes.ProperNoun;
 const defaultDictPriority = 5;
 
 const props = defineProps<{
@@ -510,6 +527,30 @@ const computeDisplayAccent = () => {
   return accent;
 };
 
+const wordType = ref<WordTypes>(defaultWordType);
+const wordTypeLabels = {
+  [WordTypes.ProperNoun]: "固有名詞",
+  [WordTypes.CommonNoun]: "一般名詞",
+  [WordTypes.Verb]: "動詞",
+  [WordTypes.Adjective]: "形容詞",
+  [WordTypes.Suffix]: "接尾辞",
+};
+
+// 品詞フィールドから WordTypes を推定する関数
+const getWordTypeFromPartOfSpeech = (dictData: UserDictWord): WordTypes => {
+  const { partOfSpeech, partOfSpeechDetail1 } = dictData;
+  if (partOfSpeech === "名詞") {
+    if (partOfSpeechDetail1 === "固有名詞") return WordTypes.ProperNoun;
+    if (partOfSpeechDetail1 === "接尾") return WordTypes.Suffix;
+    return WordTypes.CommonNoun;
+  }
+  if (partOfSpeech === "動詞") return WordTypes.Verb;
+  if (partOfSpeech === "形容詞") return WordTypes.Adjective;
+
+  // デフォルトは固有名詞
+  return WordTypes.ProperNoun;
+};
+
 const wordPriority = ref(defaultDictPriority);
 const wordPriorityLabels = {
   0: "最低",
@@ -527,11 +568,13 @@ const isWordChanged = computed(() => {
   // 一旦代入することで、userDictそのものが更新された時もcomputedするようにする
   const dict = userDict.value;
   const dictData = dict[selectedId.value];
+  const currentWordType = getWordTypeFromPartOfSpeech(dictData);
   return (
     dictData &&
     (dictData.surface !== surface.value ||
       dictData.yomi !== yomi.value ||
       dictData.accentType !== computeRegisteredAccent() ||
+      currentWordType !== wordType.value ||
       dictData.priority !== wordPriority.value)
   );
 });
@@ -549,6 +592,7 @@ const saveWord = async () => {
         surface: surface.value,
         pronunciation: yomi.value,
         accentType: accent,
+        wordType: wordType.value,
         priority: wordPriority.value,
       });
     } catch {
@@ -574,6 +618,7 @@ const saveWord = async () => {
           surface: surface.value,
           pronunciation: yomi.value,
           accentType: accent,
+          wordType: wordType.value,
           priority: wordPriority.value,
         }),
       );
@@ -663,6 +708,7 @@ const selectWord = (id: string) => {
   selectedId.value = id;
   surface.value = userDict.value[id].surface;
   void setYomi(userDict.value[id].yomi, true);
+  wordType.value = getWordTypeFromPartOfSpeech(userDict.value[id]);
   wordPriority.value = userDict.value[id].priority;
   toWordSelectedState();
 };
@@ -681,6 +727,7 @@ const toInitialState = () => {
   selectedId.value = "";
   surface.value = "";
   void setYomi("");
+  wordType.value = defaultWordType;
   wordPriority.value = defaultDictPriority;
 
   // 辞書の最初の項目を選択する
diff --git a/src/store/dictionary.ts b/src/store/dictionary.ts
index 5ca4e654..0d5ed363 100644
--- a/src/store/dictionary.ts
+++ b/src/store/dictionary.ts
@@ -64,7 +64,7 @@ export const dictionaryStore = createPartialStore<DictionaryStoreTypes>({
   ADD_WORD: {
     async action(
       { state, actions },
-      { surface, pronunciation, accentType, priority },
+      { surface, pronunciation, accentType, wordType, priority },
     ) {
       // 同じ単語IDで登録するために、１つのエンジンで登録したあと全エンジンに同期する。
       const engineId: EngineId | undefined = state.engineIds[0];
@@ -80,6 +80,7 @@ export const dictionaryStore = createPartialStore<DictionaryStoreTypes>({
             surface,
             pronunciation,
             accentType,
+            wordType,
             priority,
           }),
         );
@@ -91,7 +92,7 @@ export const dictionaryStore = createPartialStore<DictionaryStoreTypes>({
   REWRITE_WORD: {
     async action(
       { state, actions },
-      { wordUuid, surface, pronunciation, accentType, priority },
+      { wordUuid, surface, pronunciation, accentType, wordType, priority },
     ) {
       if (state.engineIds.length === 0)
         throw new Error("At least one engine must be registered");
@@ -106,6 +107,7 @@ export const dictionaryStore = createPartialStore<DictionaryStoreTypes>({
               surface,
               pronunciation,
               accentType,
+              wordType,
               priority,
             }),
           );
diff --git a/src/store/type.ts b/src/store/type.ts
index 57a97cc8..356e09ca 100644
--- a/src/store/type.ts
+++ b/src/store/type.ts
@@ -19,6 +19,7 @@ import {
   UserDictWord,
   MorphableTargetInfo,
   FrameAudioQuery,
+  WordTypes,
   Note as NoteForRequestToEngine,
 } from "@/openapi";
 import {
@@ -2253,6 +2254,7 @@ export type DictionaryStoreTypes = {
       surface: string;
       pronunciation: string;
       accentType: number;
+      wordType: WordTypes;
       priority: number;
     }): Promise<void>;
   };
@@ -2262,6 +2264,7 @@ export type DictionaryStoreTypes = {
       surface: string;
       pronunciation: string;
       accentType: number;
+      wordType: WordTypes;
       priority: number;
     }): Promise<void>;
   };