Showing
1 changed file
with
24 additions
and
14 deletions
| @@ -175,21 +175,30 @@ export struct LiveHorizontalCardComponent { | @@ -175,21 +175,30 @@ export struct LiveHorizontalCardComponent { | ||
| 175 | }) | 175 | }) |
| 176 | }) | 176 | }) |
| 177 | } | 177 | } |
| 178 | - if (this.compDTO.operDataList.length >= 2) { | ||
| 179 | - Column() { | ||
| 180 | - if (this.moreWidth > this.initMoreWidth + 2) { | ||
| 181 | - Text(this.moreTips) | ||
| 182 | - .fontSize(8) | ||
| 183 | - .fontColor(0x858585) | ||
| 184 | - .width(8) | 178 | + if (this.compDTO.operDataList.length >= 2 && !(this.compDTO?.objectType === '0' || this.compDTO?.objectType === '')) { |
| 179 | + Row() { | ||
| 180 | + Ellipse() | ||
| 181 | + .width(2* (this.moreWidth - this.initMoreWidth - 1)) | ||
| 182 | + .height('100%') | ||
| 183 | + .fill(0xe9e9e9) | ||
| 184 | + .position({ left: -(this.moreWidth - this.initMoreWidth - 3) * 0.8 , top: 0 }) | ||
| 185 | + | ||
| 186 | + Column() { | ||
| 187 | + if (this.moreWidth > this.initMoreWidth + 2) { | ||
| 188 | + Text(this.moreTips) | ||
| 189 | + .fontSize(8) | ||
| 190 | + .fontColor(0x858585) | ||
| 191 | + .width(8) | ||
| 192 | + } | ||
| 185 | } | 193 | } |
| 194 | + .justifyContent(FlexAlign.Center) | ||
| 195 | + .align(Alignment.Center) | ||
| 196 | + .height('100%') | ||
| 197 | + .width(this.initMoreWidth) | ||
| 198 | + .backgroundColor(0xe9e9e9) | ||
| 199 | + .borderRadius({ topLeft: 5, bottomLeft: 5 }) | ||
| 186 | } | 200 | } |
| 187 | - .justifyContent(FlexAlign.Center) | ||
| 188 | - .align(Alignment.Center) | ||
| 189 | - .width(this.moreWidth) | ||
| 190 | - .backgroundColor(0xf1f3f4) | ||
| 191 | - .borderRadius({ topLeft: 5, bottomLeft: 5 }) | ||
| 192 | - .height(this.compDTO.operDataList.length == 2 ? 180 : 146) | 201 | + .margin({left: 1.5 * (this.moreWidth - this.initMoreWidth)}) |
| 193 | } | 202 | } |
| 194 | } | 203 | } |
| 195 | } | 204 | } |
| @@ -201,7 +210,7 @@ export struct LiveHorizontalCardComponent { | @@ -201,7 +210,7 @@ export struct LiveHorizontalCardComponent { | ||
| 201 | this.edgeAnimation() | 210 | this.edgeAnimation() |
| 202 | }) | 211 | }) |
| 203 | .onScrollStop(() => { | 212 | .onScrollStop(() => { |
| 204 | - // this.resetEdgeAnimation(); | 213 | + this.resetEdgeAnimation(); |
| 205 | }) | 214 | }) |
| 206 | .onScroll((xOffset: number, yOffset: number) => { | 215 | .onScroll((xOffset: number, yOffset: number) => { |
| 207 | if (xOffset < 0) { | 216 | if (xOffset < 0) { |
| @@ -211,6 +220,7 @@ export struct LiveHorizontalCardComponent { | @@ -211,6 +220,7 @@ export struct LiveHorizontalCardComponent { | ||
| 211 | .onTouch((event?: TouchEvent) => { | 220 | .onTouch((event?: TouchEvent) => { |
| 212 | if(event) { | 221 | if(event) { |
| 213 | if (event.type === TouchType.Up) { | 222 | if (event.type === TouchType.Up) { |
| 223 | + this.toMore(); | ||
| 214 | this.resetEdgeAnimation(); | 224 | this.resetEdgeAnimation(); |
| 215 | } | 225 | } |
| 216 | } | 226 | } |
-
Please register or login to post a comment