From 63aeb7177bd69638b4bbc6dd2ad56371fae2e9c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E6=98=8A=E7=BF=94?= <673686754@qq.com> Date: Sat, 25 Aug 2018 10:43:24 +0800 Subject: [PATCH 01/78] =?UTF-8?q?d2-crud=20doc=20=E4=BB=8B=E7=BB=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: f9fd9abdf2253e3e8cbf882b5e23de88fe89c2bb [formerly f9fd9abdf2253e3e8cbf882b5e23de88fe89c2bb [formerly f9fd9abdf2253e3e8cbf882b5e23de88fe89c2bb [formerly f9fd9abdf2253e3e8cbf882b5e23de88fe89c2bb [formerly 1a85b364273d84fd65b402fc26b5380ae6a5abf3 [formerly ddb8c5ebdcc602e2d5dcdfc8b7b0120e4588fe6b]]]]] Former-commit-id: 1adfa36f63a34e9e9299574b4d17a7182b106686 Former-commit-id: 462c8643eaf845c3f8ad54803149c5f5bb68bf0f Former-commit-id: 0fc2923ebdf457830a57fe25225a8d549953d64e [formerly 0ae139f0a3cabc6ffaae2fdc1f250fd8e1724b2f] Former-commit-id: 7278a500c12fada59e857d5488fd10bfd176a8fc Former-commit-id: d1acec67e5288f7a34e78c5e6c0f2b4e68e003ec Former-commit-id: 8c0483b67c445eca1dae40f3a9473e571d764a10 Former-commit-id: b6def100df4860e3e7032f46d71e3cd7d10d049f Former-commit-id: 9feacdfe682f32882b708c5e01b529f68b150b88 --- docs/zh/ecosystem-d2-crud/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/zh/ecosystem-d2-crud/README.md b/docs/zh/ecosystem-d2-crud/README.md index 9c09a7f4..afcf2d82 100644 --- a/docs/zh/ecosystem-d2-crud/README.md +++ b/docs/zh/ecosystem-d2-crud/README.md @@ -1,3 +1,3 @@ # D2 CRUD -介绍内容 \ No newline at end of file +`D2-Crud`是一套基于[Vue.js 2.2.0+](https://cn.vuejs.org/)和[Element 2.0.0+](http://element-cn.eleme.io/#/zh-CN)制作的表格组件，可根据配置的json文件自动生成表格，并实现了表格内的增删改查、表格内编辑等功能。 \ No newline at end of file From 4b30ae64f0f6719a9521e595a5be49753dc31f82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E6=98=8A=E7=BF=94?= <673686754@qq.com> Date: Sat, 25 Aug 2018 11:08:23 +0800 Subject: [PATCH 02/78] =?UTF-8?q?d2-crud=20doc=20=E5=AE=89=E8=A3=85?= =?UTF-8?q?=E4=B8=8E=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: ad5a24f1fcdb7355158afe90a220b89d10effbc1 [formerly ad5a24f1fcdb7355158afe90a220b89d10effbc1 [formerly ad5a24f1fcdb7355158afe90a220b89d10effbc1 [formerly ad5a24f1fcdb7355158afe90a220b89d10effbc1 [formerly e178e288b2633c4518e4a384c600988f59a01718 [formerly cee2ebe37a1479b0e8fa7bad445a9cee66e0cd0d]]]]] Former-commit-id: e53c0c3cf06dbce9e022379ba1aee0c38063042f Former-commit-id: 4e930e5991ff25c34e9c4fa2468ed2e1e9fff384 Former-commit-id: b7fe2a305aa1bcd662a6a3761e2ce2106f0f799f [formerly 9c531ecc0cbcfac05d4a62a3e46f76fa59536f87] Former-commit-id: e25370af0e242a6790669585c9a5cc1adcb474c6 Former-commit-id: 0b8437a9836c0ed14b8afd7e906bc4f8c1674929 Former-commit-id: 1932505cf83478252b19c2a1d2f2d45087ed2010 Former-commit-id: 43e6c08bd6104e50f42ea3a11f2fb2b957290d9d Former-commit-id: b7c6c39ce7b6d6b5510ae617c969e640aaac18ee --- docs/zh/ecosystem-d2-crud/README.md | 41 ++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/docs/zh/ecosystem-d2-crud/README.md b/docs/zh/ecosystem-d2-crud/README.md index afcf2d82..79c8b831 100644 --- a/docs/zh/ecosystem-d2-crud/README.md +++ b/docs/zh/ecosystem-d2-crud/README.md @@ -1,3 +1,42 @@ # D2 CRUD -`D2-Crud`是一套基于[Vue.js 2.2.0+](https://cn.vuejs.org/)和[Element 2.0.0+](http://element-cn.eleme.io/#/zh-CN)制作的表格组件，可根据配置的json文件自动生成表格，并实现了表格内的增删改查、表格内编辑等功能。 \ No newline at end of file + +## 介绍 +`D2-Crud`是一套基于[Vue.js 2.2.0+](https://cn.vuejs.org/)和[Element 2.0.0+](http://element-cn.eleme.io/#/zh-CN)的表格组件，可根据配置的json文件自动生成表格，并实现了表格内的增删改查、新增和修改数据校验、表格内编辑等功能。 + +## 安装 +使用npm +``` bash +npm i element-ui d2-crud -S +``` + +使用yarn +``` bash +yarn add element-ui d2-crud +``` + +## 使用 +在`main.js`中写入以下内容： +``` js +import Vue from 'vue' +import ElementUI from 'element-ui' +import 'element-ui/lib/theme-chalk/index.css' +import d2Crud from 'd2-crud' + +Vue.use(d2Crud) +Vue.use(ElementUI) + +new Vue({ + el: '#app', + render: h => h(App) +}) +``` + +之后就可以在组件中使用`D2-Crud`了 +``` vue + +``` + +具体使用方法请参考 [使用指南](./api.md) From d9cb31eb98272ce7eef5dc0581b43057a5a36e03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E6=98=8A=E7=BF=94?= <673686754@qq.com> Date: Sun, 26 Aug 2018 18:23:15 +0800 Subject: [PATCH 03/78] =?UTF-8?q?d2-crud=20doc=20=E5=AE=89=E8=A3=85?= =?UTF-8?q?=E5=92=8C=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 683f264fa376ee3b34ba74a68a0620a38cf9ee06 [formerly 0aeb04b6927b6c7c115e8863e5adee72d0206876] [formerly 683f264fa376ee3b34ba74a68a0620a38cf9ee06 [formerly 0aeb04b6927b6c7c115e8863e5adee72d0206876] [formerly 683f264fa376ee3b34ba74a68a0620a38cf9ee06 [formerly 0aeb04b6927b6c7c115e8863e5adee72d0206876] [formerly 0aeb04b6927b6c7c115e8863e5adee72d0206876 [formerly 33bfc3cac1e556d1504786849fef9b98bc0a96b6 [formerly 62c564466c0ec6697988ec2f7acfef4e41f96b97]]]]] Former-commit-id: 9116106f10c5bf73663e39e047ca9229307270b3 Former-commit-id: 36d47b96ff92a07f18827daeb1c9a1c1039c760a Former-commit-id: ec26069a13f6207bc523cb94ac966048db2462bd [formerly 11a080148056553025a32528de4949dcdeb8d2a3] Former-commit-id: 22557a8ad0a29f0cb274e017b1850f00d57320ba Former-commit-id: e1460fe83483f046420770d660cc229638cd93b4 Former-commit-id: ced50fcee5d3601181d66758e38abcbd158a7c1c Former-commit-id: e4e0dee70597bef87b652c5c2658625ece9e1362 Former-commit-id: d7e62ca343273fa20dd3ceb53bfb39ec72073261 --- docs/zh/ecosystem-d2-crud/README.md | 18 +++++------------- docs/zh/ecosystem-d2-crud/api.md | 10 ++-------- 2 files changed, 7 insertions(+), 21 deletions(-) diff --git a/docs/zh/ecosystem-d2-crud/README.md b/docs/zh/ecosystem-d2-crud/README.md index 79c8b831..daf1527d 100644 --- a/docs/zh/ecosystem-d2-crud/README.md +++ b/docs/zh/ecosystem-d2-crud/README.md @@ -1,18 +1,17 @@ # D2 CRUD - ## 介绍 `D2-Crud`是一套基于[Vue.js 2.2.0+](https://cn.vuejs.org/)和[Element 2.0.0+](http://element-cn.eleme.io/#/zh-CN)的表格组件，可根据配置的json文件自动生成表格，并实现了表格内的增删改查、新增和修改数据校验、表格内编辑等功能。 ## 安装 使用npm ``` bash -npm i element-ui d2-crud -S +npm i element-ui @d2-projects/d2-crud -S ``` 使用yarn ``` bash -yarn add element-ui d2-crud +yarn add element-ui @d2-projects/d2-crud ``` ## 使用 @@ -21,10 +20,10 @@ yarn add element-ui d2-crud import Vue from 'vue' import ElementUI from 'element-ui' import 'element-ui/lib/theme-chalk/index.css' -import d2Crud from 'd2-crud' +import D2Crud from '@d2-projects/d2-crud' -Vue.use(d2Crud) Vue.use(ElementUI) +Vue.use(D2Crud) new Vue({ el: '#app', @@ -32,11 +31,4 @@ new Vue({ }) ``` -之后就可以在组件中使用`D2-Crud`了 -``` vue - -``` - -具体使用方法请参考 [使用指南](./api.md) +之后就可以在项目中使用`D2-Crud`了，具体使用方法请参考 [使用指南](./api.md) diff --git a/docs/zh/ecosystem-d2-crud/api.md b/docs/zh/ecosystem-d2-crud/api.md index 2c426cfd..a97ef9a7 100644 --- a/docs/zh/ecosystem-d2-crud/api.md +++ b/docs/zh/ecosystem-d2-crud/api.md @@ -1,9 +1,3 @@ -# api +# 使用指南 -## api-1 - -hhh - -## api-2 - -## api-3 \ No newline at end of file +## 基础表格 From ffbb2dffca4bf1a97271f4e936b749df11a08b1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E6=98=8A=E7=BF=94?= <673686754@qq.com> Date: Sun, 26 Aug 2018 18:23:52 +0800 Subject: [PATCH 04/78] =?UTF-8?q?=E6=B7=BB=E5=8A=A0d2-crud=E5=8C=85?= =?UTF-8?q?=E5=88=B0=E9=A1=B9=E7=9B=AE=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: a1040e9ff6f9073e483d1ee33686d55ba2bc66ab [formerly a1040e9ff6f9073e483d1ee33686d55ba2bc66ab [formerly a1040e9ff6f9073e483d1ee33686d55ba2bc66ab [formerly a1040e9ff6f9073e483d1ee33686d55ba2bc66ab [formerly 0752dcc245f460721fd1d2572b35a4208b67396a [formerly 1e55e5f2f708a65a2b05679fbd1eb13b1bf6c58c]]]]] Former-commit-id: e9d62b728379beb86408da0f78516ffa3cdee4af Former-commit-id: 8f00571287d2a726ed795b9cbe03a7653a3ca30a Former-commit-id: 0f933a852f72a353cba0e94bd1d0f556c5b70851 [formerly a56c67133c1697b74f9dec5aab3f2f2115e87855] Former-commit-id: 26380e73701ef194d7a2a3d8ebddc3f61a774388 Former-commit-id: ceed5e24af039985c397535ad5cba23aca3f0344 Former-commit-id: 4234126354e5ddea2a9356e5f91377037789ae8c Former-commit-id: c6ec9bef1794463242ffab72c4c786a06859ba1e Former-commit-id: a93d28113e809127723fab95db122c50d40067c7 --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 2e366f33..dbf32996 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,7 @@ "doc:build": "vuepress build docs" }, "dependencies": { + "@d2-projects/d2-crud": "^0.0.2", "axios": "^0.17.1", "babel-polyfill": "^6.26.0", "better-scroll": "^1.12.1", From 0ab200fab1e0a5ef73bead7ca016f1d3cd3601ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E6=98=8A=E7=BF=94?= <673686754@qq.com> Date: Sun, 26 Aug 2018 18:30:35 +0800 Subject: [PATCH 05/78] =?UTF-8?q?=E5=85=A5=E5=8F=A3=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=BC=95=E5=85=A5d2-crud?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: c26def84038f9c6ef876bfaecfeda6ad960a7128 [formerly c26def84038f9c6ef876bfaecfeda6ad960a7128 [formerly c26def84038f9c6ef876bfaecfeda6ad960a7128 [formerly c26def84038f9c6ef876bfaecfeda6ad960a7128 [formerly ac51bf426398ead7798bc75e47c225d4e4373c01 [formerly d109b59405dd2496434eb6136b44ce1116c48fd7]]]]] Former-commit-id: 14287833957f8edd7f85c2b59cd0e52dc959d78c Former-commit-id: e477c4156173bd2927cbcc5a38e3163a57aa6286 Former-commit-id: 31689fdb97e62c2e954a39c8a08a3795c3ad239b [formerly 902e7338b00529afc1b34d6b8945a4778fc1d312] Former-commit-id: 55fd7e3549b2cc391aa15984a31b9817c4e849dd Former-commit-id: f26bd67675a2117554ff62633ce05c73d0e86c06 Former-commit-id: 7e834316ca05e6073fc05add9ff9086f014f5a81 Former-commit-id: b12837f121821961c7f9ecb52604308990875ced Former-commit-id: 2ea5c80ed0937d6d154cbc9f331e0cb4277523c9 --- src/main.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main.js b/src/main.js index 39402fd6..04332968 100644 --- a/src/main.js +++ b/src/main.js @@ -12,6 +12,8 @@ import i18n from './i18n' // 核心插件 import d2Admin from '@/plugin/d2admin' +// [ 可选插件组件 ]D2-Crud +import D2Crud from '@d2-projects/d2-crud' // [ 可选插件组件 ] 图表 import VCharts from 'v-charts' // [ 可选插件组件 ] 右键菜单 @@ -33,6 +35,7 @@ import { frameInRoutes } from '@/router/routes' Vue.use(d2Admin) // 可选插件组件 +Vue.use(D2Crud) Vue.use(VCharts) Vue.use(contentmenu) Vue.use(vueJsonTreeView) From 993e54d64bc4c4c82fd1b7e1bf496782f6fe53c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E6=98=8A=E7=BF=94?= <673686754@qq.com> Date: Sun, 26 Aug 2018 21:22:04 +0800 Subject: [PATCH 06/78] =?UTF-8?q?d2-crud=20doc=20=E5=9F=BA=E6=9C=AC?= =?UTF-8?q?=E8=A1=A8=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: acf80443284f668a8f9fa3fdbcbb32161168cd6e [formerly acf80443284f668a8f9fa3fdbcbb32161168cd6e [formerly acf80443284f668a8f9fa3fdbcbb32161168cd6e [formerly acf80443284f668a8f9fa3fdbcbb32161168cd6e [formerly 6c6dda19796960d898f505804108986aa7114185 [formerly 608b16426fa9dfd7d39068c35d060164b2f27baf]]]]] Former-commit-id: 3da8dc3d3681adb92d6bd21b0e982f40bfdb17a0 Former-commit-id: 996adfebb0359eaf4f286a4cb03ee855347dd0d4 Former-commit-id: 7404f9647294dd8fa7c1efbda0d7fc8ab7bf5cae [formerly e98e5d3ddeaf2216c9b4e3e8bf83f7a31bedf25a] Former-commit-id: b592545fe6a45c6a79eed8badf612275e54cdc31 Former-commit-id: 285a183c0bed15c2fae96247f19e9e3ec854b037 Former-commit-id: 496e9e1362e1c407c0593826ca604c35f74866ba Former-commit-id: b3225c89b32a7a44fcbc29c0c43c7cc82c0286bd Former-commit-id: 9514dc2c0ea2ffda7bd324e05e71a1c54516d200 --- src/menu/modules/demo-d2-crud.js | 2 +- src/pages/demo/d2-crud/demo1/index.vue | 55 ++++++++++++++++++++++++-- src/router/routes.js.REMOVED.git-id | 2 +- 3 files changed, 54 insertions(+), 5 deletions(-) diff --git a/src/menu/modules/demo-d2-crud.js b/src/menu/modules/demo-d2-crud.js index 2b4d856a..8da7f9ad 100644 --- a/src/menu/modules/demo-d2-crud.js +++ b/src/menu/modules/demo-d2-crud.js @@ -4,6 +4,6 @@ export default { icon: 'table', children: (pre => [ { path: `${pre}index`, title: 'D2 CRUD 首页', icon: 'home' }, - { path: `${pre}demo1`, title: '示例1' } + { path: `${pre}demo1`, title: '基本表格' } ])('/demo/d2-crud/') } diff --git a/src/pages/demo/d2-crud/demo1/index.vue b/src/pages/demo/d2-crud/demo1/index.vue index 6d39786b..52a07b4b 100644 --- a/src/pages/demo/d2-crud/demo1/index.vue +++ b/src/pages/demo/d2-crud/demo1/index.vue @@ -1,9 +1,58 @@ + + diff --git a/src/router/routes.js.REMOVED.git-id b/src/router/routes.js.REMOVED.git-id index 2a7fbf8f..10a82f8f 100644 --- a/src/router/routes.js.REMOVED.git-id +++ b/src/router/routes.js.REMOVED.git-id @@ -1 +1 @@ -bd272213cf5328eff3aabfe6d4aea9c30c5833e3 \ No newline at end of file +6c0089557b3f47ce1383b439360cea062285b4b9 \ No newline at end of file From afeeca7247e65c104b8b86a96b0322fb9a16e75f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E6=98=8A=E7=BF=94?= <673686754@qq.com> Date: Mon, 27 Aug 2018 13:18:06 +0800 Subject: [PATCH 07/78] =?UTF-8?q?d2-crud=20=E5=9F=BA=E7=A1=80=E8=A1=A8?= =?UTF-8?q?=E6=A0=BC=E7=A4=BA=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: de858da799b11ddb64f8f1c70a927abf3ffe541a [formerly de858da799b11ddb64f8f1c70a927abf3ffe541a [formerly de858da799b11ddb64f8f1c70a927abf3ffe541a [formerly de858da799b11ddb64f8f1c70a927abf3ffe541a [formerly dc719910e44385130a5d15d61010d4567ac69e4d [formerly e3008d8f05e5255a733d12ed45270824b112ffb2]]]]] Former-commit-id: 8fd75dfb370c84815e9e20e4bea39730a5b7ef63 Former-commit-id: a70d95d941b30cb2dd2111e09e2dfba4352667fd Former-commit-id: d460cd4cfbe159a6dc21779a9c3df2ba3f74e806 [formerly cd9ca40d9b4ff3f146364e69dfe8c7d4104e6dea] Former-commit-id: 990c9ad6ad73bb009004e47b0640dd5a49d908eb Former-commit-id: 9af35feccd694c5eeaed4029477548504981afc8 Former-commit-id: 4c84831bbf31546a1468f5bcf377c1062370c1cc Former-commit-id: 0fb1ef7e88759452800461cde28b25d7c1155570 Former-commit-id: f26e220278c0a9d4e939b343200d70ed75d17758 --- docs/zh/ecosystem-d2-crud/README.md | 2 +- docs/zh/ecosystem-d2-crud/api.md | 4 +- docs/zh/ecosystem-d2-crud/example.md | 5 +++ src/menu/modules/demo-d2-crud.js | 2 +- src/pages/demo/d2-crud/demo1/code.js | 54 ++++++++++++++++++++++++++ src/pages/demo/d2-crud/demo1/index.vue | 23 ++++++++--- src/router/routes.js.REMOVED.git-id | 2 +- 7 files changed, 80 insertions(+), 12 deletions(-) create mode 100644 docs/zh/ecosystem-d2-crud/example.md create mode 100644 src/pages/demo/d2-crud/demo1/code.js diff --git a/docs/zh/ecosystem-d2-crud/README.md b/docs/zh/ecosystem-d2-crud/README.md index daf1527d..9dcab931 100644 --- a/docs/zh/ecosystem-d2-crud/README.md +++ b/docs/zh/ecosystem-d2-crud/README.md @@ -31,4 +31,4 @@ new Vue({ }) ``` -之后就可以在项目中使用`D2-Crud`了，具体使用方法请参考 [使用指南](./api.md) +之后就可以在项目中使用`D2-Crud`了。具体使用方法请参考 [示例](./example.md) diff --git a/docs/zh/ecosystem-d2-crud/api.md b/docs/zh/ecosystem-d2-crud/api.md index a97ef9a7..59327929 100644 --- a/docs/zh/ecosystem-d2-crud/api.md +++ b/docs/zh/ecosystem-d2-crud/api.md @@ -1,3 +1 @@ -# 使用指南 - -## 基础表格 +# API diff --git a/docs/zh/ecosystem-d2-crud/example.md b/docs/zh/ecosystem-d2-crud/example.md new file mode 100644 index 00000000..a0bad423 --- /dev/null +++ b/docs/zh/ecosystem-d2-crud/example.md @@ -0,0 +1,5 @@ +# 示例 + +| 示例 | 代码与演示 | +| --- | --- | +| 基础表格 | [点我查看](https://fairyever.gitee.io//d2-admin-preview/#/demo/d2-crud/demo1) | diff --git a/src/menu/modules/demo-d2-crud.js b/src/menu/modules/demo-d2-crud.js index 8da7f9ad..42675a0c 100644 --- a/src/menu/modules/demo-d2-crud.js +++ b/src/menu/modules/demo-d2-crud.js @@ -4,6 +4,6 @@ export default { icon: 'table', children: (pre => [ { path: `${pre}index`, title: 'D2 CRUD 首页', icon: 'home' }, - { path: `${pre}demo1`, title: '基本表格' } + { path: `${pre}demo1`, title: '基础表格' } ])('/demo/d2-crud/') } diff --git a/src/pages/demo/d2-crud/demo1/code.js b/src/pages/demo/d2-crud/demo1/code.js new file mode 100644 index 00000000..9302b8fd --- /dev/null +++ b/src/pages/demo/d2-crud/demo1/code.js @@ -0,0 +1,54 @@ +export default ` + +` diff --git a/src/pages/demo/d2-crud/demo1/index.vue b/src/pages/demo/d2-crud/demo1/index.vue index 52a07b4b..d2bde819 100644 --- a/src/pages/demo/d2-crud/demo1/index.vue +++ b/src/pages/demo/d2-crud/demo1/index.vue @@ -1,11 +1,17 @@ ` diff --git a/src/pages/demo/d2-crud/demo2/index.vue b/src/pages/demo/d2-crud/demo2/index.vue new file mode 100644 index 00000000..8330458c --- /dev/null +++ b/src/pages/demo/d2-crud/demo2/index.vue @@ -0,0 +1,73 @@ + + + diff --git a/src/router/routes.js.REMOVED.git-id b/src/router/routes.js.REMOVED.git-id index 96fc0682..9d30a679 100644 --- a/src/router/routes.js.REMOVED.git-id +++ b/src/router/routes.js.REMOVED.git-id @@ -1 +1 @@ -32a7ea0783b0602f53515540de1e323f60edd792 \ No newline at end of file +c97174e7ff9ee5ba2151eeb570e11a8e7fa2b87e \ No newline at end of file From 7db9276401db4346e7f29ca83720525d754c3e24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E6=98=8A=E7=BF=94?= <673686754@qq.com> Date: Mon, 27 Aug 2018 13:47:12 +0800 Subject: [PATCH 09/78] no message Former-commit-id: 2a16c2a6cd51fda17d4f865f0ecdf26b03e4c7ee [formerly fac7464138e8d4a1f5fb73c3962e215b73e244e8] [formerly 2a16c2a6cd51fda17d4f865f0ecdf26b03e4c7ee [formerly fac7464138e8d4a1f5fb73c3962e215b73e244e8] [formerly 2a16c2a6cd51fda17d4f865f0ecdf26b03e4c7ee [formerly fac7464138e8d4a1f5fb73c3962e215b73e244e8] [formerly fac7464138e8d4a1f5fb73c3962e215b73e244e8 [formerly 35b769128877ef2fe15d2f65dc4fefb52da0474d [formerly 7f13c5e52752724ac6a6b12968006819f9338741]]]]] Former-commit-id: 48b7967be89b90cad89393e164201516ce29339d Former-commit-id: 0e4a114b158000ac0d4f5114bfa5772fb4fdcc7b Former-commit-id: ad725f9f376237bbbaf52b516580d693589f17bd [formerly fc418f7eda078162b3fd3f7ae0eceedc21108171] Former-commit-id: ee44662669738a9d283d28cbbacf9f63f4f472de Former-commit-id: 142eb2073219f633719e63c8109c997944086021 Former-commit-id: 6adb3a6b462acb42ec5a74764c531d935a1582e7 Former-commit-id: c0fcbcec55cca008a4d416b70e97103a3168f40d Former-commit-id: bb2789f77eb6b39f5ee4ac0f34cf62da0a8701e5 --- docs/zh/ecosystem-d2-crud/example.md | 2 + src/menu/modules/demo-d2-crud.js | 3 +- src/pages/demo/d2-crud/demo3/code.js | 58 ++++++++++++++++++++ src/pages/demo/d2-crud/demo3/index.vue | 73 ++++++++++++++++++++++++++ src/router/routes.js.REMOVED.git-id | 2 +- 5 files changed, 136 insertions(+), 2 deletions(-) create mode 100644 src/pages/demo/d2-crud/demo3/code.js create mode 100644 src/pages/demo/d2-crud/demo3/index.vue diff --git a/docs/zh/ecosystem-d2-crud/example.md b/docs/zh/ecosystem-d2-crud/example.md index a0bad423..c280f235 100644 --- a/docs/zh/ecosystem-d2-crud/example.md +++ b/docs/zh/ecosystem-d2-crud/example.md @@ -3,3 +3,5 @@ | 示例 | 代码与演示 | | --- | --- | | 基础表格 | [点我查看](https://fairyever.gitee.io//d2-admin-preview/#/demo/d2-crud/demo1) | +| 带斑马纹表格 | [点我查看](https://fairyever.gitee.io//d2-admin-preview/#/demo/d2-crud/demo2) | +| 带边框表格 | [点我查看](https://fairyever.gitee.io//d2-admin-preview/#/demo/d2-crud/demo3) | diff --git a/src/menu/modules/demo-d2-crud.js b/src/menu/modules/demo-d2-crud.js index fd946277..cfa19cbc 100644 --- a/src/menu/modules/demo-d2-crud.js +++ b/src/menu/modules/demo-d2-crud.js @@ -5,6 +5,7 @@ export default { children: (pre => [ { path: `${pre}index`, title: 'D2 CRUD 首页', icon: 'home' }, { path: `${pre}demo1`, title: '基础表格' }, - { path: `${pre}demo2`, title: '带斑马纹表格' } + { path: `${pre}demo2`, title: '带斑马纹表格' }, + { path: `${pre}demo3`, title: '带边框表格' } ])('/demo/d2-crud/') } diff --git a/src/pages/demo/d2-crud/demo3/code.js b/src/pages/demo/d2-crud/demo3/code.js new file mode 100644 index 00000000..041ad94f --- /dev/null +++ b/src/pages/demo/d2-crud/demo3/code.js @@ -0,0 +1,58 @@ +export default ` + +` diff --git a/src/pages/demo/d2-crud/demo3/index.vue b/src/pages/demo/d2-crud/demo3/index.vue new file mode 100644 index 00000000..168248fc --- /dev/null +++ b/src/pages/demo/d2-crud/demo3/index.vue @@ -0,0 +1,73 @@ + + + diff --git a/src/router/routes.js.REMOVED.git-id b/src/router/routes.js.REMOVED.git-id index 9d30a679..0638f659 100644 --- a/src/router/routes.js.REMOVED.git-id +++ b/src/router/routes.js.REMOVED.git-id @@ -1 +1 @@ -c97174e7ff9ee5ba2151eeb570e11a8e7fa2b87e \ No newline at end of file +3e7ad2954b31e28ac24d807efc726b59b2b1bd1b \ No newline at end of file From c5121512c05d169941ceb40fd66ac44a7f24ef27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E6=98=8A=E7=BF=94?= <673686754@qq.com> Date: Mon, 27 Aug 2018 14:09:31 +0800 Subject: [PATCH 10/78] =?UTF-8?q?d2-crud=20=E5=B8=A6=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E8=A1=A8=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: aedacbb884050bcbeba78dd93d47d8c02d569ca1 [formerly aedacbb884050bcbeba78dd93d47d8c02d569ca1 [formerly aedacbb884050bcbeba78dd93d47d8c02d569ca1 [formerly aedacbb884050bcbeba78dd93d47d8c02d569ca1 [formerly ce8ae5380804ac0d94aea1f143abd516b13919d5 [formerly 6a53e667ed4edda557ff526b3d9d35515ccd4483]]]]] Former-commit-id: 5a8675d99ef0308aac368cc28d8a3aca90d610c6 Former-commit-id: d22b37bc78dc3eeac87946bb9607987c7cf23dc5 Former-commit-id: fc72d7367b05034cf21eac251c962242e0427306 [formerly 907af2041fe52543e30f08fc23499e92ade73ccb] Former-commit-id: 5a72d7ba890bcb341e77695610bab39e3e630335 Former-commit-id: 8204a10ee32924f1a5ac6d294d46a089cf5b7d3a Former-commit-id: 52a4ee4ef3a6d5b007195fcbe8a9361c9dd6cce9 Former-commit-id: b36beb64839ecbd2ac7dcf47d3f0f98c9649faa1 Former-commit-id: f28040967965e0354bb0c42c417ed8c4e0557d69 --- src/menu/modules/demo-d2-crud.js | 3 +- src/pages/demo/d2-crud/demo1/doc.md | 1 + src/pages/demo/d2-crud/demo1/index.vue | 6 +- src/pages/demo/d2-crud/demo2/doc.md | 1 + src/pages/demo/d2-crud/demo2/index.vue | 6 +- src/pages/demo/d2-crud/demo3/doc.md | 1 + src/pages/demo/d2-crud/demo3/index.vue | 6 +- src/pages/demo/d2-crud/demo4/code.js | 75 +++++++++++++++++++++ src/pages/demo/d2-crud/demo4/doc.md | 1 + src/pages/demo/d2-crud/demo4/index.vue | 90 ++++++++++++++++++++++++++ src/router/routes.js.REMOVED.git-id | 2 +- 11 files changed, 181 insertions(+), 11 deletions(-) create mode 100644 src/pages/demo/d2-crud/demo1/doc.md create mode 100644 src/pages/demo/d2-crud/demo2/doc.md create mode 100644 src/pages/demo/d2-crud/demo3/doc.md create mode 100644 src/pages/demo/d2-crud/demo4/code.js create mode 100644 src/pages/demo/d2-crud/demo4/doc.md create mode 100644 src/pages/demo/d2-crud/demo4/index.vue diff --git a/src/menu/modules/demo-d2-crud.js b/src/menu/modules/demo-d2-crud.js index cfa19cbc..92a28350 100644 --- a/src/menu/modules/demo-d2-crud.js +++ b/src/menu/modules/demo-d2-crud.js @@ -6,6 +6,7 @@ export default { { path: `${pre}index`, title: 'D2 CRUD 首页', icon: 'home' }, { path: `${pre}demo1`, title: '基础表格' }, { path: `${pre}demo2`, title: '带斑马纹表格' }, - { path: `${pre}demo3`, title: '带边框表格' } + { path: `${pre}demo3`, title: '带边框表格' }, + { path: `${pre}demo4`, title: '带状态表格' } ])('/demo/d2-crud/') } diff --git a/src/pages/demo/d2-crud/demo1/doc.md b/src/pages/demo/d2-crud/demo1/doc.md new file mode 100644 index 00000000..4695daf4 --- /dev/null +++ b/src/pages/demo/d2-crud/demo1/doc.md @@ -0,0 +1 @@ +在 `D2 Crud` 组件中传入 `columns` 和 `data` 对象数组，即可创建一个最基础的表格，可以在 `columns` 对象中传入 `width` 属性来控制列宽。代码如下： \ No newline at end of file diff --git a/src/pages/demo/d2-crud/demo1/index.vue b/src/pages/demo/d2-crud/demo1/index.vue index d2bde819..8e8a2ece 100644 --- a/src/pages/demo/d2-crud/demo1/index.vue +++ b/src/pages/demo/d2-crud/demo1/index.vue @@ -5,9 +5,7 @@ :columns="columns" :data="data"/> -

