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 2024-01-25 20:16:00 +08:00
commit d2de45e426
2 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
kernel/model/ai.go
View file

@ -48,6 +48,12 @@ func ChatGPTWithAction(ids []string, action string) (ret string) {
var cachedContextMsg []string
func chatGPT(msg string, cloud bool) (ret string) {
if "Clear context" == strings.TrimSpace(msg) {
// AI clear context action https://github.com/siyuan-note/siyuan/issues/10255
cachedContextMsg = nil
return
}
ret, retCtxMsgs, err := chatGPTContinueWrite(msg, cachedContextMsg, cloud)
if nil != err {
return
@ -58,6 +64,12 @@ func chatGPT(msg string, cloud bool) (ret string) {
func chatGPTWithAction(msg string, action string, cloud bool) (ret string) {
action = strings.TrimSpace(action)
if "Clear context" == action {
// AI clear context action https://github.com/siyuan-note/siyuan/issues/10255
cachedContextMsg = nil
return
}
if "" != action {
msg = action + ":\n\n" + msg
}

8
kernel/model/attribute_view.go
View file

@ -2432,6 +2432,14 @@ func UpdateAttributeViewCell(tx *Transaction, avID, keyID, rowID, cellID string,
if err = gulu.JSON.UnmarshalJSON(data, &val); nil != err {
return
}
if av.KeyTypeNumber == val.Type {
if nil != val.Number && !val.Number.IsNotEmpty {
// 删除内容为空值
val.Number.Content = 0
}
}
relationChangeMode := 0 // 0：不变（仅排序），1：增加，2：减少
if av.KeyTypeRelation == val.Type {
// 关联列得 content 是自动渲染的，所以不需要保存