diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index f2898a221..7409b482e 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -7,17 +7,17 @@ ## NPM dependencies -Install pnpm: `npm install -g pnpm@10.19.0` +Install pnpm: `npm install -g pnpm@10.20.0`
For China mainland 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` diff --git a/.github/CONTRIBUTING_zh_CN.md b/.github/CONTRIBUTING_zh_CN.md index 6f155d28d..09055abde 100644 --- a/.github/CONTRIBUTING_zh_CN.md +++ b/.github/CONTRIBUTING_zh_CN.md @@ -7,17 +7,17 @@ ## NPM 依赖 -安装 pnpm：`npm install -g pnpm@10.19.0` +安装 pnpm：`npm install -g pnpm@10.20.0`
适用于中国大陆 设置 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` diff --git a/app/package.json b/app/package.json index ce66dd2f0..d66c2e2e0 100644 --- a/app/package.json +++ b/app/package.json @@ -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", diff --git a/app/pnpm-lock.yaml b/app/pnpm-lock.yaml index 5a12f4a02..ea1ae6e03 100644 --- a/app/pnpm-lock.yaml +++ b/app/pnpm-lock.yaml @@ -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 diff --git a/kernel/model/attribute_view.go b/kernel/model/attribute_view.go index deb5520dc..240dd1214 100644 --- a/kernel/model/attribute_view.go +++ b/kernel/model/attribute_view.go @@ -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}})