developOne / harmonyPool

Go to a project
Toggle navigation Toggle navigation pinning
yumaochao
3d70f919 1 parent be7b05e1

fix：somebug

Inline Side-by-side
Showing 2 changed files with 26 additions and 24 deletions
@@ -50,17 +50,27 @@ export struct Card2Component { @@ -50,17 +50,27 @@ export struct Card2Component {
50 Column() { 50 Column() {
51 Column() { 51 Column() {
52 Stack() { 52 Stack() {
  53 + // if(this.contentDTO.objectType == '5'){
  54 + // Notes({ objectType: this.contentDTO.objectType }).height(30).align(Alignment.Center)
  55 + // }else if(this.contentDTO.objectType == '2'){
  56 + // if(this.contentDTO.seoTags){
  57 + // Notes({ newTags: this.contentDTO.seoTags }).height(30).align(Alignment.Center)
  58 + // }else if(this.contentDTO.newTags){
  59 + // Notes({ newTags: this.contentDTO.newTags }).height(30).align(Alignment.Center)
  60 + //
  61 + // }
  62 + // }else {
  63 + // if(this.contentDTO.newTags){
  64 + // Notes({ newTags: this.contentDTO.newTags }).height(30).align(Alignment.Center)
  65 + // }
  66 + // }
53 if(this.contentDTO.objectType == '5'){ 67 if(this.contentDTO.objectType == '5'){
54 Notes({ objectType: this.contentDTO.objectType }).height(30).align(Alignment.Center) 68 Notes({ objectType: this.contentDTO.objectType }).height(30).align(Alignment.Center)
55 - }else if(this.contentDTO.objectType == '2'){  
56 - if(this.contentDTO.seoTags){ 69 + } else {
  70 + if (this.contentDTO.seoTags) {
57 Notes({ newTags: this.contentDTO.seoTags }).height(30).align(Alignment.Center) 71 Notes({ newTags: this.contentDTO.seoTags }).height(30).align(Alignment.Center)
58 - }else if(this.contentDTO.newTags){  
59 - Notes({ newTags: this.contentDTO.newTags }).height(30).align(Alignment.Center)  
60 -  
61 } 72 }
62 - }else {  
63 - if(this.contentDTO.newTags){ 73 + if (this.contentDTO.newTags) {
64 Notes({ newTags: this.contentDTO.newTags }).height(30).align(Alignment.Center) 74 Notes({ newTags: this.contentDTO.newTags }).height(30).align(Alignment.Center)
65 } 75 }
66 } 76 }
@@ -89,8 +99,9 @@ export struct Card2Component { @@ -89,8 +99,9 @@ export struct Card2Component {
89 .lineHeight(27) 99 .lineHeight(27)
90 .textOverflow({ overflow: TextOverflow.Ellipsis }) // 超出的部分显示省略号。 100 .textOverflow({ overflow: TextOverflow.Ellipsis }) // 超出的部分显示省略号。
91 .align(Alignment.Start) 101 .align(Alignment.Start)
92 - .textIndent( (this.contentDTO.objectType === '2' && (this.contentDTO.newTags?.length || this.contentDTO.seoTags?.length) > 2 && (this.contentDTO.newTags?.length || this.contentDTO.seoTags?.length) < 5) ? 58 :  
93 - (this.contentDTO.objectType === '2' && (this.contentDTO.newTags?.length || this.contentDTO.seoTags?.length) > 0 || this.contentDTO.objectType === '5') ? 35 : 102 + .textIndent((this.contentDTO.newTags?.length || this.contentDTO.seoTags?.length) > 2 &&
  103 + (this.contentDTO.newTags?.length || this.contentDTO.seoTags?.length) < 5 ? 58 :
  104 + ((this.contentDTO.newTags?.length > 0 || this.contentDTO.seoTags?.length > 0) || this.contentDTO.objectType == '5') ? 35 :
94 0 ) 105 0 )
95 }.alignContent(Alignment.TopStart) 106 }.alignContent(Alignment.TopStart)
96 107
@@ -32,19 +32,6 @@ export struct Card6Component { @@ -32,19 +32,6 @@ export struct Card6Component {
32 this.loadImg = await onlyWifiLoadImg(); 32 this.loadImg = await onlyWifiLoadImg();
33 this.clicked = hasClicked(this.contentDTO.objectId) 33 this.clicked = hasClicked(this.contentDTO.objectId)
34 } 34 }
35 - calculateTextIndent() {  
36 - if (this.contentDTO?.newTags?.length < 5 && this.contentDTO?.newTags?.length > 2) {  
37 - return 58;  
38 - } else if ((this.contentDTO.newTags?.length !== 0) || (this.contentDTO.seoTags?.length !== 0)) {  
39 - // 当newTags或seoTags存在时，应用相同的缩进  
40 - return 35;  
41 - } else if (this.contentDTO.objectType == '5') {  
42 - return 35;  
43 - } else {  
44 - return 0;  
45 - }  
46 - }  
47 -  
48 titleInit() { 35 titleInit() {
49 if (this.contentDTO.title?.includes('<em>') && this.contentDTO.title?.includes('</em>')) { 36 if (this.contentDTO.title?.includes('<em>') && this.contentDTO.title?.includes('</em>')) {
50 this.titleMarked = true; 37 this.titleMarked = true;
@@ -74,7 +61,8 @@ export struct Card6Component { @@ -74,7 +61,8 @@ export struct Card6Component {
74 } else { 61 } else {
75 if (this.contentDTO.seoTags) { 62 if (this.contentDTO.seoTags) {
76 Notes({ newTags: this.contentDTO.seoTags }).height(30).align(Alignment.Center) 63 Notes({ newTags: this.contentDTO.seoTags }).height(30).align(Alignment.Center)
77 - } else if (this.contentDTO.newTags) { 64 + }
  65 + if (this.contentDTO.newTags) {
78 Notes({ newTags: this.contentDTO.newTags }).height(30).align(Alignment.Center) 66 Notes({ newTags: this.contentDTO.newTags }).height(30).align(Alignment.Center)
79 } 67 }
80 } 68 }
@@ -97,7 +85,10 @@ export struct Card6Component { @@ -97,7 +85,10 @@ export struct Card6Component {
97 .maxLines(3) 85 .maxLines(3)
98 .alignSelf(ItemAlign.Start) 86 .alignSelf(ItemAlign.Start)
99 .textOverflow({ overflow: TextOverflow.Ellipsis }) // 超出的部分显示省略号。 87 .textOverflow({ overflow: TextOverflow.Ellipsis }) // 超出的部分显示省略号。
100 - .textIndent(this.calculateTextIndent()) 88 + .textIndent((this.contentDTO.newTags?.length || this.contentDTO.seoTags?.length) > 2 &&
  89 + (this.contentDTO.newTags?.length || this.contentDTO.seoTags?.length) < 5 ? 58 :
  90 + ((this.contentDTO.newTags?.length > 0 || this.contentDTO.seoTags?.length > 0) || this.contentDTO.objectType == '5') ? 35 :
  91 + 0 )
101 }.alignContent(Alignment.TopStart) 92 }.alignContent(Alignment.TopStart)
102 93
103 } 94 }