Fix: Repeat the shortcut keys for "Next" and "Skip"

Author: zyronon

packages/core/src/components/About.vue

@@ -1,12 +1,11 @@
 <script setup lang="ts">
-
-import { GITHUB } from "../config/env.ts";
-import ChannelIcons from "../components/channel-icons/ChannelIcons.vue";
-import WeChat from "../components/channel-icons/WeChat.vue";
+import { APP_NAME, GITHUB } from '../config/env.ts'
+import ChannelIcons from '../components/channel-icons/ChannelIcons.vue'
+import WeChat from '../components/channel-icons/WeChat.vue'
 </script>
 
 <template>
-  <h1>Type Words</h1>
+  <h1>{{ APP_NAME }}</h1>
   <div class="w-120">
     <p class="text-xl">
       {{ $t('about_thanks') }}
@@ -15,29 +14,18 @@ import WeChat from "../components/channel-icons/WeChat.vue";
       {{ $t('github_address') }}<a :href="GITHUB" target="_blank">{{ GITHUB }}</a>
     </p>
     <div class="flex flex-col gap-2 mt-20">
+      <div class="">常见问题： <RouterLink to="/help">常见问题解答</RouterLink></div>
+      <div class="flex items-center">{{ $t('about_wechat_feedback') }}<WeChat /></div>
       <div class="">
-        常见问题： <RouterLink to="/help">常见问题解答</RouterLink>
-      </div>
-      <div class="flex items-center">
-        {{ $t('about_wechat_feedback') }}<WeChat/>
-      </div>
-      <div class="">
-        {{ $t('about_ticket_feedback') }}<a :href="`https://v.wjx.cn/vm/ev0W7fv.aspx#`"
-                    target="_blank">https://v.wjx.cn/vm/ev0W7fv.aspx#</a>
+        {{ $t('about_ticket_feedback')
+        }}<a :href="`https://v.wjx.cn/vm/ev0W7fv.aspx#`" target="_blank">https://v.wjx.cn/vm/ev0W7fv.aspx#</a>
       </div>
       <div class="flex items-center">
         {{ $t('about_other_channels') }}
-        <ChannelIcons type="horizontal"
-                      :share="false"
-                      :wechat="false"
-                      :github="false"
-        />
+        <ChannelIcons type="horizontal" :share="false" :wechat="false" :github="false" />
       </div>
     </div>
-
   </div>
 </template>
 
-<style scoped lang="scss">
-
-</style>
+<style scoped lang="scss"></style>

packages/core/src/config/env.ts

@@ -73,9 +73,10 @@ export const SAVE_DICT_KEY = {
 //18版本，移除单独保存的 app version字段，转移到 settingStore的webAppVersion里面
 //19:修复快捷键下一个单词和跳过单词重复了
 //20:修复19版本未导入变量，导致抛错所有用户setting变默认值的bug
+//21:修复快捷键下一个单词和跳过单词重复了
 export const SAVE_SETTING_KEY = {
   key: 'typing-word-setting',
-  version: 20,
+  version: 21,
 }
 
 //5版本，不再单独保存 app version字段

packages/core/src/stores/setting.ts

@@ -153,9 +153,9 @@ export const useSettingStore = defineStore('setting', {
         let configStr = await get(SAVE_SETTING_KEY.key)
         let data = await checkAndUpgradeSaveSetting(configStr)
 
-        //特殊处理
-        const shouldRefreshUpdatedAt = !!(data as any)?.__firstTimePatchedFromSnapshot ?? false
-        delete (data as any)?.__firstTimePatchedFromSnapshot
+        //如果升级了，那么要保持本地比线上新，不然会被覆盖
+        const shouldRefreshUpdatedAt = (data as any)?.__updateLocalData ?? false
+        delete (data as any)?.__updateLocalData
         if (shouldRefreshUpdatedAt) {
           await set(
             SAVE_SETTING_KEY.key,

packages/core/src/utils/http.ts

@@ -4,7 +4,7 @@ import { AppEnv, ENV } from '../config/env.ts'
 import { Toast } from '@typewords/base'
 
 export const axiosInstance: AxiosInstance = axios.create({
-  baseURL: ENV.API,
+  // baseURL: ENV.API,
   timeout: 15000,
 })
 

packages/core/src/utils/index.ts

@@ -122,19 +122,22 @@ export async function checkAndUpgradeSaveSetting(val: any) {
       let state: SettingState & { [key: string]: any } = data.val
       if (typeof state !== 'object') return defaultState
       state.load = false
+      debugger
       let version = Number(data.version)
+      //为了保持永远是最新的快捷键选项列表，但保留住用户的自定义设置，去掉无效的快捷键选项
+      //例: 2版本，可能有快捷键A。3版本没有了
+      checkRiskKey(defaultState.shortcutKeyMap, state.shortcutKeyMap)
+
+      let updateLocalData = false
       if (version <= 17) {
         defaultState.webAppVersion = (await get(APP_VERSION.key)) ?? APP_VERSION.version
-      }
-      if (version <= 18) {
-        defaultState.shortcutKeyMap[ShortcutKey.Next] = DefaultShortcutKeyMap[ShortcutKey.Next]
+        updateLocalData = true
       }
       //3/20晚上10点25推的代码，这个地方出了一个bug，ShortcutKey没导入，导致抛异常后返回了默认值，所有的用户的setting都变成默认值了。
       //在这里读取之前的快照，如果存在则从里面读取setting的firstTime，
       //判断是否与当前值相等，不相等则取快照的值并将本地的update_at更新，以免被远程覆盖
       if (version === 19) {
         try {
-          let firstTimePatchedFromSnapshot = false
           const snapshotCutoffTime = new Date('2026-03-20T22:25:00+08:00').getTime()
           const rawIndex = (await get(BACKUP_INDEX_KEY)) as Array<{ key?: string; createdAt?: number }> | null
           const index = Array.isArray(rawIndex) ? rawIndex : []
@@ -154,20 +157,22 @@ export async function checkAndUpgradeSaveSetting(val: any) {
             const currentFirstTime = Number(state?.firstTime)
             if (Number.isFinite(snapshotFirstTime) && snapshotFirstTime > 0 && snapshotFirstTime !== currentFirstTime) {
               state.firstTime = snapshotFirstTime
-              firstTimePatchedFromSnapshot = true
+              updateLocalData = true
             }
-            ;(defaultState as any).__firstTimePatchedFromSnapshot = firstTimePatchedFromSnapshot
           }
         } catch (e) {
           console.warn('firstTime 快照回填跳过或失败，忽略并继续', e)
         }
       }
 
-      //为了保持永远是最新的快捷键选项列表，但保留住用户的自定义设置，去掉无效的快捷键选项
-      //例: 2版本，可能有快捷键A。3版本没有了
-      checkRiskKey(defaultState.shortcutKeyMap, state.shortcutKeyMap)
+      if (version <= 20) {
+        defaultState.shortcutKeyMap[ShortcutKey.Next] = DefaultShortcutKeyMap[ShortcutKey.Next]
+        updateLocalData = true
+      }
+
       delete state.shortcutKeyMap
       checkRiskKey(defaultState, state)
+      ;(defaultState as any).__updateLocalData = updateLocalData
       return defaultState
     } catch (e) {
       await saveHashSnapshot('数据解析异常-自动备份', '')