- 在d2-crud元素中注入columns和data对象数组，即可创建一个最基础的表格，可以在columns对象中传入width属性来控制列宽。代码如下： -

+ @@ -19,11 +17,13 @@ + +` diff --git a/src/pages/demo/d2-crud/demo4/doc.md b/src/pages/demo/d2-crud/demo4/doc.md new file mode 100644 index 00000000..c68dfde1 --- /dev/null +++ b/src/pages/demo/d2-crud/demo4/doc.md @@ -0,0 +1 @@ +可以通过指定 `D2 Crud` 组件 `options` 对象中的 `rowClassName` 属性来为 `D2 Crud` 中的某一行添加 `class` ，表明该行处于某种状态。代码如下： \ No newline at end of file diff --git a/src/pages/demo/d2-crud/demo4/index.vue b/src/pages/demo/d2-crud/demo4/index.vue new file mode 100644 index 00000000..1fccbc24 --- /dev/null +++ b/src/pages/demo/d2-crud/demo4/index.vue @@ -0,0 +1,90 @@ + + + + + diff --git a/src/router/routes.js.REMOVED.git-id b/src/router/routes.js.REMOVED.git-id index 0638f659..b4c6f768 100644 --- a/src/router/routes.js.REMOVED.git-id +++ b/src/router/routes.js.REMOVED.git-id @@ -1 +1 @@ -3e7ad2954b31e28ac24d807efc726b59b2b1bd1b \ No newline at end of file +8b9146b67b3500e79e3547a57199c9c38fa840e1 \ No newline at end of file From f1379e707ddf66149e026e734375e2d3ae9efc27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E6=98=8A=E7=BF=94?= <673686754@qq.com> Date: Mon, 27 Aug 2018 14:30:53 +0800 Subject: [PATCH 11/78] =?UTF-8?q?d2-crud=20=E5=9B=BA=E5=AE=9A=E8=A1=A8?= =?UTF-8?q?=E5=A4=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 6e813a32d806c3153a4def37677c8a017d151e78 [formerly 6e813a32d806c3153a4def37677c8a017d151e78 [formerly 6e813a32d806c3153a4def37677c8a017d151e78 [formerly 6e813a32d806c3153a4def37677c8a017d151e78 [formerly 475b385a7c396bc6db5f2428cc40092996982ec1 [formerly 6f73e2109310b19624220cce2a255eddd82eb968]]]]] Former-commit-id: 70c7b245c35e82091c21637d73d51abd0558ff1a Former-commit-id: 1ab528bbc8f3ae48cb85b89fd988c2ff548a8bbf Former-commit-id: ed732b6c562827a6701f497bc516eb7b4aad00d1 [formerly 5fa2b1e80d94f1a0a43e112308f89d6467c9b64a] Former-commit-id: 213ba3df273d745cdbf9881c51f3181336b00c22 Former-commit-id: 37d6be18775d4cce10c02fd056a5e0452fdcc7c7 Former-commit-id: 0a40dfca74de82b788710cd5a591207bdee95c23 Former-commit-id: 0e85f76f6c36c9a03c99379055a137467f04f90d Former-commit-id: 01450edd0e3818da8e0ced6c6815073b25f6d3f8 --- docs/zh/ecosystem-d2-crud/example.md | 8 ++- src/menu/modules/demo-d2-crud.js | 3 +- src/pages/demo/d2-crud/demo5/code.js | 73 +++++++++++++++++++ src/pages/demo/d2-crud/demo5/doc.md | 1 + src/pages/demo/d2-crud/demo5/index.vue | 98 ++++++++++++++++++++++++++ src/router/routes.js.REMOVED.git-id | 2 +- 6 files changed, 180 insertions(+), 5 deletions(-) create mode 100644 src/pages/demo/d2-crud/demo5/code.js create mode 100644 src/pages/demo/d2-crud/demo5/doc.md create mode 100644 src/pages/demo/d2-crud/demo5/index.vue diff --git a/docs/zh/ecosystem-d2-crud/example.md b/docs/zh/ecosystem-d2-crud/example.md index c280f235..5aede81e 100644 --- a/docs/zh/ecosystem-d2-crud/example.md +++ b/docs/zh/ecosystem-d2-crud/example.md @@ -2,6 +2,8 @@ | 示例 | 代码与演示 | | --- | --- | -| 基础表格 | [点我查看](https://fairyever.gitee.io//d2-admin-preview/#/demo/d2-crud/demo1) | -| 带斑马纹表格 | [点我查看](https://fairyever.gitee.io//d2-admin-preview/#/demo/d2-crud/demo2) | -| 带边框表格 | [点我查看](https://fairyever.gitee.io//d2-admin-preview/#/demo/d2-crud/demo3) | +| 基础表格 | [点我查看](https://fairyever.gitee.io/d2-admin-preview/#/demo/d2-crud/demo1) | +| 带斑马纹表格 | [点我查看](https://fairyever.gitee.io/d2-admin-preview/#/demo/d2-crud/demo2) | +| 带边框表格 | [点我查看](https://fairyever.gitee.io/d2-admin-preview/#/demo/d2-crud/demo3) | +| 带状态表格 | [点我查看](https://fairyever.gitee.io/d2-admin-preview/#/demo/d2-crud/demo4) | +| 固定表头 | [点我查看](https://fairyever.gitee.io/d2-admin-preview/#/demo/d2-crud/demo5) | diff --git a/src/menu/modules/demo-d2-crud.js b/src/menu/modules/demo-d2-crud.js index 92a28350..10a97d98 100644 --- a/src/menu/modules/demo-d2-crud.js +++ b/src/menu/modules/demo-d2-crud.js @@ -7,6 +7,7 @@ export default { { path: `${pre}demo1`, title: '基础表格' }, { path: `${pre}demo2`, title: '带斑马纹表格' }, { path: `${pre}demo3`, title: '带边框表格' }, - { path: `${pre}demo4`, title: '带状态表格' } + { path: `${pre}demo4`, title: '带状态表格' }, + { path: `${pre}demo5`, title: '固定表头' } ])('/demo/d2-crud/') } diff --git a/src/pages/demo/d2-crud/demo5/code.js b/src/pages/demo/d2-crud/demo5/code.js new file mode 100644 index 00000000..03eaf9b3 --- /dev/null +++ b/src/pages/demo/d2-crud/demo5/code.js @@ -0,0 +1,73 @@ +export default ` + +` diff --git a/src/pages/demo/d2-crud/demo5/doc.md b/src/pages/demo/d2-crud/demo5/doc.md new file mode 100644 index 00000000..27edca6f --- /dev/null +++ b/src/pages/demo/d2-crud/demo5/doc.md @@ -0,0 +1 @@ +只要在 `options` 对象中定义了 `height` 属性，即可实现固定表头的表格，而不需要额外的代码。代码如下： \ No newline at end of file diff --git a/src/pages/demo/d2-crud/demo5/index.vue b/src/pages/demo/d2-crud/demo5/index.vue new file mode 100644 index 00000000..beaad070 --- /dev/null +++ b/src/pages/demo/d2-crud/demo5/index.vue @@ -0,0 +1,98 @@ + + + + + diff --git a/src/router/routes.js.REMOVED.git-id b/src/router/routes.js.REMOVED.git-id index b4c6f768..b88f596a 100644 --- a/src/router/routes.js.REMOVED.git-id +++ b/src/router/routes.js.REMOVED.git-id @@ -1 +1 @@ -8b9146b67b3500e79e3547a57199c9c38fa840e1 \ No newline at end of file +c6d31f3d245387ef99e06f8e7d1b7a66cd18121d \ No newline at end of file From b3619cae597ee13ecc6ce6c8269422b2e7a798e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E6=98=8A=E7=BF=94?= <673686754@qq.com> Date: Mon, 27 Aug 2018 15:03:21 +0800 Subject: [PATCH 12/78] =?UTF-8?q?d2-crud=20=E5=9B=BA=E5=AE=9A=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 9580078744e0754596b1fd6033b8f629bafc7586 [formerly 9580078744e0754596b1fd6033b8f629bafc7586 [formerly 9580078744e0754596b1fd6033b8f629bafc7586 [formerly 9580078744e0754596b1fd6033b8f629bafc7586 [formerly fe9bf4599ffb224a6983b1cc4434e6c484b4aaa8 [formerly d52c371ee5984497d6809af06233ab6943f03806]]]]] Former-commit-id: b36975c128f03f42e521e4b52f2ab0ec74d59d92 Former-commit-id: 0cf7a415bfc607d50498df9493dca7e9f06e40d8 Former-commit-id: 9ef0b33daa0298a5c8139c9929dcd711e3930a12 [formerly 19aab21ccb172f8eabc8213773af1568b544b02d] Former-commit-id: 5fd16510be907a6ad52fe17f19f4b300eb36ec9f Former-commit-id: 49627931456a9a76b3cc60ff51737af1359c5b76 Former-commit-id: a8086c569b6372ad64d7c5218193a7866d4aad9d Former-commit-id: 9913f1ff9966abe7df7c12d18019afdc2db1ac03 Former-commit-id: 7d8d50c492d0a008d3a041e323aac2746bfc08e1 --- docs/zh/ecosystem-d2-crud/example.md | 1 + src/menu/modules/demo-d2-crud.js | 3 +- src/pages/demo/d2-crud/demo6/code.js | 83 +++++++++++++++++++ src/pages/demo/d2-crud/demo6/doc.md | 1 + src/pages/demo/d2-crud/demo6/index.vue | 108 +++++++++++++++++++++++++ src/router/routes.js.REMOVED.git-id | 2 +- 6 files changed, 196 insertions(+), 2 deletions(-) create mode 100644 src/pages/demo/d2-crud/demo6/code.js create mode 100644 src/pages/demo/d2-crud/demo6/doc.md create mode 100644 src/pages/demo/d2-crud/demo6/index.vue diff --git a/docs/zh/ecosystem-d2-crud/example.md b/docs/zh/ecosystem-d2-crud/example.md index 5aede81e..3e0e55de 100644 --- a/docs/zh/ecosystem-d2-crud/example.md +++ b/docs/zh/ecosystem-d2-crud/example.md @@ -7,3 +7,4 @@ | 带边框表格 | [点我查看](https://fairyever.gitee.io/d2-admin-preview/#/demo/d2-crud/demo3) | | 带状态表格 | [点我查看](https://fairyever.gitee.io/d2-admin-preview/#/demo/d2-crud/demo4) | | 固定表头 | [点我查看](https://fairyever.gitee.io/d2-admin-preview/#/demo/d2-crud/demo5) | +| 固定列 | [点我查看](https://fairyever.gitee.io/d2-admin-preview/#/demo/d2-crud/demo6) | diff --git a/src/menu/modules/demo-d2-crud.js b/src/menu/modules/demo-d2-crud.js index 10a97d98..c0a064c7 100644 --- a/src/menu/modules/demo-d2-crud.js +++ b/src/menu/modules/demo-d2-crud.js @@ -8,6 +8,7 @@ export default { { path: `${pre}demo2`, title: '带斑马纹表格' }, { path: `${pre}demo3`, title: '带边框表格' }, { path: `${pre}demo4`, title: '带状态表格' }, - { path: `${pre}demo5`, title: '固定表头' } + { path: `${pre}demo5`, title: '固定表头' }, + { path: `${pre}demo6`, title: '固定列' } ])('/demo/d2-crud/') } diff --git a/src/pages/demo/d2-crud/demo6/code.js b/src/pages/demo/d2-crud/demo6/code.js new file mode 100644 index 00000000..ddc91de9 --- /dev/null +++ b/src/pages/demo/d2-crud/demo6/code.js @@ -0,0 +1,83 @@ +export default ` + +` diff --git a/src/pages/demo/d2-crud/demo6/doc.md b/src/pages/demo/d2-crud/demo6/doc.md new file mode 100644 index 00000000..1cf1f937 --- /dev/null +++ b/src/pages/demo/d2-crud/demo6/doc.md @@ -0,0 +1 @@ +固定列需要在 `columns` 对象数组中给需要固定的列传入 `fixed` 属性，它接受 `Boolean` 值或者 `left` `right` ，表示左边固定还是右边固定。代码如下： \ No newline at end of file diff --git a/src/pages/demo/d2-crud/demo6/index.vue b/src/pages/demo/d2-crud/demo6/index.vue new file mode 100644 index 00000000..b51f9add --- /dev/null +++ b/src/pages/demo/d2-crud/demo6/index.vue @@ -0,0 +1,108 @@ + + + + + diff --git a/src/router/routes.js.REMOVED.git-id b/src/router/routes.js.REMOVED.git-id index b88f596a..b6ed8a9a 100644 --- a/src/router/routes.js.REMOVED.git-id +++ b/src/router/routes.js.REMOVED.git-id @@ -1 +1 @@ -c6d31f3d245387ef99e06f8e7d1b7a66cd18121d \ No newline at end of file +acdde45a330bcab093eb4d812dc4966c000537f1 \ No newline at end of file From d0ce6dfbda03731280d561ff69320540e69edfe8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E6=98=8A=E7=BF=94?= <673686754@qq.com> Date: Mon, 27 Aug 2018 15:29:00 +0800 Subject: [PATCH 13/78] =?UTF-8?q?=E6=B5=81=E4=BD=93=E9=AB=98=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: f6112bddaca880e5b25b6d076cb47b2be34d3be2 [formerly f6112bddaca880e5b25b6d076cb47b2be34d3be2 [formerly f6112bddaca880e5b25b6d076cb47b2be34d3be2 [formerly f6112bddaca880e5b25b6d076cb47b2be34d3be2 [formerly 2231a0332db50fc3d5f5419f9728a6840bb86a7f [formerly cd2f56995f18d2ba2dd8c399eb5a7073d1f3c0b2]]]]] Former-commit-id: 764220cbe5dd9e4dea51c996bc4a7b08054f85fa Former-commit-id: da012d6e7f77fd67a2e88553cc810d6004fdbe95 Former-commit-id: e8edfd08b47e9f89017fa7ed4f33fa547c8a5815 [formerly 4e5a04247323aa39f49e1c762af2e0207ab16f96] Former-commit-id: e5a31fe57620c22c383134ee60dfd2204b022ad2 Former-commit-id: e0587df703027d63f9a1aaaabf947c6d3d46e9e7 Former-commit-id: 2976f4e2074104ca4e60697a3980cc105f8cce05 Former-commit-id: 198dbc73b4fd9f76fd5f119fb33880e507ff80fd Former-commit-id: bb6f045e56fd0cf30fa661ac1e68faed18b85600 --- src/menu/modules/demo-d2-crud.js | 3 +- src/pages/demo/d2-crud/demo7/code.js | 112 ++++++++++++++++++++ src/pages/demo/d2-crud/demo7/doc.md | 1 + src/pages/demo/d2-crud/demo7/index.vue | 137 +++++++++++++++++++++++++ src/router/routes.js.REMOVED.git-id | 2 +- 5 files changed, 253 insertions(+), 2 deletions(-) create mode 100644 src/pages/demo/d2-crud/demo7/code.js create mode 100644 src/pages/demo/d2-crud/demo7/doc.md create mode 100644 src/pages/demo/d2-crud/demo7/index.vue diff --git a/src/menu/modules/demo-d2-crud.js b/src/menu/modules/demo-d2-crud.js index c0a064c7..9a392617 100644 --- a/src/menu/modules/demo-d2-crud.js +++ b/src/menu/modules/demo-d2-crud.js @@ -9,6 +9,7 @@ export default { { path: `${pre}demo3`, title: '带边框表格' }, { path: `${pre}demo4`, title: '带状态表格' }, { path: `${pre}demo5`, title: '固定表头' }, - { path: `${pre}demo6`, title: '固定列' } + { path: `${pre}demo6`, title: '固定列' }, + { path: `${pre}demo7`, title: '流体高度' } ])('/demo/d2-crud/') } diff --git a/src/pages/demo/d2-crud/demo7/code.js b/src/pages/demo/d2-crud/demo7/code.js new file mode 100644 index 00000000..cb4d4e2c --- /dev/null +++ b/src/pages/demo/d2-crud/demo7/code.js @@ -0,0 +1,112 @@ +export default ` + +` diff --git a/src/pages/demo/d2-crud/demo7/doc.md b/src/pages/demo/d2-crud/demo7/doc.md new file mode 100644 index 00000000..264dba3b --- /dev/null +++ b/src/pages/demo/d2-crud/demo7/doc.md @@ -0,0 +1 @@ +通过在 `options` 对象设置 `maxHeight` 属性为 `D2 Crud` 指定最大高度。此时若表格所需的高度大于最大高度，则会显示一个滚动条。代码如下： \ No newline at end of file diff --git a/src/pages/demo/d2-crud/demo7/index.vue b/src/pages/demo/d2-crud/demo7/index.vue new file mode 100644 index 00000000..8a0547d3 --- /dev/null +++ b/src/pages/demo/d2-crud/demo7/index.vue @@ -0,0 +1,137 @@ + + + + + diff --git a/src/router/routes.js.REMOVED.git-id b/src/router/routes.js.REMOVED.git-id index b6ed8a9a..77481676 100644 --- a/src/router/routes.js.REMOVED.git-id +++ b/src/router/routes.js.REMOVED.git-id @@ -1 +1 @@ -acdde45a330bcab093eb4d812dc4966c000537f1 \ No newline at end of file +be070eaabb8ab1511f21970333d6d65ecf391e10 \ No newline at end of file From 135c1360e0c2fb286474d6597f97ea4e991d176f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E6=98=8A=E7=BF=94?= <673686754@qq.com> Date: Mon, 27 Aug 2018 15:48:13 +0800 Subject: [PATCH 14/78] =?UTF-8?q?d2-crud=20=E5=A4=9A=E7=BA=A7=E8=A1=A8?= =?UTF-8?q?=E5=A4=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 075bb98e3a8025983593f2643baa7cb279979010 [formerly 075bb98e3a8025983593f2643baa7cb279979010 [formerly 075bb98e3a8025983593f2643baa7cb279979010 [formerly 075bb98e3a8025983593f2643baa7cb279979010 [formerly 6f98a5af744930b23290a07491100e94b7106eb1 [formerly bf17e0ffe3ee74418b9520d24756a31a8f77e5e8]]]]] Former-commit-id: b1af95303057610e6c16551bff28cf4f80636713 Former-commit-id: c27e8e4e083b5e215901c02542db13c7b4f26ea0 Former-commit-id: 6b043daac144ba22b0edbb97f38c0e33eb0c0f71 [formerly 1ffb5790ae8c849a87e97cdf37acc899871616a4] Former-commit-id: 36ffdaa250b6222fdf7660b535c7f03049b90bec Former-commit-id: 52229a4b93280c5a058027a334b4d3ae66bad4eb Former-commit-id: e5409c0be931f296255904ab59aeb9fb7be94cac Former-commit-id: 2cb13f7e424933417bda248282335dfe81116a59 Former-commit-id: e6446076b0919738fae215a09eb64ffd3ebdfc4a --- docs/zh/ecosystem-d2-crud/example.md | 2 + src/menu/modules/demo-d2-crud.js | 3 +- src/pages/demo/d2-crud/demo8/code.js | 106 ++++++++++++++++++++ src/pages/demo/d2-crud/demo8/doc.md | 1 + src/pages/demo/d2-crud/demo8/index.vue | 131 +++++++++++++++++++++++++ src/router/routes.js.REMOVED.git-id | 2 +- 6 files changed, 243 insertions(+), 2 deletions(-) create mode 100644 src/pages/demo/d2-crud/demo8/code.js create mode 100644 src/pages/demo/d2-crud/demo8/doc.md create mode 100644 src/pages/demo/d2-crud/demo8/index.vue diff --git a/docs/zh/ecosystem-d2-crud/example.md b/docs/zh/ecosystem-d2-crud/example.md index 3e0e55de..e06d38fa 100644 --- a/docs/zh/ecosystem-d2-crud/example.md +++ b/docs/zh/ecosystem-d2-crud/example.md @@ -8,3 +8,5 @@ | 带状态表格 | [点我查看](https://fairyever.gitee.io/d2-admin-preview/#/demo/d2-crud/demo4) | | 固定表头 | [点我查看](https://fairyever.gitee.io/d2-admin-preview/#/demo/d2-crud/demo5) | | 固定列 | [点我查看](https://fairyever.gitee.io/d2-admin-preview/#/demo/d2-crud/demo6) | +| 流体高度 | [点我查看](https://fairyever.gitee.io/d2-admin-preview/#/demo/d2-crud/demo7) | +| 多级表头 | [点我查看](https://fairyever.gitee.io/d2-admin-preview/#/demo/d2-crud/demo8) | diff --git a/src/menu/modules/demo-d2-crud.js b/src/menu/modules/demo-d2-crud.js index 9a392617..1c8c4fc1 100644 --- a/src/menu/modules/demo-d2-crud.js +++ b/src/menu/modules/demo-d2-crud.js @@ -10,6 +10,7 @@ export default { { path: `${pre}demo4`, title: '带状态表格' }, { path: `${pre}demo5`, title: '固定表头' }, { path: `${pre}demo6`, title: '固定列' }, - { path: `${pre}demo7`, title: '流体高度' } + { path: `${pre}demo7`, title: '流体高度' }, + { path: `${pre}demo8`, title: '多级表头' } ])('/demo/d2-crud/') } diff --git a/src/pages/demo/d2-crud/demo8/code.js b/src/pages/demo/d2-crud/demo8/code.js new file mode 100644 index 00000000..aa3d63da --- /dev/null +++ b/src/pages/demo/d2-crud/demo8/code.js @@ -0,0 +1,106 @@ +export default ` + +` diff --git a/src/pages/demo/d2-crud/demo8/doc.md b/src/pages/demo/d2-crud/demo8/doc.md new file mode 100644 index 00000000..e7f46d62 --- /dev/null +++ b/src/pages/demo/d2-crud/demo8/doc.md @@ -0,0 +1 @@ +数据结构比较复杂的时候，可使用多级表头来展现数据的层次关系，只需在 `columns` 中使用 `children` 字段对子级表头进行嵌套即可。代码如下： \ No newline at end of file diff --git a/src/pages/demo/d2-crud/demo8/index.vue b/src/pages/demo/d2-crud/demo8/index.vue new file mode 100644 index 00000000..4acd007f --- /dev/null +++ b/src/pages/demo/d2-crud/demo8/index.vue @@ -0,0 +1,131 @@ + + + + + diff --git a/src/router/routes.js.REMOVED.git-id b/src/router/routes.js.REMOVED.git-id index 77481676..e3ebee15 100644 --- a/src/router/routes.js.REMOVED.git-id +++ b/src/router/routes.js.REMOVED.git-id @@ -1 +1 @@ -be070eaabb8ab1511f21970333d6d65ecf391e10 \ No newline at end of file +1b0ae5476017971f2818adc72e8f78713e1a64f7 \ No newline at end of file From b73ac2c4004a373df85aade00d43b425f3875228 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E6=98=8A=E7=BF=94?= <673686754@qq.com> Date: Mon, 27 Aug 2018 17:41:09 +0800 Subject: [PATCH 15/78] =?UTF-8?q?d2-crud=20=E5=8D=95=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: f77250d91b90e9dd3fdf374966c27936e5805e7a [formerly f77250d91b90e9dd3fdf374966c27936e5805e7a [formerly f77250d91b90e9dd3fdf374966c27936e5805e7a [formerly f77250d91b90e9dd3fdf374966c27936e5805e7a [formerly 5cced044ea5dda254eb1504a570e1b5b9afbb35e [formerly e0598d675e7026e265dcf4d5024f0f66ee9c1b39]]]]] Former-commit-id: 40e5719db55936e37f14ce5266a14d5e91ef23af Former-commit-id: c167dc8ab982f1ebf7ef6fcb6ee78c6ca15ed007 Former-commit-id: 193951ad3688cf7e83084340d1d7fe92acf906fa [formerly 74d1192239c08c93bbdffeb8b62e74aa85e3ae7f] Former-commit-id: fef418d170b006fb8416483d8896d4904ffb2134 Former-commit-id: 25f655562db68b4eda7bdbaa0c859e755607ae91 Former-commit-id: ffcca2588cc1853f7e9ba3235029f05cc71ce8e3 Former-commit-id: 2f93b38bd00d10a693a49f872bb81164b4221378 Former-commit-id: 51fbad2adf326e2789d4aa1931a4a138fb2dacd1 --- src/menu/modules/demo-d2-crud.js | 3 +- src/pages/demo/d2-crud/demo1/doc.md | 2 +- src/pages/demo/d2-crud/demo2/doc.md | 2 +- src/pages/demo/d2-crud/demo3/doc.md | 2 +- src/pages/demo/d2-crud/demo4/doc.md | 2 +- src/pages/demo/d2-crud/demo5/doc.md | 2 +- src/pages/demo/d2-crud/demo6/doc.md | 2 +- src/pages/demo/d2-crud/demo7/doc.md | 2 +- src/pages/demo/d2-crud/demo8/doc.md | 2 +- src/pages/demo/d2-crud/demo9/code.js | 64 ++++++++++++++++++ src/pages/demo/d2-crud/demo9/doc.md | 1 + src/pages/demo/d2-crud/demo9/index.vue | 90 ++++++++++++++++++++++++++ src/router/routes.js.REMOVED.git-id | 2 +- 13 files changed, 166 insertions(+), 10 deletions(-) create mode 100644 src/pages/demo/d2-crud/demo9/code.js create mode 100644 src/pages/demo/d2-crud/demo9/doc.md create mode 100644 src/pages/demo/d2-crud/demo9/index.vue diff --git a/src/menu/modules/demo-d2-crud.js b/src/menu/modules/demo-d2-crud.js index 1c8c4fc1..c3b4686d 100644 --- a/src/menu/modules/demo-d2-crud.js +++ b/src/menu/modules/demo-d2-crud.js @@ -11,6 +11,7 @@ export default { { path: `${pre}demo5`, title: '固定表头' }, { path: `${pre}demo6`, title: '固定列' }, { path: `${pre}demo7`, title: '流体高度' }, - { path: `${pre}demo8`, title: '多级表头' } + { path: `${pre}demo8`, title: '多级表头' }, + { path: `${pre}demo9`, title: '单选' } ])('/demo/d2-crud/') } diff --git a/src/pages/demo/d2-crud/demo1/doc.md b/src/pages/demo/d2-crud/demo1/doc.md index 4695daf4..600721ad 100644 --- a/src/pages/demo/d2-crud/demo1/doc.md +++ b/src/pages/demo/d2-crud/demo1/doc.md @@ -1 +1 @@ -在 `D2 Crud` 组件中传入 `columns` 和 `data` 对象数组，即可创建一个最基础的表格，可以在 `columns` 对象中传入 `width` 属性来控制列宽。代码如下： \ No newline at end of file +在 `D2 Crud` 组件中传入 `columns` 和 `data` 对象数组，即可创建一个最基础的表格，可以在 `columns` 对象中传入 `width` 属性来控制列宽。代码如下： diff --git a/src/pages/demo/d2-crud/demo2/doc.md b/src/pages/demo/d2-crud/demo2/doc.md index 6e554c65..71a1f7c0 100644 --- a/src/pages/demo/d2-crud/demo2/doc.md +++ b/src/pages/demo/d2-crud/demo2/doc.md @@ -1 +1 @@ -`options` 对象可以对表格进行配置，其中 `stripe` 属性可以创建带斑马纹的表格。它接受一个 `Boolean` ，设置为 `true` 即为启用。代码如下： \ No newline at end of file +`options` 对象可以对表格进行配置，其中 `stripe` 属性可以创建带斑马纹的表格。它接受一个 `Boolean` ，设置为 `true` 即为启用。代码如下： diff --git a/src/pages/demo/d2-crud/demo3/doc.md b/src/pages/demo/d2-crud/demo3/doc.md index 56d5d43b..0ff20774 100644 --- a/src/pages/demo/d2-crud/demo3/doc.md +++ b/src/pages/demo/d2-crud/demo3/doc.md @@ -1 +1 @@ -默认情况下， `D2 Crud` 是不具有竖直方向的边框的，如果需要，可以在 `options` 对象中传入一个 `border` 属性，它接受一个 `Boolean` ，设置为 `true` 即可启用。代码如下： \ No newline at end of file +默认情况下， `D2 Crud` 是不具有竖直方向的边框的，如果需要，可以在 `options` 对象中传入一个 `border` 属性，它接受一个 `Boolean` ，设置为 `true` 即可启用。代码如下： diff --git a/src/pages/demo/d2-crud/demo4/doc.md b/src/pages/demo/d2-crud/demo4/doc.md index c68dfde1..ef0b14d1 100644 --- a/src/pages/demo/d2-crud/demo4/doc.md +++ b/src/pages/demo/d2-crud/demo4/doc.md @@ -1 +1 @@ -可以通过指定 `D2 Crud` 组件 `options` 对象中的 `rowClassName` 属性来为 `D2 Crud` 中的某一行添加 `class` ，表明该行处于某种状态。代码如下： \ No newline at end of file +可以通过指定 `D2 Crud` 组件 `options` 对象中的 `rowClassName` 属性来为 `D2 Crud` 中的某一行添加 `class` ，表明该行处于某种状态。代码如下： diff --git a/src/pages/demo/d2-crud/demo5/doc.md b/src/pages/demo/d2-crud/demo5/doc.md index 27edca6f..bae31834 100644 --- a/src/pages/demo/d2-crud/demo5/doc.md +++ b/src/pages/demo/d2-crud/demo5/doc.md @@ -1 +1 @@ -只要在 `options` 对象中定义了 `height` 属性，即可实现固定表头的表格，而不需要额外的代码。代码如下： \ No newline at end of file +只要在 `options` 对象中定义了 `height` 属性，即可实现固定表头的表格，而不需要额外的代码。代码如下： diff --git a/src/pages/demo/d2-crud/demo6/doc.md b/src/pages/demo/d2-crud/demo6/doc.md index 1cf1f937..e6ea2834 100644 --- a/src/pages/demo/d2-crud/demo6/doc.md +++ b/src/pages/demo/d2-crud/demo6/doc.md @@ -1 +1 @@ -固定列需要在 `columns` 对象数组中给需要固定的列传入 `fixed` 属性，它接受 `Boolean` 值或者 `left` `right` ，表示左边固定还是右边固定。代码如下： \ No newline at end of file +固定列需要在 `columns` 对象数组中给需要固定的列传入 `fixed` 属性，它接受 `Boolean` 值或者 `left` `right` ，表示左边固定还是右边固定。代码如下： diff --git a/src/pages/demo/d2-crud/demo7/doc.md b/src/pages/demo/d2-crud/demo7/doc.md index 264dba3b..79a8afe0 100644 --- a/src/pages/demo/d2-crud/demo7/doc.md +++ b/src/pages/demo/d2-crud/demo7/doc.md @@ -1 +1 @@ -通过在 `options` 对象设置 `maxHeight` 属性为 `D2 Crud` 指定最大高度。此时若表格所需的高度大于最大高度，则会显示一个滚动条。代码如下： \ No newline at end of file +通过在 `options` 对象设置 `maxHeight` 属性为 `D2 Crud` 指定最大高度。此时若表格所需的高度大于最大高度，则会显示一个滚动条。代码如下： diff --git a/src/pages/demo/d2-crud/demo8/doc.md b/src/pages/demo/d2-crud/demo8/doc.md index e7f46d62..31fcb94e 100644 --- a/src/pages/demo/d2-crud/demo8/doc.md +++ b/src/pages/demo/d2-crud/demo8/doc.md @@ -1 +1 @@ -数据结构比较复杂的时候，可使用多级表头来展现数据的层次关系，只需在 `columns` 中使用 `children` 字段对子级表头进行嵌套即可。代码如下： \ No newline at end of file +数据结构比较复杂的时候，可使用多级表头来展现数据的层次关系，只需在 `columns` 中使用 `children` 字段对子级表头进行嵌套即可。代码如下： diff --git a/src/pages/demo/d2-crud/demo9/code.js b/src/pages/demo/d2-crud/demo9/code.js new file mode 100644 index 00000000..c4b03ee9 --- /dev/null +++ b/src/pages/demo/d2-crud/demo9/code.js @@ -0,0 +1,64 @@ +export default ` + +` diff --git a/src/pages/demo/d2-crud/demo9/doc.md b/src/pages/demo/d2-crud/demo9/doc.md new file mode 100644 index 00000000..a6efc561 --- /dev/null +++ b/src/pages/demo/d2-crud/demo9/doc.md @@ -0,0 +1 @@ +`D2 Crud` 组件提供了单选的支持，只需要在 `options` 对象中将 `highlightCurrentRow` 属性设为 `true` 即可实现单选。之后由 `current-change` 事件来管理选中时触发的事件，它会传入 `currentRow` 和 `oldCurrentRow`。如果需要显示索引，需要配置 `index-row` 属性。代码如下： diff --git a/src/pages/demo/d2-crud/demo9/index.vue b/src/pages/demo/d2-crud/demo9/index.vue new file mode 100644 index 00000000..f1ba5874 --- /dev/null +++ b/src/pages/demo/d2-crud/demo9/index.vue @@ -0,0 +1,90 @@ + + + + + diff --git a/src/router/routes.js.REMOVED.git-id b/src/router/routes.js.REMOVED.git-id index e3ebee15..85d33efa 100644 --- a/src/router/routes.js.REMOVED.git-id +++ b/src/router/routes.js.REMOVED.git-id @@ -1 +1 @@ -1b0ae5476017971f2818adc72e8f78713e1a64f7 \ No newline at end of file +b8b55dc98d4d6c94c6fc66cd1e953f7637936ed4 \ No newline at end of file From 2b267d5c3e978ae4f688bee67634ed07fa75e6c2 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Mon, 27 Aug 2018 22:44:29 +0800 Subject: [PATCH 16/78] =?UTF-8?q?=E4=B8=BA=20CRUD=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=BD=A9=E8=89=B2=E8=8F=9C=E5=8D=95=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: bdca798f5056859f38d757a26a796d1bb63552aa [formerly bdca798f5056859f38d757a26a796d1bb63552aa [formerly bdca798f5056859f38d757a26a796d1bb63552aa [formerly bdca798f5056859f38d757a26a796d1bb63552aa [formerly b079c3534c1f0d23716df4f4204bbe92b6bafed3 [formerly 1d4277d69368fc0b2c63728d88a71322028b8dba]]]]] Former-commit-id: 5e49e9230ba68c0a601245ee411154c0fd53ba6a Former-commit-id: 9090d5c67ec347b110e27e917a0ff7fe8026eebe Former-commit-id: 2654a70c4a66f347a3edf746e79a4f806fcfbd89 [formerly 74779e4b0671a2f5e0d1364591ac15d6afb30ca5] Former-commit-id: 378939089aaf8d723b84767d6ceefd1167a248e3 Former-commit-id: 99dce6ded35003802c02906f0235f20535e3013d Former-commit-id: f14493430340432913db8daab1e1b39d878ae0a9 Former-commit-id: fed18da8917574f43887d167b0ba7ebab4f96af4 Former-commit-id: 89c215ec3fec8f633f128aa503fc8788fb6380a2 --- .../style/theme/theme.scss.REMOVED.git-id | 2 +- src/assets/svg-icons/icons/add.svg | 2 +- src/assets/svg-icons/icons/alarm.svg | 2 +- src/assets/svg-icons/icons/camera.svg | 2 +- .../icons/{d2admin.svg => d2-admin.svg} | 2 +- src/assets/svg-icons/icons/d2-crud.svg | 26 +++++++++++++++++++ src/assets/svg-icons/icons/history.svg | 2 +- src/assets/svg-icons/icons/like.svg | 2 +- src/assets/svg-icons/icons/love.svg | 2 +- src/assets/svg-icons/icons/message.svg | 2 +- src/assets/svg-icons/icons/notice.svg | 2 +- src/assets/svg-icons/icons/search.svg | 2 +- src/assets/svg-icons/icons/share.svg | 2 +- src/assets/svg-icons/icons/star.svg | 2 +- src/assets/svg-icons/icons/user.svg | 2 +- .../components/components/menu-item/index.vue | 5 ++-- .../components/components/menu-sub/index.vue | 5 ++-- src/menu/index.js | 2 +- src/menu/modules/demo-d2-crud.js | 2 +- src/pages/index/page.vue | 2 +- 20 files changed, 49 insertions(+), 21 deletions(-) rename src/assets/svg-icons/icons/{d2admin.svg => d2-admin.svg} (94%) create mode 100644 src/assets/svg-icons/icons/d2-crud.svg diff --git a/src/assets/style/theme/theme.scss.REMOVED.git-id b/src/assets/style/theme/theme.scss.REMOVED.git-id index 9ba9d43f..276f4bb5 100644 --- a/src/assets/style/theme/theme.scss.REMOVED.git-id +++ b/src/assets/style/theme/theme.scss.REMOVED.git-id @@ -1 +1 @@ -bfee5e91a3b150e04d9f24695061f6f3e7c59342 \ No newline at end of file +5e28075542c22533bf13f61de9a2eaf52bf18157 \ No newline at end of file diff --git a/src/assets/svg-icons/icons/add.svg b/src/assets/svg-icons/icons/add.svg index 7d29bd88..80efd49a 100644 --- a/src/assets/svg-icons/icons/add.svg +++ b/src/assets/svg-icons/icons/add.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/svg-icons/icons/alarm.svg b/src/assets/svg-icons/icons/alarm.svg index 5878dd72..d248d0ad 100644 --- a/src/assets/svg-icons/icons/alarm.svg +++ b/src/assets/svg-icons/icons/alarm.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/svg-icons/icons/camera.svg b/src/assets/svg-icons/icons/camera.svg index ea79a254..e1d6845d 100644 --- a/src/assets/svg-icons/icons/camera.svg +++ b/src/assets/svg-icons/icons/camera.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/svg-icons/icons/d2admin.svg b/src/assets/svg-icons/icons/d2-admin.svg similarity index 94% rename from src/assets/svg-icons/icons/d2admin.svg rename to src/assets/svg-icons/icons/d2-admin.svg index 3bdef832..c2c3c07d 100644 --- a/src/assets/svg-icons/icons/d2admin.svg +++ b/src/assets/svg-icons/icons/d2-admin.svg @@ -1,5 +1,5 @@ - + D2Admin diff --git a/src/assets/svg-icons/icons/d2-crud.svg b/src/assets/svg-icons/icons/d2-crud.svg new file mode 100644 index 00000000..799b27af --- /dev/null +++ b/src/assets/svg-icons/icons/d2-crud.svg @@ -0,0 +1,26 @@ + + + + Created with Sketch. + + + \ No newline at end of file diff --git a/src/assets/svg-icons/icons/history.svg b/src/assets/svg-icons/icons/history.svg index db146145..62994ae4 100644 --- a/src/assets/svg-icons/icons/history.svg +++ b/src/assets/svg-icons/icons/history.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/svg-icons/icons/like.svg b/src/assets/svg-icons/icons/like.svg index 7d81c7cb..0bd4716a 100644 --- a/src/assets/svg-icons/icons/like.svg +++ b/src/assets/svg-icons/icons/like.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/svg-icons/icons/love.svg b/src/assets/svg-icons/icons/love.svg index 09833060..e81987ee 100644 --- a/src/assets/svg-icons/icons/love.svg +++ b/src/assets/svg-icons/icons/love.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/svg-icons/icons/message.svg b/src/assets/svg-icons/icons/message.svg index 828cfd86..83018750 100644 --- a/src/assets/svg-icons/icons/message.svg +++ b/src/assets/svg-icons/icons/message.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/svg-icons/icons/notice.svg b/src/assets/svg-icons/icons/notice.svg index c8fc6365..b8664fb4 100644 --- a/src/assets/svg-icons/icons/notice.svg +++ b/src/assets/svg-icons/icons/notice.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/svg-icons/icons/search.svg b/src/assets/svg-icons/icons/search.svg index c5a1b2b3..e27f8ddc 100644 --- a/src/assets/svg-icons/icons/search.svg +++ b/src/assets/svg-icons/icons/search.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/svg-icons/icons/share.svg b/src/assets/svg-icons/icons/share.svg index b0dbe7f1..b5db8181 100644 --- a/src/assets/svg-icons/icons/share.svg +++ b/src/assets/svg-icons/icons/share.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/svg-icons/icons/star.svg b/src/assets/svg-icons/icons/star.svg index c3010907..64909a57 100644 --- a/src/assets/svg-icons/icons/star.svg +++ b/src/assets/svg-icons/icons/star.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/svg-icons/icons/user.svg b/src/assets/svg-icons/icons/user.svg index ce7b9f75..063baee5 100644 --- a/src/assets/svg-icons/icons/user.svg +++ b/src/assets/svg-icons/icons/user.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/layout/header-aside/components/components/menu-item/index.vue b/src/layout/header-aside/components/components/menu-item/index.vue index f1608892..784e9720 100644 --- a/src/layout/header-aside/components/components/menu-item/index.vue +++ b/src/layout/header-aside/components/components/menu-item/index.vue @@ -1,9 +1,10 @@ - + + {{menu.title || '未命名菜单'}} diff --git a/src/layout/header-aside/components/components/menu-sub/index.vue b/src/layout/header-aside/components/components/menu-sub/index.vue index ca46841d..05abe60c 100644 --- a/src/layout/header-aside/components/components/menu-sub/index.vue +++ b/src/layout/header-aside/components/components/menu-sub/index.vue @@ -2,9 +2,10 @@ diff --git a/src/menu/index.js b/src/menu/index.js index 70237d71..fcb55855 100644 --- a/src/menu/index.js +++ b/src/menu/index.js @@ -69,7 +69,7 @@ export const menuHeader = [ }, { title: 'svg 菜单图标', - iconSvg: 'd2admin', + iconSvg: 'd2-admin', children: [ { title: 'add', iconSvg: 'add' }, { title: 'alarm', iconSvg: 'alarm' }, diff --git a/src/menu/modules/demo-d2-crud.js b/src/menu/modules/demo-d2-crud.js index c3b4686d..8a698fd5 100644 --- a/src/menu/modules/demo-d2-crud.js +++ b/src/menu/modules/demo-d2-crud.js @@ -1,7 +1,7 @@ export default { path: '/demo/d2-crud', title: 'D2 CRUD', - icon: 'table', + iconSvg: 'd2-crud', children: (pre => [ { path: `${pre}index`, title: 'D2 CRUD 首页', icon: 'home' }, { path: `${pre}demo1`, title: '基础表格' }, diff --git a/src/pages/index/page.vue b/src/pages/index/page.vue index b7748973..365e257d 100644 --- a/src/pages/index/page.vue +++ b/src/pages/index/page.vue @@ -3,7 +3,7 @@ - + @@ -21,8 +22,12 @@ export default { methods: { focus () { this.$nextTick(() => { + this.input = '' this.$refs.input.focus() }) + }, + handleEsc () { + this.$emit('close') } } } diff --git a/src/layout/header-aside/layout.vue b/src/layout/header-aside/layout.vue index 057750bf..2182f712 100644 --- a/src/layout/header-aside/layout.vue +++ b/src/layout/header-aside/layout.vue @@ -20,7 +20,7 @@
- + @@ -41,7 +41,9 @@
- +
@@ -66,6 +68,7 @@ diff --git a/src/store/modules/d2admin/modules/search.js b/src/store/modules/d2admin/modules/search.js index 40a84c56..edcf038c 100644 --- a/src/store/modules/d2admin/modules/search.js +++ b/src/store/modules/d2admin/modules/search.js @@ -4,7 +4,7 @@ export default { namespaced: true, state: { // 搜索面板激活状态 - active: false, + active: true, hotkey: { open: setting.hotkey.search.open, close: setting.hotkey.search.close From d3b69493c9271eb8d7b864f1b2d62b0ccb4403fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E6=98=8A=E7=BF=94?= <673686754@qq.com> Date: Tue, 28 Aug 2018 14:11:54 +0800 Subject: [PATCH 29/78] =?UTF-8?q?d2-crud=20=E6=96=B0=E5=A2=9E=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: b2a7ca90c75271d2368a759e265d1807dcfc85b7 [formerly b2a7ca90c75271d2368a759e265d1807dcfc85b7 [formerly b2a7ca90c75271d2368a759e265d1807dcfc85b7 [formerly b2a7ca90c75271d2368a759e265d1807dcfc85b7 [formerly c2eba24eed16298a504833fa000cd2e424ced688 [formerly 14318fbe903cfc32e92981ee5a50b0e24c23db8c]]]]] Former-commit-id: 5b4c4349cd880205b495ba2a8075b35734f8010e Former-commit-id: be5b6ad6e0456822b02dae0d45b7d1dac7ea3bff Former-commit-id: 2df9d50db37b8589da8afb3199c6743d6f05c78c [formerly 74c6bbfea013df936facd2210421975d1c34253e] Former-commit-id: 7625e4b8de390d6982db80c7e593c10a3ae5fa03 Former-commit-id: fcd38a9efda1d40bf895a3bb19f13d3369955805 Former-commit-id: 40e9a9f6a730af2cbdc30c97db7b7c75518edd47 Former-commit-id: feb0bff56853765a41060fdcc45b2d593e46500a Former-commit-id: c463b5f0ce4abd07bcc7a75bead49f379509b0af --- docs/zh/ecosystem-d2-crud/example.md | 8 ++ src/menu/modules/demo-d2-crud.js | 6 ++ src/pages/demo/d2-crud/demo16/code.js | 103 ++++++++++++++++++++ src/pages/demo/d2-crud/demo16/doc.md | 1 + src/pages/demo/d2-crud/demo16/index.vue | 119 ++++++++++++++++++++++++ src/router/routes.js.REMOVED.git-id | 2 +- 6 files changed, 238 insertions(+), 1 deletion(-) create mode 100644 src/pages/demo/d2-crud/demo16/code.js create mode 100644 src/pages/demo/d2-crud/demo16/doc.md create mode 100644 src/pages/demo/d2-crud/demo16/index.vue diff --git a/docs/zh/ecosystem-d2-crud/example.md b/docs/zh/ecosystem-d2-crud/example.md index 6fcd490d..2581646a 100644 --- a/docs/zh/ecosystem-d2-crud/example.md +++ b/docs/zh/ecosystem-d2-crud/example.md @@ -1,5 +1,7 @@ # 示例 +## 基础功能 + | 示例 | 代码与演示 | | --- | --- | | 基础表格 | [点我查看](https://fairyever.gitee.io/d2-admin-preview/#/demo/d2-crud/demo1) | @@ -17,3 +19,9 @@ | 表尾合计行 | [点我查看](https://fairyever.gitee.io/d2-admin-preview/#/demo/d2-crud/demo13) | | 合并行 | [点我查看](https://fairyever.gitee.io/d2-admin-preview/#/demo/d2-crud/demo14) | | 合并列 | [点我查看](https://fairyever.gitee.io/d2-admin-preview/#/demo/d2-crud/demo15) | + +## 数据操作 + +| 示例 | 代码与演示 | +| --- | --- | +| 新增数据 | [点我查看](https://fairyever.gitee.io/d2-admin-preview/#/demo/d2-crud/demo16) | diff --git a/src/menu/modules/demo-d2-crud.js b/src/menu/modules/demo-d2-crud.js index c3e356ba..74b9f3c8 100644 --- a/src/menu/modules/demo-d2-crud.js +++ b/src/menu/modules/demo-d2-crud.js @@ -23,6 +23,12 @@ export default { { path: `${pre}demo14`, title: '合并行' }, { path: `${pre}demo15`, title: '合并列' } ] + }, + { + title: '数据操作', + children: [ + { path: `${pre}demo16`, title: '新增数据' } + ] } ])('/demo/d2-crud/') } diff --git a/src/pages/demo/d2-crud/demo16/code.js b/src/pages/demo/d2-crud/demo16/code.js new file mode 100644 index 00000000..593ffeac --- /dev/null +++ b/src/pages/demo/d2-crud/demo16/code.js @@ -0,0 +1,103 @@ +export default ` + +` diff --git a/src/pages/demo/d2-crud/demo16/doc.md b/src/pages/demo/d2-crud/demo16/doc.md new file mode 100644 index 00000000..b100b4c8 --- /dev/null +++ b/src/pages/demo/d2-crud/demo16/doc.md @@ -0,0 +1 @@ +通过给 `D2 Crud` 传入 `addMode` 可开启新增模式，需要传入 `form-template` 来为新增的表单添加模板，向`form-options` 中传入 `labelWidth` 和 `labelPosition` 来控制表单中label的显示, `saveLoading` 则控制保存按钮的loading状态，`addButton` 可以控制表格顶部新增按钮的样式， `row-add` 事件控制数据新增，接收两个参数： `row` 是当前新增行的数据， `done` 用于控制保存成功，可以在 `done()` 之前加入自己的逻辑代码。代码如下： diff --git a/src/pages/demo/d2-crud/demo16/index.vue b/src/pages/demo/d2-crud/demo16/index.vue new file mode 100644 index 00000000..e9294f9e --- /dev/null +++ b/src/pages/demo/d2-crud/demo16/index.vue @@ -0,0 +1,119 @@ + + + diff --git a/src/router/routes.js.REMOVED.git-id b/src/router/routes.js.REMOVED.git-id index b83c1c2d..071f176c 100644 --- a/src/router/routes.js.REMOVED.git-id +++ b/src/router/routes.js.REMOVED.git-id @@ -1 +1 @@ -4ff3fa0ccc8c0d917bfa056ce7db7f4d9d4fb8c9 \ No newline at end of file +0770629125d5b5442d63722105a27eff9dac7365 \ No newline at end of file From 5100743edb1f7ad5f485188ef7d83fe6241942a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E6=98=8A=E7=BF=94?= <673686754@qq.com> Date: Tue, 28 Aug 2018 14:44:42 +0800 Subject: [PATCH 30/78] =?UTF-8?q?d2-crud=20=E4=BF=AE=E6=94=B9=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 33b78eff73ded5f37e63625cba773140bdcb1160 [formerly 33b78eff73ded5f37e63625cba773140bdcb1160 [formerly 33b78eff73ded5f37e63625cba773140bdcb1160 [formerly 33b78eff73ded5f37e63625cba773140bdcb1160 [formerly ec11f841676b26c24a382cde36b13ad26b6079b2 [formerly ac9073f448ef5e8c50351bbe3542aeda745afee4]]]]] Former-commit-id: 53b90c5f87c7c3260568721a63264a1c09949fd8 Former-commit-id: b8e27380091427969a613d0d211f9834250a9740 Former-commit-id: 4f57987fe76d14a144228bc84f9c2c0a5a964c31 [formerly 419b150851ece64259038ca9873e2e22298ff639] Former-commit-id: 5880285fcf0a30f101dc2405d61f681e14f0dc9a Former-commit-id: a6a0503ba6e4d90e40aaf7d53221b9dd0f42d80a Former-commit-id: ae0cae44274a1cc0d868c1f61b591c1ecb9417de Former-commit-id: 752bbb601fdac2f47ca300668d4ea0723e92f1b6 Former-commit-id: c670834cd4fa851ae54c6ac9766ab0850787cc4a --- docs/zh/ecosystem-d2-crud/example.md | 1 + src/menu/modules/demo-d2-crud.js | 3 +- src/pages/demo/d2-crud/demo17/code.js | 108 +++++++++++++++++++++ src/pages/demo/d2-crud/demo17/doc.md | 1 + src/pages/demo/d2-crud/demo17/index.vue | 124 ++++++++++++++++++++++++ src/router/routes.js.REMOVED.git-id | 2 +- 6 files changed, 237 insertions(+), 2 deletions(-) create mode 100644 src/pages/demo/d2-crud/demo17/code.js create mode 100644 src/pages/demo/d2-crud/demo17/doc.md create mode 100644 src/pages/demo/d2-crud/demo17/index.vue diff --git a/docs/zh/ecosystem-d2-crud/example.md b/docs/zh/ecosystem-d2-crud/example.md index 2581646a..1c1ee9a4 100644 --- a/docs/zh/ecosystem-d2-crud/example.md +++ b/docs/zh/ecosystem-d2-crud/example.md @@ -25,3 +25,4 @@ | 示例 | 代码与演示 | | --- | --- | | 新增数据 | [点我查看](https://fairyever.gitee.io/d2-admin-preview/#/demo/d2-crud/demo16) | +| 修改数据 | [点我查看](https://fairyever.gitee.io/d2-admin-preview/#/demo/d2-crud/demo17) | diff --git a/src/menu/modules/demo-d2-crud.js b/src/menu/modules/demo-d2-crud.js index 74b9f3c8..2ac45723 100644 --- a/src/menu/modules/demo-d2-crud.js +++ b/src/menu/modules/demo-d2-crud.js @@ -27,7 +27,8 @@ export default { { title: '数据操作', children: [ - { path: `${pre}demo16`, title: '新增数据' } + { path: `${pre}demo16`, title: '新增数据' }, + { path: `${pre}demo17`, title: '修改数据' } ] } ])('/demo/d2-crud/') diff --git a/src/pages/demo/d2-crud/demo17/code.js b/src/pages/demo/d2-crud/demo17/code.js new file mode 100644 index 00000000..59d69469 --- /dev/null +++ b/src/pages/demo/d2-crud/demo17/code.js @@ -0,0 +1,108 @@ +export default ` + +` diff --git a/src/pages/demo/d2-crud/demo17/doc.md b/src/pages/demo/d2-crud/demo17/doc.md new file mode 100644 index 00000000..4c503e83 --- /dev/null +++ b/src/pages/demo/d2-crud/demo17/doc.md @@ -0,0 +1 @@ +通过给 `D2 Crud` 传入 `rowHandle` 可开启表格操作列，传入 `columnHeader` 可以自定义操作列的表头，传入 `edit` 对象可以开启编辑模式，需要传入 `form-template` 来为编辑添加模板，向`form-options` 中传入 `labelWidth` 和 `labelPosition` 来控制表单中label的显示, `saveLoading` 则控制保存按钮的loading状态， `row-edit` 事件控制数据编辑，参数： `index` 是当前编辑行的索引， `row` 是当前编辑行的数据， `done` 用于控制编辑成功，可以在 `done()` 之前加入自己的逻辑代码。代码如下： diff --git a/src/pages/demo/d2-crud/demo17/index.vue b/src/pages/demo/d2-crud/demo17/index.vue new file mode 100644 index 00000000..1068638c --- /dev/null +++ b/src/pages/demo/d2-crud/demo17/index.vue @@ -0,0 +1,124 @@ + + + diff --git a/src/router/routes.js.REMOVED.git-id b/src/router/routes.js.REMOVED.git-id index 071f176c..92df163e 100644 --- a/src/router/routes.js.REMOVED.git-id +++ b/src/router/routes.js.REMOVED.git-id @@ -1 +1 @@ -0770629125d5b5442d63722105a27eff9dac7365 \ No newline at end of file +3bf22d5f8e04524c6e8b3a3e5dc97fb66ea3f51d \ No newline at end of file From 0041a18c642746e391bc71430af9223b48c35413 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E6=98=8A=E7=BF=94?= <673686754@qq.com> Date: Tue, 28 Aug 2018 15:12:51 +0800 Subject: [PATCH 31/78] =?UTF-8?q?d2-crud=20=E5=88=A0=E9=99=A4=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 019b2c66555c4dcac4edba4164884d1aaee56ccb [formerly 019b2c66555c4dcac4edba4164884d1aaee56ccb [formerly 019b2c66555c4dcac4edba4164884d1aaee56ccb [formerly 019b2c66555c4dcac4edba4164884d1aaee56ccb [formerly 38a3534cc94754468535b0c293c453cad8ef9f20 [formerly 5c60b7989654eab0f90525377789458ee1a692e8]]]]] Former-commit-id: 16899b32bb2702388c4c2cd81a1681a4c7fff9d4 Former-commit-id: 1b1b9df9690201ae4086653f17297325c33097b1 Former-commit-id: 149d2dede6f2726968387feb44dd1d7f7df7e397 [formerly 5cb19844aa5e80a91caa18224a1e0b00c102e67b] Former-commit-id: 8e4cb42d46522b3e3fc284e2d702febc7ea4acf0 Former-commit-id: b6ae22c084f04e7ae53317c1098bec48aef8e40d Former-commit-id: 393fcda757535a4dfdae84332c120e5f110f3af2 Former-commit-id: 80c4b506b80febb5474a95f4473f64cdb353b75b Former-commit-id: 47f57c3c4b5cc2aedac456d61bed1a88d9585bd4 --- docs/zh/ecosystem-d2-crud/example.md | 1 + src/menu/modules/demo-d2-crud.js | 3 +- src/pages/demo/d2-crud/demo18/code.js | 76 ++++++++++++++++++++ src/pages/demo/d2-crud/demo18/doc.md | 1 + src/pages/demo/d2-crud/demo18/index.vue | 92 +++++++++++++++++++++++++ src/router/routes.js.REMOVED.git-id | 2 +- 6 files changed, 173 insertions(+), 2 deletions(-) create mode 100644 src/pages/demo/d2-crud/demo18/code.js create mode 100644 src/pages/demo/d2-crud/demo18/doc.md create mode 100644 src/pages/demo/d2-crud/demo18/index.vue diff --git a/docs/zh/ecosystem-d2-crud/example.md b/docs/zh/ecosystem-d2-crud/example.md index 1c1ee9a4..5b6ff793 100644 --- a/docs/zh/ecosystem-d2-crud/example.md +++ b/docs/zh/ecosystem-d2-crud/example.md @@ -26,3 +26,4 @@ | --- | --- | | 新增数据 | [点我查看](https://fairyever.gitee.io/d2-admin-preview/#/demo/d2-crud/demo16) | | 修改数据 | [点我查看](https://fairyever.gitee.io/d2-admin-preview/#/demo/d2-crud/demo17) | +| 删除数据 | [点我查看](https://fairyever.gitee.io/d2-admin-preview/#/demo/d2-crud/demo18) | diff --git a/src/menu/modules/demo-d2-crud.js b/src/menu/modules/demo-d2-crud.js index 2ac45723..c1306c6b 100644 --- a/src/menu/modules/demo-d2-crud.js +++ b/src/menu/modules/demo-d2-crud.js @@ -28,7 +28,8 @@ export default { title: '数据操作', children: [ { path: `${pre}demo16`, title: '新增数据' }, - { path: `${pre}demo17`, title: '修改数据' } + { path: `${pre}demo17`, title: '修改数据' }, + { path: `${pre}demo18`, title: '删除数据' } ] } ])('/demo/d2-crud/') diff --git a/src/pages/demo/d2-crud/demo18/code.js b/src/pages/demo/d2-crud/demo18/code.js new file mode 100644 index 00000000..45d4e564 --- /dev/null +++ b/src/pages/demo/d2-crud/demo18/code.js @@ -0,0 +1,76 @@ +export default ` + +` diff --git a/src/pages/demo/d2-crud/demo18/doc.md b/src/pages/demo/d2-crud/demo18/doc.md new file mode 100644 index 00000000..273fe0c9 --- /dev/null +++ b/src/pages/demo/d2-crud/demo18/doc.md @@ -0,0 +1 @@ +通过给 `D2 Crud` 传入 `rowHandle` 可开启表格操作列，传入 `remove` 对象可以开启删除模式，`confirm` 属性的值为 `Boolean` 类型，控制删除前是否弹出confirm框进行提示， `row-remove` 事件控制数据删除，参数： `index` 是当前删除行的索引， `row` 是当前删除行的数据， `done` 用于控制删除成功，可以在 `done()` 之前加入自己的逻辑代码。代码如下： diff --git a/src/pages/demo/d2-crud/demo18/index.vue b/src/pages/demo/d2-crud/demo18/index.vue new file mode 100644 index 00000000..5c42ffe4 --- /dev/null +++ b/src/pages/demo/d2-crud/demo18/index.vue @@ -0,0 +1,92 @@ + + + diff --git a/src/router/routes.js.REMOVED.git-id b/src/router/routes.js.REMOVED.git-id index 92df163e..1c893735 100644 --- a/src/router/routes.js.REMOVED.git-id +++ b/src/router/routes.js.REMOVED.git-id @@ -1 +1 @@ -3bf22d5f8e04524c6e8b3a3e5dc97fb66ea3f51d \ No newline at end of file +4f35ee266511f772688d28a0c6d4b7a56c384dc4 \ No newline at end of file From 36258586a0a41ebe0a33974cdbb108123b8728e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E6=98=8A=E7=BF=94?= <673686754@qq.com> Date: Tue, 28 Aug 2018 15:28:15 +0800 Subject: [PATCH 32/78] =?UTF-8?q?d2-crud=20=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 4ef8d5658c9d9d42ba836243ddaa05246068e5c6 [formerly 4ef8d5658c9d9d42ba836243ddaa05246068e5c6 [formerly 4ef8d5658c9d9d42ba836243ddaa05246068e5c6 [formerly 4ef8d5658c9d9d42ba836243ddaa05246068e5c6 [formerly fea6d506b8eea367b160660ae0d9a9ca092db5de [formerly f408b1155caa3e9947904464fcd02c808a4cfc4c]]]]] Former-commit-id: 861f8d8d90c219a77c697ea6b7dea934f3dc1f3a Former-commit-id: 390ffaa2967f713d81ecdd8640ea8f6031245af6 Former-commit-id: db9412b70e3ba7ed4088e0ca116229c9581b051e [formerly 3c5eb7c71430a3534822d0335fcc6dbf0dd9c68f] Former-commit-id: 8d6e9cfff830ef0aecbb7e6922629ec695672307 Former-commit-id: b1ae17e6053d04300c67a10d0ea42fc5ae0f5748 Former-commit-id: cefbf05cb9427468d82f985078880a166a90d99d Former-commit-id: dcfc4e8711ab7e3169af3c59727346cc41118e77 Former-commit-id: 8425adff3f07ccc49018864127ac8b82082ebd76 --- docs/zh/ecosystem-d2-crud/example.md | 1 + src/menu/modules/demo-d2-crud.js | 3 +- src/pages/demo/d2-crud/demo19/code.js | 71 ++++++++++++++++++++ src/pages/demo/d2-crud/demo19/doc.md | 1 + src/pages/demo/d2-crud/demo19/index.vue | 87 +++++++++++++++++++++++++ src/router/routes.js.REMOVED.git-id | 2 +- 6 files changed, 163 insertions(+), 2 deletions(-) create mode 100644 src/pages/demo/d2-crud/demo19/code.js create mode 100644 src/pages/demo/d2-crud/demo19/doc.md create mode 100644 src/pages/demo/d2-crud/demo19/index.vue diff --git a/docs/zh/ecosystem-d2-crud/example.md b/docs/zh/ecosystem-d2-crud/example.md index 5b6ff793..455a64b9 100644 --- a/docs/zh/ecosystem-d2-crud/example.md +++ b/docs/zh/ecosystem-d2-crud/example.md @@ -27,3 +27,4 @@ | 新增数据 | [点我查看](https://fairyever.gitee.io/d2-admin-preview/#/demo/d2-crud/demo16) | | 修改数据 | [点我查看](https://fairyever.gitee.io/d2-admin-preview/#/demo/d2-crud/demo17) | | 删除数据 | [点我查看](https://fairyever.gitee.io/d2-admin-preview/#/demo/d2-crud/demo18) | +| 自定义操作列 | [点我查看](https://fairyever.gitee.io/d2-admin-preview/#/demo/d2-crud/demo19) | diff --git a/src/menu/modules/demo-d2-crud.js b/src/menu/modules/demo-d2-crud.js index c1306c6b..0a8242fc 100644 --- a/src/menu/modules/demo-d2-crud.js +++ b/src/menu/modules/demo-d2-crud.js @@ -29,7 +29,8 @@ export default { children: [ { path: `${pre}demo16`, title: '新增数据' }, { path: `${pre}demo17`, title: '修改数据' }, - { path: `${pre}demo18`, title: '删除数据' } + { path: `${pre}demo18`, title: '删除数据' }, + { path: `${pre}demo19`, title: '自定义操作列' } ] } ])('/demo/d2-crud/') diff --git a/src/pages/demo/d2-crud/demo19/code.js b/src/pages/demo/d2-crud/demo19/code.js new file mode 100644 index 00000000..086bcfb9 --- /dev/null +++ b/src/pages/demo/d2-crud/demo19/code.js @@ -0,0 +1,71 @@ +export default ` + +` diff --git a/src/pages/demo/d2-crud/demo19/doc.md b/src/pages/demo/d2-crud/demo19/doc.md new file mode 100644 index 00000000..56a4aab8 --- /dev/null +++ b/src/pages/demo/d2-crud/demo19/doc.md @@ -0,0 +1 @@ +通过给 `D2 Crud` 传入 `rowHandle` 可开启表格操作列，传入 `custom` 数组对象可以自定义模式，数组中每一个对象定义一个自定义按钮，对象属性支持所有的 `el-button` 属性， `emit` 属性定义了监听的事件，例如 `emit` 的值为 `custom-emit-1`，就在 `D2 Crud` 中监听 `custom-emit-1` 事件 监听的事件参数： `index` 是当前行的索引， `row` 是当前行的数据。代码如下： diff --git a/src/pages/demo/d2-crud/demo19/index.vue b/src/pages/demo/d2-crud/demo19/index.vue new file mode 100644 index 00000000..a5b60a87 --- /dev/null +++ b/src/pages/demo/d2-crud/demo19/index.vue @@ -0,0 +1,87 @@ + + + diff --git a/src/router/routes.js.REMOVED.git-id b/src/router/routes.js.REMOVED.git-id index 1c893735..e8badca6 100644 --- a/src/router/routes.js.REMOVED.git-id +++ b/src/router/routes.js.REMOVED.git-id @@ -1 +1 @@ -4f35ee266511f772688d28a0c6d4b7a56c384dc4 \ No newline at end of file +26b368ef188e9a3e98907e503a2e01368c4ad328 \ No newline at end of file From 2d264eb09ca5cdb580b459a876369d24b4d7a089 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E6=98=8A=E7=BF=94?= <673686754@qq.com> Date: Tue, 28 Aug 2018 16:01:48 +0800 Subject: [PATCH 33/78] =?UTF-8?q?d2-crud=20=E8=A1=A8=E5=8D=95=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E6=B8=B2=E6=9F=93=20=E8=A1=A8=E5=8D=95=E5=B8=83?= =?UTF-8?q?=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: dffabbae052e82d011c49a482e2c6579b510131c [formerly dffabbae052e82d011c49a482e2c6579b510131c [formerly dffabbae052e82d011c49a482e2c6579b510131c [formerly dffabbae052e82d011c49a482e2c6579b510131c [formerly 393c14f4ef07c4f7920adb79d9784961826f909d [formerly fa929764dd324849a7d1032aa98cab34600f4d85]]]]] Former-commit-id: 8f9e71375a306a4f71e9688e302327acfd1ccd6f Former-commit-id: 5c4bc13c8c115282d98b5de8f56fa46cc523c2d6 Former-commit-id: 5c59b4084b8f86ce00488020787a1d8361c099c1 [formerly 818a62a1c53edf8827226e96a16ef7b38414a5a4] Former-commit-id: eeb546c951042a284a8553cd4c4fe4f18804ff8b Former-commit-id: 17fa37ebac025b07a355da563dc490aa39507877 Former-commit-id: d0f5a02d0af43ab33e8b59b22335182ef2527cf0 Former-commit-id: 8115efda42fdb71b1df18e56a7336df8117bd5c7 Former-commit-id: 9be41ad5cd1dbf6f772e64c0381e26b0a8eceb91 --- docs/zh/ecosystem-d2-crud/example.md | 2 + src/menu/modules/demo-d2-crud.js | 4 +- src/pages/demo/d2-crud/demo20/code.js | 133 +++++++++++++++++++++ src/pages/demo/d2-crud/demo20/doc.md | 1 + src/pages/demo/d2-crud/demo20/index.vue | 149 ++++++++++++++++++++++++ src/pages/demo/d2-crud/demo21/code.js | 117 +++++++++++++++++++ src/pages/demo/d2-crud/demo21/doc.md | 1 + src/pages/demo/d2-crud/demo21/index.vue | 133 +++++++++++++++++++++ src/router/routes.js.REMOVED.git-id | 2 +- 9 files changed, 540 insertions(+), 2 deletions(-) create mode 100644 src/pages/demo/d2-crud/demo20/code.js create mode 100644 src/pages/demo/d2-crud/demo20/doc.md create mode 100644 src/pages/demo/d2-crud/demo20/index.vue create mode 100644 src/pages/demo/d2-crud/demo21/code.js create mode 100644 src/pages/demo/d2-crud/demo21/doc.md create mode 100644 src/pages/demo/d2-crud/demo21/index.vue diff --git a/docs/zh/ecosystem-d2-crud/example.md b/docs/zh/ecosystem-d2-crud/example.md index 455a64b9..6b70eb86 100644 --- a/docs/zh/ecosystem-d2-crud/example.md +++ b/docs/zh/ecosystem-d2-crud/example.md @@ -28,3 +28,5 @@ | 修改数据 | [点我查看](https://fairyever.gitee.io/d2-admin-preview/#/demo/d2-crud/demo17) | | 删除数据 | [点我查看](https://fairyever.gitee.io/d2-admin-preview/#/demo/d2-crud/demo18) | | 自定义操作列 | [点我查看](https://fairyever.gitee.io/d2-admin-preview/#/demo/d2-crud/demo19) | +| 表单组件渲染 | [点我查看](https://fairyever.gitee.io/d2-admin-preview/#/demo/d2-crud/demo20) | +| 表单布局 | [点我查看](https://fairyever.gitee.io/d2-admin-preview/#/demo/d2-crud/demo21) | diff --git a/src/menu/modules/demo-d2-crud.js b/src/menu/modules/demo-d2-crud.js index 0a8242fc..eddfdd5c 100644 --- a/src/menu/modules/demo-d2-crud.js +++ b/src/menu/modules/demo-d2-crud.js @@ -30,7 +30,9 @@ export default { { path: `${pre}demo16`, title: '新增数据' }, { path: `${pre}demo17`, title: '修改数据' }, { path: `${pre}demo18`, title: '删除数据' }, - { path: `${pre}demo19`, title: '自定义操作列' } + { path: `${pre}demo19`, title: '自定义操作列' }, + { path: `${pre}demo20`, title: '表单组件渲染' }, + { path: `${pre}demo21`, title: '表单布局' } ] } ])('/demo/d2-crud/') diff --git a/src/pages/demo/d2-crud/demo20/code.js b/src/pages/demo/d2-crud/demo20/code.js new file mode 100644 index 00000000..022eafc2 --- /dev/null +++ b/src/pages/demo/d2-crud/demo20/code.js @@ -0,0 +1,133 @@ +export default ` + +` diff --git a/src/pages/demo/d2-crud/demo20/doc.md b/src/pages/demo/d2-crud/demo20/doc.md new file mode 100644 index 00000000..b8d13e4d --- /dev/null +++ b/src/pages/demo/d2-crud/demo20/doc.md @@ -0,0 +1 @@ +向 `form-template` 的 `component` 对象传入 `name` 属性来控制渲染的组件，默认为 `el-input` ，支持的组件有 `el-input-number` `el-radio` `el-checkbox` `el-select` `el-cascader` `el-switch` `el-slider` `el-time-select` `el-time-picker` `el-date-picker` `el-rate` `el-color-picker` 以及使用 `render函数` 自己渲染。代码如下： diff --git a/src/pages/demo/d2-crud/demo20/index.vue b/src/pages/demo/d2-crud/demo20/index.vue new file mode 100644 index 00000000..190db2bc --- /dev/null +++ b/src/pages/demo/d2-crud/demo20/index.vue @@ -0,0 +1,149 @@ + + + diff --git a/src/pages/demo/d2-crud/demo21/code.js b/src/pages/demo/d2-crud/demo21/code.js new file mode 100644 index 00000000..f61c65e1 --- /dev/null +++ b/src/pages/demo/d2-crud/demo21/code.js @@ -0,0 +1,117 @@ +export default ` + +` diff --git a/src/pages/demo/d2-crud/demo21/doc.md b/src/pages/demo/d2-crud/demo21/doc.md new file mode 100644 index 00000000..7ca59dde --- /dev/null +++ b/src/pages/demo/d2-crud/demo21/doc.md @@ -0,0 +1 @@ +向 `form-options` 中传入 `gutter` 属性来控制栅格间隔，向 `form-template` 的 `component` 对象传入 `span` 属性来控制栅格占据的列数。代码如下： diff --git a/src/pages/demo/d2-crud/demo21/index.vue b/src/pages/demo/d2-crud/demo21/index.vue new file mode 100644 index 00000000..73f97132 --- /dev/null +++ b/src/pages/demo/d2-crud/demo21/index.vue @@ -0,0 +1,133 @@ + + + diff --git a/src/router/routes.js.REMOVED.git-id b/src/router/routes.js.REMOVED.git-id index e8badca6..b66b7fd2 100644 --- a/src/router/routes.js.REMOVED.git-id +++ b/src/router/routes.js.REMOVED.git-id @@ -1 +1 @@ -26b368ef188e9a3e98907e503a2e01368c4ad328 \ No newline at end of file +34f3401ccfbf14961d3133c729fe297d08339396 \ No newline at end of file From 5495b76602aae73551009e1cdbd8b00256d8e813 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E6=98=8A=E7=BF=94?= <673686754@qq.com> Date: Tue, 28 Aug 2018 16:20:16 +0800 Subject: [PATCH 34/78] =?UTF-8?q?d2-crud=20=E8=A1=A8=E5=8D=95=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: fdb0d1333ab90454a80078a692de62d68b528de5 [formerly fdb0d1333ab90454a80078a692de62d68b528de5 [formerly fdb0d1333ab90454a80078a692de62d68b528de5 [formerly fdb0d1333ab90454a80078a692de62d68b528de5 [formerly ad69fa918cb6a7c8be79693dd9d459ff24bd8850 [formerly d44f36c938ac0604b92959028777e5d8edd8b259]]]]] Former-commit-id: af610347b31ca2bf8277d8fefeb4831899ff8ed3 Former-commit-id: 1e5e4c58322d87756e2fc181607ee89e8a00c323 Former-commit-id: 6fb929e6919d633754f6ed05c1c0dc5fc52b1053 [formerly e009db20b84c2ceb15aad1f1a49e1e034aebcd3f] Former-commit-id: 9d4cd83c14915b798c77101bfc0e1a75677e054c Former-commit-id: ae9f646e106466297f17ce2acef5c3b6d40b2a16 Former-commit-id: 483af02ce21d32235ee89fa772aaf8559a13affd Former-commit-id: 93fff30eff6af98e6cc3f6d2194d187119ba1ef7 Former-commit-id: a557fac7e8617f522e810894526221fce2931c0a --- docs/zh/ecosystem-d2-crud/example.md | 1 + src/menu/modules/demo-d2-crud.js | 3 +- src/pages/demo/d2-crud/demo16/code.js | 2 +- src/pages/demo/d2-crud/demo16/doc.md | 2 +- src/pages/demo/d2-crud/demo16/index.vue | 2 +- src/pages/demo/d2-crud/demo22/code.js | 110 +++++++++++++++++++++ src/pages/demo/d2-crud/demo22/doc.md | 1 + src/pages/demo/d2-crud/demo22/index.vue | 126 ++++++++++++++++++++++++ src/router/routes.js.REMOVED.git-id | 2 +- 9 files changed, 244 insertions(+), 5 deletions(-) create mode 100644 src/pages/demo/d2-crud/demo22/code.js create mode 100644 src/pages/demo/d2-crud/demo22/doc.md create mode 100644 src/pages/demo/d2-crud/demo22/index.vue diff --git a/docs/zh/ecosystem-d2-crud/example.md b/docs/zh/ecosystem-d2-crud/example.md index 6b70eb86..1edccd8f 100644 --- a/docs/zh/ecosystem-d2-crud/example.md +++ b/docs/zh/ecosystem-d2-crud/example.md @@ -30,3 +30,4 @@ | 自定义操作列 | [点我查看](https://fairyever.gitee.io/d2-admin-preview/#/demo/d2-crud/demo19) | | 表单组件渲染 | [点我查看](https://fairyever.gitee.io/d2-admin-preview/#/demo/d2-crud/demo20) | | 表单布局 | [点我查看](https://fairyever.gitee.io/d2-admin-preview/#/demo/d2-crud/demo21) | +| 表单校验 | [点我查看](https://fairyever.gitee.io/d2-admin-preview/#/demo/d2-crud/demo22) | diff --git a/src/menu/modules/demo-d2-crud.js b/src/menu/modules/demo-d2-crud.js index eddfdd5c..076c58ab 100644 --- a/src/menu/modules/demo-d2-crud.js +++ b/src/menu/modules/demo-d2-crud.js @@ -32,7 +32,8 @@ export default { { path: `${pre}demo18`, title: '删除数据' }, { path: `${pre}demo19`, title: '自定义操作列' }, { path: `${pre}demo20`, title: '表单组件渲染' }, - { path: `${pre}demo21`, title: '表单布局' } + { path: `${pre}demo21`, title: '表单布局' }, + { path: `${pre}demo22`, title: '表单校验' } ] } ])('/demo/d2-crud/') diff --git a/src/pages/demo/d2-crud/demo16/code.js b/src/pages/demo/d2-crud/demo16/code.js index 593ffeac..98efda0a 100644 --- a/src/pages/demo/d2-crud/demo16/code.js +++ b/src/pages/demo/d2-crud/demo16/code.js @@ -4,7 +4,7 @@ export default ` diff --git a/src/pages/demo/d2-crud/demo10/index.vue b/src/pages/demo/d2-crud/demo10/index.vue index 84f3fb41..9c4213fe 100644 --- a/src/pages/demo/d2-crud/demo10/index.vue +++ b/src/pages/demo/d2-crud/demo10/index.vue @@ -14,7 +14,7 @@ diff --git a/src/pages/demo/d2-crud/demo11/index.vue b/src/pages/demo/d2-crud/demo11/index.vue index 99e79f8c..907ddef4 100644 --- a/src/pages/demo/d2-crud/demo11/index.vue +++ b/src/pages/demo/d2-crud/demo11/index.vue @@ -13,7 +13,7 @@ diff --git a/src/pages/demo/d2-crud/demo12/index.vue b/src/pages/demo/d2-crud/demo12/index.vue index 9ccad190..a1bdbae1 100644 --- a/src/pages/demo/d2-crud/demo12/index.vue +++ b/src/pages/demo/d2-crud/demo12/index.vue @@ -12,7 +12,7 @@ diff --git a/src/pages/demo/d2-crud/demo13/index.vue b/src/pages/demo/d2-crud/demo13/index.vue index c3e457c8..cc2b78b8 100644 --- a/src/pages/demo/d2-crud/demo13/index.vue +++ b/src/pages/demo/d2-crud/demo13/index.vue @@ -13,7 +13,7 @@ diff --git a/src/pages/demo/d2-crud/demo14/index.vue b/src/pages/demo/d2-crud/demo14/index.vue index c1c800b6..07e78b7f 100644 --- a/src/pages/demo/d2-crud/demo14/index.vue +++ b/src/pages/demo/d2-crud/demo14/index.vue @@ -13,7 +13,7 @@ diff --git a/src/pages/demo/d2-crud/demo15/index.vue b/src/pages/demo/d2-crud/demo15/index.vue index 191de3b5..67648360 100644 --- a/src/pages/demo/d2-crud/demo15/index.vue +++ b/src/pages/demo/d2-crud/demo15/index.vue @@ -13,7 +13,7 @@ diff --git a/src/pages/demo/d2-crud/demo16/index.vue b/src/pages/demo/d2-crud/demo16/index.vue index 6d99bfe3..aafe2b40 100644 --- a/src/pages/demo/d2-crud/demo16/index.vue +++ b/src/pages/demo/d2-crud/demo16/index.vue @@ -19,7 +19,7 @@ diff --git a/src/pages/demo/d2-crud/demo17/index.vue b/src/pages/demo/d2-crud/demo17/index.vue index 1068638c..594320d9 100644 --- a/src/pages/demo/d2-crud/demo17/index.vue +++ b/src/pages/demo/d2-crud/demo17/index.vue @@ -18,7 +18,7 @@ diff --git a/src/pages/demo/d2-crud/demo18/index.vue b/src/pages/demo/d2-crud/demo18/index.vue index 5c42ffe4..a275ba35 100644 --- a/src/pages/demo/d2-crud/demo18/index.vue +++ b/src/pages/demo/d2-crud/demo18/index.vue @@ -15,7 +15,7 @@ diff --git a/src/pages/demo/d2-crud/demo19/index.vue b/src/pages/demo/d2-crud/demo19/index.vue index a5b60a87..e412a537 100644 --- a/src/pages/demo/d2-crud/demo19/index.vue +++ b/src/pages/demo/d2-crud/demo19/index.vue @@ -15,7 +15,7 @@ diff --git a/src/pages/demo/d2-crud/demo2/index.vue b/src/pages/demo/d2-crud/demo2/index.vue index 9f0ac17c..248f04dd 100644 --- a/src/pages/demo/d2-crud/demo2/index.vue +++ b/src/pages/demo/d2-crud/demo2/index.vue @@ -12,7 +12,7 @@ diff --git a/src/pages/demo/d2-crud/demo20/index.vue b/src/pages/demo/d2-crud/demo20/index.vue index 190db2bc..55d9988d 100644 --- a/src/pages/demo/d2-crud/demo20/index.vue +++ b/src/pages/demo/d2-crud/demo20/index.vue @@ -18,7 +18,7 @@ diff --git a/src/pages/demo/d2-crud/demo21/index.vue b/src/pages/demo/d2-crud/demo21/index.vue index 73f97132..d28b3790 100644 --- a/src/pages/demo/d2-crud/demo21/index.vue +++ b/src/pages/demo/d2-crud/demo21/index.vue @@ -18,7 +18,7 @@ diff --git a/src/pages/demo/d2-crud/demo22/index.vue b/src/pages/demo/d2-crud/demo22/index.vue index 0c83e8a3..07a04570 100644 --- a/src/pages/demo/d2-crud/demo22/index.vue +++ b/src/pages/demo/d2-crud/demo22/index.vue @@ -20,7 +20,7 @@ diff --git a/src/pages/demo/d2-crud/demo23/index.vue b/src/pages/demo/d2-crud/demo23/index.vue index a120a702..0396ffbb 100644 --- a/src/pages/demo/d2-crud/demo23/index.vue +++ b/src/pages/demo/d2-crud/demo23/index.vue @@ -11,7 +11,7 @@ diff --git a/src/pages/demo/d2-crud/demo24/index.vue b/src/pages/demo/d2-crud/demo24/index.vue index de4a4e9d..f34a8000 100644 --- a/src/pages/demo/d2-crud/demo24/index.vue +++ b/src/pages/demo/d2-crud/demo24/index.vue @@ -15,7 +15,7 @@ diff --git a/src/pages/demo/d2-crud/demo3/index.vue b/src/pages/demo/d2-crud/demo3/index.vue index 1d3145c3..5db85129 100644 --- a/src/pages/demo/d2-crud/demo3/index.vue +++ b/src/pages/demo/d2-crud/demo3/index.vue @@ -12,7 +12,7 @@ diff --git a/src/pages/demo/d2-crud/demo4/index.vue b/src/pages/demo/d2-crud/demo4/index.vue index 1fccbc24..d61d2c55 100644 --- a/src/pages/demo/d2-crud/demo4/index.vue +++ b/src/pages/demo/d2-crud/demo4/index.vue @@ -12,7 +12,7 @@ diff --git a/src/pages/demo/d2-crud/demo5/index.vue b/src/pages/demo/d2-crud/demo5/index.vue index 06cf0286..00bbe16e 100644 --- a/src/pages/demo/d2-crud/demo5/index.vue +++ b/src/pages/demo/d2-crud/demo5/index.vue @@ -12,7 +12,7 @@ diff --git a/src/pages/demo/d2-crud/demo6/index.vue b/src/pages/demo/d2-crud/demo6/index.vue index 4f5ea924..a9c7af6d 100644 --- a/src/pages/demo/d2-crud/demo6/index.vue +++ b/src/pages/demo/d2-crud/demo6/index.vue @@ -11,7 +11,7 @@ diff --git a/src/pages/demo/d2-crud/demo7/index.vue b/src/pages/demo/d2-crud/demo7/index.vue index 8f4721f6..67791e48 100644 --- a/src/pages/demo/d2-crud/demo7/index.vue +++ b/src/pages/demo/d2-crud/demo7/index.vue @@ -13,7 +13,7 @@ diff --git a/src/pages/demo/d2-crud/demo8/index.vue b/src/pages/demo/d2-crud/demo8/index.vue index 47576475..13f9e6ec 100644 --- a/src/pages/demo/d2-crud/demo8/index.vue +++ b/src/pages/demo/d2-crud/demo8/index.vue @@ -11,7 +11,7 @@ diff --git a/src/pages/demo/d2-crud/demo9/index.vue b/src/pages/demo/d2-crud/demo9/index.vue index f68228fb..a87e367d 100644 --- a/src/pages/demo/d2-crud/demo9/index.vue +++ b/src/pages/demo/d2-crud/demo9/index.vue @@ -15,7 +15,7 @@ From ae60111c351499b61f3e9e6153505fc8a4bec9f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E6=98=8A=E7=BF=94?= <673686754@qq.com> Date: Fri, 31 Aug 2018 09:57:32 +0800 Subject: [PATCH 71/78] d2-crud doc Former-commit-id: 2a39e97c2e533900e9a985295c4e2178350cc569 [formerly 2a39e97c2e533900e9a985295c4e2178350cc569 [formerly 2a39e97c2e533900e9a985295c4e2178350cc569 [formerly 2a39e97c2e533900e9a985295c4e2178350cc569 [formerly 0c77db13d90e857366cc0213bfa1f5718ac1f4e0 [formerly 0897a74847ef61a667ad138e19d3da8a8a972854]]]]] Former-commit-id: 4a6dbf8ffe33b4948fd0a64dc1797b6624a301f8 Former-commit-id: 511b8dcf440b4d406b96b5842ec8e141fcb797a8 Former-commit-id: 3a7cdb741dc8778bf61a6e493b4d5439eb193648 [formerly 269587b400892a643673106f915b9286a121003e] Former-commit-id: 89f8a13be238bc49c98e06b0d627a64fa4e4f6d5 Former-commit-id: 8bcd2f5852a9ffef0dd1fe4ed3d2e2e5db318632 Former-commit-id: 32e4239223978d2dcec5a5f2249bfd1de9c6bcec Former-commit-id: 1c8460945e80d03fe7f1f0eba5cd5be3c735c4c7 Former-commit-id: b3bc21bbadce3606b6861418fbe395de74f9b6ca --- src/pages/demo/d2-crud/demo1/index.vue | 2 +- src/pages/demo/d2-crud/demo10/index.vue | 2 +- src/pages/demo/d2-crud/demo11/index.vue | 2 +- src/pages/demo/d2-crud/demo12/index.vue | 2 +- src/pages/demo/d2-crud/demo13/index.vue | 2 +- src/pages/demo/d2-crud/demo14/index.vue | 2 +- src/pages/demo/d2-crud/demo15/index.vue | 2 +- src/pages/demo/d2-crud/demo16/index.vue | 2 +- src/pages/demo/d2-crud/demo17/index.vue | 2 +- src/pages/demo/d2-crud/demo18/index.vue | 2 +- src/pages/demo/d2-crud/demo19/index.vue | 2 +- src/pages/demo/d2-crud/demo2/index.vue | 2 +- src/pages/demo/d2-crud/demo20/index.vue | 2 +- src/pages/demo/d2-crud/demo21/index.vue | 2 +- src/pages/demo/d2-crud/demo22/index.vue | 2 +- src/pages/demo/d2-crud/demo23/index.vue | 2 +- src/pages/demo/d2-crud/demo24/index.vue | 2 +- src/pages/demo/d2-crud/demo3/index.vue | 2 +- src/pages/demo/d2-crud/demo4/index.vue | 2 +- src/pages/demo/d2-crud/demo5/index.vue | 2 +- src/pages/demo/d2-crud/demo6/index.vue | 2 +- src/pages/demo/d2-crud/demo7/index.vue | 2 +- src/pages/demo/d2-crud/demo8/index.vue | 2 +- src/pages/demo/d2-crud/demo9/index.vue | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/pages/demo/d2-crud/demo1/index.vue b/src/pages/demo/d2-crud/demo1/index.vue index 36f70d41..9dc02016 100644 --- a/src/pages/demo/d2-crud/demo1/index.vue +++ b/src/pages/demo/d2-crud/demo1/index.vue @@ -12,7 +12,7 @@ diff --git a/src/pages/demo/d2-crud/demo10/index.vue b/src/pages/demo/d2-crud/demo10/index.vue index 9c4213fe..4d07c762 100644 --- a/src/pages/demo/d2-crud/demo10/index.vue +++ b/src/pages/demo/d2-crud/demo10/index.vue @@ -14,7 +14,7 @@ diff --git a/src/pages/demo/d2-crud/demo11/index.vue b/src/pages/demo/d2-crud/demo11/index.vue index 907ddef4..a36fc3c1 100644 --- a/src/pages/demo/d2-crud/demo11/index.vue +++ b/src/pages/demo/d2-crud/demo11/index.vue @@ -13,7 +13,7 @@ diff --git a/src/pages/demo/d2-crud/demo12/index.vue b/src/pages/demo/d2-crud/demo12/index.vue index a1bdbae1..944c570c 100644 --- a/src/pages/demo/d2-crud/demo12/index.vue +++ b/src/pages/demo/d2-crud/demo12/index.vue @@ -12,7 +12,7 @@ diff --git a/src/pages/demo/d2-crud/demo13/index.vue b/src/pages/demo/d2-crud/demo13/index.vue index cc2b78b8..c2fc9256 100644 --- a/src/pages/demo/d2-crud/demo13/index.vue +++ b/src/pages/demo/d2-crud/demo13/index.vue @@ -13,7 +13,7 @@ diff --git a/src/pages/demo/d2-crud/demo14/index.vue b/src/pages/demo/d2-crud/demo14/index.vue index 07e78b7f..4aeecca0 100644 --- a/src/pages/demo/d2-crud/demo14/index.vue +++ b/src/pages/demo/d2-crud/demo14/index.vue @@ -13,7 +13,7 @@ diff --git a/src/pages/demo/d2-crud/demo15/index.vue b/src/pages/demo/d2-crud/demo15/index.vue index 67648360..2c96d332 100644 --- a/src/pages/demo/d2-crud/demo15/index.vue +++ b/src/pages/demo/d2-crud/demo15/index.vue @@ -13,7 +13,7 @@ diff --git a/src/pages/demo/d2-crud/demo16/index.vue b/src/pages/demo/d2-crud/demo16/index.vue index aafe2b40..a4fcb6c1 100644 --- a/src/pages/demo/d2-crud/demo16/index.vue +++ b/src/pages/demo/d2-crud/demo16/index.vue @@ -19,7 +19,7 @@ diff --git a/src/pages/demo/d2-crud/demo17/index.vue b/src/pages/demo/d2-crud/demo17/index.vue index 594320d9..8ea682c1 100644 --- a/src/pages/demo/d2-crud/demo17/index.vue +++ b/src/pages/demo/d2-crud/demo17/index.vue @@ -18,7 +18,7 @@ diff --git a/src/pages/demo/d2-crud/demo18/index.vue b/src/pages/demo/d2-crud/demo18/index.vue index a275ba35..2c4b36fd 100644 --- a/src/pages/demo/d2-crud/demo18/index.vue +++ b/src/pages/demo/d2-crud/demo18/index.vue @@ -15,7 +15,7 @@ diff --git a/src/pages/demo/d2-crud/demo19/index.vue b/src/pages/demo/d2-crud/demo19/index.vue index e412a537..caaf351d 100644 --- a/src/pages/demo/d2-crud/demo19/index.vue +++ b/src/pages/demo/d2-crud/demo19/index.vue @@ -15,7 +15,7 @@ diff --git a/src/pages/demo/d2-crud/demo2/index.vue b/src/pages/demo/d2-crud/demo2/index.vue index 248f04dd..997ba287 100644 --- a/src/pages/demo/d2-crud/demo2/index.vue +++ b/src/pages/demo/d2-crud/demo2/index.vue @@ -12,7 +12,7 @@ diff --git a/src/pages/demo/d2-crud/demo20/index.vue b/src/pages/demo/d2-crud/demo20/index.vue index 55d9988d..309a8adf 100644 --- a/src/pages/demo/d2-crud/demo20/index.vue +++ b/src/pages/demo/d2-crud/demo20/index.vue @@ -18,7 +18,7 @@ diff --git a/src/pages/demo/d2-crud/demo21/index.vue b/src/pages/demo/d2-crud/demo21/index.vue index d28b3790..d72e115f 100644 --- a/src/pages/demo/d2-crud/demo21/index.vue +++ b/src/pages/demo/d2-crud/demo21/index.vue @@ -18,7 +18,7 @@ diff --git a/src/pages/demo/d2-crud/demo22/index.vue b/src/pages/demo/d2-crud/demo22/index.vue index 07a04570..e314b426 100644 --- a/src/pages/demo/d2-crud/demo22/index.vue +++ b/src/pages/demo/d2-crud/demo22/index.vue @@ -20,7 +20,7 @@ diff --git a/src/pages/demo/d2-crud/demo23/index.vue b/src/pages/demo/d2-crud/demo23/index.vue index 0396ffbb..c56fcf34 100644 --- a/src/pages/demo/d2-crud/demo23/index.vue +++ b/src/pages/demo/d2-crud/demo23/index.vue @@ -11,7 +11,7 @@ diff --git a/src/pages/demo/d2-crud/demo24/index.vue b/src/pages/demo/d2-crud/demo24/index.vue index f34a8000..05448a2d 100644 --- a/src/pages/demo/d2-crud/demo24/index.vue +++ b/src/pages/demo/d2-crud/demo24/index.vue @@ -15,7 +15,7 @@ diff --git a/src/pages/demo/d2-crud/demo3/index.vue b/src/pages/demo/d2-crud/demo3/index.vue index 5db85129..c576135e 100644 --- a/src/pages/demo/d2-crud/demo3/index.vue +++ b/src/pages/demo/d2-crud/demo3/index.vue @@ -12,7 +12,7 @@ diff --git a/src/pages/demo/d2-crud/demo4/index.vue b/src/pages/demo/d2-crud/demo4/index.vue index d61d2c55..b942808b 100644 --- a/src/pages/demo/d2-crud/demo4/index.vue +++ b/src/pages/demo/d2-crud/demo4/index.vue @@ -12,7 +12,7 @@ diff --git a/src/pages/demo/d2-crud/demo5/index.vue b/src/pages/demo/d2-crud/demo5/index.vue index 00bbe16e..9ecd8b8f 100644 --- a/src/pages/demo/d2-crud/demo5/index.vue +++ b/src/pages/demo/d2-crud/demo5/index.vue @@ -12,7 +12,7 @@ diff --git a/src/pages/demo/d2-crud/demo6/index.vue b/src/pages/demo/d2-crud/demo6/index.vue index a9c7af6d..65883bd3 100644 --- a/src/pages/demo/d2-crud/demo6/index.vue +++ b/src/pages/demo/d2-crud/demo6/index.vue @@ -11,7 +11,7 @@ diff --git a/src/pages/demo/d2-crud/demo7/index.vue b/src/pages/demo/d2-crud/demo7/index.vue index 67791e48..da0cf221 100644 --- a/src/pages/demo/d2-crud/demo7/index.vue +++ b/src/pages/demo/d2-crud/demo7/index.vue @@ -13,7 +13,7 @@ diff --git a/src/pages/demo/d2-crud/demo8/index.vue b/src/pages/demo/d2-crud/demo8/index.vue index 13f9e6ec..254ed14b 100644 --- a/src/pages/demo/d2-crud/demo8/index.vue +++ b/src/pages/demo/d2-crud/demo8/index.vue @@ -11,7 +11,7 @@ diff --git a/src/pages/demo/d2-crud/demo9/index.vue b/src/pages/demo/d2-crud/demo9/index.vue index a87e367d..30d0fbed 100644 --- a/src/pages/demo/d2-crud/demo9/index.vue +++ b/src/pages/demo/d2-crud/demo9/index.vue @@ -15,7 +15,7 @@ From bfe6c48b0ea3ffbd5591d5e5d77e546f34583d9f Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Fri, 31 Aug 2018 10:04:24 +0800 Subject: [PATCH 72/78] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86JavaScript=20?= =?UTF-8?q?=E5=9F=BA=E7=A1=80=E7=9F=A5=E8=AF=86=E7=AB=A0=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: aff6bce1481c39b372d73213c6726b218d002881 [formerly aff6bce1481c39b372d73213c6726b218d002881 [formerly aff6bce1481c39b372d73213c6726b218d002881 [formerly aff6bce1481c39b372d73213c6726b218d002881 [formerly 555b556d4e97c4c88604bce74a5070e3c11c24c0 [formerly ac2a60db39e5963d0b1c64207b9f61467c4eaba0]]]]] Former-commit-id: 4c60d58d89b2bcc89710db3091058fda60651982 Former-commit-id: 6a904b856929233978c9fdaefc3317a81f10928d Former-commit-id: 057336737096bda71dc7e3b6a3b1e427430c6ea2 [formerly 4bb67426c4fddb55e1a2c479986352d08e2db93b] Former-commit-id: e65878cf8fd66b7c442ef9619a024d59dec6cc8b Former-commit-id: d1db056657777779e160b9c03a3db2e2f5f53dce Former-commit-id: 2e2c5300d500eef4dd2519f2be03384b9143c5bb Former-commit-id: 0317bf1b2120fb668b23758f007d0bdd6bae6100 Former-commit-id: 21dc61fc7490d58e86a3db231e5b4e47aa25eb85 --- docs/.vuepress/config.js | 15 ++++++++++++++- docs/zh/learn-knowledge/README.md | 4 ---- .../learn-knowledge/javascript.md.REMOVED.git-id | 1 + 3 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 docs/zh/learn-knowledge/javascript.md.REMOVED.git-id diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js index 55f00bed..3c3a836a 100644 --- a/docs/.vuepress/config.js +++ b/docs/.vuepress/config.js @@ -41,7 +41,7 @@ module.exports = { text: '学习', items: [ { text: '教程', link: '/zh/learn-guide/' }, - { text: '相关知识', link: '/zh/learn-knowledge/' }, + { text: '基础知识', link: '/zh/learn-knowledge/' }, { text: '升级指引', link: '/zh/learn-update/' } ] }, @@ -117,6 +117,7 @@ module.exports = { sidebar: { '/zh/learn-guide/': sideBarLearnGuide(), '/zh/learn-update/': sideBarLearnUpdate(), + '/zh/learn-knowledge/': sideBarKnowledge(), '/zh/sys-components/': sideBarSysComponents(), '/zh/sys-plugins/': sideBarSysPlugins(), '/zh/article/': sideBarArticle('版本发布', 'Cookbook'), @@ -151,6 +152,18 @@ function sideBarLearnUpdate () { ] } +function sideBarKnowledge () { + return [ + { + collapsable: false, + children: [ + '', + 'javascript.md' + ] + } + ] +} + function sideBarSysComponents () { return [ { diff --git a/docs/zh/learn-knowledge/README.md b/docs/zh/learn-knowledge/README.md index 6200b009..de94e011 100644 --- a/docs/zh/learn-knowledge/README.md +++ b/docs/zh/learn-knowledge/README.md @@ -1,7 +1,3 @@ ---- -sidebar: auto ---- - # 相关知识 使用 D2Admin 首先组要有以下前置知识： diff --git a/docs/zh/learn-knowledge/javascript.md.REMOVED.git-id b/docs/zh/learn-knowledge/javascript.md.REMOVED.git-id new file mode 100644 index 00000000..0c820d38 --- /dev/null +++ b/docs/zh/learn-knowledge/javascript.md.REMOVED.git-id @@ -0,0 +1 @@ +adaa3d23e2e5f38fc95922e6a324af247d104660 \ No newline at end of file From 6e45b8860429827fbc9f42b02c0167f22e4c5c55 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Fri, 31 Aug 2018 10:52:28 +0800 Subject: [PATCH 73/78] no message Former-commit-id: d71155e7a3e990cdc370322d3a929769ca23e541 [formerly d71155e7a3e990cdc370322d3a929769ca23e541 [formerly d71155e7a3e990cdc370322d3a929769ca23e541 [formerly d71155e7a3e990cdc370322d3a929769ca23e541 [formerly 1a2d184203d7cdabef76dadd879b49779acdcb1f [formerly 1132884f57b0692e5944cb4aea7f35612268f99f]]]]] Former-commit-id: 12bc1cf4683900b51800e444cde5c463105e3a33 Former-commit-id: e8badf650221aa0f3186c876232500bca6d155e9 Former-commit-id: 3c45aa23aede9b81228a8fa48e3fbf08d426119c [formerly 065a757e083720cbc66a4dafcd36bf15d56fb918] Former-commit-id: 715d1d8e49273ca87b5cad98bd2fc432268ca7d2 Former-commit-id: 7d493f0190a6c1e1308363073233ed46a703f677 Former-commit-id: 802e39dd76744b9c49730bfce785ccb7b2a6c5fe Former-commit-id: 4e445fa82571e2cd6a9581ee87ff6ceaf2dc56ef Former-commit-id: 55b6919509bfdba8b43ed6bc552dd7e213153198 --- README.md | 6 +++--- dev/github/banner.png.REMOVED.git-id | 1 + dev/github/preview@2x.png.REMOVED.git-id | 1 - 3 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 dev/github/banner.png.REMOVED.git-id delete mode 100644 dev/github/preview@2x.png.REMOVED.git-id diff --git a/README.md b/README.md index 0cf4d06d..f5a46be3 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,8 @@ D2Admin 是一个开源的管理系统前端集成方案，为了方便开发者 **文档** -[中文文档 码云部署](http://d2admin.fairyever.com/zh/) | -[中文文档 服务器部署](http://app.d3collection.cn/d2-admin-doc/lastest/zh/) +* +* 两个文档地址内容一致，哪个快请用哪个。 @@ -29,7 +29,7 @@ D2Admin 是一个开源的管理系统前端集成方案，为了方便开发者 因为现在集成了很多的插件和组件，首次加载会占用很多的时间，虽然已经做了首屏加载动画，但还是建议您在发布之前一定要删除没有用到的代码，比如项目没有用到图表、示例、插件组件 - + ## 功能 diff --git a/dev/github/banner.png.REMOVED.git-id b/dev/github/banner.png.REMOVED.git-id new file mode 100644 index 00000000..9a206ab0 --- /dev/null +++ b/dev/github/banner.png.REMOVED.git-id @@ -0,0 +1 @@ +a2f6616cae3da07b11cef8bf01bee9963e27c477 \ No newline at end of file diff --git a/dev/github/preview@2x.png.REMOVED.git-id b/dev/github/preview@2x.png.REMOVED.git-id deleted file mode 100644 index 7b05e991..00000000 --- a/dev/github/preview@2x.png.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -27e431bd9e4752dd51fe827a1281d606bd7bdf07 \ No newline at end of file From 33e5eb97ab1739b48de06c0c92eaa34a01196e8d Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Fri, 31 Aug 2018 11:15:51 +0800 Subject: [PATCH 74/78] no message Former-commit-id: 64c163e13a09f5ae3e376efaa3bbc84116c987f4 [formerly 64c163e13a09f5ae3e376efaa3bbc84116c987f4 [formerly 64c163e13a09f5ae3e376efaa3bbc84116c987f4 [formerly 64c163e13a09f5ae3e376efaa3bbc84116c987f4 [formerly 1ba8e89161b60606cbac1bf7b090e37d1f4b9d8d [formerly ab0976f18a853537d7e151e9c82da4ad616f47d1]]]]] Former-commit-id: 395b69cc8e1f53eacb9834e4a29a9600c910f763 Former-commit-id: b9f58406e46b0bf326e45e84f2c5bd4ad903c91e Former-commit-id: 638ba4500f140d1d38e1e60b460bdf15e16808a0 [formerly 74f2d2c03ac09174a4dacaeb616e85b46d918b0a] Former-commit-id: 98a6dec2261c8b64d196f698ba667d5875b790de Former-commit-id: 7b1637d4102c43fe0a7865d75b13f73038602db4 Former-commit-id: 31e6bb4bca80bbc8d5d65d3675244490485eed0c Former-commit-id: 063703c71c0037e4d7f29942e558301ef205050d Former-commit-id: ea611989a07278eb797416e7bb7ccf2651700b42 --- docs/.vuepress/config.js | 3 ++- docs/zh/article/update/introduce.md | 25 +++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 docs/zh/article/update/introduce.md diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js index 3c3a836a..ead98c97 100644 --- a/docs/.vuepress/config.js +++ b/docs/.vuepress/config.js @@ -217,7 +217,8 @@ function sideBarArticle (titleUpdate, titleCookbook) { 'update/ice-1.1.2', 'update/1.1.5', 'update/1.1.4', - 'update/0.0.0' + 'update/0.0.0', + 'update/introduce' ] } ] diff --git a/docs/zh/article/update/introduce.md b/docs/zh/article/update/introduce.md new file mode 100644 index 00000000..27dfaa0c --- /dev/null +++ b/docs/zh/article/update/introduce.md @@ -0,0 +1,25 @@ +# D2 Admin 介绍 + +![](http://fairyever.qiniudn.com/20180821142809.png) + +[D2Admin](https://github.com/d2-projects/d2-admin) 是一个开源的管理系统前端集成方案，为了方便开发者快速进行管理系统开发而设计，提供了大量开箱即用的功能： + +* 登陆和注销的页面、逻辑、路由拦截 +* 主题系统 +* 基于 ElementUI 的优化外观 +* 表格 CRUD 封装 ([d2-crud](https://github.com/d2-projects/d2-crud)) +* 完善的页面容器组件，六种布局模式，具备顶栏和底栏插槽 +* 表格导入导出 +* 错误处理 +* 模拟数据 +* 集成字体图标库，以及即放即用的 svg 图标组件 +* 同类产品中最强大的出具持久化方案 +* 完善的多标签页用户控制 +* 完善的全局系统控制 +* 事无巨细的文档 +* 容纳 2000 人的 D2 Projects QQ 用户交流群解决使用问题 806395827 +* ... + +篇幅有限，更多特性请参考 [D2 Admin 中文文档 | 介绍](http://app.d3collection.cn/d2-admin-doc/lastest/zh/learn-guide/) + +D2 Admin 在开源社区由 [FairyEver](https://github.com/FairyEver) 维护，为了方便开发者快速开发推出的 D2 Admin ICE 和完整版的 D2 Admin 有完全一致的系统功能。D2 Admin ICE 和其它分支同时更新，感谢大家使用。 \ No newline at end of file From 0e576048fd30e7e5413a33517b734e14b506590c Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Fri, 31 Aug 2018 11:21:25 +0800 Subject: [PATCH 75/78] =?UTF-8?q?=E7=AE=80=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 08a7b09a807cc1702a88725378d7ac4fcbab74e5 [formerly 08a7b09a807cc1702a88725378d7ac4fcbab74e5 [formerly 08a7b09a807cc1702a88725378d7ac4fcbab74e5 [formerly 08a7b09a807cc1702a88725378d7ac4fcbab74e5 [formerly b13ac25fbf82abb06426439a8710543f29097113 [formerly 1fcfc16507cb329d038f5256f20b62c78fddc9e1]]]]] Former-commit-id: c2498b32e8647b895b07b591752dc963bbe23380 Former-commit-id: ec301466f1b95a47dcd7a52b43ffac8c6c476824 Former-commit-id: dd4d6a93b4f1346b50f519cf7e5f16504793bf06 [formerly 2a227af49f88bfa1362c360183b8a3f110bc109b] Former-commit-id: 5bc3a95ba8063773f1bf611f782fa02c90810e2a Former-commit-id: de64e0f32e2f7a35cba58464079860d5bbeacab7 Former-commit-id: 44fbebdf07a250f8eacb516327593268bcf3d742 Former-commit-id: c8cf3fcfe85cdd92f855e87d7fb71aea1d46b7b3 Former-commit-id: 3f0b9920985d5f46a4ccf96b8f58643baaa35c2a --- README.md | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/README.md b/README.md index 0cf4d06d..6740e62f 100644 --- a/README.md +++ b/README.md @@ -113,16 +113,4 @@ npm run dev // 打包 npm run build -``` - -## 觉得不错 赏个咖啡 让作者打起精神 ~ - - - -更多介绍和使用方法见 [文档](http://app.d3collection.cn/d2-admin-doc/lastest/zh/) - -## 友情链接 - -* [avue](https://github.com/nmxiaowei/avue) - - +``` \ No newline at end of file From afaef7d5362da3a99165e1ce8328faca5dd916eb Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Fri, 31 Aug 2018 11:22:19 +0800 Subject: [PATCH 76/78] no message Former-commit-id: df5bc8a6823b8deaf6950a69d24ff8318a7812db [formerly df5bc8a6823b8deaf6950a69d24ff8318a7812db [formerly df5bc8a6823b8deaf6950a69d24ff8318a7812db [formerly df5bc8a6823b8deaf6950a69d24ff8318a7812db [formerly 82d2ade21ee6e5be5557dc7d2d442169caba9ac5 [formerly 7c4e71e87759f9de9a98ea116cd703e32a197ebd]]]]] Former-commit-id: 24ec67a67e66d394de77fc5edec118b7a2d2c5d3 Former-commit-id: 821ea06edbef35cd5c66411cd4adf42fabe06447 Former-commit-id: 9c1c60b9eca513fa31514bb0c510ce198ffa82f8 [formerly 519574fc122945e3a7952ccec9800c966f7201aa] Former-commit-id: 38c4d8fc45788e0e88478b0b6091308fe78d7446 Former-commit-id: c8ebe2f897a132c5a6a8ed0acc010529b29b0b7b Former-commit-id: aefd10d2827a4a0b412756c46157e6cb69732dc2 Former-commit-id: 06780debf69f2958fdfb855e16cd3841d8f33e55 Former-commit-id: 037bc8beebb9f810a6b7e2fe5ceedd41ebbc0e1e --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6740e62f..f6bee4d9 100644 --- a/README.md +++ b/README.md @@ -102,7 +102,7 @@ D2Admin 是完全开源免费的管理系统集成方案，由 [FairyEver](https ## 使用 -详细用法见 [快速上手](http://app.d3collection.cn/d2-admin-doc/lastest/zh/guide/getting-started.html) +详细用法见 [快速上手](http://app.d3collection.cn/d2-admin-doc/lastest/zh/learn-guide/getting-started.html) ``` // 安装依赖 From 04b2323974ba06bd50961de47bdd3c42a22c40ec Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Fri, 31 Aug 2018 11:27:23 +0800 Subject: [PATCH 77/78] update Former-commit-id: 1c79e6706dc6405a837d680c6ae1adbdcf841355 [formerly 1c79e6706dc6405a837d680c6ae1adbdcf841355 [formerly 1c79e6706dc6405a837d680c6ae1adbdcf841355 [formerly 1c79e6706dc6405a837d680c6ae1adbdcf841355 [formerly 50f09a399d1d4b98c245ab8a227c50467d83613d [formerly aef5de04323c8a23059a067ae8ef831b1498bb28]]]]] Former-commit-id: 72a5f57737d4965e2eac10a38b9be188b56d0f85 Former-commit-id: 7bea73b5aa12ef2591262f703bf643193e28f576 Former-commit-id: 7169253ba9997141d4f0301ba3e172054be5b493 [formerly 83ba99b38c406369560b1378aa41c57dd09a08f5] Former-commit-id: beb842438718667995195563c13cda9c16f36c93 Former-commit-id: e9df9cb38dce8f8ff586749cf41a14f9e1da0818 Former-commit-id: bac5fa9e43f627c08a41ac9743c76c43078f6528 Former-commit-id: acefab2e05f197fd1e86c8ad35acdc58e1b20f9a Former-commit-id: 6d2023b63abfc32787a05d3cf35b8559f51ca59e --- README.md | 37 ++++--------------------------------- 1 file changed, 4 insertions(+), 33 deletions(-) diff --git a/README.md b/README.md index 5f6a9f3a..e3c50276 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ + + D2Admin 是一个开源的管理系统前端集成方案，为了方便开发者快速进行管理系统开发而设计。 ## 仓库和文档 @@ -7,7 +9,7 @@ D2Admin 是一个开源的管理系统前端集成方案，为了方便开发者 * * -两个文档地址内容一致，哪个快请用哪个。 +> 两个文档地址内容一致，哪个快请用哪个。如果其中一个挂掉了，请记得来这里使用另一个 ~ **完整版** @@ -27,10 +29,6 @@ D2Admin 是一个开源的管理系统前端集成方案，为了方便开发者 [介绍](https://juejin.im/post/5b6349716fb9a04f834669d6) | [预览地址](https://fairyever.gitee.io/d2-admin-ice-preview) -因为现在集成了很多的插件和组件，首次加载会占用很多的时间，虽然已经做了首屏加载动画，但还是建议您在发布之前一定要删除没有用到的代码，比如项目没有用到图表、示例、插件组件 - - - ## 功能 * 使用 vue-cli3 构建 @@ -86,31 +84,4 @@ D2Admin 是一个开源的管理系统前端集成方案，为了方便开发者 D2Admin 是完全开源免费的管理系统集成方案，由 [FairyEver](https://github.com/FairyEver) 在工作之余完全由兴趣驱动完成，如果你也一样喜欢前端开发，欢迎加入我们的讨论/学习群，群内可以`提问答疑`，`分享学习资料`或者随便扯淡 - - -## 获取代码 - -有两种方式可以获得 D2Admin 的代码 - -* 在 [releases](https://github.com/d2-projects/d2-admin/releases) 页面下载最新的发行版。发行版一般是完成了某个大升级或者修复重要 bug 后发布的压缩包，你可以下载下来直接使用 - -* Fork 仓库到你的 github 然后克隆到本地，然后使用 master 分支继续你的开发。这种方式得到的是最新的代码，但是会有未完成的新功能。**不建议使用这种方式** - -* 由于 github 访问较慢，推荐前往码云仓库下载 [gitee.com/fairyever/d2-admin](https://gitee.com/fairyever/d2-admin)，码云上的仓库**在每次发布版本才会更新**，所以如果你选择此方法，请直接 fork 仓库并克隆到本地 - -> 码云的仓库由 github 同步，但是发行版和标签同步有一些问题，所以推荐直接 fork 仓库 - -## 使用 - -详细用法见 [快速上手](http://app.d3collection.cn/d2-admin-doc/lastest/zh/learn-guide/getting-started.html) - -``` -// 安装依赖 -npm i - -// 运行 -npm run dev - -// 打包 -npm run build -``` \ No newline at end of file + \ No newline at end of file From ad0c8d6a461886b1bcc2ea9e4a62f01064d04968 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Fri, 31 Aug 2018 11:27:46 +0800 Subject: [PATCH 78/78] 1.3.0 Former-commit-id: 9d639f53f7ed5bb2b2809184ee02c1748da3371d [formerly 9d639f53f7ed5bb2b2809184ee02c1748da3371d [formerly 9d639f53f7ed5bb2b2809184ee02c1748da3371d [formerly 9d639f53f7ed5bb2b2809184ee02c1748da3371d [formerly e0dace04ed58f7a8fdf91f0a2ff0d3d2e2c83894 [formerly c7dded34764581c712c0a26212f82b8d0f90cad0]]]]] Former-commit-id: c225c58bd47505ed0d069da6af74ab1ebce97eaf Former-commit-id: 280a7e265bba256e905279ae2e6faee7669c0b20 Former-commit-id: 5772f3690ec391c606f2bcd0c4544f58b3310743 [formerly 4847fb44302fbd31da084c4200104c6906c9c3b8] Former-commit-id: 9e6e19293fe73baba35d341ae5284e82897cef51 Former-commit-id: 4762142fe6b5976cd18ef798bf14a234d9d1b36f Former-commit-id: c673627548f7cfc2a111df22a3e5dde43282b5b4 Former-commit-id: 9425fa60971e8823622bd4abb8f88bc30d6412ee Former-commit-id: bd1f71c0035141dc4cd0d506131796308aac6e2a --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cede1dc8..abafdb49 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "d2-admin", - "version": "1.2.1", + "version": "1.3.0", "private": true, "scripts": { "serve": "vue-cli-service serve --open",