feat: update 1.9.0

src/store/modules/d2admin/modules/page.js

@@ -1,4 +1,4 @@
-import { get } from 'lodash'
+import { cloneDeep, uniq, get } from 'lodash'
 import router from '@/router'
 import setting from '@/setting.js'
 
@@ -11,7 +11,7 @@ export default {
     // 可以在多页 tab 模式下显示的页面
     pool: [],
     // 当前显示的多页面列表
-    opened: setting.page.opened,
+    opened: get(setting, 'page.opened', []),
     // 已经加载多标签页数据 https://github.com/d2-projects/d2-admin/issues/201
     openedLoaded: false,
     // 当前页面
@@ -28,9 +28,7 @@ export default {
       if (state.openedLoaded) return Promise.resolve()
       return new Promise(resolve => {
         const timer = setInterval(() => {
-          if (state.openedLoaded) {
-            resolve(clearInterval(timer))
-          }
+          if (state.openedLoaded) resolve(clearInterval(timer))
         }, 10)
       })
     },
@@ -39,22 +37,22 @@ export default {
      * @description 从持久化数据载入标签页列表
      * @param {Object} context
      */
-    openedLoad ({ state, commit, dispatch }) {
-      return new Promise(async resolve => {
-        // store 赋值
-        const value = await dispatch('d2admin/db/get', {
-          dbName: 'sys',
-          path: 'page.opened',
-          defaultValue: setting.page.opened,
-          user: true
-        }, { root: true })
-        // 在处理函数中进行数据优化 过滤掉现在已经失效的页签或者已经改变了信息的页签
-        // 以 fullPath 字段为准
-        // 如果页面过多的话可能需要优化算法
-        // valid 有效列表 1, 1, 0, 1 => 有效, 有效, 失效, 有效
-        const valid = []
-        // 处理数据
-        state.opened = value.map(opened => {
+    async openedLoad ({ state, commit, dispatch }) {
+      // store 赋值
+      const value = await dispatch('d2admin/db/get', {
+        dbName: 'sys',
+        path: 'page.opened',
+        defaultValue: setting.page.opened,
+        user: true
+      }, { root: true })
+      // 在处理函数中进行数据优化 过滤掉现在已经失效的页签或者已经改变了信息的页签
+      // 以 fullPath 字段为准
+      // 如果页面过多的话可能需要优化算法
+      // valid 有效列表 1, 1, 0, 1 => 有效, 有效, 失效, 有效
+      const valid = []
+      // 处理数据
+      state.opened = value
+        .map(opened => {
           // 忽略首页
           if (opened.fullPath === '/index') {
             valid.push(1)
@@ -67,31 +65,25 @@ export default {
           // 返回合并后的数据 新的覆盖旧的
           // 新的数据中一般不会携带 params 和 query, 所以旧的参数会留存
           return Object.assign({}, opened, find)
-        }).filter((opened, index) => valid[index] === 1)
-        // 标记已经加载多标签页数据 https://github.com/d2-projects/d2-admin/issues/201
-        state.openedLoaded = true
-        // 根据 opened 数据生成缓存设置
-        commit('keepAliveRefresh')
-        // end
-        resolve()
-      })
+        })
+        .filter((opened, index) => valid[index] === 1)
+      // 标记已经加载多标签页数据 https://github.com/d2-projects/d2-admin/issues/201
+      state.openedLoaded = true
+      // 根据 opened 数据生成缓存设置
+      commit('keepAliveRefresh')
     },
     /**
      * 将 opened 属性赋值并持久化 在这之前请先确保已经更新了 state.opened
      * @param {Object} context
      */
-    opened2db ({ state, dispatch }) {
-      return new Promise(async resolve => {
-        // 设置数据
-        dispatch('d2admin/db/set', {
-          dbName: 'sys',
-          path: 'page.opened',
-          value: state.opened,
-          user: true
-        }, { root: true })
-        // end
-        resolve()
-      })
+    async opened2db ({ state, dispatch }) {
+      // 设置数据
+      dispatch('d2admin/db/set', {
+        dbName: 'sys',
+        path: 'page.opened',
+        value: state.opened,
+        user: true
+      }, { root: true })
     },
     /**
      * @class opened
@@ -99,19 +91,15 @@ export default {
      * @param {Object} context
      * @param {Object} payload { index, params, query, fullPath } 路由信息
      */
-    openedUpdate ({ state, commit, dispatch }, { index, params, query, fullPath }) {
-      return new Promise(async resolve => {
-        // 更新页面列表某一项
-        let page = state.opened[index]
-        page.params = params || page.params
-        page.query = query || page.query
-        page.fullPath = fullPath || page.fullPath
-        state.opened.splice(index, 1, page)
-        // 持久化
-        await dispatch('opened2db')
-        // end
-        resolve()
-      })
+    async openedUpdate ({ state, commit, dispatch }, { index, params, query, fullPath }) {
+      // 更新页面列表某一项
+      let page = state.opened[index]
+      page.params = params || page.params
+      page.query = query || page.query
+      page.fullPath = fullPath || page.fullPath
+      state.opened.splice(index, 1, page)
+      // 持久化
+      await dispatch('opened2db')
     },
     /**
      * @class opened
@@ -119,17 +107,13 @@ export default {
      * @param {Object} context
      * @param {Object} payload { oldIndex, newIndex } 位置信息
      */
-    openedSort ({ state, commit, dispatch }, { oldIndex, newIndex }) {
-      return new Promise(async resolve => {
-        // 重排页面列表某一项
-        let page = state.opened[oldIndex]
-        state.opened.splice(oldIndex, 1)
-        state.opened.splice(newIndex, 0, page)
-        // 持久化
-        await dispatch('opened2db')
-        // end
-        resolve()
-      })
+    async openedSort ({ state, commit, dispatch }, { oldIndex, newIndex }) {
+      // 重排页面列表某一项
+      let page = state.opened[oldIndex]
+      state.opened.splice(oldIndex, 1)
+      state.opened.splice(newIndex, 0, page)
+      // 持久化
+      await dispatch('opened2db')
     },
     /**
      * @class opened
@@ -137,67 +121,60 @@ export default {
      * @param {Object} context
      * @param {Object} payload new tag info
      */
-    add ({ state, commit, dispatch }, { tag, params, query, fullPath }) {
-      return new Promise(async resolve => {
-        // 设置新的 tag 在新打开一个以前没打开过的页面时使用
-        let newTag = tag
-        newTag.params = params || newTag.params
-        newTag.query = query || newTag.query
-        newTag.fullPath = fullPath || newTag.fullPath
-        // 添加进当前显示的页面数组
-        state.opened.push(newTag)
-        // 如果这个页面需要缓存 将其添加到缓存设置
-        if (isKeepAlive(newTag)) {
-          commit('keepAlivePush', tag.name)
-        }
-        // 持久化
-        await dispatch('opened2db')
-        // end
-        resolve()
-      })
+    async add ({ state, commit, dispatch }, { tag, params, query, fullPath }) {
+      // 设置新的 tag 在新打开一个以前没打开过的页面时使用
+      let newTag = tag
+      newTag.params = params || newTag.params
+      newTag.query = query || newTag.query
+      newTag.fullPath = fullPath || newTag.fullPath
+      // 添加进当前显示的页面数组
+      state.opened.push(newTag)
+      // 如果这个页面需要缓存 将其添加到缓存设置
+      if (isKeepAlive(newTag)) commit('keepAlivePush', tag.name)
+      // 持久化
+      await dispatch('opened2db')
     },
     /**
      * @class current
      * @description 打开一个新的页面
      * @param {Object} context
-     * @param {Object} payload 从路由钩子的 to 对象上获取 { name, params, query, fullPath } 路由信息
+     * @param {Object} payload 从路由钩子的 to 对象上获取 { name, params, query, fullPath, meta } 路由信息
      */
-    open ({ state, commit, dispatch }, { name, params, query, fullPath }) {
-      return new Promise(async resolve => {
-        // 已经打开的页面
-        let opened = state.opened
-        // 判断此页面是否已经打开 并且记录位置
-        let pageOpendIndex = 0
-        const pageOpend = opened.find((page, index) => {
-          const same = page.fullPath === fullPath
-          pageOpendIndex = same ? index : pageOpendIndex
-          return same
+    async open ({ state, commit, dispatch }, { name, params, query, fullPath, meta }) {
+      // 已经打开的页面
+      let opened = state.opened
+      // 判断此页面是否已经打开 并且记录位置
+      let pageOpendIndex = 0
+      const pageOpend = opened.find((page, index) => {
+        const same = page.fullPath === fullPath
+        pageOpendIndex = same ? index : pageOpendIndex
+        return same
+      })
+      if (pageOpend) {
+        // 页面以前打开过
+        await dispatch('openedUpdate', {
+          index: pageOpendIndex,
+          params,
+          query,
+          fullPath
         })
-        if (pageOpend) {
-          // 页面以前打开过
-          await dispatch('openedUpdate', {
-            index: pageOpendIndex,
+      } else {
+        // 页面以前没有打开过
+        let page = state.pool.find(t => t.name === name)
+        // 如果这里没有找到 page 代表这个路由虽然在框架内 但是不参与标签页显示
+        if (page) {
+          await dispatch('add', {
+            tag: Object.assign({}, page),
             params,
             query,
             fullPath
           })
-        } else {
-          // 页面以前没有打开过
-          let page = state.pool.find(t => t.name === name)
-          // 如果这里没有找到 page 代表这个路由虽然在框架内 但是不参与标签页显示
-          if (page) {
-            await dispatch('add', {
-              tag: Object.assign({}, page),
-              params,
-              query,
-              fullPath
-            })
-          }
         }
-        commit('currentSet', fullPath)
-        // end
-        resolve()
-      })
+      }
+      // 如果这个页面需要缓存 将其添加到缓存设置
+      if (isKeepAlive({ meta })) commit('keepAlivePush', name)
+      // 设置当前的页面
+      commit('currentSet', fullPath)
     },
     /**
      * @class opened
@@ -205,49 +182,42 @@ export default {
      * @param {Object} context
      * @param {Object} payload { tagName: 要关闭的标签名字 }
      */
-    close ({ state, commit, dispatch }, { tagName }) {
-      return new Promise(async resolve => {
-        // 下个新的页面
-        let newPage = state.opened[0]
-        const isCurrent = state.current === tagName
-        // 如果关闭的页面就是当前显示的页面
-        if (isCurrent) {
-          // 去找一个新的页面
-          let len = state.opened.length
-          for (let i = 1; i < len; i++) {
-            if (state.opened[i].fullPath === tagName) {
-              if (i < len - 1) {
-                newPage = state.opened[i + 1]
-              } else {
-                newPage = state.opened[i - 1]
-              }
-              break
-            }
+    async close ({ state, commit, dispatch }, { tagName }) {
+      // 下个新的页面
+      let newPage = state.opened[0]
+      const isCurrent = state.current === tagName
+      // 如果关闭的页面就是当前显示的页面
+      if (isCurrent) {
+        // 去找一个新的页面
+        let len = state.opened.length
+        for (let i = 1; i < len; i++) {
+          if (state.opened[i].fullPath === tagName) {
+            if (i < len - 1) newPage = state.opened[i + 1]
+            else newPage = state.opened[i - 1] 
+            break
           }
         }
-        // 找到这个页面在已经打开的数据里是第几个
-        const index = state.opened.findIndex(page => page.fullPath === tagName)
-        if (index >= 0) {
-          // 如果这个页面是缓存的页面 将其在缓存设置中删除
-          commit('keepAliveRemove', state.opened[index].name)
-          // 更新数据 删除关闭的页面
-          state.opened.splice(index, 1)
+      }
+      // 找到这个页面在已经打开的数据里是第几个
+      const index = state.opened.findIndex(page => page.fullPath === tagName)
+      if (index >= 0) {
+        // 如果这个页面是缓存的页面 将其在缓存设置中删除
+        commit('keepAliveRemove', state.opened[index].name)
+        // 更新数据 删除关闭的页面
+        state.opened.splice(index, 1)
+      }
+      // 持久化
+      await dispatch('opened2db')
+      // 最后需要判断是否需要跳到首页
+      if (isCurrent) {
+        const { name = '', params = {}, query = {} } = newPage
+        let routerObj = {
+          name,
+          params,
+          query
         }
-        // 持久化
-        await dispatch('opened2db')
-        // 最后需要判断是否需要跳到首页
-        if (isCurrent) {
-          const { name = '', params = {}, query = {} } = newPage
-          let routerObj = {
-            name,
-            params,
-            query
-          }
-          router.push(routerObj)
-        }
-        // end
-        resolve()
-      })
+        router.push(routerObj)
+      }
     },
     /**
      * @class opened
@@ -255,28 +225,20 @@ export default {
      * @param {Object} context
      * @param {Object} payload { pageSelect: 当前选中的tagName }
      */
-    closeLeft ({ state, commit, dispatch }, { pageSelect } = {}) {
-      return new Promise(async resolve => {
-        const pageAim = pageSelect || state.current
-        let currentIndex = 0
-        state.opened.forEach((page, index) => {
-          if (page.fullPath === pageAim) {
-            currentIndex = index
-          }
-        })
-        if (currentIndex > 0) {
-          // 删除打开的页面 并在缓存设置中删除
-          state.opened.splice(1, currentIndex - 1).forEach(({ name }) => commit('keepAliveRemove', name))
-        }
-        state.current = pageAim
-        if (router.app.$route.fullPath !== pageAim) {
-          router.push(pageAim)
-        }
-        // 持久化
-        await dispatch('opened2db')
-        // end
-        resolve()
+    async closeLeft ({ state, commit, dispatch }, { pageSelect } = {}) {
+      const pageAim = pageSelect || state.current
+      let currentIndex = 0
+      state.opened.forEach((page, index) => {
+        if (page.fullPath === pageAim) currentIndex = index
       })
+      if (currentIndex > 0) {
+        // 删除打开的页面 并在缓存设置中删除
+        state.opened.splice(1, currentIndex - 1).forEach(({ name }) => commit('keepAliveRemove', name))
+      }
+      state.current = pageAim
+      if (router.app.$route.fullPath !== pageAim) router.push(pageAim)
+      // 持久化
+      await dispatch('opened2db')
     },
     /**
      * @class opened
@@ -284,27 +246,19 @@ export default {
      * @param {Object} context
      * @param {Object} payload { pageSelect: 当前选中的tagName }
      */
-    closeRight ({ state, commit, dispatch }, { pageSelect } = {}) {
-      return new Promise(async resolve => {
-        const pageAim = pageSelect || state.current
-        let currentIndex = 0
-        state.opened.forEach((page, index) => {
-          if (page.fullPath === pageAim) {
-            currentIndex = index
-          }
-        })
-        // 删除打开的页面 并在缓存设置中删除
-        state.opened.splice(currentIndex + 1).forEach(({ name }) => commit('keepAliveRemove', name))
-        // 设置当前的页面
-        state.current = pageAim
-        if (router.app.$route.fullPath !== pageAim) {
-          router.push(pageAim)
-        }
-        // 持久化
-        await dispatch('opened2db')
-        // end
-        resolve()
+    async closeRight ({ state, commit, dispatch }, { pageSelect } = {}) {
+      const pageAim = pageSelect || state.current
+      let currentIndex = 0
+      state.opened.forEach((page, index) => {
+        if (page.fullPath === pageAim) currentIndex = index
       })
+      // 删除打开的页面 并在缓存设置中删除
+      state.opened.splice(currentIndex + 1).forEach(({ name }) => commit('keepAliveRemove', name))
+      // 设置当前的页面
+      state.current = pageAim
+      if (router.app.$route.fullPath !== pageAim) router.push(pageAim)
+      // 持久化
+      await dispatch('opened2db')
     },
     /**
      * @class opened
@@ -312,53 +266,39 @@ export default {
      * @param {Object} context
      * @param {Object} payload { pageSelect: 当前选中的tagName }
      */
-    closeOther ({ state, commit, dispatch }, { pageSelect } = {}) {
-      return new Promise(async resolve => {
-        const pageAim = pageSelect || state.current
-        let currentIndex = 0
-        state.opened.forEach((page, index) => {
-          if (page.fullPath === pageAim) {
-            currentIndex = index
-          }
-        })
-        // 删除打开的页面数据 并更新缓存设置
-        if (currentIndex === 0) {
-          state.opened.splice(1).forEach(({ name }) => commit('keepAliveRemove', name))
-        } else {
-          state.opened.splice(currentIndex + 1).forEach(({ name }) => commit('keepAliveRemove', name))
-          state.opened.splice(1, currentIndex - 1).forEach(({ name }) => commit('keepAliveRemove', name))
-        }
-        // 设置新的页面
-        state.current = pageAim
-        if (router.app.$route.fullPath !== pageAim) {
-          router.push(pageAim)
-        }
-        // 持久化
-        await dispatch('opened2db')
-        // end
-        resolve()
+    async closeOther ({ state, commit, dispatch }, { pageSelect } = {}) {
+      const pageAim = pageSelect || state.current
+      let currentIndex = 0
+      state.opened.forEach((page, index) => {
+        if (page.fullPath === pageAim) currentIndex = index
       })
+      // 删除打开的页面数据 并更新缓存设置
+      if (currentIndex === 0) {
+        state.opened.splice(1).forEach(({ name }) => commit('keepAliveRemove', name))
+      } else {
+        state.opened.splice(currentIndex + 1).forEach(({ name }) => commit('keepAliveRemove', name))
+        state.opened.splice(1, currentIndex - 1).forEach(({ name }) => commit('keepAliveRemove', name))
+      }
+      // 设置新的页面
+      state.current = pageAim
+      if (router.app.$route.fullPath !== pageAim) router.push(pageAim)
+      // 持久化
+      await dispatch('opened2db')
     },
     /**
      * @class opened
      * @description 关闭所有 tag
      * @param {Object} context
      */
-    closeAll ({ state, commit, dispatch }) {
-      return new Promise(async resolve => {
-        // 删除打开的页面 并在缓存设置中删除
-        state.opened.splice(1).forEach(({ name }) => commit('keepAliveRemove', name))
-        // 持久化
-        await dispatch('opened2db')
-        // 关闭所有的标签页后需要判断一次现在是不是在首页
-        if (router.app.$route.name !== 'index') {
-          router.push({
-            name: 'index'
-          })
-        }
-        // end
-        resolve()
-      })
+    async closeAll ({ state, commit, dispatch }) {
+      // 删除打开的页面 并在缓存设置中删除
+      state.opened.splice(1).forEach(({ name }) => commit('keepAliveRemove', name))
+      // 持久化
+      await dispatch('opened2db')
+      // 关闭所有的标签页后需要判断一次现在是不是在首页
+      if (router.app.$route.name !== 'index') {
+        router.push({ name: 'index' })
+      }
     }
   },
   mutations: {
@@ -376,9 +316,8 @@ export default {
      * @param {String} name name
      */
     keepAliveRemove (state, name) {
-      const list = [ ...state.keepAlive ]
+      const list = cloneDeep(state.keepAlive)
       const index = list.findIndex(item => item === name)
-
       if (index !== -1) {
         list.splice(index, 1)
         state.keepAlive = list
@@ -390,9 +329,9 @@ export default {
      * @param {String} name name
      */
     keepAlivePush (state, name) {
-      const keep = [ ...state.keepAlive ]
+      const keep = cloneDeep(state.keepAlive)
       keep.push(name)
-      state.keepAlive = keep
+      state.keepAlive = uniq(keep)
     },
     /**
      * @description 清空页面缓存设置