From 63476a9dc022c4001a0073cd196e594ec1b34ba3 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Sat, 1 Dec 2018 09:04:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AF=8F=E4=B8=AA=E6=A8=A1=E5=9D=97=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: d459515f384d47ea5a84671050246eb5fe658304 [formerly d459515f384d47ea5a84671050246eb5fe658304 [formerly d459515f384d47ea5a84671050246eb5fe658304 [formerly d459515f384d47ea5a84671050246eb5fe658304 [formerly 1d08416010fed1f2f67f487d4c93ced2334e5bd9 [formerly a2250bf183540eb016a76fe6891d4930f7aeaec3]]]]] Former-commit-id: 9a5f6e3a97a23ad6734a87e93284351eff9cfa9a Former-commit-id: 48e636d6f3a252a6c3c89ecbbdc36b4b969d78e9 Former-commit-id: 0aa75a50770886d77d4f4660e11c9874819c3d01 [formerly 66c909149fc309b1715821d6512cc3288c3e0ac6] Former-commit-id: de834b5ea328ac1aa664371f6d5c7044b96e8d4d Former-commit-id: a049a32d41ac698119dafdde87842963097357a8 Former-commit-id: b17192706355ac212cd0224006f76c1ba47d50ea Former-commit-id: d70f7c1eb4ac0b5941003faabfab4bd1342035c8 Former-commit-id: 3f00dfc99f25c34d7033fabcf98a0f8784b7f4ae --- .../components/banner/index.vue | 88 +++++++++++++++++++ src/components/d2-module-index/index.vue | 24 +++++ src/components/index.js | 1 + src/menu/modules/demo-frame.js | 1 + .../index/image/icon.png.REMOVED.git-id | 1 - src/pages/demo/business/index/index.vue | 14 +-- .../index/image/icon.png.REMOVED.git-id | 1 - src/pages/demo/charts/index/index.vue | 14 +-- .../index/image/icon.png.REMOVED.git-id | 1 - src/pages/demo/components/index/index.vue | 14 +-- src/pages/demo/d2-crud/index/index.vue | 15 ++-- .../index/image/icon.png.REMOVED.git-id | 1 - src/pages/demo/element/index/index.vue | 15 ++-- src/pages/demo/frame/index/index.vue | 19 ++++ .../index/image/icon.png.REMOVED.git-id | 1 - src/pages/demo/playground/index/index.vue | 14 +-- .../index/image/icon.png.REMOVED.git-id | 1 - src/pages/demo/plugins/index/index.vue | 14 +-- src/router/modules/frame.js | 1 + src/store/modules/d2admin/modules/db.js | 14 +-- 20 files changed, 192 insertions(+), 62 deletions(-) create mode 100644 src/components/d2-module-index/components/banner/index.vue create mode 100644 src/components/d2-module-index/index.vue delete mode 100644 src/pages/demo/business/index/image/icon.png.REMOVED.git-id delete mode 100644 src/pages/demo/charts/index/image/icon.png.REMOVED.git-id delete mode 100644 src/pages/demo/components/index/image/icon.png.REMOVED.git-id delete mode 100644 src/pages/demo/element/index/image/icon.png.REMOVED.git-id create mode 100644 src/pages/demo/frame/index/index.vue delete mode 100644 src/pages/demo/playground/index/image/icon.png.REMOVED.git-id delete mode 100644 src/pages/demo/plugins/index/image/icon.png.REMOVED.git-id diff --git a/src/components/d2-module-index/components/banner/index.vue b/src/components/d2-module-index/components/banner/index.vue new file mode 100644 index 00000000..f37e5e11 --- /dev/null +++ b/src/components/d2-module-index/components/banner/index.vue @@ -0,0 +1,88 @@ + + + + + diff --git a/src/components/d2-module-index/index.vue b/src/components/d2-module-index/index.vue new file mode 100644 index 00000000..16536edb --- /dev/null +++ b/src/components/d2-module-index/index.vue @@ -0,0 +1,24 @@ + + + diff --git a/src/components/index.js b/src/components/index.js index e6b4aba2..72bcd145 100644 --- a/src/components/index.js +++ b/src/components/index.js @@ -16,5 +16,6 @@ Vue.component('d2-icon-select', () => import('./d2-icon-select/index.vue')) Vue.component('d2-icon-svg', () => import('./d2-icon-svg/index.vue')) Vue.component('d2-markdown', () => import('./d2-markdown')) Vue.component('d2-mde', () => import('./d2-mde')) +Vue.component('d2-module-index', () => import('./d2-module-index')) Vue.component('d2-quill', () => import('./d2-quill')) Vue.component('d2-ueditor', () => import('./d2-ueditor')) diff --git a/src/menu/modules/demo-frame.js b/src/menu/modules/demo-frame.js index 8b479bcb..63e81a5a 100644 --- a/src/menu/modules/demo-frame.js +++ b/src/menu/modules/demo-frame.js @@ -3,6 +3,7 @@ export default { title: '内嵌网页', icon: 'globe', children: (pre => [ + { path: `${pre}index`, title: 'Frame 首页', icon: 'home' }, { path: `${pre}d2-doc`, title: 'D2Admin 中文文档', iconSvg: 'd2-admin' }, { path: `${pre}html`, title: '静态 HTML', icon: 'code' } ])('/demo/frame/') diff --git a/src/pages/demo/business/index/image/icon.png.REMOVED.git-id b/src/pages/demo/business/index/image/icon.png.REMOVED.git-id deleted file mode 100644 index 101ae465..00000000 --- a/src/pages/demo/business/index/image/icon.png.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -ba00e3c1f32cf9369968e9ce1a5d9e6164f3c07c \ No newline at end of file diff --git a/src/pages/demo/business/index/index.vue b/src/pages/demo/business/index/index.vue index 48ae6aaf..d9ddfc45 100644 --- a/src/pages/demo/business/index/index.vue +++ b/src/pages/demo/business/index/index.vue @@ -1,10 +1,6 @@ @@ -12,7 +8,11 @@ export default { data () { return { - filename: __filename + filename: __filename, + banner: { + title: 'DEMOS', + subTitle: '提供借鉴和参考的页面' + } } } } diff --git a/src/pages/demo/charts/index/image/icon.png.REMOVED.git-id b/src/pages/demo/charts/index/image/icon.png.REMOVED.git-id deleted file mode 100644 index 914a75f7..00000000 --- a/src/pages/demo/charts/index/image/icon.png.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -5ad0be3e886c5ecb07a563adbd7ffa5963697b66 \ No newline at end of file diff --git a/src/pages/demo/charts/index/index.vue b/src/pages/demo/charts/index/index.vue index 767c1d61..ce43891e 100644 --- a/src/pages/demo/charts/index/index.vue +++ b/src/pages/demo/charts/index/index.vue @@ -1,10 +1,6 @@ @@ -12,7 +8,11 @@ export default { data () { return { - filename: __filename + filename: __filename, + banner: { + title: 'CHARTS', + subTitle: '图表示例' + } } } } diff --git a/src/pages/demo/components/index/image/icon.png.REMOVED.git-id b/src/pages/demo/components/index/image/icon.png.REMOVED.git-id deleted file mode 100644 index 04239e6f..00000000 --- a/src/pages/demo/components/index/image/icon.png.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -31ff16c63c96f981d32bd0f3a8771424ed7ffa84 \ No newline at end of file diff --git a/src/pages/demo/components/index/index.vue b/src/pages/demo/components/index/index.vue index 61c7896a..656b4f88 100644 --- a/src/pages/demo/components/index/index.vue +++ b/src/pages/demo/components/index/index.vue @@ -1,10 +1,6 @@ @@ -12,7 +8,11 @@ export default { data () { return { - filename: __filename + filename: __filename, + banner: { + title: 'COMPONENTS', + subTitle: 'D2Admin 为你提供了一些上手即用的组件' + } } } } diff --git a/src/pages/demo/d2-crud/index/index.vue b/src/pages/demo/d2-crud/index/index.vue index 34162de4..36de5b70 100644 --- a/src/pages/demo/d2-crud/index/index.vue +++ b/src/pages/demo/d2-crud/index/index.vue @@ -1,10 +1,6 @@ @@ -12,7 +8,12 @@ export default { data () { return { - filename: __filename + filename: __filename, + banner: { + title: 'D2 CRUD', + subTitle: 'D2 Crud 是一个基于 Vue.js 和 Element UI 的表格组件，封装了常用的表格操作。', + link: 'https://github.com/d2-projects/d2-crud' + } } } } diff --git a/src/pages/demo/element/index/image/icon.png.REMOVED.git-id b/src/pages/demo/element/index/image/icon.png.REMOVED.git-id deleted file mode 100644 index 3849adbf..00000000 --- a/src/pages/demo/element/index/image/icon.png.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -96116cf6cd5a5755048348977ceaffcc3ab7b0c9 \ No newline at end of file diff --git a/src/pages/demo/element/index/index.vue b/src/pages/demo/element/index/index.vue index 8048c09d..3bcd2324 100644 --- a/src/pages/demo/element/index/index.vue +++ b/src/pages/demo/element/index/index.vue @@ -1,10 +1,6 @@ @@ -12,7 +8,12 @@ export default { data () { return { - filename: __filename + filename: __filename, + banner: { + title: 'ElementUI', + subTitle: 'D2Admin 集成由饿了么出品的 ElementUI', + link: 'http://element.eleme.io' + } } } } diff --git a/src/pages/demo/frame/index/index.vue b/src/pages/demo/frame/index/index.vue new file mode 100644 index 00000000..f6c7543a --- /dev/null +++ b/src/pages/demo/frame/index/index.vue @@ -0,0 +1,19 @@ + + + diff --git a/src/pages/demo/playground/index/image/icon.png.REMOVED.git-id b/src/pages/demo/playground/index/image/icon.png.REMOVED.git-id deleted file mode 100644 index 5a09c7c4..00000000 --- a/src/pages/demo/playground/index/image/icon.png.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -e995956a468c8bb1151a6ea5cb321dbc0ea0f0b9 \ No newline at end of file diff --git a/src/pages/demo/playground/index/index.vue b/src/pages/demo/playground/index/index.vue index a61fd305..2bc8845c 100644 --- a/src/pages/demo/playground/index/index.vue +++ b/src/pages/demo/playground/index/index.vue @@ -1,10 +1,6 @@ @@ -12,7 +8,11 @@ export default { data () { return { - filename: __filename + filename: __filename, + banner: { + title: 'PLAYGROUND', + subTitle: '在这里可以测试一些 D2Admin 的系统功能' + } } } } diff --git a/src/pages/demo/plugins/index/image/icon.png.REMOVED.git-id b/src/pages/demo/plugins/index/image/icon.png.REMOVED.git-id deleted file mode 100644 index 71ad12f0..00000000 --- a/src/pages/demo/plugins/index/image/icon.png.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -3487ff9b41bdc4e556fe1dec04176c98c388272c \ No newline at end of file diff --git a/src/pages/demo/plugins/index/index.vue b/src/pages/demo/plugins/index/index.vue index 3e3ca522..846ae4c8 100644 --- a/src/pages/demo/plugins/index/index.vue +++ b/src/pages/demo/plugins/index/index.vue @@ -1,10 +1,6 @@ @@ -12,7 +8,11 @@ export default { data () { return { - filename: __filename + filename: __filename, + banner: { + title: 'PLUGIN', + subTitle: 'D2Admin 集成了许多实用插件' + } } } } diff --git a/src/router/modules/frame.js b/src/router/modules/frame.js index 4e360ba7..d6cba14d 100644 --- a/src/router/modules/frame.js +++ b/src/router/modules/frame.js @@ -9,6 +9,7 @@ export default { redirect: { name: 'demo-frame-index' }, component: layoutHeaderAside, children: (pre => [ + { path: 'index', name: `${pre}index`, component: () => import('@/pages/demo/frame/index'), meta: { ...meta, title: 'Frame 首页' } }, { path: 'html', name: `${pre}html`, component: () => import('@/pages/demo/frame/html'), meta: { ...meta, title: '静态 HTML' } }, { path: 'd2-doc', name: `${pre}d2-doc`, component: () => import('@/pages/demo/frame/d2-doc'), meta: { ...meta, title: 'D2Admin 中文文档' } } ])('demo-frame-') diff --git a/src/store/modules/d2admin/modules/db.js b/src/store/modules/d2admin/modules/db.js index 4bf6dd15..261b472c 100644 --- a/src/store/modules/d2admin/modules/db.js +++ b/src/store/modules/d2admin/modules/db.js @@ -21,13 +21,13 @@ function pathInit ({ const uuid = util.cookies.get('uuid') || 'ghost-uuid' const currentPath = `${dbName}.${user ? `user.${uuid}` : 'public'}${path ? `.${path}` : ''}` const value = db.get(currentPath).value() - console.group('pathInit') - console.log('dbName', dbName) - console.log('path', path) - console.log('user', user) - console.log('defaultValue', defaultValue) - console.log('value', value) - console.groupEnd() + // console.group('pathInit') + // console.log('dbName', dbName) + // console.log('path', path) + // console.log('user', user) + // console.log('defaultValue', defaultValue) + // console.log('value', value) + // console.groupEnd() if (!(value !== undefined && validator(value))) { db .set(currentPath, defaultValue)