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

app/appearance/langs/en_US.json

@@ -375,6 +375,7 @@
   "aiBrainStorm": "Brainstorm",
   "aiFixGrammarSpell": "Fix grammar, spelling and typos",
   "aiCustomAction": "Custom action...",
+  "aiWriting": "AI writing",
   "database": "Database",
   "manage": "Manage",
   "spaceRepetition": "Spaced Repetition",

app/appearance/langs/es_ES.json

@@ -135,7 +135,7 @@
   "unchecked": "desmarcado",
   "percentChecked": "Porcentaje comprobado",
   "percentUnchecked": "Porcentaje no marcado",
-  "checkbox": "Casilla de verificación",
+  "checkbox": "Caja",
   "unsplit": "Desdividir",
   "unsplitAll": "Desdividir Todo",
   "resetCardTip": "¿Estás seguro de restablecer ${x} tarjetas?",
@@ -375,6 +375,7 @@
   "aiBrainStorm": "Lluvia de ideas",
   "aiFixGrammarSpell": "Corregir gramática, ortografía y errores tipográficos.",
   "aiCustomAction": "Acción personalizada...",
+  "aiWriting": "Escritura de IA",
   "database": "Base de datos",
   "manage": "Administrar",
   "spaceRepetition": "Repetición Espaciada",

app/appearance/langs/fr_FR.json

@@ -135,7 +135,7 @@
   "unchecked": "Décoché",
   "percentChecked": "Pourcentage vérifié",
   "percentUnchecked": "Pourcentage non coché",
-  "checkbox": "case à cocher",
+  "checkbox": "Case à cocher",
   "unsplit": "Unsplit",
   "unsplitAll": "Tout dédiviser",
   "resetCardTip": "Êtes-vous sûr de réinitialiser ${x} flashcards ?",
@@ -375,6 +375,7 @@
   "aiBrainStorm": "Remue-méninges",
   "aiFixGrammarSpell": "Correction de la grammaire, de l'orthographe et des fautes de frappe",
   "aiCustomAction": "Action personnalisée...",
+  "aiWriting": "Écriture de l'IA",
   "database": "Base de données",
   "manage": "Gérer",
   "spaceRepetition": "Répétition espacée",

app/appearance/langs/ja_JP.json

@@ -375,6 +375,7 @@
   "aiBrainStorm": "ブレインストーミング",
   "aiFixGrammarSpell": "文法、スペル、誤字の修正",
   "aiCustomAction": "カスタムアクション...",
+  "aiWriting": "AIライティング",
   "database": "データベース",
   "manage": "管理",
   "spaceRepetition": "復習",

app/appearance/langs/zh_CHT.json

@@ -135,7 +135,7 @@
   "unchecked": "未完成",
   "percentChecked": "已完成佔比",
   "percentUnchecked": "未完成佔比",
-  "checkbox": "勾選方塊",
+  "checkbox": "複選框",
   "unsplit": "取消分割畫面",
   "unsplitAll": "取消全部分螢幕",
   "resetCardTip": "確定重設 ${x} 張閃卡？",
@@ -375,6 +375,7 @@
   "aiBrainStorm": "頭腦風暴",
   "aiFixGrammarSpell": "修正語法、拼寫和錯別字",
   "aiCustomAction": "自定義操作...",
+  "aiWriting": "AI 編寫",
   "database": "數據庫",
   "manage": "管理",
   "spaceRepetition": "間隔重複",

app/appearance/langs/zh_CN.json

@@ -135,7 +135,7 @@
   "unchecked": "未完成",
   "percentChecked": "已完成占比",
   "percentUnchecked": "未完成占比",
-  "checkbox": "勾选框",
+  "checkbox": "复选框",
   "unsplit": "取消分屏",
   "unsplitAll": "取消全部分屏",
   "resetCardTip": "确定重置 ${x} 张闪卡？",
@@ -375,6 +375,7 @@
   "aiBrainStorm": "头脑风暴",
   "aiFixGrammarSpell": "修正语法、拼写和错别字",
   "aiCustomAction": "自定义操作...",
+  "aiWriting": "AI 编写",
   "database": "数据库",
   "manage": "管理",
   "spaceRepetition": "间隔重复",

app/src/ai/chat.ts

