Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-03 07:18:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source
This commit is contained in:
Vanessa 2023-05-26 16:20:22 +08:00
commit d054f6ffec
6 changed files with 445 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

151
app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-v9awwp0/20220105101227-n5zpr1a.sy
View file

@ -5,7 +5,7 @@
"Properties": {
"id": "20220105101227-n5zpr1a",
"title": "Limitations",
"updated": "20220722230453"
"updated": "20230526091133"
},
"Children": [
{
@ -14,7 +14,7 @@
"ListData": {},
"Properties": {
"id": "20220105101254-dhwb8a1",
"updated": "20220722230453"
"updated": "20230526091133"
},
"Children": [
{
@ -65,7 +65,15 @@
"Children": [
{
"Type": "NodeText",
"Data": "Supports the creation of up to 7 cloud synchronization directories"
"Data": "Supports the creation of up to 7 "
},
{
"Type": "NodeText",
"Data": "cloud"
},
{
"Type": "NodeText",
"Data": " synchronization directories"
}
]
}
@ -91,12 +99,32 @@
"Children": [
{
"Type": "NodeText",
"Data": "The initial total size of cloud storage space is "
"Data": "The initial total size of "
},
{
"Type": "NodeText",
"Data": "cloud"
},
{
"Type": "NodeText",
"Data": " "
},
{
"Type": "NodeText",
"Data": "storage"
},
{
"Type": "NodeText",
"Data": " space is "
},
{
"Type": "NodeTextMark",
"TextMarkType": "code",
"TextMarkTextContent": "8G"
},
{
"Type": "NodeText",
"Data": "​"
}
]
}
@ -111,7 +139,7 @@
},
"Properties": {
"id": "20220105101254-fvel6pz",
"updated": "20220325115334"
"updated": "20230526091133"
},
"Children": [
{
@ -124,7 +152,118 @@
"Children": [
{
"Type": "NodeText",
"Data": "After the paid subscription expires, the cloud storage will be completely deleted"
"Data": "After the paid subscription expires, the "
},
{
"Type": "NodeText",
"Data": "cloud"
},
{
"Type": "NodeText",
"Data": " "
},
{
"Type": "NodeText",
"Data": "storage"
},
{
"Type": "NodeText",
"Data": " will be completely deleted"
}
]
},
{
"ID": "20230526091044-hit1355",
"Type": "NodeList",
"ListData": {},
"Properties": {
"id": "20230526091044-hit1355",
"updated": "20230526091133"
},
"Children": [
{
"ID": "20230526091044-cw80vzc",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20230526091044-cw80vzc",
"updated": "20230526091044"
},
"Children": [
{
"ID": "20230526091044-sucdt8y",
"Type": "NodeParagraph",
"Properties": {
"id": "20230526091044-sucdt8y",
"updated": "20230526091044"
},
"Children": [
{
"Type": "NodeText",
"Data": "From 15 days before the expiration, the expiration reminder will pop up every time you open the software, and the reminder will stop after 2 days of expiration"
}
]
}
]
},
{
"ID": "20230526091044-aw31eq1",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20230526091044-aw31eq1",
"updated": "20230526091044"
},
"Children": [
{
"ID": "20230526091044-czi0jwq",
"Type": "NodeParagraph",
"Properties": {
"id": "20230526091044-czi0jwq",
"updated": "20230526091044"
},
"Children": [
{
"Type": "NodeText",
"Data": "2 days before the expiration date, a SMS reminder will be sent to the mobile phone bound to the account"
}
]
}
]
},
{
"ID": "20230526091044-711agmy",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20230526091044-711agmy",
"updated": "20230526091133"
},
"Children": [
{
"ID": "20230526091044-p3wzf5n",
"Type": "NodeParagraph",
"Properties": {
"id": "20230526091044-p3wzf5n",
"updated": "20230526091133"
},
"Children": [
{
"Type": "NodeText",
"Data": "Deleting cloud storage does not affect local data"
}
]
}
]
}
]
}

113
app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180320-m0ztypq/20220105100506-auvmvcw.sy
View file

