diff --git a/src/components/MultiTab/MultiTab.vue b/src/components/MultiTab/MultiTab.vue deleted file mode 100644 index 48bef300e..000000000 --- a/src/components/MultiTab/MultiTab.vue +++ /dev/null @@ -1,175 +0,0 @@ - - - diff --git a/src/components/MultiTab/index.js b/src/components/MultiTab/index.js deleted file mode 100644 index ca2a216e9..000000000 --- a/src/components/MultiTab/index.js +++ /dev/null @@ -1,4 +0,0 @@ -import MultiTab from './MultiTab' -import './index.less' - -export default MultiTab diff --git a/src/components/MultiTab/index.less b/src/components/MultiTab/index.less deleted file mode 100644 index 773e3af31..000000000 --- a/src/components/MultiTab/index.less +++ /dev/null @@ -1,25 +0,0 @@ -@import '../index'; - -@multi-tab-prefix-cls: ~"@{ant-pro-prefix}-multi-tab"; -@multi-tab-wrapper-prefix-cls: ~"@{ant-pro-prefix}-multi-tab-wrapper"; - -/* -.topmenu .@{multi-tab-prefix-cls} { - max-width: 1200px; - margin: -23px auto 24px auto; -} -*/ -.@{multi-tab-prefix-cls} { - margin: -23px -24px 24px -24px; - background: #fff; -} - -.topmenu .@{multi-tab-wrapper-prefix-cls} { - max-width: 1200px; - margin: 0 auto; -} - -.topmenu.content-width-Fluid .@{multi-tab-wrapper-prefix-cls} { - max-width: 100%; - margin: 0 auto; -} diff --git a/src/components/PageLoading/index.jsx b/src/components/PageLoading/index.jsx deleted file mode 100644 index b45b8b798..000000000 --- a/src/components/PageLoading/index.jsx +++ /dev/null @@ -1,10 +0,0 @@ -import { Spin } from 'ant-design-vue' - -export default { - name: 'PageLoading', - render() { - return (
- -
) - } -} diff --git a/src/components/SettingDrawer/settingConfig.js b/src/components/SettingDrawer/settingConfig.js index 52fbbf137..b0a987e10 100644 --- a/src/components/SettingDrawer/settingConfig.js +++ b/src/components/SettingDrawer/settingConfig.js @@ -87,9 +87,4 @@ const updateTheme = primaryColor => { } } -const updateColorWeak = colorWeak => { - // document.body.className = colorWeak ? 'colorWeak' : ''; - colorWeak ? document.body.classList.add('colorWeak') : document.body.classList.remove('colorWeak') -} - -export { updateTheme, colorList, updateColorWeak } +export { updateTheme, colorList } diff --git a/src/components/global.less b/src/components/global.less index 398a8e219..75dcf027a 100644 --- a/src/components/global.less +++ b/src/components/global.less @@ -2,9 +2,6 @@ body { overflow-y: scroll; - &.colorWeak { - filter: invert(80%); - } } .layout.ant-layout { diff --git a/src/components/index.js b/src/components/index.js index 190ec9a4f..f0bdb711a 100644 --- a/src/components/index.js +++ b/src/components/index.js @@ -8,7 +8,6 @@ import NumberInfo from '@/components/NumberInfo' import DescriptionList from '@/components/DescriptionList' import Tree from '@/components/Tree/Tree' import Trend from '@/components/Trend' -import MultiTab from '@/components/MultiTab' import Result from '@/components/Result' import ExceptionPage from '@/components/Exception' import Upload from '@/components/Upload/Upload' @@ -21,7 +20,6 @@ const _components = { NumberInfo, DescriptionList, Tree, - MultiTab, Result, ExceptionPage, Upload diff --git a/src/config/defaultSettings.js b/src/config/defaultSettings.js index 3fe0cd2fe..251c8f58c 100644 --- a/src/config/defaultSettings.js +++ b/src/config/defaultSettings.js @@ -2,7 +2,6 @@ * 项目默认配置项 * primaryColor - 默认主题色 * navTheme - sidebar theme ['dark', 'light'] 两种主题 - * colorWeak - 色盲模式 * layout - 整体布局方式 ['sidemenu', 'topmenu'] 两种布局 * fixedHeader - 固定 Header : boolean * fixSiderbar - 固定左侧菜单栏 : boolean @@ -15,18 +14,16 @@ export default { primaryColor: '#1890FF', // primary color of ant design - navTheme: 'light', // theme for nav menu + navTheme: 'dark', // theme for nav menu layout: 'topmenu', // nav menu position: sidemenu or topmenu contentWidth: 'Fixed', // layout of content: Fluid or Fixed, only works when layout is topmenu fixedHeader: false, // sticky header fixSiderbar: false, // sticky siderbar autoHideHeader: false, // auto hide header - colorWeak: false, - multiTab: false, // vue-ls options storageOptions: { namespace: 'halo__', // key prefix name: 'ls', // name variable Vue.[ls] or this.[$ls], storage: 'local' // storage name session, local, memory } -} \ No newline at end of file +} diff --git a/src/core/bootstrap.js b/src/core/bootstrap.js index 2bbb7f6ef..32ee2532c 100644 --- a/src/core/bootstrap.js +++ b/src/core/bootstrap.js @@ -5,13 +5,11 @@ import { DEFAULT_COLOR, DEFAULT_THEME, DEFAULT_LAYOUT_MODE, - DEFAULT_COLOR_WEAK, SIDEBAR_TYPE, DEFAULT_FIXED_HEADER, DEFAULT_FIXED_HEADER_HIDDEN, DEFAULT_FIXED_SIDEMENU, - DEFAULT_CONTENT_WIDTH_TYPE, - DEFAULT_MULTI_TAB + DEFAULT_CONTENT_WIDTH_TYPE } from '@/store/mutation-types' import config from '@/config/defaultSettings' @@ -23,9 +21,7 @@ export default function Initializer() { store.commit('TOGGLE_FIXED_SIDERBAR', Vue.ls.get(DEFAULT_FIXED_SIDEMENU, config.fixSiderbar)) store.commit('TOGGLE_CONTENT_WIDTH', Vue.ls.get(DEFAULT_CONTENT_WIDTH_TYPE, config.contentWidth)) store.commit('TOGGLE_FIXED_HEADER_HIDDEN', Vue.ls.get(DEFAULT_FIXED_HEADER_HIDDEN, config.autoHideHeader)) - store.commit('TOGGLE_WEAK', Vue.ls.get(DEFAULT_COLOR_WEAK, config.colorWeak)) store.commit('TOGGLE_COLOR', Vue.ls.get(DEFAULT_COLOR, config.primaryColor)) - store.commit('TOGGLE_MULTI_TAB', Vue.ls.get(DEFAULT_MULTI_TAB, config.multiTab)) store.commit('SET_TOKEN', Vue.ls.get(ACCESS_TOKEN)) // last step diff --git a/src/layouts/BasicLayout.vue b/src/layouts/BasicLayout.vue index bcbffdd9b..d1ef701bd 100644 --- a/src/layouts/BasicLayout.vue +++ b/src/layouts/BasicLayout.vue @@ -44,9 +44,8 @@ - @@ -68,7 +67,6 @@ import config from '@/config/defaultSettings' import { asyncRouterMap } from '@/config/router.config.js' import RouteView from './RouteView' -import MultiTab from '@/components/MultiTab' import SideMenu from '@/components/Menu/SideMenu' import GlobalHeader from '@/components/GlobalHeader' import GlobalFooter from '@/components/GlobalFooter' @@ -78,7 +76,6 @@ export default { mixins: [mixin, mixinDevice], components: { RouteView, - MultiTab, SideMenu, GlobalHeader, GlobalFooter diff --git a/src/layouts/PageView.vue b/src/layouts/PageView.vue index 2a3a965d0..c2b8f9e8d 100644 --- a/src/layouts/PageView.vue +++ b/src/layouts/PageView.vue @@ -19,11 +19,7 @@
- - - - - +
@@ -31,7 +27,6 @@ diff --git a/src/store/getters.js b/src/store/getters.js index 5732600b4..1bcb90a4b 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -6,8 +6,7 @@ const getters = { avatar: state => state.user.avatar, nickname: state => state.user.name, roles: state => state.user.roles, - addRouters: state => state.permission.addRouters, - multiTab: state => state.app.multiTab + addRouters: state => state.permission.addRouters } export default getters diff --git a/src/store/modules/app.js b/src/store/modules/app.js index 664a1e1b7..5aeb7f8a7 100644 --- a/src/store/modules/app.js +++ b/src/store/modules/app.js @@ -4,12 +4,10 @@ import { DEFAULT_THEME, DEFAULT_LAYOUT_MODE, DEFAULT_COLOR, - DEFAULT_COLOR_WEAK, DEFAULT_FIXED_HEADER, DEFAULT_FIXED_SIDEMENU, DEFAULT_FIXED_HEADER_HIDDEN, - DEFAULT_CONTENT_WIDTH_TYPE, - DEFAULT_MULTI_TAB + DEFAULT_CONTENT_WIDTH_TYPE } from '@/store/mutation-types' const app = { @@ -22,9 +20,7 @@ const app = { fixedHeader: false, fixSiderbar: false, autoHideHeader: false, - color: null, - weak: false, - multiTab: false + color: null }, mutations: { SET_SIDEBAR_TYPE: (state, type) => { @@ -66,14 +62,6 @@ const app = { TOGGLE_COLOR: (state, color) => { Vue.ls.set(DEFAULT_COLOR, color) state.color = color - }, - TOGGLE_WEAK: (state, flag) => { - Vue.ls.set(DEFAULT_COLOR_WEAK, flag) - state.weak = flag - }, - TOGGLE_MULTI_TAB: (state, bool) => { - Vue.ls.set(DEFAULT_MULTI_TAB, bool) - state.multiTab = bool } }, actions: { @@ -109,12 +97,6 @@ const app = { }, ToggleColor({ commit }, color) { commit('TOGGLE_COLOR', color) - }, - ToggleWeak({ commit }, weakFlag) { - commit('TOGGLE_WEAK', weakFlag) - }, - ToggleMultiTab({ commit }, bool) { - commit('TOGGLE_MULTI_TAB', bool) } } } diff --git a/src/store/mutation-types.js b/src/store/mutation-types.js index 2cf2dbb9f..a0917a9c9 100644 --- a/src/store/mutation-types.js +++ b/src/store/mutation-types.js @@ -3,12 +3,10 @@ export const SIDEBAR_TYPE = 'SIDEBAR_TYPE' export const DEFAULT_THEME = 'DEFAULT_THEME' export const DEFAULT_LAYOUT_MODE = 'DEFAULT_LAYOUT_MODE' export const DEFAULT_COLOR = 'DEFAULT_COLOR' -export const DEFAULT_COLOR_WEAK = 'DEFAULT_COLOR_WEAK' export const DEFAULT_FIXED_HEADER = 'DEFAULT_FIXED_HEADER' export const DEFAULT_FIXED_SIDEMENU = 'DEFAULT_FIXED_SIDEMENU' export const DEFAULT_FIXED_HEADER_HIDDEN = 'DEFAULT_FIXED_HEADER_HIDDEN' export const DEFAULT_CONTENT_WIDTH_TYPE = 'DEFAULT_CONTENT_WIDTH_TYPE' -export const DEFAULT_MULTI_TAB = 'DEFAULT_MULTI_TAB' export const CONTENT_WIDTH_TYPE = { Fluid: 'Fluid', diff --git a/src/utils/mixin.js b/src/utils/mixin.js index 63dc1c8c9..a7ca03397 100644 --- a/src/utils/mixin.js +++ b/src/utils/mixin.js @@ -11,14 +11,12 @@ const mixin = { layoutMode: state => state.app.layout, navTheme: state => state.app.theme, primaryColor: state => state.app.color, - colorWeak: state => state.app.weak, fixedHeader: state => state.app.fixedHeader, fixSiderbar: state => state.app.fixSiderbar, fixSidebar: state => state.app.fixSiderbar, contentWidth: state => state.app.contentWidth, autoHideHeader: state => state.app.autoHideHeader, - sidebarOpened: state => state.app.sidebar, - multiTab: state => state.app.multiTab + sidebarOpened: state => state.app.sidebar }) }, methods: {