mirror of
https://github.com/siyuan-note/siyuan.git
synced 2026-03-03 11:20:16 +01:00
♻️ Improve av structure
This commit is contained in:
Daniel
parent
f75d5e50b4
commit
373bce9791
10 changed files with 819 additions and 1165 deletions
|
|
@ -25,7 +25,6 @@ import (
|
|||
"sort"
|
||||
"strconv"
|
||||
"strings"
|
||||
"text/template"
|
||||
"time"
|
||||
|
||||
"github.com/88250/gulu"
|
||||
|
|
@ -36,6 +35,7 @@ import (
|
|||
"github.com/siyuan-note/logging"
|
||||
"github.com/siyuan-note/siyuan/kernel/av"
|
||||
"github.com/siyuan-note/siyuan/kernel/cache"
|
||||
"github.com/siyuan-note/siyuan/kernel/sql"
|
||||
"github.com/siyuan-note/siyuan/kernel/treenode"
|
||||
"github.com/siyuan-note/siyuan/kernel/util"
|
||||
"github.com/xrash/smetrics"
|
||||
|
|
@ -498,18 +498,6 @@ func GetBlockAttributeViewKeys(blockID string) (ret []*BlockAttributeViewKeys) {
|
|||
}
|
||||
|
||||
// 再处理模板列
|
||||
// 获取闪卡信息
|
||||
// TODO 目前看来使用场景不多，暂时不实现了 https://github.com/siyuan-note/siyuan/issues/10502#issuecomment-1986703280
|
||||
var flashcard *Flashcard
|
||||
//deck := Decks[builtinDeckID]
|
||||
//if nil != deck {
|
||||
// blockIDs := []string{blockID}
|
||||
// cards := deck.GetCardsByBlockIDs(blockIDs)
|
||||
// now := time.Now()
|
||||
// if 0 < len(cards) {
|
||||
// flashcard = newFlashcard(cards[0], builtinDeckID, now)
|
||||
// }
|
||||
//}
|
||||
|
||||
// 渲染模板
|
||||
var renderTemplateErr error
|
||||
|
|
@ -524,7 +512,7 @@ func GetBlockAttributeViewKeys(blockID string) (ret []*BlockAttributeViewKeys) {
|
|||
}
|
||||
|
||||
var renderErr error
|
||||
kv.Values[0].Template.Content, renderErr = renderTemplateCol(ial, flashcard, keyValues, kv.Key.Template)
|
||||
kv.Values[0].Template.Content, renderErr = sql.RenderTemplateCol(ial, keyValues, kv.Key.Template)
|
||||
if nil != renderErr {
|
||||
renderTemplateErr = fmt.Errorf("database [%s] template field [%s] rendering failed: %s", getAttrViewName(attrView), kv.Key.Name, renderErr)
|
||||
}
|
||||
|
|
@ -830,7 +818,7 @@ func renderAttributeView(attrView *av.AttributeView, viewID, query string, page,
|
|||
}
|
||||
view.Table.Sorts = tmpSorts
|
||||
|
||||
viewable, err = renderAttributeViewTable(attrView, view, query)
|
||||
viewable, err = sql.RenderAttributeViewTable(attrView, view, query, GetBlockAttrsWithoutWaitWriting)
|
||||
}
|
||||
|
||||
viewable.FilterRows(attrView)
|
||||
|
|
@ -860,468 +848,6 @@ func renderAttributeView(attrView *av.AttributeView, viewID, query string, page,
|
|||
return
|
||||
}
|
||||
|
||||
func renderTemplateCol(ial map[string]string, flashcard *Flashcard, rowValues []*av.KeyValues, tplContent string) (ret string, err error) {
|
||||
if "" == ial["id"] {
|
||||
block := getRowBlockValue(rowValues)
|
||||
if nil != block && nil != block.Block {
|
||||
ial["id"] = block.Block.ID
|
||||
}
|
||||
}
|
||||
if "" == ial["updated"] {
|
||||
block := getRowBlockValue(rowValues)
|
||||
if nil != block && nil != block.Block {
|
||||
ial["updated"] = time.UnixMilli(block.Block.Updated).Format("20060102150405")
|
||||
}
|
||||
}
|
||||
|
||||
goTpl := template.New("").Delims(".action{", "}")
|
||||
tplFuncMap := util.BuiltInTemplateFuncs()
|
||||
SQLTemplateFuncs(&tplFuncMap)
|
||||
goTpl = goTpl.Funcs(tplFuncMap)
|
||||
tpl, err := goTpl.Parse(tplContent)
|
||||
if nil != err {
|
||||
logging.LogWarnf("parse template [%s] failed: %s", tplContent, err)
|
||||
return
|
||||
}
|
||||
|
||||
buf := &bytes.Buffer{}
|
||||
dataModel := map[string]interface{}{} // 复制一份 IAL 以避免修改原始数据
|
||||
for k, v := range ial {
|
||||
dataModel[k] = v
|
||||
|
||||
// Database template column supports `created` and `updated` built-in variables https://github.com/siyuan-note/siyuan/issues/9364
|
||||
createdStr := ial["id"]
|
||||
if "" != createdStr {
|
||||
createdStr = createdStr[:len("20060102150405")]
|
||||
}
|
||||
created, parseErr := time.ParseInLocation("20060102150405", createdStr, time.Local)
|
||||
if nil == parseErr {
|
||||
dataModel["created"] = created
|
||||
} else {
|
||||
logging.LogWarnf("parse created [%s] failed: %s", createdStr, parseErr)
|
||||
dataModel["created"] = time.Now()
|
||||
}
|
||||
updatedStr := ial["updated"]
|
||||
updated, parseErr := time.ParseInLocation("20060102150405", updatedStr, time.Local)
|
||||
if nil == parseErr {
|
||||
dataModel["updated"] = updated
|
||||
} else {
|
||||
dataModel["updated"] = time.Now()
|
||||
}
|
||||
}
|
||||
|
||||
if nil != flashcard {
|
||||
dataModel["flashcard"] = flashcard
|
||||
}
|
||||
|
||||
for _, rowValue := range rowValues {
|
||||
if 1 > len(rowValue.Values) {
|
||||
continue
|
||||
}
|
||||
|
||||
v := rowValue.Values[0]
|
||||
if av.KeyTypeNumber == v.Type {
|
||||
if nil != v.Number && v.Number.IsNotEmpty {
|
||||
dataModel[rowValue.Key.Name] = v.Number.Content
|
||||
}
|
||||
} else if av.KeyTypeDate == v.Type {
|
||||
if nil != v.Date {
|
||||
if v.Date.IsNotEmpty {
|
||||
dataModel[rowValue.Key.Name] = time.UnixMilli(v.Date.Content)
|
||||
}
|
||||
if v.Date.IsNotEmpty2 {
|
||||
dataModel[rowValue.Key.Name+"_end"] = time.UnixMilli(v.Date.Content2)
|
||||
}
|
||||
}
|
||||
} else if av.KeyTypeRollup == v.Type {
|
||||
if 0 < len(v.Rollup.Contents) {
|
||||
var numbers []float64
|
||||
var contents []string
|
||||
for _, content := range v.Rollup.Contents {
|
||||
if av.KeyTypeNumber == content.Type {
|
||||
numbers = append(numbers, content.Number.Content)
|
||||
} else {
|
||||
contents = append(contents, content.String(true))
|
||||
}
|
||||
}
|
||||
|
||||
if 0 < len(numbers) {
|
||||
dataModel[rowValue.Key.Name] = numbers
|
||||
} else {
|
||||
dataModel[rowValue.Key.Name] = contents
|
||||
}
|
||||
}
|
||||
} else if av.KeyTypeRelation == v.Type {
|
||||
if 0 < len(v.Relation.Contents) {
|
||||
var contents []string
|
||||
for _, content := range v.Relation.Contents {
|
||||
contents = append(contents, content.String(true))
|
||||
}
|
||||
dataModel[rowValue.Key.Name] = contents
|
||||
}
|
||||
} else {
|
||||
dataModel[rowValue.Key.Name] = v.String(true)
|
||||
}
|
||||
}
|
||||
|
||||
if err = tpl.Execute(buf, dataModel); nil != err {
|
||||
logging.LogWarnf("execute template [%s] failed: %s", tplContent, err)
|
||||
return
|
||||
}
|
||||
ret = buf.String()
|
||||
return
|
||||
}
|
||||
|
||||
func renderAttributeViewTable(attrView *av.AttributeView, view *av.View, query string) (ret *av.Table, err error) {
|
||||
ret = &av.Table{
|
||||
ID: view.ID,
|
||||
Icon: view.Icon,
|
||||
Name: view.Name,
|
||||
HideAttrViewName: view.HideAttrViewName,
|
||||
Columns: []*av.TableColumn{},
|
||||
Rows: []*av.TableRow{},
|
||||
Filters: view.Table.Filters,
|
||||
Sorts: view.Table.Sorts,
|
||||
}
|
||||
|
||||
// 组装列
|
||||
for _, col := range view.Table.Columns {
|
||||
key, getErr := attrView.GetKey(col.ID)
|
||||
if nil != getErr {
|
||||
err = getErr
|
||||
return
|
||||
}
|
||||
|
||||
ret.Columns = append(ret.Columns, &av.TableColumn{
|
||||
ID: key.ID,
|
||||
Name: key.Name,
|
||||
Type: key.Type,
|
||||
Icon: key.Icon,
|
||||
Options: key.Options,
|
||||
NumberFormat: key.NumberFormat,
|
||||
Template: key.Template,
|
||||
Relation: key.Relation,
|
||||
Rollup: key.Rollup,
|
||||
Date: key.Date,
|
||||
Wrap: col.Wrap,
|
||||
Hidden: col.Hidden,
|
||||
Width: col.Width,
|
||||
Pin: col.Pin,
|
||||
Calc: col.Calc,
|
||||
})
|
||||
}
|
||||
|
||||
// 生成行
|
||||
rows := map[string][]*av.KeyValues{}
|
||||
for _, keyValues := range attrView.KeyValues {
|
||||
for _, val := range keyValues.Values {
|
||||
values := rows[val.BlockID]
|
||||
if nil == values {
|
||||
values = []*av.KeyValues{{Key: keyValues.Key, Values: []*av.Value{val}}}
|
||||
} else {
|
||||
values = append(values, &av.KeyValues{Key: keyValues.Key, Values: []*av.Value{val}})
|
||||
}
|
||||
rows[val.BlockID] = values
|
||||
}
|
||||
}
|
||||
|
||||
// 过滤掉不存在的行
|
||||
var notFound []string
|
||||
for blockID, keyValues := range rows {
|
||||
blockValue := getRowBlockValue(keyValues)
|
||||
if nil == blockValue {
|
||||
notFound = append(notFound, blockID)
|
||||
continue
|
||||
}
|
||||
|
||||
if blockValue.IsDetached {
|
||||
continue
|
||||
}
|
||||
|
||||
if nil != blockValue.Block && "" == blockValue.Block.ID {
|
||||
notFound = append(notFound, blockID)
|
||||
continue
|
||||
}
|
||||
|
||||
if nil == treenode.GetBlockTree(blockID) {
|
||||
notFound = append(notFound, blockID)
|
||||
}
|
||||
}
|
||||
for _, blockID := range notFound {
|
||||
delete(rows, blockID)
|
||||
}
|
||||
|
||||
// 生成行单元格
|
||||
for rowID, row := range rows {
|
||||
var tableRow av.TableRow
|
||||
for _, col := range ret.Columns {
|
||||
var tableCell *av.TableCell
|
||||
for _, keyValues := range row {
|
||||
if keyValues.Key.ID == col.ID {
|
||||
tableCell = &av.TableCell{
|
||||
ID: keyValues.Values[0].ID,
|
||||
Value: keyValues.Values[0],
|
||||
ValueType: col.Type,
|
||||
}
|
||||
break
|
||||
}
|
||||
}
|
||||
if nil == tableCell {
|
||||
tableCell = &av.TableCell{
|
||||
ID: ast.NewNodeID(),
|
||||
ValueType: col.Type,
|
||||
}
|
||||
}
|
||||
tableRow.ID = rowID
|
||||
|
||||
switch tableCell.ValueType {
|
||||
case av.KeyTypeNumber: // 格式化数字
|
||||
if nil != tableCell.Value && nil != tableCell.Value.Number && tableCell.Value.Number.IsNotEmpty {
|
||||
tableCell.Value.Number.Format = col.NumberFormat
|
||||
tableCell.Value.Number.FormatNumber()
|
||||
}
|
||||
case av.KeyTypeTemplate: // 渲染模板列
|
||||
tableCell.Value = &av.Value{ID: tableCell.ID, KeyID: col.ID, BlockID: rowID, Type: av.KeyTypeTemplate, Template: &av.ValueTemplate{Content: col.Template}}
|
||||
case av.KeyTypeCreated: // 填充创建时间列值，后面再渲染
|
||||
tableCell.Value = &av.Value{ID: tableCell.ID, KeyID: col.ID, BlockID: rowID, Type: av.KeyTypeCreated}
|
||||
case av.KeyTypeUpdated: // 填充更新时间列值，后面再渲染
|
||||
tableCell.Value = &av.Value{ID: tableCell.ID, KeyID: col.ID, BlockID: rowID, Type: av.KeyTypeUpdated}
|
||||
case av.KeyTypeRelation: // 清空关联列值，后面再渲染 https://ld246.com/article/1703831044435
|
||||
if nil != tableCell.Value && nil != tableCell.Value.Relation {
|
||||
tableCell.Value.Relation.Contents = nil
|
||||
}
|
||||
case av.KeyTypeText:
|
||||
if nil != tableCell.Value && nil != tableCell.Value.Text {
|
||||
tableCell.Value.Text.Content = util.EscapeHTML(tableCell.Value.Text.Content)
|
||||
}
|
||||
case av.KeyTypeEmail:
|
||||
if nil != tableCell.Value && nil != tableCell.Value.Email {
|
||||
tableCell.Value.Email.Content = util.EscapeHTML(tableCell.Value.Email.Content)
|
||||
}
|
||||
case av.KeyTypeURL:
|
||||
if nil != tableCell.Value && nil != tableCell.Value.URL {
|
||||
tableCell.Value.URL.Content = util.EscapeHTML(tableCell.Value.URL.Content)
|
||||
}
|
||||
case av.KeyTypePhone:
|
||||
if nil != tableCell.Value && nil != tableCell.Value.Phone {
|
||||
tableCell.Value.Phone.Content = util.EscapeHTML(tableCell.Value.Phone.Content)
|
||||
}
|
||||
}
|
||||
|
||||
treenode.FillAttributeViewTableCellNilValue(tableCell, rowID, col.ID)
|
||||
|
||||
tableRow.Cells = append(tableRow.Cells, tableCell)
|
||||
}
|
||||
ret.Rows = append(ret.Rows, &tableRow)
|
||||
}
|
||||
|
||||
// 渲染自动生成的列值，比如关联列、汇总列、创建时间列和更新时间列
|
||||
for _, row := range ret.Rows {
|
||||
for _, cell := range row.Cells {
|
||||
switch cell.ValueType {
|
||||
case av.KeyTypeRollup: // 渲染汇总列
|
||||
rollupKey, _ := attrView.GetKey(cell.Value.KeyID)
|
||||
if nil == rollupKey || nil == rollupKey.Rollup {
|
||||
break
|
||||
}
|
||||
|
||||
relKey, _ := attrView.GetKey(rollupKey.Rollup.RelationKeyID)
|
||||
if nil == relKey || nil == relKey.Relation {
|
||||
break
|
||||
}
|
||||
|
||||
relVal := attrView.GetValue(relKey.ID, row.ID)
|
||||
if nil == relVal || nil == relVal.Relation {
|
||||
break
|
||||
}
|
||||
|
||||
destAv, _ := av.ParseAttributeView(relKey.Relation.AvID)
|
||||
if nil == destAv {
|
||||
break
|
||||
}
|
||||
|
||||
destKey, _ := destAv.GetKey(rollupKey.Rollup.KeyID)
|
||||
if nil == destKey {
|
||||
continue
|
||||
}
|
||||
|
||||
for _, blockID := range relVal.Relation.BlockIDs {
|
||||
destVal := destAv.GetValue(rollupKey.Rollup.KeyID, blockID)
|
||||
if nil == destVal {
|
||||
if destAv.ExistBlock(blockID) { // 数据库中存在行但是列值不存在是数据未初始化，这里补一个默认值
|
||||
destVal = av.GetAttributeViewDefaultValue(ast.NewNodeID(), rollupKey.Rollup.KeyID, blockID, destKey.Type)
|
||||
}
|
||||
if nil == destVal {
|
||||
continue
|
||||
}
|
||||
}
|
||||
if av.KeyTypeNumber == destKey.Type {
|
||||
destVal.Number.Format = destKey.NumberFormat
|
||||
destVal.Number.FormatNumber()
|
||||
}
|
||||
|
||||
cell.Value.Rollup.Contents = append(cell.Value.Rollup.Contents, destVal.Clone())
|
||||
}
|
||||
|
||||
cell.Value.Rollup.RenderContents(rollupKey.Rollup.Calc, destKey)
|
||||
|
||||
// 将汇总列的值保存到 rows 中，后续渲染模板列的时候会用到，下同
|
||||
// Database table view template columns support reading relation, rollup, created and updated columns https://github.com/siyuan-note/siyuan/issues/10442
|
||||
keyValues := rows[row.ID]
|
||||
keyValues = append(keyValues, &av.KeyValues{Key: rollupKey, Values: []*av.Value{{ID: cell.Value.ID, KeyID: rollupKey.ID, BlockID: row.ID, Type: av.KeyTypeRollup, Rollup: cell.Value.Rollup}}})
|
||||
rows[row.ID] = keyValues
|
||||
case av.KeyTypeRelation: // 渲染关联列
|
||||
relKey, _ := attrView.GetKey(cell.Value.KeyID)
|
||||
if nil != relKey && nil != relKey.Relation {
|
||||
destAv, _ := av.ParseAttributeView(relKey.Relation.AvID)
|
||||
if nil != destAv {
|
||||
blocks := map[string]*av.Value{}
|
||||
for _, blockValue := range destAv.GetBlockKeyValues().Values {
|
||||
blocks[blockValue.BlockID] = blockValue
|
||||
}
|
||||
for _, blockID := range cell.Value.Relation.BlockIDs {
|
||||
if val := blocks[blockID]; nil != val {
|
||||
cell.Value.Relation.Contents = append(cell.Value.Relation.Contents, val)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
keyValues := rows[row.ID]
|
||||
keyValues = append(keyValues, &av.KeyValues{Key: relKey, Values: []*av.Value{{ID: cell.Value.ID, KeyID: relKey.ID, BlockID: row.ID, Type: av.KeyTypeRelation, Relation: cell.Value.Relation}}})
|
||||
rows[row.ID] = keyValues
|
||||
case av.KeyTypeCreated: // 渲染创建时间
|
||||
createdStr := row.ID[:len("20060102150405")]
|
||||
created, parseErr := time.ParseInLocation("20060102150405", createdStr, time.Local)
|
||||
if nil == parseErr {
|
||||
cell.Value.Created = av.NewFormattedValueCreated(created.UnixMilli(), 0, av.CreatedFormatNone)
|
||||
cell.Value.Created.IsNotEmpty = true
|
||||
} else {
|
||||
cell.Value.Created = av.NewFormattedValueCreated(time.Now().UnixMilli(), 0, av.CreatedFormatNone)
|
||||
}
|
||||
|
||||
keyValues := rows[row.ID]
|
||||
createdKey, _ := attrView.GetKey(cell.Value.KeyID)
|
||||
keyValues = append(keyValues, &av.KeyValues{Key: createdKey, Values: []*av.Value{{ID: cell.Value.ID, KeyID: createdKey.ID, BlockID: row.ID, Type: av.KeyTypeCreated, Created: cell.Value.Created}}})
|
||||
rows[row.ID] = keyValues
|
||||
case av.KeyTypeUpdated: // 渲染更新时间
|
||||
ial := map[string]string{}
|
||||
block := row.GetBlockValue()
|
||||
if nil != block && !block.IsDetached {
|
||||
ial = GetBlockAttrsWithoutWaitWriting(row.ID)
|
||||
}
|
||||
updatedStr := ial["updated"]
|
||||
if "" == updatedStr && nil != block {
|
||||
cell.Value.Updated = av.NewFormattedValueUpdated(block.Block.Updated, 0, av.UpdatedFormatNone)
|
||||
cell.Value.Updated.IsNotEmpty = true
|
||||
} else {
|
||||
updated, parseErr := time.ParseInLocation("20060102150405", updatedStr, time.Local)
|
||||
if nil == parseErr {
|
||||
cell.Value.Updated = av.NewFormattedValueUpdated(updated.UnixMilli(), 0, av.UpdatedFormatNone)
|
||||
cell.Value.Updated.IsNotEmpty = true
|
||||
} else {
|
||||
cell.Value.Updated = av.NewFormattedValueUpdated(time.Now().UnixMilli(), 0, av.UpdatedFormatNone)
|
||||
}
|
||||
}
|
||||
|
||||
keyValues := rows[row.ID]
|
||||
updatedKey, _ := attrView.GetKey(cell.Value.KeyID)
|
||||
keyValues = append(keyValues, &av.KeyValues{Key: updatedKey, Values: []*av.Value{{ID: cell.Value.ID, KeyID: updatedKey.ID, BlockID: row.ID, Type: av.KeyTypeUpdated, Updated: cell.Value.Updated}}})
|
||||
rows[row.ID] = keyValues
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 最后单独渲染模板列，这样模板列就可以使用汇总、关联、创建时间和更新时间列的值了
|
||||
// Database table view template columns support reading relation, rollup, created and updated columns https://github.com/siyuan-note/siyuan/issues/10442
|
||||
|
||||
// 获取闪卡信息
|
||||
flashcards := map[string]*Flashcard{}
|
||||
//deck := Decks[builtinDeckID]
|
||||
//if nil != deck {
|
||||
// var blockIDs []string
|
||||
// for _, row := range ret.Rows {
|
||||
// blockIDs = append(blockIDs, row.ID)
|
||||
// }
|
||||
// cards := deck.GetCardsByBlockIDs(blockIDs)
|
||||
// now := time.Now()
|
||||
// for _, card := range cards {
|
||||
// flashcards[card.BlockID()] = newFlashcard(card, builtinDeckID, now)
|
||||
// }
|
||||
//}
|
||||
|
||||
var renderTemplateErr error
|
||||
for _, row := range ret.Rows {
|
||||
for _, cell := range row.Cells {
|
||||
switch cell.ValueType {
|
||||
case av.KeyTypeTemplate: // 渲染模板列
|
||||
keyValues := rows[row.ID]
|
||||
ial := map[string]string{}
|
||||
block := row.GetBlockValue()
|
||||
if nil != block && !block.IsDetached {
|
||||
ial = GetBlockAttrsWithoutWaitWriting(row.ID)
|
||||
}
|
||||
content, renderErr := renderTemplateCol(ial, flashcards[row.ID], keyValues, cell.Value.Template.Content)
|
||||
cell.Value.Template.Content = content
|
||||
if nil != renderErr {
|
||||
key, _ := attrView.GetKey(cell.Value.KeyID)
|
||||
keyName := ""
|
||||
if nil != key {
|
||||
keyName = key.Name
|
||||
}
|
||||
renderTemplateErr = fmt.Errorf("database [%s] template field [%s] rendering failed: %s", getAttrViewName(attrView), keyName, renderErr)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if nil != renderTemplateErr {
|
||||
util.PushErrMsg(fmt.Sprintf(Conf.Language(44), util.EscapeHTML(renderTemplateErr.Error())), 30000)
|
||||
}
|
||||
|
||||
// 根据搜索条件过滤
|
||||
query = strings.TrimSpace(query)
|
||||
if "" != query {
|
||||
keywords := strings.Split(query, " ")
|
||||
var hitRows []*av.TableRow
|
||||
for _, row := range ret.Rows {
|
||||
hit := false
|
||||
for _, cell := range row.Cells {
|
||||
for _, keyword := range keywords {
|
||||
if strings.Contains(strings.ToLower(cell.Value.String(true)), strings.ToLower(keyword)) {
|
||||
hit = true
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
if hit {
|
||||
hitRows = append(hitRows, row)
|
||||
}
|
||||
}
|
||||
ret.Rows = hitRows
|
||||
if 1 > len(ret.Rows) {
|
||||
ret.Rows = []*av.TableRow{}
|
||||
}
|
||||
}
|
||||
|
||||
// 自定义排序
|
||||
sortRowIDs := map[string]int{}
|
||||
if 0 < len(view.Table.RowIDs) {
|
||||
for i, rowID := range view.Table.RowIDs {
|
||||
sortRowIDs[rowID] = i
|
||||
}
|
||||
}
|
||||
|
||||
sort.Slice(ret.Rows, func(i, j int) bool {
|
||||
iv := sortRowIDs[ret.Rows[i].ID]
|
||||
jv := sortRowIDs[ret.Rows[j].ID]
|
||||
if iv == jv {
|
||||
return ret.Rows[i].ID < ret.Rows[j].ID
|
||||
}
|
||||
return iv < jv
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
func getRowBlockValue(keyValues []*av.KeyValues) (ret *av.Value) {
|
||||
for _, kv := range keyValues {
|
||||
if av.KeyTypeBlock == kv.Key.Type && 0 < len(kv.Values) {
|
||||
|
|
@ -2316,7 +1842,7 @@ func addAttributeViewBlock(now int64, avID, blockID, previousBlockID, addingBloc
|
|||
// 如果存在过滤条件，则将过滤条件应用到新添加的块上
|
||||
view, _ := getAttrViewViewByBlockID(attrView, blockID)
|
||||
if nil != view && 0 < len(view.Table.Filters) && !ignoreFillFilter {
|
||||
viewable, _ := renderAttributeViewTable(attrView, view, "")
|
||||
viewable, _ := sql.RenderAttributeViewTable(attrView, view, "", GetBlockAttrsWithoutWaitWriting)
|
||||
viewable.FilterRows(attrView)
|
||||
viewable.SortRows(attrView)
|
||||
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ func SetBlockReminder(id string, timed string) (err error) {
|
|||
if ast.NodeDocument != node.Type && node.IsContainerBlock() {
|
||||
node = treenode.FirstLeafBlock(node)
|
||||
}
|
||||
content := treenode.NodeStaticContent(node, nil, false, false, false)
|
||||
content := sql.NodeStaticContent(node, nil, false, false, false, GetBlockAttrsWithoutWaitWriting)
|
||||
content = gulu.Str.SubStr(content, 128)
|
||||
err = SetCloudBlockReminder(id, content, timedMills)
|
||||
if nil != err {
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ func ExportAv2CSV(avID, blockID string) (zipPath string, err error) {
|
|||
name = Conf.language(105)
|
||||
}
|
||||
|
||||
table, err := renderAttributeViewTable(attrView, view, "")
|
||||
table, err := sql.RenderAttributeViewTable(attrView, view, "", GetBlockAttrsWithoutWaitWriting)
|
||||
if nil != err {
|
||||
logging.LogErrorf("render attribute view [%s] table failed: %s", avID, err)
|
||||
return
|
||||
|
|
@ -2297,7 +2297,7 @@ func exportTree(tree *parse.Tree, wysiwyg, expandKaTexMacros, keepFold bool,
|
|||
return ast.WalkContinue
|
||||
}
|
||||
|
||||
table, err := renderAttributeViewTable(attrView, view, "")
|
||||
table, err := sql.RenderAttributeViewTable(attrView, view, "", GetBlockAttrsWithoutWaitWriting)
|
||||
if nil != err {
|
||||
logging.LogErrorf("render attribute view [%s] table failed: %s", avID, err)
|
||||
return ast.WalkContinue
|
||||
|
|
|
|||
|
|
@ -93,7 +93,7 @@ func renderOutline(heading *ast.Node, luteEngine *lute.Lute) (ret string) {
|
|||
}
|
||||
|
||||
func renderBlockText(node *ast.Node, excludeTypes []string) (ret string) {
|
||||
ret = treenode.NodeStaticContent(node, excludeTypes, false, false, false)
|
||||
ret = sql.NodeStaticContent(node, excludeTypes, false, false, false, GetBlockAttrsWithoutWaitWriting)
|
||||
ret = strings.TrimSpace(ret)
|
||||
ret = strings.ReplaceAll(ret, "\n", "")
|
||||
ret = util.EscapeHTML(ret)
|
||||
|
|
@ -156,7 +156,7 @@ func renderBlockContentByNodes(nodes []*ast.Node) string {
|
|||
|
||||
buf := bytes.Buffer{}
|
||||
for _, n := range subNodes {
|
||||
buf.WriteString(treenode.NodeStaticContent(n, nil, false, false, false))
|
||||
buf.WriteString(sql.NodeStaticContent(n, nil, false, false, false, GetBlockAttrsWithoutWaitWriting))
|
||||
}
|
||||
return buf.String()
|
||||
}
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ import (
|
|||
func RenderGoTemplate(templateContent string) (ret string, err error) {
|
||||
tmpl := template.New("")
|
||||
tplFuncMap := util.BuiltInTemplateFuncs()
|
||||
SQLTemplateFuncs(&tplFuncMap)
|
||||
sql.SQLTemplateFuncs(&tplFuncMap)
|
||||
tmpl = tmpl.Funcs(tplFuncMap)
|
||||
tpl, err := tmpl.Parse(templateContent)
|
||||
if nil != err {
|
||||
|
|
@ -225,7 +225,7 @@ func RenderTemplate(p, id string, preview bool) (tree *parse.Tree, dom string, e
|
|||
|
||||
goTpl := template.New("").Delims(".action{", "}")
|
||||
tplFuncMap := util.BuiltInTemplateFuncs()
|
||||
SQLTemplateFuncs(&tplFuncMap)
|
||||
sql.SQLTemplateFuncs(&tplFuncMap)
|
||||
goTpl = goTpl.Funcs(tplFuncMap)
|
||||
tpl, err := goTpl.Funcs(tplFuncMap).Parse(gulu.Str.FromBytes(md))
|
||||
if nil != err {
|
||||
|
|
@ -314,7 +314,7 @@ func RenderTemplate(p, id string, preview bool) (tree *parse.Tree, dom string, e
|
|||
return ast.WalkContinue
|
||||
}
|
||||
|
||||
table, renderErr := renderAttributeViewTable(attrView, view, "")
|
||||
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
|
||||
|
|
@ -405,20 +405,3 @@ func addBlockIALNodes(tree *parse.Tree, removeUpdated bool) {
|
|||
block.InsertAfter(&ast.Node{Type: ast.NodeKramdownBlockIAL, Tokens: parse.IAL2Tokens(block.KramdownIAL)})
|
||||
}
|
||||
}
|
||||
|
||||
func SQLTemplateFuncs(templateFuncMap *template.FuncMap) {
|
||||
(*templateFuncMap)["queryBlocks"] = func(stmt string, args ...string) (retBlocks []*sql.Block) {
|
||||
for _, arg := range args {
|
||||
stmt = strings.Replace(stmt, "?", arg, 1)
|
||||
}
|
||||
retBlocks = sql.SelectBlocksRawStmt(stmt, 1, 512)
|
||||
return
|
||||
}
|
||||
(*templateFuncMap)["querySpans"] = func(stmt string, args ...string) (retSpans []*sql.Span) {
|
||||
for _, arg := range args {
|
||||
stmt = strings.Replace(stmt, "?", arg, 1)
|
||||
}
|
||||
retSpans = sql.SelectSpansRawStmt(stmt, 512)
|
||||
return
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ func getBlockVirtualRefKeywords(root *ast.Node) (ret []string) {
|
|||
return ast.WalkContinue
|
||||
}
|
||||
|
||||
content := treenode.NodeStaticContent(n, nil, false, false, false)
|
||||
content := sql.NodeStaticContent(n, nil, false, false, false, GetBlockAttrsWithoutWaitWriting)
|
||||
buf.WriteString(content)
|
||||
return ast.WalkContinue
|
||||
})
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue