From 6c1b0a7f027fe112a2d725e3b45bc629eefa0225 Mon Sep 17 00:00:00 2001
From: zyronon <zyronon@163.com>
Date: Wed, 30 Jul 2025 02:00:13 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E7=A7=BB=E9=99=A4=E5=BA=9F=E5=BC=83?=
 =?UTF-8?q?=E7=9A=84=E5=BF=AB=E6=8D=B7=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/mobile/practice/index.vue   |  6 ------
 src/pages/pc/Setting.vue              | 20 +++++++-------------
 src/pages/pc/article/StudyArticle.vue |  6 ------
 src/pages/pc/index.vue                |  6 +-----
 src/pages/pc/word/StudyWord.vue       |  5 -----
 src/stores/runtime.ts                 |  4 +---
 src/types.ts                          |  5 -----
 7 files changed, 9 insertions(+), 43 deletions(-)

diff --git a/src/pages/mobile/practice/index.vue b/src/pages/mobile/practice/index.vue
index 8782ce71..ce333f68 100644
--- a/src/pages/mobile/practice/index.vue
+++ b/src/pages/mobile/practice/index.vue
@@ -55,10 +55,6 @@ function toggleDictation() {
   settingStore.dictation = !settingStore.dictation
 }
 
-function openSetting() {
-  runtimeStore.showSettingModal = true
-}
-
 function toggleConciseMode() {
   settingStore.showToolbar = !settingStore.showToolbar
   settingStore.showPanel = settingStore.showToolbar
@@ -83,7 +79,6 @@ onMounted(() => {
   emitter.on(ShortcutKey.DictationChapter, write)
   emitter.on(ShortcutKey.ToggleShowTranslate, toggleShowTranslate)
   emitter.on(ShortcutKey.ToggleDictation, toggleDictation)
-  emitter.on(ShortcutKey.OpenSetting, openSetting)
   emitter.on(ShortcutKey.ToggleTheme, toggleTheme)
   emitter.on(ShortcutKey.ToggleConciseMode, toggleConciseMode)
   emitter.on(ShortcutKey.TogglePanel, togglePanel)
@@ -99,7 +94,6 @@ onUnmounted(() => {
   emitter.off(ShortcutKey.DictationChapter, write)
   emitter.off(ShortcutKey.ToggleShowTranslate, toggleShowTranslate)
   emitter.off(ShortcutKey.ToggleDictation, toggleDictation)
-  emitter.off(ShortcutKey.OpenSetting, openSetting)
   emitter.off(ShortcutKey.ToggleTheme, toggleTheme)
   emitter.off(ShortcutKey.ToggleConciseMode, toggleConciseMode)
   emitter.off(ShortcutKey.TogglePanel, togglePanel)
diff --git a/src/pages/pc/Setting.vue b/src/pages/pc/Setting.vue
index 6ba9b7a9..e80e8090 100644
--- a/src/pages/pc/Setting.vue
+++ b/src/pages/pc/Setting.vue
@@ -132,9 +132,8 @@ function importData(e) {
 
 <template>
   <BasePage>
-    <div class="page-title text-align-center">设置</div>
     <div class="setting">
-      <div class="left">
+      <div class="left mt-10">
         <div class="tabs">
           <div class="tab" :class="tabIndex === 0 && 'active'" @click="tabIndex = 0">
             <Icon icon="bx:headphone" width="20" color="#0C8CE9"/>
@@ -161,11 +160,9 @@ function importData(e) {
             <span>关于</span>
           </div>
         </div>
-        <div class="git-log">
-          Build {{ gitLastCommitHash }}
-        </div>
       </div>
       <div class="content">
+        <div class="page-title text-align-center">设置</div>
         <div v-if="tabIndex === 0">
           <div class="row">
             <label class="main-title">所有音效</label>
@@ -394,7 +391,7 @@ function importData(e) {
               。如果您需要在不同的设备、浏览器或者其他非官方部署上使用 {{ APP_NAME }}， 您需要手动进行数据同步和保存。
             </label>
           </div>
-          <div class="row">
+          <div class="row mt-2">
             <BaseButton @click="exportData">数据导出</BaseButton>
           </div>
           <div class="row">
@@ -453,6 +450,10 @@ function importData(e) {
             反馈：<a
               href="https://github.com/zyronon/typing-word/issues">https://github.com/zyronon/typing-word/issues</a>
           </p>
+          <div class="text-md color-gray">
+            Build {{ gitLastCommitHash }}
+          </div>
+
         </div>
       </div>
     </div>
@@ -465,7 +466,6 @@ function importData(e) {
   color: var(--color-font-1);
 
   .left {
-    height: 93vh;
     display: flex;
     flex-direction: column;
     justify-content: space-between;
@@ -492,18 +492,12 @@ function importData(e) {
       }
     }
 
-    .git-log {
-      font-size: .6rem;
-      color: gray;
-      margin-bottom: .3rem;
-    }
   }
 
   .content {
     flex: 1;
     height: 100%;
     overflow: auto;
-    padding: var(--space);
     padding: 0 2.6rem;
 
     .row {
diff --git a/src/pages/pc/article/StudyArticle.vue b/src/pages/pc/article/StudyArticle.vue
index 141a880c..e68d5ad8 100644
--- a/src/pages/pc/article/StudyArticle.vue
+++ b/src/pages/pc/article/StudyArticle.vue
@@ -50,10 +50,6 @@ function toggleDictation() {
   settingStore.dictation = !settingStore.dictation
 }
 
-function openSetting() {
-  runtimeStore.showSettingModal = true
-}
-
 function toggleConciseMode() {
   settingStore.showToolbar = !settingStore.showToolbar
   settingStore.showPanel = settingStore.showToolbar
@@ -78,7 +74,6 @@ onMounted(() => {
   emitter.on(ShortcutKey.DictationChapter, write)
   emitter.on(ShortcutKey.ToggleShowTranslate, toggleShowTranslate)
   emitter.on(ShortcutKey.ToggleDictation, toggleDictation)
-  emitter.on(ShortcutKey.OpenSetting, openSetting)
   emitter.on(ShortcutKey.ToggleTheme, toggleTheme)
   emitter.on(ShortcutKey.ToggleConciseMode, toggleConciseMode)
   emitter.on(ShortcutKey.TogglePanel, togglePanel)
@@ -94,7 +89,6 @@ onUnmounted(() => {
   emitter.off(ShortcutKey.DictationChapter, write)
   emitter.off(ShortcutKey.ToggleShowTranslate, toggleShowTranslate)
   emitter.off(ShortcutKey.ToggleDictation, toggleDictation)
-  emitter.off(ShortcutKey.OpenSetting, openSetting)
   emitter.off(ShortcutKey.ToggleTheme, toggleTheme)
   emitter.off(ShortcutKey.ToggleConciseMode, toggleConciseMode)
   emitter.off(ShortcutKey.TogglePanel, togglePanel)
diff --git a/src/pages/pc/index.vue b/src/pages/pc/index.vue
index c5a5f6d3..f0b850f4 100644
--- a/src/pages/pc/index.vue
+++ b/src/pages/pc/index.vue
@@ -40,10 +40,7 @@ const {toggleTheme} = useTheme()
           <Icon icon="ph:article-ny-times"/>
           <span v-if="settingStore.sideExpand">文章</span>
         </div>
-        <div class="row"
-             :title="`设置(${settingStore.shortcutKeyMap[ShortcutKey.OpenSetting]})`"
-             @click="router.push('/setting')"
-        >
+        <div class="row" @click="router.push('/setting')">
           <Icon icon="uil:setting"/>
           <span v-if="settingStore.sideExpand">设置</span>
         </div>
@@ -58,7 +55,6 @@ const {toggleTheme} = useTheme()
       </div>
       <div class="bottom flex justify-evenly ">
         <BaseIcon
-            :title="`收起(${settingStore.shortcutKeyMap[ShortcutKey.OpenSetting]})`"
             @click="settingStore.sideExpand = !settingStore.sideExpand"
             :icon="settingStore.sideExpand?'formkit:left':'formkit:right'"/>
         <Tooltip
diff --git a/src/pages/pc/word/StudyWord.vue b/src/pages/pc/word/StudyWord.vue
index bb5d06fb..14c4e261 100644
--- a/src/pages/pc/word/StudyWord.vue
+++ b/src/pages/pc/word/StudyWord.vue
@@ -313,10 +313,6 @@ function toggleDictation() {
   settingStore.dictation = !settingStore.dictation
 }
 
-function openSetting() {
-  runtimeStore.showSettingModal = true
-}
-
 function toggleConciseMode() {
   settingStore.showToolbar = !settingStore.showToolbar
   settingStore.showPanel = settingStore.showToolbar
@@ -348,7 +344,6 @@ useEvents([
   [ShortcutKey.RepeatChapter, repeat],
   [ShortcutKey.ToggleShowTranslate, toggleTranslate],
   [ShortcutKey.ToggleDictation, toggleDictation],
-  [ShortcutKey.OpenSetting, openSetting],
   [ShortcutKey.ToggleTheme, toggleTheme],
   [ShortcutKey.ToggleConciseMode, toggleConciseMode],
   [ShortcutKey.TogglePanel, togglePanel],
diff --git a/src/stores/runtime.ts b/src/stores/runtime.ts
index 4c28fb2a..c268caef 100644
--- a/src/stores/runtime.ts
+++ b/src/stores/runtime.ts
@@ -6,7 +6,6 @@ export interface RuntimeState {
   modalList: Array<{ id: string | number, close: Function }>
   editDict: Dict
   showDictModal: boolean
-  showSettingModal: boolean
   excludeRoutes: any[]
   routeData: any,
 }
@@ -19,7 +18,6 @@ export const useRuntimeStore = defineStore('runtime', {
       modalList: [],
       editDict: getDefaultDict(),
       showDictModal: false,
-      showSettingModal: false,
       excludeRoutes: [],
     }
   },
@@ -39,4 +37,4 @@ export const useRuntimeStore = defineStore('runtime', {
       // console.log('store.excludeRoutes', this.excludeRoutes)
     },
   }
-})
\ No newline at end of file
+})
diff --git a/src/types.ts b/src/types.ts
index 9dcd769e..24fbfa14 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -186,9 +186,6 @@ export enum ShortcutKey {
   // PlayTranslatePronunciation = 'PlayTranslatePronunciation',
   ToggleShowTranslate = 'ToggleShowTranslate',
   ToggleDictation = 'ToggleDictation',
-  OpenSetting = 'OpenSetting',
-  //todo 废弃
-  OpenDictDetail = 'OpenDictDetail',
   ToggleTheme = 'ToggleTheme',
   ToggleConciseMode = 'ToggleConciseMode',
   TogglePanel = 'TogglePanel'
@@ -210,9 +207,7 @@ export const DefaultShortcutKeyMap = {
   // [ShortcutKey.PlayTranslatePronunciation]: 'Ctrl+O',
   [ShortcutKey.ToggleShowTranslate]: 'Ctrl+Z',
   [ShortcutKey.ToggleDictation]: 'Ctrl+I',
-  [ShortcutKey.OpenSetting]: 'Ctrl+S',
   [ShortcutKey.ToggleTheme]: 'Ctrl+Q',
-  [ShortcutKey.OpenDictDetail]: 'Ctrl+J',
   [ShortcutKey.ToggleConciseMode]: 'Ctrl+M',
   [ShortcutKey.TogglePanel]: 'Ctrl+L',
 }