mirror of
https://github.com/siyuan-note/siyuan.git
synced 2025-12-26 19:38:48 +01:00
Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
Vanessa
commit
8bd9becf45
7 changed files with 79 additions and 37 deletions
|
|
@ -7,7 +7,7 @@
|
|||
"id": "20200923234731-h3zkwm2",
|
||||
"title": "FAQ",
|
||||
"type": "doc",
|
||||
"updated": "20250115163037"
|
||||
"updated": "20250518103440"
|
||||
},
|
||||
"Children": [
|
||||
{
|
||||
|
|
@ -442,7 +442,7 @@
|
|||
"HeadingLevel": 2,
|
||||
"Properties": {
|
||||
"id": "20220808181753-3ligpvz",
|
||||
"updated": "20220808181753"
|
||||
"updated": "20250518103440"
|
||||
},
|
||||
"Children": [
|
||||
{
|
||||
|
|
@ -608,7 +608,7 @@
|
|||
},
|
||||
{
|
||||
"Type": "NodeText",
|
||||
"Data": " - "
|
||||
"Data": " - "
|
||||
},
|
||||
{
|
||||
"Type": "NodeTextMark",
|
||||
|
|
@ -617,7 +617,7 @@
|
|||
},
|
||||
{
|
||||
"Type": "NodeText",
|
||||
"Data": " - "
|
||||
"Data": " - "
|
||||
},
|
||||
{
|
||||
"Type": "NodeTextMark",
|
||||
|
|
@ -626,7 +626,7 @@
|
|||
},
|
||||
{
|
||||
"Type": "NodeText",
|
||||
"Data": " / "
|
||||
"Data": " / "
|
||||
},
|
||||
{
|
||||
"Type": "NodeTextMark",
|
||||
|
|
@ -635,7 +635,7 @@
|
|||
},
|
||||
{
|
||||
"Type": "NodeText",
|
||||
"Data": ""
|
||||
"Data": ""
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -643,6 +643,20 @@
|
|||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"ID": "20250518103412-4mf2mer",
|
||||
"Type": "NodeParagraph",
|
||||
"Properties": {
|
||||
"id": "20250518103412-4mf2mer",
|
||||
"updated": "20250518103440"
|
||||
},
|
||||
"Children": [
|
||||
{
|
||||
"Type": "NodeText",
|
||||
"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."
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"ID": "20211129190925-mzmhh3v",
|
||||
"Type": "NodeHeading",
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
"id": "20200813093015-u6bopdt",
|
||||
"title": "常见问题",
|
||||
"type": "doc",
|
||||
"updated": "20250115163009"
|
||||
"updated": "20250518102608"
|
||||
},
|
||||
"Children": [
|
||||
{
|
||||
|
|
@ -443,7 +443,7 @@
|
|||
"HeadingLevel": 2,
|
||||
"Properties": {
|
||||
"id": "20210918114843-6xo7hmr",
|
||||
"updated": "20220808181126"
|
||||
"updated": "20250518102608"
|
||||
},
|
||||
"Children": [
|
||||
{
|
||||
|
|
@ -638,6 +638,20 @@
|
|||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"ID": "20250518102159-j2jxzeb",
|
||||
"Type": "NodeParagraph",
|
||||
"Properties": {
|
||||
"id": "20250518102159-j2jxzeb",
|
||||
"updated": "20250518102608"
|
||||
},
|
||||
"Children": [
|
||||
{
|
||||
"Type": "NodeText",
|
||||
"Data": "在 macOS 上思源会访问桌面、文稿和 iCloud 云盘文件夹，目的是为了检测工作空间是否放置在 iCloud 同步路径下，思源绝不会窥探你的个人数据，请放心。"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"ID": "20211129190023-eezo4zh",
|
||||
"Type": "NodeHeading",
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
"id": "20211226115227-r1rty9v",
|
||||
"title": "常見問題",
|
||||
"type": "doc",
|
||||
"updated": "20250115163022"
|
||||
"updated": "20250518103355"
|
||||
},
|
||||
"Children": [
|
||||
{
|
||||
|
|
@ -439,7 +439,7 @@
|
|||
"HeadingLevel": 2,
|
||||
"Properties": {
|
||||
"id": "20220808181824-pwnc2gx",
|
||||
"updated": "20220808181824"
|
||||
"updated": "20250518103355"
|
||||
},
|
||||
"Children": [
|
||||
{
|
||||
|
|
@ -640,6 +640,20 @@
|
|||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"ID": "20250518103354-bj96dlm",
|
||||
"Type": "NodeParagraph",
|
||||
"Properties": {
|
||||
"id": "20250518103354-bj96dlm",
|
||||
"updated": "20250518103355"
|
||||
},
|
||||
"Children": [
|
||||
{
|
||||
"Type": "NodeText",
|
||||
"Data": "在 macOS 上思源會存取桌面、文稿和 iCloud 雲端磁碟資料夾，目的是為了偵測工作空間是否放置在 iCloud 同步路徑下，思源絕不會窺探你的個人數據，請放心。"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"ID": "20211226115356-iecet3h",
|
||||
"Type": "NodeHeading",
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
"id": "20240530101000-jp793ic",
|
||||
"title": "よくある質問",
|
||||
"type": "doc",
|
||||
"updated": "20240530101000"
|
||||
"updated": "20250518103515"
|
||||
},
|
||||
"Children": [
|
||||
{
|
||||
|
|
@ -495,7 +495,7 @@
|
|||
"Properties": {
|
||||
"ID": "20240530101000-kzr1stl",
|
||||
"id": "20240530101000-kibjam5",
|
||||
"updated": "20240530101000"
|
||||
"updated": "20250518103515"
|
||||
},
|
||||
"Children": [
|
||||
{
|
||||
|
|
@ -548,15 +548,8 @@
|
|||
{
|
||||
"ID": "20240530101000-dc55vlo",
|
||||
"Type": "NodeList",
|
||||
"ListData": {
|
||||
"Tight": true,
|
||||
"BulletChar": 42,
|
||||
"Padding": 2,
|
||||
"Marker": "Kg==",
|
||||
"Num": -1
|
||||
},
|
||||
"ListData": {},
|
||||
"Properties": {
|
||||
"ID": "20240530101000-215dpj2",
|
||||
"id": "20240530101000-dc55vlo",
|
||||
"updated": "20240530101000"
|
||||
},
|
||||
|
|
@ -564,16 +557,11 @@
|
|||
{
|
||||
"ID": "20240530101000-zgsohz6",
|
||||
"Type": "NodeListItem",
|
||||
"Data": "*",
|
||||
"ListData": {
|
||||
"Tight": true,
|
||||
"BulletChar": 42,
|
||||
"Padding": 2,
|
||||
"Marker": "Kg==",
|
||||
"Num": -1
|
||||
"Marker": "Kg=="
|
||||
},
|
||||
"Properties": {
|
||||
"ID": "20240530101000-v2y1fe0",
|
||||
"id": "20240530101000-zgsohz6",
|
||||
"updated": "20240530101000"
|
||||
},
|
||||
|
|
@ -582,7 +570,6 @@
|
|||
"ID": "20240530101000-qf51d1d",
|
||||
"Type": "NodeParagraph",
|
||||
"Properties": {
|
||||
"ID": "20240530101000-5cxr6xj",
|
||||
"id": "20240530101000-qf51d1d",
|
||||
"updated": "20240530101000"
|
||||
},
|
||||
|
|
@ -639,16 +626,11 @@
|
|||
{
|
||||
"ID": "20240530101000-fgvjudu",
|
||||
"Type": "NodeListItem",
|
||||
"Data": "*",
|
||||
"ListData": {
|
||||
"Tight": true,
|
||||
"BulletChar": 42,
|
||||
"Padding": 2,
|
||||
"Marker": "Kg==",
|
||||
"Num": -1
|
||||
"Marker": "Kg=="
|
||||
},
|
||||
"Properties": {
|
||||
"ID": "20240530101000-igj6g8t",
|
||||
"id": "20240530101000-fgvjudu",
|
||||
"updated": "20240530101000"
|
||||
},
|
||||
|
|
@ -657,7 +639,6 @@
|
|||
"ID": "20240530101000-jjauibs",
|
||||
"Type": "NodeParagraph",
|
||||
"Properties": {
|
||||
"ID": "20240530101000-93fnvsy",
|
||||
"id": "20240530101000-jjauibs",
|
||||
"updated": "20240530101000"
|
||||
},
|
||||
|
|
@ -713,6 +694,20 @@
|
|||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"ID": "20250518103454-fe6q6bd",
|
||||
"Type": "NodeParagraph",
|
||||
"Properties": {
|
||||
"id": "20250518103454-fe6q6bd",
|
||||
"updated": "20250518103515"
|
||||
},
|
||||
"Children": [
|
||||
{
|
||||
"Type": "NodeText",
|
||||
"Data": "macOS では、SiYuan はデスクトップ、ドキュメント、iCloud ドライブ フォルダーにアクセスして、ワークスペースが iCloud 同期パスの下に配置されているかどうかを検出します。 SiYuan がお客様の個人情報を盗み見ることは決してありませんのでご安心ください。"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"ID": "20240530101000-hx6kozp",
|
||||
"Type": "NodeHeading",
|
||||
|
|
|
|||
|
|
@ -266,6 +266,7 @@ export class Preview {
|
|||
} else if (type === "yuque") {
|
||||
fetchPost("/api/lute/copyStdMarkdown", {
|
||||
id: protyle.block.rootID,
|
||||
assetsDestSpace2Underscore: true,
|
||||
}, (response) => {
|
||||
writeText(response.data);
|
||||
showMessage(`${window.siyuan.languages.pasteToYuque}`);
|
||||
|
|
|
|||
|
|
@ -44,7 +44,11 @@ func copyStdMarkdown(c *gin.Context) {
|
|||
}
|
||||
|
||||
id := arg["id"].(string)
|
||||
ret.Data = model.ExportStdMarkdown(id)
|
||||
assetsDestSpace2Underscore := false
|
||||
if nil != arg["assetsDestSpace2Underscore"] {
|
||||
assetsDestSpace2Underscore = arg["assetsDestSpace2Underscore"].(bool)
|
||||
}
|
||||
ret.Data = model.ExportStdMarkdown(id, assetsDestSpace2Underscore)
|
||||
}
|
||||
|
||||
func html2BlockDOM(c *gin.Context) {
|
||||
|
|
|
|||
|
|
@ -1449,7 +1449,7 @@ func processPDFLinkEmbedAssets(pdfCtx *model.Context, assetDests []string, remov
|
|||
}
|
||||
}
|
||||
|
||||
func ExportStdMarkdown(id string) string {
|
||||
func ExportStdMarkdown(id string, assetsDestSpace2Underscore bool) string {
|
||||
tree, err := LoadTreeByBlockID(id)
|
||||
if err != nil {
|
||||
logging.LogErrorf("load tree by block id [%s] failed: %s", id, err)
|
||||
|
|
@ -1487,7 +1487,7 @@ func ExportStdMarkdown(id string) string {
|
|||
}
|
||||
defBlockIDs = gulu.Str.RemoveDuplicatedElem(defBlockIDs)
|
||||
|
||||
return exportMarkdownContent0(tree, cloudAssetsBase, false,
|
||||
return exportMarkdownContent0(tree, cloudAssetsBase, assetsDestSpace2Underscore,
|
||||
".md", Conf.Export.BlockRefMode, Conf.Export.BlockEmbedMode, Conf.Export.FileAnnotationRefMode,
|
||||
Conf.Export.TagOpenMarker, Conf.Export.TagCloseMarker,
|
||||
Conf.Export.BlockRefTextLeft, Conf.Export.BlockRefTextRight,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue