diff --git a/src/components/global.less b/src/components/global.less index 1ed23c590..7d0c444d9 100644 --- a/src/components/global.less +++ b/src/components/global.less @@ -504,7 +504,4 @@ body { } } } - .ant-card-body{ - padding: 16px!important; - } } \ No newline at end of file diff --git a/src/components/page/GlobalLayout.vue b/src/components/page/GlobalLayout.vue index 384f997a9..49c723a57 100644 --- a/src/components/page/GlobalLayout.vue +++ b/src/components/page/GlobalLayout.vue @@ -67,7 +67,6 @@ - @@ -76,7 +75,6 @@ import SideMenu from '@/components/menu/SideMenu' import GlobalHeader from '@/components/page/GlobalHeader' import GlobalFooter from '@/components/page/GlobalFooter' -import SettingDrawer from '@/components/setting/SettingDrawer' import { asyncRouterMap } from '@/config/router.config.js' import { triggerWindowResizeEvent } from '@/utils/util' import { mapState, mapActions } from 'vuex' @@ -87,8 +85,7 @@ export default { components: { SideMenu, GlobalHeader, - GlobalFooter, - SettingDrawer + GlobalFooter }, mixins: [mixin, mixinDevice], data() { diff --git a/src/components/setting/SettingDrawer.vue b/src/components/setting/SettingDrawer.vue index e2c1be281..c5187ccc8 100644 --- a/src/components/setting/SettingDrawer.vue +++ b/src/components/setting/SettingDrawer.vue @@ -8,21 +8,20 @@ :visible="visible" :getContainer="() => $refs.settingDrawer" :style="{}" + :mask="false" >
-

整体风格设置

-
- dark + dark
- +
@@ -32,9 +31,9 @@ 亮色菜单风格
- light + light
- +
@@ -43,7 +42,6 @@

主题色

-
@@ -171,7 +148,7 @@ import DetailList from '@/components/tools/DetailList' import SettingItem from '@/components/setting/SettingItem' import config from '@/config/defaultSettings' -import { updateTheme, updateColorWeak, colorList } from '@/components/tools/setting' +import { updateTheme, colorList } from '@/components/tools/setting' import { mixin, mixinDevice } from '@/utils/mixin' export default { @@ -187,9 +164,7 @@ export default { baseConfig: Object.assign({}, config) } }, - watch: { - - }, + watch: {}, mounted() { const vm = this setTimeout(() => { @@ -199,9 +174,6 @@ export default { if (this.primaryColor !== config.primaryColor) { updateTheme(this.primaryColor) } - if (this.colorWeak !== config.colorWeak) { - updateColorWeak(this.colorWeak) - } }, methods: { showDrawer() { @@ -213,45 +185,10 @@ export default { toggle() { this.visible = !this.visible }, - onColorWeak(checked) { - this.baseConfig.colorWeak = checked - this.$store.dispatch('ToggleWeak', checked) - updateColorWeak(checked) - }, - onMultiTab(checked) { - this.baseConfig.multiTab = checked - this.$store.dispatch('ToggleMultiTab', checked) - }, handleMenuTheme(theme) { this.baseConfig.navTheme = theme this.$store.dispatch('ToggleTheme', theme) }, - doCopy() { - const text = `export default { - primaryColor: '${this.baseConfig.primaryColor}', // primary color of ant design - navTheme: '${this.baseConfig.navTheme}', // theme for nav menu - layout: '${this.baseConfig.layout}', // nav menu position: sidemenu or topmenu - contentWidth: '${this.baseConfig.contentWidth}', // layout of content: Fluid or Fixed, only works when layout is topmenu - fixedHeader: ${this.baseConfig.fixedHeader}, // sticky header - fixSiderbar: ${this.baseConfig.fixSiderbar}, // sticky siderbar - autoHideHeader: ${this.baseConfig.autoHideHeader}, // auto hide header - colorWeak: ${this.baseConfig.colorWeak}, - multiTab: ${this.baseConfig.multiTab}, - // vue-ls options - storageOptions: { - namespace: 'pro__', - name: 'ls', - storage: 'local', - } -}` - this.$copyText(text).then(message => { - console.log('copy', message) - this.$message.success('复制完毕') - }).catch(err => { - console.log('copy.err', err) - this.$message.error('复制失败') - }) - }, handleLayout(mode) { this.baseConfig.layout = mode this.$store.dispatch('ToggleLayoutMode', mode) @@ -292,75 +229,77 @@ export default { diff --git a/src/components/tools/HeaderComment.vue b/src/components/tools/HeaderComment.vue index 3875e6d20..e09d45383 100644 --- a/src/components/tools/HeaderComment.vue +++ b/src/components/tools/HeaderComment.vue @@ -25,7 +25,7 @@ - + diff --git a/src/components/tools/UserMenu.vue b/src/components/tools/UserMenu.vue index 11c9684f3..19e009b59 100644 --- a/src/components/tools/UserMenu.vue +++ b/src/components/tools/UserMenu.vue @@ -2,12 +2,12 @@
- + - + @@ -31,25 +31,30 @@ - +