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-05-07 09:22:07 +08:00
commit 94d81b6be3
13 changed files with 188 additions and 113 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/changelogs/v3.0.13/v3.0.13.md
View file

@ -23,6 +23,7 @@ Below are the detailed changes in this version.
* [Improve clear search button in database table view](https://github.com/siyuan-note/siyuan/issues/11244)
* [Synchronize the related entries when the database creates a two-way relation](https://github.com/siyuan-note/siyuan/issues/11250)
* [Ignore hidden files when generating asset history](https://github.com/siyuan-note/siyuan/issues/11253)
* [Improve HTML code element clipping](https://github.com/siyuan-note/siyuan/issues/11281)
### Bugfix
@ -36,6 +37,8 @@ Below are the detailed changes in this version.
* [Marketplace - Downloaded - Package size in README is empty](https://github.com/siyuan-note/siyuan/issues/11224)
* [Clicking a hyperlink does not open the browser on mobile](https://github.com/siyuan-note/siyuan/issues/11240)
* [The file name encoding is abnormal after copying the image and pasting it](https://github.com/siyuan-note/siyuan/issues/11246)
* [Exception during quick selection of database table view multi-select column](https://github.com/siyuan-note/siyuan/issues/11268)
* [The new database entry after binding block is lost in some cases](https://github.com/siyuan-note/siyuan/issues/11269)
* [After uninstalling the widget, data synchronization does not clear the widget folder](https://github.com/siyuan-note/siyuan/issues/11279)
### Refactor

3
app/changelogs/v3.0.13/v3.0.13_zh_CHT.md
View file

@ -23,6 +23,7 @@
* [改進資料庫表格檢視中清除搜尋按鈕](https://github.com/siyuan-note/siyuan/issues/11244)
* [當資料庫建立雙向關係時，同步相關條目](https://github.com/siyuan-note/siyuan/issues/11250)
* [在產生資源檔案歷史時忽略隱藏檔案](https://github.com/siyuan-note/siyuan/issues/11253)
* [改進 HTML code 元素剪藏](https://github.com/siyuan-note/siyuan/issues/11281)
### 修復缺陷
@ -36,6 +37,8 @@
* [市集 - 已下載 - README 中的包大小為空](https://github.com/siyuan-note/siyuan/issues/11224)
* [在行動裝置上點選超連結不會開啟瀏覽器](https://github.com/siyuan-note/siyuan/issues/11240)
* [複製圖片並貼上後檔案名稱編碼異常](https://github.com/siyuan-note/siyuan/issues/11246)
* [資料庫表格視圖多選列快速選擇異常](https://github.com/siyuan-note/siyuan/issues/11268)
* [某些情況下綁定區塊後的新資料庫條目會遺失](https://github.com/siyuan-note/siyuan/issues/11269)
* [卸載掛件後資料同步未清空掛件資料夾](https://github.com/siyuan-note/siyuan/issues/11279)
### 開發重構

3
app/changelogs/v3.0.13/v3.0.13_zh_CN.md
View file

@ -23,6 +23,7 @@
* [改进数据库表格视图中清除搜索按钮](https://github.com/siyuan-note/siyuan/issues/11244)
* [当数据库创建双向关系时，同步相关条目](https://github.com/siyuan-note/siyuan/issues/11250)
* [在生成资源文件历史时忽略隐藏文件](https://github.com/siyuan-note/siyuan/issues/11253)
* [改进 HTML code 元素剪藏](https://github.com/siyuan-note/siyuan/issues/11281)
### 修复缺陷
@ -36,6 +37,8 @@
* [集市 - 已下载 - README 中的包大小为空](https://github.com/siyuan-note/siyuan/issues/11224)
* [在移动设备上点击超链接不会打开浏览器](https://github.com/siyuan-note/siyuan/issues/11240)
* [复制图片并粘贴后文件名编码异常](https://github.com/siyuan-note/siyuan/issues/11246)
* [数据库表格视图多选列快速选择异常](https://github.com/siyuan-note/siyuan/issues/11268)
* [某些情况下绑定块后的新数据库条目会丢失](https://github.com/siyuan-note/siyuan/issues/11269)
* [卸载挂件后数据同步未清空挂件文件夹](https://github.com/siyuan-note/siyuan/issues/11279)
### 开发重构

10
app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-h361q1i/20200924093441-ft2rhps.sy
View file

@ -8,7 +8,7 @@
"title": "Formatting elements",
"title-img": "background-color:#269;background-image: linear-gradient(white 2px, transparent 2px),linear-gradient(90deg, white 2px, transparent 2px),linear-gradient(rgba(255,255,255,.3) 1px, transparent 1px),linear-gradient(90deg, rgba(255,255,255,.3) 1px, transparent 1px);background-size: 100px 100px, 100px 100px, 20px 20px, 20px 20px;background-position:-2px -2px, -2px -2px, -1px -1px, -1px -1px;",
"type": "doc",
"updated": "20240429100058"
"updated": "20240506230853"
},
"Children": [
{
@ -32,7 +32,7 @@
"ListData": {},
"Properties": {
"id": "20210104091509-8csaq4j",
"updated": "20240416114218"
"updated": "20240506230853"
},
"Children": [
{
@ -75,7 +75,7 @@
},
"Properties": {
"id": "20210206215048-zg5vnou",
"updated": "20220115193512"
"updated": "20240506230853"
},
"Children": [
{
@ -83,13 +83,13 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20210206215048-elufsn1",
"updated": "20220115193512"
"updated": "20240506230853"
},
"Children": [
{
"Type": "NodeTextMark",
"TextMarkType": "a",
"TextMarkAHref": "https://ld246.com",
"TextMarkAHref": "https://liuyun.io",
"TextMarkTextContent": "Hyperlink"
}
]

82
app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-h361q1i/20220628204454-hhxohv5.sy
View file

@ -6,7 +6,7 @@
"id": "20220628204454-hhxohv5",
"title": "Optimize typography",
"type": "doc",
"updated": "20220630211201"
"updated": "20240506230917"
},
"Children": [
{
@ -105,7 +105,7 @@
"ListData": {},
"Properties": {
"id": "20220628215200-rkz9o7o",
"updated": "20220628215340"
"updated": "20240506230150"
},
"Children": [
{
@ -117,7 +117,7 @@
},
"Properties": {
"id": "20220628215200-jdgcfne",
"updated": "20220628215335"
"updated": "20240506230145"
},
"Children": [
{
@ -125,12 +125,21 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20220628215200-6pyhpe4",
"updated": "20220628215335"
"updated": "20240506230145"
},
"Children": [
{
"Type": "NodeText",
"Data": "Inline code"
"Data": "Inline code: "
},
{
"Type": "NodeTextMark",
"TextMarkType": "code",
"TextMarkTextContent": "Code"
},
{
"Type": "NodeText",
"Data": "​"
}
]
}
@ -145,7 +154,7 @@
},
"Properties": {
"id": "20220628215200-ojyqca0",
"updated": "20220628215200"
"updated": "20240506230150"
},
"Children": [
{
@ -153,12 +162,21 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20220628215200-vokqsi7",
"updated": "20220628215200"
"updated": "20240506230150"
},
"Children": [
{
"Type": "NodeText",
"Data": "Inline formula"
"Data": "Inline formula: "
},
{
"Type": "NodeTextMark",
"TextMarkType": "inline-math",
"TextMarkInlineMathContent": "a^2 + b^2 = \\color{red}c^2"
},
{
"Type": "NodeText",
"Data": "\n"
}
]
}
@ -186,7 +204,7 @@
"ListData": {},
"Properties": {
"id": "20220630211201-d80xx42",
"updated": "20220630211219"
"updated": "20240506230917"
},
"Children": [
{
@ -198,7 +216,7 @@
},
"Properties": {
"id": "20220630211201-xvvr6cb",
"updated": "20220630211212"
"updated": "20240506230917"
},
"Children": [
{
@ -206,12 +224,13 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20220630211201-s03kxsh",
"updated": "20240506221623"
"updated": "20240506230917"
},
"Children": [
{
"Type": "NodeText",
"Data": "Mark"
"Type": "NodeTextMark",
"TextMarkType": "mark",
"TextMarkTextContent": "Mark"
}
]
}
@ -226,7 +245,7 @@
},
"Properties": {
"id": "20220630211201-lxnn7r2",
"updated": "20220630211213"
"updated": "20240506230054"
},
"Children": [
{
@ -234,12 +253,13 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20220630211201-5gsz1zv",
"updated": "20220630211213"
"updated": "20240506230054"
},
"Children": [
{
"Type": "NodeText",
"Data": "Strikethrough"
"Type": "NodeTextMark",
"TextMarkType": "s",
"TextMarkTextContent": "Strikethrough"
}
]
}
@ -254,7 +274,7 @@
},
"Properties": {
"id": "20220630211201-vg75q8p",
"updated": "20220630211201"
"updated": "20240506230115"
},
"Children": [
{
@ -262,12 +282,14 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20220630211201-wryew45",
"updated": "20220630211201"
"updated": "20240506230115"
},
"Children": [
{
"Type": "NodeText",
"Data": "Hyperlink anchor text"
"Type": "NodeTextMark",
"TextMarkType": "a",
"TextMarkAHref": "https://liuyun.io",
"TextMarkTextContent": "Hyperlink anchor text"
}
]
}
@ -310,7 +332,7 @@
},
"Properties": {
"id": "20220630211201-6po0hz5",
"updated": "20220630211218"
"updated": "20240506230121"
},
"Children": [
{
@ -318,12 +340,13 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20220630211201-z7c6px5",
"updated": "20240506221619"
"updated": "20240506230121"
},
"Children": [
{
"Type": "NodeText",
"Data": "Italic"
"Type": "NodeTextMark",
"TextMarkType": "em",
"TextMarkTextContent": "Italic"
}
]
}
@ -338,7 +361,7 @@
},
"Properties": {
"id": "20220630211201-4aezon3",
"updated": "20220630211219"
"updated": "20240506230123"
},
"Children": [
{
@ -346,12 +369,13 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20220630211201-4n0bq1l",
"updated": "20220630211219"
"updated": "20240506230123"
},
"Children": [
{
"Type": "NodeText",
"Data": "Bold"
"Type": "NodeTextMark",
"TextMarkType": "strong",
"TextMarkTextContent": "Bold"
}
]
}

8
app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180320-abz7w6k/20200825162036-4dx365o.sy
View file

@ -8,7 +8,7 @@
"title": "排版元素",
"title-img": "background-color: hsl(2, 57%, 40%);background-image: repeating-linear-gradient(transparent, transparent 50px, rgba(0,0,0,.4) 50px, rgba(0,0,0,.4) 53px, transparent 53px, transparent 63px, rgba(0,0,0,.4) 63px, rgba(0,0,0,.4) 66px, transparent 66px, transparent 116px, rgba(0,0,0,.5) 116px, rgba(0,0,0,.5) 166px, rgba(255,255,255,.2) 166px, rgba(255,255,255,.2) 169px, rgba(0,0,0,.5) 169px, rgba(0,0,0,.5) 179px, rgba(255,255,255,.2) 179px, rgba(255,255,255,.2) 182px, rgba(0,0,0,.5) 182px, rgba(0,0,0,.5) 232px, transparent 232px),repeating-linear-gradient(270deg, transparent, transparent 50px, rgba(0,0,0,.4) 50px, rgba(0,0,0,.4) 53px, transparent 53px, transparent 63px, rgba(0,0,0,.4) 63px, rgba(0,0,0,.4) 66px, transparent 66px, transparent 116px, rgba(0,0,0,.5) 116px, rgba(0,0,0,.5) 166px, rgba(255,255,255,.2) 166px, rgba(255,255,255,.2) 169px, rgba(0,0,0,.5) 169px, rgba(0,0,0,.5) 179px, rgba(255,255,255,.2) 179px, rgba(255,255,255,.2) 182px, rgba(0,0,0,.5) 182px, rgba(0,0,0,.5) 232px, transparent 232px),repeating-linear-gradient(125deg, transparent, transparent 2px, rgba(0,0,0,.2) 2px, rgba(0,0,0,.2) 3px, transparent 3px, transparent 5px, rgba(0,0,0,.2) 5px);",
"type": "doc",
"updated": "20240429095843"
"updated": "20240506230804"
},
"Children": [
{
@ -32,7 +32,7 @@
"ListData": {},
"Properties": {
"id": "20210104091228-ttcj9nm",
"updated": "20240416105853"
"updated": "20240506230804"
},
"Children": [
{
@ -75,7 +75,7 @@
},
"Properties": {
"id": "20210104091228-56d6mjx",
"updated": "20240416105853"
"updated": "20240506230804"
},
"Children": [
{
@ -83,7 +83,7 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20210201202130-jhxwimm",
"updated": "20240416105853"
"updated": "20240506230804"
},
"Children": [
{

82
app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180320-abz7w6k/20220628204444-9n0y9h2.sy
View file

@ -6,7 +6,7 @@
"id": "20220628204444-9n0y9h2",
"title": "优化排版",
"type": "doc",
"updated": "20220630211006"
"updated": "20240506230814"
},
"Children": [
{
@ -140,7 +140,7 @@
"ListData": {},
"Properties": {
"id": "20220628205832-odovge3",
"updated": "20221006214303"
"updated": "20240506230250"
},
"Children": [
{
@ -152,7 +152,7 @@
},
"Properties": {
"id": "20220628205833-kmfuhsp",
"updated": "20221006214303"
"updated": "20240506230250"
},
"Children": [
{
@ -160,12 +160,21 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20220628205833-iu4yxrq",
"updated": "20221006214303"
"updated": "20240506230250"
},
"Children": [
{
"Type": "NodeText",
"Data": "行级代码"
"Data": "行级代码："
},
{
"Type": "NodeTextMark",
"TextMarkType": "code",
"TextMarkTextContent": "Code"
},
{
"Type": "NodeText",
"Data": "​"
}
]
}
@ -180,7 +189,7 @@
},
"Properties": {
"id": "20220628205855-jp2ks1q",
"updated": "20220916195220"
"updated": "20240506230242"
},
"Children": [
{
@ -188,12 +197,17 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20220628205855-1gfuu51",
"updated": "20220916195220"
"updated": "20240506230242"
},
"Children": [
{
"Type": "NodeText",
"Data": "行级公式"
"Data": "行级公式："
},
{
"Type": "NodeTextMark",
"TextMarkType": "inline-math",
"TextMarkInlineMathContent": "a^2 + b^2 = \\color{red}c^2"
}
]
}
@ -221,7 +235,7 @@
"ListData": {},
"Properties": {
"id": "20220630211006-svizyw7",
"updated": "20220630211109"
"updated": "20240506230814"
},
"Children": [
{
@ -232,7 +246,8 @@
"Marker": "Kg=="
},
"Properties": {
"id": "20220630211033-fnlmuvi"
"id": "20220630211033-fnlmuvi",
"updated": "20240506230814"
},
"Children": [
{
@ -240,12 +255,13 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20220630211033-b7xfx2z",
"updated": "20240506221311"
"updated": "20240506230814"
},
"Children": [
{
"Type": "NodeText",
"Data": "标记"
"Type": "NodeTextMark",
"TextMarkType": "mark",
"TextMarkTextContent": "标记"
}
]
}
@ -259,7 +275,8 @@
"Marker": "Kg=="
},
"Properties": {
"id": "20220630211037-mntb5y9"
"id": "20220630211037-mntb5y9",
"updated": "20240506225731"
},
"Children": [
{
@ -267,12 +284,13 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20220630211037-lftq994",
"updated": "20220630211045"
"updated": "20240506225731"
},
"Children": [
{
"Type": "NodeText",
"Data": "删除线"
"Type": "NodeTextMark",
"TextMarkType": "s",
"TextMarkTextContent": "删除线"
}
]
}
@ -286,7 +304,8 @@
"Marker": "Kg=="
},
"Properties": {
"id": "20220630211045-4ve578l"
"id": "20220630211045-4ve578l",
"updated": "20240506230028"
},
"Children": [
{
@ -294,12 +313,14 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20220630211045-58vch5e",
"updated": "20220630211054"
"updated": "20240506230028"
},
"Children": [
{
"Type": "NodeText",
"Data": "超链接锚文本"
"Type": "NodeTextMark",
"TextMarkType": "a",
"TextMarkAHref": "https://ld246.com",
"TextMarkTextContent": "超链接锚文本"
}
]
}
@ -340,7 +361,8 @@
"Marker": "Kg=="
},
"Properties": {
"id": "20220630211101-1txhfqw"
"id": "20220630211101-1txhfqw",
"updated": "20240506225743"
},
"Children": [
{
@ -348,12 +370,13 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20220630211101-zcj15cy",
"updated": "20240506221332"
"updated": "20240506225743"
},
"Children": [
{
"Type": "NodeText",
"Data": "倾斜"
"Type": "NodeTextMark",
"TextMarkType": "em",
"TextMarkTextContent": "倾斜"
}
]
}
@ -368,7 +391,7 @@
},
"Properties": {
"id": "20220630211108-356v085",
"updated": "20220630211109"
"updated": "20240506225745"
},
"Children": [
{
@ -376,12 +399,13 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20220630211108-wlwci62",
"updated": "20220630211109"
"updated": "20240506225745"
},
"Children": [
{
"Type": "NodeText",
"Data": "加粗"
"Type": "NodeTextMark",
"TextMarkType": "strong",
"TextMarkTextContent": "加粗"
}
]
}

8
app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226120854-dr1jfx2/20211226121319-emrk2yy.sy
View file

@ -8,7 +8,7 @@
"title": "排版元素",
"title-img": "background-color: hsl(2, 57%, 40%);background-image: repeating-linear-gradient(transparent, transparent 50px, rgba(0,0,0,.4) 50px, rgba(0,0,0,.4) 53px, transparent 53px, transparent 63px, rgba(0,0,0,.4) 63px, rgba(0,0,0,.4) 66px, transparent 66px, transparent 116px, rgba(0,0,0,.5) 116px, rgba(0,0,0,.5) 166px, rgba(255,255,255,.2) 166px, rgba(255,255,255,.2) 169px, rgba(0,0,0,.5) 169px, rgba(0,0,0,.5) 179px, rgba(255,255,255,.2) 179px, rgba(255,255,255,.2) 182px, rgba(0,0,0,.5) 182px, rgba(0,0,0,.5) 232px, transparent 232px),repeating-linear-gradient(270deg, transparent, transparent 50px, rgba(0,0,0,.4) 50px, rgba(0,0,0,.4) 53px, transparent 53px, transparent 63px, rgba(0,0,0,.4) 63px, rgba(0,0,0,.4) 66px, transparent 66px, transparent 116px, rgba(0,0,0,.5) 116px, rgba(0,0,0,.5) 166px, rgba(255,255,255,.2) 166px, rgba(255,255,255,.2) 169px, rgba(0,0,0,.5) 169px, rgba(0,0,0,.5) 179px, rgba(255,255,255,.2) 179px, rgba(255,255,255,.2) 182px, rgba(0,0,0,.5) 182px, rgba(0,0,0,.5) 232px, transparent 232px),repeating-linear-gradient(125deg, transparent, transparent 2px, rgba(0,0,0,.2) 2px, rgba(0,0,0,.2) 3px, transparent 3px, transparent 5px, rgba(0,0,0,.2) 5px);",
"type": "doc",
"updated": "20240429095806"
"updated": "20240506230828"
},
"Children": [
{
@ -32,7 +32,7 @@
"ListData": {},
"Properties": {
"id": "20211226122008-1e014nh",
"updated": "20240416113842"
"updated": "20240506230828"
},
"Children": [
{
@ -75,7 +75,7 @@
},
"Properties": {
"id": "20211226122008-g3h952f",
"updated": "20240416113842"
"updated": "20240506230828"
},
"Children": [
{
@ -83,7 +83,7 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20211226122008-9ff5a3r",
"updated": "20240416113842"
"updated": "20240506230828"
},
"Children": [
{

78
app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226120854-dr1jfx2/20220628204420-ui79vkt.sy
View file

@ -6,7 +6,7 @@
"id": "20220628204420-ui79vkt",
"title": "最佳化排版",
"type": "doc",
"updated": "20240506221556"
"updated": "20240506230836"
},
"Children": [
{
@ -105,7 +105,7 @@
"ListData": {},
"Properties": {
"id": "20220628215506-srlvfe0",
"updated": "20220916195816"
"updated": "20240506230235"
},
"Children": [
{
@ -117,7 +117,7 @@
},
"Properties": {
"id": "20220628215506-tfhl45j",
"updated": "20220916195816"
"updated": "20240506230217"
},
"Children": [
{
@ -125,12 +125,21 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20220628215506-c6atyjn",
"updated": "20220916195816"
"updated": "20240506230217"
},
"Children": [
{
"Type": "NodeText",
"Data": "行級代碼"
"Data": "行級代碼："
},
{
"Type": "NodeTextMark",
"TextMarkType": "code",
"TextMarkTextContent": "Code"
},
{
"Type": "NodeText",
"Data": "​"
}
]
}
@ -145,7 +154,7 @@
},
"Properties": {
"id": "20220628215506-258fpgt",
"updated": "20220916195814"
"updated": "20240506230235"
},
"Children": [
{
@ -153,12 +162,17 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20220628215506-3twrnze",
"updated": "20220916195814"
"updated": "20240506230235"
},
"Children": [
{
"Type": "NodeText",
"Data": "行級公式"
"Data": "行級公式："
},
{
"Type": "NodeTextMark",
"TextMarkType": "inline-math",
"TextMarkInlineMathContent": "a^2 + b^2 = \\color{red}c^2"
}
]
}
@ -186,7 +200,7 @@
"ListData": {},
"Properties": {
"id": "20220630211154-7y2zlnx",
"updated": "20240506221556"
"updated": "20240506230836"
},
"Children": [
{
@ -198,7 +212,7 @@
},
"Properties": {
"id": "20220630211154-gjt0dpy",
"updated": "20240506221556"
"updated": "20240506230836"
},
"Children": [
{
@ -206,12 +220,13 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20220630211154-p32qfcb",
"updated": "20240506221556"
"updated": "20240506230836"
},
"Children": [
{
"Type": "NodeText",
"Data": "標記"
"Type": "NodeTextMark",
"TextMarkType": "mark",
"TextMarkTextContent": "標記"
}
]
}
@ -226,7 +241,7 @@
},
"Properties": {
"id": "20220630211154-t1yonyq",
"updated": "20220630211154"
"updated": "20240506230015"
},
"Children": [
{
@ -234,12 +249,13 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20220630211154-h54yp04",
"updated": "20220630211154"
"updated": "20240506230015"
},
"Children": [
{
"Type": "NodeText",
"Data": "刪除線"
"Type": "NodeTextMark",
"TextMarkType": "s",
"TextMarkTextContent": "刪除線"
}
]
}
@ -254,7 +270,7 @@
},
"Properties": {
"id": "20220630211154-o3way3q",
"updated": "20220630211154"
"updated": "20240506230034"
},
"Children": [
{
@ -262,12 +278,14 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20220630211154-bysdnhn",
"updated": "20220630211154"
"updated": "20240506230034"
},
"Children": [
{
"Type": "NodeText",
"Data": "超連結錨文字"
"Type": "NodeTextMark",
"TextMarkType": "a",
"TextMarkAHref": "https://ld246.com",
"TextMarkTextContent": "超連結錨文字"
}
]
}
@ -310,7 +328,7 @@
},
"Properties": {
"id": "20220630211154-ciwaquv",
"updated": "20220630211154"
"updated": "20240506230039"
},
"Children": [
{
@ -318,12 +336,13 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20220630211154-la9aicz",
"updated": "20240506221542"
"updated": "20240506230039"
},
"Children": [
{
"Type": "NodeText",
"Data": "傾斜"
"Type": "NodeTextMark",
"TextMarkType": "em",
"TextMarkTextContent": "傾斜"
}
]
}
@ -338,7 +357,7 @@
},
"Properties": {
"id": "20220630211154-uvdbsdb",
"updated": "20220630211154"
"updated": "20240506230041"
},
"Children": [
{
@ -346,12 +365,13 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20220630211154-of2mnn3",
"updated": "20220630211154"
"updated": "20240506230041"
},
"Children": [
{
"Type": "NodeText",
"Data": "加粗"
"Type": "NodeTextMark",
"TextMarkType": "strong",
"TextMarkTextContent": "加粗"
}
]
}

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

File diff suppressed because one or more lines are too long

2
kernel/go.mod
View file

@ -8,7 +8,7 @@ require (
github.com/88250/epub v0.0.0-20230830085737-c19055cd1f48
github.com/88250/go-humanize v0.0.0-20240424102817-4f78fac47ea7
github.com/88250/gulu v1.2.3-0.20240505150113-bc43bd50f866
github.com/88250/lute v1.7.7-0.20240502031007-b0b1449cfbd4
github.com/88250/lute v1.7.7-0.20240507011024-cbfccda851d2
github.com/88250/pdfcpu v0.3.14-0.20230401044135-c7369a99720c
github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1
github.com/ClarkThan/ahocorasick v0.0.0-20231011042242-30d1ef1347f4

4
kernel/go.sum
View file

@ -12,8 +12,8 @@ github.com/88250/go-sqlite3 v1.14.13-0.20231214121541-e7f54c482950 h1:Pa5hMiBceT
github.com/88250/go-sqlite3 v1.14.13-0.20231214121541-e7f54c482950/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
github.com/88250/gulu v1.2.3-0.20240505150113-bc43bd50f866 h1:RFfNFS0hv6TbOuwET6xZAfGlV4hNlXiWTnfbLN1eF6k=
github.com/88250/gulu v1.2.3-0.20240505150113-bc43bd50f866/go.mod h1:MUfzyfmbPrRDZLqxc7aPrVYveatTHRfoUa5TynPS0i8=
github.com/88250/lute v1.7.7-0.20240502031007-b0b1449cfbd4 h1:FkIdQSpufRA0fCf0CVaxYJtDaA76eohFUIzyRsDY5fs=
github.com/88250/lute v1.7.7-0.20240502031007-b0b1449cfbd4/go.mod h1:VDAzL8b+oCh+e3NAlmwwLzC53ten0rZlS8NboB7ljtk=
github.com/88250/lute v1.7.7-0.20240507011024-cbfccda851d2 h1:g1s5O3pBeR4pkpdhTgrGOTEUujRNi5NpfcUhlLVycdU=
github.com/88250/lute v1.7.7-0.20240507011024-cbfccda851d2/go.mod h1:VDAzL8b+oCh+e3NAlmwwLzC53ten0rZlS8NboB7ljtk=
github.com/88250/pdfcpu v0.3.14-0.20230401044135-c7369a99720c h1:Dl/8S9iLyPMTElnWIBxmjaLiWrkI5P4a21ivwAn5pU0=
github.com/88250/pdfcpu v0.3.14-0.20230401044135-c7369a99720c/go.mod h1:S5YT38L/GCjVjmB4PB84PymA1qfopjEhfhTNQilLpv4=
github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1 h1:48T899JQDwyyRu9yXHePYlPdHtpJfrJEUGBMH3SMBWY=

16
kernel/model/path.go
View file

@ -33,13 +33,16 @@ import (
"github.com/siyuan-note/siyuan/kernel/util"
)
func createDocsByHPath(boxID, hPath, content, parentID, id string /* id 参数仅在 parentID 不为空的情况下使用 */) (retID string, err error) {
func createDocsByHPath(boxID, hPath, content, parentID, id string) (retID string, err error) {
if "" == id {
id = ast.NewNodeID()
}
retID = id
hPath = strings.TrimSuffix(hPath, ".sy")
if "" != parentID {
retID = id
// The save path is incorrect when creating a sub-doc by ref in a doc with the same name https://github.com/siyuan-note/siyuan/issues/8138
// 在指定父文档 ID 的情况下优先查找父文档
// 在指定了父文档 ID 的情况下优先查找父文档
parentHPath, name := path.Split(hPath)
parentHPath = strings.TrimSuffix(parentHPath, "/")
preferredParent := treenode.GetBlockTreeRootByHPathPreferredParentID(boxID, parentHPath, parentID)
@ -51,11 +54,6 @@ func createDocsByHPath(boxID, hPath, content, parentID, id string /* id 参数
}
return
}
} else {
retID = ast.NewNodeID()
if "" == id {
id = retID
}
}
root := treenode.GetBlockTreeRootByPath(boxID, hPath)