@ -5,7 +5,7 @@
"Properties": {
"id": "20220105100506-auvmvcw",
"title": "限制",
"updated": "20220722230325"
"updated": "20230526091115"
},
"Children": [
{
@ -14,7 +14,7 @@
"ListData": {},
"Properties": {
"id": "20220105100506-t539921",
"updated": "20220722230325"
"updated": "20230526091115"
},
"Children": [
{
@ -74,7 +74,11 @@
"Children": [
{
"Type": "NodeText",
"Data": "最多支持保存 12 个数据快照"
"Data": "最多支持保存 12 个"
},
{
"Type": "NodeText",
"Data": "数据快照"
}
]
}
@ -116,6 +120,10 @@
"Type": "NodeTextMark",
"TextMarkType": "code",
"TextMarkTextContent": "8G"
},
{
"Type": "NodeText",
"Data": "​"
}
]
}
@ -130,7 +138,7 @@
},
"Properties": {
"id": "20220105101055-3ruzllu",
"updated": "20220325115113"
"updated": "20230526091115"
},
"Children": [
{
@ -138,20 +146,105 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20220105101055-6fop8lv",
"updated": "20220325115113"
"updated": "20230526090018"
},
"Children": [
{
"Type": "NodeText",
"Data": "付费订阅到期以后，"
"Data": "付费订阅到期以后，云端存储会被彻底删除"
}
]
},
{
"ID": "20230526090019-t4djm1s",
"Type": "NodeList",
"ListData": {},
"Properties": {
"id": "20230526090019-t4djm1s",
"updated": "20230526091115"
},
"Children": [
{
"ID": "20230526090019-gf1v75w",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20230526090019-gf1v75w"
},
"Children": [
{
"ID": "20230526090019-ov0l706",
"Type": "NodeParagraph",
"Properties": {
"id": "20230526090019-ov0l706",
"updated": "20230526090645"
},
"Children": [
{
"Type": "NodeText",
"Data": "从到期前 15 天，每次打开软件都会弹出到期提醒，到期 2 天后停止提醒"
}
]
}
]
},
{
"Type": "NodeText",
"Data": "云端"
"ID": "20230526090418-mis3qlo",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20230526090418-mis3qlo"
},
"Children": [
{
"ID": "20230526090418-3tf50pm",
"Type": "NodeParagraph",
"Properties": {
"id": "20230526090418-3tf50pm",
"updated": "20230526090536"
},
"Children": [
{
"Type": "NodeText",
"Data": "到期前 2 天，会推送一次短信提醒到账号绑定的手机上"
}
]
}
]
},
{
"Type": "NodeText",
"Data": "存储会被彻底删除"
"ID": "20230526090702-3061jin",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20230526090702-3061jin",
"updated": "20230526091115"
},
"Children": [
{
"ID": "20230526090702-dv1rp9c",
"Type": "NodeParagraph",
"Properties": {
"id": "20230526090702-dv1rp9c",
"updated": "20230526091115"
},
"Children": [
{
"Type": "NodeText",
"Data": "删除云端存储不影响本地数据"
}
]
}
]
}
]
}

141
app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121232-23s79xr/20220105101348-corstqc.sy
View file

