From 11a7310644cc073acf00fa8d24e5ba3447220b12 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Fri, 29 Jun 2018 20:30:16 +0800 Subject: [PATCH] no message Former-commit-id: 7169f59ccf101ea4408b91bc96f0ef84469e091b [formerly 7169f59ccf101ea4408b91bc96f0ef84469e091b [formerly 7169f59ccf101ea4408b91bc96f0ef84469e091b [formerly 7169f59ccf101ea4408b91bc96f0ef84469e091b [formerly 5cd2155f34bce723bd579129b00b6d6718700648 [formerly 51bd97f3521597b370e6166be2247062c6dc1fc6]]]]] Former-commit-id: 4f25d138054f1d396803394f13934136b052e7bc Former-commit-id: 37f5621c711f88fd3ad81d85a2491f4560ea955e Former-commit-id: a7a2c345c9c45262d92873bcdc5974b293c454d1 [formerly c360aca00688cfa223cd6352bfd29db1704794cb] Former-commit-id: 19a5e4af8676e8ac802c134a9f46ab4550f64725 Former-commit-id: c41a64fed89fcd7bb2981e3cfd93d1e4fc5992ed Former-commit-id: c556f6fb23859dce87fa17d872b4868347b27bc5 Former-commit-id: ecd4afda34a8bffa678afe951b8f96976575c592 Former-commit-id: 961f95d9e012a8d3dcbc8e5e54d65a210c295a3a --- .../d2-layout-main/components/-full-screen/index.vue | 4 ++-- src/pages/demo/playground/fullscreen/index.vue | 4 ++-- src/store/modules/d2admin.js | 11 ++++++++++- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/components/core/d2-layout-main/components/-full-screen/index.vue b/src/components/core/d2-layout-main/components/-full-screen/index.vue index c411f9b9..1903cea4 100644 --- a/src/components/core/d2-layout-main/components/-full-screen/index.vue +++ b/src/components/core/d2-layout-main/components/-full-screen/index.vue @@ -3,7 +3,7 @@ effect="dark" :content="isFullScreen ? '退出全屏' : '全屏'" placement="bottom"> - + @@ -20,7 +20,7 @@ export default { }, methods: { ...mapMutations([ - 'toggleFullScreen' + 'd2adminFullScreenToggle' ]) } } diff --git a/src/pages/demo/playground/fullscreen/index.vue b/src/pages/demo/playground/fullscreen/index.vue index 1fa83dcf..c1ae13ca 100644 --- a/src/pages/demo/playground/fullscreen/index.vue +++ b/src/pages/demo/playground/fullscreen/index.vue @@ -5,7 +5,7 @@ v-model="isFullScreen" active-text="全屏" inactive-text="正常" - @change="toggleFullScreen"> + @change="d2adminFullScreenToggle"> @@ -20,7 +20,7 @@ export default { }, methods: { ...mapMutations([ - 'toggleFullScreen' + 'd2adminFullScreenToggle' ]) } } diff --git a/src/store/modules/d2admin.js b/src/store/modules/d2admin.js index 097ef913..b84ee63d 100644 --- a/src/store/modules/d2admin.js +++ b/src/store/modules/d2admin.js @@ -6,6 +6,8 @@ export default { state: { // 全屏 isFullScreen: false, + // 灰度 + isGrayView: false, // 主题 themeList, themeActive: themeList[1] @@ -15,7 +17,7 @@ export default { * 切换全屏 * @param {state} state vuex state */ - toggleFullScreen (state) { + d2adminFullScreenToggle (state) { if (state.isFullScreen) { util.exitFullScreen() state.isFullScreen = false @@ -24,6 +26,13 @@ export default { state.isFullScreen = true } }, + /** + * 切换灰度状态 + * @param {state} state vuex state + */ + d2adminGrayViewToggle (state) { + state.isGray = !state.isGray + }, /** * 激活一个主题(应用到dom上) * @param {state} state vuex state