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

app/appearance/langs/en_US.json

@@ -743,7 +743,7 @@
   "moveToLeft": "Move Left",
   "moveToRight": "Move Right",
   "copyProtocol": "Copy block hyperlink",
-  "copyProtocolInMd": "Copy block hyperlink (Markdown)",
+  "copyProtocolInMd": "Copy block Markdown link",
   "uploadAssets2CDN": "Upload asset files to cloud",
   "uploadAssets2CDNConfirmTip": "Are you sure to upload the assets in this document to the cloud?",
   "notSupport1": "Does not support drag and drop across notebooks",

app/appearance/langs/es_ES.json

@@ -743,7 +743,7 @@
   "moveToLeft": "Mover a la izquierda",
   "moveToRight": "Mover a la derecha",
   "copyProtocol": "Copiar hipervínculo de bloque",
-  "copyProtocolInMd": "Copiar hipervínculo de bloque (Markdown)",
+  "copyProtocolInMd": "Copiar enlace de bloque de Markdown",
   "uploadAssets2CDN": "Subir archivos de activos a la nube",
   "uploadAssets2CDNConfirmTip": "¿Está seguro de cargar los recursos de este documento en la nube?",
   "notSupport1": "No admite la función de arrastrar y soltar en los cuadernos",

app/appearance/langs/fr_FR.json

@@ -743,7 +743,7 @@
   "moveToLeft": "vers la Gauche",
   "moveToRight": "vers la Droite",
   "copyProtocol": "Copier bloc d'hyperliens",
-  "copyProtocolInMd": "Copier bloc d'hyperliens (Markdown)",
+  "copyProtocolInMd": "Copier le lien Markdown du bloc",
   "uploadAssets2CDN": "Transférer les fichiers asset vers le Cloud",
   "uploadAssets2CDNConfirmTip": "Êtes-vous sûr de télécharger les ressources de ce document dans le cloud ?",
   "notSupport1": "Le glisser-déposer entre carnets n'est pas pris en charge",

app/appearance/langs/zh_CHT.json

@@ -743,7 +743,7 @@
   "moveToLeft": "向左移",
   "moveToRight": "向右移",
   "copyProtocol": "複製塊超連結",
-  "copyProtocolInMd": "複製塊超連結（Markdown）",
+  "copyProtocolInMd": "複製塊 Markdown 連結",
   "uploadAssets2CDN": "上傳資料檔到圖床",
   "uploadAssets2CDNConfirmTip": "確定將該文檔內的資源文件上傳到圖床嗎？",
   "notSupport1": "不支援跨筆記本進行拖拽",

app/appearance/langs/zh_CN.json

@@ -743,7 +743,7 @@
   "moveToLeft": "向左移",
   "moveToRight": "向右移",
   "copyProtocol": "复制块超链接",
-  "copyProtocolInMd": "复制块超链接（Markdown）",
+  "copyProtocolInMd": "复制块 Markdown 链接",
   "uploadAssets2CDN": "上传资源文件到图床",
   "uploadAssets2CDNConfirmTip": "确定将该文档内的资源文件上传到图床吗？",
   "notSupport1": "不支持跨笔记本进行拖拽",

kernel/treenode/node.go

@@ -182,7 +182,8 @@ func NodeStaticContent(node *ast.Node, excludeTypes []string, includeTextMarkATi
 			return getAttributeViewContent(node.AttributeViewID)
 		}
 
-		return getAttributeViewName(node.AttributeViewID)
+		ret, _ := av.GetAttributeViewName(node.AttributeViewID)
+		return ret
 	}
 
 	buf := bytes.Buffer{}
@@ -566,28 +567,6 @@ func GetAttributeViewName(avID string) (name string) {
 	return
 }
 
-func getAttributeViewName(avID string) (name string) {
-	if "" == avID {
-		return
-	}
-
-	attrView, err := av.ParseAttributeView(avID)
-	if nil != err {
-		logging.LogErrorf("parse attribute view [%s] failed: %s", avID, err)
-		return
-	}
-
-	buf := bytes.Buffer{}
-	buf.WriteString(attrView.Name)
-	buf.WriteByte(' ')
-	for _, v := range attrView.Views {
-		buf.WriteString(v.Name)
-		buf.WriteByte(' ')
-	}
-	name = strings.TrimSpace(buf.String())
-	return
-}
-
 func getAttributeViewContent(avID string) (content string) {
 	if "" == avID {
 		return