Skip to content

Commit 8aee7de

Browse files
authored
Merge pull request #244 from little3201/develop
fix: 修改apexchart类型问题
2 parents 32f9e24 + d1281d2 commit 8aee7de

36 files changed

+1139
-897
lines changed

.vscode/extensions.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"recommendations": [
33
"dbaeumer.vscode-eslint",
4-
"esbenp.prettier-vscode",
54
"editorconfig.editorconfig",
65
"vue.volar",
76
"wayou.vscode-todo-highlight"

.vscode/settings.json

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,20 @@
22
"editor.bracketPairColorization.enabled": true,
33
"editor.guides.bracketPairs": true,
44
"editor.defaultFormatter": "dbaeumer.vscode-eslint",
5-
"editor.codeActionsOnSave": [
6-
"source.fixAll.eslint"
7-
],
5+
"editor.codeActionsOnSave": {
6+
"source.organizeImports": "explicit",
7+
"source.fixAll.eslint": "explicit"
8+
},
89
"eslint.validate": [
910
"javascript",
1011
"javascriptreact",
1112
"typescript",
12-
"vue"
13+
"vue",
14+
"html"
1315
],
1416
"typescript.tsdk": "node_modules/typescript/lib",
17+
"typescript.format.semicolons": "remove",
18+
"javascript.format.semicolons": "remove",
1519
"eslint.format.enable": true,
1620
"editor.formatOnSave": true,
1721
"[typescript]": {

eslint.config.js

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import js from '@eslint/js'
2-
import globals from 'globals'
3-
import pluginVue from 'eslint-plugin-vue'
42
import pluginQuasar from '@quasar/app-vite/eslint'
53
import { defineConfigWithVueTs, vueTsConfigs } from '@vue/eslint-config-typescript'
4+
import pluginVue from 'eslint-plugin-vue'
5+
import globals from 'globals'
66

77
export default defineConfigWithVueTs(
88
{
@@ -65,8 +65,15 @@ export default defineConfigWithVueTs(
6565

6666
// add your custom rules here
6767
rules: {
68+
'semi': ['error', 'never'],
69+
'no-extra-semi': 'error',
70+
71+
quotes: ['warn', 'single', { avoidEscape: true }],
72+
6873
'prefer-promise-reject-errors': 'off',
69-
// allow debugger during development only
74+
75+
// allow console, debugger during development only
76+
'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'warn',
7077
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
7178
}
7279
},

index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<meta name="description" content="<%= productDescription %>">
88
<meta name="format-detection" content="telephone=no">
99
<meta name="msapplication-tap-highlight" content="no">
10-
<meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width<% if (ctx.mode.cordova || ctx.mode.capacitor) { %>, viewport-fit=cover<% } %>">
10+
<meta name="viewport" content="initial-scale=1, width=device-width<% if (ctx.mode.cordova || ctx.mode.capacitor) { %>, viewport-fit=cover<% } %>">
1111

1212
<link rel="icon" type="image/png" sizes="128x128" href="icons/favicon-128x128.png">
1313
<link rel="icon" type="image/png" sizes="96x96" href="icons/favicon-96x96.png">

package.json

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,29 +22,29 @@
2222
"highlight.js": "^11.11.1",
2323
"pinia": "^3.0.4",
2424
"quasar": "^2.18.6",
25-
"vue": "^3.5.25",
26-
"vue-i18n": "^11.2.2",
27-
"vue-router": "^4.6.3"
25+
"vue": "^3.5.26",
26+
"vue-i18n": "^11.2.8",
27+
"vue-router": "^4.6.4"
2828
},
2929
"devDependencies": {
30-
"@commitlint/cli": "^20.1.0",
31-
"@commitlint/config-conventional": "^20.0.0",
32-
"@eslint/js": "^9.39.1",
30+
"@commitlint/cli": "^20.3.0",
31+
"@commitlint/config-conventional": "^20.3.0",
32+
"@eslint/js": "^9.39.2",
3333
"@quasar/app-vite": "^2.4.0",
34-
"@types/node": "^22.19.1",
35-
"@vitest/coverage-v8": "^4.0.15",
34+
"@types/node": "^22.19.3",
35+
"@vitest/coverage-v8": "^4.0.16",
3636
"@vue/eslint-config-typescript": "^14.6.0",
37-
"autoprefixer": "^10.4.22",
38-
"eslint": "^9.39.1",
37+
"autoprefixer": "^10.4.23",
38+
"eslint": "^9.39.2",
3939
"eslint-plugin-vue": "^10.6.2",
40-
"globals": "^16.5.0",
40+
"globals": "^17.0.0",
4141
"husky": "^9.1.7",
4242
"lint-staged": "^16.2.7",
43-
"msw": "^2.12.3",
44-
"typescript": "~5.8.3",
45-
"vite-plugin-checker": "^0.11.0",
46-
"vitest": "^4.0.15",
47-
"vue-tsc": "^3.1.5"
43+
"msw": "^2.12.7",
44+
"typescript": "^5.9.3",
45+
"vite-plugin-checker": "^0.12.0",
46+
"vitest": "^4.0.16",
47+
"vue-tsc": "^3.2.2"
4848
},
4949
"msw": {
5050
"workerDirectory": [

0 commit comments

Comments
 (0)