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-02-23 11:31:21 +08:00
commit 1c80d70093
7 changed files with 30 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.github/CONTRIBUTING.md vendored
View file

@ -16,10 +16,10 @@ Install pnpm: `npm install -g pnpm`
Set the Electron mirror environment variable and install Electron:
* macOS/Linux: `ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@28.2.1 -D`
* macOS/Linux: `ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@29.0.1 -D`
* Windows:
* `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/`
* `pnpm install electron@28.2.1 -D`
* `pnpm install electron@29.0.1 -D`
NPM mirror:
@ -30,7 +30,7 @@ NPM mirror:
On the desktop, go to the app folder to run:
* `pnpm install electron@28.2.1 -D`
* `pnpm install electron@29.0.1 -D`
* `pnpm run dev`
* `pnpm run start`

6
.github/CONTRIBUTING_zh_CN.md vendored
View file

@ -18,11 +18,11 @@
* macOS/Linux:
```
ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@28.2.1 -D
ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@29.0.1 -D
```
* Windows:
* `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/`
* `pnpm install electron@28.2.1 -D`
* `pnpm install electron@29.0.1 -D`
NPM 镜像：
@ -32,7 +32,7 @@ NPM 镜像：
桌面端进入 app 文件夹运行：
* `pnpm install electron@28.2.1 -D`
* `pnpm install electron@29.0.1 -D`
* `pnpm run dev`
* `pnpm run start`

1
app/src/config/ai.ts
View file

@ -151,6 +151,7 @@ export const ai = {
apiMaxTokens: parseInt((ai.element.querySelector("#apiMaxTokens") as HTMLInputElement).value),
apiProxy: (ai.element.querySelector("#apiProxy") as HTMLInputElement).value,
apiTimeout: parseInt((ai.element.querySelector("#apiTimeout") as HTMLInputElement).value),
apiProvider: (ai.element.querySelector("#apiProvider") as HTMLSelectElement).value,
}
}, response => {
window.siyuan.config.ai = response.data;

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

@ -9,7 +9,7 @@ require (
github.com/88250/clipboard v0.1.5
github.com/88250/epub v0.0.0-20230830085737-c19055cd1f48
github.com/88250/gulu v1.2.3-0.20231209020950-b7b6994e395c
github.com/88250/lute v1.7.7-0.20240220070639-6c7e1adfa651
github.com/88250/lute v1.7.7-0.20240223030008-adf363ceff6c
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

@ -10,8 +10,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.20231209020950-b7b6994e395c h1:Fas3hxqP33xA9KKDV50jUmppiiOukk5bdV00Hk5VSSk=
github.com/88250/gulu v1.2.3-0.20231209020950-b7b6994e395c/go.mod h1:pTWnjt+6qUqNnP9xltswsJxgCBVu3C7eW09u48LWX0k=
github.com/88250/lute v1.7.7-0.20240220070639-6c7e1adfa651 h1:fgHjQsqwCWc+gUoLscy8rSi5XAv6dtaemFpgI8KnusI=
github.com/88250/lute v1.7.7-0.20240220070639-6c7e1adfa651/go.mod h1:+wUqx/1kdFDbWtxn9LYJlaCOAeol2pjSO6w+WJTVQsg=
github.com/88250/lute v1.7.7-0.20240223030008-adf363ceff6c h1:2Mwk9QLj1p7a9mn7s+gSNYrft0AK74RMcd7FUFYWmlI=
github.com/88250/lute v1.7.7-0.20240223030008-adf363ceff6c/go.mod h1:+wUqx/1kdFDbWtxn9LYJlaCOAeol2pjSO6w+WJTVQsg=
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=

23
kernel/model/blockial.go
View file

@ -104,25 +104,34 @@ func BatchSetBlockAttrs(blockAttrs []map[string]interface{}) (err error) {
trees := map[string]*parse.Tree{}
for _, blockAttr := range blockAttrs {
id := blockAttr["id"].(string)
if nil == trees[id] {
bt := treenode.GetBlockTree(id)
if nil == bt {
return errors.New(fmt.Sprintf(Conf.Language(15), id))
}
if nil == trees[bt.RootID] {
tree, e := loadTreeByBlockID(id)
if nil != e {
return e
}
trees[id] = tree
trees[bt.RootID] = tree
}
}
var nodes []*ast.Node
for _, blockAttr := range blockAttrs {
id := blockAttr["id"].(string)
attrs := blockAttr["attrs"].(map[string]string)
tree := trees[id]
bt := treenode.GetBlockTree(id)
if nil == bt {
return errors.New(fmt.Sprintf(Conf.Language(15), id))
}
tree := trees[bt.RootID]
node := treenode.GetNodeInTree(tree, id)
if nil == node {
return errors.New(fmt.Sprintf(Conf.Language(15), id))
}
attrs := blockAttr["attrs"].(map[string]string)
oldAttrs, e := setNodeAttrs0(node, attrs)
if nil != e {
return e
@ -133,6 +142,12 @@ func BatchSetBlockAttrs(blockAttrs []map[string]interface{}) (err error) {
nodes = append(nodes, node)
}
for _, tree := range trees {
if err = indexWriteJSONQueue(tree); nil != err {
return
}
}
IncSync()
// 不做锚文本刷新
return