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

This commit is contained in:
Vanessa 2023-12-13 22:14:17 +08:00
commit ccb43c4bf5
5 changed files with 7 additions and 4 deletions

View file

@ -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 .
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 .

View file

@ -9,7 +9,7 @@
<Identity Name="89C2A984.SiYuan"
ProcessorArchitecture="x64"
Publisher="CN=087C656E-C1D9-42D8-8807-CED45A74FC0F"
Version="2.11.1.0"/>
Version="2.11.2.0"/>
<Properties>
<DisplayName>SiYuan</DisplayName>
<PublisherDisplayName>云南链滴科技有限公司</PublisherDisplayName>

View file

@ -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",

View file

@ -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}

View file

@ -43,7 +43,7 @@ import (
var Mode = "prod"
const (
Ver = "2.11.1"
Ver = "2.11.2"
IsInsider = false
)