Przeglądaj źródła

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

Vanessa 2 lat temu
rodzic
commit
fbfad46818
2 zmienionych plików z 6 dodań i 2 usunięć
  1. 5 1
      kernel/api/attr.go
  2. 1 1
      kernel/model/assets_watcher.go

+ 5 - 1
kernel/api/attr.go

@@ -58,7 +58,11 @@ func setBlockAttrs(c *gin.Context) {
 	attrs := arg["attrs"].(map[string]interface{})
 	nameValues := map[string]string{}
 	for name, value := range attrs {
-		nameValues[name] = value.(string)
+		if nil == value { // API `setBlockAttrs` 中如果存在属性值设置为 `null` 时移除该属性 https://github.com/siyuan-note/siyuan/issues/5577
+			nameValues[name] = ""
+		} else {
+			nameValues[name] = value.(string)
+		}
 	}
 	err := model.SetBlockAttrs(id, nameValues)
 	if nil != err {

+ 1 - 1
kernel/model/assets_watcher.go

@@ -53,7 +53,7 @@ func watchAssets() {
 	}
 
 	go func() {
-		logging.Recover()
+		defer logging.Recover()
 
 		var (
 			timer     *time.Timer