Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-16 14:40:12 +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-05 10:48:26 +08:00
commit 4fe334a9f8
5 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

8
.github/CONTRIBUTING.md vendored
View file

@ -7,17 +7,17 @@
## NPM dependencies
Install pnpm: `npm install -g pnpm@10.19.0`
Install pnpm: `npm install -g pnpm@10.20.0`
<details>
<summary>For China mainland</summary>
Set the Electron mirror environment variable and install Electron:
* macOS/Linux: `ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@37.7.1 -D`
* macOS/Linux: `ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@38.5.0 -D`
* Windows:
* `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/`
* `pnpm install electron@37.7.1 -D`
* `pnpm install electron@38.5.0 -D`
NPM mirror:
@ -27,7 +27,7 @@ NPM mirror:
Enter the app folder and execute:
* `pnpm install electron@37.7.1 -D`
* `pnpm install electron@38.5.0 -D`
* `pnpm run dev`
* `pnpm run start`

8
.github/CONTRIBUTING_zh_CN.md vendored
View file

@ -7,17 +7,17 @@
## NPM 依赖
安装 pnpm：`npm install -g pnpm@10.19.0`
安装 pnpm：`npm install -g pnpm@10.20.0`
<details>
<summary>适用于中国大陆</summary>
设置 Electron 镜像环境变量并安装 Electron：
* macOS/Linux：`ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@37.7.1 -D`
* macOS/Linux：`ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@38.5.0 -D`
* Windows：
* `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/`
* `pnpm install electron@37.7.1 -D`
* `pnpm install electron@38.5.0 -D`
NPM 镜像：
@ -27,7 +27,7 @@ NPM 镜像：
进入 app 文件夹执行：
* `pnpm install electron@37.7.1 -D`
* `pnpm install electron@38.5.0 -D`
* `pnpm run dev`
* `pnpm run start`

4
app/package.json
View file

@ -4,7 +4,7 @@
"description": "Refactor your thinking",
"homepage": "https://b3log.org/siyuan",
"main": "./electron/main.js",
"packageManager": "pnpm@10.19.0",
"packageManager": "pnpm@10.20.0",
"scripts": {
"lint": "eslint . --fix --cache",
"dev": "webpack --mode development",
@ -57,7 +57,7 @@
"clean-webpack-plugin": "^4.0.0",
"css-loader": "^7.1.2",
"dayjs": "^1.11.5",
"electron": "37.7.1",
"electron": "38.5.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@37.7.1)
version: 2.1.3(electron@38.5.0)
devDependencies:
'@eslint/eslintrc':
specifier: ^3.3.1
@ -40,8 +40,8 @@ importers:
specifier: ^1.11.5
version: 1.11.18
electron:
specifier: 37.7.1
version: 37.7.1
specifier: 38.5.0
version: 38.5.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@37.7.1:
resolution: {integrity: sha512-2EmIqWv4T8BtgFQosB3/0Fezs09X3l0wXhIzes/cNt/GI+UDljbQr3NiF2J9WnqP0aFSbUEfztGUQMiX+qDvsw==}
electron@38.5.0:
resolution: {integrity: sha512-dbC7V+eZweerYMJfxQldzHOg37a1VdNMCKxrJxlkp3cA30gOXtXSg4ZYs07L5+QwI19WOy1uyvtEUgbw1RRsCQ==}
engines: {node: '>= 12.20.55'}
hasBin: true
@ -2868,9 +2868,9 @@ snapshots:
- bluebird
- supports-color
'@electron/remote@2.1.3(electron@37.7.1)':
'@electron/remote@2.1.3(electron@38.5.0)':
dependencies:
electron: 37.7.1
electron: 38.5.0
'@electron/universal@2.0.1':
dependencies:
@ -4013,7 +4013,7 @@ snapshots:
transitivePeerDependencies:
- supports-color
electron@37.7.1:
electron@38.5.0:
dependencies:
'@electron/get': 2.0.3
'@types/node': 22.18.1

10
kernel/model/attribute_view.go
View file

@ -705,7 +705,7 @@ func (tx *Transaction) doChangeAttrViewLayout(operation *Operation) (ret *TxErr)
return
}
func ChangeAttrViewLayout(blockID, avID string, layout av.LayoutType) (err error) {
func ChangeAttrViewLayout(blockID, avID string, newLayout av.LayoutType) (err error) {
attrView, err := av.ParseAttributeView(avID)
if err != nil {
return
@ -716,11 +716,11 @@ func ChangeAttrViewLayout(blockID, avID string, layout av.LayoutType) (err error
return
}
newLayout := layout
if newLayout == view.LayoutType {
return
}
oldLayout := view.LayoutType
view.LayoutType = newLayout
switch newLayout {
@ -734,7 +734,7 @@ func ChangeAttrViewLayout(blockID, avID string, layout av.LayoutType) (err error
}
view.Table = av.NewLayoutTable()
switch view.LayoutType {
switch oldLayout {
case av.LayoutTypeGallery:
for _, field := range view.Gallery.CardFields {
view.Table.Columns = append(view.Table.Columns, &av.ViewTableColumn{BaseField: &av.BaseField{ID: field.ID}})
@ -754,7 +754,7 @@ func ChangeAttrViewLayout(blockID, avID string, layout av.LayoutType) (err error
}
view.Gallery = av.NewLayoutGallery()
switch view.LayoutType {
switch oldLayout {
case av.LayoutTypeTable:
for _, col := range view.Table.Columns {
view.Gallery.CardFields = append(view.Gallery.CardFields, &av.ViewGalleryCardField{BaseField: &av.BaseField{ID: col.ID}})
@ -774,7 +774,7 @@ func ChangeAttrViewLayout(blockID, avID string, layout av.LayoutType) (err error
}
view.Kanban = av.NewLayoutKanban()
switch view.LayoutType {
switch oldLayout {
case av.LayoutTypeTable:
for _, col := range view.Table.Columns {
view.Kanban.Fields = append(view.Kanban.Fields, &av.ViewKanbanField{BaseField: &av.BaseField{ID: col.ID}})