diff --git a/.vscode/settings.json b/.vscode/settings.json index 87a96104f4e503d925c847c628f2ade09d7c1c07..7e2edd6200f92d4ae0677f8b6eca97c048fd67ac 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -13,6 +13,7 @@ "editor.cursorBlinking": "phase", "editor.cursorSmoothCaretAnimation": true, "editor.detectIndentation": false, + "editor.defaultFormatter": "esbenp.prettier-vscode", "diffEditor.ignoreTrimWhitespace": false, "javascript.format.insertSpaceBeforeFunctionParenthesis": true, "editor.formatOnPaste": true, diff --git a/package.json b/package.json index d2ba1c5bea998cb1a4534c70479a6661734169b5..625da2e361e7ed0ff1e24d9a6f2136aedf976194 100644 --- a/package.json +++ b/package.json @@ -68,8 +68,8 @@ "@types/rollup-plugin-visualizer": "^2.6.0", "@types/sortablejs": "^1.10.6", "@types/yargs": "^16.0.0", - "@typescript-eslint/eslint-plugin": "^4.16.1", - "@typescript-eslint/parser": "^4.16.1", + "@typescript-eslint/eslint-plugin": "^4.17.0", + "@typescript-eslint/parser": "^4.17.0", "@vitejs/plugin-legacy": "^1.3.1", "@vitejs/plugin-vue": "^1.1.5", "@vitejs/plugin-vue-jsx": "^1.1.2", @@ -106,7 +106,7 @@ "vite-plugin-compression": "^0.2.3", "vite-plugin-html": "^2.0.3", "vite-plugin-imagemin": "^0.2.9", - "vite-plugin-mock": "^2.2.0", + "vite-plugin-mock": "^2.2.2", "vite-plugin-purge-icons": "^0.7.0", "vite-plugin-pwa": "^0.5.6", "vite-plugin-style-import": "^0.8.1", diff --git a/src/components/Application/src/AppLocalePicker.vue b/src/components/Application/src/AppLocalePicker.vue index 9f196f6af39a20111e59fd7c3f8b8f1dd2cbaaa1..902ea76eecbbbd715e9cc5ce8a0de2da932b878b 100644 --- a/src/components/Application/src/AppLocalePicker.vue +++ b/src/components/Application/src/AppLocalePicker.vue @@ -9,11 +9,11 @@ :dropMenuList="localeList" :selectedKeys="selectedKeys" @menuEvent="handleMenuEvent" - :overlayClassName="`${prefixCls}-overlay`" + overlayClassName="app-locale-picker-overlay" > - + - {{ getLangText }} + {{ getLangText }} @@ -27,7 +27,6 @@ import { useLocale } from '/@/locales/useLocale'; import { localeList } from '/@/settings/localeSetting'; - import { useDesign } from '/@/hooks/web/useDesign'; import { propTypes } from '/@/utils/propTypes'; export default defineComponent({ @@ -42,8 +41,6 @@ setup(props) { const selectedKeys = ref([]); - const { prefixCls } = useDesign('app-locale-picker'); - const { changeLocale, getLocale } = useLocale(); const getLangText = computed(() => { @@ -67,27 +64,15 @@ toggleLocale(menu.event as string); } - return { localeList, handleMenuEvent, selectedKeys, getLangText, prefixCls }; + return { localeList, handleMenuEvent, selectedKeys, getLangText }; }, }); diff --git a/src/components/Application/src/AppLogo.vue b/src/components/Application/src/AppLogo.vue index 522b272db970d97118bb55f6291ad812fd2ac74e..413fe04729c5963673ca6a7225b75ed8ac13f945 100644 --- a/src/components/Application/src/AppLogo.vue +++ b/src/components/Application/src/AppLogo.vue @@ -48,9 +48,7 @@ setup() { const { prefixCls } = useDesign('app-logo'); const { getCollapsedShowTitle } = useMenuSetting(); - const { title } = useGlobSetting(); - const go = useGo(); function handleGoHome(): void { diff --git a/src/components/Application/src/AppProvider.vue b/src/components/Application/src/AppProvider.vue index 7ad68e532d0b7c8f3fe7a61f563ac10a1bd750c5..354a1bf1988784926adbf3b44df0b041fc89eead 100644 --- a/src/components/Application/src/AppProvider.vue +++ b/src/components/Application/src/AppProvider.vue @@ -1,20 +1,17 @@ - diff --git a/src/components/Application/src/search/AppSearchFooter.vue b/src/components/Application/src/search/AppSearchFooter.vue index 56c370850c2e06610de3c1fdab3c4fb7b2144af9..7db8839f3a84f4faa52b54b225a1e787ed003fce 100644 --- a/src/components/Application/src/search/AppSearchFooter.vue +++ b/src/components/Application/src/search/AppSearchFooter.vue @@ -1,20 +1,13 @@ @@ -22,12 +15,13 @@ diff --git a/src/components/Application/src/search/AppSearchModal.vue b/src/components/Application/src/search/AppSearchModal.vue index a2e9275fa2b29336c9a4458d4d6525b3dd9fe49c..dcc38f58a82f3a0ad0a89f878e5234f9a16e9c0c 100644 --- a/src/components/Application/src/search/AppSearchModal.vue +++ b/src/components/Application/src/search/AppSearchModal.vue @@ -11,6 +11,7 @@ @change="handleSearch" > @@ -22,6 +23,7 @@
{{ t('component.app.searchNotData') }}
+