Merge remote-tracking branch 'origin/dev' into dev

TCOTC · May 20, 2024 · ffddff7 · ffddff7
2 parents 05f4ba6 + 4a29d45
commit ffddff7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/kernel/model/attribute_view.go b/kernel/model/attribute_view.go
@@ -588,7 +588,7 @@ func GetBlockAttributeViewKeys(blockID string) (ret []*BlockAttributeViewKeys) {
 
 		ret = append(ret, &BlockAttributeViewKeys{
 			AvID:      avID,
-			AvName:    attrView.Name,
+			AvName:    getAttrViewName(attrView),
 			BlockIDs:  blockIDs,
 			KeyValues: keyValues,
 		})
@@ -3228,7 +3228,7 @@ func getAttrViewViewByBlockID(attrView *av.AttributeView, blockID string) (ret *
 }
 
 func getAttrViewName(attrView *av.AttributeView) string {
-	ret := attrView.Name
+	ret := strings.TrimSpace(attrView.Name)
 	if "" == ret {
 		ret = Conf.language(105)
 	}

diff --git a/kernel/model/export.go b/kernel/model/export.go
@@ -74,11 +74,7 @@ func ExportAv2CSV(avID, blockID string) (zipPath string, err error) {
 		return
 	}
 
-	name := util.FilterFileName(attrView.Name)
-	if "" == name {
-		name = Conf.language(105)
-	}
-
+	name := util.FilterFileName(getAttrViewName(attrView))
 	table, err := sql.RenderAttributeViewTable(attrView, view, "", GetBlockAttrsWithoutWaitWriting)
 	if nil != err {
 		logging.LogErrorf("render attribute view [%s] table failed: %s", avID, err)

diff --git a/kernel/sql/av.go b/kernel/sql/av.go
@@ -630,7 +630,7 @@ func getRowBlockValue(keyValues []*av.KeyValues) (ret *av.Value) {
 }
 
 func getAttrViewName(attrView *av.AttributeView) string {
-	ret := attrView.Name
+	ret := strings.TrimSpace(attrView.Name)
 	if "" == ret {
 		ret = util.Langs[util.Lang][105]
 	}