Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

合并 dev 的提交 #40

Merged
merged 9 commits into from
Oct 4, 2024
Merged

合并 dev 的提交 #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f9a4dcf
:memo: Improve user guide ignore search chapter fix #12032 (#12663)
TCOTC Oct 1, 2024
dd1bc54
:art: Improve search ignore result count https://github.com/siyuan-no…
88250 Oct 1, 2024
5ff6d27
:arrow_up: Upgrade lute https://github.com/siyuan-note/siyuan/issues/…
88250 Oct 1, 2024
0dbc8c2
:art: Improve performance of exporting .sy.zip for notebook https://g…
88250 Oct 1, 2024
512e727
:art: Improve database primary key content update for bound container…
88250 Oct 1, 2024
655b6bc
:bug: Search ignore is not working in some cases
88250 Oct 2, 2024
169e6a5
:art: Improve HTML code block clipping for https://ld246.com https://…
88250 Oct 2, 2024
82b89af
:art: Automatically refresh reference counts after deleting or rollin…
88250 Oct 3, 2024
f6f07d6
:arrow_up: Upgrade lute https://github.com/siyuan-note/siyuan/issues/…
88250 Oct 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 31 additions & 4 deletions ...808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-l3qg72k/20240119211017-1vbbt95.sy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
"Properties": {
"id": "20240119211017-1vbbt95",
"title": "Ignore indexing",
"updated": "20240202105426"
"type": "doc",
"updated": "20241001011235"
},
"Children": [
{
Expand Down Expand Up @@ -43,7 +44,7 @@
"HeadingLevel": 2,
"Properties": {
"id": "20240119211037-cjq7aer",
"updated": "20240119211121"
"updated": "20241001011235"
},
"Children": [
{
Expand Down Expand Up @@ -75,6 +76,32 @@
}
]
},
{
"ID": "20241001010953-34lxthr",
"Type": "NodeCodeBlock",
"IsFencedCodeBlock": true,
"Properties": {
"id": "20241001010953-34lxthr",
"updated": "20241001010953"
},
"Children": [
{
"Type": "NodeCodeBlockFenceOpenMarker",
"Data": "```"
},
{
"Type": "NodeCodeBlockFenceInfoMarker"
},
{
"Type": "NodeCodeBlockCode",
"Data": "20210808180117-6v0mkxr/20200923234011-ieuun1p.sy\n20210808180117-6v0mkxr/**/*\n"
},
{
"Type": "NodeCodeBlockFenceCloseMarker",
"Data": "```"
}
]
},
{
"ID": "20240119211037-putkxu9",
"Type": "NodeList",
Expand Down Expand Up @@ -165,12 +192,12 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20240202105425-d8fq0vu",
"updated": "20240202105426"
"updated": "20241001011235"
},
"Children": [
{
"Type": "NodeText",
"Data": "After the adjustment, you need to manually rebuild the index."
"Data": "You need to manually rebuild the index after modifying the configuration file."
}
]
}
Expand Down
131 changes: 127 additions & 4 deletions ...808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-l3qg72k/20240119212048-0huuevw.sy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
"Properties": {
"id": "20240119212048-0huuevw",
"title": "Ignore search",
"updated": "20240202105500"
"type": "doc",
"updated": "20241001011905"
},
"Children": [
{
Expand Down Expand Up @@ -43,7 +44,7 @@
"HeadingLevel": 2,
"Properties": {
"id": "20240119212104-9fehl3c",
"updated": "20240119212108"
"updated": "20241001011905"
},
"Children": [
{
Expand Down Expand Up @@ -171,7 +172,7 @@
"IsFencedCodeBlock": true,
"Properties": {
"id": "20240119212104-tepuwbm",
"updated": "20240119212108"
"updated": "20241001011008"
},
"Children": [
{
Expand All @@ -183,14 +184,136 @@
},
{
"Type": "NodeCodeBlockCode",
"Data": "path NOT LIKE '/20210808180117-6v0mkxr%'\nid != '20200923234011-ieuun1p'\n"
"Data": "path NOT LIKE '/20210808180117-6v0mkxr%'\nbox != '20210808180117-czj9bvb'\nid != '20200923234011-ieuun1p'"
},
{
"Type": "NodeCodeBlockFenceCloseMarker",
"Data": "```"
}
]
},
{
"ID": "20241001011027-qi6o51q",
"Type": "NodeList",
"ListData": {},
"Properties": {
"id": "20241001011027-qi6o51q",
"updated": "20241001011905"
},
"Children": [
{
"ID": "20241001011027-2kgpqv7",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20241001011027-2kgpqv7",
"updated": "20241001011838"
},
"Children": [
{
"ID": "20241001011027-rc5tn93",
"Type": "NodeParagraph",
"Properties": {
"id": "20241001011027-rc5tn93",
"updated": "20241001011838"
},
"Children": [
{
"Type": "NodeText",
"Data": "​"
},
{
"Type": "NodeTextMark",
"TextMarkType": "code",
"TextMarkTextContent": "path NOT LIKE '/20210808180117-6v0mkxr%'"
},
{
"Type": "NodeText",
"Data": "​: Ignore content block searches where the document path begins with ​/20210808180117-6v0mkxr"
}
]
}
]
},
{
"ID": "20241001011027-jsngmc7",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20241001011027-jsngmc7",
"updated": "20241001011854"
},
"Children": [
{
"ID": "20241001011027-tn2cjwl",
"Type": "NodeParagraph",
"Properties": {
"id": "20241001011027-tn2cjwl",
"updated": "20241001011854"
},
"Children": [
{
"Type": "NodeText",
"Data": "​"
},
{
"Type": "NodeTextMark",
"TextMarkType": "code",
"TextMarkTextContent": "box != '20210808180117-czj9bvb'"
},
{
"Type": "NodeText",
"Data": "​: Ignore content block searches under the notebook data/20210808180117-czj9bvb"
}
]
}
]
},
{
"ID": "20241001011027-02lmjzy",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20241001011027-02lmjzy",
"updated": "20241001011905"
},
"Children": [
{
"ID": "20241001011027-qsadi2j",
"Type": "NodeParagraph",
"Properties": {
"id": "20241001011027-qsadi2j",
"updated": "20241001011905"
},
"Children": [
{
"Type": "NodeText",
"Data": "​"
},
{
"Type": "NodeTextMark",
"TextMarkType": "code",
"TextMarkTextContent": "id != '20200923234011-ieuun1p'"
},
{
"Type": "NodeText",
"Data": "​: Ignore content block searches with id ​20200923234011-ieuun1p"
}
]
}
]
}
]
},
{
"ID": "20240202105459-q4d3ttn",
"Type": "NodeParagraph",
Expand Down
35 changes: 31 additions & 4 deletions ...808180117-czj9bvb/20200812220555-lj3enxa/20210808180320-gyngv2x/20240119205452-o8xp4ve.sy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
"Properties": {
"id": "20240119205452-o8xp4ve",
"title": "忽略索引",
"updated": "20240202105353"
"type": "doc",
"updated": "20241001010441"
},
"Children": [
{
Expand Down Expand Up @@ -43,7 +44,7 @@
"HeadingLevel": 2,
"Properties": {
"id": "20240119205942-35rq58s",
"updated": "20240119210019"
"updated": "20241001010441"
},
"Children": [
{
Expand Down Expand Up @@ -75,6 +76,32 @@
}
]
},
{
"ID": "20240930233109-sv59af0",
"Type": "NodeCodeBlock",
"IsFencedCodeBlock": true,
"Properties": {
"id": "20240930233109-sv59af0",
"updated": "20240930233133"
},
"Children": [
{
"Type": "NodeCodeBlockFenceOpenMarker",
"Data": "```"
},
{
"Type": "NodeCodeBlockFenceInfoMarker"
},
{
"Type": "NodeCodeBlockCode",
"Data": "20210808180117-6v0mkxr/20200923234011-ieuun1p.sy\n20210808180117-6v0mkxr/**/*\n"
},
{
"Type": "NodeCodeBlockFenceCloseMarker",
"Data": "```"
}
]
},
{
"ID": "20240119210347-nq9fqio",
"Type": "NodeList",
Expand Down Expand Up @@ -165,12 +192,12 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20240202105353-qaj8ahd",
"updated": "20240202105353"
"updated": "20241001010441"
},
"Children": [
{
"Type": "NodeText",
"Data": "调整完以后需要手动重建索引。"
"Data": "配置文件修改保存后需要手动重建索引。"
}
]
}
Expand Down
Loading
Loading