@ -5,7 +5,7 @@
"Properties": {
"id": "20220105101348-corstqc",
"title": "限制",
"updated": "20220722230405"
"updated": "20230526091143"
},
"Children": [
{
@ -14,7 +14,7 @@
"ListData": {},
"Properties": {
"id": "20220105101409-es213ce",
"updated": "20220722230405"
"updated": "20230526091143"
},
"Children": [
{
@ -39,7 +39,11 @@
"Children": [
{
"Type": "NodeText",
"Data": "最多支持保存 12 個數據快照"
"Data": "最多支持保存 12 個"
},
{
"Type": "NodeText",
"Data": "數據快照"
}
]
}
@ -65,7 +69,15 @@
"Children": [
{
"Type": "NodeText",
"Data": "最多支持創建 7 個雲端同步目錄"
"Data": "最多支持創建 7 個"
},
{
"Type": "NodeText",
"Data": "雲端"
},
{
"Type": "NodeText",
"Data": "同步目錄"
}
]
}
@ -91,12 +103,24 @@
"Children": [
{
"Type": "NodeText",
"Data": "雲端存儲空間初始化總大小為 "
"Data": "雲端"
},
{
"Type": "NodeText",
"Data": "存儲空間"
},
{
"Type": "NodeText",
"Data": "初始化總大小為 "
},
{
"Type": "NodeTextMark",
"TextMarkType": "code",
"TextMarkTextContent": "8G"
},
{
"Type": "NodeText",
"Data": "​"
}
]
}
@ -111,7 +135,7 @@
},
"Properties": {
"id": "20220105101409-7he9vg5",
"updated": "20220325115431"
"updated": "20230526091143"
},
"Children": [
{
@ -124,7 +148,110 @@
"Children": [
{
"Type": "NodeText",
"Data": "付費訂閱到期以後，雲端存儲會被徹底刪除"
"Data": "付費訂閱到期以後，"
},
{
"Type": "NodeText",
"Data": "雲端"
},
{
"Type": "NodeText",
"Data": "存儲會被徹底刪除"
}
]
},
{
"ID": "20230526090813-n13j66a",
"Type": "NodeList",
"ListData": {},
"Properties": {
"id": "20230526090813-n13j66a",
"updated": "20230526091143"
},
"Children": [
{
"ID": "20230526090813-mfumx36",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20230526090813-mfumx36",
"updated": "20230526090813"
},
"Children": [
{
"ID": "20230526090813-vb2arin",
"Type": "NodeParagraph",
"Properties": {
"id": "20230526090813-vb2arin",
"updated": "20230526090813"
},
"Children": [
{
"Type": "NodeText",
"Data": "從到期前 15 天，每次打開軟件都會彈出到期提醒，到期 2 天后停止提醒"
}
]
}
]
},
{
"ID": "20230526090813-18hhanu",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20230526090813-18hhanu",
"updated": "20230526090813"
},
"Children": [
{
"ID": "20230526090813-3or6hwd",
"Type": "NodeParagraph",
"Properties": {
"id": "20230526090813-3or6hwd",
"updated": "20230526090813"
},
"Children": [
{
"Type": "NodeText",
"Data": "到期前 2 天，會推送一次短信提醒到賬號綁定的手機上"
}
]
}
]
},
{
"ID": "20230526090813-tkeoo35",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20230526090813-tkeoo35",
"updated": "20230526091143"
},
"Children": [
{
"ID": "20230526090813-1ft916s",
"Type": "NodeParagraph",
"Properties": {
"id": "20230526090813-1ft916s",
"updated": "20230526091143"
},
"Children": [
{
"Type": "NodeText",
"Data": "刪除雲端存儲不影響本地數據"
}
]
}
]
}
]
}

97
app/stage/protyle/js/lute/lute.min.js vendored
View file

File diff suppressed because one or more lines are too long

8
kernel/model/liandi.go
View file

@ -220,11 +220,12 @@ func refreshSubscriptionExpirationRemind() {
}
subscriptionExpirationReminded = true
defer logging.Recover()
if "ios" == util.Container {
return
}
defer logging.Recover()
if IsSubscriber() && -1 != Conf.User.UserSiYuanProExpireTime {
expired := int64(Conf.User.UserSiYuanProExpireTime)
now := time.Now().UnixMilli()
@ -242,7 +243,8 @@ func refreshSubscriptionExpirationRemind() {
}
if 0 < remains && expireDay > remains {
time.Sleep(3 * time.Minute)
util.WaitForUILoaded()
time.Sleep(time.Second * 3)
util.PushErrMsg(fmt.Sprintf(Conf.Language(127), remains), 0)
return
}

7
kernel/util/sort.go
View file

@ -19,12 +19,17 @@ package util
import (
"bytes"
"io"
"strings"
"golang.org/x/text/encoding/simplifiedchinese"
"golang.org/x/text/transform"
)
func PinYinCompare(str1, str2 string) bool {
// Doc tree, backlinks, tags and templates ignores case when sorting alphabetically by name https://github.com/siyuan-note/siyuan/issues/8360
str1 = strings.ToLower(str1)
str2 = strings.ToLower(str2)
a, _ := UTF82GBK(str1)
b, _ := UTF82GBK(str2)
bLen := len(b)
@ -70,5 +75,5 @@ const (
SortModeSubDocCountDESC // 14：子文档数降序
SortModeFileTree // 15：使用文档树排序规则
SortModeUnassigned = 256 // 256：未指定排序规则，按照笔记本优先于文档树获取排序规则
SortModeUnassigned = 256 // 256：未指定排序规则，按照笔记本优先于文档树获取排序规则
)