diff --git a/src/api/demo/table.ts b/src/api/demo/table.ts index 6a5dcee7..b9b60df6 100644 --- a/src/api/demo/table.ts +++ b/src/api/demo/table.ts @@ -14,6 +14,7 @@ export const demoListApi = (params: DemoParams) => url: Api.DEMO_LIST, params, headers: { + // @ts-ignore ignoreCancelToken: true, }, }); diff --git a/src/components/Page/src/PageWrapper.vue b/src/components/Page/src/PageWrapper.vue index 8f6f0d5d..baca629f 100644 --- a/src/components/Page/src/PageWrapper.vue +++ b/src/components/Page/src/PageWrapper.vue @@ -5,7 +5,7 @@ :title="title" v-bind="omit($attrs, 'class')" ref="headerRef" - v-if="content || $slots.headerContent || title || getHeaderSlots.length" + v-if="getShowHeader" >