Skip to content

Commit 8bd9bec

Browse files
Vanessa219Vanessa219
committed
Merge remote-tracking branch 'origin/dev' into dev
2 parents a5b1173 + 248c0c1 commit 8bd9bec

File tree

7 files changed

+79
-37
lines changed

7 files changed

+79
-37
lines changed

‎app/guide/20210808180117-6v0mkxr/20200923234731-h3zkwm2.sy‎

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"id": "20200923234731-h3zkwm2",
88
"title": "FAQ",
99
"type": "doc",
10-
"updated": "20250115163037"
10+
"updated": "20250518103440"
1111
},
1212
"Children": [
1313
{
@@ -442,7 +442,7 @@
442442
"HeadingLevel": 2,
443443
"Properties": {
444444
"id": "20220808181753-3ligpvz",
445-
"updated": "20220808181753"
445+
"updated": "20250518103440"
446446
},
447447
"Children": [
448448
{
@@ -608,7 +608,7 @@
608608
},
609609
{
610610
"Type": "NodeText",
611-
"Data": "​​ - "
611+
"Data": "​ - "
612612
},
613613
{
614614
"Type": "NodeTextMark",
@@ -617,7 +617,7 @@
617617
},
618618
{
619619
"Type": "NodeText",
620-
"Data": "​​ - "
620+
"Data": "​ - "
621621
},
622622
{
623623
"Type": "NodeTextMark",
@@ -626,7 +626,7 @@
626626
},
627627
{
628628
"Type": "NodeText",
629-
"Data": "​​ / "
629+
"Data": "​ / "
630630
},
631631
{
632632
"Type": "NodeTextMark",
@@ -635,14 +635,28 @@
635635
},
636636
{
637637
"Type": "NodeText",
638-
"Data": "​​"
638+
"Data": "​"
639639
}
640640
]
641641
}
642642
]
643643
}
644644
]
645645
},
646+
{
647+
"ID": "20250518103412-4mf2mer",
648+
"Type": "NodeParagraph",
649+
"Properties": {
650+
"id": "20250518103412-4mf2mer",
651+
"updated": "20250518103440"
652+
},
653+
"Children": [
654+
{
655+
"Type": "NodeText",
656+
"Data": "On macOS, SiYuan will access the Desktop, Documents, and iCloud drive folders to detect whether the workspace is placed under the iCloud synchronization path. Please rest assured that SiYuan will never snoop on your personal data."
657+
}
658+
]
659+
},
646660
{
647661
"ID": "20211129190925-mzmhh3v",
648662
"Type": "NodeHeading",

‎app/guide/20210808180117-czj9bvb/20200813093015-u6bopdt.sy‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"id": "20200813093015-u6bopdt",
88
"title": "常见问题",
99
"type": "doc",
10-
"updated": "20250115163009"
10+
"updated": "20250518102608"
1111
},
1212
"Children": [
1313
{
@@ -443,7 +443,7 @@
443443
"HeadingLevel": 2,
444444
"Properties": {
445445
"id": "20210918114843-6xo7hmr",
446-
"updated": "20220808181126"
446+
"updated": "20250518102608"
447447
},
448448
"Children": [
449449
{
@@ -638,6 +638,20 @@
638638
}
639639
]
640640
},
641+
{
642+
"ID": "20250518102159-j2jxzeb",
643+
"Type": "NodeParagraph",
644+
"Properties": {
645+
"id": "20250518102159-j2jxzeb",
646+
"updated": "20250518102608"
647+
},
648+
"Children": [
649+
{
650+
"Type": "NodeText",
651+
"Data": "在 macOS 上思源会访问桌面、文稿和 iCloud 云盘文件夹，目的是为了检测工作空间是否放置在 iCloud 同步路径下，思源绝不会窥探你的个人数据，请放心。"
652+
}
653+
]
654+
},
641655
{
642656
"ID": "20211129190023-eezo4zh",
643657
"Type": "NodeHeading",

‎app/guide/20211226090932-5lcq56f/20211226115227-r1rty9v.sy‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"id": "20211226115227-r1rty9v",
88
"title": "常見問題",
99
"type": "doc",
10-
"updated": "20250115163022"
10+
"updated": "20250518103355"
1111
},
1212
"Children": [
1313
{
@@ -439,7 +439,7 @@
439439
"HeadingLevel": 2,
440440
"Properties": {
441441
"id": "20220808181824-pwnc2gx",
442-
"updated": "20220808181824"
442+
"updated": "20250518103355"
443443
},
444444
"Children": [
445445
{
@@ -640,6 +640,20 @@
640640
}
641641
]
642642
},
643+
{
644+
"ID": "20250518103354-bj96dlm",
645+
"Type": "NodeParagraph",
646+
"Properties": {
647+
"id": "20250518103354-bj96dlm",
648+
"updated": "20250518103355"
649+
},
650+
"Children": [
651+
{
652+
"Type": "NodeText",
653+
"Data": "在 macOS 上思源會存取桌面、文稿和 iCloud 雲端磁碟資料夾，目的是為了偵測工作空間是否放置在 iCloud 同步路徑下，思源絕不會窺探你的個人數據，請放心。"
654+
}
655+
]
656+
},
643657
{
644658
"ID": "20211226115356-iecet3h",
645659
"Type": "NodeHeading",

‎app/guide/20240530133126-axarxgx/20240530101000-jp793ic.sy‎

Lines changed: 19 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"id": "20240530101000-jp793ic",
99
"title": "よくある質問",
1010
"type": "doc",
11-
"updated": "20240530101000"
11+
"updated": "20250518103515"
1212
},
1313
"Children": [
1414
{
@@ -495,7 +495,7 @@
495495
"Properties": {
496496
"ID": "20240530101000-kzr1stl",
497497
"id": "20240530101000-kibjam5",
498-
"updated": "20240530101000"
498+
"updated": "20250518103515"
499499
},
500500
"Children": [
501501
{
@@ -548,32 +548,20 @@
548548
{
549549
"ID": "20240530101000-dc55vlo",
550550
"Type": "NodeList",
551-
"ListData": {
552-
"Tight": true,
553-
"BulletChar": 42,
554-
"Padding": 2,
555-
"Marker": "Kg==",
556-
"Num": -1
557-
},
551+
"ListData": {},
558552
"Properties": {
559-
"ID": "20240530101000-215dpj2",
560553
"id": "20240530101000-dc55vlo",
561554
"updated": "20240530101000"
562555
},
563556
"Children": [
564557
{
565558
"ID": "20240530101000-zgsohz6",
566559
"Type": "NodeListItem",
567-
"Data": "*",
568560
"ListData": {
569-
"Tight": true,
570561
"BulletChar": 42,
571-
"Padding": 2,
572-
"Marker": "Kg==",
573-
"Num": -1
562+
"Marker": "Kg=="
574563
},
575564
"Properties": {
576-
"ID": "20240530101000-v2y1fe0",
577565
"id": "20240530101000-zgsohz6",
578566
"updated": "20240530101000"
579567
},
@@ -582,7 +570,6 @@
582570
"ID": "20240530101000-qf51d1d",
583571
"Type": "NodeParagraph",
584572
"Properties": {
585-
"ID": "20240530101000-5cxr6xj",
586573
"id": "20240530101000-qf51d1d",
587574
"updated": "20240530101000"
588575
},
@@ -639,16 +626,11 @@
639626
{
640627
"ID": "20240530101000-fgvjudu",
641628
"Type": "NodeListItem",
642-
"Data": "*",
643629
"ListData": {
644-
"Tight": true,
645630
"BulletChar": 42,
646-
"Padding": 2,
647-
"Marker": "Kg==",
648-
"Num": -1
631+
"Marker": "Kg=="
649632
},
650633
"Properties": {
651-
"ID": "20240530101000-igj6g8t",
652634
"id": "20240530101000-fgvjudu",
653635
"updated": "20240530101000"
654636
},
@@ -657,7 +639,6 @@
657639
"ID": "20240530101000-jjauibs",
658640
"Type": "NodeParagraph",
659641
"Properties": {
660-
"ID": "20240530101000-93fnvsy",
661642
"id": "20240530101000-jjauibs",
662643
"updated": "20240530101000"
663644
},
@@ -713,6 +694,20 @@
713694
}
714695
]
715696
},
697+
{
698+
"ID": "20250518103454-fe6q6bd",
699+
"Type": "NodeParagraph",
700+
"Properties": {
701+
"id": "20250518103454-fe6q6bd",
702+
"updated": "20250518103515"
703+
},
704+
"Children": [
705+
{
706+
"Type": "NodeText",
707+
"Data": "macOS では、SiYuan はデスクトップ、ドキュメント、iCloud ドライブ フォルダーにアクセスして、ワークスペースが iCloud 同期パスの下に配置されているかどうかを検出します。 SiYuan がお客様の個人情報を盗み見ることは決してありませんのでご安心ください。"
708+
}
709+
]
710+
},
716711
{
717712
"ID": "20240530101000-hx6kozp",
718713
"Type": "NodeHeading",

‎app/src/protyle/preview/index.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,7 @@ export class Preview {
266266
} else if (type === "yuque") {
267267
fetchPost("/api/lute/copyStdMarkdown", {
268268
id: protyle.block.rootID,
269+
assetsDestSpace2Underscore: true,
269270
}, (response) => {
270271
writeText(response.data);
271272
showMessage(`${window.siyuan.languages.pasteToYuque}`);

‎kernel/api/lute.go‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,11 @@ func copyStdMarkdown(c *gin.Context) {
4444
}
4545

4646
id := arg["id"].(string)
47-
ret.Data = model.ExportStdMarkdown(id)
47+
assetsDestSpace2Underscore := false
48+
if nil != arg["assetsDestSpace2Underscore"] {
49+
assetsDestSpace2Underscore = arg["assetsDestSpace2Underscore"].(bool)
50+
}
51+
ret.Data = model.ExportStdMarkdown(id, assetsDestSpace2Underscore)
4852
}
4953

5054
func html2BlockDOM(c *gin.Context) {

‎kernel/model/export.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1449,7 +1449,7 @@ func processPDFLinkEmbedAssets(pdfCtx *model.Context, assetDests []string, remov
14491449
}
14501450
}
14511451

1452-
func ExportStdMarkdown(id string) string {
1452+
func ExportStdMarkdown(id string, assetsDestSpace2Underscore bool) string {
14531453
tree, err := LoadTreeByBlockID(id)
14541454
if err != nil {
14551455
logging.LogErrorf("load tree by block id [%s] failed: %s", id, err)
@@ -1487,7 +1487,7 @@ func ExportStdMarkdown(id string) string {
14871487
}
14881488
defBlockIDs = gulu.Str.RemoveDuplicatedElem(defBlockIDs)
14891489

1490-
return exportMarkdownContent0(tree, cloudAssetsBase, false,
1490+
return exportMarkdownContent0(tree, cloudAssetsBase, assetsDestSpace2Underscore,
14911491
".md", Conf.Export.BlockRefMode, Conf.Export.BlockEmbedMode, Conf.Export.FileAnnotationRefMode,
14921492
Conf.Export.TagOpenMarker, Conf.Export.TagCloseMarker,
14931493
Conf.Export.BlockRefTextLeft, Conf.Export.BlockRefTextRight,

0 commit comments

Comments
 (0)