Merge branch 'hotfix/han-feng-pr' into develop

Former-commit-id: d6b9de1953da8796d6e4df35ff43968d11cd887c [formerly d6b9de1953da8796d6e4df35ff43968d11cd887c [formerly d6b9de1953da8796d6e4df35ff43968d11cd887c [formerly d6b9de1953da8796d6e4df35ff43968d11cd887c [formerly 8d348a3814037d08d2b813c889fbc6b95678d3c4 [formerly 4b8f2d5519ad2935b2885ad30b725a8da17a8361]]]]]
Former-commit-id: cb851fc4c36cb56e3c7f27b035edf483474852cf
Former-commit-id: 7e13b7b9501fda63d0b7b8e1a4a3b543c31a6780
Former-commit-id: 41469259431287505bf4aa93601752a01a1fae86 [formerly 144e14d0deb1be04ac6591edc957c4e0dfa9de68]
Former-commit-id: 522ad890e7e3a81f57ac63cc10183ca58112885f
Former-commit-id: 9d258ca277893f7a2956281a325dec0d1b2df426
Former-commit-id: 51a546f2080cdab83fb29c2942c71c40660ff7b8
Former-commit-id: 8a3b732c53ea22fd96be35994e7f9d9583a3a637
Former-commit-id: 855644404c5e5330005431de97ad7412b841347f

.env.nomock

@@ -0,0 +1,7 @@
+# No Mock 构建
+
+# 指定构建模式
+NODE_ENV=production
+
+# 标记当前是 No Mock 构建
+VUE_APP_BUILD_MODE=nomock

package.json

@@ -1,12 +1,13 @@
 {
   "name": "d2-admin",
-  "version": "1.5.9",
+  "version": "1.6.0",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve --open",
     "start": "npm run serve",
     "dev": "npm run serve",
     "build": "vue-cli-service build",
+    "build:nomock": "vue-cli-service build --mode nomock",
     "build:travis": "vue-cli-service build --mode travis",
     "lint": "vue-cli-service lint --fix",
     "test:unit": "vue-cli-service test:unit"

src/layout/header-aside/components/menu-side/index.vue

@@ -55,12 +55,12 @@ export default {
       }, 500)
     },
     // 监听路由 控制侧边栏激活状态
