From 6802a01eab3c8dc2f9c78e3d055ae3ae08da7187 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Mon, 2 Jul 2018 21:42:55 +0800 Subject: [PATCH] no message Former-commit-id: b0058a9a5942e4f8fe9e3fc659b2abd929bd3b12 [formerly 5c3fb779630c2f2e153287244ac9de641bbc3eb2] [formerly b0058a9a5942e4f8fe9e3fc659b2abd929bd3b12 [formerly 5c3fb779630c2f2e153287244ac9de641bbc3eb2] [formerly b0058a9a5942e4f8fe9e3fc659b2abd929bd3b12 [formerly 5c3fb779630c2f2e153287244ac9de641bbc3eb2] [formerly 5c3fb779630c2f2e153287244ac9de641bbc3eb2 [formerly c85fe449ed36774edbdf96ea300fa1287e82d209 [formerly 83fa54598eae7d5a7d036c03e13bcc6c185a2809]]]]] Former-commit-id: dc063d52056be4cc1f9b186480e97c914843568f Former-commit-id: cd1dd2fcb136aec37d4dff5886603d3031b76d1b Former-commit-id: 66139b38849748671cf667f86a0676b49b17e6ea [formerly 0679f85f1d81eef8575e9fe37eabff6cbe357a34] Former-commit-id: 3ec2fdbf620d6d7279b0d03a8a4dbedef9453f0f Former-commit-id: 5bad9dfe3a995d7444f79018cc2d72253b2fbd1c Former-commit-id: 549d901c2ce1a951968769e7bb27dd46cc6c4a7f Former-commit-id: 817efa3a49754a9df8a60ee97f96b6eaf9b02541 Former-commit-id: 7fabb89165e53083accba505542175f273f8a23e --- src/components/core/d2-layout-main/index.vue | 11 +- src/libs/db.js | 3 +- src/main.js | 5 + src/store/modules/d2admin.js | 318 ------------------- src/store/modules/d2admin.js.REMOVED.git-id | 1 + 5 files changed, 9 insertions(+), 329 deletions(-) delete mode 100644 src/store/modules/d2admin.js create mode 100644 src/store/modules/d2admin.js.REMOVED.git-id diff --git a/src/components/core/d2-layout-main/index.vue b/src/components/core/d2-layout-main/index.vue index 3e4e25d4..5a2f5cb2 100644 --- a/src/components/core/d2-layout-main/index.vue +++ b/src/components/core/d2-layout-main/index.vue @@ -54,7 +54,7 @@ diff --git a/src/libs/db.js b/src/libs/db.js index 8d403104..1c9db368 100644 --- a/src/libs/db.js +++ b/src/libs/db.js @@ -6,7 +6,8 @@ const db = low(adapter) db.defaults({ themeActiveName: [], - pageOpenedList: [] + pageOpenedList: [], + updateNotify: [] }) .write() diff --git a/src/main.js b/src/main.js index 7f75d8c0..817065af 100755 --- a/src/main.js +++ b/src/main.js @@ -97,6 +97,11 @@ new Vue({ this.getAllTagFromRoutes() }, mounted () { + // DB -> store 加载版本更新弹窗的设置 + this.$store.commit('d2adminUpdateNotifyLoad') + // DB -> store 加载主题 + this.$store.commit('d2adminThemeLoad') + // DB -> store 数据库加载上次退出时的多页列表 this.$store.commit('d2adminPageOpenedListLoad') // D2Admin 开发环境检查更新 util.checkUpdate(this) diff --git a/src/store/modules/d2admin.js b/src/store/modules/d2admin.js deleted file mode 100644 index 363ba162..00000000 --- a/src/store/modules/d2admin.js +++ /dev/null @@ -1,318 +0,0 @@ -import util from '@/libs/util.js' -import db from '@/libs/db.js' -import themeList from '@/assets/style/theme/list.js' - -// 获取项目信息 -import packJson from '../../../package.json' - -export default { - state: { - // 拉取的最新版本信息 - releases: {}, - // D2Admin 版本 - version: packJson.version, - // 有更新 - update: false, - // 更新提醒弹窗 - updateNotify: false, - // 全屏 - isFullScreen: false, - // 灰度 - isGrayMode: false, - // 主题 - themeList, - themeActiveName: themeList[0].name, // 这应该是一个名字 不是对象 - // 可以在多页 tab 模式下显示的页面 - tagPool: [], - // 当前显示的多页面列表 - pageOpenedList: [ - { - name: 'index', - meta: { - title: '首页', - requiresAuth: false - } - } - ], - // 当前页面 - pageCurrent: '' - }, - getters: { - /** - * @description 返回当前的主题信息 不是一个名字 而是所有的主题数据 - * @param {state} state vuex state - */ - themeActiveSetting (state) { - return state.themeList.find(theme => theme.name === state.themeActiveName) - } - }, - mutations: { - /** - * @class 通用工具 - * @description 将 state 中某一项存储到数据库 需要 uuid - * @param {state} state vuex state - * @param {string} key key name - */ - d2adminVuex2DbByUuid (state, key) { - const row = db.get(key).find({uuid: util.uuid()}) - if (row.value()) { - row.assign({value: state[key]}).write() - } else { - db.get(key).push({ - uuid: util.uuid(), - value: state[key] - }).write() - } - }, - /** - * @class 通用工具 - * @description 从数据库取值到 vuex 需要 uuid - * @param {state} state vuex state - * @param {object} param1 key and default value - */ - d2adminDb2VuexByUuid (state, { key, defaultValue }) { - const row = db.get(key).find({uuid: util.uuid()}).value() - state[key] = row ? row.value : defaultValue - }, - /** - * @description 更新远端的版本信息 - * @class releases - * @param {state} state vuex state - * @param {object} releases info - */ - d2adminReleasesSet (state, releases) { - state.releases = releases - }, - /** - * @description 设置是否有更新 - * @class update - * @param {state} state vuex state - * @param {boolean} update update value - */ - d2adminUpdateSet (state, update) { - state.update = update - }, - /** - * @description 设置是否有更新的时候显示弹窗 - * @class updateNotify - * @param {state} state vuex state - * @param {boolean} update updateNotify value - */ - d2adminUpdateNotifySet (state, updateNotify) { - state.updateNotify = updateNotify - }, - /** - * @class pageCurrent - * @description 设置当前激活的页面 name - * @param {state} state vuex state - * @param {string} name new name - */ - d2adminPageCurrentSet (state, name) { - state.pageCurrent = name - }, - /** - * @class tagPool - * @description 保存 tagPool (候选池) - * @param {state} state vuex state - * @param {Array} tagPool tags - */ - d2adminTagPoolSet (state, tagPool) { - state.tagPool = tagPool - }, - /** - * @class pageOpenedList - * @description 更新页面列表上的某一项 - * @param {state} state vuex state - * @param {info} param1 new page info - */ - d2adminPageOpenedListUpdateItem (state, { index, argu, query }) { - // 更新页面列表某一项 - let page = state.pageOpenedList[index] - page.argu = argu || page.argu - page.query = query || page.query - state.pageOpenedList.splice(index, 1, page) - // 更新设置到数据库 - this.commit('d2adminVuex2DbByUuid', 'pageOpenedList') - }, - /** - * @class pageOpenedList - * @description 从数据库载入分页列表 - * @param {state} state vuex state - */ - d2adminPageOpenedListLoad (state) { - this.commit('d2adminDb2VuexByUuid', { - key: 'pageOpenedList', - defaultValue: state.pageOpenedList - }) - }, - /** - * @class pageOpenedList - * @description 新增一个 tag (打开一个页面) - * @param {state} state vuex state - * @param {object} param1 new tag info - */ - d2adminTagIncreate (state, { tag, argu, query }) { - // 设置新的 tag 在新打开一个以前没打开过的页面时使用 - let newPage = tag - newPage.argu = argu || newPage.argu - newPage.query = query || newPage.query - newPage.argu = argu || newPage.argu - // 添加进当前显示的页面数组 - state.pageOpenedList.push(newPage) - // 更新设置到数据库 - this.commit('d2adminVuex2DbByUuid', 'pageOpenedList') - }, - /** - * @class pageOpenedList - * @description 关闭一个 tag (关闭一个页面) - * @param {state} state vuex state - * @param {string} name close tag name - */ - d2adminTagClose (state, name) { - // 找到这个页面在已经打开的数据里是第几个 - const index = state.pageOpenedList.findIndex(page => page.name === name) - if (index >= 0) { - state.pageOpenedList.splice(index, 1) - } - // 更新设置到数据库 - this.commit('d2adminVuex2DbByUuid', 'pageOpenedList') - }, - /** - * @class pageOpenedList - * @description 关闭当前标签左边的标签 - * @param {state} state vuex state - */ - d2adminTagCloseLeft (state) { - let currentIndex = 0 - state.pageOpenedList.forEach((page, index) => { - if (page.name === state.pageCurrent) { - currentIndex = index - } - }) - if (currentIndex > 0) { - state.pageOpenedList.splice(1, currentIndex - 1) - } - // 更新设置到数据库 - this.commit('d2adminVuex2DbByUuid', 'pageOpenedList') - }, - /** - * @class pageOpenedList - * @description 关闭当前标签右边的标签 - * @param {state} state vuex state - */ - d2adminTagCloseRight (state) { - let currentIndex = 0 - state.pageOpenedList.forEach((page, index) => { - if (page.name === state.pageCurrent) { - currentIndex = index - } - }) - state.pageOpenedList.splice(currentIndex + 1) - // 更新设置到数据库 - this.commit('d2adminVuex2DbByUuid', 'pageOpenedList') - }, - /** - * @class pageOpenedList - * @description 关闭当前激活之外的 tag - * @param {state} state vuex state - */ - d2adminTagCloseOther (state) { - let currentIndex = 0 - state.pageOpenedList.forEach((page, index) => { - if (page.name === state.pageCurrent) { - currentIndex = index - } - }) - if (currentIndex === 0) { - state.pageOpenedList.splice(1) - } else { - state.pageOpenedList.splice(currentIndex + 1) - state.pageOpenedList.splice(1, currentIndex - 1) - } - // 更新设置到数据库 - this.commit('d2adminVuex2DbByUuid', 'pageOpenedList') - }, - /** - * @class pageOpenedList - * @description 关闭所有 tag - * @param {state} state vuex state - */ - d2adminTagCloseAll (state) { - state.pageOpenedList.splice(1) - // 更新设置到数据库 - this.commit('d2adminVuex2DbByUuid', 'pageOpenedList') - }, - /** - * @class isFullScreen - * @description 切换全屏 - * @param {state} state vuex state - */ - d2adminFullScreenToggle (state) { - if (state.isFullScreen) { - util.exitFullScreen() - state.isFullScreen = false - } else { - util.openFullScreen() - state.isFullScreen = true - } - }, - /** - * @class isGrayMode - * @description 切换灰度状态 - * @param {state} state vuex state - */ - d2adminGrayModeToggle (state) { - state.isGrayMode = !state.isGrayMode - }, - /** - * @class isGrayMode - * @description 设置灰度模式 - * @param {state} state vuex state - * @param {boolean} value new value - */ - d2adminGrayModeSet (state, value) { - state.isGrayMode = value - }, - /** - * @class themeActiveName - * @description 激活一个主题（应用到dom上） - * @param {state} state vuex state - * @param {string} themeValue 需要激活的主题名称 - */ - d2adminThemeSet (state, themeName) { - // 检查这个主题在主题列表里是否存在 - const theme = state.themeList.find(e => e.name === themeName) - if (theme) { - // 设置 state - state.themeActiveName = themeName - } else { - // 设置为列表第一个主题 - state.themeActiveName = state.themeList[0].name - } - // 将 vuex 中的主题应用到 dom - this.commit('d2adminTheme2dom') - // 保存到数据库 - this.commit('d2adminVuex2DbByUuid', 'themeActiveName') - }, - /** - * @class themeActiveName - * @description 将 vuex 中的主题应用到 dom - * @param {state} state vuex state - */ - d2adminTheme2dom (state) { - document.body.className = `theme-${state.themeActiveName}` - }, - /** - * @class themeActiveName - * @description 从数据库加载主题设置 - * @param {state} state vuex state - */ - d2adminThemeLoad (state) { - this.commit('d2adminDb2VuexByUuid', { - key: 'themeActiveName', - defaultValue: state.themeList[0].name - }) - this.commit('d2adminTheme2dom') - } - } -} diff --git a/src/store/modules/d2admin.js.REMOVED.git-id b/src/store/modules/d2admin.js.REMOVED.git-id new file mode 100644 index 00000000..1a8e9199 --- /dev/null +++ b/src/store/modules/d2admin.js.REMOVED.git-id @@ -0,0 +1 @@ +9cb5ae65d8c8b6c41644e115280f0d3e8ef38d33 \ No newline at end of file