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

siyuan-note · Jan 1, 2024 · 22a3804 · 22a3804
2 parents 31c2b02 + 481bb52
commit 22a3804
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/kernel/api/search.go b/kernel/api/search.go
@@ -54,6 +54,12 @@ func fullTextSearchAssetContent(c *gin.Context) {
 		return
 	}
 
+	if !model.IsPaidUser() {
+		ret.Code = -1
+		ret.Msg = model.Conf.Language(214)
+		return
+	}
+
 	page, pageSize, query, types, method, orderBy := parseSearchAssetContentArgs(arg)
 	assetContents, matchedAssetCount, pageCount := model.FullTextSearchAssetContent(query, types, method, orderBy, page, pageSize)
 	ret.Data = map[string]interface{}{

diff --git a/kernel/model/attribute_view.go b/kernel/model/attribute_view.go
@@ -223,6 +223,10 @@ func GetBlockAttributeViewKeys(blockID string) (ret []*BlockAttributeViewKeys) {
 
 			if 0 < len(kValues.Values) {
 				keyValues = append(keyValues, kValues)
+			} else {
+				// 如果没有值，那么就补一个默认值
+				kValues.Values = append(kValues.Values, treenode.GetAttributeViewDefaultValue(ast.NewNodeID(), kv.Key.ID, blockID, kv.Key.Type))
+				keyValues = append(keyValues, kValues)
 			}
 		}