From be78739c64977c76f136a73609fd740f832aab97 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Sun, 29 Jul 2018 23:21:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 381235a6a0050b14f89ed5a8ef011bcd786aaf65 [formerly 381235a6a0050b14f89ed5a8ef011bcd786aaf65 [formerly 381235a6a0050b14f89ed5a8ef011bcd786aaf65 [formerly 381235a6a0050b14f89ed5a8ef011bcd786aaf65 [formerly 8d9c1b5da31eace2ef04fab5ab0728c4c1ded8d8 [formerly b6eb642b1e897ee8c22abc1a15191c10b447508d]]]]] Former-commit-id: 6752a7d35a569741cd059c8098394c9b6f23bb1f Former-commit-id: 5b4e039730861fbaabcbcea906031e7e0193e854 Former-commit-id: 8efc596965e36e51deb02d0447924c23e6ea12ee [formerly 3deaadc8a6c05591ce18b354ca610c4d18d980d8] Former-commit-id: a10dbf0bf33fdfd7e826d78bbc4542a252b38412 Former-commit-id: b7f6e0aebcedc8478f3ce2d9a682aa7e804fe979 Former-commit-id: c53628bce5e55dea728a680d4c7f08b2c3559701 Former-commit-id: 42bfc85d1fa494e1a2c6dcb5d19069e49b1d95e4 Former-commit-id: 42cbae7dfd78cf2386ede9076641bd1110450386 --- docs/.vuepress/config.js | 2 +- docs/zh/article/update/1.1.4.md | 11 +++--- .../zh/article/update/1.1.5.md.REMOVED.git-id | 1 + docs/zh/guide/plagiarize.md | 36 +++++++++---------- docs/zh/guide/pr.md | 13 ------- 5 files changed, 26 insertions(+), 37 deletions(-) create mode 100644 docs/zh/article/update/1.1.5.md.REMOVED.git-id delete mode 100644 docs/zh/guide/pr.md diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js index fdb9245d..0e899682 100644 --- a/docs/.vuepress/config.js +++ b/docs/.vuepress/config.js @@ -69,7 +69,6 @@ function sideBarGuide (title) { '', 'getting-started', 'question', - 'pr', 'plagiarize', 'change-log' ] @@ -117,6 +116,7 @@ function sideBarArticle (titleUpdate) { collapsable: false, children: [ '', + 'update/1.1.5', 'update/1.1.4', 'update/0.0.0' ] diff --git a/docs/zh/article/update/1.1.4.md b/docs/zh/article/update/1.1.4.md index f8dd308c..7cd6a38e 100644 --- a/docs/zh/article/update/1.1.4.md +++ b/docs/zh/article/update/1.1.4.md @@ -208,11 +208,12 @@ D2Admin 是一个 **注重外观表现** 的管理系统 **PC端** 集成方案 | --- | --- | | [团队主页](https://github.com/d2-projects) | D2Admin 所属的团队主页 | | [中文文档](http://d2admin.fairyever.com/zh/) | 中文文档 | -| [预览地址](https://fairyever.gitee.io/d2-admin-preview/#/index) | 预览地址 | -| [github](https://github.com/d2-projects/d2-admin) | Github 仓库 | -| [码云](https://gitee.com/fairyever/d2-admin) | 码云镜像仓库 | +| [完整版 预览地址](https://fairyever.gitee.io/d2-admin-preview/#/index) | 完整版 预览地址 | +| [完整版 github](https://github.com/d2-projects/d2-admin) | 完整版 Github 仓库 | +| [完整版 码云](https://gitee.com/fairyever/d2-admin) | 完整版 码云镜像仓库 | +| [简化版 预览地址](https://fairyever.gitee.io/d2-admin-start-kit-preview/#/index) | 简化版 预览地址 | | [简化版 github](https://github.com/d2-projects/d2-admin-start-kit) | 简化版 Github 仓库 | -| [简化版 码云](https://gitee.com/fairyever/d2-admin-start-kit) | 简化版码云镜像仓库 | +| [简化版 码云](https://gitee.com/fairyever/d2-admin-start-kit) | 简化版 码云镜像仓库 | -在最后，如果你看完了，并且觉得不错，希望可以到 [项目主页](https://github.com/d2-projects/d2-admin) 上点一个 **star** 作为你对这个项目的认可与支持，谢谢。 +在最后，如果你看完了，并且觉得还不错，希望可以到 [项目主页](https://github.com/d2-projects/d2-admin) 上点一个 **star** 作为你对这个项目的认可与支持，谢谢。 diff --git a/docs/zh/article/update/1.1.5.md.REMOVED.git-id b/docs/zh/article/update/1.1.5.md.REMOVED.git-id new file mode 100644 index 00000000..f807a447 --- /dev/null +++ b/docs/zh/article/update/1.1.5.md.REMOVED.git-id @@ -0,0 +1 @@ +81bebad13d7b075656caeb55a6c7080a3b4c66c3 \ No newline at end of file diff --git a/docs/zh/guide/plagiarize.md b/docs/zh/guide/plagiarize.md index 80bcd0a2..7acef94d 100644 --- a/docs/zh/guide/plagiarize.md +++ b/docs/zh/guide/plagiarize.md @@ -2,17 +2,19 @@ sidebarDepth: 3 --- -# 借鉴者和抄袭者 +# 借鉴 D2Admin 的项目 -以下开源项目中存在 D2Admin 代码 +以下开源项目中借鉴了 D2Admin 代码。 -本页面不明确指出哪些是抄袭哪些是借鉴，由读着自行判断 +本页面不明确指出哪些是借鉴哪些是抄袭，由读着自行判断。 + +本页面作用是指明哪些东西是 D2Admin 原创的，避免大家看到和其它项目有类似设计时发生误会以为 D2 抄袭他人（误会发生过）。 ::: tip 图片右键在新标签页打开查看大图 ::: -**此页面截图都会标注日期，只新增，不删除** +**此页面截图都会标注日期，只新增，不删除，只代表当时日期的状态** ## nx-admin @@ -20,14 +22,16 @@ sidebarDepth: 3 ### 2018年7月29日 +* 项目首页已经放置 D2Admin 链接 + | D2Admin | nx-admin | | --- | --- | -| ![](http://fairyever.qiniudn.com/20180727103812.png?imageMogr2/auto-orient/thumbnail/1480x/blur/1x0/quality/100\|imageslim) | ![](http://fairyever.qiniudn.com/20180727103329.png?imageMogr2/auto-orient/thumbnail/1480x/blur/1x0/quality/100\|imageslim) | -| ![](http://fairyever.qiniudn.com/20180727103923.png?imageMogr2/auto-orient/thumbnail/1480x/blur/1x0/quality/100\|imageslim) | ![](http://fairyever.qiniudn.com/20180727103931.png?imageMogr2/auto-orient/thumbnail/1480x/blur/1x0/quality/100\|imageslim) | -| ![](http://fairyever.qiniudn.com/20180727104208.png?imageMogr2/auto-orient/thumbnail/1480x/blur/1x0/quality/100\|imageslim) | ![](http://fairyever.qiniudn.com/20180727104213.png?imageMogr2/auto-orient/thumbnail/1480x/blur/1x0/quality/100\|imageslim) | -| ![](http://fairyever.qiniudn.com/20180727104225.png?imageMogr2/auto-orient/thumbnail/1480x/blur/1x0/quality/100\|imageslim) | ![](http://fairyever.qiniudn.com/20180727104232.png?imageMogr2/auto-orient/thumbnail/1480x/blur/1x0/quality/100\|imageslim) | -| ![](http://fairyever.qiniudn.com/20180727104240.png?imageMogr2/auto-orient/thumbnail/1480x/blur/1x0/quality/100\|imageslim) | ![](http://fairyever.qiniudn.com/20180727104245.png?imageMogr2/auto-orient/thumbnail/1480x/blur/1x0/quality/100\|imageslim) | -| ![](http://fairyever.qiniudn.com/20180729104137.png?imageMogr2/auto-orient/thumbnail/1480x/blur/1x0/quality/100\|imageslim) | ![](http://fairyever.qiniudn.com/20180729104152.png?imageMogr2/auto-orient/thumbnail/1480x/blur/1x0/quality/100\|imageslim) | +| ![](http://fairyever.qiniudn.com/20180727103812.png) | ![](http://fairyever.qiniudn.com/20180727103329.png) | +| ![](http://fairyever.qiniudn.com/20180727103923.png) | ![](http://fairyever.qiniudn.com/20180727103931.png) | +| ![](http://fairyever.qiniudn.com/20180727104208.png) | ![](http://fairyever.qiniudn.com/20180727104213.png) | +| ![](http://fairyever.qiniudn.com/20180727104225.png) | ![](http://fairyever.qiniudn.com/20180727104232.png) | +| ![](http://fairyever.qiniudn.com/20180727104240.png) | ![](http://fairyever.qiniudn.com/20180727104245.png) | +| ![](http://fairyever.qiniudn.com/20180729104137.png) | ![](http://fairyever.qiniudn.com/20180729104152.png) | ## avue @@ -36,14 +40,10 @@ sidebarDepth: 3 ### 2018年7月29日 * 项目首页已经放置 D2Admin 链接 -* 更新文档中只说明了一个主题的来源 -* 采用的页面没有说明来源 - -下列截图在 avue 1 和 2.0 都存在 | D2Admin | avue | | --- | --- | -| ![](http://fairyever.qiniudn.com/20180729105741.png?imageMogr2/auto-orient/thumbnail/1480x/blur/1x0/quality/100\|imageslim) | ![](http://fairyever.qiniudn.com/20180729105748.png?imageMogr2/auto-orient/thumbnail/1480x/blur/1x0/quality/100\|imageslim) | -| ![](http://fairyever.qiniudn.com/20180729110207.png?imageMogr2/auto-orient/thumbnail/1480x/blur/1x0/quality/100\|imageslim) | ![](http://fairyever.qiniudn.com/20180729110231.png?imageMogr2/auto-orient/thumbnail/1480x/blur/1x0/quality/100\|imageslim) | -| ![](http://fairyever.qiniudn.com/20180729105822.png?imageMogr2/auto-orient/thumbnail/1480x/blur/1x0/quality/100\|imageslim) | ![](http://fairyever.qiniudn.com/20180729105839.png?imageMogr2/auto-orient/thumbnail/1480x/blur/1x0/quality/100\|imageslim) | -| ![](http://fairyever.qiniudn.com/20180729105855.png?imageMogr2/auto-orient/thumbnail/1480x/blur/1x0/quality/100\|imageslim) | ![](http://fairyever.qiniudn.com/20180729105908.png?imageMogr2/auto-orient/thumbnail/1480x/blur/1x0/quality/100\|imageslim) | +| ![](http://fairyever.qiniudn.com/20180729105741.png) | ![](http://fairyever.qiniudn.com/20180729105748.png) | +| ![](http://fairyever.qiniudn.com/20180729110207.png) | ![](http://fairyever.qiniudn.com/20180729110231.png) | +| ![](http://fairyever.qiniudn.com/20180729105822.png) | ![](http://fairyever.qiniudn.com/20180729105839.png) | +| ![](http://fairyever.qiniudn.com/20180729105855.png) | ![](http://fairyever.qiniudn.com/20180729105908.png) | diff --git a/docs/zh/guide/pr.md b/docs/zh/guide/pr.md deleted file mode 100644 index b44bdb67..00000000 --- a/docs/zh/guide/pr.md +++ /dev/null @@ -1,13 +0,0 @@ -# 贡献指南 - -## 如何贡献代码 - -首先在[项目主页](https://github.com/d2-projects/d2-admin) fork 本仓库，然后进行你的开发，请确保你的开发是在 **dev** 分支进行。本地测试无误后方可 pull request，我在检查通过后会合并代码到原始仓库。 - -## 要求 - -本项目代码需要符合[vue.js 风格指南](https://cn.vuejs.org/v2/style-guide/)中[优先级A](https://cn.vuejs.org/v2/style-guide/#%E4%BC%98%E5%85%88%E7%BA%A7-A-%E7%9A%84%E8%A7%84%E5%88%99%EF%BC%9A%E5%BF%85%E8%A6%81%E7%9A%84-%E8%A7%84%E9%81%BF%E9%94%99%E8%AF%AF)和[优先级B](https://cn.vuejs.org/v2/style-guide/#%E4%BC%98%E5%85%88%E7%BA%A7-B-%E7%9A%84%E8%A7%84%E5%88%99%EF%BC%9A%E5%BC%BA%E7%83%88%E6%8E%A8%E8%8D%90-%E5%A2%9E%E5%BC%BA%E5%8F%AF%E8%AF%BB%E6%80%A7)的要求以及本项目中的 ESlint 校验 - -::: tip -由于项目初始没有仔细遵循风格指南，可能项目代码中已经存在不符合规范的代码，欢迎批评指正或者直接pr -::: \ No newline at end of file