From 5a91ab709fa9166561f919769556d7621cd4e04b Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Wed, 8 Aug 2018 16:04:10 +0800 Subject: [PATCH] util user menu releases Former-commit-id: 236acdba4bc6cbd5921647fd5c1ee0258f43c143 [formerly 236acdba4bc6cbd5921647fd5c1ee0258f43c143 [formerly 236acdba4bc6cbd5921647fd5c1ee0258f43c143 [formerly 236acdba4bc6cbd5921647fd5c1ee0258f43c143 [formerly cd607a12b20a3d53a1967ee6012a35e03e3d31fe [formerly 645a010d0d8f84a370c509c39c560d93eaa8ae4f]]]]] Former-commit-id: fd4e72b6a4dc7cb2731c0b5fbf343dab6c251d3f Former-commit-id: 68305cd58cbd1927373a79c1b507de3c4f3d9924 Former-commit-id: 48312890868f48d5524b0de0dda489f2b2c57b0a [formerly fec91cd8f508ffe42c5e254dcee018c879f3d51e] Former-commit-id: 9e300a2baafd1eae86bb69a052f15b904724856e Former-commit-id: eaafbb0a410a49a286eb8e666b6784b96c9df371 Former-commit-id: ccef5438dddbe9762bd3574b33aab49bc1edee58 Former-commit-id: d2ca5c406860c43079d78a80d18ca2b1ed87f776 Former-commit-id: d4648c6865bff45b24aea999b60381b78417b802 --- package.json | 1 + .../components/header-user/index.vue | 6 +- .../components/menu-header/index.vue | 6 +- .../components/menu-side/index.vue | 16 +-- src/layout/header-aside/layout.vue | 18 ++-- src/libs/db.js | 3 + src/libs/util.js | 4 +- src/main.js | 4 +- .../demo/playground/store/menu/index.vue | 84 ++++++--------- src/pages/demo/playground/store/sys/index.vue | 23 ++-- .../modules/d2admin/index.js.REMOVED.git-id | 2 +- src/store/modules/d2admin/modules/menu.js | 67 ++++++++++++ src/store/modules/d2admin/modules/releases.js | 31 ++++++ src/store/modules/d2admin/modules/user.js | 36 +++++++ src/store/modules/d2admin/modules/util.js | 101 ++++++++++++++++++ 15 files changed, 317 insertions(+), 85 deletions(-) create mode 100644 src/store/modules/d2admin/modules/menu.js create mode 100644 src/store/modules/d2admin/modules/releases.js create mode 100644 src/store/modules/d2admin/modules/user.js create mode 100644 src/store/modules/d2admin/modules/util.js diff --git a/package.json b/package.json index 817a4232..c9a64425 100644 --- a/package.json +++ b/package.json @@ -28,6 +28,7 @@ "js-cookie": "^2.2.0", "lodash.clonedeep": "^4.5.0", "lodash.get": "^4.4.2", + "lodash.set": "^4.3.2", "lodash.sortby": "^4.7.0", "lodash.uniqueid": "^4.0.1", "lowdb": "^1.0.0", diff --git a/src/layout/header-aside/components/header-user/index.vue b/src/layout/header-aside/components/header-user/index.vue index 3cc270b0..d2f53ccc 100644 --- a/src/layout/header-aside/components/header-user/index.vue +++ b/src/layout/header-aside/components/header-user/index.vue @@ -14,9 +14,9 @@ import { mapState, mapActions } from 'vuex' export default { computed: { - ...mapState('d2admin', [ - 'userInfo' - ]) + ...mapState('d2admin', { + userInfo: state => state.user.userInfo + }) }, methods: { ...mapActions('d2admin', [ diff --git a/src/layout/header-aside/components/menu-header/index.vue b/src/layout/header-aside/components/menu-header/index.vue index 0d634f27..acea80cf 100644 --- a/src/layout/header-aside/components/menu-header/index.vue +++ b/src/layout/header-aside/components/menu-header/index.vue @@ -1,6 +1,6 @@