diff --git a/src/components/Application/src/AppLocalePicker.vue b/src/components/Application/src/AppLocalePicker.vue index fa111c0ff..644d29419 100644 --- a/src/components/Application/src/AppLocalePicker.vue +++ b/src/components/Application/src/AppLocalePicker.vue @@ -11,7 +11,7 @@ :overlayClassName="`${prefixCls}-overlay`" > - + {{ getLangText }} diff --git a/src/components/Application/src/search/AppSearch.vue b/src/components/Application/src/search/AppSearch.vue index ffe030f15..952bbda6b 100644 --- a/src/components/Application/src/search/AppSearch.vue +++ b/src/components/Application/src/search/AppSearch.vue @@ -10,7 +10,7 @@ export default defineComponent({ name: 'AppSearch', - components: { AppSearchModal, Tooltip, SearchOutlined }, + components: { AppSearchModal, Tooltip }, setup() { const showModal = ref(false); const { prefixCls } = useDesign('app-search'); diff --git a/src/enums/pageEnum.ts b/src/enums/pageEnum.ts index 912c46f6e..8169e6667 100644 --- a/src/enums/pageEnum.ts +++ b/src/enums/pageEnum.ts @@ -6,5 +6,5 @@ export enum PageEnum { // error page path ERROR_PAGE = '/exception', // error log page path - ERROR_LOG_PAGE = '/feat/error-log', + ERROR_LOG_PAGE = '/error-log/list', } diff --git a/src/layouts/default/header/components/index.ts b/src/layouts/default/header/components/index.ts index fb6287062..1a22f6a20 100644 --- a/src/layouts/default/header/components/index.ts +++ b/src/layouts/default/header/components/index.ts @@ -10,6 +10,4 @@ export const FullScreen = createAsyncComponent(() => import('./FullScreen.vue')) export const Notify = createAsyncComponent(() => import('./notify/index.vue')); -export const LockItem = createAsyncComponent(() => import('./lock/index.vue')); - export const ErrorAction = createAsyncComponent(() => import('./ErrorAction.vue')); diff --git a/src/layouts/default/header/components/lock/LockAction.less b/src/layouts/default/header/components/lock/LockAction.less deleted file mode 100644 index ffd25bbb7..000000000 --- a/src/layouts/default/header/components/lock/LockAction.less +++ /dev/null @@ -1,30 +0,0 @@ -.lock-modal { - &__entry { - position: relative; - height: 240px; - padding: 130px 30px 60px 30px; - background: #fff; - border-radius: 10px; - } - - &__header { - position: absolute; - top: 0; - left: calc(50% - 45px); - width: auto; - text-align: center; - - &-img { - width: 70px; - border-radius: 50%; - } - - &-name { - margin-top: 5px; - } - } - - &__footer { - text-align: center; - } -} diff --git a/src/layouts/default/header/components/lock/LockAction.tsx b/src/layouts/default/header/components/lock/LockAction.tsx deleted file mode 100644 index 51483b5ad..000000000 --- a/src/layouts/default/header/components/lock/LockAction.tsx +++ /dev/null @@ -1,72 +0,0 @@ -import './LockAction.less'; - -import { defineComponent } from 'vue'; -import { BasicModal, useModalInner } from '/@/components/Modal/index'; -import { Button } from '/@/components/Button'; -import { BasicForm, useForm } from '/@/components/Form/index'; - -import headerImg from '/@/assets/images/header.jpg'; - -import { userStore } from '/@/store/modules/user'; -import { useI18n } from '/@/hooks/web/useI18n'; -import { lockStore } from '/@/store/modules/lock'; - -const prefixCls = 'lock-modal'; -export default defineComponent({ - name: 'LockModal', - setup(_, { attrs }) { - const { t } = useI18n(); - const [register, { closeModal }] = useModalInner(); - - const [registerForm, { validateFields, resetFields }] = useForm({ - showActionButtonGroup: false, - schemas: [ - { - field: 'password', - label: t('layout.header.lockScreenPassword'), - component: 'InputPassword', - required: true, - }, - ], - }); - - async function lock() { - const values = (await validateFields()) as any; - const password: string | undefined = values.password; - closeModal(); - - lockStore.commitLockInfoState({ - isLock: true, - pwd: password, - }); - await resetFields(); - } - - return () => ( - - {() => ( -
-
- -

{userStore.getUserInfoState.realName}

-
- - - -
- -
-
- )} -
- ); - }, -}); diff --git a/src/layouts/default/header/components/lock/index.vue b/src/layouts/default/header/components/lock/index.vue deleted file mode 100644 index 37b2ff4db..000000000 --- a/src/layouts/default/header/components/lock/index.vue +++ /dev/null @@ -1,38 +0,0 @@ - - diff --git a/src/layouts/default/header/components/user-dropdown/index.vue b/src/layouts/default/header/components/user-dropdown/index.vue index 4b4f89a83..12151e431 100644 --- a/src/layouts/default/header/components/user-dropdown/index.vue +++ b/src/layouts/default/header/components/user-dropdown/index.vue @@ -12,18 +12,24 @@ + + + diff --git a/src/layouts/default/setting/index.vue b/src/layouts/default/setting/index.vue index 4d81b8fa8..8ad7a8c90 100644 --- a/src/layouts/default/setting/index.vue +++ b/src/layouts/default/setting/index.vue @@ -1,20 +1,20 @@