-    '$route.matched': {
-      handler (val) {
-        this.active = val[val.length - 1].path
+    '$route': {
+      handler ({ fullPath }) {
+        this.active = fullPath
         this.$nextTick(() => {
           if (this.aside.length > 0 && this.$refs.menu) {
-            this.$refs.menu.activeIndex = this.active
+            this.$refs.menu.activeIndex = fullPath
           }
         })
       },

src/layout/header-aside/components/tabs/index.vue

@@ -7,7 +7,7 @@
           :x="contentmenuX"
           :y="contentmenuY">
           <d2-contextmenu-list
-            :menulist="tagName === 'index' ? contextmenuListIndex : contextmenuList"
+            :menulist="tagName === '/index' ? contextmenuListIndex : contextmenuList"
             @rowClick="contextmenuClick"/>
         </d2-contextmenu>
         <el-tabs
@@ -22,7 +22,7 @@
             v-for="(page, index) in opened"
             :key="index"
             :label="page.meta.title || '未命名'"
-            :name="page.name"/>
+            :name="page.fullPath"/>
         </el-tabs>
       </div>
     </div>
@@ -79,7 +79,7 @@ export default {
         { icon: 'times', title: '关闭其它', value: 'other' },
         { icon: 'times-circle', title: '关闭全部', value: 'all' }
       ],
-      tagName: 'index'
+      tagName: '/index'
     }
   },
   computed: {
@@ -163,7 +163,7 @@ export default {
      */
     handleClick (tab, event) {
       // 找到点击的页面在 tag 列表里是哪个
-      const page = this.opened.find(page => page.name === tab.name)
+      const page = this.opened.find(page => page.fullPath === tab.name)
       const { name, params, query } = page
       if (page) {
         this.$router.push({ name, params, query })

src/main.js

@@ -5,8 +5,6 @@ import Vue from 'vue'
 import App from './App'
 // store
 import store from '@/store/index'
-// 模拟数据
-import '@/mock'
 // 多国语
 import i18n from './i18n'
 // 核心插件

src/menu/modules/demo-playground.js

@@ -58,7 +58,9 @@ export default {
       icon: 'hdd-o',
       children: [
         { path: `${pre}page-cache/on`, title: '开启缓存' },
-        { path: `${pre}page-cache/off`, title: '关闭缓存' }
+        { path: `${pre}page-cache/off`, title: '关闭缓存' },
+        { path: `${pre}page-cache/params/1`, title: '带参路由缓存 1' },
+        { path: `${pre}page-cache/params/2`, title: '带参路由缓存 2' }
       ]
     },
     {

src/pages/demo/playground/page-cache/params.vue

@@ -0,0 +1,22 @@
+<template>
+  <d2-container type="card">
+    <template slot="header">这个页面会被 keep-alive</template>
+    <h2 class="d2-mt-0">编号：{{id}}</h2>
+    <p class="d2-mt-0">在下面的输入框输入任意字符后，切换到其它页面，再回到此页时输入框文字保留，证明被缓存</p>
+    <el-input v-model="value" placeholder="input here"></el-input>
+  </d2-container>
+</template>
+
+<script>
+export default {
+  name: 'demo-playground-page-cache-params',
+  props: {
+    id: String
+  },
+  data () {
+    return {
+      value: ''
+    }
+  }
+}
+</script>

src/router/index.js

@@ -55,9 +55,9 @@ router.afterEach(to => {
   NProgress.done()
   // 需要的信息
   const app = router.app
-  const { name, params, query } = to
+  const { name, params, query, fullPath } = to
   // 多页控制 打开新的页面
-  app.$store.dispatch('d2admin/page/open', { name, params, query })
+  app.$store.dispatch('d2admin/page/open', { name, params, query, fullPath })
   // 更改标题
   util.title(to.meta.title)
 })

src/router/modules/playground.js

@@ -20,6 +20,7 @@ export default {
     { path: 'store/transition', name: `${pre}store-transition`, component: () => import('@/pages/demo/playground/store/transition'), meta: { ...meta, title: '页面过渡开关' } },
     { path: 'page-cache/on', name: `${pre}page-cache-on`, component: () => import('@/pages/demo/playground/page-cache/on.vue'), meta: { ...meta, cache: true, title: '开启缓存' } },
     { path: 'page-cache/off', name: `${pre}page-cache-off`, component: () => import('@/pages/demo/playground/page-cache/off.vue'), meta: { ...meta, title: '关闭缓存' } },
+    { path: 'page-cache/params/:id', name: `${pre}page-cache-params`, component: () => import('@/pages/demo/playground/page-cache/params.vue'), meta: { ...meta, cache: true, title: '带参路由缓存' }, props: true },
     { path: 'page-argu/send', name: `${pre}page-argu-send`, component: () => import('@/pages/demo/playground/page-argu/send.vue'), meta: { ...meta, title: '参数传递 发送' } },
     { path: 'page-argu/get/:username', name: `${pre}page-argu-get`, component: () => import('@/pages/demo/playground/page-argu/get.vue'), meta: { ...meta, title: '参数传递 接收' } },
     { path: 'db/all', name: `${pre}db-all`, component: () => import('@/pages/demo/playground/db/all'), meta: { ...meta, title: '总览' } },

src/setting.js

@@ -18,6 +18,7 @@ export default {
     opened: [
       {
         name: 'index',
+        fullPath: '/index',
         meta: {
           title: '首页',
           requiresAuth: false

src/store/modules/d2admin/modules/account.js

@@ -10,14 +10,14 @@ export default {
      * @param {Object} param vm {Object} vue 实例
      * @param {Object} param username {String} 用户账号
      * @param {Object} param password {String} 密码
-     * @param {Object} param route {Object} 登录成功后定向的路由对象
+     * @param {Object} param route {Object} 登录成功后定向的路由对象 任何 vue-router 支持的格式
      */
     login ({ dispatch }, {
       vm,
       username,
       password,
       route = {
-        name: 'index'
+        path: '/'
       }
     }) {
       // 开始请求登录接口

src/store/modules/d2admin/modules/page.js.REMOVED.git-id

@@ -1 +1 @@
-b640559cb03d106f8ed74403b61a7af0561e5015
+033fcecc7eeff02cfda00a5ded8a23cb359855f1

vue.config.js

@@ -57,5 +57,11 @@ module.exports = {
     entry
       .add('babel-polyfill')
       .end()
+    // 判断环境加入模拟数据
+    if (process.env.VUE_APP_BUILD_MODE !== 'nomock') {
+      entry
+        .add('@/mock')
+        .end()
+    }
   }
 }