Explorar el Código

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

Vanessa hace 1 año
padre
commit
f3a79a8ea5
Se han modificado 1 ficheros con 8 adiciones y 0 borrados
  1. 8 0
      kernel/model/export.go

+ 8 - 0
kernel/model/export.go

@@ -80,6 +80,10 @@ func ExportAv2CSV(avID string) (zipPath string, err error) {
 		return
 		return
 	}
 	}
 
 
+	// 遵循视图过滤和排序规则 Use filtering and sorting of current view settings when exporting database blocks https://github.com/siyuan-note/siyuan/issues/10474
+	table.FilterRows(attrView)
+	table.SortRows()
+
 	exportFolder := filepath.Join(util.TempDir, "export", "csv", name)
 	exportFolder := filepath.Join(util.TempDir, "export", "csv", name)
 	if err = os.MkdirAll(exportFolder, 0755); nil != err {
 	if err = os.MkdirAll(exportFolder, 0755); nil != err {
 		logging.LogErrorf("mkdir [%s] failed: %s", exportFolder, err)
 		logging.LogErrorf("mkdir [%s] failed: %s", exportFolder, err)
@@ -2250,6 +2254,10 @@ func exportTree(tree *parse.Tree, wysiwyg, expandKaTexMacros, keepFold bool,
 			return ast.WalkContinue
 			return ast.WalkContinue
 		}
 		}
 
 
+		// 遵循视图过滤和排序规则 Use filtering and sorting of current view settings when exporting database blocks https://github.com/siyuan-note/siyuan/issues/10474
+		table.FilterRows(attrView)
+		table.SortRows()
+
 		var aligns []int
 		var aligns []int
 		for range table.Columns {
 		for range table.Columns {
 			aligns = append(aligns, 0)
 			aligns = append(aligns, 0)