Skip to content

Commit 9a4a6aa

Browse files
committed
Merge branch 'dev' of github.com:wangyi7099/vuescroll into dev
2 parents 50a458b + e475452 commit 9a4a6aa

File tree

3 files changed

+17
-11
lines changed

3 files changed

+17
-11
lines changed

README-ZH.md

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
## 介绍
1313

14-
Vuescroll 是一个可定制的, 跨平台的,可以和第三方 UI 框架兼容的,基于 Vue.js 的虚拟滚动条。它创造了div用于包裹要滚动的内容,充当滚动条,然后操作div完成滚动。 设计它的目的是用来美化和增强你的滚动条的。
14+
Vuescroll 是一个可定制的, 跨平台的,可以和第三方 UI 框架兼容的,基于 Vue.js 的虚拟滚动条。它创造了 div 用于包裹要滚动的内容,充当滚动条,然后操作 div 完成滚动。 设计它的目的是用来美化和增强你的滚动条的。
1515

1616
你可以根据自己的喜好,需要来选择不同的模式:
1717

@@ -36,7 +36,7 @@ Vuescroll 是一个可定制的, 跨平台的,可以和第三方 UI 框架
3636
## Demo & 文档
3737

3838
* 你可以浏览这个 repo 的根目录下的 Demo 文件夹。
39-
* 详细的 Demo, 文档: 请访问 [官方地址](https://wangyi7099.github.io/vuescrolljs/zh/).
39+
* 详细的 Demo, 文档: 请访问 [官方地址](https://wangyi7099.github.io/vuescrolljs/zh/Demo/).
4040

4141
## 特点
4242

@@ -127,9 +127,12 @@ const vm = new Vue({
127127
Vuescroll 是极其容易扩展的,你基本只需要做 2 步即可。
128128

129129
1.[global-config.js](https://github.com/wangyi7099/vuescroll/blob/dev/src/shared/global-config.js) 文件中对应的模块处修改/增加对应的特性,比如,我想增加一个可以配置滚动面板颜色的特性,默认是红色,如下图:
130+
<br>
130131
![](https://github.com/wangyi7099/pictureCdn/blob/master/allPic/vuescroll/s1.jpg?raw=true)
131132
2. 找到对应的模块文件, 并在模块的对应的代码处修改即可,如下图:
133+
<br>
132134
![](https://github.com/wangyi7099/pictureCdn/blob/master/allPic/vuescroll/s2.jpg?raw=true)
135+
<br>
133136
![](https://github.com/wangyi7099/pictureCdn/blob/master/allPic/vuescroll/s3.jpg?raw=true)
134137

135138
### Git 层面
@@ -147,9 +150,10 @@ Vuescroll 是极其容易扩展的,你基本只需要做 2 步即可。
147150

148151
## 灵感来源
149152

150-
* [slimscroll](https://github.com/rochal/jQuery-slimScroll)
151-
* [element-ui](https://github.com/ElemeFE/element/tree/dev/packages/scrollbar/src)
152-
* [scroller](https://github.com/pbakaus/scroller)
153+
* [slimscroll](http://rocha.la/jQuery-slimScroll)
154+
* [element-ui](http://element.eleme.io/#/zh-CN/component/installation)
155+
* [scroller](http://zynga.github.io/scroller/)
156+
* [CodePen](https://codepen.io/wangyi7099/pen/YLVBNe)
153157

154158
## 协议
155159

README.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ In a word, Vuescroll is not only a scrollbar, but you can use to make a carousel
3939
## Demo & Documentation
4040

4141
* You can find Demo under the root of this repo.
42-
* For detailed demo and documentation: Please visit [Offical Website](https://wangyi7099.github.io/vuescrolljs/).
42+
* For detailed demo and documentation: Please visit [Offical Website](https://wangyi7099.github.io/vuescrolljs/Demo/).
4343

4444
## Features
4545

@@ -133,6 +133,7 @@ Vuescroll is extremely easy to expand.You only have to do 2 steps
133133
![](https://github.com/wangyi7099/pictureCdn/blob/master/allPic/vuescroll/s1.jpg?raw=true)
134134
2. Find the corresponding module file and modify it in the corresponding code of the module, as follows:
135135
![](https://github.com/wangyi7099/pictureCdn/blob/master/allPic/vuescroll/s2.jpg?raw=true)
136+
<br>
136137
![](https://github.com/wangyi7099/pictureCdn/blob/master/allPic/vuescroll/s3.jpg?raw=true)
137138

138139
### Git level
@@ -151,9 +152,10 @@ Vuescroll is extremely easy to expand.You only have to do 2 steps
151152

152153
## Inspired By
153154

154-
* [slimscroll](https://github.com/rochal/jQuery-slimScroll)
155-
* [element-ui](https://github.com/ElemeFE/element/tree/dev/packages/scrollbar/src)
156-
* [scroller](https://github.com/pbakaus/scroller)
155+
* [slimscroll](http://rocha.la/jQuery-slimScroll)
156+
* [element-ui](http://element.eleme.io/#/zh-CN/component/installation)
157+
* [scroller](http://zynga.github.io/scroller/)
158+
* [CodePen](https://codepen.io/wangyi7099/pen/YLVBNe)
157159

158160
## License
159161

src/third-party/README.MD

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
#### This directory contains core or one of modules of third-party libraries.
1+
#### The following is the third party library used by Vuescroll and its corresponding module.
22

33
| Libarary Name | Module |
44
| --------------- | ------------- |
5-
| Scroller | core |
5+
| Scroller | core, animate |
66
| Smooth-scroll | easingPattern |
77
| resize-detector | injectObject |

0 commit comments

Comments
 (0)