diff --git a/.ncurc.js b/.ncurc.js index 8bcfcffa..f607d668 100644 --- a/.ncurc.js +++ b/.ncurc.js @@ -1,7 +1,6 @@ module.exports = { upgrade: true, reject: [ - 'vue-loader', 'webpack-dev-server', 'eslint', 'electron', diff --git a/.vscode/settings.json b/.vscode/settings.json index 0730dd7c..b7ce6379 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -7,13 +7,15 @@ "@common/*": "${workspaceFolder}/src/common/*", }, "i18n-ally.localesPaths": [ - "src/renderer/lang" + "src/lang" ], + // "i18n-ally.fullReloadOnChanged": true, + "i18n-ally.keystyle": "nested", "i18n-ally.displayLanguage": "zh-cn", "i18n-ally.sourceLanguage": "zh-cn", - "i18n-ally.namespace": true, - "i18n-ally.translate.engines": ["google-cn", "google"], - "i18n-ally.pathMatcher": "{locale}/{namespaces}.json", - "i18n-ally.keystyle": "flat", + "i18n-ally.translate.engines": [ + "google-cn", + "google" + ], "i18n-ally.sortKeys": true } diff --git a/FAQ.md b/FAQ.md index 711e3eb6..dbe0dfa8 100644 --- a/FAQ.md +++ b/FAQ.md @@ -250,6 +250,13 @@ Windows 7 未开启 Aero 效果时桌面歌词会有问题，详情看上面的 - 以管理员权限打开`cmd`，输入`sfc /scannow`回车等待检查完成重启电脑 - 若上面的方法**修复、重启**电脑后仍然不行，就自行百度弹出的**错误信息**看下别人是怎么解决的 +## MAC OS无法启动软件，提示 lx-music-desktop 已损坏 + +这是因为软件没有签名，被系统阻止运行，
+在终端里输入 `sudo xattr -rd com.apple.quarantine /Applications/lx-music-desktop.app`，然后输入你的电脑密码即可 + +还可以参考： + ## 杀毒软件提示有病毒或恶意行为 本人只能保证我写的代码不包含任何**恶意代码**、**收集用户信息**的行为，并且软件代码已开源，请自行查阅，软件安装包也是由CI拉取源代码构建，构建日志：[GitHub Actions](https://github.com/lyswhut/lx-music-desktop/actions)
diff --git a/README.md b/README.md index f32dd72c..d5bf470b 100644 --- a/README.md +++ b/README.md @@ -36,8 +36,8 @@ 所用技术栈： -- Electron 15 -- Vue 2 +- Electron 13 +- Vue 3 已支持的平台： diff --git a/build-config/renderer-lyric/webpack.config.base.js b/build-config/renderer-lyric/webpack.config.base.js index 354bb3cf..523bb150 100644 --- a/build-config/renderer-lyric/webpack.config.base.js +++ b/build-config/renderer-lyric/webpack.config.base.js @@ -1,5 +1,5 @@ const path = require('path') -const VueLoaderPlugin = require('vue-loader/lib/plugin') +const { VueLoaderPlugin } = require('vue-loader') const HTMLPlugin = require('html-webpack-plugin') const MiniCssExtractPlugin = require('mini-css-extract-plugin') const CleanCSSPlugin = require('less-plugin-clean-css') @@ -23,6 +23,7 @@ module.exports = { }, resolve: { alias: { + '@': path.join(__dirname, '../../src'), '@main': path.join(__dirname, '../../src/main'), '@renderer': path.join(__dirname, '../../src/renderer'), '@lyric': path.join(__dirname, '../../src/renderer-lyric'), @@ -126,7 +127,6 @@ module.exports = { template: path.join(__dirname, '../../src/renderer-lyric/index.pug'), isProd: process.env.NODE_ENV == 'production', browser: process.browser, - scriptLoading: 'blocking', __dirname, }), new VueLoaderPlugin(), diff --git a/build-config/renderer-lyric/webpack.config.prod.js b/build-config/renderer-lyric/webpack.config.prod.js index a2bc7ba2..5c582010 100644 --- a/build-config/renderer-lyric/webpack.config.prod.js +++ b/build-config/renderer-lyric/webpack.config.prod.js @@ -9,7 +9,8 @@ const baseConfig = require('./webpack.config.base') const { dependencies } = require('../../package.json') -let whiteListedModules = ['vue'] +// let whiteListedModules = ['vue'] +let whiteListedModules = ['vue', 'vue-router', 'vuex', 'vue-i18n'] module.exports = merge(baseConfig, { diff --git a/build-config/renderer/webpack.config.base.js b/build-config/renderer/webpack.config.base.js index 8705b907..a5855856 100644 --- a/build-config/renderer/webpack.config.base.js +++ b/build-config/renderer/webpack.config.base.js @@ -1,5 +1,5 @@ const path = require('path') -const VueLoaderPlugin = require('vue-loader/lib/plugin') +const { VueLoaderPlugin } = require('vue-loader') const HTMLPlugin = require('html-webpack-plugin') const MiniCssExtractPlugin = require('mini-css-extract-plugin') const CleanCSSPlugin = require('less-plugin-clean-css') @@ -23,6 +23,7 @@ module.exports = { }, resolve: { alias: { + '@': path.join(__dirname, '../../src'), '@main': path.join(__dirname, '../../src/main'), '@renderer': path.join(__dirname, '../../src/renderer'), '@lyric': path.join(__dirname, '../../src/renderer-lyric'), @@ -123,10 +124,9 @@ module.exports = { plugins: [ new HTMLPlugin({ filename: 'index.html', - template: path.join(__dirname, '../../src/renderer/index.pug'), + template: path.join(__dirname, '../../src/renderer/index.html'), isProd: process.env.NODE_ENV == 'production', browser: process.browser, - scriptLoading: 'blocking', __dirname, }), new VueLoaderPlugin(), diff --git a/build-config/renderer/webpack.config.prod.js b/build-config/renderer/webpack.config.prod.js index a2bc7ba2..f908a5c1 100644 --- a/build-config/renderer/webpack.config.prod.js +++ b/build-config/renderer/webpack.config.prod.js @@ -9,7 +9,7 @@ const baseConfig = require('./webpack.config.base') const { dependencies } = require('../../package.json') -let whiteListedModules = ['vue'] +let whiteListedModules = ['vue', 'vue-router', 'vuex', 'vue-i18n'] module.exports = merge(baseConfig, { @@ -34,6 +34,7 @@ module.exports = merge(baseConfig, { }), ], optimization: { + minimize: false, minimizer: [ new TerserPlugin(), new CssMinimizerPlugin(), diff --git a/package-lock.json b/package-lock.json index 7a4bf349..24d2a206 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "lx-music-desktop", - "version": "1.15.3", + "version": "1.16.0-beta", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -3001,6 +3001,55 @@ "integrity": "sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==", "dev": true }, + "@intlify/core-base": { + "version": "9.2.0-beta.22", + "resolved": "https://registry.npmjs.org/@intlify/core-base/-/core-base-9.2.0-beta.22.tgz", + "integrity": "sha512-SqgQx+npGJ8XgY920FoHnvfo7Th4bEFPxOUrMquqHCHH7J/HSLV6Xppzf8wE1ZzCWjn1wmUHkavTW9ASNCXj0Q==", + "requires": { + "@intlify/devtools-if": "9.2.0-beta.22", + "@intlify/message-compiler": "9.2.0-beta.22", + "@intlify/shared": "9.2.0-beta.22", + "@intlify/vue-devtools": "9.2.0-beta.22" + } + }, + "@intlify/devtools-if": { + "version": "9.2.0-beta.22", + "resolved": "https://registry.npmjs.org/@intlify/devtools-if/-/devtools-if-9.2.0-beta.22.tgz", + "integrity": "sha512-TRpig6P7hMZejDvmwTGygf+TbGUkeICnIMtNqKCMkAw78Yoc5FhgaKTCkK72Gjcmul7V9CdOF+ro/xtzY6MQGQ==", + "requires": { + "@intlify/shared": "9.2.0-beta.22" + } + }, + "@intlify/message-compiler": { + "version": "9.2.0-beta.22", + "resolved": "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-9.2.0-beta.22.tgz", + "integrity": "sha512-+Nx8IpKcXBQ7L+f6UWLQf/iReD7rotBkV4oxUX1rKMQgaJToYB1ovrPYNoNDd6aK4rEQ9sJoM5nd2+ENmCs7dA==", + "requires": { + "@intlify/shared": "9.2.0-beta.22", + "source-map": "0.6.1" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" + } + } + }, + "@intlify/shared": { + "version": "9.2.0-beta.22", + "resolved": "https://registry.npmjs.org/@intlify/shared/-/shared-9.2.0-beta.22.tgz", + "integrity": "sha512-IyU9Trx1d5EZgAh6/3y0+efgko5xRw1iTwpM19qublZsTSnDSkHB8NnSyHVZrMARj+LgZgL7pKktsSO5os9k2A==" + }, + "@intlify/vue-devtools": { + "version": "9.2.0-beta.22", + "resolved": "https://registry.npmjs.org/@intlify/vue-devtools/-/vue-devtools-9.2.0-beta.22.tgz", + "integrity": "sha512-CZwrIFGiXl9q6Rrqyqtb3P+wwG7f0FcMvbQqJf2CnCsT7rLi4O+qbSzY5ZjN5J0bsLTfL2a4UIhxIlim4Ea+hQ==", + "requires": { + "@intlify/core-base": "9.2.0-beta.22", + "@intlify/shared": "9.2.0-beta.22" + } + }, "@malept/cross-spawn-promise": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz", @@ -3280,89 +3329,141 @@ "integrity": "sha512-7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw==", "dev": true }, - "@vue/component-compiler-utils": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-3.2.2.tgz", - "integrity": "sha512-rAYMLmgMuqJFWAOb3Awjqqv5X3Q3hVr4jH/kgrFJpiU0j3a90tnNBplqbj+snzrgZhC9W128z+dtgMifOiMfJg==", - "dev": true, + "@vue/compiler-core": { + "version": "3.2.23", + "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.23.tgz", + "integrity": "sha512-4ZhiI/orx+7EJ1B+0zjgvXMV2uRN+XBfG06UN2sJfND9rH5gtEQT3QmO4erum1o6Irl7y754W8/KSaDJh4EUQg==", "requires": { - "consolidate": "^0.15.1", - "hash-sum": "^1.0.2", - "lru-cache": "^4.1.2", - "merge-source-map": "^1.1.0", - "postcss": "^7.0.36", - "postcss-selector-parser": "^6.0.2", - "prettier": "^1.18.2", - "source-map": "~0.6.1", - "vue-template-es2015-compiler": "^1.9.0" + "@babel/parser": "^7.15.0", + "@vue/shared": "3.2.23", + "estree-walker": "^2.0.2", + "source-map": "^0.6.1" }, "dependencies": { - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "dependencies": { - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "lru-cache": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", - "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", - "dev": true, - "requires": { - "pseudomap": "^1.0.2", - "yallist": "^2.1.2" - } - }, - "postcss": { - "version": "7.0.36", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz", - "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==", - "dev": true, - "requires": { - "chalk": "^2.4.2", - "source-map": "^0.6.1", - "supports-color": "^6.1.0" - } + "@babel/parser": { + "version": "7.16.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.4.tgz", + "integrity": "sha512-6V0qdPUaiVHH3RtZeLIsc+6pDhbYzHR8ogA8w+f+Wc77DuXto19g2QUwveINoS34Uw+W8/hQDGJCx+i4n7xcng==" }, "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - }, - "supports-color": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", - "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - }, - "yallist": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", - "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=", - "dev": true + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" } } }, + "@vue/compiler-dom": { + "version": "3.2.23", + "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.23.tgz", + "integrity": "sha512-X2Nw8QFc5lgoK3kio5ktM95nqmLUH+q+N/PbV4kCHzF1avqv/EGLnAhaaF0Iu4bewNvHJAAhhwPZFeoV/22nbw==", + "requires": { + "@vue/compiler-core": "3.2.23", + "@vue/shared": "3.2.23" + } + }, + "@vue/compiler-sfc": { + "version": "3.2.23", + "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.23.tgz", + "integrity": "sha512-Aw+pb50Q5zTjyvWod8mNKmYZDRGHJBptmNNWE+84ZxrzEztPgMz8cNYIzWGbwcFVkmJlhvioAMvKnB+LM/sjSA==", + "requires": { + "@babel/parser": "^7.15.0", + "@vue/compiler-core": "3.2.23", + "@vue/compiler-dom": "3.2.23", + "@vue/compiler-ssr": "3.2.23", + "@vue/ref-transform": "3.2.23", + "@vue/shared": "3.2.23", + "estree-walker": "^2.0.2", + "magic-string": "^0.25.7", + "postcss": "^8.1.10", + "source-map": "^0.6.1" + }, + "dependencies": { + "@babel/parser": { + "version": "7.16.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.4.tgz", + "integrity": "sha512-6V0qdPUaiVHH3RtZeLIsc+6pDhbYzHR8ogA8w+f+Wc77DuXto19g2QUwveINoS34Uw+W8/hQDGJCx+i4n7xcng==" + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" + } + } + }, + "@vue/compiler-ssr": { + "version": "3.2.23", + "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.23.tgz", + "integrity": "sha512-Bqzn4jFyXPK1Ehqiq7e/czS8n62gtYF1Zfeu0DrR5uv+SBllh7LIvZjZU6+c8qbocAd3/T3I3gn2cZGmnDb6zg==", + "requires": { + "@vue/compiler-dom": "3.2.23", + "@vue/shared": "3.2.23" + } + }, + "@vue/devtools-api": { + "version": "6.0.0-beta.20.1", + "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.0.0-beta.20.1.tgz", + "integrity": "sha512-R2rfiRY+kZugzWh9ZyITaovx+jpU4vgivAEAiz80kvh3yviiTU3CBuGuyWpSwGz9/C7TkSWVM/FtQRGlZ16n8Q==" + }, + "@vue/reactivity": { + "version": "3.2.23", + "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.23.tgz", + "integrity": "sha512-8RGVr/5Kpgb/EkCjgHXqttgA5IMc6n0lIXFY4TVbMkzdXrvaIhzBd7Te44oIDsTSYVKZLpfHd6/wEnuDqE8vFw==", + "requires": { + "@vue/shared": "3.2.23" + } + }, + "@vue/ref-transform": { + "version": "3.2.23", + "resolved": "https://registry.npmjs.org/@vue/ref-transform/-/ref-transform-3.2.23.tgz", + "integrity": "sha512-gW0GD2PSAs/th7mC7tPB/UwpIQxclbApVtsDtscDmOJXb2+cdu60ny+SuHNgfrlUT/JqWKQHq7jFKO4woxLNaA==", + "requires": { + "@babel/parser": "^7.15.0", + "@vue/compiler-core": "3.2.23", + "@vue/shared": "3.2.23", + "estree-walker": "^2.0.2", + "magic-string": "^0.25.7" + }, + "dependencies": { + "@babel/parser": { + "version": "7.16.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.4.tgz", + "integrity": "sha512-6V0qdPUaiVHH3RtZeLIsc+6pDhbYzHR8ogA8w+f+Wc77DuXto19g2QUwveINoS34Uw+W8/hQDGJCx+i4n7xcng==" + } + } + }, + "@vue/runtime-core": { + "version": "3.2.23", + "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.23.tgz", + "integrity": "sha512-wSI5lmY2kCGLf89iiygqxVh6/5bsawz78Me9n1x4U2bHnN0yf3PWyuhN0WgIE8VfEaF7e75E333uboNEIFjgkg==", + "requires": { + "@vue/reactivity": "3.2.23", + "@vue/shared": "3.2.23" + } + }, + "@vue/runtime-dom": { + "version": "3.2.23", + "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.2.23.tgz", + "integrity": "sha512-z6lp0888NkLmxD9j2sGoll8Kb7J743s8s6w7GbiyUc4WZwm0KJ35B4qTFDMoIU0G7CatS6Z+yRTpPHc6srtByg==", + "requires": { + "@vue/runtime-core": "3.2.23", + "@vue/shared": "3.2.23", + "csstype": "^2.6.8" + } + }, + "@vue/server-renderer": { + "version": "3.2.23", + "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.2.23.tgz", + "integrity": "sha512-mgQ2VAE5WjeZELJKNbwE69uiBNpN+3LyL0ZDki1bJWVwHD2fhPfx7pwyYuiucE81xz2LxVsyGxhKKUL997g8vw==", + "requires": { + "@vue/compiler-ssr": "3.2.23", + "@vue/shared": "3.2.23" + } + }, + "@vue/shared": { + "version": "3.2.23", + "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.23.tgz", + "integrity": "sha512-U+/Jefa0QfXUF2qVy9Dqlrb6HKJSr9/wJcM66wXmWcTOoqg7hOWzF4qruDle51pyF4x3wMn6TSH54UdjKjCKMA==" + }, "@webassemblyjs/ast": { "version": "1.11.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz", @@ -4631,12 +4732,61 @@ "wrap-ansi": "^7.0.0" }, "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, "camelcase": { "version": "6.2.0", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz", "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==", "dev": true }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + }, "type-fest": { "version": "0.20.2", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", @@ -4742,6 +4892,15 @@ "temp-file": "^3.4.0" }, "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, "builder-util-runtime": { "version": "8.7.7", "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.7.7.tgz", @@ -4752,6 +4911,31 @@ "sax": "^1.2.4" } }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, "debug": { "version": "4.3.2", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", @@ -4772,6 +4956,12 @@ "universalify": "^2.0.0" } }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, "jsonfile": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", @@ -4782,6 +4972,15 @@ "universalify": "^2.0.0" } }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + }, "universalify": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", @@ -4800,9 +4999,9 @@ }, "dependencies": { "debug": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", - "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", + "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", "requires": { "ms": "2.1.2" } @@ -4924,9 +5123,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001282", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001282.tgz", - "integrity": "sha512-YhF/hG6nqBEllymSIjLtR2iWDDnChvhnVJqp+vloyt2tEHFG1yBR+ac2B/rOw0qOK0m0lEXU2dv4E/sMk5P9Kg==", + "version": "1.0.30001283", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001283.tgz", + "integrity": "sha512-9RoKo841j1GQFSJz/nCXOj0sD7tHBtlowjYlrqIUS812x9/emfBLBt6IyMz1zIaYc/eRL8Cs6HPUVi2Hzq4sIg==", "dev": true }, "caseless": { @@ -4942,6 +5141,57 @@ "requires": { "chalk": "^4.1.2", "window-size": "^1.1.1" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } } }, "chalk": { @@ -5559,15 +5809,6 @@ "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==", "dev": true }, - "consolidate": { - "version": "0.15.1", - "resolved": "https://registry.npmjs.org/consolidate/-/consolidate-0.15.1.tgz", - "integrity": "sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw==", - "dev": true, - "requires": { - "bluebird": "^3.1.1" - } - }, "constantinople": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/constantinople/-/constantinople-4.0.1.tgz", @@ -5679,9 +5920,9 @@ "dev": true }, "ajv": { - "version": "8.8.1", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.8.1.tgz", - "integrity": "sha512-6CiMNDrzv0ZR916u2T+iRunnD60uWmNn8SkdB44/6stVORUg0aAkWO7PkOhpCmjmW8f2I/G/xnowD66fxGyQJg==", + "version": "8.8.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.8.2.tgz", + "integrity": "sha512-x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw==", "dev": true, "requires": { "fast-deep-equal": "^3.1.1", @@ -5691,9 +5932,9 @@ } }, "ajv-keywords": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.0.0.tgz", - "integrity": "sha512-ULd1QMjRoH6JDNUQIfDLrlE+OgZlFaxyYCjzt58uNuUQtKXt8/U+vK/8Ql0gyn/C5mqZzUWtKMqr/4YquvTrWA==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz", + "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==", "dev": true, "requires": { "fast-deep-equal": "^3.1.3" @@ -5822,12 +6063,12 @@ "dev": true }, "core-js-compat": { - "version": "3.19.1", - "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.19.1.tgz", - "integrity": "sha512-Q/VJ7jAF/y68+aUsQJ/afPOewdsGkDtcMb40J8MbuWKlK3Y+wtHq8bTHKPj2WKWLIqmS5JhHs4CzHtz6pT2W6g==", + "version": "3.19.2", + "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.19.2.tgz", + "integrity": "sha512-ObBY1W5vx/LFFMaL1P5Udo4Npib6fu+cMokeziWkA8Tns4FcDemKF5j9JvaI5JhdkW8EQJQGJN1EcrzmEwuAqQ==", "dev": true, "requires": { - "browserslist": "^4.17.6", + "browserslist": "^4.18.1", "semver": "7.0.0" }, "dependencies": { @@ -6126,6 +6367,11 @@ "css-tree": "^1.1.2" } }, + "csstype": { + "version": "2.6.19", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.19.tgz", + "integrity": "sha512-ZVxXaNy28/k3kJg0Fou5MiYpp88j7H9hLZp8PDC3jV0WFjfH5E9xHb56L0W59cPbKbcHXeP4qyT8PrHp8t6LcQ==" + }, "dashdash": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", @@ -6608,6 +6854,15 @@ "yargs": "^17.0.1" }, "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, "builder-util-runtime": { "version": "8.7.7", "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.7.7.tgz", @@ -6618,6 +6873,31 @@ "sax": "^1.2.4" } }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, "debug": { "version": "4.3.2", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", @@ -6638,6 +6918,12 @@ "universalify": "^2.0.0" } }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, "jsonfile": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", @@ -6654,6 +6940,15 @@ "integrity": "sha512-0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q==", "dev": true }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + }, "universalify": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", @@ -6745,6 +7040,15 @@ "mime": "^2.5.2" }, "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, "builder-util-runtime": { "version": "8.7.7", "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.7.7.tgz", @@ -6755,6 +7059,31 @@ "sax": "^1.2.4" } }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, "debug": { "version": "4.3.2", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", @@ -6775,6 +7104,12 @@ "universalify": "^2.0.0" } }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, "jsonfile": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", @@ -6797,6 +7132,15 @@ "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==", "dev": true }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + }, "universalify": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", @@ -6923,9 +7267,9 @@ "integrity": "sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==" }, "debug": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", - "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", + "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", "requires": { "ms": "2.1.2" } @@ -7228,6 +7572,51 @@ "sprintf-js": "~1.0.2" } }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, "escape-string-regexp": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", @@ -7255,6 +7644,12 @@ "type-fest": "^0.20.2" } }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, "ignore": { "version": "4.0.6", "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", @@ -7794,6 +8189,11 @@ "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", "dev": true }, + "estree-walker": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz", + "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==" + }, "esutils": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", @@ -8944,9 +9344,9 @@ "dev": true }, "hash-sum": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz", - "integrity": "sha1-M7QHd3VMZDJXPBIMw4CLvRDUfwQ=", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-2.0.0.tgz", + "integrity": "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==", "dev": true }, "he": { @@ -10463,6 +10863,14 @@ "yallist": "^4.0.0" } }, + "magic-string": { + "version": "0.25.7", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz", + "integrity": "sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==", + "requires": { + "sourcemap-codec": "^1.4.4" + } + }, "make-dir": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.0.2.tgz", @@ -10566,23 +10974,6 @@ "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=", "dev": true }, - "merge-source-map": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.1.0.tgz", - "integrity": "sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==", - "dev": true, - "requires": { - "source-map": "^0.6.1" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } - } - }, "merge-stream": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", @@ -10657,9 +11048,9 @@ "dev": true }, "ajv": { - "version": "8.8.1", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.8.1.tgz", - "integrity": "sha512-6CiMNDrzv0ZR916u2T+iRunnD60uWmNn8SkdB44/6stVORUg0aAkWO7PkOhpCmjmW8f2I/G/xnowD66fxGyQJg==", + "version": "8.8.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.8.2.tgz", + "integrity": "sha512-x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw==", "dev": true, "requires": { "fast-deep-equal": "^3.1.1", @@ -10669,9 +11060,9 @@ } }, "ajv-keywords": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.0.0.tgz", - "integrity": "sha512-ULd1QMjRoH6JDNUQIfDLrlE+OgZlFaxyYCjzt58uNuUQtKXt8/U+vK/8Ql0gyn/C5mqZzUWtKMqr/4YquvTrWA==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz", + "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==", "dev": true, "requires": { "fast-deep-equal": "^3.1.3" @@ -10726,6 +11117,11 @@ "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", "dev": true }, + "mitt": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.0.tgz", + "integrity": "sha512-7dX2/10ITVyqh4aOSVI9gdape+t9l2/8QxHrFmUXu4EEUpdlxl6RudZUPZoc+zuY2hk1j7XxVroIVIan/pD/SQ==" + }, "mixin-deep": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz", @@ -10787,8 +11183,7 @@ "nanoid": { "version": "3.1.30", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.30.tgz", - "integrity": "sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ==", - "dev": true + "integrity": "sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ==" }, "nanomatch": { "version": "1.2.13", @@ -11413,8 +11808,7 @@ "picocolors": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", - "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", - "dev": true + "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==" }, "picomatch": { "version": "2.2.2", @@ -11558,7 +11952,6 @@ "version": "8.4.4", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.4.tgz", "integrity": "sha512-joU6fBsN6EIer28Lj6GDFoC/5yOZzLCfn0zHAn/MYXI7aPt4m4hK5KC5ovEZXy+lnCjmYIbQWngvju2ddyEr8Q==", - "dev": true, "requires": { "nanoid": "^3.1.30", "picocolors": "^1.0.0", @@ -11964,13 +12357,6 @@ "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=", "dev": true }, - "prettier": { - "version": "1.19.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz", - "integrity": "sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==", - "dev": true, - "optional": true - }, "pretty-error": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-4.0.0.tgz", @@ -12025,12 +12411,6 @@ "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=", "dev": true }, - "pseudomap": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", - "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=", - "dev": true - }, "psl": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz", @@ -13352,9 +13732,9 @@ }, "dependencies": { "debug": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", - "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", + "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", "requires": { "ms": "2.1.2" } @@ -13377,9 +13757,9 @@ }, "dependencies": { "debug": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", - "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", + "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", "requires": { "ms": "2.1.2" } @@ -13431,8 +13811,7 @@ "source-map-js": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.1.tgz", - "integrity": "sha512-4+TN2b3tqOCd/kaGRJ/sTYA0tR0mdXx26ipdolxcwtJVqEnqNYvlCAt1q3ypy4QMlYus+Zh34RNtYLoq2oQ4IA==", - "dev": true + "integrity": "sha512-4+TN2b3tqOCd/kaGRJ/sTYA0tR0mdXx26ipdolxcwtJVqEnqNYvlCAt1q3ypy4QMlYus+Zh34RNtYLoq2oQ4IA==" }, "source-map-resolve": { "version": "0.5.3", @@ -13471,6 +13850,11 @@ "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=", "dev": true }, + "sourcemap-codec": { + "version": "1.4.8", + "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz", + "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==" + }, "spdy": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz", @@ -14471,12 +14855,52 @@ "xdg-basedir": "^4.0.0" }, "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, "ci-info": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz", "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==", "dev": true }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, "is-ci": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz", @@ -14494,6 +14918,15 @@ "requires": { "lru-cache": "^6.0.0" } + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } } } }, @@ -14687,47 +15120,107 @@ "dev": true }, "vue": { - "version": "2.6.14", - "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.14.tgz", - "integrity": "sha512-x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ==" - }, - "vue-hot-reload-api": { - "version": "2.3.4", - "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz", - "integrity": "sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog==", - "dev": true + "version": "3.2.23", + "resolved": "https://registry.npmjs.org/vue/-/vue-3.2.23.tgz", + "integrity": "sha512-MGp9JZC37lzGhwSu6c1tQxrQbXbw7XKFqtYh7SFwNrNK899FPxGAHwSHMZijMChTSC3uZrD2BGO/3EHOgMJ0cw==", + "requires": { + "@vue/compiler-dom": "3.2.23", + "@vue/compiler-sfc": "3.2.23", + "@vue/runtime-dom": "3.2.23", + "@vue/server-renderer": "3.2.23", + "@vue/shared": "3.2.23" + } }, "vue-i18n": { - "version": "8.26.7", - "resolved": "https://registry.npmmirror.com/vue-i18n/download/vue-i18n-8.26.7.tgz?cache=0&sync_timestamp=1635872432438&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fvue-i18n%2Fdownload%2Fvue-i18n-8.26.7.tgz", - "integrity": "sha1-rf1INzRJ/jFDjEjjs71DBE3DpoE=" + "version": "9.2.0-beta.22", + "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-9.2.0-beta.22.tgz", + "integrity": "sha512-XnkGLhC1ESZYiCpWnTkAsc3/z8p2ntu5dmQjp9M0hhOZi5w8JZ8VQieJiiq5MFlqjVeIxNkGMn6HM0hvC4xtFA==", + "requires": { + "@intlify/core-base": "9.2.0-beta.22", + "@intlify/shared": "9.2.0-beta.22", + "@intlify/vue-devtools": "9.2.0-beta.22", + "@vue/devtools-api": "^6.0.0-beta.13" + } }, "vue-loader": { - "version": "15.9.8", - "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.9.8.tgz", - "integrity": "sha512-GwSkxPrihfLR69/dSV3+5CdMQ0D+jXg8Ma1S4nQXKJAznYFX14vHdc/NetQc34Dw+rBbIJyP7JOuVb9Fhprvog==", + "version": "16.8.3", + "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz", + "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==", "dev": true, "requires": { - "@vue/component-compiler-utils": "^3.1.0", - "hash-sum": "^1.0.2", - "loader-utils": "^1.1.0", - "vue-hot-reload-api": "^2.3.0", - "vue-style-loader": "^4.1.0" + "chalk": "^4.1.0", + "hash-sum": "^2.0.0", + "loader-utils": "^2.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "loader-utils": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz", + "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==", + "dev": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + } + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } } }, "vue-router": { - "version": "3.5.3", - "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.5.3.tgz", - "integrity": "sha512-FUlILrW3DGitS2h+Xaw8aRNvGTwtuaxrRkNSHWTizOfLUie7wuYwezeZ50iflRn8YPV5kxmU2LQuu3nM/b3Zsg==" - }, - "vue-style-loader": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.3.tgz", - "integrity": "sha512-sFuh0xfbtpRlKfm39ss/ikqs9AbKCoXZBpHeVZ8Tx650o0k0q/YCM7FRvigtxpACezfq6af+a7JeqVTWvncqDg==", - "dev": true, + "version": "4.0.12", + "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.0.12.tgz", + "integrity": "sha512-CPXvfqe+mZLB1kBWssssTiWg4EQERyqJZes7USiqfW9B5N2x+nHlnsM1D3b5CaJ6qgCvMmYJnz+G0iWjNCvXrg==", "requires": { - "hash-sum": "^1.0.2", - "loader-utils": "^1.0.2" + "@vue/devtools-api": "^6.0.0-beta.18" } }, "vue-template-compiler": { @@ -14740,16 +15233,13 @@ "he": "^1.1.0" } }, - "vue-template-es2015-compiler": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz", - "integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==", - "dev": true - }, "vuex": { - "version": "3.6.2", - "resolved": "https://registry.npm.taobao.org/vuex/download/vuex-3.6.2.tgz", - "integrity": "sha1-I2vAhqhww655lG8QfxbeWdWJXnE=" + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/vuex/-/vuex-4.0.2.tgz", + "integrity": "sha512-M6r8uxELjZIK8kTKDGgZTYX/ahzblnzC4isU1tpmEuOIIKmV+TRdc+H4s8ds2NuZ7wpUTdGRzJRtoj+lI+pc0Q==", + "requires": { + "@vue/devtools-api": "^6.0.0-beta.11" + } }, "watchpack": { "version": "2.3.0", diff --git a/package.json b/package.json index 3c2f082b..6e2adf34 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lx-music-desktop", - "version": "1.15.3", + "version": "1.16.0-beta", "description": "一个免费的音乐查找助手", "main": "./dist/electron/main.js", "productName": "lx-music-desktop", @@ -70,7 +70,7 @@ "up": "cross-env ELECTRON_GET_USE_PROXY=true GLOBAL_AGENT_HTTPS_PROXY=http://localhost:1081 npm i" }, "browserslist": [ - "Electron 15.2.0" + "Electron 13.4.0" ], "engines": { "node": ">= 14" @@ -221,7 +221,7 @@ "spinnies": "^0.5.1", "terser-webpack-plugin": "^5.2.5", "url-loader": "^4.1.1", - "vue-loader": "^15.9.8", + "vue-loader": "^16.8.3", "vue-template-compiler": "^2.6.14", "webpack": "^5.64.4", "webpack-cli": "^4.9.1", @@ -241,14 +241,15 @@ "image-size": "^1.0.0", "koa": "^2.13.4", "long": "^5.2.0", + "mitt": "^3.0.0", "needle": "^3.0.0", "node-id3": "^0.2.3", "request": "^2.88.2", "socket.io": "^4.4.0", "utf-8-validate": "^5.0.7", - "vue": "^2.6.14", - "vue-i18n": "^8.26.7", - "vue-router": "^3.5.3", - "vuex": "^3.6.2" + "vue": "^3.2.23", + "vue-i18n": "^9.2.0-beta.22", + "vue-router": "^4.0.12", + "vuex": "^4.0.2" } } diff --git a/publish/changeLog.md b/publish/changeLog.md index f58f7d9f..40737581 100644 --- a/publish/changeLog.md +++ b/publish/changeLog.md @@ -1,3 +1,12 @@ +### 新增 + +- 播放详情页新增音量控制条 +- 播放详情页新增桌面歌词切换按钮 + ### 优化 -- 优化歌词自动换源机制 +- 优化列表性能，软件整体性能 + +### 其他 + +- 升级vue到 3.x diff --git a/src/common/config.js b/src/common/config.js index c6568f1d..ad870979 100644 --- a/src/common/config.js +++ b/src/common/config.js @@ -53,4 +53,76 @@ module.exports = { navigationUrlWhiteList: [ ], + themes: [ + { + id: 0, + name: '绿意盎然', + className: 'green', + }, + { + id: 1, + name: '蓝田生玉', + className: 'blue', + }, + { + id: 2, + name: '信口雌黄', + className: 'yellow', + }, + { + id: 3, + name: '橙黄橘绿', + className: 'orange', + }, + { + id: 4, + name: '热情似火', + className: 'red', + }, + { + id: 10, + name: '粉装玉琢', + className: 'pink', + }, + { + id: 5, + name: '重斤球紫', + className: 'purple', + }, + { + id: 6, + name: '灰常美丽', + className: 'grey', + }, + { + id: 11, + name: '青出于黑', + className: 'ming', + }, + { + id: 12, + name: '青出于黑', + className: 'blue2', + }, + { + id: 13, + name: '黑纸白字', + className: 'black', + }, + { + id: 7, + name: '月里嫦娥', + className: 'mid_autumn', + }, + { + id: 8, + name: '木叶之村', + className: 'naruto', + }, + { + id: 9, + name: '新年快乐', + className: 'happy_new_year', + }, + ], } diff --git a/src/common/ipcNames.js b/src/common/ipcNames.js index e2674b51..113c290c 100644 --- a/src/common/ipcNames.js +++ b/src/common/ipcNames.js @@ -8,6 +8,8 @@ const names = { clear_cache: 'clear_cache', get_cache_size: 'get_cache_size', get_env_params: 'get_env_params', + wait: 'wait', + wait_cancel: 'wait_cancel', set_music_meta: 'set_music_meta', progress: 'progress', @@ -35,7 +37,7 @@ const names = { lang_s2t: 'lang_s2t', - // handle_kw_decode_lyric: 'handle_kw_decode_lyric', + handle_kw_decode_lyric: 'handle_kw_decode_lyric', get_lyric_info: 'get_lyric_info', set_lyric_info: 'set_lyric_info', set_config: 'set_config', diff --git a/src/renderer/lang/Readme.md b/src/lang/Readme.md similarity index 100% rename from src/renderer/lang/Readme.md rename to src/lang/Readme.md diff --git a/src/lang/en-us.json b/src/lang/en-us.json new file mode 100644 index 00000000..a8524339 --- /dev/null +++ b/src/lang/en-us.json @@ -0,0 +1,389 @@ +{ + "action": "Manage", + "agree": "Accept", + "download": "Downloads", + "leaderboard": "Charts", + "my_list": "Your Library", + "search": "Search", + "setting": "Settings", + "song_list": "Playlists", + "close": "Close", + "comment__hot_load_error": "Hot comments failed to load, click to try to reload", + "comment__hot_loading": "Hot comments are loading", + "comment__hot_title": "Hot Comment", + "comment__new_load_error": "The latest comment failed to load, click to try to reload", + "comment__new_loading": "Latest comments are loading", + "comment__new_title": "Latest comment", + "comment__no_content": "No comments yet", + "comment__refresh": "Refresh comments", + "comment__show": "Song comments", + "comment__title": "{name} comment", + "copy_tip": " (Click to copy)", + "default_list": "Recently Played", + "desktop_lyric__back": "Back", + "desktop_lyric__close": "Close", + "desktop_lyric__font_decrease": "Reduce font size (Right click to fine-tune)", + "desktop_lyric__font_increase": "Increase font size (Right click to fine-tune)", + "desktop_lyric__lock": "Lock Lyrics", + "desktop_lyric__lrc_active_zoom_off": "Unzoom the currently playing lyrics", + "desktop_lyric__lrc_active_zoom_on": "Zoom the currently playing lyrics", + "desktop_lyric__opactiy_decrease": "Increase Transparency (Right click to fine-tune)", + "desktop_lyric__opactiy_increase": "Decrease Transparency (Right click to fine-tune)", + "desktop_lyric__theme": "Theme Color", + "desktop_lyric__unlock": "Unlock Lyrics", + "desktop_lyric__win_top_off": "Cancel the top lyrics interface", + "desktop_lyric__win_top_on": "Top lyrics interface", + "download__high_quality": "High Quality", + "download__lossless": "Lossless", + "download__multiple_tip": "{len} song selected", + "download__multiple_tip2": "Select preferred download quality", + "download__normal": "Normal", + "download__not_available_tip": "The audio quality is not available", + "list__add_to": "Add to ...", + "list__collect": "Collect", + "list__copy_name": "Copy name", + "list__download": "Download", + "list__file": "Locate the file", + "list__load_failed": "Ah, the loading failed 😭", + "list__loading": "List loading...⏳", + "list__move_to": "Move to ...", + "list__pause": "Pause Task", + "list__play": "Play", + "list__play_later": "Play later", + "list__remove": "Remove", + "list__search": "Search", + "list__sort": "Adjust position", + "list__source_detail": "Song Page", + "list__start": "Start Task", + "list_add__btn_title": "Add the song(s) to {name}", + "list_add__multiple_btn_title": "Add these song(s) to {name}", + "list_add__multiple_title_add": "Add the selected {num} song(s) to ...", + "list_add__multiple_title_move": "Move the selected {num} song(s) to ...", + "list_add__title_first_add": "Add", + "list_add__title_first_move": "Move", + "list_add__title_last": "to...", + "lists__duplicate": "Duplicate song", + "lists__export": "Export", + "lists__export_part_desc": "Choose where to save the list file", + "lists__import": "Import", + "lists__import_part_button_cancel": "No", + "lists__import_part_button_confirm": "Overwrite", + "lists__import_part_confirm": "The imported list ({importName}) has the same ID as the local list ({localName}). Do you overwrite the local list?", + "lists__import_part_desc": "Select list file", + "lists__movedown": "Move Down", + "lists__moveup": "Move Up", + "lists__new_list_btn": "Create list", + "lists__new_list_input": "New list...", + "lists__remove": "Remove", + "lists__remove_tip": "Do you really want to remove {name}?", + "lists__remove_tip_button": "Yes, that's right", + "lists__rename": "Rename", + "lists__sync": "Update", + "load_list_file_error_detail": "We have helped you back up the old list file to {path}\nIt is stored in JSON format, you can try to repair and restore it manually\n\nError details: {detail}", + "load_list_file_error_title": "Error loading playlist data", + "loding_list": "Loading...", + "love_list": "Favorites", + "lyric__load_error": "Failed to get lyrics", + "lyric__select": "Lyric text selection", + "min": "Minimize", + "music_album": "Album", + "music_name": "Name", + "music_singer": "Artist", + "music_time": "Length", + "no_item": "Nothing's here...", + "not_agree": "Not accept", + "pagination__next": "Next page", + "pagination__page": "Page {num}", + "pagination__prev": "Previous page", + "player__add_music_to": "Add the current song to...", + "player__buffering": "Buffering...", + "player__desktop_lyric_lock": "Right click to lock lyrics", + "player__desktop_lyric_off": "Close Desktop Lyrics", + "player__desktop_lyric_on": "Open Desktop Lyrics", + "player__desktop_lyric_unlock": "Right click to unlock lyrics", + "player__end": "Stopped", + "player__error": "Error loading music. Switch to next song after 5 seconds", + "player__geting_url": "Getting music link...", + "player__hide_detail_tip": "Hide detail page (Right-click in the view to quickly hide the details page)", + "player__loading": "Music loading...", + "player__music_album": "Album: ", + "player__music_name": "Name: ", + "player__music_singer": "Artist: ", + "player__next": "Next", + "player__pause": "Pause", + "player__pic_tip": "Right click to locate the currently playing song in \"My List\"", + "player__play": "Play", + "player__play_toggle_mode_list": "Play in order", + "player__play_toggle_mode_list_loop": "List Loop", + "player__play_toggle_mode_off": "Disable", + "player__play_toggle_mode_random": "List Random", + "player__play_toggle_mode_single_loop": "Single Loop", + "player__playing": "Now playing...", + "player__prev": "Prev", + "player__refresh_url": "Music URL expired, refreshing...", + "player__stop": "Paused", + "player__volume": "Volume: ", + "source_alias_all": "Aggregated", + "source_alias_bd": "BD Music", + "source_alias_kg": "KG Music", + "source_alias_kw": "KW Music", + "source_alias_mg": "MG Music", + "source_alias_tx": "TX Music", + "source_alias_wy": "WY Music", + "source_alias_xm": "XM Music", + "source_all": "Aggregated", + "source_bd": "Baidu", + "source_kg": "Kugou", + "source_kw": "Kuwo", + "source_mg": "Migu", + "source_tx": "Tencent", + "source_wy": "Netease", + "source_xm": "Xiami", + "sync__merge_btn_local_remote": "Local list merge remote list", + "sync__merge_btn_remote_local": "Remote list merge local list", + "sync__merge_label": "Merge", + "sync__merge_tip": "Merge:", + "sync__merge_tip_desc": "Merge the two lists together, the same song will be removed (the song of the merged person is removed), and different songs will be added.", + "sync__other_label": "Other", + "sync__other_tip": "Other: ", + "sync__other_tip_desc": "\"Only use real-time synchronization function\" will not modify the lists of both parties, only real-time synchronization operations; \"Cancel synchronization\" will directly disconnect the two parties.", + "sync__overwrite": "Full coverage", + "sync__overwrite_btn_cancel": "Cancel sync", + "sync__overwrite_btn_local_remote": "Local list Overwrite remote list", + "sync__overwrite_btn_none": "Only use real-time synchronization", + "sync__overwrite_btn_remote_local": "Remote list Overwrite local list", + "sync__overwrite_label": "Cover", + "sync__overwrite_tip": "Cover: ", + "sync__overwrite_tip_desc": "The list with the same ID of the covered person and the covered list will be deleted and replaced with the list of the covered person (lists with different list IDs will be merged together). If you check Complete coverage, all lists of the covered person will be moved. \nDivide, and then replace with a list of overriders.", + "sync__title": "Choose how to synchronize the list with {name}", + "tag__high_quality": "HQ", + "tag__lossless": "SQ", + "theme_black": "Black", + "theme_blue": "Blue", + "theme_blue2": "Purple Blue", + "theme_green": "Green", + "theme_grey": "Grey", + "theme_happy_new_year": "New Year", + "theme_mid_autumn": "Mid-Autumn", + "theme_ming": "Ming", + "theme_naruto": "Naruto", + "theme_orange": "Orange", + "theme_pink": "Pink", + "theme_purple": "Purple", + "theme_red": "Red", + "theme_yellow": "Yellow", + "search__welcome": "Search what I want to 😉", + "search__hot_search": "Top Searches", + "history_search": "History Searches", + "history_clear": "Clear History", + "history_remove": "Right click to remove this entry", + "download__progress": "Progress", + "download__status": "Status", + "download__quality": "Quality", + "download__all": "All Tasks", + "download__runing": "Downloading", + "download__paused": "Paused", + "download__error": "Error", + "download__finished": "Download complete", + "back": "Back", + + "songlist__open_list": "open {name} playlist", + "songlist__import_input_tip": "Enter songlist link or songlist ID", + "songlist__import_input_tip_1": "Cross-source playlists are not supported, please confirm whether the playlist to be opened corresponds to the current playlist source", + "songlist__import_input_tip_2": "If you encounter a link to a playlist that cannot be opened, welcome feedback", + "songlist__import_input_tip_3": "Kugou source does not support opening with playlist ID, but supports Kugou code opening", + "default": "Default", + "music_duplicate": "Duplicate song", + "export": "Export", + "list__export_part_desc": "Choose where to save the list file", + "import": "Import", + "list__import_part_button_cancel": "Don't", + "list__import_part_button_confirm": "Overwrite", + "list__import_part_confirm": "The imported list ({importName}) has the same ID as the local list ({localName}). Do you want to overwrite the local list?", + "list__import_part_desc": "Select List File", + "list__movedown": "Movedown", + "list__moveup": "Move up", + "list__new_list_btn": "New List", + "list__new_list_input": "New list...", + "list__remove_tip": "Do you really want to remove {name}?", + "list__remove_tip_button": "Yes, that's right", + "list__rename": "Rename", + "list__sync": "Update", + + "music_sort__title": "Adjust the position of {name} to:", + "music_sort__title_multiple": "Adjust the position of the selected {num} songs to:", + "music_sort__input_tip": "Please input which position you want to adjust to", + "music_sort__btn_confirm": "Confirm", + + "cancel_button_text": "Cancel", + "confirm_button_text": "OK", + "date_format_hour": "{num} hours ago", + "date_format_minute": "{num} minutes ago", + "date_format_second": "{num} seconds ago", + + + "setting__about": "About lx-music-desktop", + "setting__backup": "Backup and restore", + "setting__backup_all": "All data (list data and setting data)", + "setting__backup_all_export": "Export", + "setting__backup_all_export_desc": "Select the backup to...", + "setting__backup_all_import": "Import", + "setting__backup_all_import_desc": "Select a backup file", + "setting__backup_part": "Partial data (list data includes audition list, favorite list, user-defined list, setting data does not include shortcut key settings)", + "setting__backup_part_export_list": "Export lists", + "setting__backup_part_export_list_desc": "Save the list to...", + "setting__backup_part_export_setting": "Export settings", + "setting__backup_part_export_setting_desc": "Save the list to...", + "setting__backup_part_import_list": "Import lists", + "setting__backup_part_import_list_desc": "Select a list backup", + "setting__backup_part_import_setting": "Import settings", + "setting__backup_part_import_setting_desc": "Select the Settings file", + "setting__basic": "General", + "setting__basic_animation": "Random pop-up animation", + "setting__basic_control_btn_position": "Control Button Position", + "setting__basic_control_btn_position_left": "Left", + "setting__basic_control_btn_position_right": "Right", + "setting__basic_lang": "Language", + "setting__basic_lang_title": "The language displayed in the software", + "setting__basic_show_animation": "Show switching animation", + "setting__basic_source": "Music source", + "setting__basic_source_status_failed": "Initialization failed", + "setting__basic_source_status_initing": "Initializing", + "setting__basic_source_status_success": "Initialization successful", + "setting__basic_source_temp": "Temporary API (some features not available; workaround if Test API unavailable)", + "setting__basic_source_test": "Test API (Available for most software features)", + "setting__basic_source_title": "Choose a music source", + "setting__basic_source_user_api_btn": "Custom Source Management", + "setting__basic_sourcename": "Source name", + "setting__basic_sourcename_alias": "Aliases", + "setting__basic_sourcename_real": "Original", + "setting__basic_sourcename_title": "Select the name of music source", + "setting__basic_theme": "Theme", + "setting__basic_to_tray": "Do not exit the software when closing the software and minimize it to the system tray", + "setting__basic_window_size": "Window size", + "setting__basic_window_size_big": "Large", + "setting__basic_window_size_huge": "Huge", + "setting__basic_window_size_larger": "Larger", + "setting__basic_window_size_medium": "Medium", + "setting__basic_window_size_oversized": "Oversized", + "setting__basic_window_size_small": "Small", + "setting__basic_window_size_smaller": "Smaller", + "setting__basic_window_size_title": "Set the window size", + "setting__click_copy": "Click to copy", + "setting__click_open": "Click to open", + "setting__desktop_lyric": "Desktop Lyric Settings", + "setting__desktop_lyric_always_on_top": "Make the lyrics always above other windows", + "setting__desktop_lyric_enable": "Display lyrics", + "setting__desktop_lyric_font": "Lyric font", + "setting__desktop_lyric_font_default": "Default", + "setting__desktop_lyric_lock": "Lock lyrics", + "setting__desktop_lyric_lock_screen": "It is not allowed to drag the lyrics window out of the main screen", + "setting__download": "Download", + "setting__download_data_embed": "Whether to embed the following content in the audio file", + "setting__download_embed_lyric": "Embedding lyric", + "setting__download_embed_pic": "Embedding cover", + "setting__download_enable": "Whether to enable download function", + "setting__download_lyric": "Lyrics download", + "setting__download_lyric_format": "Downloaded lyrics file encoding format", + "setting__download_lyric_format_gbk": "GBK (Try to select this format when Chinese garbled characters appear on some devices)", + "setting__download_lyric_format_utf8": "UTF-8", + "setting__download_lyric_title": "Select whether to download the lyrics file", + "setting__download_name": "Music file naming", + "setting__download_name1": "Title - Artist", + "setting__download_name2": "Artist - Title", + "setting__download_name3": "Title only", + "setting__download_name_title": "Select the music naming method for downloading", + "setting__download_path": "Download path", + "setting__download_path_change_btn": "Change", + "setting__download_path_label": "Current: ", + "setting__download_path_open_label": "Click to open this path", + "setting__download_path_title": "Define the path to downloading", + "setting__download_select_save_path": "Select the save path", + "setting__download_use_other_source": "Automatically change the source to download (when the song cannot be downloaded from the original source, try to switch to another source to download. Note: this function does not 100% guarantee that the version of the song after the source is changed is the same as the original version)", + "setting__hot_key": "Shortcut Key Settings", + "setting__hot_key_common_focus_search_input": "Focus Search Box", + "setting__hot_key_common_min": "Minimize the program", + "setting__hot_key_common_toggle_close": "Quit Program", + "setting__hot_key_common_toggle_hide": "Show/Hide Program", + "setting__hot_key_common_toggle_min": "Minimize/Restore Program", + "setting__hot_key_desktop_lyric_toggle_always_top": "Top Desktop Lyrics Switch", + "setting__hot_key_desktop_lyric_toggle_lock": "Desktop Lyric Lock Switch", + "setting__hot_key_desktop_lyric_toggle_visible": "Turn on/off desktop lyrics", + "setting__hot_key_global_title": "Global Shortcut Key", + "setting__hot_key_local_title": "Shortcut Keys in Software", + "setting__hot_key_player_next": "Next Song", + "setting__hot_key_player_prev": "Previous Song", + "setting__hot_key_player_toggle_play": "Play/Pause Control", + "setting__hot_key_player_volume_down": "Reduce Volume", + "setting__hot_key_player_volume_mute": "Mute Switch", + "setting__hot_key_player_volume_up": "Increase Volume", + "setting__hot_key_tip_input": "Please enter a new key", + "setting__hot_key_unset_input": "Not Set", + "setting__is_enable": "Enabled", + "setting__is_show": "Showed", + "setting__list": "List", + "setting__list_add_music_location_type": "Position when adding a song to the list", + "setting__list_add_music_location_type_bottom": "Bottom", + "setting__list_add_music_location_type_top": "Top", + "setting__list_scroll": "Remember the position of the scroll bar of the playlist (only valid for my music classification)", + "setting__list_source": "Show song source (only valid for my music category)", + "setting__network": "Network", + "setting__network_proxy_host": "Host", + "setting__network_proxy_password": "Password", + "setting__network_proxy_port": "Port", + "setting__network_proxy_title": "HTTP Proxy (False setting would block Internet connections)", + "setting__network_proxy_username": "Username", + "setting__odc": "Auto clear", + "setting__odc_clear_search_input": "Clear the search box when you are not searching", + "setting__odc_clear_search_list": "Clear the search list when you are not searching", + "setting__other": "Extras", + "setting__other_play_list_cache": "List cache management (links to songs that have been cached in my list, alternative sources for playback, after cleaning up, you need to re-acquire them when you play and download songs, and do not clean up if there are no issues related to song playback)", + "setting__other_play_list_cache_clear_btn": "Clear list cache information", + "setting__other_resource_cache": "Resource cache management (pictures, audios and other caches, pictures and other resources will need to be downloaded again after cleaning up, it is not recommended to clean up, the software will dynamically manage the cache size according to the disk space)", + "setting__other_resource_cache_clear_btn": "Clear resource cache", + "setting__other_resource_cache_label": "The software has used cache size: ", + "setting__other_tray_theme": "Tray Icon Style", + "setting__other_tray_theme_black": "Black Color", + "setting__other_tray_theme_native": "Solid Color", + "setting__other_tray_theme_origin": "Primary Color", + "setting__play": "Play", + "setting__play_lyric_lxlrc": "Use Karaoke-style lyrics playback (if supported)", + "setting__play_lyric_transition": "Show lyrics translation", + "setting__play_mediaDevice": "Audio output", + "setting__play_mediaDevice_remove_stop_play": "Pause the song when the current sound output device is changed", + "setting__play_mediaDevice_title": "Select a media device for audio output", + "setting__play_quality": "Play 320K quality songs first (if supported)", + "setting__play_save_play_time": "Remember playback progress", + "setting__play_task_bar": "Show playing progress on the taskbar", + "setting__search": "Search", + "setting__search_focus_search_box": "Automatically focus the search box on startup", + "setting__search_history": "Search history", + "setting__search_hot": "Top Searches", + "setting__sync": "Data synchronization [This is a test function, it is recommended to back up the playlist before using it for the first time]", + "setting__sync_address": "Synchronization service address: {address}", + "setting__sync_auth_code": "Connection code: {code}", + "setting__sync_device": "Connected devices: {devices}", + "setting__sync_enable": "Enable the synchronization function (because the data is transmitted in clear text, please use it under a trusted network)", + "setting__sync_port": "Sync port settings", + "setting__sync_port_tip": "Please enter the synchronization service port number", + "setting__sync_refresh_code": "Refresh the connection code", + "setting__update": "Update", + "setting__update_checking": "Checking for updates...", + "setting__update_current_label": "Current version: ", + "setting__update_downloading": "Update is found and being downloaded...⏳", + "setting__update_init": "Processing update...", + "setting__update_latest": "The software is up-to-date, enjoy yourself!🥂", + "setting__update_latest_label": "Latest version: ", + "setting__update_open_version_modal_btn": "Open the update window🚀", + "setting__update_progress": "Download progress: ", + "setting__update_unknown": "Unknown", + + "user_api__title": "Custom Source Management", + "user_api__readme": "Source writing instructions: ", + "user_api__note": "Tip: Although we have isolated the script's running environment as much as possible, importing scripts containing malicious behaviors may still affect your system. Please import them carefully.", + "user_api__btn_remove": "Remove", + "user_api__btn_import": "Import", + "user_api__btn_export": "Export", + "user_api__import_file": "Select music API script file", + "user_api__noitem": "There is nothing here...😲" +} diff --git a/src/lang/index.js b/src/lang/index.js new file mode 100644 index 00000000..4083ed5c --- /dev/null +++ b/src/lang/index.js @@ -0,0 +1,42 @@ +import zh_cn from './zh-cn.json' +import zh_tw from './zh-tw.json' +import en_us from './en-us.json' + +const langs = [ + { + name: '简体中文', + locale: 'zh-cn', + alternate: 'zh-hans', + country: 'cn', + fallback: true, + message: zh_cn, + }, + { + name: '繁体中文', + locale: 'zh-tw', + alternate: 'zh-hk', + country: 'cn', + message: zh_tw, + }, + { + name: 'English', + locale: 'en-us', + country: 'us', + message: en_us, + }, +] + +const langList = [] +const messages = {} +langs.forEach(item => { + langList.push({ + name: item.name, + locale: item.locale, + }) + messages[item.locale] = item.message +}) + +export { + langList, + messages, +} diff --git a/src/renderer/lang/languages.json b/src/lang/languages.json similarity index 100% rename from src/renderer/lang/languages.json rename to src/lang/languages.json diff --git a/src/lang/zh-cn.json b/src/lang/zh-cn.json new file mode 100644 index 00000000..f3103cd8 --- /dev/null +++ b/src/lang/zh-cn.json @@ -0,0 +1,388 @@ +{ + "search": "搜索", + "song_list": "歌单", + "leaderboard": "排行榜", + "my_list": "我的列表", + "download": "下载", + "min": "最小化", + "close": "关闭", + "setting": "设置", + "download__not_available_tip": "该音质不可用", + "download__lossless": "无损音质", + "download__high_quality": "高品音质", + "download__normal": "普通音质", + "download__multiple_tip": "已选择 {len} 首歌曲", + "download__multiple_tip2": "请选择要优先下载的音质", + "list_add__title_first_add": "添加", + "list_add__title_first_move": "移动", + "list_add__title_last": "到...", + "list_add__btn_title": "把该歌曲添加到 {name}", + "list_add__multiple_title_add": "添加已选的 {num} 首歌曲到...", + "list_add__multiple_title_move": "移动已选的 {num} 首歌曲到...", + "list_add__multiple_btn_title": "把这些歌曲添加到 {name}", + "action": "操作", + "music_album": "专辑", + "default_list": "试听列表", + "list__add_to": "添加到...", + "list__copy_name": "复制歌曲名", + "list__download": "下载", + "list__move_to": "移动到...", + "list__play": "播放", + "list__collect": "收藏", + "list__play_later": "稍后播放", + "list__remove": "删除", + "list__search": "搜索", + "list__sort": "调整位置", + "list__source_detail": "歌曲详情页", + "list__start": "开始任务", + "list__pause": "暂停任务", + "list__file": "定位文件", + "list__load_failed": "啊，加载失败了😭", + "list__loading": "列表加载中...⏳", + "tag__lossless": "SQ", + "tag__high_quality": "HQ", + "lists__duplicate": "重复歌曲", + "lists__export": "导出", + "lists__export_part_desc": "选择列表文件保存位置", + "lists__import": "导入", + "lists__import_part_button_cancel": "不要啊", + "lists__import_part_button_confirm": "覆盖掉", + "lists__import_part_confirm": "导入的列表（{importName}）与本地列表（{localName}）的ID相同，是否覆盖本地列表？", + "lists__import_part_desc": "选择列表文件", + "lists__movedown": "下移", + "lists__moveup": "上移", + "lists__new_list_btn": "新建列表", + "lists__new_list_input": "新列表...", + "lists__remove": "删除", + "lists__remove_tip": "你真的想要移除 {name} 吗？", + "lists__remove_tip_button": "是的 没错", + "lists__rename": "重命名", + "lists__sync": "更新", + "loding": "加载中...", + "love_list": "收藏", + "music_name": "歌曲名", + "no_item": "列表竟然是空的...", + "music_singer": "歌手", + "music_time": "时长", + "sync__merge_btn_local_remote": "本机列表 合并 远程列表", + "sync__merge_btn_remote_local": "远程列表 合并 本机列表", + "sync__merge_label": "合并", + "sync__merge_tip": "合并:", + "sync__merge_tip_desc": "将两边的列表合并到一起，相同的歌曲将被去掉（去掉的是被合并者的歌曲），不同的歌曲将被添加。", + "sync__other_label": "其他", + "sync__other_tip": "其他:", + "sync__other_tip_desc": "“仅使用实时同步功能”将不修改双方的列表，仅实时同步操作；“取消同步”将直接断开双方的连接。", + "sync__overwrite": "完全覆盖", + "sync__overwrite_btn_cancel": "取消同步", + "sync__overwrite_btn_local_remote": "本机列表 覆盖 远程列表", + "sync__overwrite_btn_none": "仅使用实时同步功能", + "sync__overwrite_btn_remote_local": "远程列表 覆盖 本机列表", + "sync__overwrite_label": "覆盖", + "sync__overwrite_tip": "覆盖:", + "sync__overwrite_tip_desc": "被覆盖者与覆盖者列表ID相同的列表将被删除后替换成覆盖者的列表（列表ID不同的列表将被合并到一起），若勾选完全覆盖，则被覆盖者的所有列表将被移除，然后替换成覆盖者的列表。", + "sync__title": "选择与 {name} 的列表同步方式", + "agree": "接受", + "not_agree": "不接受", + "player__add_music_to": "添加当前歌曲到...", + "player__music_album": "专辑名：", + "player__buffering": "缓冲中...", + "comment__hot_load_error": "热门评论加载失败，点击尝试重新加载", + "comment__hot_loading": "热门评论加载中", + "comment__hot_title": "热门评论", + "comment__new_load_error": "最新评论加载失败，点击尝试重新加载", + "comment__new_loading": "最新评论加载中", + "comment__new_title": "最新评论", + "comment__no_content": "暂无评论", + "comment__refresh": "刷新评论", + "comment__show": "歌曲评论", + "comment__title": "{name} 的评论", + "copy_tip": "（点击复制）", + "player__desktop_lyric_lock": "右击锁定歌词", + "player__desktop_lyric_off": "关闭桌面歌词", + "player__desktop_lyric_on": "开启桌面歌词", + "player__desktop_lyric_unlock": "右击解锁歌词", + "player__end": "播放完毕", + "player__error": "音频加载出错，5 秒后切换下一首", + "player__geting_url": "歌曲链接获取中...", + "player__hide_detail_tip": "隐藏详情页（界面内右键双击可快速隐藏详情页）", + "player__loading": "音乐加载中...", + "lyric__load_error": "歌词获取失败", + "lyric__select": "歌词文本选择", + "player__music_name": "歌曲名：", + "player__next": "下一首", + "player__pause": "暂停", + "player__pic_tip": "右击在“我的列表”定位当前播放的歌曲", + "player__play": "播放", + "player__play_toggle_mode_list": "顺序播放", + "player__play_toggle_mode_list_loop": "列表循环", + "player__play_toggle_mode_off": "禁用", + "player__play_toggle_mode_random": "列表随机", + "player__play_toggle_mode_single_loop": "单曲循环", + "player__playing": "播放中...", + "player__prev": "上一首", + "player__refresh_url": "URL过期，正在刷新URL...", + "player__music_singer": "艺术家：", + "player__stop": "暂停播放", + "player__volume": "当前音量：", + "pagination__prev": "上一页", + "pagination__next": "下一页", + "pagination__page": "第 {num} 页", + "desktop_lyric__close": "关闭", + "desktop_lyric__back": "返回", + "desktop_lyric__lock": "锁定歌词", + "desktop_lyric__unlock": "解锁歌词", + "desktop_lyric__theme": "主题配色", + "desktop_lyric__font_increase": "增加字体大小（右击可微调）", + "desktop_lyric__font_decrease": "减小字体大小（右击可微调）", + "desktop_lyric__opactiy_increase": "减小透明度（右击可微调）", + "desktop_lyric__opactiy_decrease": "增加透明度（右击可微调）", + "desktop_lyric__lrc_active_zoom_on": "缩放当前播放的歌词", + "desktop_lyric__lrc_active_zoom_off": "取消缩放当前播放的歌词", + "desktop_lyric__win_top_on": "置顶歌词界面", + "desktop_lyric__win_top_off": "取消置顶歌词界面", + "theme_green": "绿意盎然", + "theme_blue": "蓝田生玉", + "theme_yellow": "信口雌黄", + "theme_orange": "橙黄橘绿", + "theme_red": "热情似火", + "theme_pink": "粉装玉琢", + "theme_purple": "重斤球紫", + "theme_grey": "灰常美丽", + "theme_ming": "青出于黑", + "theme_blue2": "清热版蓝", + "theme_black": "黑灯瞎火", + "theme_mid_autumn": "月里嫦娥", + "theme_naruto": "木叶之村", + "theme_happy_new_year": "新年快乐", + "source_kw": "酷我音乐", + "source_kg": "酷狗音乐", + "source_tx": "企鹅音乐", + "source_wy": "网易音乐", + "source_mg": "咪咕音乐", + "source_xm": "虾米音乐", + "source_bd": "百度音乐", + "source_all": "聚合搜索", + "source_alias_kw": "小蜗音乐", + "source_alias_kg": "小枸音乐", + "source_alias_tx": "小秋音乐", + "source_alias_wy": "小芸音乐", + "source_alias_mg": "小蜜音乐", + "source_alias_xm": "小霞音乐", + "source_alias_bd": "小杜音乐", + "source_alias_all": "聚合大会", + "load_list_file_error_title": "播放列表数据加载错误（建议到GitHub或加群反馈）", + "load_list_file_error_detail": "我们已经帮你把旧的列表文件备份到{path}\n它以 JSON 格式存储，你可以尝试手动修复并恢复它\n\n错误详情：{detail}", + "search__welcome": "搜我所想~~😉", + "search__hot_search": "热门搜索", + "history_search": "历史搜索", + "history_clear": "清空搜索历史", + "history_remove": "右击移除该历史", + + "download__progress": "进度", + "download__status": "状态", + "download__quality": "品质", + "download__all": "全部任务", + "download__runing": "正在下载", + "download__paused": "已暂停", + "download__error": "出错", + "download__finished": "下载完成", + "back": "返回", + + "songlist__open_list": "打开{name}歌单", + "songlist__import_input_tip": "输入歌单链接或歌单ID", + "songlist__import_input_tip_1": "不支持跨源打开歌单，请确认要打开的歌单与当前歌单源是否对应", + "songlist__import_input_tip_2": "若遇到无法打开的歌单链接，欢迎反馈", + "songlist__import_input_tip_3": "酷狗源不支持用歌单ID打开，但支持酷狗码打开", + "default": "默认", + + "music_duplicate": "重复歌曲", + "export": "导出", + "list__export_part_desc": "选择列表文件保存位置", + "import": "导入", + "list__import_part_button_cancel": "不要啊", + "list__import_part_button_confirm": "覆盖掉", + "list__import_part_confirm": "导入的列表（{importName}）与本地列表（{localName}）的ID相同，是否覆盖本地列表？", + "list__import_part_desc": "选择列表文件", + "list__movedown": "下移", + "list__moveup": "上移", + "list__new_list_btn": "新建列表", + "list__new_list_input": "新列表...", + "list__remove_tip": "你真的想要移除 {name} 吗？", + "list__remove_tip_button": "是的 没错", + "list__rename": "重命名", + "list__sync": "更新", + + "music_sort__title": "将 {name} 的位置调整到：", + "music_sort__title_multiple": "将已选的 {num} 首歌曲的位置调整到：", + "music_sort__input_tip": "请输入要调整到第几个位置", + "music_sort__btn_confirm": "确定", + "cancel_button_text": "我不", + "confirm_button_text": "好的", + "date_format_hour": "{num}小时前", + "date_format_minute": "{num}分钟前", + "date_format_second": "{num}秒前", + + "setting__about": "关于洛雪音乐", + "setting__backup": "备份与恢复", + "setting__backup_all": "所有数据（列表数据与设置数据）", + "setting__backup_all_export": "导出", + "setting__backup_all_export_desc": "选择备份保存位置", + "setting__backup_all_import": "导入", + "setting__backup_all_import_desc": "选择备份文件", + "setting__backup_part": "部分数据（列表数据包括试听列表、收藏列表、用户自定义列表，设置数据不包括快捷键设置）", + "setting__backup_part_export_list": "导出列表", + "setting__backup_part_export_list_desc": "选择歌单保存位置", + "setting__backup_part_export_setting": "导出设置", + "setting__backup_part_export_setting_desc": "选择设置保存位置", + "setting__backup_part_import_list": "导入列表", + "setting__backup_part_import_list_desc": "选择列表文件", + "setting__backup_part_import_setting": "导入设置", + "setting__backup_part_import_setting_desc": "选择配置文件", + "setting__basic": "基本设置", + "setting__basic_animation": "弹出层随机动画", + "setting__basic_control_btn_position": "控制按钮位置", + "setting__basic_control_btn_position_left": "左边", + "setting__basic_control_btn_position_right": "右边", + "setting__basic_lang": "语言", + "setting__basic_lang_title": "软件显示的语言", + "setting__basic_show_animation": "显示切换动画", + "setting__basic_source": "音乐来源", + "setting__basic_source_status_failed": "初始化失败", + "setting__basic_source_status_initing": "初始化中", + "setting__basic_source_status_success": "初始化成功", + "setting__basic_source_temp": "临时接口（软件的某些功能不可用，建议测试接口不可用再使用本接口）", + "setting__basic_source_test": "测试接口（几乎软件的所有功能都可用）", + "setting__basic_source_title": "选择音乐来源", + "setting__basic_source_user_api_btn": "自定义源管理", + "setting__basic_sourcename": "音源名字", + "setting__basic_sourcename_alias": "别名", + "setting__basic_sourcename_real": "原名", + "setting__basic_sourcename_title": "选择音源名字类型", + "setting__basic_theme": "主题颜色", + "setting__basic_to_tray": "关闭软件时不退出软件将其最小化到系统托盘", + "setting__basic_window_size": "窗口尺寸", + "setting__basic_window_size_big": "大", + "setting__basic_window_size_huge": "巨大", + "setting__basic_window_size_larger": "较大", + "setting__basic_window_size_medium": "中", + "setting__basic_window_size_oversized": "超大", + "setting__basic_window_size_small": "小", + "setting__basic_window_size_smaller": "较小", + "setting__basic_window_size_title": "设置软件窗口尺寸", + "setting__click_copy": "点击复制", + "setting__click_open": "点击打开", + "setting__desktop_lyric": "桌面歌词设置", + "setting__desktop_lyric_always_on_top": "使歌词总是在其他窗口之上", + "setting__desktop_lyric_enable": "显示歌词", + "setting__desktop_lyric_font": "歌词字体", + "setting__desktop_lyric_font_default": "默认", + "setting__desktop_lyric_lock": "锁定歌词", + "setting__desktop_lyric_lock_screen": "不允许歌词窗口拖出主屏幕之外", + "setting__download": "下载设置", + "setting__download_data_embed": "是否将以下内容嵌入到音频文件中", + "setting__download_embed_lyric": "歌词嵌入", + "setting__download_embed_pic": "封面嵌入", + "setting__download_enable": "是否启用下载功能", + "setting__download_lyric": "歌词下载", + "setting__download_lyric_format": "下载的歌词文件编码格式", + "setting__download_lyric_format_gbk": "GBK（在某些设备上出现中文乱码时可尝试选择此格式）", + "setting__download_lyric_format_utf8": "UTF-8", + "setting__download_lyric_title": "是否同时下载歌词文件", + "setting__download_name": "文件命名方式", + "setting__download_name1": "歌名 - 歌手", + "setting__download_name2": "歌手 - 歌名", + "setting__download_name3": "歌名", + "setting__download_name_title": "下载歌曲时的命名方式", + "setting__download_path": "下载路径", + "setting__download_path_change_btn": "更改", + "setting__download_path_label": "当前下载路径：", + "setting__download_path_open_label": "点击打开当前路径", + "setting__download_path_title": "下载歌曲保存的路径", + "setting__download_select_save_path": "选择歌曲保存路径", + "setting__download_use_other_source": "自动换源下载（当无法从歌曲的原始源下载时，尝试切换到其他源下载，注：此功能不100%保证换源后的歌曲版本与原版一致）", + "setting__hot_key": "快捷键设置", + "setting__hot_key_common_focus_search_input": "聚焦搜索框", + "setting__hot_key_common_min": "最小化程序", + "setting__hot_key_common_toggle_close": "退出程序", + "setting__hot_key_common_toggle_hide": "显示/隐藏程序", + "setting__hot_key_common_toggle_min": "最小化/还原程序", + "setting__hot_key_desktop_lyric_toggle_always_top": "桌面歌词置顶切换", + "setting__hot_key_desktop_lyric_toggle_lock": "桌面歌词锁定切换", + "setting__hot_key_desktop_lyric_toggle_visible": "开/关桌面歌词", + "setting__hot_key_global_title": "全局快捷键", + "setting__hot_key_local_title": "软件内快捷键", + "setting__hot_key_player_next": "下一首歌曲", + "setting__hot_key_player_prev": "上一首歌曲", + "setting__hot_key_player_toggle_play": "播放/暂停控制", + "setting__hot_key_player_volume_down": "减少音量", + "setting__hot_key_player_volume_mute": "静音切换", + "setting__hot_key_player_volume_up": "增加音量", + "setting__hot_key_tip_input": "请输入新的按键", + "setting__hot_key_unset_input": "未设置", + "setting__is_enable": "是否启用", + "setting__is_show": "是否显示", + "setting__list": "列表设置", + "setting__list_add_music_location_type": "添加歌曲到列表时的位置", + "setting__list_add_music_location_type_bottom": "底部", + "setting__list_add_music_location_type_top": "顶部", + "setting__list_scroll": "记住播放列表滚动条位置（仅对我的音乐分类有效）", + "setting__list_source": "显示歌曲源（仅对我的音乐分类有效）", + "setting__network": "网络设置", + "setting__network_proxy_host": "主机", + "setting__network_proxy_password": "密码", + "setting__network_proxy_port": "端口", + "setting__network_proxy_title": "HTTP代理设置（乱设置软件将无法联网）", + "setting__network_proxy_username": "用户名", + "setting__odc": "强迫症设置", + "setting__odc_clear_search_input": "离开搜索界面时清空搜索框", + "setting__odc_clear_search_list": "离开搜索界面时清空搜索列表", + "setting__other": "其他", + "setting__other_play_list_cache": "列表缓存管理（我的列表中已缓存的歌曲链接、播放代替源，清理后播放、下载歌曲时需要重新获取，没有歌曲播放相关的问题不要清理）", + "setting__other_play_list_cache_clear_btn": "清理列表缓存信息", + "setting__other_resource_cache": "资源缓存管理（图片、音频等缓存，清理后图片等资源将需要重新下载，不建议清理，软件会根据磁盘空间动态管理缓存大小）", + "setting__other_resource_cache_clear_btn": "清理资源缓存", + "setting__other_resource_cache_label": "软件已使用缓存大小：", + "setting__other_tray_theme": "托盘图标样式", + "setting__other_tray_theme_black": "黑色", + "setting__other_tray_theme_native": "纯色", + "setting__other_tray_theme_origin": "原色", + "setting__play": "播放设置", + "setting__play_lyric_lxlrc": "使用卡拉OK式歌词播放（如果支持）", + "setting__play_lyric_transition": "显示歌词翻译", + "setting__play_mediaDevice": "音频输出", + "setting__play_mediaDevice_remove_stop_play": "当前的声音输出设备被改变时暂停播放歌曲", + "setting__play_mediaDevice_title": "选择声音输出的媒体设备", + "setting__play_quality": "优先播放320K品质的歌曲（如果支持）", + "setting__play_save_play_time": "记住播放进度", + "setting__play_task_bar": "在任务栏上显示当前歌曲播放进度", + "setting__search": "搜索设置", + "setting__search_focus_search_box": "启动时自动聚焦搜索框", + "setting__search_history": "显示历史搜索记录", + "setting__search_hot": "显示热门搜索", + "setting__sync": "数据同步 [此为测试功能，首次使用前建议先备份一次歌单]", + "setting__sync_address": "同步服务地址：{address}", + "setting__sync_auth_code": "连接码：{code}", + "setting__sync_device": "已连接的设备：{devices}", + "setting__sync_enable": "启用同步功能（由于数据是明文传输，请在受信任的网络下使用）", + "setting__sync_port": "同步端口设置", + "setting__sync_port_tip": "请输入同步服务端口号", + "setting__sync_refresh_code": "刷新连接码", + "setting__update": "软件更新", + "setting__update_checking": "检查更新中...", + "setting__update_current_label": "当前版本：", + "setting__update_downloading": "发现新版本并在努力下载中，请稍后...⏳", + "setting__update_init": "处理更新中...", + "setting__update_latest": "软件已是最新，尽情地体验吧~🥂", + "setting__update_latest_label": "最新版本：", + "setting__update_open_version_modal_btn": "打开更新窗口 🚀", + "setting__update_progress": "下载进度：", + "setting__update_unknown": "未知", + "user_api__title": "自定义源管理", + "user_api__readme": "源编写说明：", + "user_api__note": "提示：虽然我们已经尽可能地隔离了脚本的运行环境，但导入包含恶意行为的脚本仍可能会影响你的系统，请谨慎导入。", + "user_api__btn_remove": "移除", + "user_api__btn_import": "导入", + "user_api__btn_export": "导出", + "user_api__import_file": "选择音乐API脚本文件", + "user_api__noitem": "这里竟然是空的 😲" +} diff --git a/src/lang/zh-tw.json b/src/lang/zh-tw.json new file mode 100644 index 00000000..78a17ed8 --- /dev/null +++ b/src/lang/zh-tw.json @@ -0,0 +1,385 @@ +{ + "action": "操作", + "agree": "接受", + "download": "下載管理", + "leaderboard": "排行榜", + "my_list": "我的列表", + "search": "搜索", + "setting": "設置", + "song_list": "歌單", + "close": "關閉", + "comment__hot_load_error": "熱門評論加載失敗，點擊嘗試重新加載", + "comment__hot_loading": "熱門評論加載中", + "comment__hot_title": "熱門評論", + "comment__new_load_error": "最新評論加載失敗，點擊嘗試重新加載", + "comment__new_loading": "最新評論加載中", + "comment__new_title": "最新評論", + "comment__no_content": "暫無評論", + "comment__refresh": "刷新評論", + "comment__show": "歌曲評論", + "comment__title": "{name} 的評論", + "copy_tip": "（點擊複製）", + "default_list": "試聽列表", + "desktop_lyric__back": "返回", + "desktop_lyric__close": "關閉", + "desktop_lyric__font_decrease": "減小字體大小（右擊可微調）", + "desktop_lyric__font_increase": "增加字體大小（右擊可微調）", + "desktop_lyric__lock": "鎖定歌詞", + "desktop_lyric__lrc_active_zoom_off": "取消縮放當前播放的歌詞", + "desktop_lyric__lrc_active_zoom_on": "縮放當前播放的歌詞", + "desktop_lyric__opactiy_decrease": "增加透明度（右擊可微調）", + "desktop_lyric__opactiy_increase": "減小透明度（右擊可微調）", + "desktop_lyric__theme": "主題配色", + "desktop_lyric__unlock": "解鎖歌詞", + "desktop_lyric__win_top_off": "取消置頂歌詞界面", + "desktop_lyric__win_top_on": "置頂歌詞界面", + "download__high_quality": "高品音質", + "download__lossless": "無損音質", + "download__multiple_tip": "已選擇 {len} 首歌曲", + "download__multiple_tip2": "請選擇要優先下載的音質", + "download__normal": "普通音質", + "download__not_available_tip": "該音質不可用", + "list__add_to": "添加到...", + "list__collect": "收藏", + "list__copy_name": "複製歌曲名", + "list__download": "下載", + "list__file": "定位文件", + "list__load_failed": "啊，加載失敗了😭", + "list__loading": "列表加載中...⏳", + "list__move_to": "移動到...", + "list__pause": "暫停任務", + "list__play": "播放", + "list__play_later": "稍後播放", + "list__remove": "刪除", + "list__search": "搜索", + "list__sort": "調整位置", + "list__source_detail": "歌曲詳情頁", + "list__start": "開始任務", + "list_add__btn_title": "把該歌曲添加到 {name}", + "list_add__multiple_btn_title": "把這些歌曲添加到 {name}", + "list_add__multiple_title_add": "添加已選的 {num} 首歌曲到...", + "list_add__multiple_title_move": "添加移動已選的 {num} 首歌曲到...", + "list_add__title_first_add": "添加", + "list_add__title_first_move": "移動", + "list_add__title_last": "到...", + "lists__duplicate": "重複歌曲", + "lists__export": "導出", + "lists__export_part_desc": "選擇列表文件保存位置", + "lists__import": "導入", + "lists__import_part_button_cancel": "不要啊", + "lists__import_part_button_confirm": "覆蓋掉", + "lists__import_part_confirm": "導入的列表（{importName}）與本地列表（{localName}）的ID相同，是否覆蓋本地列表？", + "lists__import_part_desc": "選擇列表文件", + "lists__movedown": "下移", + "lists__moveup": "上移", + "lists__new_list_btn": "新建列表", + "lists__new_list_input": "新列表...", + "lists__remove": "刪除", + "lists__remove_tip": "你真的想要移除 {name} 嗎？", + "lists__remove_tip_button": "是的 沒錯", + "lists__rename": "重命名", + "lists__sync": "更新", + "load_list_file_error_detail": "我們已經幫你把舊的列表文件備份到{path}\n它以 JSON 格式存儲，你可以嘗試手動修復並恢復它\n\n錯誤詳情：{detail}", + "load_list_file_error_title": "播放列表數據加載錯誤", + "loding": "加載中...", + "love_list": "收藏列表", + "lyric__load_error": "歌詞獲取失敗", + "lyric__select": "歌詞文本選擇", + "min": "最小化", + "music_album": "專輯", + "music_name": "歌曲名", + "music_singer": "歌手", + "music_time": "時長", + "no_item": "列表竟然是空的...", + "not_agree": "不接受", + "pagination__next": "下一頁", + "pagination__page": "第 {num} 頁", + "pagination__prev": "上一頁", + "player__add_music_to": "添加當前歌曲到...", + "player__album": "專輯名：", + "player__buffering": "緩衝中...", + "player__desktop_lyric_lock": "右擊鎖定歌詞", + "player__desktop_lyric_off": "關閉桌面歌詞", + "player__desktop_lyric_on": "開啟桌面歌詞", + "player__desktop_lyric_unlock": "右擊解鎖歌詞", + "player__end": "播放完畢", + "player__error": "音頻加載出錯，5 秒後切換下一首", + "player__geting_url": "歌曲鏈接獲取中...", + "player__hide_detail_tip": "隱藏詳情頁（界面內右鍵雙擊可快速隱藏詳情頁）", + "player__loading": "音樂加載中...", + "player__music_name": "歌曲名：", + "player__music_singer": "藝術家：", + "player__next": "下一首", + "player__pause": "暫停", + "player__pic_tip": "右擊在“我的列表”定位當前播放的歌曲", + "player__play": "播放", + "player__play_toggle_mode_list": "順序播放", + "player__play_toggle_mode_list_loop": "列表循環", + "player__play_toggle_mode_off": "禁用", + "player__play_toggle_mode_random": "列表隨機", + "player__play_toggle_mode_single_loop": "單曲循環", + "player__playing": "播放中...", + "player__prev": "上一首", + "player__refresh_url": "URL過期，正在刷新URL...", + "player__stop": "暫停播放", + "player__volume": "當前音量：", + "source_alias_all": "聚合大會", + "source_alias_bd": "小杜音樂", + "source_alias_kg": "小枸音樂", + "source_alias_kw": "小蝸音樂", + "source_alias_mg": "小蜜音樂", + "source_alias_tx": "小秋音樂", + "source_alias_wy": "小芸音樂", + "source_alias_xm": "小霞音樂", + "source_all": "聚合搜索", + "source_bd": "百度音樂", + "source_kg": "酷狗音樂", + "source_kw": "酷我音樂", + "source_mg": "咪咕音樂", + "source_tx": "企鵝音樂", + "source_wy": "網易音樂", + "source_xm": "蝦米音樂", + "sync__merge_btn_local_remote": "本機列表 合併 遠程列表", + "sync__merge_btn_remote_local": "遠程列表 合併 本機列表", + "sync__merge_label": "合併", + "sync__merge_tip": "合併:", + "sync__merge_tip_desc": "將兩邊的列表合併到一起，相同的歌曲將被去掉（去掉的是被合併者的歌曲），不同的歌曲將被添加。", + "sync__other_label": "其他", + "sync__other_tip": "其他:", + "sync__other_tip_desc": "“僅使用實時同步功能”將不修改雙方的列表，僅實時同步操作；“取消同步”將直接斷開雙方的連接。", + "sync__overwrite": "完全覆蓋", + "sync__overwrite_btn_cancel": "取消同步", + "sync__overwrite_btn_local_remote": "本機列表 覆蓋 遠程列表", + "sync__overwrite_btn_none": "僅使用實時同步功能", + "sync__overwrite_btn_remote_local": "遠程列表 覆蓋 本機列表", + "sync__overwrite_label": "覆蓋", + "sync__overwrite_tip": "覆蓋:", + "sync__overwrite_tip_desc": "被覆蓋者與覆蓋者列表ID相同的列表將被刪除後替換成覆蓋者的列表（列表ID不同的列表將被合併到一起），若勾選完全覆蓋，則被覆蓋者的所有列表將被移除，然後替換成覆蓋者的列表。", + "sync__title": "選擇與 {name} 的列表同步方式", + "tag__high_quality": "HQ", + "tag__lossless": "SQ", + "theme_black": "黑燈瞎火", + "theme_blue": "藍田生玉", + "theme_blue2": "清熱版藍", + "theme_green": "綠意盎然", + "theme_grey": "灰常美麗", + "theme_happy_new_year": "新年快樂", + "theme_mid_autumn": "月裡嫦娥", + "theme_ming": "青出於黑", + "theme_naruto": "木葉之村", + "theme_orange": "橙黃橘綠", + "theme_pink": "粉裝玉琢", + "theme_purple": "重斤球紫", + "theme_red": "熱情似火", + "theme_yellow": "信口雌黃", + "search__welcome": "搜我所想~~😉", + "search__hot_search": "熱門搜索", + "history_search": "歷史搜索", + "history_clear": "清空搜索歷史", + "history_remove": "右擊移除該歷史", + "download__progress": "進度", + "download__status": "狀態", + "download__quality": "品質", + "download__all": "全部任務", + "download__runing": "正在下載", + "download__paused": "已暫停", + "download__error": "出錯", + "download__finished": "下載完成", + "back": "返回", + "songlist__open_list": "打開{name}歌單", + "songlist__import_input_tip": "輸入歌單鏈接或歌單ID", + "songlist__import_input_tip_1": "不支持跨源打開歌單，請確認要打開的歌單與當前歌單源是否對應", + "songlist__import_input_tip_2": "若遇到無法打開的歌單鏈接，歡迎反饋", + "songlist__import_input_tip_3": "酷狗源不支持用歌單ID打開，但支持酷狗碼打開", + "default": "默認", + "music_duplicate": "重複歌曲", + "export": "導出", + "list__export_part_desc": "選擇列表文件保存位置", + "import": "導入", + "list__import_part_button_cancel": "不要啊", + "list__import_part_button_confirm": "覆蓋掉", + "list__import_part_confirm": "導入的列表（{importName}）與本地列表（{localName}）的ID相同，是否覆蓋本地列表？", + "list__import_part_desc": "選擇列表文件", + "list__movedown": "下移", + "list__moveup": "上移", + "list__new_list_btn": "新建列表", + "list__new_list_input": "新列表...", + "list__remove_tip": "你真的想要移除 {name} 嗎？", + "list__remove_tip_button": "是的 沒錯", + "list__rename": "重命名", + "list__sync": "更新", + "music_sort__title": "將 {name} 的位置調整到：", + "music_sort__title_multiple": "將已選的 {num} 首歌曲的位置調整到：", + "music_sort__input_tip": "請輸入要調整到第幾個位置", + "music_sort__btn_confirm": "確定", + "cancel_button_text": "取消", + "confirm_button_text": "好的", + "date_format_hour": "{num}小時前", + "date_format_minute": "{num}分鐘前", + "date_format_second": "{num}秒前", + + "setting__about": "關於洛雪音樂", + "setting__backup": "備份與恢復", + "setting__backup_all": "所有數據（列表數據與設置數據）", + "setting__backup_all_export": "導出", + "setting__backup_all_export_desc": "選擇備份保存位置", + "setting__backup_all_import": "導入", + "setting__backup_all_import_desc": "選擇備份文件", + "setting__backup_part": "部分數據（列表數據包括試聽列表、收藏列表、用戶自定義列表，設置數據不包括快捷鍵設置）", + "setting__backup_part_export_list": "導出列表", + "setting__backup_part_export_list_desc": "選擇歌單保存位置", + "setting__backup_part_export_setting": "導出設置", + "setting__backup_part_export_setting_desc": "選擇設置保存位置", + "setting__backup_part_import_list": "導入列表", + "setting__backup_part_import_list_desc": "選擇列表文件", + "setting__backup_part_import_setting": "導入設置", + "setting__backup_part_import_setting_desc": "選擇配置文件", + "setting__basic": "基本設置", + "setting__basic_animation": "彈出層隨機動畫", + "setting__basic_control_btn_position": "控制按鈕位置", + "setting__basic_control_btn_position_left": "左邊", + "setting__basic_control_btn_position_right": "右邊", + "setting__basic_lang": "語言", + "setting__basic_lang_title": "軟件顯示的語言", + "setting__basic_show_animation": "顯示切換動畫", + "setting__basic_source": "音樂來源", + "setting__basic_source_status_failed": "初始化失敗", + "setting__basic_source_status_initing": "初始化中", + "setting__basic_source_status_success": "初始化成功", + "setting__basic_source_temp": "臨時接口（軟件的某些功能不可用，建議測試接口不可用再使用本接口）", + "setting__basic_source_test": "測試接口（幾乎軟件的所有功能都可用）", + "setting__basic_source_title": "選擇音樂來源", + "setting__basic_source_user_api_btn": "自定義源管理", + "setting__basic_sourcename": "音源名字", + "setting__basic_sourcename_alias": "別名", + "setting__basic_sourcename_real": "原名", + "setting__basic_sourcename_title": "選擇音源名字類型", + "setting__basic_theme": "主題顏色", + "setting__basic_to_tray": "關閉軟件時不退出軟件將其最小化到系統托盤", + "setting__basic_window_size": "窗口尺寸", + "setting__basic_window_size_big": "大", + "setting__basic_window_size_huge": "巨大", + "setting__basic_window_size_larger": "較大", + "setting__basic_window_size_medium": "中", + "setting__basic_window_size_oversized": "超大", + "setting__basic_window_size_small": "小", + "setting__basic_window_size_smaller": "較小", + "setting__basic_window_size_title": "設置軟件窗口尺寸", + "setting__click_copy": "點擊複製", + "setting__click_open": "點擊打開", + "setting__desktop_lyric": "桌面歌詞設置", + "setting__desktop_lyric_always_on_top": "使歌詞總是在其他窗口之上", + "setting__desktop_lyric_enable": "顯示歌詞", + "setting__desktop_lyric_font": "歌詞字體", + "setting__desktop_lyric_font_default": "默認", + "setting__desktop_lyric_lock": "鎖定歌詞", + "setting__desktop_lyric_lock_screen": "不允許歌詞窗口拖出主屏幕之外", + "setting__download": "下載設置", + "setting__download_data_embed": "是否將以下內容嵌入到音頻文件中", + "setting__download_embed_lyric": "歌詞嵌入", + "setting__download_embed_pic": "封面嵌入", + "setting__download_enable": "是否啟用下載功能", + "setting__download_lyric": "歌詞下載", + "setting__download_lyric_format": "下載的歌詞文件編碼格式", + "setting__download_lyric_format_gbk": "GBK（在某些設備上出現中文亂碼時可嘗試選擇此格式）", + "setting__download_lyric_format_utf8": "UTF-8", + "setting__download_lyric_title": "是否同時下載歌詞文件", + "setting__download_name": "文件命名方式", + "setting__download_name1": "歌名 - 歌手", + "setting__download_name2": "歌手 - 歌名", + "setting__download_name3": "歌名", + "setting__download_name_title": "下載歌曲時的命名方式", + "setting__download_path": "下載路徑", + "setting__download_path_change_btn": "更改", + "setting__download_path_label": "當前下載路徑：", + "setting__download_path_open_label": "點擊打開當前路徑", + "setting__download_path_title": "下載歌曲保存的路徑", + "setting__download_select_save_path": "選擇歌曲保存路徑", + "setting__download_use_other_source": "自動換源下載（當無法從歌曲的原始源下載時，嘗試切換到其他源下載，注：此功能不100%保證換源後的歌曲版本與原版一致）", + "setting__hot_key": "快捷鍵設置", + "setting__hot_key_common_focus_search_input": "聚焦搜索框", + "setting__hot_key_common_min": "最小化程序", + "setting__hot_key_common_toggle_close": "退出程序", + "setting__hot_key_common_toggle_hide": "顯示/隱藏程序", + "setting__hot_key_common_toggle_min": "最小化/還原程序", + "setting__hot_key_desktop_lyric_toggle_always_top": "桌面歌詞置頂切換", + "setting__hot_key_desktop_lyric_toggle_lock": "桌面歌詞鎖定切換", + "setting__hot_key_desktop_lyric_toggle_visible": "開/關桌面歌詞", + "setting__hot_key_global_title": "全局快捷鍵", + "setting__hot_key_local_title": "軟件內快捷鍵", + "setting__hot_key_player_next": "下一首歌曲", + "setting__hot_key_player_prev": "上一首歌曲", + "setting__hot_key_player_toggle_play": "播放/暫停控制​​", + "setting__hot_key_player_volume_down": "減少音量", + "setting__hot_key_player_volume_mute": "靜音切換", + "setting__hot_key_player_volume_up": "增加音量", + "setting__hot_key_tip_input": "請輸入新的按鍵", + "setting__hot_key_unset_input": "未設置", + "setting__is_enable": "是否啟用", + "setting__is_show": "是否顯示", + "setting__list": "列表設置", + "setting__list_add_music_location_type": "添加歌曲到列表時的位置", + "setting__list_add_music_location_type_bottom": "底部", + "setting__list_add_music_location_type_top": "頂部", + "setting__list_scroll": "記住播放列表滾動條位置（僅對我的音樂分類有效）", + "setting__list_source": "顯示歌曲源（僅對我的音樂分類有效）", + "setting__network": "網絡設置", + "setting__network_proxy_host": "主機", + "setting__network_proxy_password": "密碼", + "setting__network_proxy_port": "端口", + "setting__network_proxy_title": "HTTP代理設置（亂設置軟件將無法聯網）", + "setting__network_proxy_username": "用戶名", + "setting__odc": "強迫症設置", + "setting__odc_clear_search_input": "離開搜索界面時清空搜索框", + "setting__odc_clear_search_list": "離開搜索界面時清空搜索列表", + "setting__other": "其他", + "setting__other_play_list_cache": "列表緩存管理（我的列表中已緩存的歌曲鏈接、播放代替源，清理後播放、下載歌曲時需要重新獲取，沒有歌曲播放相關的問題不要清理）", + "setting__other_play_list_cache_clear_btn": "清理列表緩存信息", + "setting__other_resource_cache": "資源緩存管理（圖片、音頻等緩存，清理後圖片等資源將需要重新下載，不建議清理，軟件會根據磁盤空間動態管理緩存大小）", + "setting__other_resource_cache_clear_btn": "清理資源緩存", + "setting__other_resource_cache_label": "軟件已使用緩存大小：", + "setting__other_tray_theme": "托盤圖標樣式", + "setting__other_tray_theme_black": "黑色", + "setting__other_tray_theme_native": "純色", + "setting__other_tray_theme_origin": "原色", + "setting__play": "播放設置", + "setting__play_lyric_lxlrc": "使用卡拉OK式歌詞播放（如果支持）", + "setting__play_lyric_transition": "顯示歌詞翻譯", + "setting__play_mediaDevice": "音頻輸出", + "setting__play_mediaDevice_remove_stop_play": "當前的聲音輸出設備被改變時暫停播放歌曲", + "setting__play_mediaDevice_title": "選擇聲音輸出的媒體設備", + "setting__play_quality": "優先播放320K品質的歌曲（如果支持）", + "setting__play_save_play_time": "記住播放進度", + "setting__play_task_bar": "在任務欄上顯示當前歌曲播放進度", + "setting__search": "搜索設置", + "setting__search_focus_search_box": "啟動時自動聚焦搜索框", + "setting__search_history": "顯示歷史搜索記錄", + "setting__search_hot": "顯示熱門搜索", + "setting__sync": "數據同步 [此為測試功能，首次使用前建議先備份一次歌單]", + "setting__sync_address": "同步服務地址：{address}", + "setting__sync_auth_code": "連接碼：{code}", + "setting__sync_device": "已連接的設備：{devices}", + "setting__sync_enable": "啟用同步功能（由於數據是明文傳輸，請在受信任的網絡下使用）", + "setting__sync_port": "同步端口設置", + "setting__sync_port_tip": "請輸入同步服務端口號", + "setting__sync_refresh_code": "刷新連接碼", + "setting__update": "軟件更新", + "setting__update_checking": "檢查更新中...", + "setting__update_current_label": "當前版本：", + "setting__update_downloading": "發現新版本並在努力下載中，請稍後...⏳", + "setting__update_init": "處理更新中...", + "setting__update_latest": "軟件已是最新，盡情地體驗吧~🥂", + "setting__update_latest_label": "最新版本：", + "setting__update_open_version_modal_btn": "打開更新窗口 🚀", + "setting__update_progress": "下載進度：", + "setting__update_unknown": "未知", + + "user_api__title": "自定義源管理", + "user_api__readme": "源編寫說明：", + "user_api__note": "提示：雖然我們已經盡可能地隔離了腳本的運行環境，但導入包含惡意行為的腳本仍可能會影響你的系統，請謹慎導入。", + "user_api__btn_remove": "移除", + "user_api__btn_import": "導入", + "user_api__btn_export": "導出", + "user_api__import_file": "選擇音樂API腳本文件", + "user_api__noitem": "這裡竟然是空的 😲" +} diff --git a/src/main/index.js b/src/main/index.js index 9b84e671..950cfe81 100644 --- a/src/main/index.js +++ b/src/main/index.js @@ -38,7 +38,7 @@ if (process.platform == 'linux') app.commandLine.appendSwitch('use-gl', 'desktop app.commandLine.appendSwitch('wm-window-animations-disabled') -const { navigationUrlWhiteList } = require('../common/config') +const { navigationUrlWhiteList, themes } = require('../common/config') const { getWindowSizeInfo, initSetting, updateSetting } = require('./utils') const { isMac, isLinux, initHotKey } = require('../common/utils') @@ -121,7 +121,7 @@ function createWindow() { }, }) - global.modules.mainWindow.loadURL(winURL) + global.modules.mainWindow.loadURL(winURL + `?dt=${!!global.envParams.cmdParams.dt}&theme=${themes.find(t => t.id == global.appSetting.themeId)?.className ?? themes[0].className}`) winEvent(global.modules.mainWindow) // global.modules.mainWindow.webContents.openDevTools() diff --git a/src/main/rendererEvents/index.js b/src/main/rendererEvents/index.js index 4d61666f..59839321 100644 --- a/src/main/rendererEvents/index.js +++ b/src/main/rendererEvents/index.js @@ -20,6 +20,7 @@ require('./data') require('./lyric') require('./musicUrl') require('./systemFonts') +require('./wait') // require('./kw_decodeLyric') diff --git a/src/main/rendererEvents/playList.js b/src/main/rendererEvents/playList.js index d73a7e29..681ffc71 100644 --- a/src/main/rendererEvents/playList.js +++ b/src/main/rendererEvents/playList.js @@ -8,16 +8,18 @@ mainHandle(ipcMainWindowNames.get_playlist, async(event, isIgnoredError = false) return { defaultList: electronStore_list.get('defaultList'), loveList: electronStore_list.get('loveList'), + tempList: electronStore_list.get('tempList'), userList: electronStore_list.get('userList'), downloadList: getStore('downloadList').get('list'), } }) -const handleSaveList = ({ defaultList, loveList, userList }) => { +const handleSaveList = ({ defaultList, loveList, userList, tempList }) => { let data = {} if (defaultList != null) data.defaultList = defaultList if (loveList != null) data.loveList = loveList if (userList != null) data.userList = userList + if (tempList != null) data.tempList = tempList getStore('playList').set(data) } mainOn(ipcMainWindowNames.save_playlist, (event, { type, data }) => { diff --git a/src/main/rendererEvents/setLyricInfo.js b/src/main/rendererEvents/setLyricInfo.js index 5d978d46..642bd8aa 100644 --- a/src/main/rendererEvents/setLyricInfo.js +++ b/src/main/rendererEvents/setLyricInfo.js @@ -1,4 +1,4 @@ -const { mainOn, mainSend, NAMES: { mainWindow: ipcMainWindowNames } } = require('../../common/ipc') +const { mainOn, mainSend, NAMES: { mainWindow: ipcMainWindowNames } } = require('@common/ipc') mainOn(ipcMainWindowNames.set_lyric_info, (event, info) => { diff --git a/src/main/rendererEvents/wait.js b/src/main/rendererEvents/wait.js new file mode 100644 index 00000000..a6d99368 --- /dev/null +++ b/src/main/rendererEvents/wait.js @@ -0,0 +1,25 @@ +const { mainOn, mainHandle, NAMES: { mainWindow: ipcMainWindowNames } } = require('@common/ipc') + +const timeoutMap = new Map() + +mainHandle(ipcMainWindowNames.wait, (event, { time, id }) => { + return new Promise((resolve, reject) => { + const timeout = setTimeout(() => { + if (timeoutMap.has(id)) timeoutMap.delete(id) + resolve() + }, time) + timeoutMap.set(id, { + timeout, + resolve, + reject, + }) + }) +}) + +mainOn(ipcMainWindowNames.wait_cancel, (event, id) => { + if (!timeoutMap.has(id)) return + const timeout = timeoutMap.get(id) + timeoutMap.delete(id) + clearTimeout(timeout.timeout) + timeout.reject('cancelled') +}) diff --git a/src/renderer-lyric/App.vue b/src/renderer-lyric/App.vue index 455e45f4..e55e417d 100644 --- a/src/renderer-lyric/App.vue +++ b/src/renderer-lyric/App.vue @@ -105,7 +105,7 @@ export default { document.addEventListener('mousemove', this.handleMouseMove) document.addEventListener('mouseup', this.handleMouseUp) }, - beforeDestroy() { + beforeUnmount() { document.removeEventListener('mousemove', this.handleMouseMove) document.removeEventListener('mouseup', this.handleMouseUp) }, @@ -224,6 +224,15 @@ body { opacity: .8; } +body { + user-select: none; + height: 100vh; + box-sizing: border-box; +} +#root { + height: 100%; +} + #container { padding: 8px; box-sizing: border-box; diff --git a/src/renderer-lyric/components/core/ControlBar.vue b/src/renderer-lyric/components/core/ControlBar.vue index 8fa100a1..4811d768 100644 --- a/src/renderer-lyric/components/core/ControlBar.vue +++ b/src/renderer-lyric/components/core/ControlBar.vue @@ -2,38 +2,38 @@ div(:class="$style.container") transition(enter-active-class="animated-fast fadeIn" leave-active-class="animated fadeOut") div(:class="$style.btns" v-show="!isShowThemeList") - button(:class="$style.btn" @click="handleClose" :title="$t('desktopLyric.close')") + button(:class="$style.btn" @click="handleClose" :title="$t('desktop_lyric__close')") svg(version='1.1' xmlns='http://www.w3.org/2000/svg' xlink='http://www.w3.org/1999/xlink' height='20px' viewBox='0 0 24 24' space='preserve') use(xlink:href='#icon-close') - button(:class="$style.btn" @click="handleLock" :title="$t('desktopLyric.' + (lrcConfig.isLock ? 'unlock' : 'lock'))") + button(:class="$style.btn" @click="handleLock" :title="$t('desktop_lyric__' + (lrcConfig.isLock ? 'unlock' : 'lock'))") svg(v-if="config.isLock" version='1.1' xmlns='http://www.w3.org/2000/svg' xlink='http://www.w3.org/1999/xlink' height='20px' viewBox='0 0 24 24' space='preserve') use(xlink:href='#icon-unlock') svg(v-else version='1.1' xmlns='http://www.w3.org/2000/svg' xlink='http://www.w3.org/1999/xlink' height='20px' viewBox='0 0 24 24' space='preserve') use(xlink:href='#icon-lock') - button(:class="$style.btn" :title="$t('desktopLyric.theme')" @click="isShowThemeList = true") + button(:class="$style.btn" :title="$t('desktop_lyric__theme')" @click="isShowThemeList = true") svg(version='1.1' xmlns='http://www.w3.org/2000/svg' xlink='http://www.w3.org/1999/xlink' height='20px' viewBox='0 0 24 24' space='preserve') use(xlink:href='#icon-theme') - button(:class="$style.btn" @click="handleFontChange('increase', 10)" @contextmenu="handleFontChange('increase', 1)" :title="$t('desktopLyric.font_increase')") + button(:class="$style.btn" @click="handleFontChange('increase', 10)" @contextmenu="handleFontChange('increase', 1)" :title="$t('desktop_lyric__font_increase')") svg(version='1.1' xmlns='http://www.w3.org/2000/svg' xlink='http://www.w3.org/1999/xlink' height='20px' viewBox='0 0 24 24' space='preserve') use(xlink:href='#icon-font-increase') - button(:class="$style.btn" @click="handleFontChange('decrease', 10)" @contextmenu="handleFontChange('decrease', 1)" :title="$t('desktopLyric.font_decrease')") + button(:class="$style.btn" @click="handleFontChange('decrease', 10)" @contextmenu="handleFontChange('decrease', 1)" :title="$t('desktop_lyric__font_decrease')") svg(version='1.1' xmlns='http://www.w3.org/2000/svg' xlink='http://www.w3.org/1999/xlink' height='20px' viewBox='0 0 24 24' space='preserve') use(xlink:href='#icon-font-decrease') - button(:class="$style.btn" @click="handleOpactiyChange('increase', 10)" @contextmenu="handleOpactiyChange('increase', 2)" :title="$t('desktopLyric.opactiy_increase')") + button(:class="$style.btn" @click="handleOpactiyChange('increase', 10)" @contextmenu="handleOpactiyChange('increase', 2)" :title="$t('desktop_lyric__opactiy_increase')") svg(version='1.1' xmlns='http://www.w3.org/2000/svg' xlink='http://www.w3.org/1999/xlink' height='20px' viewBox='0 0 24 24' space='preserve') use(xlink:href='#icon-opactiy-increase') - button(:class="$style.btn" @click="handleOpactiyChange('decrease', 10)" @contextmenu="handleOpactiyChange('decrease', 2)" :title="$t('desktopLyric.opactiy_decrease')") + button(:class="$style.btn" @click="handleOpactiyChange('decrease', 10)" @contextmenu="handleOpactiyChange('decrease', 2)" :title="$t('desktop_lyric__opactiy_decrease')") svg(version='1.1' xmlns='http://www.w3.org/2000/svg' xlink='http://www.w3.org/1999/xlink' height='20px' viewBox='0 0 24 24' space='preserve') use(xlink:href='#icon-opactiy-decrease') //- button(:class="$style.btn" v-text="lrcConfig.style.isZoomActiveLrc ? '取消缩放' : '缩放歌词'" @click="handleZoomLrc") - button(:class="$style.btn" @click="handleZoomLrc" :title="$t('desktopLyric.' + (lrcConfig.style.isZoomActiveLrc ? 'lrc_active_zoom_off' : 'lrc_active_zoom_on'))") + button(:class="$style.btn" @click="handleZoomLrc" :title="$t('desktop_lyric__' + (lrcConfig.style.isZoomActiveLrc ? 'lrc_active_zoom_off' : 'lrc_active_zoom_on'))") svg(v-if="config.style.isZoomActiveLrc" version='1.1' xmlns='http://www.w3.org/2000/svg' xlink='http://www.w3.org/1999/xlink' height='20px' viewBox='0 0 24 24' space='preserve') use(xlink:href='#icon-vibrate-off') svg(v-else version='1.1' xmlns='http://www.w3.org/2000/svg' xlink='http://www.w3.org/1999/xlink' height='20px' viewBox='0 0 24 24' space='preserve') use(xlink:href='#icon-vibrate') - button(:class="$style.btn" @click="handleAlwaysOnTop" :title="$t('desktopLyric.' + (lrcConfig.isAlwaysOnTop ? 'win_top_off' : 'win_top_on'))") + button(:class="$style.btn" @click="handleAlwaysOnTop" :title="$t('desktop_lyric__' + (lrcConfig.isAlwaysOnTop ? 'win_top_off' : 'win_top_on'))") svg(v-if="config.isAlwaysOnTop" version='1.1' xmlns='http://www.w3.org/2000/svg' xlink='http://www.w3.org/1999/xlink' height='20px' viewBox='0 0 24 24' space='preserve') use(xlink:href='#icon-top-off') svg(v-else version='1.1' xmlns='http://www.w3.org/2000/svg' xlink='http://www.w3.org/1999/xlink' height='20px' viewBox='0 0 24 24' space='preserve') @@ -44,7 +44,7 @@ div(:class="$style.container") div(:class="$style.themes" v-show="isShowThemeList") ul(:class="$style.themeList") li(:class="$style.btnBack") - button(:class="$style.btn" @click="isShowThemeList = false" :title="$t('desktopLyric.back')") + button(:class="$style.btn" @click="isShowThemeList = false" :title="$t('desktop_lyric__back')") svg(version='1.1' xmlns='http://www.w3.org/2000/svg' xlink='http://www.w3.org/1999/xlink' height='20px' viewBox='0 0 512 512' space='preserve') use(xlink:href='#icon-back') li(:class="[$style.themeItem, theme.className, lrcConfig.theme == theme.id ? $style.active : null]" v-for="theme in themes" @click="handleToggleTheme(theme)") @@ -52,6 +52,7 @@ div(:class="$style.container") diff --git a/src/renderer/components/common/DownloadMultipleModal.vue b/src/renderer/components/common/DownloadMultipleModal.vue new file mode 100644 index 00000000..0053c2ec --- /dev/null +++ b/src/renderer/components/common/DownloadMultipleModal.vue @@ -0,0 +1,85 @@ + + + + + + diff --git a/src/renderer/components/material/ListAddModal.vue b/src/renderer/components/common/ListAddModal.vue similarity index 63% rename from src/renderer/components/material/ListAddModal.vue rename to src/renderer/components/common/ListAddModal.vue index dca5e789..ca314109 100644 --- a/src/renderer/components/material/ListAddModal.vue +++ b/src/renderer/components/common/ListAddModal.vue @@ -1,21 +1,27 @@ -