From b0187d4049a515ffecfc39dc2c6268ed9bb0916d Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sat, 3 Nov 2018 22:03:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BA=86=E5=85=B3=E9=97=AD?=
 =?UTF-8?q?=E5=BD=93=E5=89=8D=E9=A1=B5=E7=9A=84=E6=BC=94=E7=A4=BA=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 03266ab647bba9e41bec8a041a955af0f15c40ff [formerly 03266ab647bba9e41bec8a041a955af0f15c40ff [formerly 03266ab647bba9e41bec8a041a955af0f15c40ff [formerly 03266ab647bba9e41bec8a041a955af0f15c40ff [formerly 3c54fb07a591656bd559d0c47ab411ed805a3f9a [formerly 825f86753aff1836276058c18173eb46fe234194]]]]]
Former-commit-id: 7edc745314d896b8485619b120d55f74eede993c
Former-commit-id: 2560f5530f3c08433d8d7eae1547e229cb966b10
Former-commit-id: 9f1b2d523e9aac7340602c5e535064506e8b1ae3 [formerly 2bedfa7b79262575d1fd11da3988acddd2254a76]
Former-commit-id: d02c30e8aab42b61d8be00a1a0a3842e26d5b2c3
Former-commit-id: e2901abdf43563238e24bdc6f5787f68cf01d3cd
Former-commit-id: 1e9831b40827e0c2af4da0a1c8f8bc89459ea6aa
Former-commit-id: 80c2de16c921ebd541189d7bcdd36b152593f054
Former-commit-id: 26d7667f92da3e0a33edfb875ce07e9f999eccdb
---
 src/menu/modules/demo-playground.js           | 29 ++++++++++---------
 .../demo/playground/store/page/index.vue      | 26 +++++++++++++++++
 src/router/modules/playground.js              |  9 +++---
 3 files changed, 46 insertions(+), 18 deletions(-)
 create mode 100644 src/pages/demo/playground/store/page/index.vue

diff --git a/src/menu/modules/demo-playground.js b/src/menu/modules/demo-playground.js
index 5023625d..71ec355a 100644
--- a/src/menu/modules/demo-playground.js
+++ b/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: '数据持久化',
diff --git a/src/pages/demo/playground/store/page/index.vue b/src/pages/demo/playground/store/page/index.vue
new file mode 100644
index 00000000..5c64e128
--- /dev/null
+++ b/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>
diff --git a/src/router/modules/playground.js b/src/router/modules/playground.js
index 504055ed..92f9aec4 100644
--- a/src/router/modules/playground.js
+++ b/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: '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/page', name: `${pre}store-page`, component: () => import('@/pages/demo/playground/store/page'), 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: '私有存储' } },