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 2022-11-13 21:32:41 +08:00
commit 51fe9b1a99
7 changed files with 12 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/appearance/langs/en_US.json
View file

@ -1,7 +1,7 @@
{
"syncOfficialProviderIntro": "Currently selected is the cloud storage service officially provided by SiYuan, which only supports paid subscription users",
"syncThirdPartyProviderS3Intro": "The current selected is a third-party cloud storage service compatible with the Amazon S3 protocol. This feature support is currently in the free public beta stage",
"syncThirdPartyProviderWebDAVIntro": "The currently selected is a third-party cloud storage service with the WebDAV protocol. This feature support is currently in the free public beta stage",
"syncThirdPartyProviderS3Intro": "The current selected is a third-party cloud storage service compatible with the Amazon S3 protocol (eg <a href=\"https://s.qiniu.com/VbQfeu\" target=\"_blank\">Qiniu</a>, <a href=\"https://www.aliyun.com/product/ oss?userCode=yqovuas2\" target=\"_blank\">Aliyun OSS</a>, <a href=\"https://www.cloudflare.com/\" target=\"_blank\">Cloudflare R2</a>). This feature support is currently in the free public beta stage",
"syncThirdPartyProviderWebDAVIntro": "The currently selected is a third-party cloud storage service with the WebDAV protocol (eg <a href=\"https://teracloud.jp/\" target=\"_blank\">TeraCLOUD</a>). This feature support is currently in the free public beta stage",
"syncThirdPartyProviderTip": "Before using this feature, please pay attention to the technical limitations and billing items of the third-party cloud storage service: <div class=\"b3-label__text\"><ul class='fn__list'><li>Technical limitations such as interface calling frequency and bandwidth</li><li>Billing items such as storage space and traffic</li><li>Terms of use and availability guarantee</li></ul></div><div class='fn__hr'></div>Disclaimer: For details, please refer to the relevant terms in the open source license AGPLv3 used by SiYuan",
"syncProvider": "Cloud Storage Service Provider",
"syncProviderTip": "If selected, the cloud storage service of this provider will be used to achieve cloud synchronization and backup functions",

4
app/appearance/langs/zh_CHT.json
View file

@ -1,7 +1,7 @@
{
"syncOfficialProviderIntro": "當前選擇的是 SiYuan 官方提供的雲端存儲服務，僅支持付費訂閱用戶使用",
"syncThirdPartyProviderS3Intro": "當前選擇的是 Amazon S3 協議兼容的第三方雲端存儲服務，該特性支持目前處於免費公測階段",
"syncThirdPartyProviderWebDAVIntro": "當前選擇的是 WebDAV 協議的第三方雲端存儲服務，該特性支持目前處於免費公測階段",
"syncThirdPartyProviderS3Intro": "當前選擇的是 Amazon S3 協議兼容的第三方雲端存儲服務（比如<a href=\"https://s.qiniu.com/VbQfeu\" target=\"_blank\">七牛雲</a>、<a href=\"https://www.aliyun.com/product/oss?userCode=yqovuas2\" target=\"_blank\">阿里雲 OSS</a>、<a href=\"https://www.cloudflare.com/\" target=\"_blank\">Cloudflare R2</a>），該特性支持目前處於免費公測階段",
"syncThirdPartyProviderWebDAVIntro": "當前選擇的是 WebDAV 協議的第三方雲端存儲服務（比如 <a href=\"https://teracloud.jp/\" target=\"_blank\">TeraCLOUD</a>），該特性支持目前處於免費公測階段",
"syncThirdPartyProviderTip": "在使用該特性前，請注意第三方雲端存儲服務的技術限制和計費項目等條款：<div class=\"b3-label__text\"><ul class='fn__list'><li>接口調用頻率、帶寬等技術限制</li><li>存儲空間和流量等計費項目</li><li>使用條款和可用性保障等條款</li></ul></div><div class='fn__hr'></div>免責聲明：詳見思源筆記所使用的開源許可證 AGPLv3 中的相關條款",
"syncProvider": "雲端存儲服務提供商",
"syncProviderTip": "選擇後將使用該提供商的雲端存儲服務實現雲端同步和備份功能",

4
app/appearance/langs/zh_CN.json
View file

@ -1,7 +1,7 @@
{
"syncOfficialProviderIntro": "当前选择的是 SiYuan 官方提供的云端存储服务，仅支持付费订阅用户使用",
"syncThirdPartyProviderS3Intro": "当前选择的是 Amazon S3 协议兼容的第三方云端存储服务，该特性支持目前处于免费公测阶段",
"syncThirdPartyProviderWebDAVIntro": "当前选择的是 WebDAV 协议的第三方云端存储服务，该特性支持目前处于免费公测阶段",
"syncThirdPartyProviderS3Intro": "当前选择的是 Amazon S3 协议兼容的第三方云端存储服务（比如<a href=\"https://s.qiniu.com/VbQfeu\" target=\"_blank\">七牛云</a>、<a href=\"https://www.aliyun.com/product/oss?userCode=yqovuas2\" target=\"_blank\">阿里云 OSS</a>、<a href=\"https://www.cloudflare.com/\" target=\"_blank\">Cloudflare R2</a>），该特性支持目前处于免费公测阶段",
"syncThirdPartyProviderWebDAVIntro": "当前选择的是 WebDAV 协议的第三方云端存储服务（比如 <a href=\"https://teracloud.jp/\" target=\"_blank\">TeraCLOUD</a>），该特性支持目前处于免费公测阶段",
"syncThirdPartyProviderTip": "在使用该特性前，请注意第三方云端存储服务的技术限制和计费项目等条款：<div class=\"b3-label__text\"><ul class='fn__list'><li>接口调用频率、带宽等技术限制</li><li>存储空间和流量等计费项目</li><li>使用条款和可用性保障等条款</li></ul></div><div class='fn__hr'></div>免责声明：详见思源笔记所使用的开源许可证 AGPLv3 中的相关条款",
"syncProvider": "云端存储服务提供商",
"syncProviderTip": "选择后将使用该提供商的云端存储服务实现云端同步和备份功能",

12
app/guide/20210808180117-6v0mkxr/20200923234731-h3zkwm2.sy
View file

@ -592,7 +592,7 @@
"Type": "NodeTextMark",
"TextMarkType": "a",
"TextMarkAHref": "https://s.qiniu.com/VbQfeu",
"TextMarkTextContent": "Qiniu Cloud"
"TextMarkTextContent": "Qiniu"
},
{
"Type": "NodeText",
@ -602,7 +602,7 @@
"Type": "NodeTextMark",
"TextMarkType": "a",
"TextMarkAHref": "https://www.aliyun.com/product/oss?userCode=yqovuas2",
"TextMarkTextContent": "Alibaba Cloud OSS"
"TextMarkTextContent": "Aliyun OSS"
},
{
"Type": "NodeText",
@ -613,10 +613,6 @@
"TextMarkType": "a",
"TextMarkAHref": "https://www.cloudflare.com/",
"TextMarkTextContent": "Cloudflare R2"
},
{
"Type": "NodeText",
"Data": ", etc."
}
]
}
@ -661,10 +657,6 @@
"TextMarkType": "a",
"TextMarkAHref": "https://koofr.eu/",
"TextMarkTextContent": "Koofr"
},
{
"Type": "NodeText",
"Data": ", etc."
}
]
}

