diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 7626ebfd4..f77f293c2 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -224,7 +224,7 @@ jobs: GOPATH: ${{ github.workspace }}/go GOARCH: ${{ matrix.config.goarch }} - - name: Building Electron + - name: Building Electron App run: pnpm run ${{ matrix.config.electron_args }} working-directory: ${{ github.workspace }}/go/src/github.com/${{ env.repo_owner }}/${{ env.repo_name }}/app diff --git a/kernel/av/filter.go b/kernel/av/filter.go index 01d91d4c6..5de906120 100644 --- a/kernel/av/filter.go +++ b/kernel/av/filter.go @@ -689,6 +689,13 @@ func (filter *ViewFilter) GetAffectValue(key *Key, defaultVal *Value) (ret *Valu return nil } + if FilterOperatorIsEmpty != filter.Operator && FilterOperatorIsNotEmpty != filter.Operator { + if filter.Value.IsEmpty() { + // 在不是过滤空值和非空值的情况下,空值不设置默认值 https://github.com/siyuan-note/siyuan/issues/11297 + return nil + } + } + ret = filter.Value.Clone() ret.CreatedAt = util.CurrentTimeMillis() ret.UpdatedAt = ret.CreatedAt + 1000 diff --git a/kernel/model/attribute_view.go b/kernel/model/attribute_view.go index 85f6b897a..be14292c4 100644 --- a/kernel/model/attribute_view.go +++ b/kernel/model/attribute_view.go @@ -2897,6 +2897,11 @@ func updateAttributeViewColumn(operation *Operation) (err error) { if keyValues.Key.ID == operation.ID { keyValues.Key.Name = strings.TrimSpace(operation.Name) keyValues.Key.Type = colType + + for _, value := range keyValues.Values { + value.Type = colType + } + break } } diff --git a/scripts/darwin-build.sh b/scripts/darwin-build.sh index bbbc921b8..d6dea75a9 100755 --- a/scripts/darwin-build.sh +++ b/scripts/darwin-build.sh @@ -27,9 +27,9 @@ export GOARCH=arm64 go build --tags fts5 -v -o "../app/kernel-darwin-arm64/SiYuan-Kernel" -ldflags "-s -w" . cd .. -echo 'Building Electron' +echo 'Building Electron App amd64' cd app pnpm run dist-darwin -echo 'Building Electron arm64' +echo 'Building Electron App arm64' pnpm run dist-darwin-arm64 cd .. diff --git a/scripts/linux-build.sh b/scripts/linux-build.sh index 3efe2a92f..307208ba2 100755 --- a/scripts/linux-build.sh +++ b/scripts/linux-build.sh @@ -22,7 +22,7 @@ export GOARCH=amd64 go build --tags fts5 -v -o "../app/kernel-linux/SiYuan-Kernel" -ldflags "-s -w" . cd .. -echo 'Building Electron' +echo 'Building Electron App' cd app pnpm run dist-linux cd .. diff --git a/scripts/win-build.bat b/scripts/win-build.bat index e153606d5..da942c6fd 100644 --- a/scripts/win-build.bat +++ b/scripts/win-build.bat @@ -35,7 +35,7 @@ if errorlevel 1 ( cd .. -echo 'Building Electron' +echo 'Building Electron App' cd app call pnpm run dist if errorlevel 1 (