From 75edff2260bae3cdbe50557c9356dc2e338334b8 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Fri, 26 Oct 2018 00:20:29 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E6=96=B0=E7=89=88=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 90c1d4e56959f6529bd7429adea7fda43e047c8e [formerly 90c1d4e56959f6529bd7429adea7fda43e047c8e [formerly 90c1d4e56959f6529bd7429adea7fda43e047c8e [formerly 90c1d4e56959f6529bd7429adea7fda43e047c8e [formerly 3a8bb1567ca234e52177b6b2b7de91e1cad8b339 [formerly e2ca0a02ac182001ae34e3b701a5df42ced0bb29]]]]] Former-commit-id: 588703593f668880f42eeeb8b557e26def3783b3 Former-commit-id: fbc918913ddcc17dca5bad52446a3a16972a5ec9 Former-commit-id: 75c53f179edd29b15df1850c86e33bc8362ee991 [formerly 676043a162e8d764f8e45a5b2fa481caf54b54c0] Former-commit-id: f53ffba4791f2a52392f71ccc22d55960b718cd2 Former-commit-id: 601c5bf0185cc084f71a5c61260da854041f0574 Former-commit-id: 8844a432d15b9ea812f14b9bc435187ee068a101 Former-commit-id: a2b9c1286c7a434b600d370a08e5b72e2d5542d1 Former-commit-id: b719ad81f7c00083179e73c75e02edddf07e43ff --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a36f1d9d..270bff94 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "d2-admin", - "version": "1.5.4", + "version": "1.5.5", "private": true, "scripts": { "serve": "vue-cli-service serve --open", From 810d2eb5a4ca6639ff46a452811fffb66bcb2e53 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Fri, 26 Oct 2018 00:20:49 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E6=96=B0=E7=89=88=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E8=BD=BD=E5=85=A5=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: e469ecfee4e9c3fe4d21ee3ee9d0c91a2a5a2958 [formerly 1a0640c66512d49a1903237173c3d262e17949b0] [formerly e469ecfee4e9c3fe4d21ee3ee9d0c91a2a5a2958 [formerly 1a0640c66512d49a1903237173c3d262e17949b0] [formerly e469ecfee4e9c3fe4d21ee3ee9d0c91a2a5a2958 [formerly 1a0640c66512d49a1903237173c3d262e17949b0] [formerly 1a0640c66512d49a1903237173c3d262e17949b0 [formerly 6c4aa3fcf442fbf8479f9aed32d3c9eaf1246cff [formerly 54fd4afda552fc2e7128fd1db072a21f73d924f0]]]]] Former-commit-id: cae83e98e9644388611a229282ef3d2fd10c6045 Former-commit-id: f56a9e5f69e36609be9ac86f3729a11d205678f6 Former-commit-id: c6af5cea2fb153d893097a4ad38782bacfcb645e [formerly 0aa116a0822e73d92bc7214c4f812f1505efc168] Former-commit-id: 377a51e81339086a718587aa53a33607a949b265 Former-commit-id: 645083e12611d4d93f6c83f5b3fa026a50b46e13 Former-commit-id: 694ab08a02a5b770b97a75268091a64300bd90f5 Former-commit-id: 01269425158df45734a20ba120fe92bd792c01d7 Former-commit-id: 659a181abd0eb4d3c36c755efb6a7fb46fe0d5c2 --- public/image/loading/loading-spin.svg | 6 + public/index.html | 170 +++++++------------------- 2 files changed, 50 insertions(+), 126 deletions(-) create mode 100644 public/image/loading/loading-spin.svg diff --git a/public/image/loading/loading-spin.svg b/public/image/loading/loading-spin.svg new file mode 100644 index 00000000..e2166a58 --- /dev/null +++ b/public/image/loading/loading-spin.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/public/index.html b/public/index.html index 907c0910..fbce95c9 100644 --- a/public/index.html +++ b/public/index.html @@ -12,125 +12,49 @@ margin: 0px; padding: 0px; } - .d2-app-loading-group { + .d2-home { + background-color: #303133; height: 100%; + display: flex; + flex-direction: column; + } + .d2-home__header { width: 100%; + flex-grow: 0; + } + .d2-home__main { + user-select: none; + width: 100%; + flex-grow: 1; display: flex; justify-content: center; align-items: center; flex-direction: column; - background: linear-gradient(to bottom, rgba(255,255,255,0.15) 0%, rgba(0,0,0,0.15) 100%), radial-gradient(at top center, rgba(255,255,255,0.40) 0%, rgba(0,0,0,0.40) 120%) #989898; - background-blend-mode: multiply,multiply; } - .d2-app-loading-title { - color: #FFF; - font-weight: bold; - font-size: 14px; - margin-top: 40px; - margin-bottom: 10px; - letter-spacing: 0.2em; - } - .d2-app-loading-sub-title { - color: #FFF; - font-size: 10px; - margin-bottom: 10px; - } - .d2-app-loading-sub-info { - color: #FFF; - font-size: 10px; - opacity: .8; - margin-bottom: 4px; - } - .d2-app-loading-btn { - text-decoration: none; - display: inline-block; - line-height: 1; - white-space: nowrap; - cursor: pointer; - background: #fff; - border: 1px solid #dcdfe6; - border-color: #dcdfe6; - color: #606266; - -webkit-appearance: none; + .d2-home__footer { + width: 100%; + flex-grow: 0; text-align: center; - box-sizing: border-box; - outline: none; - margin: 0; - transition: .1s; - font-weight: 500; - -moz-user-select: none; - -webkit-user-select: none; - -ms-user-select: none; - padding: 12px 20px; - font-size: 14px; - border-radius: 4px; - /* 圆角 */ - padding: 7px 15px; - border-radius: 20px; + padding: 1em 0; + } + .d2-home__footer > a { font-size: 12px; + color: #ABABAB; + text-decoration: none; } - .d2-app-loading-grid { - width: 30px; - height: 30px; + .d2-home__loading { + height: 32px; + width: 32px; + margin-bottom: 20px; } - .d2-app-loading-grid .d2-app-loading { - width: 10px; - height: 10px; - background-color: #FFF; - float: left; - -webkit-animation: d2-app-loading-grid-scale-delay 1.3s infinite ease-in-out; - animation: d2-app-loading-grid-scale-delay 1.3s infinite ease-in-out; + .d2-home__title { + color: #FFF; + font-size: 14px; + margin-bottom: 10px; } - .d2-app-loading-grid .d2-app-loading1 { - border-top-left-radius: 4px; - -webkit-animation-delay: 0.2s; - animation-delay: 0.2s; } - .d2-app-loading-grid .d2-app-loading2 { - -webkit-animation-delay: 0.3s; - animation-delay: 0.3s; } - .d2-app-loading-grid .d2-app-loading3 { - border-top-right-radius: 4px; - -webkit-animation-delay: 0.4s; - animation-delay: 0.4s; } - .d2-app-loading-grid .d2-app-loading4 { - -webkit-animation-delay: 0.1s; - animation-delay: 0.1s; } - .d2-app-loading-grid .d2-app-loading5 { - -webkit-animation-delay: 0.2s; - animation-delay: 0.2s; } - .d2-app-loading-grid .d2-app-loading6 { - -webkit-animation-delay: 0.3s; - animation-delay: 0.3s; } - .d2-app-loading-grid .d2-app-loading7 { - border-bottom-left-radius: 4px; - -webkit-animation-delay: 0s; - animation-delay: 0s; } - .d2-app-loading-grid .d2-app-loading8 { - -webkit-animation-delay: 0.1s; - animation-delay: 0.1s; } - .d2-app-loading-grid .d2-app-loading9 { - border-bottom-right-radius: 4px; - -webkit-animation-delay: 0.2s; - animation-delay: 0.2s; } - - @-webkit-keyframes d2-app-loading-grid-scale-delay { - 0%, 70%, 100% { - -webkit-transform: scale3D(1, 1, 1); - transform: scale3D(1, 1, 1); - } 35% { - -webkit-transform: scale3D(0, 0, 1); - transform: scale3D(0, 0, 1); - } - } - - @keyframes d2-app-loading-grid-scale-delay { - 0%, 70%, 100% { - -webkit-transform: scale3D(1, 1, 1); - transform: scale3D(1, 1, 1); - } 35% { - -webkit-transform: scale3D(0, 0, 1); - transform: scale3D(0, 0, 1); - } + .d2-home__sub-title { + color: #ABABAB; + font-size: 12px; } From 40572cb3d6038ad632576a8ba9b1b9c1b09936cd Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Fri, 26 Oct 2018 10:00:36 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BA=86=20TODO?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 1e4a87befdc0ab3f275526dcd913b38e9e7b1a0d [formerly 1e4a87befdc0ab3f275526dcd913b38e9e7b1a0d [formerly 1e4a87befdc0ab3f275526dcd913b38e9e7b1a0d [formerly 1e4a87befdc0ab3f275526dcd913b38e9e7b1a0d [formerly 73fb92ce95bbd4cabd42306ecba0e02845658d2f [formerly 3355f2883903406386ca481d04c10e1c397e5e17]]]]] Former-commit-id: 300ba77c06fbadd113ed18dcf57bbc3084d0af4a Former-commit-id: ad88d16695a65a1051f2e76389fafad7fb59b0cf Former-commit-id: 7be68f7370f28b595b7589b1117dc250fd47f49f [formerly 064381347705ba1252747b7c93e09522219747de] Former-commit-id: 5ea547e9912f750269a5d188c2bc86f34adae6db Former-commit-id: 0d125255da5a34786d43bb7767d0822adbb8cde7 Former-commit-id: 18660ad51258acccf5f85f74fe3ae363a34da9f5 Former-commit-id: 3eecf2836e5dd56943df86559a1164a23749ceb4 Former-commit-id: 4737b27fd1d70232940dfb33b8360751bc56af96 --- README.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/README.md b/README.md index 1b78599b..d390a8b6 100644 --- a/README.md +++ b/README.md @@ -84,12 +84,6 @@ * 全局菜单搜索 `1.3.0 +` * 自定义登录重定向 `1.3.0 +` -## TODO - -* 可以折叠后显示一行输入控件的的表格搜索栏组件 -* 用户管理示例界面（用户管理、权限管理、角色管理等）方便对接后台 -* 更多的错误信息页面以及美化错误页面（404、401...） - ## 其它版本 | 名称 | Github / 主页 | 预览 | 介绍 | From 5f50db24f8e962ec5bce8cda8d851b018713b1a6 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Fri, 26 Oct 2018 14:14:56 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=8B=E7=BB=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 977740264c2b81426e76fc62b2a33c274d053c34 [formerly 977740264c2b81426e76fc62b2a33c274d053c34 [formerly 977740264c2b81426e76fc62b2a33c274d053c34 [formerly 977740264c2b81426e76fc62b2a33c274d053c34 [formerly e976289e205e4d3ca1a8cc710657e1d9ccd28109 [formerly ac0915917867ed3005964b424752117fb8be9f2a]]]]] Former-commit-id: 933d002ddc3207f45097fedf9418a332ce5a9ea8 Former-commit-id: 078b56883abf255beff93f7f9ab6d2a71394be47 Former-commit-id: fb167562f8c263478dc45be85f69ce9d2651990a [formerly 188ed9e9e12750c880b38d0d3cbe6ed2a330abec] Former-commit-id: 6519e5830db7ba96cf66e6b5fbd75ef64665cc7b Former-commit-id: 5ed65b2b6f134d7d40e83ac4f3c9d3317429c287 Former-commit-id: 3e57c5ac8e161d677c620d3afffc094d212e1695 Former-commit-id: 10ccd5bd894429a251be1a3e30845af8b5c6f238 Former-commit-id: 4cb91d5e5672105ba139d877bb76b47035a62e2c --- README.md | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index d390a8b6..3797a844 100644 --- a/README.md +++ b/README.md @@ -17,11 +17,11 @@

-[D2Admin](https://github.com/d2-projects/d2-admin) 是一个完全**开源免费**的管理系统前端集成方案，为您做好大部分项目前期准备工作，提供大量示例代码，方便快速进行管理系统开发。 +[D2Admin](https://github.com/d2-projects/d2-admin) 是一个完全 **开源免费** 的企业中后台产品前端集成方案，使用最新的前端技术栈，已经做好大部分项目前期准备工作，并且带有大量示例代码，助力管理系统敏捷开发。 ## 文档 -[中文文档](https://doc.d2admin.fairyever.com/zh/) +[文档](https://doc.d2admin.fairyever.com) ## 预览 @@ -83,6 +83,10 @@ * 日志记录和错误捕捉 `1.3.0 +` * 全局菜单搜索 `1.3.0 +` * 自定义登录重定向 `1.3.0 +` +* 切换全局基础组件尺寸 `1.4.0 +` +* 页面载入进度条 `1.4.1 +` +* 自适应的顶部菜单栏 `1.4.7 +` +* 数据导出 xslx 时支持合并单元格 `1.5.4 +` ## 其它版本 @@ -95,10 +99,13 @@ | 名称 | Github / 主页 | 预览 | 介绍 | | --- | --- | --- | --- | +| D2 日报 | [Github](https://github.com/d2-projects/d2-awesome) | [网站](https://awesome.fairyever.com/daily/) | 每天更新设计与技术圈的新闻和资源 | | D2 CRUD | [Github](https://github.com/d2-projects/d2-crud) | [预览](https://d2admin.fairyever.com/#/demo/d2-crud/index) | 表格常用操作封装 | | D2 Ribbons | [Github](https://github.com/d2-projects/d2-ribbons) | [预览](https://github.com/d2-projects/d2-ribbons) | 开源项目徽标库 | -## 后端实现 +## 开源后端实现 + +> 后端由开源社区贡献，不保证使用 D2Admin 最新版本，相关使用问题请联系其开源作者。 | 名称 | Github / 主页 | 预览 | 介绍 | | --- | --- | --- | --- | @@ -128,12 +135,12 @@ D2Admin 是完全开源免费的项目，旨在帮助开发者更方便地进行 ![join](https://raw.githubusercontent.com/FairyEver/d2-admin/master/doc/image/join@2x.png) -## 支持 +## License -D2 Projects 相关项目全部完全免费，但是也有相关的费用支出，比如七牛图床、码云付费 page 服务（已经废弃）、服务器和域名（现已全部转至 Github）、QQ 群扩容、群内红包福利等，现已花费数百元。所以如果您喜欢这些项目欢迎小额捐助一下，十分感谢。 +[MIT](https://github.com/d2-projects/d2-admin/blob/master/LICENSE) -![reward-me](https://raw.githubusercontent.com/FairyEver/d2-admin/master/doc/image/reward-me@2x.png) +Copyright (c) 2018-present FairyEver + +![](https://raw.githubusercontent.com/FairyEver/d2-admin/master/doc/image/give-a-star@2x.png) -如果希望您的博客或者网站出现在 [D2 Projects](https://github.com/d2-projects) 项目的 README 以及文档中，请联系作者。 -![join](https://raw.githubusercontent.com/FairyEver/d2-admin/master/doc/image/give-a-star@2x.png) \ No newline at end of file From cad161104c6f1a3e3d0d41593dec8664a7371c9a Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Sat, 27 Oct 2018 18:37:04 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E7=BC=93=E5=AD=98=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: a6af4ed39466b4c9e9365ad693fcb84d73036e18 [formerly 506769e37a7db720d8f86ed20d535fe2a26d9e68] [formerly a6af4ed39466b4c9e9365ad693fcb84d73036e18 [formerly 506769e37a7db720d8f86ed20d535fe2a26d9e68] [formerly a6af4ed39466b4c9e9365ad693fcb84d73036e18 [formerly 506769e37a7db720d8f86ed20d535fe2a26d9e68] [formerly 506769e37a7db720d8f86ed20d535fe2a26d9e68 [formerly 9ebaa44ba31bf6b89e6a26e7c880694317c10849 [formerly 6915b7b392bbf51a784a7a60faa5805e05749e62]]]]] Former-commit-id: 0500901750714d3f756cdab974061f703c54a20c Former-commit-id: 718d0d4f016503154f4d76b983fac52135d12ba8 Former-commit-id: f393f36317e7bfce386b8e8bd04d8a378552187d [formerly 74aef31060be3c3f360e1b902f5472d60ed3f360] Former-commit-id: eacb846db5711af1dde9627b5df3001bfe524429 Former-commit-id: 00763a56295e33408b38497fd2c2ab89c635c8c9 Former-commit-id: 9447f0f2beb288dd1b07dae908148c02811cea2c Former-commit-id: 713f4784cbf5ad1f49e8f599438cb395fcbf9d3d Former-commit-id: e9835fb631ab8e6bff51fa25eecf1781bdb14f0f --- src/router/modules/playground.js | 4 ++-- src/store/modules/d2admin/modules/page.js.REMOVED.git-id | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/router/modules/playground.js b/src/router/modules/playground.js index 5f0d069b..504055ed 100644 --- a/src/router/modules/playground.js +++ b/src/router/modules/playground.js @@ -10,8 +10,8 @@ export default { component: layoutHeaderAside, children: (pre => [ { path: 'index', name: `${pre}index`, component: () => import('@/pages/demo/playground/index'), meta: { ...meta, title: '试验台首页' } }, - { path: 'page-cache/on', name: `${pre}page-cache-on`, component: () => import('@/pages/demo/playground/page-cache/on.vue'), meta: { ...meta, title: '开启缓存' } }, - { path: 'page-cache/off', name: `${pre}page-cache-off`, component: () => import('@/pages/demo/playground/page-cache/off.vue'), meta: { ...meta, notCache: true, title: '关闭缓存' } }, + { path: 'page-cache/on', name: `${pre}page-cache-on`, component: () => import('@/pages/demo/playground/page-cache/on.vue'), meta: { ...meta, cache: true, title: '开启缓存' } }, + { path: 'page-cache/off', name: `${pre}page-cache-off`, component: () => import('@/pages/demo/playground/page-cache/off.vue'), meta: { ...meta, title: '关闭缓存' } }, { path: 'page-argu/send', name: `${pre}page-argu-send`, component: () => import('@/pages/demo/playground/page-argu/send.vue'), meta: { ...meta, title: '参数传递 发送' } }, { path: 'page-argu/get/:username', name: `${pre}page-argu-get`, component: () => import('@/pages/demo/playground/page-argu/get.vue'), meta: { ...meta, title: '参数传递 接收' } }, { path: 'store/menu', name: `${pre}store-menu`, component: () => import('@/pages/demo/playground/store/menu'), meta: { ...meta, title: '菜单控制' } }, diff --git a/src/store/modules/d2admin/modules/page.js.REMOVED.git-id b/src/store/modules/d2admin/modules/page.js.REMOVED.git-id index 682a8b12..6566506e 100644 --- a/src/store/modules/d2admin/modules/page.js.REMOVED.git-id +++ b/src/store/modules/d2admin/modules/page.js.REMOVED.git-id @@ -1 +1 @@ -3cac6fb289611555b60a92937c3b5ba99e7b9ec1 \ No newline at end of file +78d2ffb63408e98c92632f7fd5d2596dcad9e199 \ No newline at end of file