Merge branch 'hotfix/关闭当前页演示' into develop

Former-commit-id: 2587c74c0fb16b4990758947a5b2e2c7fe11edce [formerly 2587c74c0fb16b4990758947a5b2e2c7fe11edce [formerly 2587c74c0fb16b4990758947a5b2e2c7fe11edce [formerly 2587c74c0fb16b4990758947a5b2e2c7fe11edce [formerly 5b53cca9a6fa25d736fb31966796a70b43279e59 [formerly 1ab163a71e4c5edc16f28b164989038cf4e5c965]]]]]
Former-commit-id: 8f897dc1db60073e6cbce81cc1eab5ee0f50ba75
Former-commit-id: 4edd9bf6ac4efbeb15706633eb69c4d7c8e79bf2
Former-commit-id: 0c63734e6e14013d6c5fde820b78e513706d28b8 [formerly d15929fd903f0cf58b9049ff7f1168b354978216]
Former-commit-id: 536a61fcb42d76cf9bf3ffdfbb2a883b6c45d17a
Former-commit-id: 0e0af8598a5c3a5a64bfc67308504cbeb55ac6ca
Former-commit-id: e2f0ee692e075f1789481dad9360b484fe3f2d3c
Former-commit-id: 9062917a1046c973d59388157fa9bfcac81bafd8
Former-commit-id: 5f62240ed73e7f7ae894c0d098622a7590f98ae9

src/menu/modules/demo-playground.js

@@ -37,6 +37,21 @@ export default {
         { title: '正在开发 3' }
       ]
     },
+    {
+      path: `${pre}store`,
+      title: '全局状态管理',
+      icon: 'bolt',
+      children: [
+        { path: `${pre}store/page`, title: '多标签页控制', icon: 'window-restore' },
+        { path: `${pre}store/menu`, title: '菜单控制', icon: 'bars' },
+        { path: `${pre}store/size`, title: '全局尺寸', icon: 'font' },
+        { path: `${pre}store/ua`, title: '浏览器信息', icon: 'info-circle' },
+        { path: `${pre}store/gray`, title: '灰度模式', icon: 'eye' },
+        { path: `${pre}store/fullscreen`, title: '全屏', icon: 'arrows-alt' },
+        { path: `${pre}store/theme`, title: '主题', icon: 'diamond' },
+        { path: `${pre}store/transition`, title: '页面过渡开关', icon: 'toggle-on' }
+      ]
+    },
     {
       path: `${pre}page-cache`,
       title: '页面缓存',
@@ -55,20 +70,6 @@ export default {
         { path: `${pre}page-argu/get/username-from-menu?userid=userid-from-menu`, title: '接收' }
       ]
     },
-    {
-      path: `${pre}store`,
-      title: '全局状态管理',
-      icon: 'bolt',
-      children: [
-        { path: `${pre}store/menu`, title: '菜单控制', icon: 'bars' },
-        { path: `${pre}store/size`, title: '全局尺寸', icon: 'font' },
-        { path: `${pre}store/ua`, title: '浏览器信息', icon: 'info-circle' },
-        { path: `${pre}store/gray`, title: '灰度模式', icon: 'eye' },
-        { path: `${pre}store/fullscreen`, title: '全屏', icon: 'arrows-alt' },
-        { path: `${pre}store/theme`, title: '主题', icon: 'diamond' },
-        { path: `${pre}store/transition`, title: '页面过渡开关', icon: 'toggle-on' }
-      ]
-    },
     {
       path: `${pre}db`,
       title: '数据持久化',

src/pages/demo/playground/store/page/index.vue

@@ -0,0 +1,26 @@
+<template>
+  <d2-container type="card">
+    <el-button @click="closeCurrent" type="danger">
+      <d2-icon name="times"/>
+      关闭当前页
+    </el-button>
+  </d2-container>
+</template>
+
+<script>
+import { mapActions } from 'vuex'
+export default {
+  methods: {
+    ...mapActions('d2admin/page', [
+      'close'
+    ]),
+    // 关闭当前页
+    closeCurrent () {
+      this.close({
+        tagName: this.$route.name,
+        vm: this
+      })
+    }
+  }
+}
+</script>

src/router/modules/playground.js

@@ -10,10 +10,7 @@ export default {
   component: layoutHeaderAside,
   children: (pre => [
     { path: 'index', name: `${pre}index`, component: () => import('@/pages/demo/playground/index'), 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: 'store/page', name: `${pre}store-page`, component: () => import('@/pages/demo/playground/store/page'), meta: { ...meta, title: '多标签页控制' } },
-    { path: 'page-cache/off', name: `${pre}page-cache-off`, component: () => import('@/pages/demo/playground/page-cache/off.vue'), meta: { ...meta, title: '关闭缓存' } },
-    { 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: 'store/menu', name: `${pre}store-menu`, component: () => import('@/pages/demo/playground/store/menu'), meta: { ...meta, title: '菜单控制' } },
     { path: 'store/size', name: `${pre}store-size`, component: () => import('@/pages/demo/playground/store/size'), meta: { ...meta, title: '全局尺寸' } },
     { path: 'store/ua', name: `${pre}store-ua`, component: () => import('@/pages/demo/playground/store/ua'), meta: { ...meta, title: '浏览器信息' } },
@@ -21,6 +18,10 @@ export default {
     { path: 'store/fullscreen', name: `${pre}store-fullscreen`, component: () => import('@/pages/demo/playground/store/fullscreen'), meta: { ...meta, title: '全屏' } },
     { path: 'store/theme', name: `${pre}store-theme`, component: () => import('@/pages/demo/playground/store/theme'), meta: { ...meta, title: '主题' } },
     { 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-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: '总览' } },
     { path: 'db/public', name: `${pre}db-public`, component: () => import('@/pages/demo/playground/db/public'), meta: { ...meta, title: '公共存储' } },
     { path: 'db/user', name: `${pre}db-user`, component: () => import('@/pages/demo/playground/db/user'), meta: { ...meta, title: '私有存储' } },