Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-03-11 23:22:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Vanessa 2022-09-05 22:02:10 +08:00
commit 009f59a8d1
13 changed files with 83 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/appx/AppxManifest.xml
View file

@ -9,7 +9,7 @@
<Identity Name="89C2A984.SiYuan"
ProcessorArchitecture="x64"
Publisher='CN=087C656E-C1D9-42D8-8807-CED45A74FC0F'
Version="2.1.12.0"/>
Version="2.1.13.0"/>
<Properties>
<DisplayName>SiYuan</DisplayName>
<PublisherDisplayName>云南链滴科技有限公司</PublisherDisplayName>

6
app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20200924100744-br924ar.sy
View file

@ -5,7 +5,7 @@
"id": "20200924100744-br924ar",
"title": "Assets",
"type": "doc",
"updated": "20220902220108"
"updated": "20220905215835"
},
"Children": [
{
@ -81,12 +81,12 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20220824172815-s8znsau",
"updated": "20220824172918"
"updated": "20220905215835"
},
"Children": [
{
"Type": "NodeText",
"Data": "In the editor, you can directly paste the copied picture or file in the system clipboard, or insert it by dragging and dropping the picture or file into the editor. There are two options when inserting:"
"Data": "In the editor, you can directly paste the copied picture or file in the system clipboard (not supported on Linux), or insert it by dragging and dropping the picture or file into the editor. There are two options when inserting:"
}
]
},

6
app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20200915214115-42b8zma.sy
View file

@ -5,7 +5,7 @@
"id": "20200915214115-42b8zma",
"title": "资源文件",
"type": "doc",
"updated": "20220902215702"
"updated": "20220905215650"
},
"Children": [
{
@ -81,12 +81,12 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20210104091255-8s7avcx",
"updated": "20220824172231"
"updated": "20220905215650"
},
"Children": [
{
"Type": "NodeText",
"Data": "在编辑器中可以直接粘贴系统剪切板中复制好的图片或文件，或者通过拖拽图片或文件到编辑器中也可以实现插入。插入时有两个选择："
"Data": "在编辑器中可以直接粘贴系统剪切板中复制好的图片或文件（Linux 端不支持），或者通过拖拽图片或文件到编辑器中也可以实现插入。插入时有两个选择："
}
]
},

6
app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121203-rjjngpz/20211226123038-4umgpxy.sy
View file

@ -4,7 +4,7 @@
"Properties": {
"id": "20211226123038-4umgpxy",
"title": "資料文件",
"updated": "20220902220120"
"updated": "20220905215759"
},
"Children": [
{
@ -76,12 +76,12 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20211226123051-zdhnfws",
"updated": "20220824172714"
"updated": "20220905215759"
},
"Children": [
{
"Type": "NodeText",
"Data": "在編輯器中可以直接粘貼系統剪切板中復制好的圖片或文件，或者通過拖拽圖片或文件到編輯器中也可以實現插入。插入時有兩個選擇："
"Data": "在編輯器中可以直接粘貼系統剪切板中復制好的圖片或文件（Linux 端不支持），或者通過拖拽圖片或文件到編輯器中也可以實現插入。插入時有兩個選擇："
}
]
},

2
app/package.json
View file

@ -1,6 +1,6 @@
{
"name": "SiYuan",
"version": "2.1.12",
"version": "2.1.13",
"description": "Build Your Eternal Digital Garden",
"homepage": "https://b3log.org/siyuan",
"main": "./electron/main.js",

4
app/src/editor/util.ts
View file

@ -481,6 +481,10 @@ export const openBy = (url: string, type: "folder" | "app") => {
if (type === "app") {
shell.openPath(address);
} else if (type === "folder") {
if ("windows" === window.siyuan.config.system.os) {
// Windows 端打开本地文件所在位置失效 https://github.com/siyuan-note/siyuan/issues/5808
address = address.replace(/\\\\/g, "\\");
}
shell.showItemInFolder(address);
}
/// #endif