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

This commit is contained in:
Vanessa 2023-08-18 10:57:41 +08:00
commit 099d45a8b5
3 changed files with 469 additions and 27 deletions

View File

@ -5,30 +5,175 @@
"Properties": {
"id": "20230805232134-3d6mx2k",
"title": "Search asset content",
"updated": "20230805232250"
"updated": "20230818102341"
},
"Children": [
{
"ID": "20230805232134-cpi0qgh",
"ID": "20230818102341-c9x1xox",
"Type": "NodeParagraph",
"Properties": {
"id": "20230805232134-cpi0qgh",
"updated": "20230805232250"
"id": "20230818102341-c9x1xox",
"updated": "20230818102402"
},
"Children": [
{
"Type": "NodeText",
"Data": "This feature is still under development, please pay attention to "
"Data": "In the upper right corner of the "
},
{
"Type": "NodeTextMark",
"TextMarkType": "a",
"TextMarkAHref": "https://github.com/siyuan-note/siyuan/issues/8874",
"TextMarkTextContent": "https://github.com/siyuan-note/siyuan/issues/8874"
"TextMarkType": "kbd",
"TextMarkTextContent": "Search"
},
{
"Type": "NodeText",
"Data": "."
"Data": " interface, you can switch the search function to search asset content. Currently, asset content search in the following formats is supported:"
}
]
},
{
"ID": "20230818102341-ny18orr",
"Type": "NodeList",
"ListData": {},
"Properties": {
"id": "20230818102341-ny18orr",
"updated": "20230818102341"
},
"Children": [
{
"ID": "20230818102341-eg8labw",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20230818102341-eg8labw",
"updated": "20230818102341"
},
"Children": [
{
"ID": "20230818102341-izc16tp",
"Type": "NodeParagraph",
"Properties": {
"id": "20230818102341-izc16tp",
"updated": "20230818102426"
},
"Children": [
{
"Type": "NodeText",
"Data": "Text files (.txt, .md, .json, .log, .sql, .html, .xml, .java, .h, .c, .cpp, .go, .rs, .swift, .kt, . py, .php, .js, .css, .ts, .sh, .bat, .cmd, .ini, .yaml, .rst, .adoc, .textile, .opml, .org, .wiki)"
}
]
}
]
},
{
"ID": "20230818102427-os9c4nm",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20230818102427-os9c4nm"
},
"Children": [
{
"ID": "20230818102427-dyojs23",
"Type": "NodeParagraph",
"Properties": {
"id": "20230818102427-dyojs23",
"updated": "20230818102429"
},
"Children": [
{
"Type": "NodeText",
"Data": ".docx"
}
]
}
]
},
{
"ID": "20230818102430-sw9p4uf",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20230818102430-sw9p4uf"
},
"Children": [
{
"ID": "20230818102430-boci4wf",
"Type": "NodeParagraph",
"Properties": {
"id": "20230818102430-boci4wf",
"updated": "20230818102431"
},
"Children": [
{
"Type": "NodeText",
"Data": ".pptx"
}
]
}
]
},
{
"ID": "20230818102432-6uclx4n",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20230818102432-6uclx4n"
},
"Children": [
{
"ID": "20230818102432-3n95b7k",
"Type": "NodeParagraph",
"Properties": {
"id": "20230818102432-3n95b7k",
"updated": "20230818102433"
},
"Children": [
{
"Type": "NodeText",
"Data": ".xlsx"
}
]
}
]
},
{
"ID": "20230818102434-9xgwy7r",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20230818102434-9xgwy7r"
},
"Children": [
{
"ID": "20230818102434-1efdkw9",
"Type": "NodeParagraph",
"Properties": {
"id": "20230818102434-1efdkw9"
},
"Children": [
{
"Type": "NodeText",
"Data": ".pdf"
}
]
}
]
}
]
}

View File

