From 028bf5919dcda94abb3b7a6ecc3fc15ed21f7fec Mon Sep 17 00:00:00 2001 From: lyswhut Date: Mon, 7 Aug 2023 15:17:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=8Ewebpack=E8=BF=81=E7=A7=BB=E5=88=B0vite?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .eslintrc.base.cjs | 84 + .eslintrc.cjs | 89 +- .github/workflows/eslint.yml | 25 + .ncurc.js | 1 + README.md | 2 + build-config/css-loader.config.js | 9 - build-config/main/webpack.config.base.js | 48 - build-config/main/webpack.config.dev.js | 28 - build-config/main/webpack.config.prod.js | 49 - build-config/pack.js | 145 +- .../renderer-lyric/webpack.config.base.js | 152 - .../renderer-lyric/webpack.config.dev.js | 26 - .../renderer-lyric/webpack.config.prod.js | 49 - .../renderer-scripts/webpack.config.base.js | 57 - .../renderer-scripts/webpack.config.dev.js | 24 - .../renderer-scripts/webpack.config.prod.js | 45 - build-config/renderer/webpack.config.base.js | 158 - build-config/renderer/webpack.config.dev.js | 27 - build-config/renderer/webpack.config.prod.js | 62 - build-config/runner-dev.js | 249 +- build-config/utils.js | 65 - build-config/vite/configs/main.ts | 77 + .../vite/configs/postcss.config.js | 0 build-config/vite/configs/renderer-lyric.ts | 74 + build-config/vite/configs/renderer-scripts.ts | 61 + build-config/vite/configs/renderer.ts | 105 + build-config/vite/copyAssets.ts | 27 + build-config/vite/pack.ts | 62 + build-config/vite/runner-dev.ts | 119 + build-config/vite/utils.ts | 140 + build-config/vite/worker.ts | 33 + build-config/vue-loader.config.js | 12 - build-config/webpack-build-config.js | 3 - package-lock.json | 11733 +++------------- package.json | 84 +- publish/changeLog.md | 1 + src/common/.eslintrc.cjs | 15 + src/common/defaultSetting.ts | 6 +- src/common/error.ts | 2 +- src/common/theme/colorUtils.js | 10 +- src/common/theme/createThemes.js | 6 +- .../{images => theme_images}/china_ink.jpg | Bin .../theme/{images => theme_images}/jqbg.jpg | Bin .../{images => theme_images}/landingMoon.png | Bin .../theme/{images => theme_images}/myzcbg.jpg | Bin .../theme/{images => theme_images}/xnkl.png | Bin src/common/theme/utils.js | 4 +- src/common/tsconfig.json | 6 +- src/common/types/app_setting.d.ts | 2 +- src/common/types/download_list.d.ts | 2 +- src/common/utils/index.ts | 1 - .../utils/lyric-font-player/font-player.js | 4 +- src/common/utils/lyric-font-player/index.js | 6 +- .../utils/lyric-font-player/line-player.js | 4 +- src/common/utils/lyric-font-player/utils.js | 4 +- src/common/utils/nodejs.ts | 8 +- src/lang/.eslintrc.cjs | 15 + src/main/.eslintrc.cjs | 18 + src/main/app.ts | 31 +- src/main/index-dev.ts | 2 +- src/main/index.ts | 1 + src/main/modules/sync/client/client.ts | 4 +- src/main/modules/sync/client/index.ts | 2 +- src/main/modules/tray.ts | 6 +- src/main/modules/userApi/config/index.js | 2 - src/main/modules/userApi/config/index.ts | 2 + src/main/modules/userApi/main.ts | 15 +- src/main/modules/userApi/renderer/preload.js | 10 +- .../rendererEvent/{name.js => name.ts} | 3 +- .../userApi/rendererEvent/rendererEvent.ts | 2 +- src/main/modules/winLyric/main.ts | 4 +- src/main/modules/winMain/main.ts | 4 +- .../winMain/rendererEvent/tx_decodeLyric.ts | 6 +- src/main/modules/winMain/utils.ts | 4 +- src/main/tsconfig.json | 2 +- src/main/types/app.d.ts | 2 +- src/main/types/global.d.ts | 5 +- src/main/utils/logInit.ts | 4 + src/main/utils/store.ts | 10 +- src/main/worker/dbService/db.ts | 6 +- src/main/worker/utils/index.ts | 14 +- src/main/worker/utils/worker.ts | 6 +- src/renderer-lyric/.eslintrc.cjs | 16 + src/renderer-lyric/components/index.js | 25 +- .../components/layout/ControlBar.vue | 3 +- .../layout/LyricHorizontal/index.vue | 10 +- .../components/layout/LyricVertical/index.vue | 10 +- src/renderer-lyric/index.html | 1 + src/renderer-lyric/main.ts | 2 +- src/renderer-lyric/plugins/i18n.ts | 4 +- src/renderer-lyric/tsconfig.json | 3 +- src/renderer/.eslintrc.cjs | 19 + src/renderer/components/base/Checkbox.vue | 4 +- src/renderer/components/base/Input.vue | 6 +- src/renderer/components/base/Menu.vue | 4 +- src/renderer/components/base/Selection.vue | 4 +- src/renderer/components/base/SliderBar.vue | 6 +- src/renderer/components/base/Tab.vue | 10 +- .../components/base/useVirtualizedList.ts | 18 +- .../components/common/ListAddModal.vue | 4 +- .../common/ListAddMultipleModal.vue | 4 +- .../components/common/ProgressBar.vue | 12 +- .../AddPitchShifterPresetBtn.vue | 90 - .../SoundEffectBtn/AudioConvolution.vue | 2 +- .../common/SoundEffectBtn/BiquadFilter.vue | 2 +- .../common/SoundEffectBtn/index.vue | 6 +- src/renderer/components/index.js | 25 +- .../components/layout/Aside/index.vue | 4 +- .../layout/PlayBar/FullWidthProgress.vue | 4 +- .../layout/PlayBar/MiddleWidthProgress.vue | 2 +- .../layout/PlayBar/MiniWidthProgress.vue | 6 +- .../layout/PlayDetail/LyricPlayer.vue | 8 +- .../components/layout/PlayDetail/PlayBar.vue | 16 +- .../PlayDetail/components/LyricMenu.vue | 10 +- .../components/MusicComment/CommentFloor.vue | 4 +- .../components/MusicComment/index.vue | 4 +- .../components/layout/PlayDetail/index.vue | 8 +- .../components/layout/Toolbar/index.vue | 4 +- .../components/material/OnlineList/index.vue | 2 +- .../components/material/SearchInput.vue | 8 +- .../useApp/usePlayer/useMediaSessionInfo.ts | 3 +- .../core/useApp/usePlayer/useSoundEffect.ts | 63 +- src/renderer/core/useApp/useSettingSync.ts | 4 +- src/renderer/index.html | 1 + src/renderer/main.ts | 7 +- src/renderer/plugins/Dialog/Dialog.vue | 4 +- src/renderer/plugins/Dialog/index.js | 2 +- src/renderer/plugins/SvgIcon/index.js | 8 +- src/renderer/plugins/i18n.ts | 4 +- src/renderer/plugins/player/index.ts | 8 +- src/renderer/router.ts | 22 +- src/renderer/store/index.ts | 6 +- src/renderer/tsconfig.json | 17 +- src/renderer/types/env.d.ts | 2 + src/renderer/types/i18n.d.ts | 2 +- .../utils/musicSdk/api-source-info.js | 2 +- src/renderer/utils/musicSdk/api-source.js | 19 +- src/renderer/utils/musicSdk/kg/songList.js | 2 +- .../utils/musicSdk/kg/vendors/infSign.min.js | 2 +- src/renderer/utils/update.js | 2 +- src/renderer/views/Download/index.vue | 2 +- src/renderer/views/List/MusicList/index.vue | 6 +- .../MyList/components/DuplicateMusicModal.vue | 4 +- .../List/MyList/components/ListSortModal.vue | 2 +- .../MyList/components/ListUpdateModal.vue | 2 +- src/renderer/views/List/MyList/index.vue | 6 +- src/renderer/views/List/index.vue | 4 +- .../views/Search/components/BlankView.vue | 14 +- .../Setting/components/PlayTimeoutModal.vue | 8 +- .../Setting/components/SettingBackup.vue | 8 +- .../views/Setting/components/SettingBasic.vue | 18 +- .../components/SettingDesktopLyric.vue | 8 +- .../Setting/components/SettingDownload.vue | 8 +- .../views/Setting/components/SettingOther.vue | 8 +- .../views/Setting/components/SettingSync.vue | 4 - .../Setting/components/SettingUpdate.vue | 4 +- .../components/ThemeEditModal/index.vue | 10 +- .../Setting/components/ThemeSelectorModal.vue | 4 +- .../views/Setting/components/UserApiModal.vue | 6 +- src/renderer/views/Setting/index.vue | 30 +- src/renderer/views/songList/Detail/index.vue | 12 +- .../List/components/OpenListModal.vue | 2 +- .../songList/List/components/SortTab.vue | 2 +- .../songList/List/components/TagList.vue | 2 +- src/renderer/worker/utils/index.ts | 21 +- tsconfig.json | 10 +- 166 files changed, 3071 insertions(+), 11869 deletions(-) create mode 100644 .eslintrc.base.cjs create mode 100644 .github/workflows/eslint.yml delete mode 100644 build-config/css-loader.config.js delete mode 100644 build-config/main/webpack.config.base.js delete mode 100644 build-config/main/webpack.config.dev.js delete mode 100644 build-config/main/webpack.config.prod.js delete mode 100644 build-config/renderer-lyric/webpack.config.base.js delete mode 100644 build-config/renderer-lyric/webpack.config.dev.js delete mode 100644 build-config/renderer-lyric/webpack.config.prod.js delete mode 100644 build-config/renderer-scripts/webpack.config.base.js delete mode 100644 build-config/renderer-scripts/webpack.config.dev.js delete mode 100644 build-config/renderer-scripts/webpack.config.prod.js delete mode 100644 build-config/renderer/webpack.config.base.js delete mode 100644 build-config/renderer/webpack.config.dev.js delete mode 100644 build-config/renderer/webpack.config.prod.js delete mode 100644 build-config/utils.js create mode 100644 build-config/vite/configs/main.ts rename postcss.config.js => build-config/vite/configs/postcss.config.js (100%) create mode 100644 build-config/vite/configs/renderer-lyric.ts create mode 100644 build-config/vite/configs/renderer-scripts.ts create mode 100644 build-config/vite/configs/renderer.ts create mode 100644 build-config/vite/copyAssets.ts create mode 100644 build-config/vite/pack.ts create mode 100644 build-config/vite/runner-dev.ts create mode 100644 build-config/vite/utils.ts create mode 100644 build-config/vite/worker.ts delete mode 100644 build-config/vue-loader.config.js delete mode 100644 build-config/webpack-build-config.js create mode 100644 src/common/.eslintrc.cjs rename src/common/theme/{images => theme_images}/china_ink.jpg (100%) rename src/common/theme/{images => theme_images}/jqbg.jpg (100%) rename src/common/theme/{images => theme_images}/landingMoon.png (100%) rename src/common/theme/{images => theme_images}/myzcbg.jpg (100%) rename src/common/theme/{images => theme_images}/xnkl.png (100%) create mode 100644 src/lang/.eslintrc.cjs create mode 100644 src/main/.eslintrc.cjs delete mode 100644 src/main/modules/userApi/config/index.js create mode 100644 src/main/modules/userApi/config/index.ts rename src/main/modules/userApi/rendererEvent/{name.js => name.ts} (88%) create mode 100644 src/main/utils/logInit.ts create mode 100644 src/renderer-lyric/.eslintrc.cjs create mode 100644 src/renderer/.eslintrc.cjs delete mode 100644 src/renderer/components/common/SoundEffectBtn/AddPitchShifterPresetBtn.vue create mode 100644 src/renderer/types/env.d.ts diff --git a/.eslintrc.base.cjs b/.eslintrc.base.cjs new file mode 100644 index 00000000..526fe23e --- /dev/null +++ b/.eslintrc.base.cjs @@ -0,0 +1,84 @@ +const baseRule = { + 'no-new': 'off', + camelcase: 'off', + 'no-return-assign': 'off', + 'space-before-function-paren': ['error', 'never'], + 'no-var': 'error', + 'no-fallthrough': 'off', + 'prefer-promise-reject-errors': 'off', + eqeqeq: 'off', + 'no-multiple-empty-lines': [1, { max: 2 }], + 'comma-dangle': [2, 'always-multiline'], + 'standard/no-callback-literal': 'off', + 'prefer-const': 'off', + 'no-labels': 'off', + 'node/no-callback-literal': 'off', + 'multiline-ternary': 'off', +} +const typescriptRule = { + ...baseRule, + '@typescript-eslint/strict-boolean-expressions': 'off', + '@typescript-eslint/explicit-function-return-type': 'off', + '@typescript-eslint/space-before-function-paren': 'off', + '@typescript-eslint/no-non-null-assertion': 'off', + '@typescript-eslint/restrict-template-expressions': [1, { + allowBoolean: true, + allowAny: true, + }], + '@typescript-eslint/restrict-plus-operands': [1, { + allowBoolean: true, + allowAny: true, + }], + '@typescript-eslint/naming-convention': 'off', + '@typescript-eslint/return-await': 'off', + '@typescript-eslint/ban-ts-comment': 'off', + '@typescript-eslint/comma-dangle': 'off', +} +const vueRule = { + ...baseRule, + 'vue/multi-word-component-names': 'off', + 'vue/max-attributes-per-line': 'off', + 'vue/singleline-html-element-content-newline': 'off', + 'vue/use-v-on-exact': 'off', +} + +exports.base = { + extends: ['standard'], + plugins: ['html'], + rules: baseRule, + parser: '@babel/eslint-parser', +} + +exports.typescript = { + files: ['*.ts'], + rules: typescriptRule, + parser: '@typescript-eslint/parser', + extends: [ + 'standard-with-typescript', + ], +} + +exports.vue = { + files: ['*.vue'], + rules: vueRule, + parser: 'vue-eslint-parser', + extends: [ + // 'plugin:vue/vue3-essential', + 'plugin:vue/base', + 'plugin:vue/vue3-recommended', + 'plugin:vue-pug/vue3-recommended', + // "plugin:vue/strongly-recommended" + 'standard-with-typescript', + ], + parserOptions: { + sourceType: 'module', + parser: { + // Script parser for ` + diff --git a/src/renderer-lyric/main.ts b/src/renderer-lyric/main.ts index d369ad3b..9ccf53ae 100644 --- a/src/renderer-lyric/main.ts +++ b/src/renderer-lyric/main.ts @@ -6,7 +6,7 @@ import mountComponents from './components' import App from './App.vue' -import '@/common/error' +import '@root/common/error' import { getSetting, onMainWindowInited, onSettingChanged, sendConnectMainWindowEvent } from './utils/ipc' import { initSetting, mergeSetting } from './store/action' import { init as initMainWindowChannel } from './core/mainWindowChannel' diff --git a/src/renderer-lyric/plugins/i18n.ts b/src/renderer-lyric/plugins/i18n.ts index 62c5c5c7..5ab89219 100644 --- a/src/renderer-lyric/plugins/i18n.ts +++ b/src/renderer-lyric/plugins/i18n.ts @@ -1,5 +1,5 @@ -import type { I18n } from '@/lang' -import { createI18n, i18nPlugin, useI18n } from '@/lang' +import type { I18n } from '@root/lang' +import { createI18n, i18nPlugin, useI18n } from '@root/lang' window.i18n = createI18n() diff --git a/src/renderer-lyric/tsconfig.json b/src/renderer-lyric/tsconfig.json index 20f1407f..8ce4c1e4 100644 --- a/src/renderer-lyric/tsconfig.json +++ b/src/renderer-lyric/tsconfig.json @@ -2,12 +2,13 @@ "extends": "../../tsconfig.json", "compilerOptions": { "isolatedModules": true, + "moduleResolution": "nodenext", "paths": { /* Specify a set of entries that re-map imports to additional lookup locations. */ "@common/*": ["common/*"], // "@renderer/*": ["renderer/*"], "@lyric/*": ["renderer-lyric/*"], "@static/*": ["static/*"], - "@/*": ["./*"], + "@root/*": ["./*"], }, "typeRoots": [ /* Specify multiple folders that act like './node_modules/@types'. */ "./types" diff --git a/src/renderer/.eslintrc.cjs b/src/renderer/.eslintrc.cjs new file mode 100644 index 00000000..85bb85dd --- /dev/null +++ b/src/renderer/.eslintrc.cjs @@ -0,0 +1,19 @@ +/* eslint-env node */ +const { base, typescript, vue } = require('../../.eslintrc.base.cjs') + +module.exports = { + root: true, + ...base, + overrides: [ + vue, + { + ...typescript, + parserOptions: { + project: './tsconfig.json', + }, + }, + ], + ignorePatterns: [ + 'vendors', + ], +} diff --git a/src/renderer/components/base/Checkbox.vue b/src/renderer/components/base/Checkbox.vue index 4a6f6aff..b05941c6 100644 --- a/src/renderer/components/base/Checkbox.vue +++ b/src/renderer/components/base/Checkbox.vue @@ -51,7 +51,7 @@ export default { default: false, }, }, - emits: ['update:model-value', 'change'], + emits: ['update:modelValue', 'change'], data() { return { checked: false, @@ -80,7 +80,7 @@ export default { modelValue = checked } else modelValue = checked ? this.value : '' } - this.$emit('update:model-value', modelValue) + this.$emit('update:modelValue', modelValue) this.$emit('change', modelValue) }, setValue(value) { diff --git a/src/renderer/components/base/Input.vue b/src/renderer/components/base/Input.vue index ed232621..5f440f89 100644 --- a/src/renderer/components/base/Input.vue +++ b/src/renderer/components/base/Input.vue @@ -52,7 +52,7 @@ export default { // default: true, // }, }, - emits: ['update:model-value', 'submit', 'change'], + emits: ['update:modelValue', 'submit', 'change'], methods: { handleInput(event) { let value = event.target.value @@ -60,7 +60,7 @@ export default { value = value.trim() event.target.value = value } - this.$emit('update:model-value', value) + this.$emit('update:modelValue', value) }, focus() { this.$refs.dom_input.focus() @@ -78,7 +78,7 @@ export default { // if (dom_input.selectionStart == dom_input.selectionEnd) { const value = text.substring(0, dom_input.selectionStart) + str + text.substring(dom_input.selectionEnd, text.length) event.target.value = value - this.$emit('update:model-value', value) + this.$emit('update:modelValue', value) // } else { // clipboardWriteText(text.substring(dom_input.selectionStart, dom_input.selectionEnd)) // } diff --git a/src/renderer/components/base/Menu.vue b/src/renderer/components/base/Menu.vue index 3f673155..1444449e 100644 --- a/src/renderer/components/base/Menu.vue +++ b/src/renderer/components/base/Menu.vue @@ -48,13 +48,13 @@ export default { default: 'name', }, }, - emits: ['update:model-value', 'menu-click'], + emits: ['update:modelValue', 'menu-click'], setup(props, { emit }) { const visible = computed(() => props.modelValue) const location = computed(() => props.xy) const onHide = () => { - emit('update:model-value', false) + emit('update:modelValue', false) menuClick(null) } diff --git a/src/renderer/components/base/Selection.vue b/src/renderer/components/base/Selection.vue index 0612c33b..ac32b265 100644 --- a/src/renderer/components/base/Selection.vue +++ b/src/renderer/components/base/Selection.vue @@ -42,7 +42,7 @@ export default { default: '', }, }, - emits: ['update:model-value', 'change'], + emits: ['update:modelValue', 'change'], data() { return { show: false, @@ -84,7 +84,7 @@ export default { handleClick(item) { // console.log(this.modelValue) if (item === this.modelValue) return - this.$emit('update:model-value', this.itemKey ? item[this.itemKey] : item) + this.$emit('update:modelValue', this.itemKey ? item[this.itemKey] : item) this.$emit('change', item) }, handleShow() { diff --git a/src/renderer/components/base/SliderBar.vue b/src/renderer/components/base/SliderBar.vue index 2bab768f..eb6cb26b 100644 --- a/src/renderer/components/base/SliderBar.vue +++ b/src/renderer/components/base/SliderBar.vue @@ -1,6 +1,6 @@ diff --git a/src/renderer/components/material/OnlineList/index.vue b/src/renderer/components/material/OnlineList/index.vue index e2b2c7c0..a585532e 100644 --- a/src/renderer/components/material/OnlineList/index.vue +++ b/src/renderer/components/material/OnlineList/index.vue @@ -285,7 +285,7 @@ export default { diff --git a/src/renderer/views/Setting/components/SettingBasic.vue b/src/renderer/views/Setting/components/SettingBasic.vue index ff358c52..c12e34c1 100644 --- a/src/renderer/views/Setting/components/SettingBasic.vue +++ b/src/renderer/views/Setting/components/SettingBasic.vue @@ -20,7 +20,7 @@ dd div(:class="$style.bg") div(:class="$style.bgContent") svg-icon(:class="$style.icon" name="plus") - span(:class="$style.label") {{$t('theme_add')}} + span(:class="$style.label") {{ $t('theme_add') }} dd div @@ -33,7 +33,7 @@ dd .gap-top base-checkbox(id="setting_to_tray" :model-value="appSetting['tray.enable']" :label="$t('setting__basic_to_tray')" @update:model-value="updateSetting({'tray.enable': $event})") .p.gap-top - base-btn.btn(min @click="isShowPlayTimeoutModal = true") {{$t('setting__play_timeout')}} {{ timeLabel ? ` (${timeLabel})` : '' }} + base-btn.btn(min @click="isShowPlayTimeoutModal = true") {{ $t('setting__play_timeout')}} {{ timeLabel ? ` (${timeLabel})` : '' }} dd h3#basic_source {{ $t('setting__basic_source') }} @@ -43,7 +43,7 @@ dd :id="`setting_api_source_${item.id}`" name="setting_api_source" need :model-value="appSetting['common.apiSource']" :disabled="item.disabled" :value="item.id" :label="item.label" @update:model-value="updateSetting({'common.apiSource': $event})") .p.gap-top - base-btn.btn(min @click="isShowUserApiModal = true") {{$t('setting__basic_source_user_api_btn')}} + base-btn.btn(min @click="isShowUserApiModal = true") {{ $t('setting__basic_source_user_api_btn') }} dd h3#basic_window_size {{ $t('setting__basic_window_size') }} @@ -55,7 +55,7 @@ dd dd h3#basic_font_size {{ $t('setting__basic_font_size') }} div - //- base-selection.gap-teft(:list="fontSizeList" :modelValue="appSetting['common.fontSize']" @update:model-value="updateSetting({'common.fontSize': $event})") + //- base-selection.gap-teft(:list="fontSizeList" :model-value="appSetting['common.fontSize']" @update:model-value="updateSetting({'common.fontSize': $event})") base-checkbox.gap-left( v-for="item in fontSizeList" :id="`setting_basic_font_size_${item.id}`" :key="item.id" name="setting_basic_font_size" need :model-value="appSetting['common.fontSize']" :value="item.id" @@ -107,16 +107,16 @@ user-api-modal(v-model="isShowUserApiModal") diff --git a/src/renderer/views/Setting/components/SettingOther.vue b/src/renderer/views/Setting/components/SettingOther.vue index 8090d617..eb3dc71e 100644 --- a/src/renderer/views/Setting/components/SettingOther.vue +++ b/src/renderer/views/Setting/components/SettingOther.vue @@ -15,7 +15,7 @@ dd | {{ $t('setting__other_resource_cache_label') }} span.auto-hidden {{ cacheSize }} .p - base-btn.btn(min :disabled="isDisabledResourceCacheClear" @click="clearResourceCache") {{$t('setting__other_resource_cache_clear_btn')}} + base-btn.btn(min :disabled="isDisabledResourceCacheClear" @click="clearResourceCache") {{ $t('setting__other_resource_cache_clear_btn') }} dd h3#other_other_source {{ $t('setting__other_other_cache') }} @@ -32,7 +32,7 @@ dd .p base-btn.btn(min :disabled="isDisabledOtherSourceCacheClear" @click="handleClearOtherSourceCache") {{ $t('setting__other_other_source_clear_btn') }} base-btn.btn(min :disabled="isDisabledMusicUrlCacheClear" @click="handleClearMusicUrlCache") {{ $t('setting__other_music_url_clear_btn') }} - base-btn.btn(min :disabled="isDisabledLyricRawCacheClear" @click="handleClearLyricRawCache") {{$t('setting__other_lyric_raw_clear_btn')}} + base-btn.btn(min :disabled="isDisabledLyricRawCacheClear" @click="handleClearLyricRawCache") {{ $t('setting__other_lyric_raw_clear_btn') }} dd h3#other_lyric_edited {{ $t('setting__other_lyric_edited_cache') }} @@ -41,13 +41,13 @@ dd | {{ $t('setting__other_lyric_edited_label') }} span.auto-hidden {{ lyricEditedCount }} .p - base-btn.btn(min :disabled="isDisabledLyricEditedCacheClear" @click="handleClearLyricEditedCache") {{$t('setting__other_lyric_edited_clear_btn')}} + base-btn.btn(min :disabled="isDisabledLyricEditedCacheClear" @click="handleClearLyricEditedCache") {{ $t('setting__other_lyric_edited_clear_btn') }} dd h3#other_lyric_edited {{ $t('setting__other_listdata') }} div .p - base-btn.btn(min @click="handleClearListData") {{$t('setting__other_listdata_clear_btn')}} + base-btn.btn(min @click="handleClearListData") {{ $t('setting__other_listdata_clear_btn') }} diff --git a/src/renderer/views/Setting/components/SettingSync.vue b/src/renderer/views/Setting/components/SettingSync.vue index 4ed451c0..1afa7470 100644 --- a/src/renderer/views/Setting/components/SettingSync.vue +++ b/src/renderer/views/Setting/components/SettingSync.vue @@ -120,10 +120,6 @@ export default {