diff --git a/kernel/model/attribute_view.go b/kernel/model/attribute_view.go index c5eb0e05d..d7c048c8b 100644 --- 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 index b64add327..a0e3acbdd 100644 --- 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 index 297085e74..1e9586358 100644 --- 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] }