@ -5,30 +5,177 @@
"Properties": {
"id": "20230805230218-aea8icj",
"title": "搜索资源文件内容",
"updated": "20230805231517"
"updated": "20230818101545"
},
"Children": [
{
"ID": "20230805230218-ii0k5c6",
"ID": "20230818101510-yjc0r0h",
"Type": "NodeParagraph",
"Properties": {
"id": "20230805230218-ii0k5c6",
"updated": "20230805231517"
"id": "20230818101510-yjc0r0h",
"updated": "20230818102305"
},
"Children": [
{
"Type": "NodeText",
"Data": "该特性还开发中,请关注 "
"Data": "在 "
},
{
"Type": "NodeTextMark",
"TextMarkType": "a",
"TextMarkAHref": "https://github.com/siyuan-note/siyuan/issues/8874",
"TextMarkTextContent": "https://github.com/siyuan-note/siyuan/issues/8874"
"TextMarkType": "kbd",
"TextMarkTextContent": "搜索"
},
{
"Type": "NodeText",
"Data": "。"
"Data": " 界面右上角可以将搜索功能切换到搜索资源文件内容,目前支持如下格式的资源文件内容搜索:"
}
]
},
{
"ID": "20230818101450-4a6lzdg",
"Type": "NodeList",
"ListData": {},
"Properties": {
"id": "20230818101450-4a6lzdg",
"updated": "20230818101545"
},
"Children": [
{
"ID": "20230818101510-rfacaaf",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20230818101510-rfacaaf",
"updated": "20230818101800"
},
"Children": [
{
"ID": "20230818101510-duzarcy",
"Type": "NodeParagraph",
"Properties": {
"id": "20230818101510-duzarcy",
"updated": "20230818101800"
},
"Children": [
{
"Type": "NodeText",
"Data": "文本文件(.txt、.md、.json、.log、.sql、.html、.xml、.java、.h、.c、.cpp、.go、.rs、.swift、.kt、.py、.php、.js、.css、.ts、.sh、.bat、.cmd、.ini、.yaml、.rst、.adoc、.textile、.opml、.org、.wiki"
}
]
}
]
},
{
"ID": "20230818101513-x5baw16",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20230818101513-x5baw16"
},
"Children": [
{
"ID": "20230818101513-558ntbl",
"Type": "NodeParagraph",
"Properties": {
"id": "20230818101513-558ntbl",
"updated": "20230818101520"
},
"Children": [
{
"Type": "NodeText",
"Data": ".docx"
}
]
}
]
},
{
"ID": "20230818101521-n1r8yqv",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20230818101521-n1r8yqv"
},
"Children": [
{
"ID": "20230818101521-mutuxqo",
"Type": "NodeParagraph",
"Properties": {
"id": "20230818101521-mutuxqo",
"updated": "20230818101526"
},
"Children": [
{
"Type": "NodeText",
"Data": ".pptx"
}
]
}
]
},
{
"ID": "20230818101526-oortrwo",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20230818101526-oortrwo"
},
"Children": [
{
"ID": "20230818101526-t4uvb3w",
"Type": "NodeParagraph",
"Properties": {
"id": "20230818101526-t4uvb3w",
"updated": "20230818101529"
},
"Children": [
{
"Type": "NodeText",
"Data": ".xlsx"
}
]
}
]
},
{
"ID": "20230818101543-ejcoq3j",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20230818101543-ejcoq3j",
"updated": "20230818101545"
},
"Children": [
{
"ID": "20230818101543-36waszk",
"Type": "NodeParagraph",
"Properties": {
"id": "20230818101543-36waszk",
"updated": "20230818101545"
},
"Children": [
{
"Type": "NodeText",
"Data": ".pdf"
}
]
}
]
}
]
}

View File

@ -5,30 +5,180 @@
"Properties": {
"id": "20230805232920-5fdco36",
"title": "搜索資源文件內容",
"updated": "20230805233014"
"updated": "20230818102519"
},
"Children": [
{
"ID": "20230805232920-8xpdtdi",
"ID": "20230818102501-pyzoppc",
"Type": "NodeParagraph",
"Properties": {
"id": "20230805232920-8xpdtdi",
"updated": "20230805233014"
"id": "20230818102501-pyzoppc",
"updated": "20230818102506"
},
"Children": [
{
"Type": "NodeText",
"Data": "該特性還開發中,請關注 "
"Data": "在 "
},
{
"Type": "NodeTextMark",
"TextMarkType": "a",
"TextMarkAHref": "https://github.com/siyuan-note/siyuan/issues/8874",
"TextMarkTextContent": "https://github.com/siyuan-note/siyuan/issues/8874"
"TextMarkType": "kbd",
"TextMarkTextContent": "搜索"
},
{
"Type": "NodeText",
"Data": "。"
"Data": " 界面右上角可以將搜索功能切換到搜索資源文件內容,目前支持如下格式的資源文件內容搜索:"
}
]
},
{
"ID": "20230818102501-gq9fesz",
"Type": "NodeList",
"ListData": {},
"Properties": {
"id": "20230818102501-gq9fesz",
"updated": "20230818102519"
},
"Children": [
{
"ID": "20230818102501-2qu8flm",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20230818102501-2qu8flm",
"updated": "20230818102519"
},
"Children": [
{
"ID": "20230818102501-p1l631d",
"Type": "NodeParagraph",
"Properties": {
"id": "20230818102501-p1l631d",
"updated": "20230818102519"
},
"Children": [
{
"Type": "NodeText",
"Data": "文本文件(.txt、.md、.json、.log、.sql、.html、.xml、.java、.h、.c、.cpp、.go、.rs、.swift、.kt、.py、.php、.js、.css、.ts、.sh、.bat、.cmd、.ini、.yaml、.rst、.adoc、.textile、.opml、.org、.wiki"
}
]
}
]
},
{
"ID": "20230818102501-8jue7y8",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20230818102501-8jue7y8",
"updated": "20230818102501"
},
"Children": [
{
"ID": "20230818102501-fom9qf4",
"Type": "NodeParagraph",
"Properties": {
"id": "20230818102501-fom9qf4",
"updated": "20230818102501"
},
"Children": [
{
"Type": "NodeText",
"Data": ".docx"
}
]
}
]
},
{
"ID": "20230818102501-609htp0",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20230818102501-609htp0",
"updated": "20230818102501"
},
"Children": [
{
"ID": "20230818102501-fu9up7s",
"Type": "NodeParagraph",
"Properties": {
"id": "20230818102501-fu9up7s",
"updated": "20230818102501"
},
"Children": [
{
"Type": "NodeText",
"Data": ".pptx"
}
]
}
]
},
{
"ID": "20230818102501-cjozdv1",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20230818102501-cjozdv1",
"updated": "20230818102501"
},
"Children": [
{
"ID": "20230818102501-ewonoc2",
"Type": "NodeParagraph",
"Properties": {
"id": "20230818102501-ewonoc2",
"updated": "20230818102501"
},
"Children": [
{
"Type": "NodeText",
"Data": ".xlsx"
}
]
}
]
},
{
"ID": "20230818102501-ljun2c0",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20230818102501-ljun2c0",
"updated": "20230818102501"
},
"Children": [
{
"ID": "20230818102501-w0e68xh",
"Type": "NodeParagraph",
"Properties": {
"id": "20230818102501-w0e68xh",
"updated": "20230818102501"
},
"Children": [
{
"Type": "NodeText",
"Data": ".pdf"
}
]
}
]
}
]
}