From a03b5a6c408e1cf899cffbee201dfc728b8ccf76 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Wed, 22 Aug 2018 19:41:00 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=88=9B=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 6c81510ba7f2b764f260a2d83a206c6114eb8924 [formerly 6c81510ba7f2b764f260a2d83a206c6114eb8924 [formerly 6c81510ba7f2b764f260a2d83a206c6114eb8924 [formerly 6c81510ba7f2b764f260a2d83a206c6114eb8924 [formerly da3bffe6cb5f4c8e5460ffff8b2d24912a1eca6a [formerly 74f20da195f1bba4e8ba50ceb4760bc92d85de56]]]]] Former-commit-id: 88b3d286a981b43de86cc56b968bd290abf3e1bc Former-commit-id: 84a7018334067c21dca398c3d791b517e4e07882 Former-commit-id: 85c1692d38095029c67a788ba353f842e4709f57 [formerly 0ef458e86faef7189e6f1264f2621fd7f3cef49c] Former-commit-id: 65c90339852c903c2dee65ccdf1d098e30c25c0c Former-commit-id: 325a0f780d7cd68d0fe8da378bde8857524dbb8c Former-commit-id: dd5c0c22f00bff0bfc44e8a9819d2bfc0a229a9c Former-commit-id: 82d946c1130070a54ccaad40c59a86f832f36a68 Former-commit-id: 8911cee5b21115d285cc0fb9b71b2b525fba4bb0 --- src/menu/index.js | 6 +++++- src/menu/modules/demo-d2-crud.js | 9 +++++++++ src/pages/demo/d2-crud/demo1/index.vue | 9 +++++++++ src/pages/demo/d2-crud/index/index.vue | 9 +++++++++ src/router/routes.js.REMOVED.git-id | 2 +- 5 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 src/menu/modules/demo-d2-crud.js create mode 100644 src/pages/demo/d2-crud/demo1/index.vue create mode 100644 src/pages/demo/d2-crud/index/index.vue diff --git a/src/menu/index.js b/src/menu/index.js index 3a45ed1f..70237d71 100644 --- a/src/menu/index.js +++ b/src/menu/index.js @@ -10,6 +10,8 @@ import demoElement from './modules/demo-element' import demoPlayground from './modules/demo-playground' // 示例 import demoBusiness from './modules/demo-business' +// 示例 +import demoD2Crud from './modules/demo-d2-crud' // 菜单 侧边栏 export const menuAside = [ @@ -18,7 +20,8 @@ export const menuAside = [ demoCharts, demoElement, demoPlayground, - demoBusiness + demoBusiness, + demoD2Crud ] // 菜单 顶栏 @@ -32,6 +35,7 @@ export const menuHeader = [ title: '功能', icon: 'puzzle-piece', children: [ + demoD2Crud, demoComponents, demoElement, demoCharts, diff --git a/src/menu/modules/demo-d2-crud.js b/src/menu/modules/demo-d2-crud.js new file mode 100644 index 00000000..2b4d856a --- /dev/null +++ b/src/menu/modules/demo-d2-crud.js @@ -0,0 +1,9 @@ +export default { + path: '/demo/d2-crud', + title: 'D2 CRUD', + icon: 'table', + children: (pre => [ + { path: `${pre}index`, title: 'D2 CRUD 首页', icon: 'home' }, + { path: `${pre}demo1`, title: '示例1' } + ])('/demo/d2-crud/') +} diff --git a/src/pages/demo/d2-crud/demo1/index.vue b/src/pages/demo/d2-crud/demo1/index.vue new file mode 100644 index 00000000..6d39786b --- /dev/null +++ b/src/pages/demo/d2-crud/demo1/index.vue @@ -0,0 +1,9 @@ + diff --git a/src/pages/demo/d2-crud/index/index.vue b/src/pages/demo/d2-crud/index/index.vue new file mode 100644 index 00000000..a3995e79 --- /dev/null +++ b/src/pages/demo/d2-crud/index/index.vue @@ -0,0 +1,9 @@ + diff --git a/src/router/routes.js.REMOVED.git-id b/src/router/routes.js.REMOVED.git-id index 0690831d..2a7fbf8f 100644 --- a/src/router/routes.js.REMOVED.git-id +++ b/src/router/routes.js.REMOVED.git-id @@ -1 +1 @@ -d1701498ab5c7359fcd9d5098540ae29b236d7ee \ No newline at end of file +bd272213cf5328eff3aabfe6d4aea9c30c5833e3 \ No newline at end of file From 2a8e20e9edada7b1b8346b7d388e3c8f7675db82 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Wed, 22 Aug 2018 22:44:54 +0800 Subject: [PATCH 2/3] doc update Former-commit-id: fa84c200e2ca76acf1986544c1381b0324a1385a [formerly fa84c200e2ca76acf1986544c1381b0324a1385a [formerly fa84c200e2ca76acf1986544c1381b0324a1385a [formerly fa84c200e2ca76acf1986544c1381b0324a1385a [formerly bc24974d8d62c41a9b55d448b66ce08f65a82fa6 [formerly e9788a2fd218ff3c34b80d4de331f0a0c6befed8]]]]] Former-commit-id: 25a2bcf3e309173162ac649d724694bfde900484 Former-commit-id: 238df5486c330cbbf7f293868c1baefda5da9983 Former-commit-id: 847b0887bf9957f67525d56865084fbbfb52d895 [formerly ef5429925f651a0ce180ee41a744f8a005bb2059] Former-commit-id: 5edfb067b270f7a8db7d6945bb2aa624450e3827 Former-commit-id: b91de751059fb998b257512afeb929dcb607ded3 Former-commit-id: 792801cdb1ed60a5a15538815c1820e174994c13 Former-commit-id: c26e57c2dc81178efcb94c6e4da34aa3ba63a237 Former-commit-id: c5dc867f945818ef8dff7689ef8f3879e19c12fe --- docs/zh/learn-guide/getting-started.md | 2 +- docs/zh/sys-db/README.md.REMOVED.git-id | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/zh/learn-guide/getting-started.md b/docs/zh/learn-guide/getting-started.md index 8c39c7d9..7a4580a3 100644 --- a/docs/zh/learn-guide/getting-started.md +++ b/docs/zh/learn-guide/getting-started.md @@ -196,7 +196,7 @@ const frameIn = [ `src/menu` 目录是菜单存放目录，里面的两个文件分别存放顶栏和侧边栏的菜单。 ::: tip -D2Admin 现在将顶栏和侧边栏菜单分别存放然后赋值的逻辑只是一个最简单的演示，请根据您的需要自己修改菜变化逻辑，您可以只用一行代码就可以动态更新菜单，方法见 [vuex](/zh/sys-vuex/)。 +D2Admin 现在将顶栏和侧边栏菜单分别存放然后赋值的逻辑只是一个最简单的演示，请根据您的需要自己修改菜变化逻辑，您可以只用一行代码就可以动态更新菜单，方法见 [vuex menu 模块](/zh/sys-vuex/#menu)。 ::: 打开 `src/menu/header.js` 添加新的菜单（高亮行）： diff --git a/docs/zh/sys-db/README.md.REMOVED.git-id b/docs/zh/sys-db/README.md.REMOVED.git-id index 22d06029..5453eecb 100644 --- a/docs/zh/sys-db/README.md.REMOVED.git-id +++ b/docs/zh/sys-db/README.md.REMOVED.git-id @@ -1 +1 @@ -f859e2952f21e7ee100da4dc863f96f721bb439c \ No newline at end of file +6d459ba316535f43ff7be55849d50283fb96df15 \ No newline at end of file From e899f965f424dbd3053cbd8fcc3785a837101171 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Thu, 23 Aug 2018 01:31:17 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 26b6bb4573076d1c1399fbef8f569384159fabf3 [formerly 26b6bb4573076d1c1399fbef8f569384159fabf3 [formerly 26b6bb4573076d1c1399fbef8f569384159fabf3 [formerly 26b6bb4573076d1c1399fbef8f569384159fabf3 [formerly 6f809525b3af2af8d5baa6867a22beb70284e51f [formerly ace0ebbede89aa18ddf98540e3378799e6024374]]]]] Former-commit-id: 2005c6288c0051a3cc54c28556df26026197c1e3 Former-commit-id: ac38d93d2f3d4606789a96f6d498ce831230c00f Former-commit-id: 3467dfc30056d668e59a7017c92f49d59b7873c1 [formerly c93566c926de46b1262fedd54444aa3067b7af32] Former-commit-id: c232696614928e6f5e2b5de419aeab8326b8b64c Former-commit-id: 4d747f7e25dd274167b60ef33ebfb36badb174a1 Former-commit-id: 370c67dde80932fad02113b8e1d4fc8c54b64c57 Former-commit-id: cd57afa59768d7519f4809c386a260c390e77e69 Former-commit-id: 4dd1e3f35b35b0f1d5a0c81fcaf59aac3ae6b25d --- README.md | 1 + docs/.vuepress/config.js | 2 ++ docs/zh/article/update/1.2.0.md.REMOVED.git-id | 1 + docs/zh/sys-db/README.md.REMOVED.git-id | 2 +- 4 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 docs/zh/article/update/1.2.0.md.REMOVED.git-id diff --git a/README.md b/README.md index 3dcd4f3f..35613c0d 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,7 @@ D2Admin 是一个开源的管理系统前端集成方案，为了方便开发者 本项目仓库在 Github 和 Gitee 同步发布 [中文文档](http://d2admin.fairyever.com/zh/) +[中文文档 备用](http://app.d3collection.cn/d2-admin-doc/lastest/zh/) **完整版** diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js index 44ef5b09..ebf8b9cd 100644 --- a/docs/.vuepress/config.js +++ b/docs/.vuepress/config.js @@ -1,4 +1,5 @@ module.exports = { + // base: '/d2-admin-doc/lastest/', locales: { '/': { lang: 'en-US', @@ -184,6 +185,7 @@ function sideBarArticle (titleUpdate, titleCookbook) { title: titleUpdate, collapsable: false, children: [ + 'update/1.2.0', 'update/ice-1.1.2', 'update/1.1.5', 'update/1.1.4', diff --git a/docs/zh/article/update/1.2.0.md.REMOVED.git-id b/docs/zh/article/update/1.2.0.md.REMOVED.git-id new file mode 100644 index 00000000..324b5623 --- /dev/null +++ b/docs/zh/article/update/1.2.0.md.REMOVED.git-id @@ -0,0 +1 @@ +0a7f2e68d1f7b2c236189780aa8e141ba0c9de85 \ No newline at end of file diff --git a/docs/zh/sys-db/README.md.REMOVED.git-id b/docs/zh/sys-db/README.md.REMOVED.git-id index 5453eecb..dc83294d 100644 --- a/docs/zh/sys-db/README.md.REMOVED.git-id +++ b/docs/zh/sys-db/README.md.REMOVED.git-id @@ -1 +1 @@ -6d459ba316535f43ff7be55849d50283fb96df15 \ No newline at end of file +46da9d30067372ce67f67f637eb38caf6b45aeba \ No newline at end of file