Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-20 08:30:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 Prompt when database template field reports an error https://github.com/siyuan-note/siyuan/issues/11070

Browse source
This commit is contained in:
Daniel 2024-04-17 19:54:33 +08:00
parent 043e953dac
commit abbfbc0acb
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
1 changed files with 27 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

36
kernel/model/attribute_view.go
View file

@ -18,6 +18,7 @@ package model
import ( import (
"bytes" "bytes"
"fmt"
"os" "os"
"path/filepath" "path/filepath"
"sort" "sort"
@ -499,6 +500,7 @@ func GetBlockAttributeViewKeys(blockID string) (ret []*BlockAttributeViewKeys) {
//} //}
// 渲染模板 // 渲染模板
var renderTemplateErr error
for _, kv := range keyValues { for _, kv := range keyValues {
switch kv.Key.Type { switch kv.Key.Type {
case av.KeyTypeTemplate: case av.KeyTypeTemplate:
@ -509,10 +511,17 @@ func GetBlockAttributeViewKeys(blockID string) (ret []*BlockAttributeViewKeys) {
ial = GetBlockAttrsWithoutWaitWriting(block.BlockID) ial = GetBlockAttrsWithoutWaitWriting(block.BlockID)
} }
kv.Values[0].Template.Content = renderTemplateCol(ial, flashcard, keyValues, kv.Key.Template) var renderErr error
kv.Values[0].Template.Content, renderErr = renderTemplateCol(ial, flashcard, keyValues, kv.Key.Template)
if nil != renderErr {
renderTemplateErr = renderErr
} }
} }
} }
}
if nil != renderTemplateErr {
util.PushErrMsg(fmt.Sprintf(Conf.Language(44), util.EscapeHTML(renderTemplateErr.Error())), 30000)
}
// Attribute Panel - Database sort attributes by view column order https://github.com/siyuan-note/siyuan/issues/9319 // Attribute Panel - Database sort attributes by view column order https://github.com/siyuan-note/siyuan/issues/9319
viewID := attrs[av.NodeAttrView] viewID := attrs[av.NodeAttrView]
@ -839,7 +848,7 @@ func renderAttributeView(attrView *av.AttributeView, viewID, query string, page,
return return
} }
func renderTemplateCol(ial map[string]string, flashcard *Flashcard, rowValues []*av.KeyValues, tplContent string) string { func renderTemplateCol(ial map[string]string, flashcard *Flashcard, rowValues []*av.KeyValues, tplContent string) (ret string, err error) {
if "" == ial["id"] { if "" == ial["id"] {
block := getRowBlockValue(rowValues) block := getRowBlockValue(rowValues)
if nil != block && nil != block.Block { if nil != block && nil != block.Block {
@ -857,10 +866,10 @@ func renderTemplateCol(ial map[string]string, flashcard *Flashcard, rowValues []
tplFuncMap := util.BuiltInTemplateFuncs() tplFuncMap := util.BuiltInTemplateFuncs()
SQLTemplateFuncs(&tplFuncMap) SQLTemplateFuncs(&tplFuncMap)
goTpl = goTpl.Funcs(tplFuncMap) goTpl = goTpl.Funcs(tplFuncMap)
tpl, tplErr := goTpl.Parse(tplContent) tpl, err := goTpl.Parse(tplContent)
if nil != tplErr { if nil != err {
logging.LogWarnf("parse template [%s] failed: %s", tplContent, tplErr) logging.LogWarnf("parse template [%s] failed: %s", tplContent, err)
return "" return
} }
buf := &bytes.Buffer{} buf := &bytes.Buffer{}
@ -943,10 +952,12 @@ func renderTemplateCol(ial map[string]string, flashcard *Flashcard, rowValues []
} }
} }
if err := tpl.Execute(buf, dataModel); nil != err { if err = tpl.Execute(buf, dataModel); nil != err {
logging.LogWarnf("execute template [%s] failed: %s", tplContent, err) logging.LogWarnf("execute template [%s] failed: %s", tplContent, err)
return
} }
return buf.String() ret = buf.String()
return
} }
func renderAttributeViewTable(attrView *av.AttributeView, view *av.View, query string) (ret *av.Table, err error) { func renderAttributeViewTable(attrView *av.AttributeView, view *av.View, query string) (ret *av.Table, err error) {
@ -1219,6 +1230,7 @@ func renderAttributeViewTable(attrView *av.AttributeView, view *av.View, query s
// } // }
//} //}
var renderTemplateErr error
for _, row := range ret.Rows { for _, row := range ret.Rows {
for _, cell := range row.Cells { for _, cell := range row.Cells {
switch cell.ValueType { switch cell.ValueType {
@ -1229,11 +1241,17 @@ func renderAttributeViewTable(attrView *av.AttributeView, view *av.View, query s
if nil != block && !block.IsDetached { if nil != block && !block.IsDetached {
ial = GetBlockAttrsWithoutWaitWriting(row.ID) ial = GetBlockAttrsWithoutWaitWriting(row.ID)
} }
content := renderTemplateCol(ial, flashcards[row.ID], keyValues, cell.Value.Template.Content) content, renderErr := renderTemplateCol(ial, flashcards[row.ID], keyValues, cell.Value.Template.Content)
cell.Value.Template.Content = content cell.Value.Template.Content = content
if nil != renderErr {
renderTemplateErr = renderErr
} }
} }
} }
}
if nil != renderTemplateErr {
util.PushErrMsg(fmt.Sprintf(Conf.Language(44), util.EscapeHTML(renderTemplateErr.Error())), 30000)
}
// 根据搜索条件过滤 // 根据搜索条件过滤
query = strings.TrimSpace(query) query = strings.TrimSpace(query)