Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-16 22:50:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source
This commit is contained in:
Vanessa 2025-11-15 15:18:38 +08:00
commit 10256c5486
5 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.github/CONTRIBUTING.md vendored
View file

@ -14,10 +14,10 @@ Install pnpm: `npm install -g pnpm@10.20.0`
Set the Electron mirror environment variable and install Electron:
* macOS/Linux: `ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@38.6.0 -D`
* macOS/Linux: `ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@38.7.0 -D`
* Windows:
* `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/`
* `pnpm install electron@38.6.0 -D`
* `pnpm install electron@38.7.0 -D`
NPM mirror:
@ -27,7 +27,7 @@ NPM mirror:
Enter the app folder and execute:
* `pnpm install electron@38.6.0 -D`
* `pnpm install electron@38.7.0 -D`
* `pnpm run dev`
* `pnpm run start`

6
.github/CONTRIBUTING_zh_CN.md vendored
View file

@ -14,10 +14,10 @@
设置 Electron 镜像环境变量并安装 Electron：
* macOS/Linux：`ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@38.6.0 -D`
* macOS/Linux：`ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@38.7.0 -D`
* Windows：
* `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/`
* `pnpm install electron@38.6.0 -D`
* `pnpm install electron@38.7.0 -D`
NPM 镜像：
@ -27,7 +27,7 @@ NPM 镜像：
进入 app 文件夹执行：
* `pnpm install electron@38.6.0 -D`
* `pnpm install electron@38.7.0 -D`
* `pnpm run dev`
* `pnpm run start`

2
app/package.json
View file

@ -57,7 +57,7 @@
"clean-webpack-plugin": "^4.0.0",
"css-loader": "^7.1.2",
"dayjs": "^1.11.5",
"electron": "38.6.0",
"electron": "38.7.0",
"electron-builder": "26.0.12",
"encoding": "^0.1.13",
"esbuild-loader": "^3.0.1",

16
app/pnpm-lock.yaml generated
View file

@ -10,7 +10,7 @@ importers:
dependencies:
'@electron/remote':
specifier: ^2.1.3
version: 2.1.3(electron@38.6.0)
version: 2.1.3(electron@38.7.0)
devDependencies:
'@eslint/eslintrc':
specifier: ^3.3.1
@ -40,8 +40,8 @@ importers:
specifier: ^1.11.5
version: 1.11.18
electron:
specifier: 38.6.0
version: 38.6.0
specifier: 38.7.0
version: 38.7.0
electron-builder:
specifier: 26.0.12
version: 26.0.12(electron-builder-squirrel-windows@26.0.12)
@ -1198,8 +1198,8 @@ packages:
resolution: {integrity: sha512-bO3y10YikuUwUuDUQRM4KfwNkKhnpVO7IPdbsrejwN9/AABJzzTQ4GeHwyzNSrVO+tEH3/Np255a3sVZpZDjvg==}
engines: {node: '>=8.0.0'}
electron@38.6.0:
resolution: {integrity: sha512-68OFNxJlrEStA+t8k5atzf4frJddvRR1N1oalr49Ll8YZ0+0nEsDhw4UNhTCoZKTjSYcxFF/4rt+sco+OlnB3g==}
electron@38.7.0:
resolution: {integrity: sha512-ZHrhfzceUgZwdi6Cd8VS/A10ljIjiHOY5KwZ4iJ5D+JuUYMeS/Uvxbrr1WqjnZUwGe9aUjQHFsxeS3gBWGalOw==}
engines: {node: '>= 12.20.55'}
hasBin: true
@ -2868,9 +2868,9 @@ snapshots:
- bluebird
- supports-color
'@electron/remote@2.1.3(electron@38.6.0)':
'@electron/remote@2.1.3(electron@38.7.0)':
dependencies:
electron: 38.6.0
electron: 38.7.0
'@electron/universal@2.0.1':
dependencies:
@ -4013,7 +4013,7 @@ snapshots:
transitivePeerDependencies:
- supports-color
electron@38.6.0:
electron@38.7.0:
dependencies:
'@electron/get': 2.0.3
'@types/node': 22.18.1

2
kernel/model/transaction.go
View file

@ -1156,6 +1156,7 @@ func (tx *Transaction) doLargeInsert(previousID string) (ret *TxErr) {
data := strings.ReplaceAll(operation.Data.(string), editor.FrontEndCaret, "")
subTree := tx.luteEngine.BlockDOM2Tree(data)
subTree.Box, subTree.Path = tree.Box, tree.Path
tx.processGlobalAssets(subTree)
insertedNode := subTree.Root.FirstChild
@ -1288,6 +1289,7 @@ func (tx *Transaction) doInsert(operation *Operation) (ret *TxErr) {
data := strings.ReplaceAll(operation.Data.(string), editor.FrontEndCaret, "")
subTree := tx.luteEngine.BlockDOM2Tree(data)
subTree.Box, subTree.Path = tree.Box, tree.Path
tx.processGlobalAssets(subTree)
insertedNode := subTree.Root.FirstChild