AMAZEHOME/TypeWords
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixbug

Browse Source
This commit is contained in:
zyronon
2023-11-09 15:55:06 +08:00
parent 76269c50fe
commit 3c60cf521b
7 changed files with 98 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components.d.ts vendored
View File

@@ -24,9 +24,6 @@ declare module 'vue' {
EditArticle: typeof import('./src/components/Article/EditArticle.vue')['default']
EditBatchArticleModal: typeof import('./src/components/Article/EditBatchArticleModal.vue')['default']
EditSingleArticleModal: typeof import('./src/components/Article/EditSingleArticleModal.vue')['default']
ElButton: typeof import('element-plus/es')['ElButton']
ElForm: typeof import('element-plus/es')['ElForm']
ElFormItem: typeof import('element-plus/es')['ElFormItem']
ElInput: typeof import('element-plus/es')['ElInput']
ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
ElOption: typeof import('element-plus/es')['ElOption']

96
src/components/Modal/SettingModal.vue
View File

@@ -4,12 +4,14 @@ import {useBaseStore} from "@/stores/base.ts"
import {Icon} from '@iconify/vue';
import {watch, ref} from "vue";
import {useSettingStore} from "@/stores/setting.ts";
import {useChangeAllSound, useWatchAllSound} from "@/hooks/sound.ts";
import {getAudioFileUrl, useChangeAllSound, usePlayAudio, useWatchAllSound} from "@/hooks/sound.ts";
import {getShortcutKey, useDisableEventListener, useEventListener} from "@/hooks/event.ts";
import {$computed, $ref} from "vue/macros";
import {cloneDeep} from "lodash-es";
import {DefaultShortcutKeyMap, ShortcutKey} from "@/types.ts";
import BaseButton from "@/components/BaseButton.vue";
import {SoundFileOptions} from "@/utils/const.ts";
import VolumeIcon from "@/components/icon/VolumeIcon.vue";
const tabIndex = $ref(0)
const settingStore = useSettingStore()
@@ -105,7 +107,7 @@ function resetShortcutKeyMap() {
</div>
<div class="line"></div>
<div class="row">
<label class="item-title">单词发音</label>
<label class="item-title">单词/句子自动发音</label>
<div class="wrapper">
<el-switch v-model="settingStore.wordSound"
inline-prompt
@@ -114,6 +116,17 @@ function resetShortcutKeyMap() {
/>
</div>
</div>
<div class="row">
<label class="sub-title">单词/句子发音口音</label>
<div class="wrapper">
<el-select v-model="settingStore.wordSoundType"
placeholder="请选择"
>
<el-option label="美音" value="us"/>
<el-option label="英音" value="uk"/>
</el-select>
</div>
</div>
<div class="row">
<label class="sub-title">音量</label>
<div class="wrapper">
@@ -124,7 +137,7 @@ function resetShortcutKeyMap() {
<div class="row">
<label class="sub-title">倍速</label>
<div class="wrapper">
<el-slider v-model="settingStore.wordSoundSpeed" :step="0.1" :min="0.5" :max="4"/>
<el-slider v-model="settingStore.wordSoundSpeed" :step="0.1" :min="0.5" :max="3"/>
<span>{{ settingStore.wordSoundSpeed }}</span>
</div>
</div>
@@ -139,6 +152,28 @@ function resetShortcutKeyMap() {
/>
</div>
</div>
<div class="row">
<label class="item-title">按键音效</label>
<div class="wrapper">
<el-select v-model="settingStore.keyboardSoundFile"
placeholder="请选择"
>
<el-option
v-for="item in SoundFileOptions"
:key="item.value"
:label="item.label"
:value="item.value"
>
<div class="el-option-row">
<span>{{ item.label }}</span>
<VolumeIcon
:time="100"
@click="usePlayAudio(getAudioFileUrl(item.value)[0])"/>
</div>
</el-option>
</el-select>
</div>
</div>
<div class="row">
<label class="sub-title">音量</label>
<div class="wrapper">
@@ -147,23 +182,23 @@ function resetShortcutKeyMap() {
</div>
</div>
<div class="line"></div>
<div class="row">
<label class="item-title">释义发音</label>
<div class="wrapper">
<el-switch v-model="settingStore.translateSound"
inline-prompt
active-text="开"
inactive-text="关"
/>
</div>
</div>
<div class="row">
<label class="sub-title">音量</label>
<div class="wrapper">
<el-slider v-model="settingStore.translateSoundVolume"/>
<span>{{ settingStore.translateSoundVolume }}%</span>
</div>
</div>
<!-- <div class="row">-->
<!-- <label class="item-title">释义发音</label>-->
<!-- <div class="wrapper">-->
<!-- <el-switch v-model="settingStore.translateSound"-->
<!-- inline-prompt-->
<!-- active-text="开"-->
<!-- inactive-text="关"-->
<!-- />-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="row">-->
<!-- <label class="sub-title">音量</label>-->
<!-- <div class="wrapper">-->
<!-- <el-slider v-model="settingStore.translateSoundVolume"/>-->
<!-- <span>{{ settingStore.translateSoundVolume }}%</span>-->
<!-- </div>-->
<!-- </div>-->
<div class="line"></div>
<div class="row">
<label class="item-title">效果音（章节结算页烟花音效）</label>
@@ -185,7 +220,7 @@ function resetShortcutKeyMap() {
</div>
<div v-if="tabIndex === 1">
<div class="row">
<label class="item-title">练习时展示上一个/下一个单词</label>
<label class="item-title">显示上一个/下一个单词</label>
<div class="wrapper">
<el-switch v-model="settingStore.showNearWord"
inline-prompt
@@ -195,11 +230,11 @@ function resetShortcutKeyMap() {
</div>
</div>
<div class="desc">
开启后，练习中会在上方展示上一个/下一个单词
开启后，练习中会在上方显示上一个/下一个单词
</div>
<div class="line"></div>
<div class="row">
<label class="item-title">是否忽略大小写</label>
<label class="item-title">忽略大小写</label>
<div class="wrapper">
<el-switch v-model="settingStore.ignoreCase"
inline-prompt
@@ -213,7 +248,7 @@ function resetShortcutKeyMap() {
</div>
<div class="line"></div>
<div class="row">
<label class="item-title">是否允许默写模式下显示提示</label>
<label class="item-title">允许默写模式下显示提示</label>
<div class="wrapper">
<el-switch v-model="settingStore.allowWordTip"
inline-prompt
@@ -387,6 +422,8 @@ function resetShortcutKeyMap() {
color: var(--color-font-1);
}
}
}
.main-title {
@@ -431,4 +468,15 @@ function resetShortcutKeyMap() {
}
}
.el-option-row {
width: 100%;
display: flex;
justify-content: space-between;
align-items: center;
.icon-wrapper {
transform: translateX(10rem);
}
}
</style>

11
src/components/Practice/Panel.vue
View File

@@ -4,7 +4,7 @@ import WordList from "@/components/list/WordList.vue"
import {$ref} from "vue/macros"
import {computed, provide, watch} from "vue"
import {Dict, DictType} from "@/types.ts"
import {Dict, DictType, ShortcutKey} from "@/types.ts"
import PopConfirm from "@/components/PopConfirm.vue"
import BaseButton from "@/components/BaseButton.vue";
import {useSettingStore} from "@/stores/setting.ts";
@@ -47,9 +47,12 @@ const {
<div class="panel" v-show="settingStore.showPanel">
<header>
<Transition name="fade">
<Close
@click="settingStore.showPanel = false"
v-if="!settingStore.showToolbar"/>
<Tooltip
v-if="!settingStore.showToolbar"
:title="`关闭(快捷键：${settingStore.shortcutKeyMap[ShortcutKey.TogglePanel]})`"
>
<Close @click="settingStore.showPanel = false"/>
</Tooltip>
</Transition>
<div class="tabs">
<div class="tab" :class="tabIndex === 0 && 'active'" @click="tabIndex = 0">当前</div>

2
src/components/Practice/Practice.vue
View File

@@ -105,7 +105,7 @@ function openDictDetail() {
function toggleConciseMode() {
settingStore.showToolbar = !settingStore.showToolbar
settingStore.showPanel = !settingStore.showPanel
settingStore.showPanel = settingStore.showToolbar
}
function togglePanel() {

9
src/components/Toolbar/Toolbar.vue
View File

@@ -123,9 +123,11 @@ watch(() => store.load, n => {
</IconWrapper>
</Tooltip>
<!-- <div class="base-button" @click="emitter.emit(EventKey.openStatModal)">ok</div>-->
<!-- <div class="base-button" @click="emitter.emit(EventKey.openStatModal)">ok</div>-->
<Tooltip title="单词本">
<Tooltip
:title="`单词本(快捷键：${settingStore.shortcutKeyMap[ShortcutKey.TogglePanel]})`"
>
<IconWrapper>
<Icon icon="tdesign:menu-unfold" class="menu" @click="settingStore.showPanel = !settingStore.showPanel"/>
</IconWrapper>
@@ -188,6 +190,7 @@ header {
align-items: center;
cursor: pointer;
transition: all .3s;
max-width: 45%;
&:hover {
background: var(--color-main-active);
@@ -219,6 +222,8 @@ header {
}
.with-bg {
display: flex;
align-items: center;
position: relative;
background: var(--color-second-bg);
}

16
src/hooks/sound.ts
View File

@@ -23,11 +23,13 @@ export function useSound(audioSrcList?: string[], audioFileLength?: number) {
index = 0
}
function play() {
function play(volume: number = 100) {
index++
if (audioList.length > 1 && audioList.length !== audioLength) {
audioList[index % audioList.length].volume = volume / 100
audioList[index % audioList.length].play()
} else {
audioList[index % audioLength].volume = volume / 100
audioList[index % audioLength].play()
}
}
@@ -35,6 +37,7 @@ export function useSound(audioSrcList?: string[], audioFileLength?: number) {
return {play, setAudio}
}
export function usePlayKeyboardAudio() {
const settingStore = useSettingStore()
const {play, setAudio} = useSound()
@@ -46,7 +49,7 @@ export function usePlayKeyboardAudio() {
function playAudio() {
if (settingStore.keyboardSound) {
play()
play(settingStore.keyboardSoundVolume)
}
}
@@ -59,7 +62,7 @@ export function usePlayBeep() {
function playAudio() {
if (settingStore.effectSound) {
play()
play(settingStore.effectSoundVolume)
}
}
@@ -72,7 +75,7 @@ export function usePlayCorrect() {
function playAudio() {
if (settingStore.effectSound) {
play()
play(settingStore.effectSoundVolume)
}
}
@@ -89,6 +92,8 @@ export function usePlayWordAudio() {
} else if (settingStore.wordSoundType === 'us') {
audio.src = `${PronunciationApi}${word}&type=2`
}
audio.volume = settingStore.wordSoundVolume / 100
audio.playbackRate = settingStore.wordSoundSpeed
audio.play()
}
@@ -111,14 +116,13 @@ export function useTTsPlayAudio() {
msg.lang = 'zh-CN';
isPlay = true
window.speechSynthesis.speak(msg);
console.log('text',text)
console.log('text', text)
}
return play
}
export function usePlayAudio(url: string) {
new Audio(url).play().then(r => void 0)
}

4
src/stores/base.ts
View File

@@ -228,9 +228,7 @@ export const useBaseStore = defineStore('base', {
if (res) w = Object.assign(w, res)
})
setTimeout(()=>{
resolve(true)
},5000)
resolve(true)
})
})
} else {