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