@@ -5,7 +5,7 @@ import {fillContent} from "./actions";
 
 export const AIChat = (protyle: IProtyle, element: Element) => {
     const dialog = new Dialog({
-        title: "AI Chat",
+        title: "✨ " + window.siyuan.languages.aiWriting,
         content: `<div class="b3-dialog__content"><textarea class="b3-text-field fn__block"></textarea></div>
 <div class="b3-dialog__action">
     <button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button><div class="fn__space"></div>

app/src/mobile/util/keyboardToolbar.ts

@@ -213,7 +213,7 @@ const renderSlashMenu = (protyle: IProtyle, toolbarElement: Element) => {
     ${getSlashItem(Constants.ZWSP + 2, "iconImage", window.siyuan.languages.assets)}
     ${getSlashItem("((", "iconRef", window.siyuan.languages.ref, "true")}
     ${getSlashItem("{{", "iconSQL", window.siyuan.languages.blockEmbed, "true")}
-    ${getSlashItem(Constants.ZWSP + 5, "iconSparkles", "AI Chat")}
+    ${getSlashItem(Constants.ZWSP + 5, "iconSparkles", window.siyuan.languages.aiWriting)}
     ${getSlashItem('<div data-type="NodeAttributeView" data-av-type="table"></div>', "iconDatabase", window.siyuan.languages.database, "true")}
     ${getSlashItem(Constants.ZWSP + 4, "iconFile", window.siyuan.languages.newSubDocRef)}
 </div>

app/src/protyle/hint/extend.ts

@@ -43,9 +43,9 @@ export const hintSlash = (key: string, protyle: IProtyle) => {
         value: "{{",
         html: `<div class="b3-list-item__first"><svg class="b3-list-item__graphic"><use xlink:href="#iconSQL"></use></svg><span class="b3-list-item__text">${window.siyuan.languages.blockEmbed}</span><span class="b3-list-item__meta">{{</span></div>`,
     }, {
-        filter: ["ai chat"],
+        filter: ["人工智能", "ai", "rgzn"],
         value: Constants.ZWSP + 5,
-        html: '<div class="b3-list-item__first"><svg class="b3-list-item__graphic"><use xlink:href="#iconSparkles"></use></svg><span class="b3-list-item__text">AI Chat</span></div>',
+        html: `<div class="b3-list-item__first"><svg class="b3-list-item__graphic"><use xlink:href="#iconSparkles"></use></svg><span class="b3-list-item__text">${window.siyuan.languages.aiWriting}</span></div>`,
     }, {
         filter: ["数据库", "视图", "shujuku", "shitu", "sjk", "st", "database", "view", "db"],
         value: '<div data-type="NodeAttributeView" data-av-type="table"></div>',

kernel/model/attribute_view.go

@@ -651,7 +651,7 @@ func GetBlockAttributeViewKeys(blockID string) (ret []*BlockAttributeViewKeys) {
 		}
 
 		// 字段排序
-		refreshAttrViewKeyIDs(attrView)
+		refreshAttrViewKeyIDs(attrView, true)
 		sorts := map[string]int{}
 		for i, k := range attrView.KeyIDs {
 			sorts[k] = i
@@ -2533,7 +2533,7 @@ func SortAttributeViewKey(avID, keyID, previousKeyID string) (err error) {
 		return
 	}
 
-	refreshAttrViewKeyIDs(attrView)
+	refreshAttrViewKeyIDs(attrView, false)
 
 	var currentKeyID string
 	var idx, previousIndex int
@@ -2562,7 +2562,7 @@ func SortAttributeViewKey(avID, keyID, previousKeyID string) (err error) {
 	return
 }
 
-func refreshAttrViewKeyIDs(attrView *av.AttributeView) {
+func refreshAttrViewKeyIDs(attrView *av.AttributeView, needSave bool) {
 	// 订正 keyIDs 数据
 
 	existKeyIDs := map[string]bool{}
@@ -2583,6 +2583,10 @@ func refreshAttrViewKeyIDs(attrView *av.AttributeView) {
 		}
 	}
 	attrView.KeyIDs = tmp
+
+	if needSave {
+		av.SaveAttributeView(attrView)
+	}
 }
 
 func (tx *Transaction) doAddAttrViewColumn(operation *Operation) (ret *TxErr) {