Merge remote-tracking branch 'forke-siyuan/dev' into v0.30

app/appearance/langs/en_US.json

@@ -378,7 +378,7 @@
   "sortByRankDesc": "Relevance DESC",
   "sortByRankAsc": "Relevance ASC",
   "saveCriterion": "Save query criteria",
-  "useCriterion": "After clearing, the last query condition can be used",
+  "useCriterion": "Search criteria will be saved for next query",
   "removeCriterion": "Remove query criteria",
   "group": "Group",
   "noGroupBy": "No grouping",

app/appearance/langs/es_ES.json

@@ -378,7 +378,7 @@
   "sortByRankDesc": "Relevancia DESC",
   "sortByRankAsc": "Relevancia ASC",
   "saveCriterion": "Guardar criterios de consulta",
-  "useCriterion": "Después de borrar, se puede usar la última condición de consulta",
+  "useCriterion": "Los criterios de búsqueda se guardarán para la siguiente consulta",
   "removeCriterion": "Eliminar criterios de consulta",
   "grupo": "Grupo",
   "noGroupBy": "Sin agrupar",

app/appearance/langs/fr_FR.json

@@ -378,7 +378,7 @@
   "sortByRankDesc": "DESC de pertinence",
   "sortByRankAsc": "ASC de pertinence",
   "saveCriterion": "Enregistrer les critères de requête",
-  "useCriterion": "Après effacement, la dernière condition de requête peut être utilisée",
+  "useCriterion": "Les critères de recherche seront enregistrés pour la prochaine requête",
   "removeCriterion": "Supprimer les critères de requête",
   "groupe": "Groupe",
   "noGroupBy": "Aucun regroupement",

app/appearance/langs/zh_CHT.json

@@ -378,7 +378,7 @@
   "sortByRankDesc": "按相關度降序",
   "sortByRankAsc": "按相關度升序",
   "saveCriterion": "保存查詢條件",
-  "useCriterion": "清空後可使用上一次的查詢條件",
+  "useCriterion": "搜尋條件將保存到下次查詢中",
   "removeCriterion": "清空查詢條件",
   "group": "分組",
   "noGroupBy": "不分組",

app/appearance/langs/zh_CN.json

@@ -379,7 +379,7 @@
   "sortByRankDesc": "按相关度降序",
   "sortByRankAsc": "按相关度升序",
   "saveCriterion": "保存查询条件",
-  "useCriterion": "清空后可使用上一次的查询条件",
+  "useCriterion": "搜索条件将保存到下一次查询中",
   "removeCriterion": "清空查询条件",
   "group": "分组",
   "noGroupBy": "不分组",

app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sillot",
-  "version": "0.30.1210",
+  "version": "0.30.1300",
   "syv": "3.0.11",
   "sypv": "[]",
   "description": "Build Your Eternal Digital Garden",

app/src/layout/dock/Backlink.ts

@@ -595,8 +595,7 @@ export class Backlink extends Model {
                         this.status[this.blockId].backlinkMOpenIds.push(data.backmentions[index].id);
                     }
                 });
