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/37] =?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/37] =?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/37] =?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/37] =?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/37] =?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/37] =?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/37] =?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/37] 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/37] =?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/37] =?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/37] =?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/37] =?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/37] =?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/37] =?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/37] =?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 @@ - +