diff --git a/.vscode/settings.json b/.vscode/settings.json index dc206778..6adbc86b 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -14,7 +14,6 @@ "editor.tabSize": 2, "editor.detectIndentation": false, "editor.cursorBlinking": "expand", - "editor.defaultFormatter": "esbenp.prettier-vscode", "editor.largeFileOptimizations": false, "editor.accessibilitySupport": "off", "editor.cursorSmoothCaretAnimation": "on", @@ -37,7 +36,34 @@ "source.fixAll.stylelint": "explicit", "source.organizeImports": "never" }, - + "editor.defaultFormatter": "esbenp.prettier-vscode", + "[html]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[css]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[scss]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[javascript]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[typescript]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[json]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[markdown]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[jsonc]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[vue]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, // extensions "extensions.ignoreRecommendations": true, @@ -194,7 +220,7 @@ "i18n-ally.keystyle": "nested", "commentTranslate.multiLineMerge": true, "vue.server.hybridMode": true, - "typescript.tsdk": "node_modules/typescript/lib", "vitest.disableWorkspaceWarning": true, - "cSpell.words": ["tinymce"] + "cSpell.words": ["tinymce"], + "typescript.tsdk": "node_modules/typescript/lib" } diff --git a/apps/web-antd/package.json b/apps/web-antd/package.json index 4d35e746..eaf502e5 100644 --- a/apps/web-antd/package.json +++ b/apps/web-antd/package.json @@ -28,13 +28,13 @@ "dependencies": { "@tinymce/tinymce-vue": "^6.0.1", "@vben/access": "workspace:*", - "@vben/chart-ui": "workspace:*", "@vben/common-ui": "workspace:*", "@vben/constants": "workspace:*", "@vben/hooks": "workspace:*", "@vben/icons": "workspace:*", "@vben/layouts": "workspace:*", "@vben/locales": "workspace:*", + "@vben/plugins": "workspace:*", "@vben/preferences": "workspace:*", "@vben/request": "workspace:*", "@vben/stores": "workspace:*", diff --git a/apps/web-antd/src/views/dashboard/analytics/analytics-trends.vue b/apps/web-antd/src/views/dashboard/analytics/analytics-trends.vue index 261c847c..35e90276 100644 --- a/apps/web-antd/src/views/dashboard/analytics/analytics-trends.vue +++ b/apps/web-antd/src/views/dashboard/analytics/analytics-trends.vue @@ -1,7 +1,11 @@