Merge pull request #4 from kongying-tavern/feat/next

fix: fix config input method and remove magic word

Author: boxsnake

src/shared/configSettings.ts

@@ -0,0 +1,13 @@
+export enum ConfigInputMethodEnum {
+  TEXT = "text",
+  KEYBOARD = "keyboard",
+}
+
+export type ConfigInputMethod =
+  | ConfigInputMethodEnum.TEXT
+  | ConfigInputMethodEnum.KEYBOARD;
+
+export interface Config {
+  inputMethod: ConfigInputMethod;
+  keyTransform: boolean;
+}

src/shared/index.ts

@@ -1 +1,2 @@
+export * from "./configSettings";
 export * from "./keyboardLayout";

src/views/pageTypewriter/components/ConfigBar/ButtonInputMethod.vue

@@ -3,6 +3,8 @@ import { computed } from "vue";
 import SvgIcon from "@/components/SvgIcon.vue";
 import ButtonBase from "./ButtonBase.vue";
 import ButtonDropdown from "./ButtonDropdown.vue";
+import type { ConfigInputMethod } from "@/shared";
+import { ConfigInputMethodEnum } from "@/shared";
 import { useConfig } from "../../hooks";
 
 const iconBase = import.meta.url;
@@ -19,8 +21,16 @@ interface inputMethodOption {
 }
 
 const inputMethodOptions: inputMethodOption[] = [
-  { icon: iconPathEnum.text, label: "文本输入", command: "text" },
-  { icon: iconPathEnum.keyboard, label: "键盘输入", command: "keyboard" },
+  {
+    icon: iconPathEnum.text,
+    label: "文本输入",
+    command: ConfigInputMethodEnum.TEXT,
+  },
+  {
+    icon: iconPathEnum.keyboard,
+    label: "键盘输入",
+    command: ConfigInputMethodEnum.KEYBOARD,
+  },
 ];
 
 const { config } = useConfig();
@@ -29,7 +39,9 @@ const iconPath = computed(() => {
   return iconPathEnum[config.value.inputMethod] || "";
 });
 
-const changeInputMethod = (command: "text" | "keyboard" = "keyboard") => {
+const changeInputMethod = (
+  command: ConfigInputMethod = ConfigInputMethodEnum.KEYBOARD
+) => {
   config.value.inputMethod = command;
 };
 </script>

src/views/pageTypewriter/hooks/useConfig.ts

@@ -1,10 +1,7 @@
-export interface Config {
-  inputMethod: "text" | "keyboard";
-  keyTransform: boolean;
-}
+import type { Config, ConfigInputMethod } from "@/shared";
 
 const config: Ref<Config> = ref({
-  inputMethod: "keyboard",
+  inputMethod: "keyboard" as ConfigInputMethod,
   keyTransform: true,
 });