From c461bad99ae2cb9a0fd47250108a3807d10a11d6 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Wed, 13 Dec 2023 21:06:57 +0800 Subject: [PATCH 1/2] :bookmark: Release v2.11.2 --- .github/workflows/dockerimage.yml | 2 +- app/appx/AppxManifest.xml | 2 +- app/package.json | 2 +- kernel/util/working.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 68de0cabf..3a95d3632 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -49,4 +49,4 @@ jobs: - name: Build the Docker image run: | - docker buildx build --push --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v8 -t b3log/siyuan:latest -t b3log/siyuan:v2.11.1 . \ No newline at end of file + docker buildx build --push --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v8 -t b3log/siyuan:latest -t b3log/siyuan:v2.11.2 . \ No newline at end of file diff --git a/app/appx/AppxManifest.xml b/app/appx/AppxManifest.xml index 0250d4743..b63a60e2c 100644 --- a/app/appx/AppxManifest.xml +++ b/app/appx/AppxManifest.xml @@ -9,7 +9,7 @@ + Version="2.11.2.0"/> SiYuan 云南链滴科技有限公司 diff --git a/app/package.json b/app/package.json index d516a8ec2..682f5c1e9 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "SiYuan", - "version": "2.11.1", + "version": "2.11.2", "description": "Refactor your thinking", "homepage": "https://b3log.org/siyuan", "main": "./electron/main.js", diff --git a/kernel/util/working.go b/kernel/util/working.go index 28048705a..6a978e2ea 100644 --- a/kernel/util/working.go +++ b/kernel/util/working.go @@ -43,7 +43,7 @@ import ( var Mode = "prod" const ( - Ver = "2.11.1" + Ver = "2.11.2" IsInsider = false ) From 43e0beaeae8d7c10005ef2fadde47806773a3549 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Wed, 13 Dec 2023 21:38:36 +0800 Subject: [PATCH 2/2] :art: Improve add database table view --- kernel/model/attribute_view.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/kernel/model/attribute_view.go b/kernel/model/attribute_view.go index 8292808ba..1f46e93d5 100644 --- a/kernel/model/attribute_view.go +++ b/kernel/model/attribute_view.go @@ -785,6 +785,7 @@ func (tx *Transaction) doDuplicateAttrViewView(operation *Operation) (ret *TxErr } view.Table.PageSize = masterView.Table.PageSize + view.Table.RowIDs = masterView.Table.RowIDs if err = av.SaveAttributeView(attrView); nil != err { logging.LogErrorf("save attribute view [%s] failed: %s", avID, err) @@ -817,6 +818,8 @@ func (tx *Transaction) doAddAttrViewView(operation *Operation) (ret *TxErr) { view.Table.Columns = append(view.Table.Columns, &av.ViewTableColumn{ID: col.ID}) } + view.Table.RowIDs = firstView.Table.RowIDs + if err = av.SaveAttributeView(attrView); nil != err { logging.LogErrorf("save attribute view [%s] failed: %s", avID, err) return &TxErr{code: TxErrWriteAttributeView, msg: err.Error(), id: avID}