From f31f6e3bebd1147b7c46bfb2ba7eccb4789bde84 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Wed, 13 Jun 2018 23:42:11 +0800 Subject: [PATCH 1/6] no message Former-commit-id: 70d31cd6d3bfd412d9cf417d8d63266eae91330c [formerly 70d31cd6d3bfd412d9cf417d8d63266eae91330c [formerly 70d31cd6d3bfd412d9cf417d8d63266eae91330c [formerly 70d31cd6d3bfd412d9cf417d8d63266eae91330c [formerly 1a6d3b25b29293476319d180ae2f871532cc3573 [formerly 980190ca81662515bc4c1dd8248ce6c45da7a214]]]]] Former-commit-id: 5cf3c73b45ec84df15a6220dea7a3b68ca88c603 Former-commit-id: 3876cff4b3249e9d94e65cfbf85462ec7492c269 Former-commit-id: bef8a2546d38c203d8926808cbace0e18d2fa895 [formerly 9a7def00e97e5dcaaa8f3805af80fb9003f045d7] Former-commit-id: 9e5bd631720d4fbd22d0f46ebf86606a0b2d7cd9 Former-commit-id: de95a1e226eeaf048baa6d276483354765def45f Former-commit-id: 120ba0b647a1726211a85be9e7a33680c85ad9f6 Former-commit-id: 2f54b5b5334f204fc786928bdf0ec850d5628548 Former-commit-id: a92d9269109b2dee4f7d37a82b6077c3d2e0aa14 --- docs/zh/guide/change-log.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/zh/guide/change-log.md b/docs/zh/guide/change-log.md index e83db96c..f7850e87 100644 --- a/docs/zh/guide/change-log.md +++ b/docs/zh/guide/change-log.md @@ -20,6 +20,7 @@ * [ 修改 ] 删除 `timeago` 插件，更换为更强大的 `dayjs` * [ 新增 ] `Tomorrow Night Blue` 主题 * [ 修改 ] `src/assets/style/public-class.scss` 写法优化 +* [ 新增 ] [vue-bigdata-table](https://github.com/lison16/vue-bigdata-table)组件 ## v1.0.0 From 4d27b441adaba602d7a639b0c41adf3bffcc1065 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Thu, 14 Jun 2018 18:46:20 +0800 Subject: [PATCH 2/6] no message Former-commit-id: 059628b458d3ee7581082ea7eb5b207d7a8c4a77 [formerly 059628b458d3ee7581082ea7eb5b207d7a8c4a77 [formerly 059628b458d3ee7581082ea7eb5b207d7a8c4a77 [formerly 059628b458d3ee7581082ea7eb5b207d7a8c4a77 [formerly 937520e84e34cb24db8b676e42a549c9d024d0fb [formerly 5330ad3a07a01e43c451f4f66d4785d6917232d2]]]]] Former-commit-id: 6162353a8407a1ded84a44abcce1fe48e6043ecb Former-commit-id: 7a2e127380b8e9cbd796c3b18582d0cd273fb569 Former-commit-id: c4df7c09fc02282c3359b7318ea07d3d4c3b7447 [formerly be66306a300ecc02c534c382e8063c92a5518908] Former-commit-id: 770586260ff645790530baf3f43954d0b34366be Former-commit-id: 1c3286b94ea67cf20ea0913a428e9a7cce61ff81 Former-commit-id: 7c8eba0bf8eb2776f7d4b01fb63ba3ddbfae135d Former-commit-id: c53ae7fdc501d6cf07052f710e01fc47f0997940 Former-commit-id: b9290d4cab13402a8d8f3d05e2330d82f1f207c4 --- src/menu/index.js | 3 +- src/pages/demo/components/scrollbar/index.vue | 37 +++++++++++++++++++ src/pages/demo/components/scrollbar/md/doc.md | 1 + src/router/index.js | 3 +- 4 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 src/pages/demo/components/scrollbar/index.vue create mode 100644 src/pages/demo/components/scrollbar/md/doc.md diff --git a/src/menu/index.js b/src/menu/index.js index 05afb67a..4b146d03 100644 --- a/src/menu/index.js +++ b/src/menu/index.js @@ -87,7 +87,8 @@ const demoComponents = { { path: `${pre}markdown/url`, title: '异步加载文件' } ] }, - { path: `${pre}bigdata-table`, title: '超大量数据表格' }, + { path: `${pre}bigdata-table`, title: '百万数量级表格' }, + { path: `${pre}scrollbar`, title: '滚动条' }, { path: `${pre}countup`, title: '数字动画' }, { path: `${pre}editor-quill`, title: '富文本编辑器' }, { path: `${pre}editor-simpleMDE`, title: 'markdown编辑器' }, diff --git a/src/pages/demo/components/scrollbar/index.vue b/src/pages/demo/components/scrollbar/index.vue new file mode 100644 index 00000000..98881d84 --- /dev/null +++ b/src/pages/demo/components/scrollbar/index.vue @@ -0,0 +1,37 @@ + + + + diff --git a/src/pages/demo/components/scrollbar/md/doc.md b/src/pages/demo/components/scrollbar/md/doc.md new file mode 100644 index 00000000..158a909f --- /dev/null +++ b/src/pages/demo/components/scrollbar/md/doc.md @@ -0,0 +1 @@ +[hahaha](https://github.com/ElemeFE/element/issues/2238) \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index af0ce1e1..5f0be777 100755 --- a/src/router/index.js +++ b/src/router/index.js @@ -42,7 +42,8 @@ const routes = [ { path: 'layout/grid', name: `${pre}layout-grid`, component: () => import('@/pages/demo/components/layout/grid.vue') }, { path: 'layout/splitpane', name: `${pre}layout-splitpane`, component: () => import('@/pages/demo/components/layout/splitpane.vue') }, { path: 'markdown/source', name: `${pre}markdown-source`, component: () => import('@/pages/demo/components/markdown/source.vue') }, - { path: 'markdown/url', name: `${pre}markdown-url`, component: () => import('@/pages/demo/components/markdown/url.vue') } + { path: 'markdown/url', name: `${pre}markdown-url`, component: () => import('@/pages/demo/components/markdown/url.vue') }, + { path: 'scrollbar', name: `${pre}scrollbar`, component: () => import('@/pages/demo/components/scrollbar/index.vue') } ])('demo-components-') }, { From 3a9029425c6e8c8e183baf38f1d4be45dd4e94da Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Thu, 14 Jun 2018 18:50:39 +0800 Subject: [PATCH 3/6] no message Former-commit-id: 4df79927ac3468b40b89ab9da3bba59f5a3493e5 [formerly 4df79927ac3468b40b89ab9da3bba59f5a3493e5 [formerly 4df79927ac3468b40b89ab9da3bba59f5a3493e5 [formerly 4df79927ac3468b40b89ab9da3bba59f5a3493e5 [formerly 544fc456679c8a83076e0366d439090f38255cb0 [formerly 20aa228294f3328e14968ea90581e3fffcd8846f]]]]] Former-commit-id: 011953ec6a8c4a09a60c5e834ea9620942722ac8 Former-commit-id: be06a4a952d85a4dec7901f3bf2716440d85fade Former-commit-id: 8c4ab609a945a0bf20602d92ed813182325de4e4 [formerly 1bbc0071a694f5897b03aaf5fd07d7a063b659c0] Former-commit-id: 31fc47297fe920835b766f34e6476a18a1ffc7b4 Former-commit-id: 07e3c87b35b802349e47e9aa7d712b3d3cc9aa69 Former-commit-id: 56e9b47c4acfafa8ef8e97ae08313a6ed7501565 Former-commit-id: aad0acf314eb003fb7c9ab20cc592b67880290a0 Former-commit-id: a0518e652211d611284a0c160ee5468c26c5fe9b --- src/pages/demo/components/scrollbar/index.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/demo/components/scrollbar/index.vue b/src/pages/demo/components/scrollbar/index.vue index 98881d84..bb74c16e 100644 --- a/src/pages/demo/components/scrollbar/index.vue +++ b/src/pages/demo/components/scrollbar/index.vue @@ -15,7 +15,6 @@ -