Browse Source

fix: 修复 Cannot access 'pagewrapper' before initialization

pull/126/head
王军 3 years ago
parent
commit
fc35c4a4eb
  1. 4
      vben28/src/components/Application/src/AppLogo.vue
  2. 2
      vben28/src/components/Page/index.ts
  3. 2
      vben28/src/components/Page/src/PageWrapper.vue
  4. 2
      vben28/src/components/Table/src/BasicTable.vue
  5. 2
      vben28/src/enums/pageEnum.ts
  6. 4
      vben28/src/settings/componentSetting.ts

4
vben28/src/components/Application/src/AppLogo.vue

@ -64,8 +64,8 @@
display: flex; display: flex;
align-items: center; align-items: center;
padding-left: 7px; padding-left: 7px;
cursor: pointer;
transition: all 0.2s ease; transition: all 0.2s ease;
cursor: pointer;
&.light { &.light {
border-bottom: 1px solid @border-color-base; border-bottom: 1px solid @border-color-base;
@ -84,9 +84,9 @@
} }
&__title { &__title {
transition: all 0.5s;
font-size: 16px; font-size: 16px;
font-weight: 700; font-weight: 700;
transition: all 0.5s;
line-height: normal; line-height: normal;
} }
} }

2
vben28/src/components/Page/index.ts

@ -5,5 +5,3 @@ import pageWrapper from './src/PageWrapper.vue';
export const PageFooter = withInstall(pageFooter); export const PageFooter = withInstall(pageFooter);
export const PageWrapper = withInstall(pageWrapper); export const PageWrapper = withInstall(pageWrapper);
export const PageWrapperFixedHeightKey = 'PageWrapperFixedHeight';

2
vben28/src/components/Page/src/PageWrapper.vue

@ -43,7 +43,7 @@
import { omit } from 'lodash-es'; import { omit } from 'lodash-es';
import { PageHeader } from 'ant-design-vue'; import { PageHeader } from 'ant-design-vue';
import { useContentHeight } from '/@/hooks/web/useContentHeight'; import { useContentHeight } from '/@/hooks/web/useContentHeight';
import { PageWrapperFixedHeightKey } from '..'; import { PageWrapperFixedHeightKey } from '/@/enums/pageEnum';
export default defineComponent({ export default defineComponent({
name: 'PageWrapper', name: 'PageWrapper',

2
vben28/src/components/Table/src/BasicTable.vue

@ -49,7 +49,7 @@
import { defineComponent, ref, computed, unref, toRaw, inject, watchEffect } from 'vue'; import { defineComponent, ref, computed, unref, toRaw, inject, watchEffect } from 'vue';
import { Table } from 'ant-design-vue'; import { Table } from 'ant-design-vue';
import { BasicForm, useForm } from '/@/components/Form/index'; import { BasicForm, useForm } from '/@/components/Form/index';
import { PageWrapperFixedHeightKey } from '/@/components/Page'; import { PageWrapperFixedHeightKey } from '/@/enums/pageEnum';
import HeaderCell from './components/HeaderCell.vue'; import HeaderCell from './components/HeaderCell.vue';
import { InnerHandlers } from './types/table'; import { InnerHandlers } from './types/table';

2
vben28/src/enums/pageEnum.ts

@ -8,3 +8,5 @@ export enum PageEnum {
// error log page path // error log page path
ERROR_LOG_PAGE = '/error-log/list', ERROR_LOG_PAGE = '/error-log/list',
} }
export const PageWrapperFixedHeightKey = 'PageWrapperFixedHeight';

4
vben28/src/settings/componentSetting.ts

@ -29,9 +29,9 @@ export default {
if (field && order) { if (field && order) {
return { return {
// The sort field passed to the backend you // The sort field passed to the backend you
field, sorting: field + ' ' + order.replace('end', ''),
// Sorting method passed to the background asc/desc // Sorting method passed to the background asc/desc
order, //order,
}; };
} else { } else {
return {}; return {};

Loading…
Cancel
Save