0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Vanessa 2023-06-09 22:44:08 +08:00
commit 31cda72ed8
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/protyle/wysiwyg/transaction.ts
View file

@ -57,7 +57,7 @@ const promiseTransaction = () => {
const doOperations = window.siyuan.transactions[0].doOperations;
const undoOperations = window.siyuan.transactions[0].undoOperations;
// 1. * ;2. * ;3. a
// 第一步请求没有返回前在 transaction 中会合并1、2步，此时第一步请求返回将被以下代码删除，在输入a时，就会出现 block not found，因此以下代码不能放入请求回掉中
// 第一步请求没有返回前在 transaction 中会合并1、2步，此时第一步请求返回将被以下代码删除，在输入a时，就会出现 block not found，因此以下代码不能放入请求回调中
window.siyuan.transactions.splice(0, 1);
fetchPost("/api/transactions", {
session: protyle.id,

2
kernel/go.sum
View file

@ -8,8 +8,6 @@ github.com/88250/go-sqlite3 v1.14.13-0.20220714142610-fbbda1ee84f5 h1:8HdZozCsXS
github.com/88250/go-sqlite3 v1.14.13-0.20220714142610-fbbda1ee84f5/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
github.com/88250/gulu v1.2.3-0.20230501031728-4d62370997cd h1:PgbmnoTqfVbYyhUljovnAz6l/oWPlbM1d5yrkVDHO1w=
github.com/88250/gulu v1.2.3-0.20230501031728-4d62370997cd/go.mod h1:pTWnjt+6qUqNnP9xltswsJxgCBVu3C7eW09u48LWX0k=
github.com/88250/lute v1.7.6-0.20230605111712-21754836ff70 h1:1cMGprniVmAG1+vUFOdrzaRRUNQQQN5v2RmEmrrIV/k=
github.com/88250/lute v1.7.6-0.20230605111712-21754836ff70/go.mod h1:+wUqx/1kdFDbWtxn9LYJlaCOAeol2pjSO6w+WJTVQsg=
github.com/88250/lute v1.7.6-0.20230608014232-e10343eb445d h1:D3HPp3lcibUYqq6hu/dPP6rx+To23VyE96eMBhwFoNg=
github.com/88250/lute v1.7.6-0.20230608014232-e10343eb445d/go.mod h1:+wUqx/1kdFDbWtxn9LYJlaCOAeol2pjSO6w+WJTVQsg=
github.com/88250/pdfcpu v0.3.14-0.20230401044135-c7369a99720c h1:Dl/8S9iLyPMTElnWIBxmjaLiWrkI5P4a21ivwAn5pU0=

5
kernel/util/runtime.go
View file

@ -38,8 +38,6 @@ import (
"github.com/siyuan-note/logging"
)
const DatabaseVer = "20220501" // 修改表结构的话需要修改这里
// IsUILoaded 是否已经加载了 UI。
var IsUILoaded = false
@ -65,6 +63,9 @@ var IsExiting = false
// MobileOSVer 移动端操作系统版本。
var MobileOSVer string
// DatabaseVer 数据库版本。修改表结构的话需要修改这里。
const DatabaseVer = "20220501"
func logBootInfo() {
plat := GetOSPlatform()
logging.LogInfof("kernel is booting:\n"+