From 4a668ab414f48f5cd3bd2134683fa4c2b5b1034a Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Mon, 18 Nov 2024 10:24:38 +0800 Subject: [PATCH 1/3] :art: Improve av option editing https://github.com/siyuan-note/siyuan/issues/11484 --- kernel/model/attribute_view.go | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/kernel/model/attribute_view.go b/kernel/model/attribute_view.go index 9e76aa3a0..3261d1341 100644 --- a/kernel/model/attribute_view.go +++ b/kernel/model/attribute_view.go @@ -3468,7 +3468,7 @@ func updateAttributeViewColumnOption(operation *Operation) (err error) { found := false if oldName != newName { for _, opt := range key.Options { - if newName == opt.Name { // 如果选项名已经存在则直接使用 + if newName == opt.Name { // 如果选项已经存在则直接使用 found = true newColor = opt.Color break @@ -3497,13 +3497,33 @@ func updateAttributeViewColumnOption(operation *Operation) (err error) { continue } - for i, opt := range value.MSelect { - if oldName == opt.Content { - value.MSelect[i].Content = newName - value.MSelect[i].Color = newColor + found = false + for _, opt := range value.MSelect { + if newName == opt.Content { + found = true break } } + if found { + idx := -1 + for i, opt := range value.MSelect { + if oldName == opt.Content { + idx = i + break + } + } + if 0 <= idx { + value.MSelect = util.RemoveElem(value.MSelect, idx) + } + } else { + for i, opt := range value.MSelect { + if oldName == opt.Content { + value.MSelect[i].Content = newName + value.MSelect[i].Color = newColor + break + } + } + } } break } From 0e1fe2f20f553d1b16177e3684f6af32590fbb21 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Mon, 18 Nov 2024 10:49:22 +0800 Subject: [PATCH 2/3] :art: Support exporting Markdown after selecting multiple documents https://github.com/siyuan-note/siyuan/issues/12912 --- kernel/model/export.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kernel/model/export.go b/kernel/model/export.go index c47ed2446..d7ae9c00d 100644 --- a/kernel/model/export.go +++ b/kernel/model/export.go @@ -1389,10 +1389,11 @@ func BatchExportPandocConvertZip(ids []string, pandocTo, ext string) (name, zipP if "." == baseFolderName { baseFolderName = path.Base(block.Path) } - var docPaths []string + var docPaths []string bts := treenode.GetBlockTrees(ids) for _, bt := range bts { + docPaths = append(docPaths, bt.Path) docFiles := box.ListFiles(strings.TrimSuffix(bt.Path, ".sy")) for _, docFile := range docFiles { docPaths = append(docPaths, docFile.path) From 745691dbe478fac411cb74c73153aae877f2b668 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Mon, 18 Nov 2024 11:00:51 +0800 Subject: [PATCH 3/3] :art: The database supports adding view/field/option description https://github.com/siyuan-note/siyuan/issues/11053 --- kernel/api/av.go | 1 + 1 file changed, 1 insertion(+) diff --git a/kernel/api/av.go b/kernel/api/av.go index 3d2d468fa..930f98302 100644 --- a/kernel/api/av.go +++ b/kernel/api/av.go @@ -569,6 +569,7 @@ func renderAttributeView(c *gin.Context) { "id": v.ID, "icon": v.Icon, "name": v.Name, + "desc": v.Desc, "hideAttrViewName": v.HideAttrViewName, "type": v.LayoutType, "pageSize": pSize,