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

.github/workflows/cd.yml

@@ -92,7 +92,7 @@ jobs:
     strategy:
       matrix:
         config:
-          - os: ubuntu-22.04
+          - os: ubuntu-20.04
             name: ubuntu build linux.AppImage
             kernel_path: "../app/kernel-linux/SiYuan-Kernel"
             build_args_prefix: "-s -w -X"
@@ -101,7 +101,7 @@ jobs:
             goos: "linux"
             goarch: "amd64"
             suffix: "linux.AppImage"
-          - os: ubuntu-22.04
+          - os: ubuntu-20.04
             name: ubuntu build linux.tar.gz
             kernel_path: "../app/kernel-linux/SiYuan-Kernel"
             build_args_prefix: "-s -w -X"

README.md

@@ -253,11 +253,11 @@ Template reference:
 ```
 Web UI: 6806
 Container Port: 6806
+Container Path: /home/siyuan
 Host path: /mnt/user/appdata/siyuan
-Container Path: /siyuan/workspace
 PUID: 1000
 PGID: 1000
-Publish parameters: --workspace=/siyuan/workspace/ --accessAuthCode=******(Access authorization code)
+Publish parameters: --accessAuthCode=******(Access authorization code)
 ```
 
 </details>

README_zh_CN.md

@@ -256,11 +256,11 @@ services:
 ```
 Web UI: 6806
 Container Port: 6806
+Container Path: /home/siyuan
 Host path: /mnt/user/appdata/siyuan
-Container Path: /siyuan/workspace
 PUID: 1000
 PGID: 1000
-Publish parameters: --workspace=/siyuan/workspace/ --accessAuthCode=******（访问授权码）
+Publish parameters: --accessAuthCode=******（访问授权码）
 ```
 
 </details>

app/src/mobile/settings/editor.ts

@@ -14,9 +14,9 @@ const setEditor = (modelMainElement: Element) => {
         dynamicLoadBlocks = 1024;
         (modelMainElement.querySelector("#dynamicLoadBlocks") as HTMLInputElement).value = "1024";
     }
-    window.siyuan.config.editor.markdown=  {
+    window.siyuan.config.editor.markdown = {
         inlineSup: (modelMainElement.querySelector("#editorMarkdownInlineSup") as HTMLInputElement).checked,
-            inlineSub: (modelMainElement.querySelector("#editorMarkdownInlineSub") as HTMLInputElement).checked,
+        inlineSub: (modelMainElement.querySelector("#editorMarkdownInlineSub") as HTMLInputElement).checked,
         inlineTag: (modelMainElement.querySelector("#editorMarkdownInlineTag") as HTMLInputElement).checked,
         inlineMath: (modelMainElement.querySelector("#editorMarkdownInlineMath") as HTMLInputElement).checked
     };

kernel/av/av.go

@@ -120,6 +120,16 @@ func NewKey(id, name, icon string, keyType KeyType) *Key {
 	}
 }
 
+func (k *Key) GetOption(name string) (ret *SelectOption) {
+	for _, option := range k.Options {
+		if option.Name == name {
+			ret = option
+			return
+		}
+	}
+	return
+}
+
 type Date struct {
 	AutoFillNow bool `json:"autoFillNow"` // 是否自动填充当前时间 The database date field supports filling the current time by default https://github.com/siyuan-note/siyuan/issues/10823
 }

kernel/model/attribute_view.go

@@ -2704,7 +2704,7 @@ func UpdateAttributeViewCell(tx *Transaction, avID, keyID, rowID, cellID string,
 		}
 
 		if nil == val {
-			val = &av.Value{ID: cellID, KeyID: keyValues.Key.ID, BlockID: rowID, Type: keyValues.Key.Type, CreatedAt: now, UpdatedAt: now}
+			val = &av.Value{ID: cellID, KeyID: keyID, BlockID: rowID, Type: keyValues.Key.Type, CreatedAt: now, UpdatedAt: now}
 			keyValues.Values = append(keyValues.Values, val)
 		}
 		break
@@ -2728,6 +2728,8 @@ func UpdateAttributeViewCell(tx *Transaction, avID, keyID, rowID, cellID string,
 		return
 	}
 
+	key, _ := attrView.GetKey(keyID)
+
 	if av.KeyTypeNumber == val.Type {
 		if nil != val.Number && !val.Number.IsNotEmpty {
 			val.Number.Content = 0
@@ -2738,6 +2740,20 @@ func UpdateAttributeViewCell(tx *Transaction, avID, keyID, rowID, cellID string,
 			val.Date.Content = 0
 			val.Date.FormattedContent = ""
 		}
+	} else if av.KeyTypeSelect == val.Type || av.KeyTypeMSelect == val.Type {
+		if nil != key && 0 < len(val.MSelect) {
+			// The selection options are inconsistent after pasting data into the database https://github.com/siyuan-note/siyuan/issues/11409
+			for _, valOpt := range val.MSelect {
+				if opt := key.GetOption(valOpt.Content); nil == opt {
+					// 不存在的选项新建保存
+					opt = &av.SelectOption{Name: valOpt.Content, Color: valOpt.Color}
+					key.Options = append(key.Options, opt)
+				} else {
+					// 已经存在的选项颜色需要保持不变
+					valOpt.Color = opt.Color
+				}
+			}
+		}
 	}
 
 	relationChangeMode := 0 // 0：不变（仅排序），1：增加，2：减少
@@ -2800,7 +2816,6 @@ func UpdateAttributeViewCell(tx *Transaction, avID, keyID, rowID, cellID string,
 	}
 	val.SetUpdatedAt(now)
 
-	key, _ := attrView.GetKey(val.KeyID)
 	if nil != key && av.KeyTypeRelation == key.Type && nil != key.Relation && key.Relation.IsTwoWay {
 		// 双向关联需要同时更新目标字段的值