🔧 调整配置

This commit is contained in:
目棃
2024-12-04 10:39:26 +08:00
parent 2a83fcbcb8
commit 02ddb441a0
6 changed files with 216 additions and 222 deletions

View File

@@ -2,8 +2,8 @@ import pluginImport from "eslint-plugin-import";
import pluginPrettier from "eslint-plugin-prettier";
import pluginVue from "eslint-plugin-vue";
import globals from "globals";
import eslint_ts from "typescript-eslint";
import vue_parser from "vue-eslint-parser";
import eslintTs from "typescript-eslint";
import parserVue from "vue-eslint-parser";
const tsConfigRules = {
"@typescript-eslint/consistent-type-assertions": ["error", { assertionStyle: "angle-bracket" }],
@@ -24,25 +24,25 @@ const tsConfigRules = {
const tsConfig = {
files: ["*.ts", "*.d.ts", "src/**/*.ts", "src/**/*.d.ts"],
plugins: { typescript: eslint_ts, import: pluginImport, prettier: pluginPrettier },
plugins: { typescript: eslintTs, import: pluginImport, prettier: pluginPrettier },
languageOptions: {
parser: eslint_ts.parser,
parser: eslintTs.parser,
parserOptions: { project: "tsconfig.json", tsconfigRootDir: "." },
},
rules: tsConfigRules,
};
const vueConfig = {
files: ["src/**/*.vue"],
files: ["src/**/*.vue", "src/App.vue"],
plugins: { vue: pluginVue, import: pluginImport, prettier: pluginPrettier },
languageOptions: {
globals: { ...globals.browser, ...globals.es2021, TGApp: "readonly", window: "readonly" },
ecmaVersion: "latest",
sourceType: "module",
parser: vue_parser,
parser: parserVue,
parserOptions: {
project: "tsconfig.json",
parser: eslint_ts.parser,
parser: eslintTs.parser,
extraFileExtensions: [".vue"],
tsconfigRootDir: ".",
},

View File

@@ -81,7 +81,7 @@
"artplayer": "^5.2.1",
"clipboard": "^2.0.11",
"color-convert": "^2.0.1",
"echarts": "^5.5.1",
"echarts": "file:../../Node/echarts",
"html2canvas": "^1.4.1",
"js-md5": "^0.8.3",
"jsencrypt": "^3.3.2",

26
pnpm-lock.yaml generated
View File

@@ -54,8 +54,8 @@ importers:
specifier: ^2.0.1
version: 2.0.1
echarts:
specifier: ^5.5.1
version: 5.5.1
specifier: file:../../Node/echarts
version: file:../../Node/echarts
html2canvas:
specifier: ^1.4.1
version: 1.4.1
@@ -79,7 +79,7 @@ importers:
version: 3.5.13(typescript@5.7.2)
vue-echarts:
specifier: ^7.0.3
version: 7.0.3(@vue/runtime-core@3.5.13)(echarts@5.5.1)(vue@3.5.13(typescript@5.7.2))
version: 7.0.3(@vue/runtime-core@3.5.13)(echarts@file:../../Node/echarts)(vue@3.5.13(typescript@5.7.2))
vue-json-viewer:
specifier: ^3.0.4
version: 3.0.4(vue@3.5.13(typescript@5.7.2))
@@ -1432,8 +1432,8 @@ packages:
resolution: {integrity: sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==}
engines: {node: '>=12'}
echarts@5.5.1:
resolution: {integrity: sha512-Fce8upazaAXUVUVsjgV6mBnGuqgO+JNDlcgF79Dksy4+wgGpQB2lmYoO4TSweFg/mZITdpGHomw/cNBJZj1icA==}
echarts@file:../../Node/echarts:
resolution: {directory: ../../Node/echarts, type: directory}
electron-to-chromium@1.5.14:
resolution: {integrity: sha512-bEfPECb3fJ15eaDnu9LEJ2vPGD6W1vt7vZleSVyFhYuMIKm3vz/g9lt7IvEzgdwj58RjbPKUF2rXTCN/UW47tQ==}
@@ -3062,6 +3062,7 @@ packages:
vue-echarts@7.0.3:
resolution: {integrity: sha512-/jSxNwOsw5+dYAUcwSfkLwKPuzTQ0Cepz1LxCOpj2QcHrrmUa/Ql0eQqMmc1rTPQVrh2JQ29n2dhq75ZcHvRDw==}
version: 7.0.3
peerDependencies:
'@vue/runtime-core': ^3.0.0
echarts: ^5.5.1
@@ -3191,8 +3192,9 @@ packages:
resolution: {integrity: sha512-GQHQqAopRhwU8Kt1DDM8NjibDXHC8eoh1erhGAJPEyveY9qqVeXvVikNKrDz69sHowPMorbPUrH/mx8c50eiBQ==}
engines: {node: '>=18'}
zrender@5.6.0:
resolution: {integrity: sha512-uzgraf4njmmHAbEUxMJ8Oxg+P3fT04O+9p7gY+wJRVxo8Ge+KmYv0WJev945EH4wFuc4OY2NLXz46FZrWS9xJg==}
zrender@https://codeload.github.com/ecomfe/zrender/tar.gz/980b0ea43e68da10f82aa9a18449357e8c40bba0:
resolution: {tarball: https://codeload.github.com/ecomfe/zrender/tar.gz/980b0ea43e68da10f82aa9a18449357e8c40bba0}
version: 5.6.0
snapshots:
@@ -4431,10 +4433,10 @@ snapshots:
dotenv@16.4.5: {}
echarts@5.5.1:
echarts@file:../../Node/echarts:
dependencies:
tslib: 2.3.0
zrender: 5.6.0
zrender: https://codeload.github.com/ecomfe/zrender/tar.gz/980b0ea43e68da10f82aa9a18449357e8c40bba0
electron-to-chromium@1.5.14: {}
@@ -6189,9 +6191,9 @@ snapshots:
dependencies:
vue: 3.5.13(typescript@5.7.2)
vue-echarts@7.0.3(@vue/runtime-core@3.5.13)(echarts@5.5.1)(vue@3.5.13(typescript@5.7.2)):
vue-echarts@7.0.3(@vue/runtime-core@3.5.13)(echarts@file:../../Node/echarts)(vue@3.5.13(typescript@5.7.2)):
dependencies:
echarts: 5.5.1
echarts: file:../../Node/echarts
vue: 3.5.13(typescript@5.7.2)
vue-demi: 0.13.11(vue@3.5.13(typescript@5.7.2))
optionalDependencies:
@@ -6322,6 +6324,6 @@ snapshots:
yoctocolors@2.1.1: {}
zrender@5.6.0:
zrender@https://codeload.github.com/ecomfe/zrender/tar.gz/980b0ea43e68da10f82aa9a18449357e8c40bba0:
dependencies:
tslib: 2.3.0

387
src-tauri/Cargo.lock generated

File diff suppressed because it is too large Load Diff

View File

@@ -61,11 +61,7 @@
</v-list-item>
<v-list-item title="分享设置">
<template #subtitle>
{{
appStore.shareDefaultFile === true
? "默认保存到文件"
: `默认保存到剪贴板,超过${appStore.shareDefaultFile}MB时保存到文件`
}}
默认保存到剪贴板超过{{ appStore.shareDefaultFile }}MB时保存到文件
</template>
<template #prepend>
<div class="config-icon">
@@ -255,7 +251,7 @@ async function confirmShare(): Promise<void> {
"阈值:",
appStore.shareDefaultFile.toString(),
);
if (input === null) {
if (input === undefined) {
showSnackbar.cancel("已取消修改分享设置");
return;
}

View File

@@ -24,6 +24,7 @@
"src/**/*.d.ts",
"src/**/*.ts",
"src/**/*.vue",
"src/App.vue",
"src/data/**/*.json",
"tsconfig.json",
"vite.config.ts",