diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 49f7af9f2..96a46e782 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -14,10 +14,10 @@ Install pnpm: `npm install -g pnpm` Set the Electron mirror environment variable and install Electron: -* macOS/Linux: `ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ pnpm install electron@20.0.3 -D` +* macOS/Linux: `ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ pnpm install electron@20.1.0 -D` * Windows: * `SET ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/` - * `pnpm install electron@20.0.3 -D` + * `pnpm install electron@20.1.0 -D` NPM mirror: @@ -28,7 +28,7 @@ NPM mirror: On the desktop, go to the app folder to run: -* `pnpm install electron@20.0.3 -D` +* `pnpm install electron@20.1.0 -D` * `pnpm run dev` * `pnpm run start` diff --git a/.github/CONTRIBUTING_zh_CN.md b/.github/CONTRIBUTING_zh_CN.md index 7cd75fbf5..8d16e0847 100644 --- a/.github/CONTRIBUTING_zh_CN.md +++ b/.github/CONTRIBUTING_zh_CN.md @@ -14,10 +14,10 @@ 设置 Electron 镜像环境变量并安装 Electron： -* macOS/Linux: `ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ pnpm install electron@20.0.3 -D` +* macOS/Linux: `ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ pnpm install electron@20.1.0 -D` * Windows: * `SET ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/` - * `pnpm install electron@20.0.3 -D` + * `pnpm install electron@20.1.0 -D` NPM 镜像： @@ -27,7 +27,7 @@ NPM 镜像： 桌面端进入 app 文件夹运行： -* `pnpm install electron@20.0.3 -D` +* `pnpm install electron@20.1.0 -D` * `pnpm run dev` * `pnpm run start` diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 2b80ba405..0d6719931 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -33,4 +33,4 @@ jobs: - name: Build the Docker image run: | - docker buildx build --push --platform linux/amd64,linux/arm64,linux/arm/v7 -t b3log/siyuan:latest -t b3log/siyuan:v2.1.9 . \ No newline at end of file + docker buildx build --push --platform linux/amd64,linux/arm64,linux/arm/v7 -t b3log/siyuan:latest -t b3log/siyuan:v2.1.10 . \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 45fb46b30..d412286a5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,31 @@ +## v2.1.10 / 2022-08-28 + +### 改进功能 + +* [数学公式支持设置全局宏定义](https://github.com/siyuan-note/siyuan/issues/5682) +* [提供重建单个文档索引的 API](https://github.com/siyuan-note/siyuan/issues/5719) +* [支持导出系统日志](https://github.com/siyuan-note/siyuan/issues/5726) +* [同步向导优化，登录后根据条件进行下一步提示](https://github.com/siyuan-note/siyuan/issues/5727) +* [链接菜单中的转化为文本移动到删除上](https://github.com/siyuan-note/siyuan/issues/5731) +* [使用 HTML 块时建议使用 `
` 包裹 HTML 代码](https://github.com/siyuan-note/siyuan/issues/5732) +* [表格中的代码包含 `\|` 时复制纯文本应该剔除掉 `\`](https://github.com/siyuan-note/siyuan/issues/5733) +* [改进云端同步图标](https://github.com/siyuan-note/siyuan/issues/5734) +* [移动端实现状态栏提示](https://github.com/siyuan-note/siyuan/issues/5736) + +### 开发重构 + +* [Android 端升级 SDK 为 32](https://github.com/siyuan-note/siyuan/issues/5737) +* [升级 Electron](https://github.com/siyuan-note/siyuan/issues/5738) + +### 修复缺陷 + +* [macOS 端无法使用 ⌘V 粘贴图片](https://github.com/siyuan-note/siyuan/issues/5722) +* [复制粘贴带换行的文本拆分为多个块后解析不正确](https://github.com/siyuan-note/siyuan/issues/5723) +* [拖动有序列表项生产超级块后撤销不正确](https://github.com/siyuan-note/siyuan/issues/5725) +* [嵌入块中存在换行 SQL 语句时会被转换为段落文本](https://github.com/siyuan-note/siyuan/issues/5728) +* [第一次打开页签有光标，关闭后第二次打开无光标](https://github.com/siyuan-note/siyuan/issues/5729) +* [云端同步失败重试后导致旧数据覆盖新数据](https://github.com/siyuan-note/siyuan/issues/5730) + ## v2.1.9 / 2022-08-24 ### 改进功能 diff --git a/app/appx/AppxManifest.xml b/app/appx/AppxManifest.xml index fdc89639a..f990985ba 100644 --- a/app/appx/AppxManifest.xml +++ b/app/appx/AppxManifest.xml @@ -9,7 +9,7 @@ + Version="2.1.10.0"/> SiYuan 云南链滴科技有限公司 diff --git a/app/package.json b/app/package.json index 91ee93570..29896a90e 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "SiYuan", - "version": "2.1.9", + "version": "2.1.10", "description": "Build Your Eternal Digital Garden", "homepage": "https://b3log.org/siyuan", "main": "./electron/main.js", @@ -59,7 +59,7 @@ "clean-webpack-plugin": "^4.0.0", "css-loader": "^6.7.1", "dayjs": "^1.11.3", - "electron": "20.0.3", + "electron": "20.1.0", "electron-builder": "^23.3.1", "encoding": "^0.1.13", "eslint": "^8.19.0", diff --git a/app/pnpm-lock.yaml b/app/pnpm-lock.yaml index 21f1e720c..f4021ad22 100644 --- a/app/pnpm-lock.yaml +++ b/app/pnpm-lock.yaml @@ -15,7 +15,7 @@ specifiers: clean-webpack-plugin: ^4.0.0 css-loader: ^6.7.1 dayjs: ^1.11.3 - electron: 20.0.3 + electron: 20.1.0 electron-builder: ^23.3.1 electron-fetch: ^1.7.4 encoding: ^0.1.13 @@ -39,7 +39,7 @@ specifiers: webpack-cli: ^4.10.0 dependencies: - '@electron/remote': 2.0.8_electron@20.0.3 + '@electron/remote': 2.0.8_electron@20.1.0 electron-fetch: 1.7.4 pnpm: 7.9.3 @@ -57,7 +57,7 @@ devDependencies: clean-webpack-plugin: 4.0.0_webpack@5.73.0 css-loader: 6.7.1_webpack@5.73.0 dayjs: 1.11.3 - electron: 20.0.3 + electron: 20.1.0 electron-builder: 23.3.1 encoding: 0.1.13 eslint: 8.19.0 @@ -1274,12 +1274,12 @@ packages: transitivePeerDependencies: - supports-color - /@electron/remote/2.0.8_electron@20.0.3: + /@electron/remote/2.0.8_electron@20.1.0: resolution: {integrity: sha512-P10v3+iFCIvEPeYzTWWGwwHmqWnjoh8RYnbtZAb3RlQefy4guagzIwcWtfftABIfm6JJTNQf4WPSKWZOpLmHXw==} peerDependencies: electron: '>= 13.0.0' dependencies: - electron: 20.0.3 + electron: 20.1.0 dev: false /@electron/universal/1.2.1: @@ -1906,10 +1906,10 @@ packages: resolution: {integrity: sha512-mi4DG3m32cMJ5CtO9iYk41gBvGWLzJjQsaQgGOd4ZhmIuKyj8M/0rT1g0s/0qD4Tw8jsa//NXMXCC7vpGIfkTg==} engines: {node: '>=14.0.0'} dependencies: + 7zip-bin: 5.1.1 '@develar/schema-utils': 2.6.5 '@electron/universal': 1.2.1 '@malept/flatpak-bundler': 0.4.0 - 7zip-bin: 5.1.1 async-exit-hook: 2.0.1 bluebird-lst: 1.0.9 builder-util: 23.3.0 @@ -2193,9 +2193,9 @@ packages: /builder-util/23.3.0: resolution: {integrity: sha512-m7RRd21N2yrnuGFd+ZqOY0ryeqWmBslDKmGDVz0wETqoEEqpiJsF3CGlsb6MRN2EQKDubvE5e+lBf8ATt06fnA==} dependencies: + 7zip-bin: 5.1.1 '@types/debug': 4.1.7 '@types/fs-extra': 9.0.13 - 7zip-bin: 5.1.1 app-builder-bin: 4.0.0 bluebird-lst: 1.0.9 builder-util-runtime: 9.0.3 @@ -2815,8 +2815,8 @@ packages: resolution: {integrity: sha512-YoVeFrGd/7ROjz4R9uPoND1K/hSRC/xADy9639ZmIZeJSaBnKdYx3I6LMPsY7CXLpK7JFgKQVzeZ/dk2br6Eaw==} dev: true - /electron/20.0.3: - resolution: {integrity: sha512-Yx0a/SGgus/XqDAoMMs165JUikgE5vBmQpNJ+0XMDG/IYFj6TNNzfY2ATI+t171JjhKKO+MYPO8xqyZdFRoIDw==} + /electron/20.1.0: + resolution: {integrity: sha512-gzl6fdZe5g0qmzCC6Ejxa1Oa8eqUSxs4+QLtrM7SyEVp+mEPJAOoDe0xD8ayRQqeXTBxLK1LFrKtc4c98iufsg==} engines: {node: '>= 10.17.0'} hasBin: true requiresBuild: true diff --git a/kernel/model/search.go b/kernel/model/search.go index 179bec993..4b30e2160 100644 --- a/kernel/model/search.go +++ b/kernel/model/search.go @@ -331,8 +331,6 @@ func fullTextSearchCount(query, box, path, filter string) (matchedBlockCount, ma } func fullTextSearch(query, box, path, filter string, beforeLen int, querySyntax bool) (ret []*Block, matchedBlockCount, matchedRootCount int) { - fullTextSearchHistory(query, 1) - query = gulu.Str.RemoveInvisible(query) if util.IsIDPattern(query) { ret, matchedBlockCount, matchedRootCount = searchBySQL("SELECT * FROM `blocks` WHERE `id` = '"+query+"'", beforeLen) diff --git a/kernel/util/runtime.go b/kernel/util/runtime.go index 3618235bd..2b71bccfd 100644 --- a/kernel/util/runtime.go +++ b/kernel/util/runtime.go @@ -29,7 +29,7 @@ import ( "github.com/siyuan-note/logging" ) -const DatabaseVer = "20220828" // 修改表结构的话需要修改这里 +const DatabaseVer = "20220501" // 修改表结构的话需要修改这里 const ( ExitCodeReadOnlyDatabase = 20 // 数据库文件被锁 diff --git a/kernel/util/working.go b/kernel/util/working.go index 267fb1d70..c6260029a 100644 --- a/kernel/util/working.go +++ b/kernel/util/working.go @@ -40,7 +40,7 @@ import ( var Mode = "prod" const ( - Ver = "2.1.9" + Ver = "2.1.10" IsInsider = false )