From 7205ba815567139d9ff92337f8eb49d068b04939 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 15 Jul 2018 22:37:47 +0800
Subject: [PATCH] d2adminPageOpenNew

Former-commit-id: 5df2296b49b7aa30fd538cd4cba6243fb4c5dcda [formerly 5df2296b49b7aa30fd538cd4cba6243fb4c5dcda [formerly 5df2296b49b7aa30fd538cd4cba6243fb4c5dcda [formerly 5df2296b49b7aa30fd538cd4cba6243fb4c5dcda [formerly 3815f30b8582ad103adcb095d6029d9a49a991d8 [formerly 6d6ac8200dd2f35d0ce5c7d5c64be0f6ada4dd36]]]]]
Former-commit-id: 40ca6c487421eb03c7f7319109479c7491a3ceaa
Former-commit-id: 7ec071bf88a4110193a80568d192dac33998e0ef
Former-commit-id: 6549b8201614da3e4fa18caa0b0aaeac488b4475 [formerly cb49c8b8de3b602f0c429d1b0a98ff9ee2b53e2a]
Former-commit-id: fa34fcc37693bb793361336873452b45aa28aad6
Former-commit-id: df95dbbbe950e913c2b4cf05318372055491004e
Former-commit-id: 77345827cb3bd27ce976cc5ec685275ac234590a
Former-commit-id: f4fff691850c4ab570df39e81eef233944de7024
Former-commit-id: 3ee802ca4169f581928e408af9ea13db8be77e53
---
 .../core/d2-multiple-page-control/index.vue   |  2 +-
 src/libs/util.js                              | 32 -------------------
 src/router/index.js                           |  2 +-
 src/store/modules/d2admin.js.REMOVED.git-id   |  2 +-
 4 files changed, 3 insertions(+), 35 deletions(-)

diff --git a/src/components/core/d2-multiple-page-control/index.vue b/src/components/core/d2-multiple-page-control/index.vue
index 69307db7..9472db4c 100644
--- a/src/components/core/d2-multiple-page-control/index.vue
+++ b/src/components/core/d2-multiple-page-control/index.vue
@@ -100,7 +100,7 @@ export default {
       if (page) {
         this.$router.push({
           name: page.name,
-          params: page.argu,
+          params: page.params,
           query: page.query
         })
       }
diff --git a/src/libs/util.js b/src/libs/util.js
index 867e6bbf..13f8c320 100644
--- a/src/libs/util.js
+++ b/src/libs/util.js
@@ -25,37 +25,6 @@ util.title = function (title) {
   window.document.title = `${prefix}${title ? ` | ${title}` : ''}`
 }
 
-/**
- * @description 在每次打开新页面的时候调用 打开一个新的 tab
- * @param {object} vm vue
- * @param {string} name route name
- * @param {object} argu arguments
- * @param {object} query query object
- */
-util.openNewPage = function (vm, name, argu, query) {
-  // 已经打开的页面
-  let pageOpenedList = vm.$store.state.d2admin.pageOpenedList
-  // 判断此页面是否已经打开 并且记录位置
-  let pageOpendIndex = 0
-  const pageOpend = pageOpenedList.find((page, index) => {
-    const same = page.name === name
-    pageOpendIndex = same ? index : pageOpendIndex
-    return same
-  })
-  if (pageOpend) {
-    // 页面以前打开过 但是新的页面可能 name 一样，参数不一样
-    vm.$store.commit('d2adminPageOpenedListUpdateItem', { index: pageOpendIndex, argu, query })
-  } else {
-    // 页面以前没有打开过
-    const tagPool = vm.$store.state.d2admin.tagPool
-    let tag = tagPool.find(t => t.name === name)
-    if (tag) {
-      vm.$store.commit('d2adminTagIncreate', { tag, argu, query })
-    }
-  }
-  vm.$store.commit('d2adminPageCurrentSet', name)
-}
-
 /**
  * @description 判断是否在其内
  * @param {*} ele element
@@ -73,7 +42,6 @@ util.isOneOf = function (ele, targetArr) {
  * @description 检查版本更新
  * @param {object} vm vue
  */
-// TODO: 添加 跳过此版本 选项
 util.checkUpdate = function (vm) {
   axios.get('https://api.github.com/repos/FairyEver/d2-admin/releases/latest')
     .then(res => {
diff --git a/src/router/index.js b/src/router/index.js
index 1a5fffa7..e643aa5f 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -39,7 +39,7 @@ router.afterEach(to => {
   const app = router.app
   const { name, params, query } = to
   // 多页控制 打开新的页面
-  util.openNewPage(app, name, params, query)
+  app.$store.commit('d2adminPageOpenNew', { name, params, query })
   // 更改标题
   util.title(to.meta.title)
 })
diff --git a/src/store/modules/d2admin.js.REMOVED.git-id b/src/store/modules/d2admin.js.REMOVED.git-id
index e446952e..6c69df56 100644
--- a/src/store/modules/d2admin.js.REMOVED.git-id
+++ b/src/store/modules/d2admin.js.REMOVED.git-id
@@ -1 +1 @@
-dbbf4b265c5bc57b7defe585c27f8491ca9e7a85
\ No newline at end of file
+a77ef2a929f3e850d71b14a5d2c8570053a5c44c
\ No newline at end of file