diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 1efc9cf6a..fd521540b 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -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@29.0.1 -D` +* macOS/Linux: `ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@28.2.4 -D` * Windows: * `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/` - * `pnpm install electron@29.0.1 -D` + * `pnpm install electron@28.2.4 -D` NPM mirror: @@ -30,7 +30,7 @@ NPM mirror: On the desktop, go to the app folder to run: -* `pnpm install electron@29.0.1 -D` +* `pnpm install electron@28.2.4 -D` * `pnpm run dev` * `pnpm run start` diff --git a/.github/CONTRIBUTING_zh_CN.md b/.github/CONTRIBUTING_zh_CN.md index 057224b49..ff343fae2 100644 --- a/.github/CONTRIBUTING_zh_CN.md +++ b/.github/CONTRIBUTING_zh_CN.md @@ -18,11 +18,11 @@ * macOS/Linux: ``` - ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@29.0.1 -D + ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@28.2.4 -D ``` * Windows: * `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/` - * `pnpm install electron@29.0.1 -D` + * `pnpm install electron@28.2.4 -D` NPM 镜像： @@ -32,7 +32,7 @@ NPM 镜像： 桌面端进入 app 文件夹运行： -* `pnpm install electron@29.0.1 -D` +* `pnpm install electron@28.2.4 -D` * `pnpm run dev` * `pnpm run start` diff --git a/app/package.json b/app/package.json index 7da189cc9..e04c73632 100644 --- a/app/package.json +++ b/app/package.json @@ -53,7 +53,7 @@ "clean-webpack-plugin": "^4.0.0", "css-loader": "^6.7.1", "dayjs": "^1.11.5", - "electron": "29.0.1", + "electron": "28.2.4", "electron-builder": "^24.9.1", "encoding": "^0.1.13", "esbuild-loader": "^3.0.1", diff --git a/app/pnpm-lock.yaml b/app/pnpm-lock.yaml index 0199a064e..6dfbbda97 100644 --- a/app/pnpm-lock.yaml +++ b/app/pnpm-lock.yaml @@ -7,7 +7,7 @@ settings: dependencies: '@electron/remote': specifier: ^2.1.2 - version: 2.1.2(electron@29.0.1) + version: 2.1.2(electron@28.2.4) devDependencies: '@types/node': @@ -32,8 +32,8 @@ devDependencies: specifier: ^1.11.5 version: 1.11.5 electron: - specifier: 29.0.1 - version: 29.0.1 + specifier: 28.2.4 + version: 28.2.4 electron-builder: specifier: ^24.9.1 version: 24.9.1 @@ -161,12 +161,12 @@ packages: - supports-color dev: true - /@electron/remote@2.1.2(electron@29.0.1): + /@electron/remote@2.1.2(electron@28.2.4): resolution: {integrity: sha512-EPwNx+nhdrTBxyCqXt/pftoQg/ybtWDW3DUWHafejvnB1ZGGfMpv6e15D8KeempocjXe78T7WreyGGb3mlZxdA==} peerDependencies: electron: '>= 13.0.0' dependencies: - electron: 29.0.1 + electron: 28.2.4 dev: false /@electron/universal@1.4.1: @@ -582,11 +582,6 @@ packages: /@types/node@18.13.0: resolution: {integrity: sha512-gC3TazRzGoOnoKAhUx+Q0t8S9Tzs74z7m0ipwGpSqQrleP14hKxP4/JUeEQcD3W1/aIpnWl8pHowI7WokuZpXg==} - /@types/node@20.11.20: - resolution: {integrity: sha512-7/rR21OS+fq8IyHTgtLkDK949uzsa6n8BkziAKtPVpugIkO6D+/ooXMvzXxDnZrmtXVfjb1bKQafYpb8s89LOg==} - dependencies: - undici-types: 5.26.5 - /@types/plist@3.0.2: resolution: {integrity: sha512-ULqvZNGMv0zRFvqn8/4LSPtnmN4MfhlPNtJCTpKuIIxGVGZ2rYWzFXrvEBoh9CVyqSE7D6YFRJ1hydLHI6kbWw==} requiresBuild: true @@ -1675,14 +1670,14 @@ packages: resolution: {integrity: sha512-YoVeFrGd/7ROjz4R9uPoND1K/hSRC/xADy9639ZmIZeJSaBnKdYx3I6LMPsY7CXLpK7JFgKQVzeZ/dk2br6Eaw==} dev: true - /electron@29.0.1: - resolution: {integrity: sha512-hsQr9clm8NCAMv4uhHlXThHn52UAgrHgyz3ubBAxZIPuUcpKVDtg4HPmx4hbmHIbYICI5OyLN3Ztp7rS+Dn4Lw==} + /electron@28.2.4: + resolution: {integrity: sha512-XrSsqKCmpGwz1pqzmdLhdGonYvatDXor60rBd+TfURMQQRSxyTaSwrds9kV0aab9YRpeYUH6NJDAOwBhQYDDkA==} engines: {node: '>= 12.20.55'} hasBin: true requiresBuild: true dependencies: '@electron/get': 2.0.2 - '@types/node': 20.11.20 + '@types/node': 18.13.0 extract-zip: 2.0.1 transitivePeerDependencies: - supports-color @@ -3643,9 +3638,6 @@ packages: hasBin: true dev: true - /undici-types@5.26.5: - resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==} - /universalify@0.1.2: resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==} engines: {node: '>= 4.0.0'} diff --git a/kernel/api/block.go b/kernel/api/block.go index 4e9d3d050..de361d15a 100644 --- a/kernel/api/block.go +++ b/kernel/api/block.go @@ -62,6 +62,11 @@ func transferBlockRef(c *gin.Context) { return } + reloadUI := true + if nil != arg["reloadUI"] { + reloadUI = arg["reloadUI"].(bool) + } + var refIDs []string if nil != arg["refIDs"] { for _, refID := range arg["refIDs"].([]interface{}) { @@ -76,6 +81,10 @@ func transferBlockRef(c *gin.Context) { ret.Data = map[string]interface{}{"closeTimeout": 7000} return } + + if reloadUI { + util.ReloadUI() + } } func swapBlockRef(c *gin.Context) { diff --git a/kernel/model/block.go b/kernel/model/block.go index 9d9a88063..2779ad608 100644 --- a/kernel/model/block.go +++ b/kernel/model/block.go @@ -205,7 +205,6 @@ func TransferBlockRef(fromID, toID string, refIDs []string) (err error) { } sql.WaitForWritingDatabase() - util.ReloadUI() return } diff --git a/kernel/model/storage.go b/kernel/model/storage.go index 8cfbf17b7..397dc1339 100644 --- a/kernel/model/storage.go +++ b/kernel/model/storage.go @@ -174,18 +174,19 @@ type Criterion struct { } type CriterionTypes struct { - MathBlock bool `json:"mathBlock"` - Table bool `json:"table"` - Blockquote bool `json:"blockquote"` - SuperBlock bool `json:"superBlock"` - Paragraph bool `json:"paragraph"` - Document bool `json:"document"` - Heading bool `json:"heading"` - List bool `json:"list"` - ListItem bool `json:"listItem"` - CodeBlock bool `json:"codeBlock"` - HtmlBlock bool `json:"htmlBlock"` - EmbedBlock bool `json:"embedBlock"` + MathBlock bool `json:"mathBlock"` + Table bool `json:"table"` + Blockquote bool `json:"blockquote"` + SuperBlock bool `json:"superBlock"` + Paragraph bool `json:"paragraph"` + Document bool `json:"document"` + Heading bool `json:"heading"` + List bool `json:"list"` + ListItem bool `json:"listItem"` + CodeBlock bool `json:"codeBlock"` + HtmlBlock bool `json:"htmlBlock"` + EmbedBlock bool `json:"embedBlock"` + DatabaseBlock bool `json:"databaseBlock"` } type CriterionReplaceTypes struct {