Skip to content

Commit

Permalink
fix(swiper-layout): Fixed jumping when sliding coordinates moved
Browse files Browse the repository at this point in the history
  • Loading branch information
mulinJiao committed Jan 28, 2022
1 parent 5e09dbf commit 8fc4a33
Show file tree
Hide file tree
Showing 19 changed files with 629 additions and 70 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@
/entry/.preview
.cxx
/node_modules
/entry/node_modules
33 changes: 33 additions & 0 deletions entry/package-lock.json

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

22 changes: 22 additions & 0 deletions entry/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"version": "0.0.1",
"main": "index.js",
"devDependencies": {
"@oho-ui/progress": "file:../package/progress",
"@oho-ui/swiper-layout": "file:../package/swiper-layout",
"oho-ui": "file:../package/oho-ui"
},
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"repository": {
"type": "git",
"url": "git+https://github.com/originjs/oho-ui.git"
},
"author": "",
"license": "ISC",
"bugs": {
"url": "https://github.com/originjs/oho-ui/issues"
},
"homepage": "https://github.com/originjs/oho-ui#readme"
}
2 changes: 0 additions & 2 deletions entry/src/main/ets/default/pages/index.ets
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ import router from '@system.router';
@Entry
@Component
struct Index {

@State historyInput:string = '123'
build() {
Column() {
Row({space: 30}){
Expand Down
2 changes: 1 addition & 1 deletion entry/src/main/ets/default/pages/progressDem.ets
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { OhProgress } from '@oho-ui/progress'
import { OhProgress } from 'oho-ui'
import router from '@system.router';
@Entry
@Component
Expand Down
5 changes: 3 additions & 2 deletions entry/src/main/ets/default/pages/swiperLayoutDem.ets
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import router from '@system.router';
import { OhSwiperLayout, Item, Render } from '@oho-ui/swiper-layout'
import { OhSwiperLayout, Item, Render } from 'oho-ui'

@Entry
@Component
Expand Down Expand Up @@ -37,7 +37,7 @@ export struct SwiperLayoutDem{
@Builder body () {
Row() {
Text('这是主视窗').fontSize(30)
}.width('100%').backgroundColor('#ff5722')
}.width('100%').height('100%').backgroundColor('#ff5722')
}

@Builder floatLayer () {
Expand Down Expand Up @@ -68,6 +68,7 @@ export struct SwiperLayoutDem{
}.width('70%')
Row() {}.width('15%')
}
.zIndex(10)
}
}
}
60 changes: 8 additions & 52 deletions package-lock.json

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

1 change: 1 addition & 0 deletions package/oho-ui/node_modules/@oho-ui/progress/index.ets

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

7 changes: 7 additions & 0 deletions package/oho-ui/node_modules/@oho-ui/progress/package.json

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

53 changes: 53 additions & 0 deletions package/oho-ui/node_modules/@oho-ui/progress/src/cirProgress.ets

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

42 changes: 42 additions & 0 deletions package/oho-ui/node_modules/@oho-ui/progress/src/lineProgess.ets

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

Loading

0 comments on commit 8fc4a33

Please sign in to comment.