Commit 0084f44

committed

0.3.0 scrollTo 接受 null

1 parent 8ce65aa commit 0084f44Copy full SHA for 0084f44

File tree

+110

-90

lines changed

+110

-90

lines changed

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -150,8 +150,8 @@ export default {`
`150`	`150`	`export default {`
`151`	`151`	`methods:{`
`152`	`152`	`scrollTo(){`
`153`		`- // 水平滚50个像素,垂直滚100个像素,在300ms内完成`
`154`		`- this.$refs.ohyeah.scrollTo(50, 100, 300);`
	`153`	`+ // 水平保持原位,垂直滚100个像素,在300ms内完成`
	`154`	`+ this.$refs.ohyeah.scrollTo(null, 100, 300);`
`155`	`155`	`},`
`156`	`156`	`scrollToEnd(){`
`157`	`157`	`// 水平滚到最左边,垂直滚到底,瞬间完成`
`@@ -210,6 +210,7 @@ export default {`
`210`	`210`	`- 那么就需要一个具有高度和宽度的父级元素来包裹ohyeah`
`211`	`211`
`212`	`212`	`### 更新`
	`213`	`+- 0.3.0 this.$refs.ohyeah.scrollTo(null, 100); 传递null表示保持原位不动`
`213`	`214`	`- 0.2.9 处理了一下nuxt.js中使用的情况。修复了卸载组件时没有正确卸载容器监听的方法`
`214`	`215`	`- 2019年05月09日处理了嵌套滚动条的事件冒泡问题`
`215`	`216`	`> 原生滚动条(子)和ohyeah(父)嵌套时,原生滚动条需要设置@wheel.stop, todo: 目前的方案不完美,待升级`

Lines changed: 1 addition & 1 deletion

Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "vue-ohyeah-scroll",`
`3`	`3`	`"description": "prettier scroll",`
`4`		`- "version": "0.2.9",`
	`4`	`+ "version": "0.3.0",`
`5`	`5`	`"author": "L <https://blog.isluo.com>",`
`6`	`6`	`"license": "MIT",`
`7`	`7`	`"private": false,`
`@@ -30,18 +30,18 @@`
`30`	`30`	`"vue": "^2.6.10"`
`31`	`31`	`},`
`32`	`32`	`"devDependencies": {`
`33`		`- "@babel/core": "^7.4.4",`
`34`		`- "@babel/preset-env": "^7.4.4",`
`35`		`- "babel-loader": "^8.0.5",`
	`33`	`+ "@babel/core": "^7.4.5",`
	`34`	`+ "@babel/preset-env": "^7.4.5",`
	`35`	`+ "babel-loader": "^8.0.6",`
`36`	`36`	`"cross-env": "^5.2.0",`
`37`	`37`	`"css-loader": "^2.1.1",`
`38`	`38`	`"file-loader": "^3.0.1",`
`39`	`39`	`"node-sass": "^4.12.0",`
`40`	`40`	`"sass-loader": "^7.1.0",`
`41`	`41`	`"vue-loader": "^15.7.0",`
`42`	`42`	`"vue-template-compiler": "^2.6.10",`
`43`		`- "webpack": "^4.31.0",`
	`43`	`+ "webpack": "^4.32.2",`
`44`	`44`	`"webpack-cli": "^3.3.2",`
`45`		`- "webpack-dev-server": "^3.3.1"`
	`45`	`+ "webpack-dev-server": "^3.4.1"`
`46`	`46`	`}`
`47`	`47`	`}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ export default {`
`96`	`96`	`//console.log("正在滚动:", obj);`
`97`	`97`	`},`
`98`	`98`	`onScrollTo() {`
`99`		`- this.$refs.scroll1.scrollTo("end", "end", 300);`
	`99`	`+ this.$refs.scroll1.scrollTo("end", null, 300);`
`100`	`100`	`},`
`101`	`101`	`onHorStart(obj) {`
`102`	`102`	`console.log("到左了:", obj);`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -383,7 +383,7 @@ export default {`
`383`	`383`	`}`
`384`	`384`	`},`
`385`	`385`
`386`		`- scrollTo(x=0, y=0, time = 0) {`
	`386`	`+ scrollTo(x, y, time = 0) {`
`387`	`387`	`const s_y =`
`388`	`388`	`y === "end"`
`389`	`389`	`? this.trickH - this.barHTall`
`@@ -398,13 +398,13 @@ export default {`
`398`	`398`	`: 0;`
`399`	`399`
`400`	`400`	`this.transSpeed = time;`
`401`		`- if (this.realShowH) {`
	`401`	`+ if (this.realShowH&& (y \|\| y ===0)) {`
`402`	`402`	`this.barHScrollTop = Math.min(`
`403`	`403`	`Math.max(s_y, 0),`
`404`	`404`	`this.trickH - this.barHTall`
`405`	`405`	`);`
`406`	`406`	`}`
`407`		`- if (this.realShowW) {`
	`407`	`+ if (this.realShowW&& (x \|\| x ===0)) {`
`408`	`408`	`this.barWScrollLeft = Math.min(`
`409`	`409`	`Math.max(s_x, 0),`
`410`	`410`	`this.trickW - this.barWTall`

Comments

(0)