From 4bf44147579a94e09ec853ccc9e67fab53c69562 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Wed, 20 Jun 2018 14:00:45 +0800 Subject: [PATCH] no message Former-commit-id: fa44e62cc25b58c8e3ea1608d619a80e5be1d398 [formerly fa44e62cc25b58c8e3ea1608d619a80e5be1d398 [formerly fa44e62cc25b58c8e3ea1608d619a80e5be1d398 [formerly fa44e62cc25b58c8e3ea1608d619a80e5be1d398 [formerly 36c19824b8471a64fc79448f387a53bf3846c9f5 [formerly 8bf2ad148e3d6f4b6fcf9b1113666872f51a2924]]]]] Former-commit-id: 5b3c2d62929d06dcf6875bbcfe9c463acf694941 Former-commit-id: 41b9d7f61085f40a2167d67bf053a2dcfe823159 Former-commit-id: c5a5f3433498e95f9fdbbdf225612773c71b4e1c [formerly 6ab62d738b4e0605ff65e0a9dba72362269f2036] Former-commit-id: 5d3a8fc8ec8de1fece491026ad143d0d31953aeb Former-commit-id: f7740607d012c1c96f92dd56950ef983ffebad08 Former-commit-id: ba408cbe880ab3c7c0c098c4094dee42f93ef3d4 Former-commit-id: 960996e83cee4f35ff5bfd87e286176e3ef77533 Former-commit-id: 9445fd6b866e60c132f6dac34831b5f80ec03819 --- README.md | 8 ++++---- deploy.sh | 2 +- docs/.vuepress/config.js | 6 +++--- docs/zh/components/README.md | 2 +- docs/zh/components/markdown.md | 2 +- docs/zh/guide/README.md | 10 +++++----- docs/zh/guide/change-log.md | 2 +- docs/zh/guide/pr.md | 2 +- docs/zh/plugins/README.md | 2 +- docs/zh/plugins/i18n.md | 2 +- package.json | 2 +- src/components/demo/d2-demo-page-cover/index.vue | 2 +- src/pages/demo/components/container/full.vue | 2 +- src/pages/demo/components/editor-quill/value.js | 2 +- src/pages/demo/components/editor-simpleMDE/text.js | 2 +- 15 files changed, 24 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index ac8471d5..b557366e 100755 --- a/README.md +++ b/README.md @@ -21,21 +21,21 @@ Solution of management system front-end based on `vue.js` and `ElementUI` Welcome everyone to maintain -[Documentation (English)](https://fairyever.github.io/d2admin-vue-element/) / [中文文档](https://fairyever.github.io/d2admin-vue-element/zh/) +[Documentation (English)](https://fairyever.github.io/d2-admin/) / [中文文档](https://fairyever.github.io/d2-admin/zh/) [Online preview / 在线预览](http://d2admin.fairyever.com/) **Do not clone this repository, please download the officially released version.** -不要克隆这个仓库，请下载已经正式发行的版本 [Download / 下载](https://github.com/FairyEver/d2admin-vue-element/releases) +不要克隆这个仓库，请下载已经正式发行的版本 [Download / 下载](https://github.com/FairyEver/d2-admin/releases) **Do not clone this repository, please download the officially released version.** -不要克隆这个仓库，请下载已经正式发行的版本 [Download / 下载](https://github.com/FairyEver/d2admin-vue-element/releases) +不要克隆这个仓库，请下载已经正式发行的版本 [Download / 下载](https://github.com/FairyEver/d2-admin/releases) **Do not clone this repository, please download the officially released version.** -不要克隆这个仓库，请下载已经正式发行的版本 [Download / 下载](https://github.com/FairyEver/d2admin-vue-element/releases) +不要克隆这个仓库，请下载已经正式发行的版本 [Download / 下载](https://github.com/FairyEver/d2-admin/releases) > This project is suitable for use as a template. Because a lot of plug-ins and components are integrated now, the first load will take more time. Although the first screen loading animation has been done, it is suggested that you must delete the code that is not used when you release it. For example, the project does not use charts, so it is better to delete the integrated chart library and encapsulated chart components. diff --git a/deploy.sh b/deploy.sh index 91de84cd..fcd44a5e 100755 --- a/deploy.sh +++ b/deploy.sh @@ -20,6 +20,6 @@ git commit -m 'deploy' # git push -f git@github.com:/.github.io.git master # 如果发布到 https://.github.io/ -git push -f git@github.com:FairyEver/d2admin-vue-element.git master:gh-pages +git push -f git@github.com:FairyEver/d2-admin.git master:gh-pages cd - \ No newline at end of file diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js index 51845e3e..36a080ee 100644 --- a/docs/.vuepress/config.js +++ b/docs/.vuepress/config.js @@ -1,5 +1,5 @@ module.exports = { - base: '/d2admin-vue-element/', + base: '/d2-admin/', locales: { '/': { lang: 'en-US', @@ -14,7 +14,7 @@ module.exports = { }, themeConfig: { // 项目仓库地址 - repo: 'https://github.com/FairyEver/d2admin-vue-element', + repo: 'https://github.com/FairyEver/d2-admin', // 自定义仓库链接文字 repoLabel: '查看源码', // 文档不是放在仓库的根目录下 @@ -38,7 +38,7 @@ module.exports = { { text: '指南', link: '/zh/guide/' }, { text: '插件', link: '/zh/plugins/' }, { text: '组件', link: '/zh/components/' }, - { text: '下载', link: 'https://github.com/FairyEver/d2admin-vue-element/releases' } + { text: '下载', link: 'https://github.com/FairyEver/d2-admin/releases' } ], sidebar: { '/zh/guide/': sideBarGuide('指南'), diff --git a/docs/zh/components/README.md b/docs/zh/components/README.md index a87c99eb..2fd73b8a 100644 --- a/docs/zh/components/README.md +++ b/docs/zh/components/README.md @@ -1,3 +1,3 @@ # 组件概述 -d2admin-vue-element（以下简称 d2admin）封装（或者集成第三方）了一些组件，方便开发者进行开发，具体组件文档请从左侧列表进入 \ No newline at end of file +d2-admin（以下简称 d2admin）封装（或者集成第三方）了一些组件，方便开发者进行开发，具体组件文档请从左侧列表进入 \ No newline at end of file diff --git a/docs/zh/components/markdown.md b/docs/zh/components/markdown.md index 1a0f8235..1e84aa45 100644 --- a/docs/zh/components/markdown.md +++ b/docs/zh/components/markdown.md @@ -56,5 +56,5 @@ markdown 中引用部分的文本由于被识别为百度云的分享链接， 上面的块会嵌套在你的 markdown 渲染结果中 ::: tip -了解 D2Admin 是如何在 markdown 中匹配百度云链接的？ [查看源码](https://github.com/FairyEver/d2admin-vue-element/blob/master/src/components/core/Markdown/plugin/baidupan.js) +了解 D2Admin 是如何在 markdown 中匹配百度云链接的？ [查看源码](https://github.com/FairyEver/d2-admin/blob/master/src/components/core/Markdown/plugin/baidupan.js) ::: \ No newline at end of file diff --git a/docs/zh/guide/README.md b/docs/zh/guide/README.md index 0e5a5468..12bc06de 100644 --- a/docs/zh/guide/README.md +++ b/docs/zh/guide/README.md @@ -1,12 +1,12 @@ # 介绍 -d2admin-vue-element（以下简称 d2admin）是一个开源的管理系统前端集成方案 +d2-admin（以下简称 d2admin）是一个开源的管理系统前端集成方案 -[Github仓库](https://github.com/FairyEver/d2admin-vue-element) - [预览地址](http://d2admin.fairyever.com/) +[Github仓库](https://github.com/FairyEver/d2-admin) - [预览地址](http://d2admin.fairyever.com/)
- - + +
::: tip @@ -120,7 +120,7 @@ d2admin 仍然处于开发中，这里有一些计划： ## 使用 -首先下载模板 [d2admin-vue-element/releases](https://github.com/FairyEver/d2admin-vue-element/releases) +首先下载模板 [d2-admin/releases](https://github.com/FairyEver/d2-admin/releases) ::: tip 不要直接克隆本项目，请选择已经发行的版本，尤其不要使用 dev 分支 diff --git a/docs/zh/guide/change-log.md b/docs/zh/guide/change-log.md index 21361b86..73ca1d87 100644 --- a/docs/zh/guide/change-log.md +++ b/docs/zh/guide/change-log.md @@ -34,6 +34,6 @@ ## v1.0.0 -[https://github.com/FairyEver/d2admin-vue-element/releases/tag/v1.0.0](https://github.com/FairyEver/d2admin-vue-element/releases/tag/v1.0.0) +[https://github.com/FairyEver/d2-admin/releases/tag/v1.0.0](https://github.com/FairyEver/d2-admin/releases/tag/v1.0.0) 这是第一个版本，还有一点小问题，但是已经可用 \ No newline at end of file diff --git a/docs/zh/guide/pr.md b/docs/zh/guide/pr.md index 53423c6b..9371bd79 100644 --- a/docs/zh/guide/pr.md +++ b/docs/zh/guide/pr.md @@ -2,7 +2,7 @@ ## 如何贡献代码 -首先在[项目主页](https://github.com/FairyEver/d2admin-vue-element) fork 本仓库，然后进行你的开发，请确保你的开发是在 dev 分支进行。本地测试无误后方可 pull request，我在检查通过后会合并代码到原始仓库。 +首先在[项目主页](https://github.com/FairyEver/d2-admin) fork 本仓库，然后进行你的开发，请确保你的开发是在 dev 分支进行。本地测试无误后方可 pull request，我在检查通过后会合并代码到原始仓库。 ## 要求 diff --git a/docs/zh/plugins/README.md b/docs/zh/plugins/README.md index 77764c0e..cdac3b88 100644 --- a/docs/zh/plugins/README.md +++ b/docs/zh/plugins/README.md @@ -1,3 +1,3 @@ # 插件概述 -d2admin-vue-element（以下简称 d2admin）封装（或者集成第三方）了一些插件，方便开发者进行开发，具体组件文档请从左侧列表进入 \ No newline at end of file +d2-admin（以下简称 d2admin）封装（或者集成第三方）了一些插件，方便开发者进行开发，具体组件文档请从左侧列表进入 \ No newline at end of file diff --git a/docs/zh/plugins/i18n.md b/docs/zh/plugins/i18n.md index 424bfce1..12e2522a 100644 --- a/docs/zh/plugins/i18n.md +++ b/docs/zh/plugins/i18n.md @@ -49,7 +49,7 @@ new Vue({ ## 局部配置 -有时候我们只希望在某个文件中配置这个组件的多国语言，如果所有的语言设置都放在 `d2admin-vue-element/src/i18n` 中会造成混乱，不易维护 +有时候我们只希望在某个文件中配置这个组件的多国语言，如果所有的语言设置都放在 `d2-admin/src/i18n` 中会造成混乱，不易维护 `D2Admin` 已经替你安装好了 `vue-i18n-loader`，可以方便地在单文件组件中使用 diff --git a/package.json b/package.json index e966cc19..d0cc8ced 100755 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "d2admin-vue-element", + "name": "d2-admin", "version": "1.0.0", "description": "A management system framework based on element", "author": "李杨 <1711467488@qq.com>", diff --git a/src/components/demo/d2-demo-page-cover/index.vue b/src/components/demo/d2-demo-page-cover/index.vue index 2b9c66d6..7e80e486 100644 --- a/src/components/demo/d2-demo-page-cover/index.vue +++ b/src/components/demo/d2-demo-page-cover/index.vue @@ -5,7 +5,7 @@

{{title}}

{{subTitle}}

- + diff --git a/src/pages/demo/components/editor-quill/value.js b/src/pages/demo/components/editor-quill/value.js index be1c89cf..7b093364 100644 --- a/src/pages/demo/components/editor-quill/value.js +++ b/src/pages/demo/components/editor-quill/value.js @@ -1,5 +1,5 @@ export default `

-D2 Admin +D2 Admin by vue.js diff --git a/src/pages/demo/components/editor-simpleMDE/text.js b/src/pages/demo/components/editor-simpleMDE/text.js index aa22931d..359546d6 100644 --- a/src/pages/demo/components/editor-simpleMDE/text.js +++ b/src/pages/demo/components/editor-simpleMDE/text.js @@ -7,4 +7,4 @@ export default `# 标题 alert('Hello') \`\`\` -[D2Admin in github](https://github.com/FairyEver/d2admin-vue-element)` +[D2Admin in github](https://github.com/FairyEver/d2-admin)`