Merge remote-tracking branch 'origin/main'

@@ -74,6 +74,10 @@ export struct ZhSingleRow02 {
     }
     }
   }
   }
 
 
+  showMore() {
+    return !!this.compDTO.dataSourceType || !(this.compDTO?.objectType === '0' || this.compDTO?.objectType === '')
+  }
+
   build() {
   build() {
     Column() {
     Column() {
       //顶部
       //顶部
@@ -93,7 +97,7 @@ export struct ZhSingleRow02 {
                 .margin({ right: 8 })
                 .margin({ right: 8 })
             })
             })
           }
           }
-          if (this.compDTO.operDataList.length >= 2 && !(this.compDTO?.objectType === '0' || this.compDTO?.objectType === '')) {
+          if (this.compDTO.operDataList.length >= 2 && this.showMore()) {
             Row() {
             Row() {
               Ellipse()
               Ellipse()
                 .width(2* (this.moreWidth - this.initMoreWidth - 1))
                 .width(2* (this.moreWidth - this.initMoreWidth - 1))
@@ -182,7 +186,7 @@ export struct ZhSingleRow02 {
       .padding({
       .padding({
         right: $r('app.float.card_comp_pagePadding_lf'),
         right: $r('app.float.card_comp_pagePadding_lf'),
       })
       })
-      .visibility(this.compDTO?.objectType === '0' || this.compDTO?.objectType === '' ? Visibility.None : Visibility.Visible)
+      .visibility(this.showMore() ? Visibility.Visible : Visibility.None)
       .onClick(() => {
       .onClick(() => {
         if (this.compDTO?.objectType === '11') {
         if (this.compDTO?.objectType === '11') {
           ProcessUtils.jumpChannelTab(this.compDTO.objectId, this.compDTO.pageId as string, this.compDTO.objectTitle)
           ProcessUtils.jumpChannelTab(this.compDTO.objectId, this.compDTO.pageId as string, this.compDTO.objectTitle)

@@ -150,7 +150,10 @@ export struct ZhSingleRow03 {
         return str.slice(0)
         return str.slice(0)
       }
       }
     }
     }
+  }
 
 
+  showMore() {
+    return !!this.compDTO.dataSourceType || !(this.compDTO?.objectType === '0' || this.compDTO?.objectType === '')
   }
   }
 
 
   build() {
   build() {
@@ -165,7 +168,7 @@ export struct ZhSingleRow03 {
               this.ItemCard(item)
               this.ItemCard(item)
             })
             })
           }
           }
-          if (this.compDTO.operDataList.length >= 2 && !(this.compDTO?.objectType === '0' || this.compDTO?.objectType === '')) {
+          if (this.compDTO.operDataList.length >= 2 && this.showMore()) {
             Row() {
             Row() {
               Ellipse()
               Ellipse()
                 .width(2* (this.moreWidth - this.initMoreWidth - 1))
                 .width(2* (this.moreWidth - this.initMoreWidth - 1))
@@ -401,7 +404,7 @@ export struct ZhSingleRow03 {
           .fontWeight(600)
           .fontWeight(600)
       }
       }
 
 
-      if (!(this.compDTO?.objectType === '0' || this.compDTO?.objectType === '')) {
+      if (this.showMore()) {
         Row() {
         Row() {
           Text("更多")
           Text("更多")
             .fontSize($r("app.float.font_size_14"))
             .fontSize($r("app.float.font_size_14"))