0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Vanessa 2024-03-02 22:43:16 +08:00
commit 82d3297e2a
4 changed files with 4 additions and 162 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20240208172514-9dsv6na.sy
View file

@ -628,59 +628,6 @@
},
"AttributeViewID": "20240208173528-oq4elsj",
"AttributeViewType": "table"
},
{
"ID": "20240208173718-rd3m292",
"Type": "NodeParagraph",
"Properties": {
"id": "20240208173718-rd3m292",
"updated": "20240208173725"
},
"Children": [
{
"Type": "NodeText",
"Data": "Limitations:"
}
]
},
{
"ID": "20240208173718-nfm0bmg",
"Type": "NodeList",
"ListData": {},
"Properties": {
"id": "20240208173718-nfm0bmg",
"updated": "20240208173738"
},
"Children": [
{
"ID": "20240208173718-02mf086",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20240208173718-02mf086",
"updated": "20240208173738"
},
"Children": [
{
"ID": "20240208173718-glmn4sj",
"Type": "NodeParagraph",
"Properties": {
"id": "20240208173718-glmn4sj",
"updated": "20240208173738"
},
"Children": [
{
"Type": "NodeText",
"Data": "Templates do not support access to rollups and other templates"
}
]
}
]
}
]
}
]
}

53
app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20240208113259-nykkvaq.sy
View file

@ -627,59 +627,6 @@
"AttributeViewID": "20240208163918-rxu3llx",
"AttributeViewType": "table"
},
{
"ID": "20240208163259-grav8dt",
"Type": "NodeParagraph",
"Properties": {
"id": "20240208163259-grav8dt",
"updated": "20240208163743"
},
"Children": [
{
"Type": "NodeText",
"Data": "限制："
}
]
},
{
"ID": "20240208163744-adnusw0",
"Type": "NodeList",
"ListData": {},
"Properties": {
"id": "20240208163744-adnusw0",
"updated": "20240208164314"
},
"Children": [
{
"ID": "20240208163744-wqpsu75",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20240208163744-wqpsu75",
"updated": "20240208164314"
},
"Children": [
{
"ID": "20240208163744-mvchkvw",
"Type": "NodeParagraph",
"Properties": {
"id": "20240208163744-mvchkvw",
"updated": "20240208164314"
},
"Children": [
{
"Type": "NodeText",
"Data": "模板不支持访问汇总和其他模板属性"
}
]
}
]
}
]
},
{
"ID": "20240208164400-bj6bcvj",
"Type": "NodeParagraph",

53
app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121203-rjjngpz/20240208171522-y7dxcno.sy
View file

@ -628,59 +628,6 @@
},
"AttributeViewID": "20240208172113-d44j7tk",
"AttributeViewType": "table"
},
{
"ID": "20240208172311-cq451l0",
"Type": "NodeParagraph",
"Properties": {
"id": "20240208172311-cq451l0",
"updated": "20240208172311"
},
"Children": [
{
"Type": "NodeText",
"Data": "限制："
}
]
},
{
"ID": "20240208172311-6owi2nq",
"Type": "NodeList",
"ListData": {},
"Properties": {
"id": "20240208172311-6owi2nq",
"updated": "20240208172311"
},
"Children": [
{
"ID": "20240208172311-qogv4xs",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20240208172311-qogv4xs",
"updated": "20240208172311"
},
"Children": [
{
"ID": "20240208172311-hwflpdm",
"Type": "NodeParagraph",
"Properties": {
"id": "20240208172311-hwflpdm",
"updated": "20240208172311"
},
"Children": [
{
"Type": "NodeText",
"Data": "範本不支援存取匯總和其他範本屬性"
}
]
}
]
}
]
}
]
}

7
kernel/av/filter.go
View file

@ -17,8 +17,9 @@
package av
import (
"github.com/siyuan-note/siyuan/kernel/util"
"strings"
"github.com/siyuan-note/siyuan/kernel/util"
)
type Filterable interface {
@ -51,8 +52,8 @@ const (
)
type RelativeDate struct {
Count int `json:"count"` // 数量
Unit RelativeDateUnit `json:"unit"` // 单位：0 天、1 周、2 月、3 年
Count int `json:"count"` // 数量
Unit RelativeDateUnit `json:"unit"` // 单位：0 天、1 周、2 月、3 年
Direction RelativeDateDirection `json:"direction"` // 方向：-1 前、0 这、1 后
}