8
app/guide/20210808180117-czj9bvb/20200813093015-u6bopdt.sy
View file

@ -717,10 +717,6 @@
"TextMarkType": "a",
"TextMarkAHref": "https://www.cloudflare.com/",
"TextMarkTextContent": "Cloudflare R2"
},
{
"Type": "NodeText",
"Data": " 等"
}
]
}
@ -754,10 +750,6 @@
"TextMarkType": "a",
"TextMarkAHref": "https://teracloud.jp/",
"TextMarkTextContent": "TeraCLOUD"
},
{
"Type": "NodeText",
"Data": " 等"
}
]
}

8
app/guide/20211226090932-5lcq56f/20211226115227-r1rty9v.sy
View file

@ -607,10 +607,6 @@
"TextMarkType": "a",
"TextMarkAHref": "https://www.cloudflare.com/",
"TextMarkTextContent": "Cloudflare R2"
},
{
"Type": "NodeText",
"Data": " 等"
}
]
}
@ -655,10 +651,6 @@
"TextMarkType": "a",
"TextMarkAHref": "https://koofr.eu/",
"TextMarkTextContent": "Koofr"
},
{
"Type": "NodeText",
"Data": " 等"
}
]
}

12
kernel/model/search.go
View file

@ -117,11 +117,8 @@ func SearchRefBlock(id, rootID, keyword string, beforeLen int) (ret []*Block, ne
if nil == block {
continue
}
block.Content = maxContent(block.Content, Conf.Editor.BlockRefDynamicAnchorTextMaxLen)
block.RefText = block.Content
if block.IsContainerBlock() {
block.RefText = block.FContent // `((` 引用列表项时使用第一个子块作为动态锚文本 https://github.com/siyuan-note/siyuan/issues/4536
}
block.RefText = sql.GetRefText(block.ID)
block.RefText = maxContent(block.RefText, Conf.Editor.BlockRefDynamicAnchorTextMaxLen)
ret = append(ret, block)
}
if 1 > len(ret) {
@ -135,9 +132,9 @@ func SearchRefBlock(id, rootID, keyword string, beforeLen int) (ret []*Block, ne
trees := map[string]*parse.Tree{}
for _, b := range ret {
hitFirstChildID := false
b.RefText = b.Content
b.RefText = sql.GetRefText(b.ID)
b.RefText = maxContent(b.RefText, Conf.Editor.BlockRefDynamicAnchorTextMaxLen)
if b.IsContainerBlock() {
b.RefText = b.FContent // `((` 引用列表项时使用第一个子块作为动态锚文本 https://github.com/siyuan-note/siyuan/issues/4536
// `((` 引用候选中排除当前块的父块 https://github.com/siyuan-note/siyuan/issues/4538
tree := trees[b.RootID]
@ -154,7 +151,6 @@ func SearchRefBlock(id, rootID, keyword string, beforeLen int) (ret []*Block, ne
}
if b.ID != id && !hitFirstChildID && b.ID != rootID {
b.Content = maxContent(b.Content, Conf.Editor.BlockRefDynamicAnchorTextMaxLen)
tmp = append(tmp, b)
}
}