-                if (window.siyuan.config.editor.backmentionExpandCount === 0) {
-                    // 设置为 0 时需折叠
+                if (data.mentionsCount === 0) {
                     this.status[this.blockId].backlinkMStatus = 3;
                 } else {
                     if (data.linkRefsCount === 0) {

app/src/protyle/render/av/action.ts

@@ -30,6 +30,7 @@ import {avRender} from "./render";
 import {addView, openViewMenu} from "./view";
 import {isOnlyMeta, writeText} from "../../util/compatibility";
 import {openSearchAV} from "./relation";
+import {Constants} from "../../../constants";
 
 export const avClick = (protyle: IProtyle, event: MouseEvent & { target: HTMLElement }) => {
     window.sout.tracker("invoked");
@@ -89,7 +90,9 @@ export const avClick = (protyle: IProtyle, event: MouseEvent & { target: HTMLEle
         searchElement.style.width = "128px";
         searchElement.style.paddingLeft = "";
         searchElement.style.paddingRight = "";
-        searchElement.focus();
+        setTimeout(() => {
+            searchElement.focus();
+        }, Constants.TIMEOUT_TRANSITION);
         event.preventDefault();
         event.stopPropagation();
         return true;

app/src/protyle/util/insertHTML.ts

@@ -170,7 +170,7 @@ const processAV = (range: Range, html: string, protyle: IProtyle, blockElement:
         updateCellsValue(protyle, blockElement as HTMLElement, text);
     } else if (cellsElement.length > 0) {
         updateCellsValue(protyle, blockElement as HTMLElement, text, cellsElement);
-    } else {
+    } else if (hasClosestByClassName(range.startContainer, "av__title")) {
         range.insertNode(document.createTextNode(text));
         range.collapse(false);
         updateAVName(protyle, blockElement);

app/src/protyle/wysiwyg/index.ts

@@ -1764,7 +1764,7 @@ export class WYSIWYG {
                 return;
             }
             const blockElement = hasClosestBlock(event.target);
-            if (blockElement && (!getContenteditableElement(blockElement) || hasClosestByClassName(event.target, "av__cursor"))) {
+            if (blockElement && !getContenteditableElement(blockElement)) {
                 event.stopPropagation();
                 event.preventDefault();
                 return;

app/src/protyle/wysiwyg/keydown.ts

@@ -933,11 +933,11 @@ export const keydown = (protyle: IProtyle, editorElement: HTMLElement) => {
                 const selectElements = protyle.wysiwyg.element.querySelectorAll(".protyle-wysiwyg--select");
                 if (selectElements.length > 0) {
                     selectElements[0].setAttribute("data-reftext", "true");
+                    focusByRange(getEditorRange(nodeElement));
+                    document.execCommand("copy");
                 } else {
-                    nodeElement.setAttribute("data-reftext", "true");
+                    writeText(`((${nodeElement.getAttribute("data-node-id")} "*"))`);
                 }
-                focusByRange(getEditorRange(nodeElement));
-                document.execCommand("copy");
             }
             event.preventDefault();
             event.stopPropagation();

kernel/api/av.go

@@ -135,7 +135,7 @@ func addAttributeViewValues(c *gin.Context) {
 		return
 	}
 
-	pushRefreshAttrView(avID)
+	util.PushReloadAttrView(avID)
 }
 
 func removeAttributeViewValues(c *gin.Context) {
@@ -160,7 +160,7 @@ func removeAttributeViewValues(c *gin.Context) {
 		return
 	}
 
-	pushRefreshAttrView(avID)
+	util.PushReloadAttrView(avID)
 }
 
 func addAttributeViewKey(c *gin.Context) {
@@ -186,7 +186,7 @@ func addAttributeViewKey(c *gin.Context) {
 		return
 	}
 
-	pushRefreshAttrView(avID)
+	util.PushReloadAttrView(avID)
 }
 
 func removeAttributeViewKey(c *gin.Context) {
@@ -208,7 +208,7 @@ func removeAttributeViewKey(c *gin.Context) {
 		return
 	}
 
-	pushRefreshAttrView(avID)
+	util.PushReloadAttrView(avID)
 }
 
 func sortAttributeViewKey(c *gin.Context) {
@@ -235,7 +235,7 @@ func sortAttributeViewKey(c *gin.Context) {
 		return
 	}
 
-	pushRefreshAttrView(avID)
+	util.PushReloadAttrView(avID)
 }
 
 func getAttributeViewFilterSort(c *gin.Context) {
@@ -509,9 +509,5 @@ func setAttributeViewBlockAttr(c *gin.Context) {
 	blockAttributeViewKeys := model.UpdateAttributeViewCell(nil, avID, keyID, rowID, cellID, value)
 	ret.Data = blockAttributeViewKeys
 
-	pushRefreshAttrView(avID)
-}
-
-func pushRefreshAttrView(avID string) {
-	util.BroadcastByType("protyle", "refreshAttributeView", 0, "", map[string]interface{}{"id": avID})
+	util.PushReloadAttrView(avID)
 }

kernel/av/mirror.go

@@ -66,7 +66,7 @@ func IsMirror(avID string) bool {
 	return nil != blockIDs && 1 < len(blockIDs)
 }
 
-func RemoveBlockRel(avID, blockID string) {
+func RemoveBlockRel(avID, blockID string, existBlockTree func(string) bool) (ret bool) {
 	AttributeViewBlocksLock.Lock()
 	defer AttributeViewBlocksLock.Unlock()
 
@@ -95,10 +95,13 @@ func RemoveBlockRel(avID, blockID string) {
 	var newBlockIDs []string
 	for _, v := range blockIDs {
 		if v != blockID {
-			newBlockIDs = append(newBlockIDs, v)
+			if existBlockTree(v) {
+				newBlockIDs = append(newBlockIDs, v)
+			}
 		}
 	}
 	avBlocks[avID] = newBlockIDs
+	ret = len(newBlockIDs) != len(blockIDs)
 
 	data, err = msgpack.Marshal(avBlocks)
 	if nil != err {
@@ -109,6 +112,7 @@ func RemoveBlockRel(avID, blockID string) {
 		logging.LogErrorf("write attribute view blocks failed: %s", err)
 		return
 	}
+	return
 }
 
 func BatchUpsertBlockRel(nodes []*ast.Node) {
@@ -161,7 +165,7 @@ func BatchUpsertBlockRel(nodes []*ast.Node) {
 	}
 }
 
-func UpsertBlockRel(avID, blockID string) {
+func UpsertBlockRel(avID, blockID string) (ret bool) {
 	AttributeViewBlocksLock.Lock()
 	defer AttributeViewBlocksLock.Unlock()
 
@@ -186,9 +190,11 @@ func UpsertBlockRel(avID, blockID string) {
 	}
 
 	blockIDs := avBlocks[avID]
+	oldLen := len(blockIDs)
 	blockIDs = append(blockIDs, blockID)
 	blockIDs = gulu.Str.RemoveDuplicatedElem(blockIDs)
 	avBlocks[avID] = blockIDs
+	ret = oldLen != len(blockIDs)
 
 	data, err := msgpack.Marshal(avBlocks)
 	if nil != err {
@@ -199,4 +205,5 @@ func UpsertBlockRel(avID, blockID string) {
 		logging.LogErrorf("write attribute view blocks failed: %s", err)
 		return
 	}
+	return
 }

kernel/bazaar/package.go

@@ -554,7 +554,7 @@ func downloadPackage(repoURLHash string, pushProgress bool, systemID string) (da
 	repoURLHash = strings.TrimPrefix(repoURLHash, "https://github.com/")
 	u := util.BazaarOSSServer + "/package/" + repoURLHash
 	buf := &bytes.Buffer{}
-	resp, err := httpclient.NewBrowserRequest().SetOutput(buf).SetDownloadCallback(func(info req.DownloadInfo) {
+	resp, err := httpclient.NewCloudFileRequest2m().SetOutput(buf).SetDownloadCallback(func(info req.DownloadInfo) {
 		if pushProgress {
 			progress := float32(info.DownloadedSize) / float32(info.Response.ContentLength)
 			//logging.LogDebugf("downloading bazaar package [%f]", progress)

kernel/filesys/json_parser.go

@@ -144,6 +144,21 @@ func genTreeByJSON(node *ast.Node, tree *parse.Tree, idMap *map[string]bool, nee
 				*needFix = true
 				return // 忽略空查询嵌入块
 			}
+		case ast.NodeCodeBlock:
+			if 4 > len(node.Children) {
+				// https://ld246.com/article/1713689223067
+				existCode := false
+				for _, child := range node.Children {
+					if ast.NodeCodeBlockCode.String() == child.TypeStr {
+						existCode = true
+						break
+					}
+				}
+				if !existCode {
+					*needFix = true
+					return // 忽略空代码块
+				}
+			}
 		}
 
 		fixLegacyData(tree.Context.Tip, node, idMap, needFix, needMigrate2Spec1)

kernel/model/attribute_view.go

@@ -1339,6 +1339,7 @@ func unbindAttributeViewBlock(operation *Operation, tx *Transaction) (err error)
 				unbindBlockAv(tx, operation.AvID, value.BlockID)
 			}
 			value.BlockID = operation.NextID
+			value.IsDetached = true
 			if nil != value.Block {
 				value.Block.ID = operation.NextID
 			}
@@ -1602,7 +1603,7 @@ func updateAttributeViewColRelation(operation *Operation) (err error) {
 	}
 	if !isSameAv {
 		err = av.SaveAttributeView(destAv)
-		util.BroadcastByType("protyle", "refreshAttributeView", 0, "", map[string]interface{}{"id": destAv.ID})
+		util.PushReloadAttrView(destAv.ID)
 	}
 
 	av.UpsertAvBackRel(srcAv.ID, destAv.ID)
@@ -2419,7 +2420,7 @@ func removeAttributeViewBlock(srcIDs []string, avID string, tx *Transaction) (er
 
 	relatedAvIDs := av.GetSrcAvIDs(avID)
 	for _, relatedAvID := range relatedAvIDs {
-		util.BroadcastByType("protyle", "refreshAttributeView", 0, "", map[string]interface{}{"id": relatedAvID})
+		util.PushReloadAttrView(relatedAvID)
 	}
 
 	err = av.SaveAttributeView(attrView)
@@ -2648,23 +2649,23 @@ func sortAttributeViewRow(operation *Operation) (err error) {
 	}
 
 	var rowID string
-	var index, previousIndex int
+	var idx, previousIndex int
 	for i, r := range view.Table.RowIDs {
 		if r == operation.ID {
 			rowID = r
-			index = i
+			idx = i
 			break
 		}
 	}
 	if "" == rowID {
 		rowID = operation.ID
 		view.Table.RowIDs = append(view.Table.RowIDs, rowID)
-		index = len(view.Table.RowIDs) - 1
+		idx = len(view.Table.RowIDs) - 1
 	}
 
 	switch view.LayoutType {
 	case av.LayoutTypeTable:
-		view.Table.RowIDs = append(view.Table.RowIDs[:index], view.Table.RowIDs[index+1:]...)
+		view.Table.RowIDs = append(view.Table.RowIDs[:idx], view.Table.RowIDs[idx+1:]...)
 		for i, r := range view.Table.RowIDs {
 			if r == operation.PreviousID {
 				previousIndex = i + 1
@@ -2934,7 +2935,7 @@ func RemoveAttributeViewKey(avID, keyID string) (err error) {
 				}
 
 				av.SaveAttributeView(destAv)
-				util.BroadcastByType("protyle", "refreshAttributeView", 0, "", map[string]interface{}{"id": destAv.ID})
+				util.PushReloadAttrView(destAv.ID)
 
 				if !destAvRelSrcAv {
 					av.RemoveAvRel(destAv.ID, attrView.ID)
@@ -3250,7 +3251,7 @@ func UpdateAttributeViewCell(tx *Transaction, avID, keyID, rowID, cellID string,
 
 	relatedAvIDs := av.GetSrcAvIDs(avID)
 	for _, relatedAvID := range relatedAvIDs {
-		util.BroadcastByType("protyle", "refreshAttributeView", 0, "", map[string]interface{}{"id": relatedAvID})
+		util.PushReloadAttrView(relatedAvID)
 	}
 
 	if err = av.SaveAttributeView(attrView); nil != err {