Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-17 15:10:12 +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 2025-05-27 10:04:54 +08:00
commit 14c53946bd
4 changed files with 10 additions and 3 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" <Identity Name="89C2A984.SiYuan"
ProcessorArchitecture="x64" ProcessorArchitecture="x64"
Publisher="CN=087C656E-C1D9-42D8-8807-CED45A74FC0F" Publisher="CN=087C656E-C1D9-42D8-8807-CED45A74FC0F"
Version="3.1.30.0"/> Version="3.1.31.0"/>
<Properties> <Properties>
<DisplayName>SiYuan</DisplayName> <DisplayName>SiYuan</DisplayName>
<PublisherDisplayName>云南链滴科技有限公司</PublisherDisplayName> <PublisherDisplayName>云南链滴科技有限公司</PublisherDisplayName>

2
app/package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "SiYuan", "name": "SiYuan",
"version": "3.1.30", "version": "3.1.31",
"description": "Refactor your thinking", "description": "Refactor your thinking",
"homepage": "https://b3log.org/siyuan", "homepage": "https://b3log.org/siyuan",
"main": "./electron/main.js", "main": "./electron/main.js",

7
kernel/model/export.go
View file

@ -2322,6 +2322,13 @@ func exportTree(tree *parse.Tree, wysiwyg, keepFold, avHiddenCol bool,
if root, _ := getBlock(id, tree); nil != root { if root, _ := getBlock(id, tree); nil != root {
root.IAL["type"] = "doc" root.IAL["type"] = "doc"
title := &ast.Node{Type: ast.NodeHeading, HeadingLevel: 1} title := &ast.Node{Type: ast.NodeHeading, HeadingLevel: 1}
for k, v := range root.IAL {
if "type" == k {
continue
}
title.SetIALAttr(k, v)
}
title.InsertAfter(&ast.Node{Type: ast.NodeKramdownBlockIAL, Tokens: parse.IAL2Tokens(title.KramdownIAL)})
content := html.UnescapeString(root.Content) content := html.UnescapeString(root.Content)
title.AppendChild(&ast.Node{Type: ast.NodeText, Tokens: []byte(content)}) title.AppendChild(&ast.Node{Type: ast.NodeText, Tokens: []byte(content)})
ret.Root.PrependChild(title) ret.Root.PrependChild(title)

2
kernel/util/working.go
View file

@ -45,7 +45,7 @@ import (
var Mode = "prod" var Mode = "prod"
const ( const (
Ver = "3.1.30" Ver = "3.1.31"
IsInsider = false IsInsider = false
// env vars as fallback for commandline parameters // env vars as fallback for commandline parameters