From 54e6a72f3abf9536a77e97ff59abed99422e888f Mon Sep 17 00:00:00 2001
From: iczer <1126263215@qq.com>
Date: Tue, 16 Jun 2020 10:00:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9:=20=E4=BB=A3=E7=A0=81?=
=?UTF-8?q?=E8=A7=84=E8=8C=83=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/menu/menu.js | 2 +-
src/components/setting/Setting.vue | 10 +++++-----
src/layouts/MenuView.vue | 12 ++++++------
src/layouts/PageView.vue | 6 +++---
src/layouts/RouteView.vue | 6 +++---
src/store/modules/setting.js | 6 +++---
6 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/src/components/menu/menu.js b/src/components/menu/menu.js
index 67ad81f..62b4d90 100644
--- a/src/components/menu/menu.js
+++ b/src/components/menu/menu.js
@@ -19,7 +19,7 @@
* ]
**/
import Menu from 'ant-design-vue/es/menu'
-import Icon from 'ant-design-vue/es/icon/'
+import Icon from 'ant-design-vue/es/icon'
const {Item, SubMenu} = Menu
diff --git a/src/components/setting/Setting.vue b/src/components/setting/Setting.vue
index f8f46d3..e28f533 100644
--- a/src/components/setting/Setting.vue
+++ b/src/components/setting/Setting.vue
@@ -57,7 +57,7 @@
多页签模式
-
+
@@ -79,8 +79,8 @@ export default {
name: 'Setting',
components: {ImgCheckboxGroup, ImgCheckbox, ColorCheckboxGroup, ColorCheckbox, SettingItem},
computed: {
- multipage () {
- return this.$store.state.setting.multipage
+ multiPage () {
+ return this.$store.state.setting.multiPage
}
},
methods: {
@@ -103,8 +103,8 @@ export default {
clipboard.destroy()
})
},
- setMultipage (checked) {
- this.$store.commit('setting/setMultipage', checked)
+ setMultiPage (checked) {
+ this.$store.commit('setting/setMultiPage', checked)
}
}
}
diff --git a/src/layouts/MenuView.vue b/src/layouts/MenuView.vue
index d830476..1c450a1 100644
--- a/src/layouts/MenuView.vue
+++ b/src/layouts/MenuView.vue
@@ -3,7 +3,7 @@
onContextmenu(e)"
- v-if="multipage"
+ v-if="multiPage"
:active-key="activePage"
style="margin-top: -8px; margin-bottom: 8px"
:hide-add="true"
@@ -15,7 +15,7 @@
-
+
@@ -43,8 +43,8 @@ export default {
}
},
computed: {
- multipage () {
- return this.$store.state.setting.multipage
+ multiPage () {
+ return this.$store.state.setting.multiPage
}
},
created () {
@@ -55,7 +55,7 @@ export default {
watch: {
'$route': function (newRoute) {
this.activePage = newRoute.fullPath
- if (!this.multipage) {
+ if (!this.multiPage) {
this.linkList = [newRoute.fullPath]
this.pageList = [newRoute]
} else if (this.linkList.indexOf(newRoute.fullPath) < 0) {
@@ -66,7 +66,7 @@ export default {
'activePage': function (key) {
this.$router.push(key)
},
- 'multipage': function (newVal) {
+ 'multiPage': function (newVal) {
if (!newVal) {
this.linkList = [this.$route.fullPath]
this.pageList = [this.$route]
diff --git a/src/layouts/PageView.vue b/src/layouts/PageView.vue
index 8bd391a..d9f1b56 100644
--- a/src/layouts/PageView.vue
+++ b/src/layouts/PageView.vue
@@ -4,7 +4,7 @@
-
+
@@ -26,8 +26,8 @@ export default {
}
},
computed: {
- multipage () {
- return this.$store.state.setting.multipage
+ multiPage () {
+ return this.$store.state.setting.multiPage
}
},
mounted () {
diff --git a/src/layouts/RouteView.vue b/src/layouts/RouteView.vue
index 2da2158..ecedaaa 100644
--- a/src/layouts/RouteView.vue
+++ b/src/layouts/RouteView.vue
@@ -1,6 +1,6 @@
-
+
@@ -11,8 +11,8 @@
export default {
name: 'RouteView',
computed: {
- multipage () {
- return this.$store.state.setting.multipage
+ multiPage () {
+ return this.$store.state.setting.multiPage
}
}
}
diff --git a/src/store/modules/setting.js b/src/store/modules/setting.js
index e9cda48..0f3f77d 100644
--- a/src/store/modules/setting.js
+++ b/src/store/modules/setting.js
@@ -11,7 +11,7 @@ export default {
{link: 'https://github.com/iczer/vue-antd-admin', icon: 'github'},
{link: 'https://ant.design', name: 'Ant Design'}
],
- multipage: true
+ multiPage: true
},
mutations: {
setDevice (state, isMobile) {
@@ -23,8 +23,8 @@ export default {
setLayout (state, layout) {
state.layout = layout
},
- setMultipage (state, multipage) {
- state.multipage = multipage
+ setMultiPage (state, multiPage) {
+ state.multiPage = multiPage
}
}
}