diff --git a/.env.nomock b/.env.nomock new file mode 100644 index 00000000..0c644c80 --- /dev/null +++ b/.env.nomock @@ -0,0 +1,7 @@ +# No Mock 构建 + +# 指定构建模式 +NODE_ENV=production + +# 标记当前是 No Mock 构建 +VUE_APP_BUILD_MODE=nomock diff --git a/package.json b/package.json index f5d7c7e4..3e8324d6 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,7 @@ "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" diff --git a/src/layout/header-aside/components/tabs/index.vue b/src/layout/header-aside/components/tabs/index.vue index d1a77676..45b4e029 100644 --- a/src/layout/header-aside/components/tabs/index.vue +++ b/src/layout/header-aside/components/tabs/index.vue @@ -7,7 +7,7 @@ :x="contentmenuX" :y="contentmenuY"> + :name="page.fullPath"/> @@ -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 }) diff --git a/src/main.js b/src/main.js index 3704dc78..b11a2976 100644 --- a/src/main.js +++ b/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' // 核心插件 diff --git a/src/menu/modules/demo-playground.js b/src/menu/modules/demo-playground.js index 71ec355a..eb84d2d9 100644 --- a/src/menu/modules/demo-playground.js +++ b/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' } ] }, { diff --git a/src/pages/demo/playground/page-cache/params.vue b/src/pages/demo/playground/page-cache/params.vue new file mode 100644 index 00000000..90f032e7 --- /dev/null +++ b/src/pages/demo/playground/page-cache/params.vue @@ -0,0 +1,22 @@ + + + diff --git a/src/router/index.js b/src/router/index.js index 4cf7d272..241e6215 100755 --- a/src/router/index.js +++ b/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) }) diff --git a/src/router/modules/playground.js b/src/router/modules/playground.js index f2bd74d3..b2d6a7b1 100644 --- a/src/router/modules/playground.js +++ b/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: '总览' } }, diff --git a/src/setting.js b/src/setting.js index f6f4016e..66ed4bd1 100644 --- a/src/setting.js +++ b/src/setting.js @@ -18,6 +18,7 @@ export default { opened: [ { name: 'index', + fullPath: '/index', meta: { title: '首页', requiresAuth: false diff --git a/src/store/modules/d2admin/modules/page.js.REMOVED.git-id b/src/store/modules/d2admin/modules/page.js.REMOVED.git-id index 5a5e14b3..b42d384d 100644 --- a/src/store/modules/d2admin/modules/page.js.REMOVED.git-id +++ b/src/store/modules/d2admin/modules/page.js.REMOVED.git-id @@ -1 +1 @@ -b640559cb03d106f8ed74403b61a7af0561e5015 \ No newline at end of file +033fcecc7eeff02cfda00a5ded8a23cb359855f1 \ No newline at end of file diff --git a/vue.config.js b/vue.config.js index aa5136af..f2f2f446 100644 --- a/vue.config.js +++ b/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() + } } }