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

app/changelogs/v3.3.3/v3.3.3.md

@@ -36,6 +36,7 @@ Below are the detailed changes in this version.
 * [Improve font loading](https://github.com/siyuan-note/siyuan/issues/15879)
 * [Improve document opening compatibility](https://github.com/siyuan-note/siyuan/issues/15885)
 * [Improve dynamic loading to prevent continuous automatic loading in certain situations](https://github.com/siyuan-note/siyuan/issues/15889)
+* [Improve the judgment of editable blocks and the escape processing of HTML blocks](https://github.com/siyuan-note/siyuan/issues/15904)
 
 ### Bugfix
 
@@ -48,6 +49,7 @@ Below are the detailed changes in this version.
 * [`Optimize typography` exception when code block contains ```](https://github.com/siyuan-note/siyuan/issues/15843)
 * [`Add to Database` shows databases that are not in the document](https://github.com/siyuan-note/siyuan/issues/15847)
 * [An error occurs when inserting a tag using a mouse click](https://github.com/siyuan-note/siyuan/issues/15867)
+* [Outline drag function is abnormal](https://github.com/siyuan-note/siyuan/issues/15909)
 
 ### Development
 

app/changelogs/v3.3.3/v3.3.3_zh_CHT.md

@@ -36,6 +36,7 @@
 * [改進字體載入](https://github.com/siyuan-note/siyuan/issues/15879)
 * [改進開啟文件相容性](https://github.com/siyuan-note/siyuan/issues/15885)
 * [改進文件動態加載，防止在特定情況下持續自動加載](https://github.com/siyuan-note/siyuan/issues/15889)
+* [改進可編輯區塊的判斷和 HTML 區塊的轉義處理](https://github.com/siyuan-note/siyuan/issues/15904)
 
 ### 修復缺陷
 
@@ -48,6 +49,7 @@
 * [程式碼區塊包含 ``` 時「最佳化排版」異常](https://github.com/siyuan-note/siyuan/issues/15843)
 * [「新增至資料庫」會顯示不在文件中的資料庫](https://github.com/siyuan-note/siyuan/issues/15847)
 * [滑鼠點選插入標籤時報錯誤](https://github.com/siyuan-note/siyuan/issues/15867)
+* [大綱拖曳功能異常](https://github.com/siyuan-note/siyuan/issues/15909)
 
 ### 開發者
 

app/changelogs/v3.3.3/v3.3.3_zh_CN.md

@@ -36,6 +36,7 @@
 * [改进字体加载](https://github.com/siyuan-note/siyuan/issues/15879)
 * [改进打开文档兼容性](https://github.com/siyuan-note/siyuan/issues/15885)
 * [改进文档动态加载，防止特定情况下持续自动加载](https://github.com/siyuan-note/siyuan/issues/15889)
+* [改进可编辑块的判断和 HTML 块的转义处理](https://github.com/siyuan-note/siyuan/issues/15904)
 
 ### 修复缺陷
 
@@ -48,6 +49,7 @@
 * [代码块包含 ``` 时“优化排版”异常](https://github.com/siyuan-note/siyuan/issues/15843)
 * [“添加到数据库”会显示不在文档中的数据库](https://github.com/siyuan-note/siyuan/issues/15847)
 * [鼠标点击插入标签时报错](https://github.com/siyuan-note/siyuan/issues/15867)
+* [大纲拖动功能异常](https://github.com/siyuan-note/siyuan/issues/15909)
 
 ### 开发者
 

kernel/av/filter.go

@@ -287,9 +287,15 @@ func (value *Value) Filter(filter *ViewFilter, attrView *AttributeView, itemID s
 			for _, asset := range value.MAsset {
 				switch asset.Type {
 				case AssetTypeFile:
-					if filterTextContent(filter.Operator, asset.Name, filter.Value.MAsset[0].Content) ||
-						filterTextContent(filter.Operator, asset.Content, filter.Value.MAsset[0].Content) {
-						return false
+					if "" != strings.TrimSpace(asset.Name) {
+						if filterTextContent(filter.Operator, asset.Name, filter.Value.MAsset[0].Content) {
+							return false
+						}
+					}
+					if "" != strings.TrimSpace(asset.Content) {
+						if filterTextContent(filter.Operator, asset.Content, filter.Value.MAsset[0].Content) {
+							return false
+						}
 					}
 				case AssetTypeImage:
 					if filterTextContent(filter.Operator, asset.Content, filter.Value.MAsset[0].Content) {

kernel/model/attribute_view.go

@@ -186,6 +186,15 @@ func getAttrViewAddingBlockDefaultValues(attrView *av.AttributeView, view, group
 			continue
 		}
 
+		if av.KeyTypeMAsset == keyValues.Key.Type {
+			if nil != nearItem {
+				if _, ok := ret[keyValues.Key.ID]; !ok {
+					ret[keyValues.Key.ID] = getNewValueByNearItem(nearItem, keyValues.Key, addingItemID)
+				}
+			}
+			return
+		}
+
 		newValue := filter.GetAffectValue(keyValues.Key, addingItemID)
 		if nil == newValue {
 			newValue = getNewValueByNearItem(nearItem, keyValues.Key, addingItemID)

kernel/model/outline.go

@@ -90,9 +90,8 @@ func (tx *Transaction) doMoveOutlineHeading(operation *Operation) (ret *TxErr) {
 		}
 
 		for _, h := range headingChildren {
-			if h.ID == targetNode.ID {
-				// 目标节点是当前标题的子节点，不需要移动
-				return
+			if h.ID == targetNode.ID { // 目标节点是当前标题的子节点
+				targetNode = heading.Previous
 			}
 		}