diff --git a/vben28/src/components/Application/src/AppLogo.vue b/vben28/src/components/Application/src/AppLogo.vue index 86aaf76a..c9d99287 100644 --- a/vben28/src/components/Application/src/AppLogo.vue +++ b/vben28/src/components/Application/src/AppLogo.vue @@ -64,8 +64,8 @@ display: flex; align-items: center; padding-left: 7px; - cursor: pointer; transition: all 0.2s ease; + cursor: pointer; &.light { border-bottom: 1px solid @border-color-base; @@ -84,9 +84,9 @@ } &__title { + transition: all 0.5s; font-size: 16px; font-weight: 700; - transition: all 0.5s; line-height: normal; } } diff --git a/vben28/src/components/Page/index.ts b/vben28/src/components/Page/index.ts index 2d3f6dd7..d0962640 100644 --- a/vben28/src/components/Page/index.ts +++ b/vben28/src/components/Page/index.ts @@ -5,5 +5,3 @@ import pageWrapper from './src/PageWrapper.vue'; export const PageFooter = withInstall(pageFooter); export const PageWrapper = withInstall(pageWrapper); - -export const PageWrapperFixedHeightKey = 'PageWrapperFixedHeight'; diff --git a/vben28/src/components/Page/src/PageWrapper.vue b/vben28/src/components/Page/src/PageWrapper.vue index baca629f..8f014b34 100644 --- a/vben28/src/components/Page/src/PageWrapper.vue +++ b/vben28/src/components/Page/src/PageWrapper.vue @@ -43,7 +43,7 @@ import { omit } from 'lodash-es'; import { PageHeader } from 'ant-design-vue'; import { useContentHeight } from '/@/hooks/web/useContentHeight'; - import { PageWrapperFixedHeightKey } from '..'; + import { PageWrapperFixedHeightKey } from '/@/enums/pageEnum'; export default defineComponent({ name: 'PageWrapper', diff --git a/vben28/src/components/Table/src/BasicTable.vue b/vben28/src/components/Table/src/BasicTable.vue index 621ec117..ccda8a94 100644 --- a/vben28/src/components/Table/src/BasicTable.vue +++ b/vben28/src/components/Table/src/BasicTable.vue @@ -49,7 +49,7 @@ import { defineComponent, ref, computed, unref, toRaw, inject, watchEffect } from 'vue'; import { Table } from 'ant-design-vue'; import { BasicForm, useForm } from '/@/components/Form/index'; - import { PageWrapperFixedHeightKey } from '/@/components/Page'; + import { PageWrapperFixedHeightKey } from '/@/enums/pageEnum'; import HeaderCell from './components/HeaderCell.vue'; import { InnerHandlers } from './types/table'; diff --git a/vben28/src/enums/pageEnum.ts b/vben28/src/enums/pageEnum.ts index c7ca3632..e739d67a 100644 --- a/vben28/src/enums/pageEnum.ts +++ b/vben28/src/enums/pageEnum.ts @@ -8,3 +8,5 @@ export enum PageEnum { // error log page path ERROR_LOG_PAGE = '/error-log/list', } + +export const PageWrapperFixedHeightKey = 'PageWrapperFixedHeight'; diff --git a/vben28/src/settings/componentSetting.ts b/vben28/src/settings/componentSetting.ts index 18041f18..ab66ab17 100644 --- a/vben28/src/settings/componentSetting.ts +++ b/vben28/src/settings/componentSetting.ts @@ -29,9 +29,9 @@ export default { if (field && order) { return { // The sort field passed to the backend you - field, + sorting: field + ' ' + order.replace('end', ''), // Sorting method passed to the background asc/desc - order, + //order, }; } else { return {};