Skip to content

Commit 622db53

Browse files
committed
fix: SettingDrawer default slot render
1 parent 97b452f commit 622db53

File tree

4 files changed

+36
-33
lines changed

4 files changed

+36
-33
lines changed

examples/src/core/antd/icons.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,18 @@ export {
6262
export {
6363
default as QuestionCircleOutline
6464
} from '@ant-design/icons/lib/outline/QuestionCircleOutline'
65+
export {
66+
default as InfoCircleFill
67+
} from '@ant-design/icons/lib/fill/InfoCircleFill'
68+
export {
69+
default as ExclamationCircleFill
70+
} from '@ant-design/icons/lib/fill/ExclamationCircleFill'
71+
export {
72+
default as CloseCircleFill
73+
} from '@ant-design/icons/lib/fill/CloseCircleFill'
74+
export {
75+
default as CheckCircleFill
76+
} from '@ant-design/icons/lib/fill/CheckCircleFill'
6577
/* Feedback end */
6678

6779
/* MultiTab begin */

examples/src/layouts/BasicLayout.vue

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<template>
22
<pro-layout
3-
title="Pro Layout"
43
:menus="menus"
54
:collapsed="collapsed"
65
:mediaQuery="query"
76
:isMobile="isMobile"
87
:handleMediaQuery="handleMediaQuery"
98
:handleCollapse="handleCollapse"
109
:i18nRender="i18nRender"
10+
:siderWidth="208"
1111
v-bind="settings"
1212
>
1313
<!-- <template v-slot:menuRender>
@@ -22,7 +22,11 @@
2222
</div>
2323
</template>
2424
<template v-slot:headerContentRender>
25-
<div>headerContentRender</div>
25+
<div>
26+
<a-tooltip title="刷新页面">
27+
<a-icon type="reload" style="font-size: 18px;cursor: pointer;" @click="() => { $message.info('假的') }" />
28+
</a-tooltip>
29+
</div>
2630
</template>
2731
<template v-slot:rightContentRender>
2832
<div :class="['ant-pro-global-header-index-right', settings.layout === 'topmenu' && `ant-pro-global-header-index-${settings.theme}`]">
@@ -35,7 +39,11 @@
3539
<setting-drawer
3640
:settings="settings"
3741
@change="handleSettingChange"
38-
/>
42+
>
43+
<div style="margin: 12px 0;">
44+
This is SettingDrawer custom footer content.
45+
</div>
46+
</setting-drawer>
3947
<router-view />
4048
</pro-layout>
4149
</template>
@@ -45,7 +53,6 @@ import { asyncRouterMap } from '../config/router.config'
4553
import { i18nRender } from '../locales'
4654
4755
import defaultSettings from '@/config/defaultSettings'
48-
import LogoSvg from '../assets/logo.svg?inline'
4956
import { CONTENT_WIDTH_TYPE } from '@/store/mutation-types'
5057
5158
export default {
@@ -121,12 +128,6 @@ export default {
121128
}
122129
break
123130
}
124-
},
125-
logoRender () {
126-
return <LogoSvg />
127-
},
128-
footerRender () {
129-
return <div>custom footer</div>
130131
}
131132
}
132133
}

src/components/SettingDrawer/index.jsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,9 @@ const SettingDrawer = {
320320
</CopyToClipboard>
321321
)}
322322

323+
<div class={`${baseClassName}-content-footer`}>
324+
{this.$slots.default}
325+
</div>
323326
</div>
324327
</Drawer>
325328
)

src/index.js

Lines changed: 10 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,10 @@
1-
import BasicLayout, { BasicLayoutProps } from './BasicLayout'
2-
import BlockLayout from './BlockLayout'
3-
import PageHeaderWrapper from './components/PageHeaderWrapper'
4-
import SiderMenuWrapper from './components/SiderMenu'
5-
import GlobalFooter from './components/GlobalFooter'
6-
import SettingDrawer from './components/SettingDrawer'
7-
import DocumentTitle from './components/DocumentTitle'
8-
import { updateTheme, updateColorWeak } from './utils/dynamicTheme'
9-
10-
export {
11-
GlobalFooter,
12-
PageHeaderWrapper,
13-
SiderMenuWrapper,
14-
BlockLayout,
15-
SettingDrawer,
16-
DocumentTitle,
17-
BasicLayoutProps,
18-
19-
updateTheme,
20-
updateColorWeak
21-
}
22-
23-
export default BasicLayout
1+
export { default, BasicLayoutProps } from './BasicLayout'
2+
export { default as BlockLayout } from './BlockLayout'
3+
export { default as PageHeaderWrapper } from './components/PageHeaderWrapper'
4+
export { default as SiderMenuWrapper } from './components/SiderMenu'
5+
export { default as GlobalFooter } from './components/GlobalFooter'
6+
export { default as SettingDrawer } from './components/SettingDrawer'
7+
export { default as DocumentTitle } from './components/DocumentTitle'
8+
export { default as BaseMenu } from './components/RouteMenu'
9+
// func
10+
export { updateTheme, updateColorWeak } from './utils/dynamicTheme'

0 commit comments

Comments
 (0)