From 4870bca745c13d85374d1ce24b0cdd8bd913c72b Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Sat, 18 Aug 2018 08:56:51 +0800 Subject: [PATCH 1/7] version Former-commit-id: 2cbacb700dc767f729793c5b633c0e6a06e323a7 [formerly 2cbacb700dc767f729793c5b633c0e6a06e323a7 [formerly 2cbacb700dc767f729793c5b633c0e6a06e323a7 [formerly 2cbacb700dc767f729793c5b633c0e6a06e323a7 [formerly 27e5b32bf051018572b746fd7c86c7de256efdcb [formerly 736cce3abbba934b2fba14d225833a27708bb9de]]]]] Former-commit-id: 99c3f5474535fee51526d1bf66b38f67f80c5023 Former-commit-id: 81b0aff11a52fac578a7979e149b204b84974b00 Former-commit-id: 99bb784e5c2bd0693e2aa20918442f3da714c95a [formerly c60228f9306d7d86596a01293637a81f4d894346] Former-commit-id: 62bac12fd2425ed114954442b6a04129abfab5a7 Former-commit-id: 9169e4476550f060868a8c5d1564bbef8f311367 Former-commit-id: 06038ef0aed68b3d3fb92f84a8dd1e002794a35c Former-commit-id: c5f028012a1bbde60f4ca20d1c7c4c4a34ea7b33 Former-commit-id: b2029a8fce81589aa9c6331c9cafde2a39ce38c9 --- src/libs/db.js | 4 ++-- src/setting.js | 7 +++++++ src/store/modules/d2admin/modules/releases.js | 4 ++-- 3 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 src/setting.js diff --git a/src/libs/db.js b/src/libs/db.js index 05bcb04f..786be3f9 100644 --- a/src/libs/db.js +++ b/src/libs/db.js @@ -1,8 +1,8 @@ import low from 'lowdb' import LocalStorage from 'lowdb/adapters/LocalStorage' -import { version } from '../../package' +import setting from '@/setting.js' -const adapter = new LocalStorage(`d2admin-${version}`) +const adapter = new LocalStorage(`d2admin-${setting.version}`) const db = low(adapter) // 初始化数据库 diff --git a/src/setting.js b/src/setting.js new file mode 100644 index 00000000..983cbccd --- /dev/null +++ b/src/setting.js @@ -0,0 +1,7 @@ +import { version } from '../package' + +const setting = { + version +} + +export default setting diff --git a/src/store/modules/d2admin/modules/releases.js b/src/store/modules/d2admin/modules/releases.js index dfba87ee..f172895c 100644 --- a/src/store/modules/d2admin/modules/releases.js +++ b/src/store/modules/d2admin/modules/releases.js @@ -1,10 +1,10 @@ -import { version } from '../../../../../package' +import setting from '@/setting.js' export default { namespaced: true, state: { // D2Admin 版本 - version, + version: setting.version, // 最新版本的信息 latest: {}, // 有新版本 From 116e99ae7efdea72904e8e2e3080cecb4c992e88 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Sat, 18 Aug 2018 09:05:39 +0800 Subject: [PATCH 2/7] setting.transition.active Former-commit-id: ab15f02f5df0af79ab9aec05c8da1ca7d88c6c0e [formerly ab15f02f5df0af79ab9aec05c8da1ca7d88c6c0e [formerly ab15f02f5df0af79ab9aec05c8da1ca7d88c6c0e [formerly ab15f02f5df0af79ab9aec05c8da1ca7d88c6c0e [formerly aebc8e98dfc650620aa131662358b4b0eb4d0d08 [formerly 1c13d65dfc194169a1c23c23f5be53773712753b]]]]] Former-commit-id: 4ebf6ec9066b2c4d133d3dccee644b74bfd5601f Former-commit-id: 4835c162035bd130bf69ac8ae2ba23001917c2dc Former-commit-id: d076b43fd4ec4f76e847a3123bac1453bf33d2f1 [formerly fd669004d4b52734789f7413715331fa8cbc24d3] Former-commit-id: 19d74711538d4b99d79e7ce51f29fe72802fe77b Former-commit-id: 04ff4c69d15b8e37305f3bbc6e1820095d2f7e89 Former-commit-id: 3f141616fcec0cf514b2ba40db0851f2f807a750 Former-commit-id: 6d6b0e51a981976cdeee54a912270f536dff39d7 Former-commit-id: 6008563f3a03173a349ccd34b744899bde772f56 --- src/setting.js | 7 ++++++- src/store/modules/d2admin/modules/transition.js | 6 ++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/setting.js b/src/setting.js index 983cbccd..49dbb3dd 100644 --- a/src/setting.js +++ b/src/setting.js @@ -1,7 +1,12 @@ import { version } from '../package' const setting = { - version + // 版本 + version: version, + // 是否默认开启页面切换动画 + transition: { + active: true + } } export default setting diff --git a/src/store/modules/d2admin/modules/transition.js b/src/store/modules/d2admin/modules/transition.js index 17a3a73d..4d13250d 100644 --- a/src/store/modules/d2admin/modules/transition.js +++ b/src/store/modules/d2admin/modules/transition.js @@ -1,8 +1,10 @@ +import setting from '@/setting.js' + export default { namespaced: true, state: { // 是否开启页面过度动画 - active: true + active: setting.transition.active }, mutations: { /** @@ -29,7 +31,7 @@ export default { state.active = await this.dispatch('d2admin/db/getByUser', { dbName: 'sys', path: 'transition.active', - defaultValue: true + defaultValue: setting.transition.active }) } } From 1baac207245652183b03747c8f01dd01649a16e8 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Sat, 18 Aug 2018 09:12:21 +0800 Subject: [PATCH 3/7] setting.page.opened Former-commit-id: 6c9d1551a1272b4ec72ddd8c2b234032fa6c0f61 [formerly 6c9d1551a1272b4ec72ddd8c2b234032fa6c0f61 [formerly 6c9d1551a1272b4ec72ddd8c2b234032fa6c0f61 [formerly 6c9d1551a1272b4ec72ddd8c2b234032fa6c0f61 [formerly ba4d62f46328960667d1a494f3e7ce3ed70a245d [formerly 8a9e597d75d85be0733820959990f24ccf7512c7]]]]] Former-commit-id: c0c553913c0860aa6d57168dea8e121e7c4acb6f Former-commit-id: bcea6ec987b15dcf777cde8e01a1d809ca7ef6b6 Former-commit-id: 33243469bbcb5ed69f831df6c32cdc50ea342f51 [formerly b43657fc42fe609ddc7d9e1f4c258aca6d8288ce] Former-commit-id: f8dad1ef93466ca9e0330fbb49c228af5549d197 Former-commit-id: 48e155804b06454f70de094e5d4a54e2af4f5d64 Former-commit-id: 029dd50c1fa0588c9c849b9c13f81ce855efa32a Former-commit-id: 580777b7e7e1f40ebf51de38493e98e051b15343 Former-commit-id: 93f9de93a6697ea991b3ec3b0f694fb52562e0e6 --- src/setting.js | 12 ++++++++++++ src/store/modules/d2admin/modules/page.js | 17 ++++------------- src/store/modules/d2admin/modules/releases.js | 1 + src/store/modules/d2admin/modules/transition.js | 1 + 4 files changed, 18 insertions(+), 13 deletions(-) diff --git a/src/setting.js b/src/setting.js index 49dbb3dd..53e3ff43 100644 --- a/src/setting.js +++ b/src/setting.js @@ -6,6 +6,18 @@ const setting = { // 是否默认开启页面切换动画 transition: { active: true + }, + // 在读取页面持久化数据失败时默认页面 + page: { + opened: [ + { + name: 'index', + meta: { + title: '首页', + requiresAuth: false + } + } + ] } } diff --git a/src/store/modules/d2admin/modules/page.js b/src/store/modules/d2admin/modules/page.js index dc0af01a..e0d50ccf 100644 --- a/src/store/modules/d2admin/modules/page.js +++ b/src/store/modules/d2admin/modules/page.js @@ -1,10 +1,5 @@ -const openedDefult = { - name: 'index', - meta: { - title: '首页', - requiresAuth: false - } -} +// 设置文件 +import setting from '@/setting.js' export default { namespaced: true, @@ -12,9 +7,7 @@ export default { // 可以在多页 tab 模式下显示的页面 pool: [], // 当前显示的多页面列表 - opened: [ - openedDefult - ], + opened: setting.page.opened, // 当前页面 current: '' }, @@ -116,9 +109,7 @@ export default { const value = await this.dispatch('d2admin/db/getByUser', { dbName: 'sys', path: 'page.opened', - defaultValue: [ - openedDefult - ] + defaultValue: setting.page.opened }) // 在处理函数中进行数据优化 过滤掉现在已经失效的页签或者已经改变了信息的页签 // 以 name 字段为准 diff --git a/src/store/modules/d2admin/modules/releases.js b/src/store/modules/d2admin/modules/releases.js index f172895c..bf48bb9a 100644 --- a/src/store/modules/d2admin/modules/releases.js +++ b/src/store/modules/d2admin/modules/releases.js @@ -1,3 +1,4 @@ +// 设置文件 import setting from '@/setting.js' export default { diff --git a/src/store/modules/d2admin/modules/transition.js b/src/store/modules/d2admin/modules/transition.js index 4d13250d..566da7ac 100644 --- a/src/store/modules/d2admin/modules/transition.js +++ b/src/store/modules/d2admin/modules/transition.js @@ -1,3 +1,4 @@ +// 设置文件 import setting from '@/setting.js' export default { From 7c7a3191209163cf2134accbdccb761f37511b04 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Sat, 18 Aug 2018 09:20:45 +0800 Subject: [PATCH 4/7] setting.menu.asideCollapse Former-commit-id: 68d3e39a7d1082c83963e0bd79526eec49a6baea [formerly 68d3e39a7d1082c83963e0bd79526eec49a6baea [formerly 68d3e39a7d1082c83963e0bd79526eec49a6baea [formerly 68d3e39a7d1082c83963e0bd79526eec49a6baea [formerly cfa6c3f07d9749ba60c1704446432f639a674d02 [formerly ff8ce4c77c3a0c89f57a5488dc8a61fb1b595b72]]]]] Former-commit-id: 4f4001e0ae55690a8e977f10ce2df68ec05b0625 Former-commit-id: b858dd2048aea051389e6891eb7d41c3b493a87c Former-commit-id: dd4baf0ff8afebde88576a0213f137a2d3c7e587 [formerly 421c3c84654e7ed97bad82e8b7fb0e60ba87cad0] Former-commit-id: 413985740115a65f7c2e2fa45d996bbe1bbe3a3f Former-commit-id: 5df2d81e07eaf679742e0d768bdd3c5e518430e7 Former-commit-id: d1b77790b1b261e26e059307194722530f83e0af Former-commit-id: e0cba4e0edb7f7c46665197758d04e908f316e8b Former-commit-id: f928a9303f988a74c8b7e72acad653f20edc3364 --- src/setting.js | 4 ++++ src/store/modules/d2admin/modules/menu.js | 7 +++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/setting.js b/src/setting.js index 53e3ff43..4995c1c8 100644 --- a/src/setting.js +++ b/src/setting.js @@ -18,6 +18,10 @@ const setting = { } } ] + }, + // 侧边栏默认折叠状态 + menu: { + asideCollapse: false } } diff --git a/src/store/modules/d2admin/modules/menu.js b/src/store/modules/d2admin/modules/menu.js index cc7c1b8f..48327f94 100644 --- a/src/store/modules/d2admin/modules/menu.js +++ b/src/store/modules/d2admin/modules/menu.js @@ -1,3 +1,6 @@ +// 设置文件 +import setting from '@/setting.js' + export default { namespaced: true, state: { @@ -6,7 +9,7 @@ export default { // 侧栏菜单 aside: [], // 侧边栏收缩 - asideCollapse: false + asideCollapse: setting.menu.asideCollapse }, mutations: { /** @@ -63,7 +66,7 @@ export default { state.asideCollapse = await this.dispatch('d2admin/db/getByUser', { dbName: 'sys', path: 'menu.asideCollapse', - defaultValue: false + defaultValue: setting.menu.asideCollapse }) } } From 3aa8842c4c5f5f1b720b06cdc27876f0736f7bc6 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Sat, 18 Aug 2018 10:09:34 +0800 Subject: [PATCH 5/7] setting.theme.list Former-commit-id: 64fae64373352ba20bec75a31d4efcfb9c41c0d9 [formerly 64fae64373352ba20bec75a31d4efcfb9c41c0d9 [formerly 64fae64373352ba20bec75a31d4efcfb9c41c0d9 [formerly 64fae64373352ba20bec75a31d4efcfb9c41c0d9 [formerly 7fe4a9f1a9dcd05bfa0dcd9cb59ae055259fc57a [formerly 043e62b28695f61476f743f718b14213c14c0221]]]]] Former-commit-id: a58ce67cf2dad895ca3e7ba23da271a1d6e57f41 Former-commit-id: c45b3fddb81844925d7f4c2fcfb49f32ab22fa90 Former-commit-id: faed2900b12d2510cbe2f01c0a97be38d75f5416 [formerly b588d0a3209cb47034671b767d63387a8984a5af] Former-commit-id: 9310a28da5854431cbf26bce3246737da0f8aba6 Former-commit-id: be20de4b72feeb68510d3c5be0cd4f38a18a9a67 Former-commit-id: 5d0d11d39f07481e9bfc4af2b17395a72c6ef718 Former-commit-id: 12f30a189b49504cbf57ded6e519a487994fd459 Former-commit-id: 03f4426c2f32a05a6ab4ae3abe2e55333bb35d98 --- src/assets/style/theme/list.js | 29 -------------------- src/setting.js | 32 ++++++++++++++++++++++ src/store/modules/d2admin/modules/theme.js | 7 +++-- 3 files changed, 36 insertions(+), 32 deletions(-) delete mode 100644 src/assets/style/theme/list.js diff --git a/src/assets/style/theme/list.js b/src/assets/style/theme/list.js deleted file mode 100644 index c2c4a2e6..00000000 --- a/src/assets/style/theme/list.js +++ /dev/null @@ -1,29 +0,0 @@ -export default [ - { - title: 'd2admin 经典', - name: 'd2', - preview: 'image/theme/d2/preview@2x.png' - }, - { - title: '紫罗兰', - name: 'violet', - preview: 'image/theme/violet/preview@2x.png' - }, - { - title: '简约线条', - name: 'line', - backgroundImage: 'image/theme/line/bg.jpg', - preview: 'image/theme/line/preview@2x.png' - }, - { - title: '流星', - name: 'star', - backgroundImage: 'image/theme/star/bg.jpg', - preview: 'image/theme/star/preview@2x.png' - }, - { - title: 'Tomorrow Night Blue (vsCode)', - name: 'tomorrow-night-blue', - preview: 'image/theme/tomorrow-night-blue/preview@2x.png' - } -] diff --git a/src/setting.js b/src/setting.js index 4995c1c8..a88a6a2f 100644 --- a/src/setting.js +++ b/src/setting.js @@ -22,6 +22,38 @@ const setting = { // 侧边栏默认折叠状态 menu: { asideCollapse: false + }, + // 注册的主题 + theme: { + list: [ + { + title: 'd2admin 经典', + name: 'd2', + preview: 'image/theme/d2/preview@2x.png' + }, + { + title: '紫罗兰', + name: 'violet', + preview: 'image/theme/violet/preview@2x.png' + }, + { + title: '简约线条', + name: 'line', + backgroundImage: 'image/theme/line/bg.jpg', + preview: 'image/theme/line/preview@2x.png' + }, + { + title: '流星', + name: 'star', + backgroundImage: 'image/theme/star/bg.jpg', + preview: 'image/theme/star/preview@2x.png' + }, + { + title: 'Tomorrow Night Blue (vsCode)', + name: 'tomorrow-night-blue', + preview: 'image/theme/tomorrow-night-blue/preview@2x.png' + } + ] } } diff --git a/src/store/modules/d2admin/modules/theme.js b/src/store/modules/d2admin/modules/theme.js index e887d2ff..d6b4677b 100644 --- a/src/store/modules/d2admin/modules/theme.js +++ b/src/store/modules/d2admin/modules/theme.js @@ -1,12 +1,13 @@ -import list from '@/assets/style/theme/list.js' +// 设置文件 +import setting from '@/setting.js' export default { namespaced: true, state: { // 主题 - list, + list: setting.theme.list, // 现在激活的主题 这应该是一个名字 不是对象 - activeName: list[0].name + activeName: setting.theme.list[0].name }, getters: { /** From 7b3085f9453f2412f640af3af042a7c0e5ace0cd Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Sat, 18 Aug 2018 10:14:44 +0800 Subject: [PATCH 6/7] setting.user.info Former-commit-id: 2b037474b07e50657678abc98c83ada463991475 [formerly 2b037474b07e50657678abc98c83ada463991475 [formerly 2b037474b07e50657678abc98c83ada463991475 [formerly 2b037474b07e50657678abc98c83ada463991475 [formerly cfd34ebc03b774ce56b1f70e48a186ed5f1a7332 [formerly f7a8b3b58e733acff905f29643c78cf0d68971dc]]]]] Former-commit-id: f835b546cb0ca44db26c5a2bc398365ea8917f2a Former-commit-id: e89fd4f8ceb3feeb19735730ff90b2020c45b68b Former-commit-id: cae751d7329f8a60e58ca988cffb50b79c0f2c45 [formerly 7b313d24cfcf14e36c353e550b5c5f0e63c7d12c] Former-commit-id: 5f5a9e12d01d79e8d51a59cb7d2060f5d142f3c9 Former-commit-id: 5cf6e118c28ad12bf5940b1fb2f9de82e7cb7b9c Former-commit-id: ac85bc6bedb18713c3fd547c92746ad265a2cc09 Former-commit-id: c3bb7d2ff234d281e26e33ef380b89fe6ab4cd90 Former-commit-id: b854199ec9d2f81d3ffc7d4ec5b79035a438bac3 --- src/setting.js | 8 +++++++- src/store/modules/d2admin/modules/user.js | 11 +++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/setting.js b/src/setting.js index a88a6a2f..8bd1aa0c 100644 --- a/src/setting.js +++ b/src/setting.js @@ -7,7 +7,7 @@ const setting = { transition: { active: true }, - // 在读取页面持久化数据失败时默认页面 + // 在读取持久化数据失败时默认页面 page: { opened: [ { @@ -54,6 +54,12 @@ const setting = { preview: 'image/theme/tomorrow-night-blue/preview@2x.png' } ] + }, + // 在读取持久化数据失败时默认用户信息 + user: { + info: { + name: 'Ghost' + } } } diff --git a/src/store/modules/d2admin/modules/user.js b/src/store/modules/d2admin/modules/user.js index 36c72be3..5b2728bd 100644 --- a/src/store/modules/d2admin/modules/user.js +++ b/src/store/modules/d2admin/modules/user.js @@ -1,10 +1,11 @@ +// 设置文件 +import setting from '@/setting.js' + export default { namespaced: true, state: { // 用户信息 - info: { - name: '' - } + info: setting.user.info }, mutations: { /** @@ -31,9 +32,7 @@ export default { state.info = await this.dispatch('d2admin/db/getByUser', { dbName: 'sys', path: 'user.info', - defaultValue: { - name: 'Ghost' - } + defaultValue: setting.user.info }) } } From bf3ea8deb6bbfc9be53da303ec96b07e447488f5 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Sat, 18 Aug 2018 10:27:10 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 95dab17076892c5d76f26ce43a75566edc50580c [formerly 95dab17076892c5d76f26ce43a75566edc50580c [formerly 95dab17076892c5d76f26ce43a75566edc50580c [formerly 95dab17076892c5d76f26ce43a75566edc50580c [formerly 742ca799c0d528ef15f3df85f1da47d81ce16355 [formerly caab06ee31c4b00ab37dc8ea6aa8408e52122d85]]]]] Former-commit-id: 9d5d438ef73a60ac2d0b9148e4e844365cee0f55 Former-commit-id: 7e2e85fbd1a419e28ea9ea3448c94d387ed7d2a0 Former-commit-id: e9acc40cbef8b59e8c155bb9740727cd155d99b1 [formerly 7850a06ed145f64b04d98cad51337f907f0de448] Former-commit-id: a02688e010f723dc49136c7a530be2a552c99bf9 Former-commit-id: 8235b91b496dbe86ecdd95864fe99d2d72ac455d Former-commit-id: 3e07baf19db5a2c9922c702b98ddae787c6fdf72 Former-commit-id: b919cf34172fa0d857245ec0a5543518b8c6d399 Former-commit-id: dad76d00d192a27570c2fd35f187ef90986a9314 --- src/setting.js | 18 ++++++++++-------- src/store/modules/d2admin/modules/releases.js | 2 +- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/setting.js b/src/setting.js index 8bd1aa0c..34b1f473 100644 --- a/src/setting.js +++ b/src/setting.js @@ -1,11 +1,9 @@ import { version } from '../package' const setting = { - // 版本 - version: version, - // 是否默认开启页面切换动画 - transition: { - active: true + // 侧边栏默认折叠状态 + menu: { + asideCollapse: false }, // 在读取持久化数据失败时默认页面 page: { @@ -19,9 +17,9 @@ const setting = { } ] }, - // 侧边栏默认折叠状态 - menu: { - asideCollapse: false + // 版本 + releases: { + version: version }, // 注册的主题 theme: { @@ -55,6 +53,10 @@ const setting = { } ] }, + // 是否默认开启页面切换动画 + transition: { + active: true + }, // 在读取持久化数据失败时默认用户信息 user: { info: { diff --git a/src/store/modules/d2admin/modules/releases.js b/src/store/modules/d2admin/modules/releases.js index bf48bb9a..6cc4c3e4 100644 --- a/src/store/modules/d2admin/modules/releases.js +++ b/src/store/modules/d2admin/modules/releases.js @@ -5,7 +5,7 @@ export default { namespaced: true, state: { // D2Admin 版本 - version: setting.version, + version: setting.releases.version, // 最新版本的信息 latest: {}, // 有新版本