diff --git a/app/src/protyle/render/av/col.ts b/app/src/protyle/render/av/col.ts index 7ec1bd0d9..eb84692b4 100644 --- a/app/src/protyle/render/av/col.ts +++ b/app/src/protyle/render/av/col.ts @@ -36,8 +36,8 @@ export const duplicateCol = (options: { const blockId = options.blockElement.getAttribute("data-node-id"); transaction(options.protyle, [{ action: "duplicateAttrViewKey", - keyID:newColData.id, - nextID:options.colId, + keyID: options.colId, + nextID: newColData.id, avID: options.data.id, }, { action: "doUpdateUpdated", diff --git a/kernel/model/attribute_view.go b/kernel/model/attribute_view.go index 1748a3c21..35762473a 100644 --- a/kernel/model/attribute_view.go +++ b/kernel/model/attribute_view.go @@ -952,7 +952,7 @@ func renderAttributeView(attrView *av.AttributeView, viewID, query string, page, } view.Table.Sorts = tmpSorts - viewable, err = sql.RenderAttributeViewTable(attrView, view, query, GetBlockAttrsWithoutWaitWriting) + viewable = sql.RenderAttributeViewTable(attrView, view, query, GetBlockAttrsWithoutWaitWriting) } viewable.FilterRows(attrView) @@ -1966,7 +1966,7 @@ func addAttributeViewBlock(now int64, avID, blockID, previousBlockID, addingBloc // 如果存在过滤条件,则将过滤条件应用到新添加的块上 view, _ := getAttrViewViewByBlockID(attrView, blockID) if nil != view && 0 < len(view.Table.Filters) && !ignoreFillFilter { - viewable, _ := sql.RenderAttributeViewTable(attrView, view, "", GetBlockAttrsWithoutWaitWriting) + viewable := sql.RenderAttributeViewTable(attrView, view, "", GetBlockAttrsWithoutWaitWriting) viewable.FilterRows(attrView) viewable.SortRows(attrView) diff --git a/kernel/model/export.go b/kernel/model/export.go index 43aefb0b5..6f0a91d30 100644 --- a/kernel/model/export.go +++ b/kernel/model/export.go @@ -75,11 +75,7 @@ func ExportAv2CSV(avID, blockID string) (zipPath string, err error) { } name := util.FilterFileName(getAttrViewName(attrView)) - table, err := sql.RenderAttributeViewTable(attrView, view, "", GetBlockAttrsWithoutWaitWriting) - if nil != err { - logging.LogErrorf("render attribute view [%s] table failed: %s", avID, err) - return - } + table := sql.RenderAttributeViewTable(attrView, view, "", GetBlockAttrsWithoutWaitWriting) // 遵循视图过滤和排序规则 Use filtering and sorting of current view settings when exporting database blocks https://github.com/siyuan-note/siyuan/issues/10474 table.FilterRows(attrView) @@ -2237,11 +2233,7 @@ func exportTree(tree *parse.Tree, wysiwyg, keepFold bool, return ast.WalkContinue } - table, err := sql.RenderAttributeViewTable(attrView, view, "", GetBlockAttrsWithoutWaitWriting) - if nil != err { - logging.LogErrorf("render attribute view [%s] table failed: %s", avID, err) - return ast.WalkContinue - } + table := sql.RenderAttributeViewTable(attrView, view, "", GetBlockAttrsWithoutWaitWriting) // 遵循视图过滤和排序规则 Use filtering and sorting of current view settings when exporting database blocks https://github.com/siyuan-note/siyuan/issues/10474 table.FilterRows(attrView) diff --git a/kernel/model/template.go b/kernel/model/template.go index 80086a9f8..f19f8ba36 100644 --- a/kernel/model/template.go +++ b/kernel/model/template.go @@ -314,11 +314,7 @@ func RenderTemplate(p, id string, preview bool) (tree *parse.Tree, dom string, e return ast.WalkContinue } - table, renderErr := sql.RenderAttributeViewTable(attrView, view, "", GetBlockAttrsWithoutWaitWriting) - if nil != renderErr { - logging.LogErrorf("render attribute view [%s] table failed: %s", n.AttributeViewID, renderErr) - return ast.WalkContinue - } + table := sql.RenderAttributeViewTable(attrView, view, "", GetBlockAttrsWithoutWaitWriting) var aligns []int for range table.Columns { diff --git a/kernel/sql/av.go b/kernel/sql/av.go index 34a3e5983..82bb1b25b 100644 --- a/kernel/sql/av.go +++ b/kernel/sql/av.go @@ -33,7 +33,7 @@ import ( ) func RenderAttributeViewTable(attrView *av.AttributeView, view *av.View, query string, - GetBlockAttrsWithoutWaitWriting func(id string) (ret map[string]string)) (ret *av.Table, err error) { + GetBlockAttrsWithoutWaitWriting func(id string) (ret map[string]string)) (ret *av.Table) { if nil == GetBlockAttrsWithoutWaitWriting { GetBlockAttrsWithoutWaitWriting = func(id string) (ret map[string]string) { ret = cache.GetBlockIAL(id) @@ -59,8 +59,8 @@ func RenderAttributeViewTable(attrView *av.AttributeView, view *av.View, query s for _, col := range view.Table.Columns { key, getErr := attrView.GetKey(col.ID) if nil != getErr { - err = getErr - return + logging.LogWarnf("get key [%s] failed: %s", col.ID, getErr) + continue } ret.Columns = append(ret.Columns, &av.TableColumn{ @@ -587,12 +587,7 @@ func getAttributeViewContent(avID string, return } - table, err := RenderAttributeViewTable(attrView, view, "", GetBlockAttrsWithoutWaitWriting) - if nil != err { - content = strings.TrimSpace(buf.String()) - return - } - + table := RenderAttributeViewTable(attrView, view, "", GetBlockAttrsWithoutWaitWriting) for _, col := range table.Columns { buf.WriteString(col.Name) buf.WriteByte(' ')