From ab188fdeab593ce90b6e3e70287ea8363b30ca00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=88=90=E6=9E=97?= Date: Fri, 25 Jan 2019 15:32:34 +0800 Subject: [PATCH] add Scroller --- src/assets/img/loading.png | Bin 0 -> 559 bytes src/config.json | 35 ++-- src/packages/scroller/demo.vue | 200 +++++++++++++++++++ src/packages/scroller/doc.md | 0 src/packages/scroller/horizontal-scroll.vue | 173 ++++++++++++++++ src/packages/scroller/index.js | 8 + src/packages/scroller/scroller.scss | 62 ++++++ src/packages/scroller/scroller.vue | 81 ++++++++ src/packages/scroller/vertical-scroll.vue | 208 ++++++++++++++++++++ 9 files changed, 754 insertions(+), 13 deletions(-) create mode 100644 src/assets/img/loading.png create mode 100644 src/packages/scroller/demo.vue create mode 100644 src/packages/scroller/doc.md create mode 100644 src/packages/scroller/horizontal-scroll.vue create mode 100644 src/packages/scroller/index.js create mode 100644 src/packages/scroller/scroller.scss create mode 100644 src/packages/scroller/scroller.vue create mode 100644 src/packages/scroller/vertical-scroll.vue diff --git a/src/assets/img/loading.png b/src/assets/img/loading.png new file mode 100644 index 0000000000000000000000000000000000000000..f24dd65ac6ef3112a965c0e958f56247fcfa36c7 GIT binary patch literal 559 zcmeAS@N?(olHy`uVBq!ia0vp^Rv^s53?#3m?vesh_5nU2u0Z;W2LDGj!H+6@pH%pO zBpiJ}V#5S^VGO7;Pj1arpb?@aL4Lsu+~O|E#Zgnt)9>tAuXoyi(f5vqm(^bREes5d zU7jwEAs)xCUb>j~M1jX4FsJ$8Ne0Ca|L^ZI2-dutyP0#{l~vzUiEMa?fS1Qp4?yEeC9g0QetPZRF}CM7e70`;W~FQ2?$_tLtX(PTS<}+3AGZaz zoJrXyYQC)dM&zlbHpluo&IIW!{kqrnhR^mXO^>I2vWfLpOrDuJFK_9G1&Q;11s!pD zX5s%mXwIa*zSjLym5entpUmmq@-? zwVhWnV(HPmkL+uB4WrifR&~#fx)8ZR`A3th?6Kvp464TjzZ_F4&ffpxK-Wuy2iY6e baerr5@!>zl*0ZG+7;Oxmu6{1-oD!M<@Z$ml literal 0 HcmV?d00001 diff --git a/src/config.json b/src/config.json index def6c938a..1c697ec51 100644 --- a/src/config.json +++ b/src/config.json @@ -359,25 +359,34 @@ "author": "Vicky.Ye" }, { - "version":"1.0.0", - "name":"ShortPassword", - "chnName":"短密码", - "des":"短密码", - "type":"component", - "sort":"1", + "version": "1.0.0", + "name": "ShortPassword", + "chnName": "短密码", + "des": "短密码", + "type": "component", + "sort": "1", "showDemo": true, "author": "wangnan31" - }, { - "version":"1.0.0", - "name":"Skeleton", - "chnName":"骨架屏", - "des":"在页面上待加载区域填充灰色的占位图,本质上是界面加载过程中的过渡效果", - "type":"component", - "sort":"0", + "version": "1.0.0", + "name": "Skeleton", + "chnName": "骨架屏", + "des": "在页面上待加载区域填充灰色的占位图,本质上是界面加载过程中的过渡效果", + "type": "component", + "sort": "0", "showDemo": true, "author": "wangnan31" + }, + { + "version": "1.0.0", + "name": "Scroller", + "chnName": "滚动", + "desc": "滚动组件", + "type": "component", + "sort": "1", + "showDemo": true, + "author": "iris" } ] } \ No newline at end of file diff --git a/src/packages/scroller/demo.vue b/src/packages/scroller/demo.vue new file mode 100644 index 000000000..a601098cd --- /dev/null +++ b/src/packages/scroller/demo.vue @@ -0,0 +1,200 @@ + + + + + diff --git a/src/packages/scroller/doc.md b/src/packages/scroller/doc.md new file mode 100644 index 000000000..e69de29bb diff --git a/src/packages/scroller/horizontal-scroll.vue b/src/packages/scroller/horizontal-scroll.vue new file mode 100644 index 000000000..96f70e918 --- /dev/null +++ b/src/packages/scroller/horizontal-scroll.vue @@ -0,0 +1,173 @@ + + + diff --git a/src/packages/scroller/index.js b/src/packages/scroller/index.js new file mode 100644 index 000000000..907da9ed0 --- /dev/null +++ b/src/packages/scroller/index.js @@ -0,0 +1,8 @@ +import Scroller from './scroller.vue'; +import './scroller.scss'; + +Scroller.install = function(Vue) { + Vue.component(Scroller.name, Scroller); +}; + +export default Scroller \ No newline at end of file diff --git a/src/packages/scroller/scroller.scss b/src/packages/scroller/scroller.scss new file mode 100644 index 000000000..974f897ed --- /dev/null +++ b/src/packages/scroller/scroller.scss @@ -0,0 +1,62 @@ +@import "../../styles/animation/rotate"; + +.nut-scroller{ + display: flex; + height: 100%; +} +// 横向滚动 +.nut-hor-scroll{ + height: 100%; + width: 100%; + overflow: hidden; + .nut-hor-list{ + height: 100%; + display: flex; + flex-direction: row; + box-orient: horizontal; + box-direction: normal; + } + .nut-hor-control{ + height: 100%; + } +} + +// 竖向滚动 +.nut-vert-scroll{ + flex: 1; + overflow: hidden; + .nut-vert-list{ + width: 100%; + position: relative; + } + .nut-vert-pulldown{ + position: absolute; + top: -50px; + width: 100%; + } + .nut-vert-loadmore, .nut-vert-pulldown, .nut-vert-unloadmore{ + height: 50px; + text-align: center; + line-height: 50px; + font-size: 12px; + color: $text-color; + .nut-vert-pulldown-status, .nut-vert-loadmore-status{ + height: 50px; + } + .nut-vert-loading{ + height: 20px; + width: 20px; + background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADoAAAA6CAMAAADWZboaAAAAP1BMVEUAAAD0KA/xJhHxJA7yJA7xJA7xJA7xJA7xJA7wJA7xJA7xJA7xJA7xJA7xJA7xJA3xJA7xJA7xJA7xJA7xJA5JCyllAAAAFXRSTlMACxdEI3NalDdn3LyvLstPoveIgOl7Sm+EAAABiklEQVRIx9XS0W7kIAxAUWyDwckAIfD/37owUyndbbMJrtSq92UeoiMbGHMWRqKciSKamSw5v23b462d7T0HVIc76NrbGK8h+153vgozi9u39ZW7wOSfSYB3pyY3JqdV4ByiG86FTw6xrSmlx+mZ4757X8PJPo/Uo5OPe4/MaTwGy6dfOvz/VeAY7OGjrPvOcHH9PqXFf9i21krmMrcsi/vnhg55bfPfr1Irm1v5bqM5ElcF7lFYl2WF46DOOTA3w/TuuNBlMLeTvjIeQ8XcD9LS9mOoNRPl1t7GBufYTLW29jotP4dOjk2mhyJi5oKltfG2UYTMZL4VN6aL2FnKpTzGjwjMUiyl9b1F2Ey3lILjlvI8XUshY5lpnm6l8KBhnvpSxETmOE/3UpySjo6Fv5UiMykp5JyNsk5BSUPOqL2nnKP2sERklHWq3pgoaDf+nWPVfwsK6rcNIVilxW7xB6wNMVqtjXqLnVrQWbAj+IJFHcanRQAlxhH0xiJza7/owIrpMOBrsK4L9wckTA/GBoy0fQAAAABJRU5ErkJggg==) no-repeat 0 0; + background-size: 100%; + animation: rotation 2s linear infinite; + } + .nut-vert-loading-txt{ + height: 50px; + padding-left: 5px; + } + .nut-vert-loading, .nut-vert-loading-txt{ + display: inline-block; + vertical-align: middle; + } + } +} \ No newline at end of file diff --git a/src/packages/scroller/scroller.vue b/src/packages/scroller/scroller.vue new file mode 100644 index 000000000..b127aadd8 --- /dev/null +++ b/src/packages/scroller/scroller.vue @@ -0,0 +1,81 @@ + + \ No newline at end of file diff --git a/src/packages/scroller/vertical-scroll.vue b/src/packages/scroller/vertical-scroll.vue new file mode 100644 index 000000000..a4936f88b --- /dev/null +++ b/src/packages/scroller/vertical-scroll.vue @@ -0,0 +1,208 @@ + + + -- GitLab