From 5836c276c3331a1c28cf3ac68540f72ef51e3a1d Mon Sep 17 00:00:00 2001
From: Soltus <liaoshanyi@qq.com>
Date: Wed, 20 Mar 2024 17:08:37 +0800
Subject: [PATCH 01/77] node16 to node20

---
 .github/workflows/Codecov.yml         | 4 ++--
 .github/workflows/aci.yml             | 6 +++---
 .github/workflows/cd.yml              | 6 +++---
 .github/workflows/codeql.yml          | 2 +-
 .github/workflows/dockerimage.yml     | 2 +-
 app/package/.github/workflows/npm.yml | 6 +++---
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/Codecov.yml b/.github/workflows/Codecov.yml
index fe23c5e6bf..4958380f6b 100644
--- a/.github/workflows/Codecov.yml
+++ b/.github/workflows/Codecov.yml
@@ -12,12 +12,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository and submodules
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive
           path: ${{ github.workspace }}/go/src/github.com/Hi-Windom/Sillot
       - name: Set up Node 18
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 18
       - name: Install Node pnpm
diff --git a/.github/workflows/aci.yml b/.github/workflows/aci.yml
index 76f4bee7bc..1b2fdf325a 100644
--- a/.github/workflows/aci.yml
+++ b/.github/workflows/aci.yml
@@ -16,8 +16,8 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    # - uses: actions/checkout@v3
-    # - uses: actions/setup-node@v3
+    # - uses: actions/checkout@v4
+    # - uses: actions/setup-node@v4
     #   with:
     #       node-version: 16
     - name: Get Latest Release Assets
@@ -64,4 +64,4 @@ jobs:
           upload_url: ${{ steps.latest_release.outputs.result }}
           asset_path: ./Assets_SHA256_Sum.txt
           asset_name: Assets_SHA256_Sum.txt
-          asset_content_type: text/plain
\ No newline at end of file
+          asset_content_type: text/plain
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 879442561f..27d9541093 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -155,7 +155,7 @@ jobs:
         working-directory: ${{ github.workspace }}
 
       - name: Set up Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
           go-version: "1.21"
 
@@ -171,7 +171,7 @@ jobs:
           GOARCH: ${{ matrix.config.goarch }}
 
       - name: Set up Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 20
 
@@ -278,7 +278,7 @@ jobs:
           distribution: 'zulu'
           overwrite-settings: true
       - name: Setup Android SDK
-        uses: android-actions/setup-android@v2
+        uses: android-actions/setup-android@v3.2.0
       - name: Install Android NDK
         uses: nttld/setup-ndk@v1
         with:
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 52caaa8642..4eccacc712 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -48,7 +48,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml
index aac64546a0..768392b96a 100644
--- a/.github/workflows/dockerimage.yml
+++ b/.github/workflows/dockerimage.yml
@@ -36,7 +36,7 @@ jobs:
           swap-storage: true
 
       - name: Checkout repository and submodules
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: dev
           submodules: recursive
diff --git a/app/package/.github/workflows/npm.yml b/app/package/.github/workflows/npm.yml
index 15830a23d6..ccb1fb72b0 100644
--- a/app/package/.github/workflows/npm.yml
+++ b/app/package/.github/workflows/npm.yml
@@ -10,9 +10,9 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       # Setup .npmrc file to publish to npm
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version: '18.x'
           registry-url: 'https://registry.npmjs.org'
@@ -20,4 +20,4 @@ jobs:
       - run: npm ci
       - run: npm publish --access public
         env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
\ No newline at end of file
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

From 2d52dbfd1c5e977c91d4d13f6d72b8c7cc35a8c5 Mon Sep 17 00:00:00 2001
From: Vanessa <lly219@gmail.com>
Date: Wed, 20 Mar 2024 21:50:03 +0800
Subject: [PATCH 02/77] :art: fix
 https://github.com/siyuan-note/siyuan/issues/10669

---
 app/appearance/langs/en_US.json  |  8 --------
 app/appearance/langs/es_ES.json  |  8 --------
 app/appearance/langs/fr_FR.json  |  8 --------
 app/appearance/langs/zh_CHT.json |  8 --------
 app/appearance/langs/zh_CN.json  |  8 --------
 app/electron/main.js             |  6 ++----
 app/src/ai/actions.ts            | 26 +-------------------------
 app/src/block/popover.ts         |  2 +-
 8 files changed, 4 insertions(+), 70 deletions(-)

diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json
index 186779fadd..388d1cf1f9 100644
--- a/app/appearance/langs/en_US.json
+++ b/app/appearance/langs/en_US.json
@@ -313,14 +313,6 @@
   "aiContinueWrite": "Continue writing",
   "aiTranslate": "Translate",
   "aiExtractSummary": "Extract summary",
-  "aiTranslate_zh_Hans": "Simplified Chinese",
-  "aiTranslate_zh_Hant": "Traditional Chinese",
-  "aiTranslate_ja_JP": "Japanese",
-  "aiTranslate_ko_KR": "Korean",
-  "aiTranslate_en_US": "English",
-  "aiTranslate_es_ES": "Spanish",
-  "aiTranslate_fr_FR": "French",
-  "aiTranslate_de_DE": "German",
   "aiBrainStorm": "Brainstorm",
   "aiFixGrammarSpell": "Fix grammar, spelling and typos",
   "aiCustomAction": "Custom action...",
diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json
index be488258ea..77d30ee697 100644
--- a/app/appearance/langs/es_ES.json
+++ b/app/appearance/langs/es_ES.json
@@ -313,14 +313,6 @@
   "aiContinueWrite": "Continuar escribiendo",
   "aiTranslate": "Traducir",
   "aiExtractSummary": "Extraer resumen",
-  "aiTranslate_zh_Hans": "Chino simplificado",
-  "aiTranslate_zh_Hant": "Chino tradicional",
-  "aiTranslate_ja_JP": "Japonés",
-  "aiTranslate_ko_KR": "Coreano",
-  "aiTranslate_en_US": "Inglés",
-  "aiTranslate_es_ES": "Español",
-  "aiTranslate_fr_FR": "Francés",
-  "aiTranslate_de_DE": "Alemán",
   "aiBrainStorm": "Lluvia de ideas",
   "aiFixGrammarSpell": "Corregir gramática, ortografía y errores tipográficos.",
   "aiCustomAction": "Acción personalizada...",
diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json
index 58a7db0cc9..e3d2ab430d 100644
--- a/app/appearance/langs/fr_FR.json
+++ b/app/appearance/langs/fr_FR.json
@@ -313,14 +313,6 @@
   "aiContinueWrite": "Continuer à écrire",
   "aiTranslate": "Traduire",
   "aiExtractSummary": "Résumé de l'extrait",
-  "aiTranslate_zh_Hans": "Chinois simplifié",
-  "aiTranslate_zh_Hant": "chinois traditionnel",
-  "aiTranslate_ja_JP": "Japonais",
-  "aiTranslate_ko_KR": "Coréen",
-  "aiTranslate_en_US": "Anglais",
-  "aiTranslate_es_ES": "Espagnol",
-  "aiTranslate_fr_FR": "Français",
-  "aiTranslate_de_DE": "Allemand",
   "aiBrainStorm": "Remue-méninges",
   "aiFixGrammarSpell": "Correction de la grammaire, de l'orthographe et des fautes de frappe",
   "aiCustomAction": "Action personnalisée...",
diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json
index 49ecd50325..3b8e5985e0 100644
--- a/app/appearance/langs/zh_CHT.json
+++ b/app/appearance/langs/zh_CHT.json
@@ -313,14 +313,6 @@
   "aiContinueWrite": "續寫",
   "aiTranslate": "翻譯",
   "aiExtractSummary": "提取摘要",
-  "aiTranslate_zh_Hans": "簡體中文",
-  "aiTranslate_zh_Hant": "繁體中文",
-  "aiTranslate_ja_JP": "日文",
-  "aiTranslate_ko_KR": "韓文",
-  "aiTranslate_en_US": "英文",
-  "aiTranslate_es_ES": "西班牙文",
-  "aiTranslate_fr_FR": "法文",
-  "aiTranslate_de_DE": "德文",
   "aiBrainStorm": "頭腦風暴",
   "aiFixGrammarSpell": "修正語法、拼寫和錯別字",
   "aiCustomAction": "自定義操作...",
diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json
index 137d648080..0ca4c0db9e 100644
--- a/app/appearance/langs/zh_CN.json
+++ b/app/appearance/langs/zh_CN.json
@@ -313,14 +313,6 @@
   "aiContinueWrite": "续写",
   "aiTranslate": "翻译",
   "aiExtractSummary": "提取摘要",
-  "aiTranslate_zh_Hans": "简体中文",
-  "aiTranslate_zh_Hant": "繁体中文",
-  "aiTranslate_ja_JP": "日文",
-  "aiTranslate_ko_KR": "韩文",
-  "aiTranslate_en_US": "英文",
-  "aiTranslate_es_ES": "西班牙文",
-  "aiTranslate_fr_FR": "法文",
-  "aiTranslate_de_DE": "德文",
   "aiBrainStorm": "头脑风暴",
   "aiFixGrammarSpell": "修正语法、拼写和错别字",
   "aiCustomAction": "自定义操作...",
diff --git a/app/electron/main.js b/app/electron/main.js
index 63a150449d..a815dd0b71 100644
--- a/app/electron/main.js
+++ b/app/electron/main.js
@@ -861,14 +861,12 @@ app.whenReady().then(() => {
     ipcMain.on("siyuan-export-newwindow", (event, data) => {
         const parentWnd = getWindowByContentId(event.sender.id);
         // The PDF/Word export preview window automatically adjusts according to the size of the main window https://github.com/siyuan-note/siyuan/issues/10554
-        const width = parentWnd.getBounds().width * 0.8;
-        const height = parentWnd.getBounds().height * 0.8;
         const printWin = new BrowserWindow({
             parent: parentWnd,
             modal: false,
             show: true,
-            width: width,
-            height: height,
+            width: Math.floor(parentWnd.getBounds().width * 0.8),
+            height: Math.floor(parentWnd.getBounds().height * 0.8),
             resizable: false,
             frame: "darwin" === process.platform,
             icon: path.join(appDir, "stage", "icon-large.png"),
diff --git a/app/src/ai/actions.ts b/app/src/ai/actions.ts
index 56fc1bd9d4..0dc904ccc4 100644
--- a/app/src/ai/actions.ts
+++ b/app/src/ai/actions.ts
@@ -185,31 +185,6 @@ export const AIActions = (elements: Element[], protyle: IProtyle) => {
             ${window.siyuan.languages.aiContinueWrite}
         </div>
         <div class="b3-menu__separator"></div>
-        <div class="b3-list-item b3-list-item--narrow" data-action="Translate as follows to [zh-Hans]">
-            ${window.siyuan.languages.aiTranslate_zh_Hans}
-        </div>
-        <div class="b3-list-item b3-list-item--narrow" data-action="Translate as follows to [zh-Hant]">
-            ${window.siyuan.languages.aiTranslate_zh_Hant}
-        </div>
-        <div class="b3-list-item b3-list-item--narrow" data-action="Translate as follows to [ja-JP]">
-            ${window.siyuan.languages.aiTranslate_ja_JP}
-        </div>
-        <div class="b3-list-item b3-list-item--narrow" data-action="Translate as follows to [ko-KR]">
-            ${window.siyuan.languages.aiTranslate_ko_KR}
-        </div>
-        <div class="b3-list-item b3-list-item--narrow" data-action="Translate as follows to [en-US]">
-            ${window.siyuan.languages.aiTranslate_en_US}
-        </div>
-        <div class="b3-list-item b3-list-item--narrow" data-action="Translate as follows to [es-ES]">
-            ${window.siyuan.languages.aiTranslate_es_ES}
-        </div>
-        <div class="b3-list-item b3-list-item--narrow" data-action="Translate as follows to [fr-FR]">
-            ${window.siyuan.languages.aiTranslate_fr_FR}
-        </div>
-        <div class="b3-list-item b3-list-item--narrow" data-action="Translate as follows to [de-DE]">
-            ${window.siyuan.languages.aiTranslate_de_DE}
-        </div>
-        <div class="b3-menu__separator"></div>
         <div class="b3-list-item b3-list-item--narrow" data-action="${window.siyuan.languages.aiExtractSummary}">
             ${window.siyuan.languages.aiExtractSummary}
         </div>
@@ -222,6 +197,7 @@ export const AIActions = (elements: Element[], protyle: IProtyle) => {
         <div class="b3-list-item b3-list-item--narrow" data-action="Clear context">
             ${window.siyuan.languages.clearContext}
         </div>
+        <div class="b3-menu__separator"></div>
         <div class="b3-list-item b3-list-item--narrow" data-type="custom">
             ${window.siyuan.languages.aiCustomAction}
         </div>
diff --git a/app/src/block/popover.ts b/app/src/block/popover.ts
index 48c725a8f0..a32c0f404a 100644
--- a/app/src/block/popover.ts
+++ b/app/src/block/popover.ts
@@ -17,7 +17,7 @@ export const initBlockPopover = (app: App) => {
     let timeoutHide: number;
     // 编辑器内容块引用/backlinks/tag/bookmark/套娃中使用
     document.addEventListener("mouseover", (event: MouseEvent & { target: HTMLElement, path: HTMLElement[] }) => {
-        if (!window.siyuan.config) {
+        if (!window.siyuan.config || !window.siyuan.menus) {
             return;
         }
         const aElement = hasClosestByAttribute(event.target, "data-type", "a", true) ||

From 34e46eee0b114c8fe074d909e0f0f7497fdc7768 Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Wed, 20 Mar 2024 22:30:09 +0800
Subject: [PATCH 03/77] :art: Clean code

---
 kernel/av/value.go | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/kernel/av/value.go b/kernel/av/value.go
index 4b8b289fa2..6e80d1ec07 100644
--- a/kernel/av/value.go
+++ b/kernel/av/value.go
@@ -205,10 +205,6 @@ func (value *Value) IsEdited() bool {
 	return value.CreatedAt != value.UpdatedAt
 }
 
-func (value *Value) IsGenerated() bool {
-	return KeyTypeUpdated == value.Type || KeyTypeCreated == value.Type
-}
-
 func (value *Value) IsEmpty() bool {
 	switch value.Type {
 	case KeyTypeBlock:

From fd1f283b2f963dbbfe6c1ce7ee94b1466addd746 Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Wed, 20 Mar 2024 22:30:21 +0800
Subject: [PATCH 04/77] :art: Duplicate relation values in the Attribute Panel
 - Database Fix https://github.com/siyuan-note/siyuan/issues/10670

---
 kernel/model/attribute_view.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kernel/model/attribute_view.go b/kernel/model/attribute_view.go
index 42b55b75ba..9108317e4f 100644
--- a/kernel/model/attribute_view.go
+++ b/kernel/model/attribute_view.go
@@ -367,6 +367,7 @@ func GetBlockAttributeViewKeys(blockID string) (ret []*BlockAttributeViewKeys) {
 				for _, blockValue := range destAv.GetBlockKeyValues().Values {
 					blocks[blockValue.BlockID] = blockValue
 				}
+				kv.Values[0].Relation.Contents = nil // 先清空 https://github.com/siyuan-note/siyuan/issues/10670
 				for _, bID := range kv.Values[0].Relation.BlockIDs {
 					kv.Values[0].Relation.Contents = append(kv.Values[0].Relation.Contents, blocks[bID])
 				}

From 80decafb73a44c89a566b80042d7e450c97b9f29 Mon Sep 17 00:00:00 2001
From: Vanessa <lly219@gmail.com>
Date: Wed, 20 Mar 2024 22:52:04 +0800
Subject: [PATCH 05/77] :art:
 https://github.com/siyuan-note/siyuan/issues/10666

---
 app/src/asset/anno.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/src/asset/anno.ts b/app/src/asset/anno.ts
index b22df4f40a..f3b2d1204f 100644
--- a/app/src/asset/anno.ts
+++ b/app/src/asset/anno.ts
@@ -1,7 +1,6 @@
 import {fetchPost} from "../util/fetch";
 import {setPosition} from "../util/setPosition";
 import {hasClosestByAttribute, hasClosestByClassName} from "../protyle/util/hasClosest";
-import * as dayjs from "dayjs";
 import {setStorageVal, writeText} from "../protyle/util/compatibility";
 import {getAllModels} from "../layout/getAll";
 import {focusByRange} from "../protyle/util/selection";
@@ -531,8 +530,7 @@ const getHightlightCoordsByRect = (pdf: any, color: string, rectResizeElement: H
         }];
 
     const id = Lute.NewNodeID();
-    const content = pdf.appConfig.file.replace(location.origin, "").substr(8).replace(/-\d{14}-\w{7}.pdf$/, "") +
-        `-P${startPage.id}-${dayjs().format("YYYYMMDDHHmmss")}`;
+    const content = `${pdf.appConfig.file.replace(location.origin, "").substr(8).replace(/-\d{14}-\w{7}.pdf$/, "")}-P${startPage.id}-${id}`;
     const result = [{
         index: startPage.id - 1,
         coords: [startSelected],

From b9b14365728f35b23e77d5c0b26b564cb07c55d7 Mon Sep 17 00:00:00 2001
From: Vanessa <lly219@gmail.com>
Date: Wed, 20 Mar 2024 22:53:10 +0800
Subject: [PATCH 06/77] :art:
 https://github.com/siyuan-note/siyuan/issues/10666

---
 app/src/asset/anno.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/asset/anno.ts b/app/src/asset/anno.ts
index f3b2d1204f..33c3c841b6 100644
--- a/app/src/asset/anno.ts
+++ b/app/src/asset/anno.ts
@@ -719,6 +719,7 @@ const copyAnno = (idPath: string, fileName: string, pdf: any) => {
                     const formData = new FormData();
                     const imageName = content + ".png";
                     formData.append("file[]", blob, imageName);
+                    formData.append("skipIfDuplicated", "true");
                     fetchPost(Constants.UPLOAD_ADDRESS, formData, (response) => {
                         writeText(`<<${idPath} "${content}">>
 ![](${response.data.succMap[imageName]})`);

From 580209b165b556337d23a511872ee9ad74914554 Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Wed, 20 Mar 2024 23:18:32 +0800
Subject: [PATCH 07/77] :art:
 https://github.com/siyuan-note/siyuan/issues/10666

---
 kernel/model/upload.go | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/kernel/model/upload.go b/kernel/model/upload.go
index 405dd4170b..acd2291b2e 100644
--- a/kernel/model/upload.go
+++ b/kernel/model/upload.go
@@ -147,6 +147,11 @@ func Upload(c *gin.Context) {
 	var errFiles []string
 	succMap := map[string]interface{}{}
 	files := form.File["file[]"]
+	skipIfDuplicated := false // 默认不跳过重复文件，但是有的场景需要跳过，比如上传 PDF 标注图片 https://github.com/siyuan-note/siyuan/issues/10666
+	if nil != form.Value["skipIfDuplicated"] {
+		skipIfDuplicated = "true" == form.Value["skipIfDuplicated"][0]
+	}
+
 	for _, file := range files {
 		baseName := file.Filename
 
@@ -182,6 +187,20 @@ func Upload(c *gin.Context) {
 			// 已经存在同样数据的资源文件的话不重复保存
 			succMap[baseName] = existAsset.Path
 		} else {
+			if skipIfDuplicated {
+				matches, globErr := filepath.Glob(assetsDirPath + string(os.PathSeparator) + strings.TrimSuffix(fName, ext) + "*")
+				if nil != globErr {
+					logging.LogErrorf("glob failed: %s", globErr)
+				} else {
+					if 0 < len(matches) {
+						fName = filepath.Base(matches[0])
+						succMap[baseName] = strings.TrimPrefix(path.Join(relAssetsDirPath, fName), "/")
+						f.Close()
+						break
+					}
+				}
+			}
+
 			fName = util.AssetName(fName)
 			writePath := filepath.Join(assetsDirPath, fName)
 			tmpDir := filepath.Join(util.TempDir, "convert", "zip", gulu.Rand.String(7))

From d522a74654530f8730f087d0ce26792284f49e0e Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Wed, 20 Mar 2024 23:21:26 +0800
Subject: [PATCH 08/77] :art:
 https://github.com/siyuan-note/siyuan/issues/10666

---
 kernel/model/upload.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kernel/model/upload.go b/kernel/model/upload.go
index acd2291b2e..ad57efe60b 100644
--- a/kernel/model/upload.go
+++ b/kernel/model/upload.go
@@ -188,6 +188,7 @@ func Upload(c *gin.Context) {
 			succMap[baseName] = existAsset.Path
 		} else {
 			if skipIfDuplicated {
+				// https://github.com/siyuan-note/siyuan/issues/10666
 				matches, globErr := filepath.Glob(assetsDirPath + string(os.PathSeparator) + strings.TrimSuffix(fName, ext) + "*")
 				if nil != globErr {
 					logging.LogErrorf("glob failed: %s", globErr)

From 30d95605df9acbd36a6d229d69e26b56c96fd650 Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Thu, 21 Mar 2024 10:03:08 +0800
Subject: [PATCH 09/77] :art: Database select field supports sorting by option
 order Fix https://github.com/siyuan-note/siyuan/issues/10665

---
 kernel/av/sort.go              | 33 ++++++++++++++++++++++++---------
 kernel/av/table.go             |  4 ++--
 kernel/model/attribute_view.go |  4 ++--
 kernel/model/export.go         |  4 ++--
 4 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/kernel/av/sort.go b/kernel/av/sort.go
index ade93d63f9..681ea7fc7d 100644
--- a/kernel/av/sort.go
+++ b/kernel/av/sort.go
@@ -25,7 +25,7 @@ import (
 )
 
 type Sortable interface {
-	SortRows()
+	SortRows(attrView *AttributeView)
 }
 
 type ViewSort struct {
@@ -40,7 +40,7 @@ const (
 	SortOrderDesc SortOrder = "DESC"
 )
 
-func (value *Value) Compare(other *Value) int {
+func (value *Value) Compare(other *Value, attrView *AttributeView) int {
 	switch value.Type {
 	case KeyTypeBlock:
 		if nil != value.Block && nil != other.Block {
@@ -112,14 +112,29 @@ func (value *Value) Compare(other *Value) int {
 			return 0
 		}
 	case KeyTypeSelect, KeyTypeMSelect:
-		if nil != value.MSelect && nil != other.MSelect {
-			var v1 string
-			for _, v := range value.MSelect {
-				v1 += v.Content
+		if 0 < len(value.MSelect) && 0 < len(other.MSelect) {
+			v1 := value.MSelect[0].Content
+			v2 := other.MSelect[0].Content
+			if v1 == v2 {
+				return 0
 			}
-			var v2 string
-			for _, v := range other.MSelect {
-				v2 += v.Content
+
+			key, _ := attrView.GetKey(value.KeyID)
+			if nil != key {
+				optionSort := map[string]int{}
+				for i, op := range key.Options {
+					optionSort[op.Name] = i
+				}
+
+				v1Sort := optionSort[v1]
+				v2Sort := optionSort[v2]
+				if v1Sort > v2Sort {
+					return 1
+				}
+				if v1Sort < v2Sort {
+					return -1
+				}
+				return 0
 			}
 			return strings.Compare(v1, v2)
 		}
diff --git a/kernel/av/table.go b/kernel/av/table.go
index 1a57055dc9..0930b01eb9 100644
--- a/kernel/av/table.go
+++ b/kernel/av/table.go
@@ -153,7 +153,7 @@ func (table *Table) GetID() string {
 	return table.ID
 }
 
-func (table *Table) SortRows() {
+func (table *Table) SortRows(attrView *AttributeView) {
 	if 1 > len(table.Sorts) {
 		return
 	}
@@ -220,7 +220,7 @@ func (table *Table) SortRows() {
 				return colIndexSort.Order != SortOrderAsc
 			}
 
-			result := val1.Compare(val2)
+			result := val1.Compare(val2, attrView)
 			if 0 == result {
 				sorted = false
 				continue
diff --git a/kernel/model/attribute_view.go b/kernel/model/attribute_view.go
index 9108317e4f..cd52a232d2 100644
--- a/kernel/model/attribute_view.go
+++ b/kernel/model/attribute_view.go
@@ -724,7 +724,7 @@ func renderAttributeView(attrView *av.AttributeView, viewID, query string, page,
 	}
 
 	viewable.FilterRows(attrView)
-	viewable.SortRows()
+	viewable.SortRows(attrView)
 	viewable.CalcCols()
 
 	// 分页
@@ -2010,7 +2010,7 @@ func addAttributeViewBlock(avID, blockID, previousBlockID, addingBlockID string,
 	if nil != view && 0 < len(view.Table.Filters) && !ignoreFillFilter {
 		viewable, _ := renderAttributeViewTable(attrView, view, "")
 		viewable.FilterRows(attrView)
-		viewable.SortRows()
+		viewable.SortRows(attrView)
 
 		var nearRow *av.TableRow
 		if 0 < len(viewable.Rows) {
diff --git a/kernel/model/export.go b/kernel/model/export.go
index b3cfb4dbc6..eba5ee4ec6 100644
--- a/kernel/model/export.go
+++ b/kernel/model/export.go
@@ -87,7 +87,7 @@ func ExportAv2CSV(avID, blockID string) (zipPath string, err error) {
 
 	// 遵循视图过滤和排序规则 Use filtering and sorting of current view settings when exporting database blocks https://github.com/siyuan-note/siyuan/issues/10474
 	table.FilterRows(attrView)
-	table.SortRows()
+	table.SortRows(attrView)
 
 	exportFolder := filepath.Join(util.TempDir, "export", "csv", name)
 	if err = os.MkdirAll(exportFolder, 0755); nil != err {
@@ -2284,7 +2284,7 @@ func exportTree(tree *parse.Tree, wysiwyg, expandKaTexMacros, keepFold bool,
 
 		// 遵循视图过滤和排序规则 Use filtering and sorting of current view settings when exporting database blocks https://github.com/siyuan-note/siyuan/issues/10474
 		table.FilterRows(attrView)
-		table.SortRows()
+		table.SortRows(attrView)
 
 		var aligns []int
 		for range table.Columns {

From 0606ee127e6b19a8037d487a21e42da9b2cb78ca Mon Sep 17 00:00:00 2001
From: Vanessa <lly219@gmail.com>
Date: Thu, 21 Mar 2024 10:14:18 +0800
Subject: [PATCH 10/77] :art: fix
 https://github.com/siyuan-note/siyuan/issues/10674

---
 app/src/plugin/loader.ts         |  4 ++--
 app/src/protyle/wysiwyg/index.ts | 13 ++++++++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/app/src/plugin/loader.ts b/app/src/plugin/loader.ts
index 7c0d3c1002..b5c77ddc2d 100644
--- a/app/src/plugin/loader.ts
+++ b/app/src/plugin/loader.ts
@@ -158,7 +158,7 @@ const mergePluginHotkey = (plugin: Plugin) => {
             }
             window.siyuan.config.keymap.plugin[plugin.name][dockKey]["default"] = dock.config.hotkey;
         }
-    })
+    });
 };
 
 export const afterLoadPlugin = (plugin: Plugin) => {
@@ -222,7 +222,7 @@ export const afterLoadPlugin = (plugin: Plugin) => {
     });
     Object.keys(plugin.docks).forEach(key => {
         const dock = plugin.docks[key];
-        const hotkey = window.siyuan.config.keymap.plugin[plugin.name][key].custom
+        const hotkey = window.siyuan.config.keymap.plugin[plugin.name][key].custom;
         if (dock.config.position.startsWith("Left")) {
             window.siyuan.layout.leftDock.genButton([{
                 type: key,
diff --git a/app/src/protyle/wysiwyg/index.ts b/app/src/protyle/wysiwyg/index.ts
index 4d6856e68e..6d062429d5 100644
--- a/app/src/protyle/wysiwyg/index.ts
+++ b/app/src/protyle/wysiwyg/index.ts
@@ -875,11 +875,17 @@ export class WYSIWYG {
                     return;
                 }
                 let firstBlockElement = hasClosestBlock(firstElement);
+                if (!firstBlockElement && firstElement.classList.contains("protyle-breadcrumb__bar")) {
+                    firstBlockElement = firstElement.nextElementSibling as HTMLElement;
+                }
                 if (moveEvent.clientY > y) {
                     if (!startFirstElement) {
                         // 向上选择导致滚动条滚动到顶部再向下选择至 > y 时，firstBlockElement 为 undefined https://ld246.com/article/1705233964097
                         if (!firstBlockElement) {
                             firstBlockElement = protyle.wysiwyg.element.firstElementChild as HTMLElement;
+                            if (firstBlockElement.classList.contains("protyle-breadcrumb__bar")) {
+                                firstBlockElement = firstBlockElement.nextElementSibling as HTMLElement;
+                            }
                         }
                         startFirstElement = firstBlockElement;
                     }
@@ -887,6 +893,9 @@ export class WYSIWYG {
                     // https://github.com/siyuan-note/siyuan/issues/7580
                     moveEvent.clientY < protyle.wysiwyg.element.lastElementChild.getBoundingClientRect().bottom) {
                     firstBlockElement = protyle.wysiwyg.element.firstElementChild as HTMLElement;
+                    if (firstBlockElement.classList.contains("protyle-breadcrumb__bar")) {
+                        firstBlockElement = firstBlockElement.nextElementSibling as HTMLElement;
+                    }
                 }
                 let selectElements: Element[] = [];
                 let currentElement: Element | boolean = firstBlockElement;
@@ -915,7 +924,9 @@ export class WYSIWYG {
                                     hasJump = true;
                                 }
                             } else {
-                                selectElements.push(currentElement);
+                                if (!currentElement.classList.contains("protyle-breadcrumb__bar")) {
+                                    selectElements.push(currentElement);
+                                }
                                 currentElement = currentElement.nextElementSibling;
                             }
                         } else if (currentElement.parentElement.classList.contains("sb")) {

From c45e80b9e01a9d53132d952a9825c26ff3284494 Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Thu, 21 Mar 2024 10:32:16 +0800
Subject: [PATCH 11/77] :art: One-click upgrade of downloaded marketplace
 packages https://github.com/siyuan-note/siyuan/issues/8390

---
 kernel/api/bazaar.go   | 20 ++++++++++++++++++++
 kernel/api/router.go   |  1 +
 kernel/model/bazzar.go |  9 +++++++++
 3 files changed, 30 insertions(+)

diff --git a/kernel/api/bazaar.go b/kernel/api/bazaar.go
index 53e1bf9446..e05ad04dd7 100644
--- a/kernel/api/bazaar.go
+++ b/kernel/api/bazaar.go
@@ -25,6 +25,26 @@ import (
 	"github.com/siyuan-note/siyuan/kernel/util"
 )
 
+func getBazaarPackages(c *gin.Context) {
+	ret := gulu.Ret.NewResult()
+	defer c.JSON(http.StatusOK, ret)
+
+	arg, ok := util.JsonArg(c, ret)
+	if !ok {
+		return
+	}
+
+	frontend := arg["frontend"].(string)
+	plugins, widgets, icons, themes, templates := model.BazaarPackages(frontend)
+	ret.Data = map[string]interface{}{
+		"plugins":   plugins,
+		"widgets":   widgets,
+		"icons":     icons,
+		"themes":    themes,
+		"templates": templates,
+	}
+}
+
 func getBazaarPackageREAME(c *gin.Context) {
 	ret := gulu.Ret.NewResult()
 	defer c.JSON(http.StatusOK, ret)
diff --git a/kernel/api/router.go b/kernel/api/router.go
index 6af5564d56..fc6e51ee20 100644
--- a/kernel/api/router.go
+++ b/kernel/api/router.go
@@ -330,6 +330,7 @@ func ServeAPI(ginServer *gin.Engine) {
 	ginServer.Handle("POST", "/api/graph/getGraph", model.CheckAuth, getGraph)
 	ginServer.Handle("POST", "/api/graph/getLocalGraph", model.CheckAuth, getLocalGraph)
 
+	ginServer.Handle("POST", "/api/bazaar/getBazaarPackages", model.CheckAuth, getBazaarPackages)
 	ginServer.Handle("POST", "/api/bazaar/getBazaarPlugin", model.CheckAuth, getBazaarPlugin)
 	ginServer.Handle("POST", "/api/bazaar/getInstalledPlugin", model.CheckAuth, getInstalledPlugin)
 	ginServer.Handle("POST", "/api/bazaar/installBazaarPlugin", model.CheckAuth, model.CheckReadonly, installBazaarPlugin)
diff --git a/kernel/model/bazzar.go b/kernel/model/bazzar.go
index a531f9a27e..a01c3a36e9 100644
--- a/kernel/model/bazzar.go
+++ b/kernel/model/bazzar.go
@@ -29,6 +29,15 @@ import (
 	"github.com/siyuan-note/siyuan/kernel/bazaar"
 )
 
+func BazaarPackages(frontend string) (plugins []*bazaar.Plugin, widgets []*bazaar.Widget, icons []*bazaar.Icon, themes []*bazaar.Theme, templates []*bazaar.Template) {
+	plugins = BazaarPlugins(frontend, "")
+	widgets = BazaarWidgets("")
+	icons = BazaarIcons("")
+	themes = BazaarThemes("")
+	templates = BazaarTemplates("")
+	return
+}
+
 func GetPackageREADME(repoURL, repoHash, packageType string) (ret string) {
 	ret = bazaar.GetPackageREADME(repoURL, repoHash, packageType)
 	return

From 00d015aeadb508fb59ac52cc01ca565a22c05748 Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Thu, 21 Mar 2024 10:44:34 +0800
Subject: [PATCH 12/77] :art: One-click upgrade of downloaded marketplace
 packages https://github.com/siyuan-note/siyuan/issues/8390

---
 kernel/model/bazzar.go | 34 +++++++++++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/kernel/model/bazzar.go b/kernel/model/bazzar.go
index a01c3a36e9..f53e42e4fb 100644
--- a/kernel/model/bazzar.go
+++ b/kernel/model/bazzar.go
@@ -22,6 +22,7 @@ import (
 	"path"
 	"path/filepath"
 	"strings"
+	"sync"
 
 	"github.com/88250/gulu"
 	"github.com/siyuan-note/siyuan/kernel/util"
@@ -30,11 +31,34 @@ import (
 )
 
 func BazaarPackages(frontend string) (plugins []*bazaar.Plugin, widgets []*bazaar.Widget, icons []*bazaar.Icon, themes []*bazaar.Theme, templates []*bazaar.Template) {
-	plugins = BazaarPlugins(frontend, "")
-	widgets = BazaarWidgets("")
-	icons = BazaarIcons("")
-	themes = BazaarThemes("")
-	templates = BazaarTemplates("")
+	wg := &sync.WaitGroup{}
+	wg.Add(5)
+	go func() {
+		defer wg.Done()
+		plugins = InstalledPlugins(frontend, "")
+	}()
+
+	go func() {
+		defer wg.Done()
+		widgets = InstalledWidgets("")
+	}()
+
+	go func() {
+		defer wg.Done()
+		icons = InstalledIcons("")
+	}()
+
+	go func() {
+		defer wg.Done()
+		themes = InstalledThemes("")
+	}()
+
+	go func() {
+		defer wg.Done()
+		templates = InstalledTemplates("")
+	}()
+
+	wg.Wait()
 	return
 }
 

From e2e3632d6ed0a99c14cd3648771234db58a44af5 Mon Sep 17 00:00:00 2001
From: Vanessa <lly219@gmail.com>
Date: Thu, 21 Mar 2024 11:15:07 +0800
Subject: [PATCH 13/77] :art: fix
 https://github.com/siyuan-note/siyuan/issues/10667

---
 app/appearance/langs/en_US.json     |   2 +
 app/appearance/langs/es_ES.json     |   2 +
 app/appearance/langs/fr_FR.json     |   2 +
 app/appearance/langs/zh_CHT.json    |   2 +
 app/appearance/langs/zh_CN.json     |   2 +
 app/src/protyle/render/av/action.ts | 112 ++++++++++++----------------
 app/src/protyle/render/av/row.ts    |  33 +++++++-
 7 files changed, 90 insertions(+), 65 deletions(-)

diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json
index 388d1cf1f9..1c9dd76755 100644
--- a/app/appearance/langs/en_US.json
+++ b/app/appearance/langs/en_US.json
@@ -1,4 +1,6 @@
 {
+  "insertRowBefore": "Insert rows ${x} above",
+  "insertRowAfter": "Insert rows ${x} below",
   "setDueTime": "Set expiration time",
   "showCardDay": "After how many days do you want to show the card?",
   "forgetCount": "Forget to count",
diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json
index 77d30ee697..23f6c89aee 100644
--- a/app/appearance/langs/es_ES.json
+++ b/app/appearance/langs/es_ES.json
@@ -1,4 +1,6 @@
 {
+  "insertRowBefore": "Insertar filas ${x} arriba",
+  "insertRowAfter": "Insertar filas ${x} debajo",
   "setDueTime": "Establecer tiempo de vencimiento",
   "showCardDay": "¿Después de cuántos días deseas mostrar la tarjeta?",
   "forgetCount": "Olvídate de contar",
diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json
index e3d2ab430d..a63e956b0e 100644
--- a/app/appearance/langs/fr_FR.json
+++ b/app/appearance/langs/fr_FR.json
@@ -1,4 +1,6 @@
 {
+  "insertRowBefore": "Insérer les lignes ${x} ci-dessus",
+  "insertRowAfter": "Insérer les lignes ${x} ci-dessous",
   "setDueTime": "Définir le délai d'expiration",
   "showCardDay": "Après combien de jours souhaitez-vous montrer la carte ?",
   "forgetCount": "Oublier de compter",
diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json
index 3b8e5985e0..6eebbae4ff 100644
--- a/app/appearance/langs/zh_CHT.json
+++ b/app/appearance/langs/zh_CHT.json
@@ -1,4 +1,6 @@
 {
+  "insertRowBefore": "在上方插入${x}行",
+  "insertRowAfter": "在下方插入${x}行",
   "setDueTime": "設定到期時間",
   "showCardDay": "要在幾天後顯示卡片？",
   "forgetCount": "遺忘次數",
diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json
index 0ca4c0db9e..80775476c1 100644
--- a/app/appearance/langs/zh_CN.json
+++ b/app/appearance/langs/zh_CN.json
@@ -1,4 +1,6 @@
 {
+  "insertRowBefore": "在上方插入${x}行",
+  "insertRowAfter": "在下方插入${x}行",
   "setDueTime": "设置到期时间",
   "showCardDay": "要在多少天后显示卡片？",
   "forgetCount": "遗忘次数",
diff --git a/app/src/protyle/render/av/action.ts b/app/src/protyle/render/av/action.ts
index 842e4edaae..2bf064b982 100644
--- a/app/src/protyle/render/av/action.ts
+++ b/app/src/protyle/render/av/action.ts
@@ -5,7 +5,7 @@ import {openEditorTab} from "../../../menus/util";
 import {copySubMenu} from "../../../menus/commonMenuItem";
 import {getCellText, getTypeByCellElement, popTextCell, renderCell, renderCellAttr, updateHeaderCell} from "./cell";
 import {getColIconByType, showColMenu} from "./col";
-import {deleteRow, insertAttrViewBlockAnimation, setPageSize, updateHeader} from "./row";
+import {deleteRow, insertRows, setPageSize, updateHeader} from "./row";
 import {emitOpenMenu} from "../../../plugin/EventBus";
 import {addCol} from "./col";
 import {openMenuPanel} from "./openMenuPanel";
@@ -174,30 +174,7 @@ export const avClick = (protyle: IProtyle, event: MouseEvent & { target: HTMLEle
             event.stopPropagation();
             return true;
         } else if (type === "av-add-more") {
-            const avID = blockElement.getAttribute("data-av-id");
-            const srcIDs = [Lute.NewNodeID()];
-            const newUpdated = dayjs().format("YYYYMMDDHHmmss");
-            transaction(protyle, [{
-                action: "insertAttrViewBlock",
-                avID,
-                srcIDs,
-                isDetached: true,
-                blockID: blockElement.dataset.nodeId,
-            }, {
-                action: "doUpdateUpdated",
-                id: blockElement.dataset.nodeId,
-                data: newUpdated,
-            }], [{
-                action: "removeAttrViewBlock",
-                srcIDs,
-                avID,
-            }, {
-                action: "doUpdateUpdated",
-                id: blockElement.dataset.nodeId,
-                data: blockElement.getAttribute("updated")
-            }]);
-            insertAttrViewBlockAnimation(protyle, blockElement, srcIDs, undefined, avID);
-            blockElement.setAttribute("updated", newUpdated);
+            insertRows(blockElement, protyle, 1, undefined);
             event.preventDefault();
             event.stopPropagation();
             return true;
@@ -245,32 +222,7 @@ export const avClick = (protyle: IProtyle, event: MouseEvent & { target: HTMLEle
             event.stopPropagation();
             return true;
         } else if (type === "av-add-bottom") {
-            const avID = blockElement.getAttribute("data-av-id");
-            const srcIDs = [Lute.NewNodeID()];
-            const previousID = blockElement.querySelector(".av__row--util").previousElementSibling.getAttribute("data-id") || "";
-            const newUpdated = dayjs().format("YYYYMMDDHHmmss");
-            transaction(protyle, [{
-                action: "insertAttrViewBlock",
-                avID,
-                previousID,
-                srcIDs,
-                isDetached: true,
-                blockID: blockElement.dataset.nodeId,
-            }, {
-                action: "doUpdateUpdated",
-                id: blockElement.dataset.nodeId,
-                data: newUpdated,
-            }], [{
-                action: "removeAttrViewBlock",
-                srcIDs,
-                avID,
-            }, {
-                action: "doUpdateUpdated",
-                id: blockElement.dataset.nodeId,
-                data: blockElement.getAttribute("updated")
-            }]);
-            insertAttrViewBlockAnimation(protyle, blockElement, srcIDs, previousID, avID);
-            blockElement.setAttribute("updated", newUpdated);
+            insertRows(blockElement, protyle, 1, blockElement.querySelector(".av__row--util").previousElementSibling.getAttribute("data-id") || "");
             event.preventDefault();
             event.stopPropagation();
             return true;
@@ -344,19 +296,7 @@ export const avContextmenu = (protyle: IProtyle, rowElement: HTMLElement, positi
     rowElement.querySelector(".av__firstcol use").setAttribute("xlink:href", "#iconCheck");
     const rowElements = blockElement.querySelectorAll(".av__row--select:not(.av__row--header)");
     updateHeader(rowElement);
-    if (!protyle.disabled) {
-        menu.addItem({
-            icon: "iconTrashcan",
-            label: window.siyuan.languages.delete,
-            click() {
-                deleteRow(blockElement, protyle);
-            }
-        });
-    }
     if (rowElements.length === 1 && !rowElements[0].querySelector('[data-detached="true"]')) {
-        if (!protyle.disabled) {
-            menu.addSeparator();
-        }
         openEditorTab(protyle.app, rowElements[0].getAttribute("data-id"));
         menu.addItem({
             label: window.siyuan.languages.copy,
@@ -366,7 +306,51 @@ export const avContextmenu = (protyle: IProtyle, rowElement: HTMLElement, positi
         });
     }
     if (!protyle.disabled) {
-        menu.addSeparator();
+        if (rowElements.length === 1) {
+            if (!rowElements[0].querySelector('[data-detached="true"]')) {
+                menu.addSeparator();
+            }
+            menu.addItem({
+                icon: "iconBefore",
+                type: "readonly",
+                label: `<div class="fn__flex" style="align-items: center;">
+${window.siyuan.languages.insertRowBefore.replace("${x}", '<span class="fn__space"></span><input style="width:64px" type="number" step="1" min="1" placeholder="Enter" class="b3-text-field"><span class="fn__space"></span>')}
+</div>`,
+                bind(element) {
+                    const inputElement = element.querySelector("input")
+                    inputElement.addEventListener("keydown", (event: KeyboardEvent) => {
+                        if (!event.isComposing && event.key === "Enter") {
+                            insertRows(blockElement, protyle, parseInt(inputElement.value), rowElements[0].previousElementSibling.getAttribute("data-id"));
+                            menu.close();
+                        }
+                    })
+                }
+            });
+            menu.addItem({
+                icon: "iconAfter",
+                type: "readonly",
+                label: `<div class="fn__flex" style="align-items: center;">
+${window.siyuan.languages.insertRowAfter.replace("${x}", '<span class="fn__space"></span><input style="width:64px" type="number" step="1" min="1" placeholder="Enter" class="b3-text-field"><span class="fn__space"></span>')}
+</div>`,
+                bind(element) {
+                    const inputElement = element.querySelector("input")
+                    inputElement.addEventListener("keydown", (event: KeyboardEvent) => {
+                        if (!event.isComposing && event.key === "Enter") {
+                            insertRows(blockElement, protyle, parseInt(inputElement.value), rowElements[0].getAttribute("data-id"));
+                            menu.close();
+                        }
+                    })
+                }
+            });
+            menu.addSeparator();
+        }
+        menu.addItem({
+            icon: "iconTrashcan",
+            label: window.siyuan.languages.delete,
+            click() {
+                deleteRow(blockElement, protyle);
+            }
+        });
         const editAttrSubmenu: IMenu[] = [];
         rowElement.parentElement.querySelectorAll(".av__row--header .av__cell").forEach((cellElement: HTMLElement) => {
             let hideBlock = false;
diff --git a/app/src/protyle/render/av/row.ts b/app/src/protyle/render/av/row.ts
index 0912271daa..ef7e5c0799 100644
--- a/app/src/protyle/render/av/row.ts
+++ b/app/src/protyle/render/av/row.ts
@@ -171,7 +171,7 @@ ${(item.getAttribute("data-block-id") || item.dataset.dtype === "block") ? ' dat
             if (hideTextCell) {
                 currentRow.remove();
                 showMessage(window.siyuan.languages.insertRowTip);
-            } else {
+            } else if (srcIDs.length === 1) {
                 popTextCell(protyle, [currentRow.querySelector('.av__cell[data-detached="true"]')], "block");
             }
             setPage(blockElement);
@@ -350,3 +350,34 @@ export const deleteRow = (blockElement: HTMLElement, protyle: IProtyle) => {
     updateHeader(blockElement.querySelector(".av__row"));
     blockElement.setAttribute("updated", newUpdated);
 };
+
+export const insertRows = (blockElement: HTMLElement, protyle: IProtyle, count: number, previousID: string) => {
+    const avID = blockElement.getAttribute("data-av-id");
+    const srcIDs: string[] = [];
+    new Array(count).fill(0).forEach(() => {
+        srcIDs.push(Lute.NewNodeID());
+    });
+    const newUpdated = dayjs().format("YYYYMMDDHHmmss");
+    transaction(protyle, [{
+        action: "insertAttrViewBlock",
+        avID,
+        previousID,
+        srcIDs,
+        isDetached: true,
+        blockID: blockElement.dataset.nodeId,
+    }, {
+        action: "doUpdateUpdated",
+        id: blockElement.dataset.nodeId,
+        data: newUpdated,
+    }], [{
+        action: "removeAttrViewBlock",
+        srcIDs,
+        avID,
+    }, {
+        action: "doUpdateUpdated",
+        id: blockElement.dataset.nodeId,
+        data: blockElement.getAttribute("updated")
+    }]);
+    insertAttrViewBlockAnimation(protyle, blockElement, srcIDs, previousID, avID);
+    blockElement.setAttribute("updated", newUpdated);
+}

From 055e011b3e4abca2d5d42ddc3accb978e1adff1e Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Thu, 21 Mar 2024 17:09:08 +0800
Subject: [PATCH 14/77] :art: One-click upgrade of downloaded marketplace
 packages https://github.com/siyuan-note/siyuan/issues/8390

---
 kernel/api/bazaar.go   | 4 ++--
 kernel/api/router.go   | 2 +-
 kernel/model/bazzar.go | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/kernel/api/bazaar.go b/kernel/api/bazaar.go
index e05ad04dd7..d8fbcc73fe 100644
--- a/kernel/api/bazaar.go
+++ b/kernel/api/bazaar.go
@@ -25,7 +25,7 @@ import (
 	"github.com/siyuan-note/siyuan/kernel/util"
 )
 
-func getBazaarPackages(c *gin.Context) {
+func getUpdatedPackage(c *gin.Context) {
 	ret := gulu.Ret.NewResult()
 	defer c.JSON(http.StatusOK, ret)
 
@@ -35,7 +35,7 @@ func getBazaarPackages(c *gin.Context) {
 	}
 
 	frontend := arg["frontend"].(string)
-	plugins, widgets, icons, themes, templates := model.BazaarPackages(frontend)
+	plugins, widgets, icons, themes, templates := model.UpdatedPackages(frontend)
 	ret.Data = map[string]interface{}{
 		"plugins":   plugins,
 		"widgets":   widgets,
diff --git a/kernel/api/router.go b/kernel/api/router.go
index fc6e51ee20..d4bc60b9b9 100644
--- a/kernel/api/router.go
+++ b/kernel/api/router.go
@@ -330,7 +330,7 @@ func ServeAPI(ginServer *gin.Engine) {
 	ginServer.Handle("POST", "/api/graph/getGraph", model.CheckAuth, getGraph)
 	ginServer.Handle("POST", "/api/graph/getLocalGraph", model.CheckAuth, getLocalGraph)
 
-	ginServer.Handle("POST", "/api/bazaar/getBazaarPackages", model.CheckAuth, getBazaarPackages)
+	ginServer.Handle("POST", "/api/bazaar/getUpdatedPackage", model.CheckAuth, getUpdatedPackage)
 	ginServer.Handle("POST", "/api/bazaar/getBazaarPlugin", model.CheckAuth, getBazaarPlugin)
 	ginServer.Handle("POST", "/api/bazaar/getInstalledPlugin", model.CheckAuth, getInstalledPlugin)
 	ginServer.Handle("POST", "/api/bazaar/installBazaarPlugin", model.CheckAuth, model.CheckReadonly, installBazaarPlugin)
diff --git a/kernel/model/bazzar.go b/kernel/model/bazzar.go
index f53e42e4fb..573d4cf742 100644
--- a/kernel/model/bazzar.go
+++ b/kernel/model/bazzar.go
@@ -30,7 +30,7 @@ import (
 	"github.com/siyuan-note/siyuan/kernel/bazaar"
 )
 
-func BazaarPackages(frontend string) (plugins []*bazaar.Plugin, widgets []*bazaar.Widget, icons []*bazaar.Icon, themes []*bazaar.Theme, templates []*bazaar.Template) {
+func UpdatedPackages(frontend string) (plugins []*bazaar.Plugin, widgets []*bazaar.Widget, icons []*bazaar.Icon, themes []*bazaar.Theme, templates []*bazaar.Template) {
 	wg := &sync.WaitGroup{}
 	wg.Add(5)
 	go func() {

From d793155e55147477797f986a0f2fcf5eae33d8fb Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Thu, 21 Mar 2024 17:10:14 +0800
Subject: [PATCH 15/77] :art: One-click upgrade of downloaded marketplace
 packages https://github.com/siyuan-note/siyuan/issues/8390

---
 kernel/model/bazzar.go | 35 ++++++++++++++++++++++++++++++-----
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/kernel/model/bazzar.go b/kernel/model/bazzar.go
index 573d4cf742..6ec935baf3 100644
--- a/kernel/model/bazzar.go
+++ b/kernel/model/bazzar.go
@@ -35,27 +35,52 @@ func UpdatedPackages(frontend string) (plugins []*bazaar.Plugin, widgets []*baza
 	wg.Add(5)
 	go func() {
 		defer wg.Done()
-		plugins = InstalledPlugins(frontend, "")
+		tmp := InstalledPlugins(frontend, "")
+		for _, plugin := range tmp {
+			if plugin.Outdated {
+				plugins = append(plugins, plugin)
+			}
+		}
 	}()
 
 	go func() {
 		defer wg.Done()
-		widgets = InstalledWidgets("")
+		tmp := InstalledWidgets("")
+		for _, widget := range tmp {
+			if widget.Outdated {
+				widgets = append(widgets, widget)
+			}
+		}
 	}()
 
 	go func() {
 		defer wg.Done()
-		icons = InstalledIcons("")
+		tmp := InstalledIcons("")
+		for _, icon := range tmp {
+			if icon.Outdated {
+				icons = append(icons, icon)
+			}
+		}
 	}()
 
 	go func() {
 		defer wg.Done()
-		themes = InstalledThemes("")
+		tmp := InstalledThemes("")
+		for _, theme := range tmp {
+			if theme.Outdated {
+				themes = append(themes, theme)
+			}
+		}
 	}()
 
 	go func() {
 		defer wg.Done()
-		templates = InstalledTemplates("")
+		tmp := InstalledTemplates("")
+		for _, template := range tmp {
+			if template.Outdated {
+				templates = append(templates, template)
+			}
+		}
 	}()
 
 	wg.Wait()

From ec622364affdfc57546f351ee540651ec719dd7f Mon Sep 17 00:00:00 2001
From: Vanessa <lly219@gmail.com>
Date: Thu, 21 Mar 2024 17:32:39 +0800
Subject: [PATCH 16/77] :art: https://github.com/siyuan-note/siyuan/issues/8390

---
 app/src/config/bazaar.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/src/config/bazaar.ts b/app/src/config/bazaar.ts
index c895ba2875..1139119919 100644
--- a/app/src/config/bazaar.ts
+++ b/app/src/config/bazaar.ts
@@ -83,6 +83,7 @@ export const bazaar = {
 </div>
 <div class="fn__flex-1">
     <div class="config-bazaar__panel" data-type="downloaded" data-init="true">
+        <div data-type="downloaded-update"></div>
         <div class="fn__flex config-bazaar__title">
             <button data-type="myPlugin" class="b3-button">${window.siyuan.languages.plugin}</button>
             <div class="fn__space"></div>
@@ -292,6 +293,11 @@ export const bazaar = {
     </div>
 </div>`;
     },
+    _getUpdate() {
+        fetchPost("/api/bazaar/getUpdatedPackage", {frontend: getFrontend()}, (response) => {
+            this.element.querySelector('[data-type="downloaded-update"]').innerHTML = `<div class="fn__flex"></div>`
+        })
+    },
     _genMyHTML(bazaarType: TBazaarType, app: App) {
         const contentElement = bazaar.element.querySelector("#configBazaarDownloaded");
         if (contentElement.getAttribute("data-loading") === "true" ||
@@ -535,6 +541,7 @@ export const bazaar = {
             return;
         }
         this._genMyHTML("plugins", app);
+        this._getUpdate();
         bazaar.element.firstElementChild.addEventListener("click", (event) => {
             let target = event.target as HTMLElement;
             const dataElement = hasClosestByAttribute(target, "data-obj", null);

From 496c44e389bd5ceda03cfb6ff1db10d78fb8559b Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Thu, 21 Mar 2024 17:58:53 +0800
Subject: [PATCH 17/77] :art: One-click upgrade of downloaded marketplace
 packages https://github.com/siyuan-note/siyuan/issues/8390

---
 kernel/model/bazzar.go | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/kernel/model/bazzar.go b/kernel/model/bazzar.go
index 6ec935baf3..ffe71755b8 100644
--- a/kernel/model/bazzar.go
+++ b/kernel/model/bazzar.go
@@ -84,6 +84,26 @@ func UpdatedPackages(frontend string) (plugins []*bazaar.Plugin, widgets []*baza
 	}()
 
 	wg.Wait()
+
+	if 1 > len(plugins) {
+		plugins = []*bazaar.Plugin{}
+	}
+
+	if 1 > len(widgets) {
+		widgets = []*bazaar.Widget{}
+	}
+
+	if 1 > len(icons) {
+		icons = []*bazaar.Icon{}
+	}
+
+	if 1 > len(themes) {
+		themes = []*bazaar.Theme{}
+	}
+
+	if 1 > len(templates) {
+		templates = []*bazaar.Template{}
+	}
 	return
 }
 

From c228971a23a9474f9a312a0122fa85a302f82fdb Mon Sep 17 00:00:00 2001
From: Vanessa <lly219@gmail.com>
Date: Thu, 21 Mar 2024 18:05:10 +0800
Subject: [PATCH 18/77] :art: https://github.com/siyuan-note/siyuan/issues/8390

---
 app/src/assets/scss/base.scss |  4 +++
 app/src/config/bazaar.ts      | 51 ++++++++++++++++++++++++++++++-----
 2 files changed, 48 insertions(+), 7 deletions(-)

diff --git a/app/src/assets/scss/base.scss b/app/src/assets/scss/base.scss
index 25f511cfd7..d34c69e875 100644
--- a/app/src/assets/scss/base.scss
+++ b/app/src/assets/scss/base.scss
@@ -371,6 +371,10 @@ html {
     width: 32px;
     text-align: right;
   }
+
+  &--bg {
+    background-color: var(--b3-theme-surface);
+  }
 }
 
 .reveal {
diff --git a/app/src/config/bazaar.ts b/app/src/config/bazaar.ts
index 1139119919..741bf227b4 100644
--- a/app/src/config/bazaar.ts
+++ b/app/src/config/bazaar.ts
@@ -102,7 +102,7 @@ export const bazaar = {
             <div class="fn__space"></div>
             <div class="fn__flex-1"></div>
             <input ${window.siyuan.config.bazaar.petalDisabled ? "" : " checked"} data-type="plugins-enable" type="checkbox" class="b3-switch" style="margin: 8px 16px">
-            <div class="counter fn__none fn__flex-center b3-tooltips b3-tooltips__w" aria-label="${window.siyuan.languages.total}" style="background: var(--b3-theme-surface)"></div>
+            <div class="counter counter--bg fn__none fn__flex-center b3-tooltips b3-tooltips__w" aria-label="${window.siyuan.languages.total}"></div>
         </div>
         <div id="configBazaarDownloaded" class="config-bazaar__content">
             ${loadingHTML}
@@ -131,7 +131,7 @@ export const bazaar = {
             </div>
             <div class="fn__space"></div>
             <div class="fn__flex-1"></div>
-            <div class="counter fn__flex-center b3-tooltips b3-tooltips__w" aria-label="${window.siyuan.languages.total}" style="background: var(--b3-theme-surface)"></div>
+            <div class="counter counter--bg fn__flex-center b3-tooltips b3-tooltips__w" aria-label="${window.siyuan.languages.total}"></div>
         </div>
         <div id="configBazaarTheme" class="config-bazaar__content">
             ${loadingHTML}
@@ -154,7 +154,7 @@ export const bazaar = {
             </div>
             <div class="fn__space"></div>
             <div class="fn__flex-1"></div>
-            <div class="counter fn__flex-center b3-tooltips b3-tooltips__w" aria-label="${window.siyuan.languages.total}" style="background: var(--b3-theme-surface)"></div>
+            <div class="counter counter--bg fn__flex-center b3-tooltips b3-tooltips__w" aria-label="${window.siyuan.languages.total}"></div>
         </div>
         <div id="configBazaarTemplate" class="config-bazaar__content">
             ${loadingHTML}
@@ -177,7 +177,7 @@ export const bazaar = {
             </div>
             <div class="fn__space"></div>
             <div class="fn__flex-1"></div>
-            <div class="counter fn__flex-center b3-tooltips b3-tooltips__w" aria-label="${window.siyuan.languages.total}" style="background: var(--b3-theme-surface)"></div>
+            <div class="counter counter--bg fn__flex-center b3-tooltips b3-tooltips__w" aria-label="${window.siyuan.languages.total}"></div>
         </div>
         <div id="configBazaarPlugin" class="config-bazaar__content">
             ${loadingHTML}
@@ -200,7 +200,7 @@ export const bazaar = {
             </div>
             <div class="fn__space"></div>
             <div class="fn__flex-1"></div>
-            <div class="counter fn__flex-center b3-tooltips b3-tooltips__w" aria-label="${window.siyuan.languages.total}" style="background: var(--b3-theme-surface)"></div>
+            <div class="counter counter--bg fn__flex-center b3-tooltips b3-tooltips__w" aria-label="${window.siyuan.languages.total}"></div>
         </div>
         <div id="configBazaarIcon" class="config-bazaar__content">
             ${loadingHTML}
@@ -223,7 +223,7 @@ export const bazaar = {
             </div>
             <div class="fn__space"></div>
             <div class="fn__flex-1"></div>
-            <div class="counter fn__flex-center b3-tooltips b3-tooltips__w" aria-label="${window.siyuan.languages.total}" style="background: var(--b3-theme-surface)"></div>
+            <div class="counter counter--bg fn__flex-center b3-tooltips b3-tooltips__w" aria-label="${window.siyuan.languages.total}"></div>
         </div>
         <div id="configBazaarWidget" class="config-bazaar__content">
             ${loadingHTML}
@@ -292,10 +292,47 @@ export const bazaar = {
         </div>
     </div>
 </div>`;
+    },
+    _genUpdateItemHTML (item: IBazaarItem) {
+        return `<div class="b3-card">
+    <div class="b3-card__img"><img src="${item.iconURL}" onerror="this.src='/stage/images/icon.png'"/></div>
+        <div class="fn__flex-1 fn__flex-column">
+    <div class="b3-card__info b3-card__info--left fn__flex-1">
+    ${item.preferredName} <span class="ft__on-surface ft__smaller">${item.name}</span>
+        <div class="b3-card__desc" title="${escapeAttr(item.preferredDesc) || ""}">${item.preferredDesc || ""}</div>
+    </div>
+    </div>
+    <div class="b3-card__actions b3-card__actions--right">
+        ${item.incompatible ? `<span class="fn__flex-center b3-tooltips b3-tooltips__nw b3-chip b3-chip--error b3-chip--small" aria-label="${window.siyuan.languages.incompatiblePluginTip}">${window.siyuan.languages.incompatible}</span>` : ""}
+        ${item.preferredFunding ? `<span class="fn__space"></span><a target="_blank" href="${item.preferredFunding}" class="block__icon block__icon--show ariaLabel" aria-label="${window.siyuan.languages.sponsor} ${item.preferredFunding}"><svg class="ft__pink"><use xlink:href="#iconHeart"></use></svg></a>` : ""}
+    </div>
+</div>`
     },
     _getUpdate() {
         fetchPost("/api/bazaar/getUpdatedPackage", {frontend: getFrontend()}, (response) => {
-            this.element.querySelector('[data-type="downloaded-update"]').innerHTML = `<div class="fn__flex"></div>`
+            let html = "";
+            response.data.plugins.forEach((item: IBazaarItem) => {
+                html += this._genUpdateItemHTML(item);
+            });
+            response.data.themes.forEach((item: IBazaarItem) => {
+                html += this._genUpdateItemHTML(item);
+            });
+            response.data.icons.forEach((item: IBazaarItem) => {
+                html += this._genUpdateItemHTML(item);
+            });
+            response.data.templates.forEach((item: IBazaarItem) => {
+                html += this._genUpdateItemHTML(item);
+            });
+            response.data.widgets.forEach((item: IBazaarItem) => {
+                html += this._genUpdateItemHTML(item);
+            });
+            this.element.querySelector('[data-type="downloaded-update"]').innerHTML = `<div class="fn__flex config-bazaar__title">
+    <div class="fn__flex-1"></div>
+    <button class="b3-button">${window.siyuan.languages.update}</button>
+    <span class="fn__space"></span>
+    <div class="counter counter--bg fn__flex-center">${response.data.themes.length + response.data.icons.length + response.data.widgets.length + response.data.plugins.length + response.data.templates.length}</div>
+</div>
+<div class="config-bazaar__content">${html}</div>`;
         })
     },
     _genMyHTML(bazaarType: TBazaarType, app: App) {

From 5f5bb83ed560a912b405e4b361aaa4aa9367883c Mon Sep 17 00:00:00 2001
From: Soltus <liaoshanyi@qq.com>
Date: Thu, 21 Mar 2024 18:51:59 +0800
Subject: [PATCH 19/77] https://github.com/Hi-Windom/Sillot/issues/587

---
 app/scripts/genTPLData.js                |  3 +++
 app/src/assets/template/mobile/index.tpl |  3 +++
 app/src/protyle/util/compatibility.ts    | 31 +++++++++++++++++++++++-
 3 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/app/scripts/genTPLData.js b/app/scripts/genTPLData.js
index f2aa8d084e..e0a95bc24b 100644
--- a/app/scripts/genTPLData.js
+++ b/app/scripts/genTPLData.js
@@ -37,6 +37,9 @@ exports.default = {
           </svg>
           <svg id="toolbarConsole" class="toolbar__icon" data-mode="0">
               <use xlink:href="#iconBug"></use>
+          </svg>
+					<svg id="toolbarOpenBy" class="toolbar__icon fn__none" data-mode="0">
+              <use xlink:href="#iconOpen"></use>
           </svg>
           <svg id="toolbarMore" class="toolbar__icon">
               <use xlink:href="#iconMore"></use>
diff --git a/app/src/assets/template/mobile/index.tpl b/app/src/assets/template/mobile/index.tpl
index faeed503fb..918650e9bc 100644
--- a/app/src/assets/template/mobile/index.tpl
+++ b/app/src/assets/template/mobile/index.tpl
@@ -23,6 +23,9 @@
           </svg>
           <svg id="toolbarConsole" class="toolbar__icon" data-mode="0">
               <use xlink:href="#iconBug"></use>
+          </svg>
+					<svg id="toolbarOpenBy" class="toolbar__icon fn__none" data-mode="0">
+              <use xlink:href="#iconOpen"></use>
           </svg>
           <svg id="toolbarMore" class="toolbar__icon">
               <use xlink:href="#iconMore"></use>
diff --git a/app/src/protyle/util/compatibility.ts b/app/src/protyle/util/compatibility.ts
index a3b5f7f22d..24daa941e8 100644
--- a/app/src/protyle/util/compatibility.ts
+++ b/app/src/protyle/util/compatibility.ts
@@ -9,7 +9,36 @@ export const openByMobile = (uri: string) => {
     if (window.siyuan.config.system.container === "ios") {
         window.location.href = uri;
     } else if (isInAndroid()) {
-        window.JSAndroid.openExternal(uri);
+				const toolbarOpenBy = document.querySelector("#toolbarOpenBy");
+				const toolbarConsole = document.querySelector("#toolbarConsole");
+				if (toolbarOpenBy && toolbarConsole) {
+					const existingUri = toolbarOpenBy.getAttribute("data-uri");
+
+					// 只有在首次调用时才更新uri和绑定事件
+					if (!existingUri) {
+							toolbarConsole.classList.add("fn__none");
+							toolbarOpenBy.classList.remove("fn__none");
+
+							toolbarOpenBy.addEventListener("click", () => {
+									toolbarOpenBy.classList.add("fn__none");
+									toolbarConsole.classList.remove("fn__none");
+									const updatedUri = toolbarOpenBy.getAttribute("data-uri");
+									if (updatedUri) {
+											window.JSAndroid.openExternal(updatedUri);
+											toolbarOpenBy.removeAttribute("data-uri");
+									}
+							});
+
+							// 更新"data-uri"值
+							toolbarOpenBy.setAttribute("data-uri", uri);
+					} else {
+							// 更新"data-uri"值
+							toolbarOpenBy.setAttribute("data-uri", uri);
+					}
+			} else {
+					// 如果找不到元素，则直接调用
+					window.JSAndroid.openExternal(uri);
+			}
     } else {
         window.open(uri);
     }

From a42d0f27509ddc5da7813897524c490ccf4f127c Mon Sep 17 00:00:00 2001
From: Soltus <liaoshanyi@qq.com>
Date: Thu, 21 Mar 2024 19:25:37 +0800
Subject: [PATCH 20/77] =?UTF-8?q?#587=20=E7=BB=86=E8=8A=82=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/assets/scss/base.scss                        |  3 ++-
 app/src/assets/scss/mobile.scss                      |  3 ++-
 .../scss/sillot/{_logic.scss => _base_logic.scss}    |  0
 app/src/assets/scss/sillot/_base_motion.scss         | 12 ++++++++++++
 app/src/protyle/util/compatibility.ts                | 12 ++++++++++++
 5 files changed, 28 insertions(+), 2 deletions(-)
 rename app/src/assets/scss/sillot/{_logic.scss => _base_logic.scss} (100%)
 create mode 100644 app/src/assets/scss/sillot/_base_motion.scss

diff --git a/app/src/assets/scss/base.scss b/app/src/assets/scss/base.scss
index db3f09e696..0288e8fc2e 100644
--- a/app/src/assets/scss/base.scss
+++ b/app/src/assets/scss/base.scss
@@ -36,7 +36,8 @@
 @import "business/av";
 
 // sillot extend start
-@import "sillot/logic";
+@import "sillot/base_logic";
+@import "sillot/base_motion";
 // sillot extend end
 
 /*
diff --git a/app/src/assets/scss/mobile.scss b/app/src/assets/scss/mobile.scss
index 3ec1ef7f87..f303f657e9 100644
--- a/app/src/assets/scss/mobile.scss
+++ b/app/src/assets/scss/mobile.scss
@@ -29,7 +29,8 @@
 @import "business/search";
 
 // sillot extend start
-@import "sillot/logic";
+@import "sillot/base_logic";
+@import "sillot/base_motion";
 @import "sillot/mobile_slider";
 @import "sillot/mobile_menu";
 // sillot extend end
diff --git a/app/src/assets/scss/sillot/_logic.scss b/app/src/assets/scss/sillot/_base_logic.scss
similarity index 100%
rename from app/src/assets/scss/sillot/_logic.scss
rename to app/src/assets/scss/sillot/_base_logic.scss
diff --git a/app/src/assets/scss/sillot/_base_motion.scss b/app/src/assets/scss/sillot/_base_motion.scss
new file mode 100644
index 0000000000..386490deaf
--- /dev/null
+++ b/app/src/assets/scss/sillot/_base_motion.scss
@@ -0,0 +1,12 @@
+.flash-blue {
+	animation: flash 0.1s infinite alternate;
+}
+
+@keyframes flash {
+	from {
+			background-color: transparent;
+	}
+	to {
+			background-color: rgba(56, 83, 218, 0.83);
+	}
+}
diff --git a/app/src/protyle/util/compatibility.ts b/app/src/protyle/util/compatibility.ts
index 24daa941e8..9f0b1a6a18 100644
--- a/app/src/protyle/util/compatibility.ts
+++ b/app/src/protyle/util/compatibility.ts
@@ -31,9 +31,21 @@ export const openByMobile = (uri: string) => {
 
 							// 更新"data-uri"值
 							toolbarOpenBy.setAttribute("data-uri", uri);
+							if (!toolbarOpenBy.classList.contains("flash-blue")) {
+									toolbarOpenBy.classList.add("flash-blue");
+									setTimeout(() => {
+											toolbarOpenBy.classList.remove("flash-blue");
+									}, 200);
+							}
 					} else {
 							// 更新"data-uri"值
 							toolbarOpenBy.setAttribute("data-uri", uri);
+							if (!toolbarOpenBy.classList.contains("flash-blue")) {
+									toolbarOpenBy.classList.add("flash-blue");
+									setTimeout(() => {
+											toolbarOpenBy.classList.remove("flash-blue");
+									}, 200);
+							}
 					}
 			} else {
 					// 如果找不到元素，则直接调用

From 7a9f05937f2ffeadb563a570041c55c56f2c41d0 Mon Sep 17 00:00:00 2001
From: Soltus <liaoshanyi@qq.com>
Date: Thu, 21 Mar 2024 20:56:06 +0800
Subject: [PATCH 21/77] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=87=8C=E7=A8=8B?=
 =?UTF-8?q?=E7=A2=91=E5=85=B3=E9=97=AD=E5=AF=BC=E8=87=B4=E6=A3=80=E7=B4=A2?=
 =?UTF-8?q?=E4=B8=8D=E5=88=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/parse-changelog-sillot.py | 3 ++-
 scripts/parse-changelog.py        | 3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/parse-changelog-sillot.py b/scripts/parse-changelog-sillot.py
index 58108bd1b2..7b03b0d9e7 100644
--- a/scripts/parse-changelog-sillot.py
+++ b/scripts/parse-changelog-sillot.py
@@ -81,7 +81,8 @@ def find_milestone(repo, title, lastestRelease):
 ---
 
 ''')
-    for milestone in repo.get_milestones():
+    for milestone in repo.get_milestones(state=all):
+      # REF https://docs.github.com/en/rest/issues/milestones?apiVersion=2022-11-28#list-milestones
         if version in milestone.title:
             return milestone
 
diff --git a/scripts/parse-changelog.py b/scripts/parse-changelog.py
index 710f59bc3b..9466442b71 100644
--- a/scripts/parse-changelog.py
+++ b/scripts/parse-changelog.py
@@ -71,10 +71,9 @@ def find_milestone(repo, title, lastestRelease):
 # ---
 
 # ''')
-    for milestone in repo.get_milestones():
+    for milestone in repo.get_milestones(state=all):
         if version in milestone.title:
             return milestone
-    return version
 
 
 def get_issue_first_label(issue):

From c8afc608ba7e27121dbe5015d5dc96111fe08fcb Mon Sep 17 00:00:00 2001
From: Soltus <liaoshanyi@qq.com>
Date: Thu, 21 Mar 2024 20:58:39 +0800
Subject: [PATCH 22/77] test

---
 app/package.json   |   14 +-
 app/pnpm-lock.yaml | 1271 +++++++++++++++++++++++---------------------
 2 files changed, 665 insertions(+), 620 deletions(-)

diff --git a/app/package.json b/app/package.json
index 05c5cf8284..d41e97b6fd 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sillot",
-  "version": "0.27.13",
+  "version": "0.27.14",
   "syv": "3.0.4",
   "description": "Build Your Eternal Digital Garden",
   "homepage": "https://github.com/Hi-Windom/Sillot",
@@ -76,11 +76,11 @@
     }
   ],
   "devDependencies": {
-    "@babel/core": "^7.24.0",
+    "@babel/core": "^7.24.3",
     "@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
     "@babel/plugin-proposal-optional-chaining": "^7.21.0",
-    "@babel/plugin-transform-runtime": "^7.24.0",
-    "@babel/preset-env": "^7.24.0",
+    "@babel/plugin-transform-runtime": "^7.24.3",
+    "@babel/preset-env": "^7.24.3",
     "@babel/preset-react": "^7.23.3",
     "@babel/preset-typescript": "^7.23.3",
     "@babel/runtime": "^7.24.0",
@@ -135,7 +135,7 @@
     "npm-check": "^6.0.1",
     "ora": "^8.0.1",
     "path-browserify": "^1.0.1",
-    "postcss": "^8.4.36",
+    "postcss": "^8.4.38",
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "react-hot-toast": "^2.4.1",
@@ -161,9 +161,9 @@
     "ts-jest": "^29.1.2",
     "ts-loader": "^9.5.1",
     "tslib": "^2.6.2",
-    "typescript": "^5.4.2",
+    "typescript": "^5.4.3",
     "vconsole": "^3.15.1",
-    "webpack": "^5.90.3",
+    "webpack": "^5.91.0",
     "webpack-bundle-analyzer": "^4.10.1",
     "webpack-cli": "^5.1.4"
   },
diff --git a/app/pnpm-lock.yaml b/app/pnpm-lock.yaml
index 24b8862cbf..21f933af52 100644
--- a/app/pnpm-lock.yaml
+++ b/app/pnpm-lock.yaml
@@ -31,26 +31,26 @@ importers:
         version: 3.1.0
     devDependencies:
       '@babel/core':
-        specifier: ^7.24.0
-        version: 7.24.1
+        specifier: ^7.24.3
+        version: 7.24.3
       '@babel/plugin-proposal-nullish-coalescing-operator':
         specifier: ^7.18.6
-        version: 7.18.6(@babel/core@7.24.1)
+        version: 7.18.6(@babel/core@7.24.3)
       '@babel/plugin-proposal-optional-chaining':
         specifier: ^7.21.0
-        version: 7.21.0(@babel/core@7.24.1)
+        version: 7.21.0(@babel/core@7.24.3)
       '@babel/plugin-transform-runtime':
-        specifier: ^7.24.0
-        version: 7.24.1(@babel/core@7.24.1)
+        specifier: ^7.24.3
+        version: 7.24.3(@babel/core@7.24.3)
       '@babel/preset-env':
-        specifier: ^7.24.0
-        version: 7.24.1(@babel/core@7.24.1)
+        specifier: ^7.24.3
+        version: 7.24.3(@babel/core@7.24.3)
       '@babel/preset-react':
         specifier: ^7.23.3
-        version: 7.24.1(@babel/core@7.24.1)
+        version: 7.24.1(@babel/core@7.24.3)
       '@babel/preset-typescript':
         specifier: ^7.23.3
-        version: 7.24.1(@babel/core@7.24.1)
+        version: 7.24.1(@babel/core@7.24.3)
       '@babel/runtime':
         specifier: ^7.24.0
         version: 7.24.1
@@ -71,7 +71,7 @@ importers:
         version: 5.15.14(@emotion/react@11.11.4(@types/react@18.2.67)(react@18.2.0))(@emotion/styled@11.11.0(@emotion/react@11.11.4(@types/react@18.2.67)(react@18.2.0))(@types/react@18.2.67)(react@18.2.0))(@types/react@18.2.67)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@rollup/plugin-babel':
         specifier: ^6.0.4
-        version: 6.0.4(@babel/core@7.24.1)(rollup@4.13.0)
+        version: 6.0.4(@babel/core@7.24.3)(rollup@4.13.0)
       '@rollup/plugin-commonjs':
         specifier: ^25.0.7
         version: 25.0.7(rollup@4.13.0)
@@ -107,28 +107,28 @@ importers:
         version: 18.2.22
       '@typescript-eslint/eslint-plugin':
         specifier: ^7.3.1
-        version: 7.3.1(@typescript-eslint/parser@7.3.1(eslint@8.57.0)(typescript@5.4.2))(eslint@8.57.0)(typescript@5.4.2)
+        version: 7.3.1(@typescript-eslint/parser@7.3.1(eslint@8.57.0)(typescript@5.4.3))(eslint@8.57.0)(typescript@5.4.3)
       '@typescript-eslint/parser':
         specifier: ^7.3.1
-        version: 7.3.1(eslint@8.57.0)(typescript@5.4.2)
+        version: 7.3.1(eslint@8.57.0)(typescript@5.4.3)
       '@wixc3/react-board':
         specifier: ^2.4.1
         version: 2.4.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       babel-loader:
         specifier: ^9.1.3
-        version: 9.1.3(@babel/core@7.24.1)(webpack@5.90.3(esbuild@0.20.2)(webpack-cli@5.1.4))
+        version: 9.1.3(@babel/core@7.24.3)(webpack@5.91.0(esbuild@0.20.2)(webpack-cli@5.1.4))
       brace:
         specifier: ^0.11.1
         version: 0.11.1
       clean-webpack-plugin:
         specifier: ^4.0.0
-        version: 4.0.0(webpack@5.90.3(esbuild@0.20.2)(webpack-cli@5.1.4))
+        version: 4.0.0(webpack@5.91.0(esbuild@0.20.2)(webpack-cli@5.1.4))
       concurrently:
         specifier: ^8.2.2
         version: 8.2.2
       css-loader:
         specifier: ^6.10.0
-        version: 6.10.0(webpack@5.90.3(esbuild@0.20.2)(webpack-cli@5.1.4))
+        version: 6.10.0(webpack@5.91.0(esbuild@0.20.2)(webpack-cli@5.1.4))
       csstype:
         specifier: ^3.1.3
         version: 3.1.3
@@ -155,7 +155,7 @@ importers:
         version: 0.20.2
       esbuild-loader:
         specifier: ^4.1.0
-        version: 4.1.0(webpack@5.90.3(esbuild@0.20.2)(webpack-cli@5.1.4))
+        version: 4.1.0(webpack@5.91.0(esbuild@0.20.2)(webpack-cli@5.1.4))
       eslint:
         specifier: ^8.57.0
         version: 8.57.0
@@ -167,16 +167,16 @@ importers:
         version: 4.6.0(eslint@8.57.0)
       file-loader:
         specifier: ^6.2.0
-        version: 6.2.0(webpack@5.90.3(esbuild@0.20.2)(webpack-cli@5.1.4))
+        version: 6.2.0(webpack@5.91.0(esbuild@0.20.2)(webpack-cli@5.1.4))
       fs-extra:
         specifier: ^11.2.0
         version: 11.2.0
       html-loader:
         specifier: ^5.0.0
-        version: 5.0.0(webpack@5.90.3(esbuild@0.20.2)(webpack-cli@5.1.4))
+        version: 5.0.0(webpack@5.91.0(esbuild@0.20.2)(webpack-cli@5.1.4))
       html-webpack-plugin:
         specifier: ^5.6.0
-        version: 5.6.0(webpack@5.90.3(esbuild@0.20.2)(webpack-cli@5.1.4))
+        version: 5.6.0(webpack@5.91.0(esbuild@0.20.2)(webpack-cli@5.1.4))
       iconv-lite:
         specifier: ^0.6.3
         version: 0.6.3
@@ -194,10 +194,10 @@ importers:
         version: 4.17.21
       mini-css-extract-plugin:
         specifier: 2.8.1
-        version: 2.8.1(webpack@5.90.3(esbuild@0.20.2)(webpack-cli@5.1.4))
+        version: 2.8.1(webpack@5.91.0(esbuild@0.20.2)(webpack-cli@5.1.4))
       monaco-editor-webpack-plugin:
         specifier: ^7.1.0
-        version: 7.1.0(monaco-editor@0.47.0)(webpack@5.90.3(esbuild@0.20.2)(webpack-cli@5.1.4))
+        version: 7.1.0(monaco-editor@0.47.0)(webpack@5.91.0(esbuild@0.20.2)(webpack-cli@5.1.4))
       npm-check:
         specifier: ^6.0.1
         version: 6.0.1
@@ -208,8 +208,8 @@ importers:
         specifier: ^1.0.1
         version: 1.0.1
       postcss:
-        specifier: ^8.4.36
-        version: 8.4.37
+        specifier: ^8.4.38
+        version: 8.4.38
       react:
         specifier: 18.2.0
         version: 18.2.0
@@ -239,7 +239,7 @@ importers:
         version: 3.5.0(rollup@4.13.0)
       rollup-plugin-postcss:
         specifier: ^4.0.2
-        version: 4.0.2(postcss@8.4.37)
+        version: 4.0.2(postcss@8.4.38)
       rome:
         specifier: ^12.1.3
         version: 12.1.3
@@ -254,7 +254,7 @@ importers:
         version: 1.72.0
       sass-loader:
         specifier: ^14.1.1
-        version: 14.1.1(sass@1.72.0)(webpack@5.90.3(esbuild@0.20.2)(webpack-cli@5.1.4))
+        version: 14.1.1(sass@1.72.0)(webpack@5.91.0(esbuild@0.20.2)(webpack-cli@5.1.4))
       shelljs:
         specifier: ^0.8.5
         version: 0.8.5
@@ -263,43 +263,43 @@ importers:
         version: 4.7.5
       sofill:
         specifier: ^1.0.76
-        version: 1.0.76(@sillot/bridge@0.0.3)(typescript@5.4.2)
+        version: 1.0.76(@sillot/bridge@0.0.3)(typescript@5.4.3)
       sout:
         specifier: ^1.1.0
         version: 1.1.0
       style-loader:
         specifier: ^3.3.4
-        version: 3.3.4(webpack@5.90.3(esbuild@0.20.2)(webpack-cli@5.1.4))
+        version: 3.3.4(webpack@5.91.0(esbuild@0.20.2)(webpack-cli@5.1.4))
       sweetalert2:
         specifier: ^11.10.6
         version: 11.10.6
       terser-webpack-plugin:
         specifier: ^5.3.10
-        version: 5.3.10(esbuild@0.20.2)(webpack@5.90.3(esbuild@0.20.2)(webpack-cli@5.1.4))
+        version: 5.3.10(esbuild@0.20.2)(webpack@5.91.0(esbuild@0.20.2)(webpack-cli@5.1.4))
       ts-jest:
         specifier: ^29.1.2
-        version: 29.1.2(@babel/core@7.24.1)(esbuild@0.20.2)(jest@29.7.0(@types/node@20.11.30))(typescript@5.4.2)
+        version: 29.1.2(@babel/core@7.24.3)(esbuild@0.20.2)(jest@29.7.0(@types/node@20.11.30))(typescript@5.4.3)
       ts-loader:
         specifier: ^9.5.1
-        version: 9.5.1(typescript@5.4.2)(webpack@5.90.3(esbuild@0.20.2)(webpack-cli@5.1.4))
+        version: 9.5.1(typescript@5.4.3)(webpack@5.91.0(esbuild@0.20.2)(webpack-cli@5.1.4))
       tslib:
         specifier: ^2.6.2
         version: 2.6.2
       typescript:
-        specifier: ^5.4.2
-        version: 5.4.2
+        specifier: ^5.4.3
+        version: 5.4.3
       vconsole:
         specifier: ^3.15.1
         version: 3.15.1
       webpack:
-        specifier: ^5.90.3
-        version: 5.90.3(esbuild@0.20.2)(webpack-cli@5.1.4)
+        specifier: ^5.91.0
+        version: 5.91.0(esbuild@0.20.2)(webpack-cli@5.1.4)
       webpack-bundle-analyzer:
         specifier: ^4.10.1
         version: 4.10.1
       webpack-cli:
         specifier: ^5.1.4
-        version: 5.1.4(webpack-bundle-analyzer@4.10.1)(webpack@5.90.3)
+        version: 5.1.4(webpack-bundle-analyzer@4.10.1)(webpack@5.91.0)
 
 packages:
 
@@ -318,12 +318,16 @@ packages:
     resolution: {integrity: sha512-bC49z4spJQR3j8vFtJBLqzyzFV0ciuL5HYX7qfSl3KEqeMVV+eTquRvmXxpvB0AMubRrvv7y5DILiLLPi57Ewg==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/code-frame@7.24.2':
+    resolution: {integrity: sha512-y5+tLQyV8pg3fsiln67BVLD1P13Eg4lh5RW9mF0zUuvLrv9uIQ4MCL+CRT+FTsBlBjcIan6PGsLcBN0m3ClUyQ==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/compat-data@7.24.1':
     resolution: {integrity: sha512-Pc65opHDliVpRHuKfzI+gSA4zcgr65O4cl64fFJIWEEh8JoHIHh0Oez1Eo8Arz8zq/JhgKodQaxEwUPRtZylVA==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/core@7.24.1':
-    resolution: {integrity: sha512-F82udohVyIgGAY2VVj/g34TpFUG606rumIHjTfVbssPg2zTR7PuuEpZcX8JA6sgBfIYmJrFtWgPvHQuJamVqZQ==}
+  '@babel/core@7.24.3':
+    resolution: {integrity: sha512-5FcvN1JHw2sHJChotgx8Ek0lyuh4kCKelgMTTqhYJJtloNvUfpAFMeNQUtdlIaktwrSV9LtCdqwk48wL2wBacQ==}
     engines: {node: '>=6.9.0'}
 
   '@babel/generator@7.24.1':
@@ -379,6 +383,10 @@ packages:
     resolution: {integrity: sha512-HfEWzysMyOa7xI5uQHc/OcZf67/jc+xe/RZlznWQHhbb8Pg1SkRdbK4yEi61aY8wxQA7PkSfoojtLQP/Kpe3og==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/helper-module-imports@7.24.3':
+    resolution: {integrity: sha512-viKb0F9f2s0BCS22QSF308z/+1YWKV/76mwt61NBzS5izMzDPwdq1pTrzf+Li3npBWX9KdQbkeCt1jSAM7lZqg==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/helper-module-transforms@7.23.3':
     resolution: {integrity: sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==}
     engines: {node: '>=6.9.0'}
@@ -441,6 +449,10 @@ packages:
     resolution: {integrity: sha512-EPmDPxidWe/Ex+HTFINpvXdPHRmgSF3T8hGvzondYjmgzTQ/0EbLpSxyt+w3zzlYSk9cNBQNF9k0dT5Z2NiBjw==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/highlight@7.24.2':
+    resolution: {integrity: sha512-Yac1ao4flkTxTteCDZLEvdxg2fZfz1v8M4QpaGypq/WPDqg3ijHYbDfs+LG5hvzSoqaSZ9/Z9lKSP3CjZjv+pA==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/parser@7.24.1':
     resolution: {integrity: sha512-Zo9c7N3xdOIQrNip7Lc9wvRPzlRtovHVE4lkz8WEDr7uYh/GMQhSiIgFxGIArRHYdJE5kxtZjAf8rT0xhdLCzg==}
     engines: {node: '>=6.0.0'}
@@ -603,8 +615,8 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-async-generator-functions@7.24.1':
-    resolution: {integrity: sha512-OTkLJM0OtmzcpOgF7MREERUCdCnCBtBsq3vVFbuq/RKMK0/jdYqdMexWi3zNs7Nzd95ase65MbTGrpFJflOb6A==}
+  '@babel/plugin-transform-async-generator-functions@7.24.3':
+    resolution: {integrity: sha512-Qe26CMYVjpQxJ8zxM1340JFNjZaF+ISWpr1Kt/jGo+ZTUzKkfw/pphEWbRCb+lmSM6k/TOgfYLvmbHkUQ0asIg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -855,8 +867,8 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-runtime@7.24.1':
-    resolution: {integrity: sha512-yHLX14/T+tO0gjgJroDb8JYjOcQuzVC+Brt4CjHAxq/Ghw4xBVG+N02d1rMEcyUnKUQBL4Yy2gA9R72GK961jQ==}
+  '@babel/plugin-transform-runtime@7.24.3':
+    resolution: {integrity: sha512-J0BuRPNlNqlMTRJ72eVptpt9VcInbxO6iP3jaxr+1NPhC0UkKL+6oeX6VXMEYdADnuqmMmsBspt4d5w8Y/TCbQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -921,8 +933,8 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0
 
-  '@babel/preset-env@7.24.1':
-    resolution: {integrity: sha512-CwCMz1Z28UHLI2iE+cbnWT2epPMV9bzzoBGM6A3mOS22VQd/1TPoWItV7S7iL9TkPmPEf5L/QzurmztyyDN9FA==}
+  '@babel/preset-env@7.24.3':
+    resolution: {integrity: sha512-fSk430k5c2ff8536JcPvPWK4tZDwehWLGlBp0wrsBUjZVdeQV6lePbwKWZaZfK2vnh/1kQX1PzAJWsnBmVgGJA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -2252,6 +2264,11 @@ packages:
     peerDependencies:
       '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
 
+  babel-plugin-polyfill-corejs3@0.10.4:
+    resolution: {integrity: sha512-25J6I8NGfa5YkCDogHRID3fVCadIR8/pGl1/spvCkzb6lVn6SR3ojpx9nOn9iEBcUsjY24AmdKm5khcfKdylcg==}
+    peerDependencies:
+      '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
+
   babel-plugin-polyfill-regenerator@0.6.1:
     resolution: {integrity: sha512-JfTApdE++cgcTWjsiCQlLyFBMbTUft9ja17saCc93lgV33h4tuCVj7tlvu//qpLwaG+3yEz7/KhahGrUMkVq9g==}
     peerDependencies:
@@ -4956,8 +4973,8 @@ packages:
   postcss-value-parser@4.2.0:
     resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==}
 
-  postcss@8.4.37:
-    resolution: {integrity: sha512-7iB/v/r7Woof0glKLH8b1SPHrsX7uhdO+Geb41QpF/+mWZHU3uxxSlN+UXGVit1PawOYDToO+AbZzhBzWRDwbQ==}
+  postcss@8.4.38:
+    resolution: {integrity: sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==}
     engines: {node: ^10 || ^12 || >=14}
 
   preferred-pm@3.1.3:
@@ -5919,8 +5936,8 @@ packages:
   typedarray-to-buffer@3.1.5:
     resolution: {integrity: sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==}
 
-  typescript@5.4.2:
-    resolution: {integrity: sha512-+2/g0Fds1ERlP6JsakQQDXjZdZMM+rqpamFZJEKh4kwTIn3iDkgKtby0CeNd5ATNZ4Ry1ax15TMx0W2V+miizQ==}
+  typescript@5.4.3:
+    resolution: {integrity: sha512-KrPd3PKaCLr78MalgiwJnA25Nm8HAmdwN3mYUYZgG/wizIo9EainNVQI9/yDavtVFRN2h3k8uf3GLHuhDMgEHg==}
     engines: {node: '>=14.17'}
     hasBin: true
 
@@ -6045,8 +6062,8 @@ packages:
     resolution: {integrity: sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==}
     engines: {node: '>=10.13.0'}
 
-  webpack@5.90.3:
-    resolution: {integrity: sha512-h6uDYlWCctQRuXBs1oYpVe6sFcWedl0dpcVaTf/YF67J9bKvwJajFulMVSYKHrksMB3I/pIagRzDxwxkebuzKA==}
+  webpack@5.91.0:
+    resolution: {integrity: sha512-rzVwlLeBWHJbmgTC/8TvAcu5vpJNII+MelQpylD4jNERPwpBJOE2lEcko1zJX3QJeLjTTAnQxn/OJ8bjDzVQaw==}
     engines: {node: '>=10.13.0'}
     hasBin: true
     peerDependencies:
@@ -6213,16 +6230,22 @@ snapshots:
       picocolors: 1.0.0
     dev: true
 
+  '@babel/code-frame@7.24.2':
+    dependencies:
+      '@babel/highlight': 7.24.2
+      picocolors: 1.0.0
+    dev: true
+
   '@babel/compat-data@7.24.1':
     dev: true
 
-  '@babel/core@7.24.1':
+  '@babel/core@7.24.3':
     dependencies:
       '@ampproject/remapping': 2.3.0
-      '@babel/code-frame': 7.24.1
+      '@babel/code-frame': 7.24.2
       '@babel/generator': 7.24.1
       '@babel/helper-compilation-targets': 7.23.6
-      '@babel/helper-module-transforms': 7.23.3(@babel/core@7.24.1)
+      '@babel/helper-module-transforms': 7.23.3(@babel/core@7.24.3)
       '@babel/helpers': 7.24.1
       '@babel/parser': 7.24.1
       '@babel/template': 7.24.0
@@ -6264,31 +6287,31 @@ snapshots:
       semver: 6.3.1
     dev: true
 
-  '@babel/helper-create-class-features-plugin@7.24.1(@babel/core@7.24.1)':
+  '@babel/helper-create-class-features-plugin@7.24.1(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-annotate-as-pure': 7.22.5
       '@babel/helper-environment-visitor': 7.22.20
       '@babel/helper-function-name': 7.23.0
       '@babel/helper-member-expression-to-functions': 7.23.0
       '@babel/helper-optimise-call-expression': 7.22.5
-      '@babel/helper-replace-supers': 7.24.1(@babel/core@7.24.1)
+      '@babel/helper-replace-supers': 7.24.1(@babel/core@7.24.3)
       '@babel/helper-skip-transparent-expression-wrappers': 7.22.5
       '@babel/helper-split-export-declaration': 7.22.6
       semver: 6.3.1
     dev: true
 
-  '@babel/helper-create-regexp-features-plugin@7.22.15(@babel/core@7.24.1)':
+  '@babel/helper-create-regexp-features-plugin@7.22.15(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-annotate-as-pure': 7.22.5
       regexpu-core: 5.3.2
       semver: 6.3.1
     dev: true
 
-  '@babel/helper-define-polyfill-provider@0.6.1(@babel/core@7.24.1)':
+  '@babel/helper-define-polyfill-provider@0.6.1(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-compilation-targets': 7.23.6
       '@babel/helper-plugin-utils': 7.24.0
       debug: 4.3.4
@@ -6322,9 +6345,14 @@ snapshots:
       '@babel/types': 7.24.0
     dev: true
 
-  '@babel/helper-module-transforms@7.23.3(@babel/core@7.24.1)':
+  '@babel/helper-module-imports@7.24.3':
+    dependencies:
+      '@babel/types': 7.24.0
+    dev: true
+
+  '@babel/helper-module-transforms@7.23.3(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-environment-visitor': 7.22.20
       '@babel/helper-module-imports': 7.24.1
       '@babel/helper-simple-access': 7.22.5
@@ -6340,17 +6368,17 @@ snapshots:
   '@babel/helper-plugin-utils@7.24.0':
     dev: true
 
-  '@babel/helper-remap-async-to-generator@7.22.20(@babel/core@7.24.1)':
+  '@babel/helper-remap-async-to-generator@7.22.20(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-annotate-as-pure': 7.22.5
       '@babel/helper-environment-visitor': 7.22.20
       '@babel/helper-wrap-function': 7.22.20
     dev: true
 
-  '@babel/helper-replace-supers@7.24.1(@babel/core@7.24.1)':
+  '@babel/helper-replace-supers@7.24.1(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-environment-visitor': 7.22.20
       '@babel/helper-member-expression-to-functions': 7.23.0
       '@babel/helper-optimise-call-expression': 7.22.5
@@ -6404,683 +6432,691 @@ snapshots:
       picocolors: 1.0.0
     dev: true
 
+  '@babel/highlight@7.24.2':
+    dependencies:
+      '@babel/helper-validator-identifier': 7.22.20
+      chalk: 2.4.2
+      js-tokens: 4.0.0
+      picocolors: 1.0.0
+    dev: true
+
   '@babel/parser@7.24.1':
     dependencies:
       '@babel/types': 7.24.0
     dev: true
 
-  '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.24.1(@babel/core@7.24.1)':
+  '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.24.1(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.24.1(@babel/core@7.24.1)':
+  '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.24.1(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/helper-skip-transparent-expression-wrappers': 7.22.5
-      '@babel/plugin-transform-optional-chaining': 7.24.1(@babel/core@7.24.1)
+      '@babel/plugin-transform-optional-chaining': 7.24.1(@babel/core@7.24.3)
     dev: true
 
-  '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@7.24.1(@babel/core@7.24.1)':
+  '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@7.24.1(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-environment-visitor': 7.22.20
       '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  '@babel/plugin-proposal-nullish-coalescing-operator@7.18.6(@babel/core@7.24.1)':
+  '@babel/plugin-proposal-nullish-coalescing-operator@7.18.6(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-plugin-utils': 7.24.0
-      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.24.1)
+      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.24.3)
     dev: true
 
-  '@babel/plugin-proposal-optional-chaining@7.21.0(@babel/core@7.24.1)':
+  '@babel/plugin-proposal-optional-chaining@7.21.0(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/helper-skip-transparent-expression-wrappers': 7.22.5
-      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.24.1)
+      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.24.3)
     dev: true
 
-  '@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2(@babel/core@7.24.1)':
+  '@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
     dev: true
 
-  '@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.24.1)':
+  '@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  '@babel/plugin-syntax-bigint@7.8.3(@babel/core@7.24.1)':
+  '@babel/plugin-syntax-bigint@7.8.3(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  '@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.24.1)':
+  '@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  '@babel/plugin-syntax-class-static-block@7.14.5(@babel/core@7.24.1)':
+  '@babel/plugin-syntax-class-static-block@7.14.5(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  '@babel/plugin-syntax-dynamic-import@7.8.3(@babel/core@7.24.1)':
+  '@babel/plugin-syntax-dynamic-import@7.8.3(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  '@babel/plugin-syntax-export-namespace-from@7.8.3(@babel/core@7.24.1)':
+  '@babel/plugin-syntax-export-namespace-from@7.8.3(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  '@babel/plugin-syntax-import-assertions@7.24.1(@babel/core@7.24.1)':
+  '@babel/plugin-syntax-import-assertions@7.24.1(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  '@babel/plugin-syntax-import-attributes@7.24.1(@babel/core@7.24.1)':
+  '@babel/plugin-syntax-import-attributes@7.24.1(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  '@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.24.1)':
+  '@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  '@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.24.1)':
+  '@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  '@babel/plugin-syntax-jsx@7.24.1(@babel/core@7.24.1)':
+  '@babel/plugin-syntax-jsx@7.24.1(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  '@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.24.1)':
+  '@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  '@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.24.1)':
+  '@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  '@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.24.1)':
+  '@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  '@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.24.1)':
+  '@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  '@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.24.1)':
+  '@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  '@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.24.1)':
+  '@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  '@babel/plugin-syntax-private-property-in-object@7.14.5(@babel/core@7.24.1)':
+  '@babel/plugin-syntax-private-property-in-object@7.14.5(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  '@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.24.1)':
+  '@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  '@babel/plugin-syntax-typescript@7.24.1(@babel/core@7.24.1)':
+  '@babel/plugin-syntax-typescript@7.24.1(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  '@babel/plugin-syntax-unicode-sets-regex@7.18.6(@babel/core@7.24.1)':
+  '@babel/plugin-syntax-unicode-sets-regex@7.18.6(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
-      '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.24.1)
+      '@babel/core': 7.24.3
+      '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.24.3)
       '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  '@babel/plugin-transform-arrow-functions@7.24.1(@babel/core@7.24.1)':
+  '@babel/plugin-transform-arrow-functions@7.24.1(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  '@babel/plugin-transform-async-generator-functions@7.24.1(@babel/core@7.24.1)':
+  '@babel/plugin-transform-async-generator-functions@7.24.3(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-environment-visitor': 7.22.20
       '@babel/helper-plugin-utils': 7.24.0
-      '@babel/helper-remap-async-to-generator': 7.22.20(@babel/core@7.24.1)
-      '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.24.1)
+      '@babel/helper-remap-async-to-generator': 7.22.20(@babel/core@7.24.3)
+      '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.24.3)
     dev: true
 
-  '@babel/plugin-transform-async-to-generator@7.24.1(@babel/core@7.24.1)':
+  '@babel/plugin-transform-async-to-generator@7.24.1(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-module-imports': 7.24.1
       '@babel/helper-plugin-utils': 7.24.0
-      '@babel/helper-remap-async-to-generator': 7.22.20(@babel/core@7.24.1)
+      '@babel/helper-remap-async-to-generator': 7.22.20(@babel/core@7.24.3)
     dev: true
 
-  '@babel/plugin-transform-block-scoped-functions@7.24.1(@babel/core@7.24.1)':
+  '@babel/plugin-transform-block-scoped-functions@7.24.1(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  '@babel/plugin-transform-block-scoping@7.24.1(@babel/core@7.24.1)':
+  '@babel/plugin-transform-block-scoping@7.24.1(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  '@babel/plugin-transform-class-properties@7.24.1(@babel/core@7.24.1)':
+  '@babel/plugin-transform-class-properties@7.24.1(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
-      '@babel/helper-create-class-features-plugin': 7.24.1(@babel/core@7.24.1)
+      '@babel/core': 7.24.3
+      '@babel/helper-create-class-features-plugin': 7.24.1(@babel/core@7.24.3)
       '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  '@babel/plugin-transform-class-static-block@7.24.1(@babel/core@7.24.1)':
+  '@babel/plugin-transform-class-static-block@7.24.1(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
-      '@babel/helper-create-class-features-plugin': 7.24.1(@babel/core@7.24.1)
+      '@babel/core': 7.24.3
+      '@babel/helper-create-class-features-plugin': 7.24.1(@babel/core@7.24.3)
       '@babel/helper-plugin-utils': 7.24.0
-      '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.24.1)
+      '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.24.3)
     dev: true
 
-  '@babel/plugin-transform-classes@7.24.1(@babel/core@7.24.1)':
+  '@babel/plugin-transform-classes@7.24.1(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-annotate-as-pure': 7.22.5
       '@babel/helper-compilation-targets': 7.23.6
       '@babel/helper-environment-visitor': 7.22.20
       '@babel/helper-function-name': 7.23.0
       '@babel/helper-plugin-utils': 7.24.0
-      '@babel/helper-replace-supers': 7.24.1(@babel/core@7.24.1)
+      '@babel/helper-replace-supers': 7.24.1(@babel/core@7.24.3)
       '@babel/helper-split-export-declaration': 7.22.6
       globals: 11.12.0
     dev: true
 
-  '@babel/plugin-transform-computed-properties@7.24.1(@babel/core@7.24.1)':
+  '@babel/plugin-transform-computed-properties@7.24.1(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/template': 7.24.0
     dev: true
 
-  '@babel/plugin-transform-destructuring@7.24.1(@babel/core@7.24.1)':
+  '@babel/plugin-transform-destructuring@7.24.1(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  '@babel/plugin-transform-dotall-regex@7.24.1(@babel/core@7.24.1)':
+  '@babel/plugin-transform-dotall-regex@7.24.1(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
-      '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.24.1)
+      '@babel/core': 7.24.3
+      '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.24.3)
       '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  '@babel/plugin-transform-duplicate-keys@7.24.1(@babel/core@7.24.1)':
+  '@babel/plugin-transform-duplicate-keys@7.24.1(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  '@babel/plugin-transform-dynamic-import@7.24.1(@babel/core@7.24.1)':
+  '@babel/plugin-transform-dynamic-import@7.24.1(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-plugin-utils': 7.24.0
-      '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.24.1)
+      '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.24.3)
     dev: true
 
-  '@babel/plugin-transform-exponentiation-operator@7.24.1(@babel/core@7.24.1)':
+  '@babel/plugin-transform-exponentiation-operator@7.24.1(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-builder-binary-assignment-operator-visitor': 7.22.15
       '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  '@babel/plugin-transform-export-namespace-from@7.24.1(@babel/core@7.24.1)':
+  '@babel/plugin-transform-export-namespace-from@7.24.1(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-plugin-utils': 7.24.0
-      '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.24.1)
+      '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.24.3)
     dev: true
 
-  '@babel/plugin-transform-for-of@7.24.1(@babel/core@7.24.1)':
+  '@babel/plugin-transform-for-of@7.24.1(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/helper-skip-transparent-expression-wrappers': 7.22.5
     dev: true
 
-  '@babel/plugin-transform-function-name@7.24.1(@babel/core@7.24.1)':
+  '@babel/plugin-transform-function-name@7.24.1(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-compilation-targets': 7.23.6
       '@babel/helper-function-name': 7.23.0
       '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  '@babel/plugin-transform-json-strings@7.24.1(@babel/core@7.24.1)':
+  '@babel/plugin-transform-json-strings@7.24.1(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-plugin-utils': 7.24.0
-      '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.24.1)
+      '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.24.3)
     dev: true
 
-  '@babel/plugin-transform-literals@7.24.1(@babel/core@7.24.1)':
+  '@babel/plugin-transform-literals@7.24.1(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  '@babel/plugin-transform-logical-assignment-operators@7.24.1(@babel/core@7.24.1)':
+  '@babel/plugin-transform-logical-assignment-operators@7.24.1(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-plugin-utils': 7.24.0
-      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.24.1)
+      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.24.3)
     dev: true
 
-  '@babel/plugin-transform-member-expression-literals@7.24.1(@babel/core@7.24.1)':
+  '@babel/plugin-transform-member-expression-literals@7.24.1(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  '@babel/plugin-transform-modules-amd@7.24.1(@babel/core@7.24.1)':
+  '@babel/plugin-transform-modules-amd@7.24.1(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
-      '@babel/helper-module-transforms': 7.23.3(@babel/core@7.24.1)
+      '@babel/core': 7.24.3
+      '@babel/helper-module-transforms': 7.23.3(@babel/core@7.24.3)
       '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  '@babel/plugin-transform-modules-commonjs@7.24.1(@babel/core@7.24.1)':
+  '@babel/plugin-transform-modules-commonjs@7.24.1(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
-      '@babel/helper-module-transforms': 7.23.3(@babel/core@7.24.1)
+      '@babel/core': 7.24.3
+      '@babel/helper-module-transforms': 7.23.3(@babel/core@7.24.3)
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/helper-simple-access': 7.22.5
     dev: true
 
-  '@babel/plugin-transform-modules-systemjs@7.24.1(@babel/core@7.24.1)':
+  '@babel/plugin-transform-modules-systemjs@7.24.1(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-hoist-variables': 7.22.5
-      '@babel/helper-module-transforms': 7.23.3(@babel/core@7.24.1)
+      '@babel/helper-module-transforms': 7.23.3(@babel/core@7.24.3)
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/helper-validator-identifier': 7.22.20
     dev: true
 
-  '@babel/plugin-transform-modules-umd@7.24.1(@babel/core@7.24.1)':
+  '@babel/plugin-transform-modules-umd@7.24.1(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
-      '@babel/helper-module-transforms': 7.23.3(@babel/core@7.24.1)
+      '@babel/core': 7.24.3
+      '@babel/helper-module-transforms': 7.23.3(@babel/core@7.24.3)
       '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  '@babel/plugin-transform-named-capturing-groups-regex@7.22.5(@babel/core@7.24.1)':
+  '@babel/plugin-transform-named-capturing-groups-regex@7.22.5(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
-      '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.24.1)
+      '@babel/core': 7.24.3
+      '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.24.3)
       '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  '@babel/plugin-transform-new-target@7.24.1(@babel/core@7.24.1)':
+  '@babel/plugin-transform-new-target@7.24.1(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  '@babel/plugin-transform-nullish-coalescing-operator@7.24.1(@babel/core@7.24.1)':
+  '@babel/plugin-transform-nullish-coalescing-operator@7.24.1(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-plugin-utils': 7.24.0
-      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.24.1)
+      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.24.3)
     dev: true
 
-  '@babel/plugin-transform-numeric-separator@7.24.1(@babel/core@7.24.1)':
+  '@babel/plugin-transform-numeric-separator@7.24.1(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-plugin-utils': 7.24.0
-      '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.24.1)
+      '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.24.3)
     dev: true
 
-  '@babel/plugin-transform-object-rest-spread@7.24.1(@babel/core@7.24.1)':
+  '@babel/plugin-transform-object-rest-spread@7.24.1(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-compilation-targets': 7.23.6
       '@babel/helper-plugin-utils': 7.24.0
-      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.24.1)
-      '@babel/plugin-transform-parameters': 7.24.1(@babel/core@7.24.1)
+      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.24.3)
+      '@babel/plugin-transform-parameters': 7.24.1(@babel/core@7.24.3)
     dev: true
 
-  '@babel/plugin-transform-object-super@7.24.1(@babel/core@7.24.1)':
+  '@babel/plugin-transform-object-super@7.24.1(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-plugin-utils': 7.24.0
-      '@babel/helper-replace-supers': 7.24.1(@babel/core@7.24.1)
+      '@babel/helper-replace-supers': 7.24.1(@babel/core@7.24.3)
     dev: true
 
-  '@babel/plugin-transform-optional-catch-binding@7.24.1(@babel/core@7.24.1)':
+  '@babel/plugin-transform-optional-catch-binding@7.24.1(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-plugin-utils': 7.24.0
-      '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.24.1)
+      '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.24.3)
     dev: true
 
-  '@babel/plugin-transform-optional-chaining@7.24.1(@babel/core@7.24.1)':
+  '@babel/plugin-transform-optional-chaining@7.24.1(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/helper-skip-transparent-expression-wrappers': 7.22.5
-      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.24.1)
+      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.24.3)
     dev: true
 
-  '@babel/plugin-transform-parameters@7.24.1(@babel/core@7.24.1)':
+  '@babel/plugin-transform-parameters@7.24.1(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  '@babel/plugin-transform-private-methods@7.24.1(@babel/core@7.24.1)':
+  '@babel/plugin-transform-private-methods@7.24.1(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
-      '@babel/helper-create-class-features-plugin': 7.24.1(@babel/core@7.24.1)
+      '@babel/core': 7.24.3
+      '@babel/helper-create-class-features-plugin': 7.24.1(@babel/core@7.24.3)
       '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  '@babel/plugin-transform-private-property-in-object@7.24.1(@babel/core@7.24.1)':
+  '@babel/plugin-transform-private-property-in-object@7.24.1(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-annotate-as-pure': 7.22.5
-      '@babel/helper-create-class-features-plugin': 7.24.1(@babel/core@7.24.1)
+      '@babel/helper-create-class-features-plugin': 7.24.1(@babel/core@7.24.3)
       '@babel/helper-plugin-utils': 7.24.0
-      '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.24.1)
+      '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.24.3)
     dev: true
 
-  '@babel/plugin-transform-property-literals@7.24.1(@babel/core@7.24.1)':
+  '@babel/plugin-transform-property-literals@7.24.1(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  '@babel/plugin-transform-react-display-name@7.24.1(@babel/core@7.24.1)':
+  '@babel/plugin-transform-react-display-name@7.24.1(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  '@babel/plugin-transform-react-jsx-development@7.22.5(@babel/core@7.24.1)':
+  '@babel/plugin-transform-react-jsx-development@7.22.5(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
-      '@babel/plugin-transform-react-jsx': 7.23.4(@babel/core@7.24.1)
+      '@babel/core': 7.24.3
+      '@babel/plugin-transform-react-jsx': 7.23.4(@babel/core@7.24.3)
     dev: true
 
-  '@babel/plugin-transform-react-jsx@7.23.4(@babel/core@7.24.1)':
+  '@babel/plugin-transform-react-jsx@7.23.4(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-annotate-as-pure': 7.22.5
       '@babel/helper-module-imports': 7.24.1
       '@babel/helper-plugin-utils': 7.24.0
-      '@babel/plugin-syntax-jsx': 7.24.1(@babel/core@7.24.1)
+      '@babel/plugin-syntax-jsx': 7.24.1(@babel/core@7.24.3)
       '@babel/types': 7.24.0
     dev: true
 
-  '@babel/plugin-transform-react-pure-annotations@7.24.1(@babel/core@7.24.1)':
+  '@babel/plugin-transform-react-pure-annotations@7.24.1(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-annotate-as-pure': 7.22.5
       '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  '@babel/plugin-transform-regenerator@7.24.1(@babel/core@7.24.1)':
+  '@babel/plugin-transform-regenerator@7.24.1(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-plugin-utils': 7.24.0
       regenerator-transform: 0.15.2
     dev: true
 
-  '@babel/plugin-transform-reserved-words@7.24.1(@babel/core@7.24.1)':
+  '@babel/plugin-transform-reserved-words@7.24.1(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  '@babel/plugin-transform-runtime@7.24.1(@babel/core@7.24.1)':
+  '@babel/plugin-transform-runtime@7.24.3(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
-      '@babel/helper-module-imports': 7.24.1
+      '@babel/core': 7.24.3
+      '@babel/helper-module-imports': 7.24.3
       '@babel/helper-plugin-utils': 7.24.0
-      babel-plugin-polyfill-corejs2: 0.4.10(@babel/core@7.24.1)
-      babel-plugin-polyfill-corejs3: 0.10.1(@babel/core@7.24.1)
-      babel-plugin-polyfill-regenerator: 0.6.1(@babel/core@7.24.1)
+      babel-plugin-polyfill-corejs2: 0.4.10(@babel/core@7.24.3)
+      babel-plugin-polyfill-corejs3: 0.10.1(@babel/core@7.24.3)
+      babel-plugin-polyfill-regenerator: 0.6.1(@babel/core@7.24.3)
       semver: 6.3.1
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  '@babel/plugin-transform-shorthand-properties@7.24.1(@babel/core@7.24.1)':
+  '@babel/plugin-transform-shorthand-properties@7.24.1(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  '@babel/plugin-transform-spread@7.24.1(@babel/core@7.24.1)':
+  '@babel/plugin-transform-spread@7.24.1(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/helper-skip-transparent-expression-wrappers': 7.22.5
     dev: true
 
-  '@babel/plugin-transform-sticky-regex@7.24.1(@babel/core@7.24.1)':
+  '@babel/plugin-transform-sticky-regex@7.24.1(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  '@babel/plugin-transform-template-literals@7.24.1(@babel/core@7.24.1)':
+  '@babel/plugin-transform-template-literals@7.24.1(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  '@babel/plugin-transform-typeof-symbol@7.24.1(@babel/core@7.24.1)':
+  '@babel/plugin-transform-typeof-symbol@7.24.1(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  '@babel/plugin-transform-typescript@7.24.1(@babel/core@7.24.1)':
+  '@babel/plugin-transform-typescript@7.24.1(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-annotate-as-pure': 7.22.5
-      '@babel/helper-create-class-features-plugin': 7.24.1(@babel/core@7.24.1)
+      '@babel/helper-create-class-features-plugin': 7.24.1(@babel/core@7.24.3)
       '@babel/helper-plugin-utils': 7.24.0
-      '@babel/plugin-syntax-typescript': 7.24.1(@babel/core@7.24.1)
+      '@babel/plugin-syntax-typescript': 7.24.1(@babel/core@7.24.3)
     dev: true
 
-  '@babel/plugin-transform-unicode-escapes@7.24.1(@babel/core@7.24.1)':
+  '@babel/plugin-transform-unicode-escapes@7.24.1(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  '@babel/plugin-transform-unicode-property-regex@7.24.1(@babel/core@7.24.1)':
+  '@babel/plugin-transform-unicode-property-regex@7.24.1(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
-      '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.24.1)
+      '@babel/core': 7.24.3
+      '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.24.3)
       '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  '@babel/plugin-transform-unicode-regex@7.24.1(@babel/core@7.24.1)':
+  '@babel/plugin-transform-unicode-regex@7.24.1(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
-      '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.24.1)
+      '@babel/core': 7.24.3
+      '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.24.3)
       '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  '@babel/plugin-transform-unicode-sets-regex@7.24.1(@babel/core@7.24.1)':
+  '@babel/plugin-transform-unicode-sets-regex@7.24.1(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
-      '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.24.1)
+      '@babel/core': 7.24.3
+      '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.24.3)
       '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
-  '@babel/preset-env@7.24.1(@babel/core@7.24.1)':
+  '@babel/preset-env@7.24.3(@babel/core@7.24.3)':
     dependencies:
       '@babel/compat-data': 7.24.1
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-compilation-targets': 7.23.6
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/helper-validator-option': 7.23.5
-      '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression': 7.24.1(@babel/core@7.24.1)
-      '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.24.1(@babel/core@7.24.1)
-      '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly': 7.24.1(@babel/core@7.24.1)
-      '@babel/plugin-proposal-private-property-in-object': 7.21.0-placeholder-for-preset-env.2(@babel/core@7.24.1)
-      '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.24.1)
-      '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.24.1)
-      '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.24.1)
-      '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.24.1)
-      '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.24.1)
-      '@babel/plugin-syntax-import-assertions': 7.24.1(@babel/core@7.24.1)
-      '@babel/plugin-syntax-import-attributes': 7.24.1(@babel/core@7.24.1)
-      '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.24.1)
-      '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.24.1)
-      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.24.1)
-      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.24.1)
-      '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.24.1)
-      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.24.1)
-      '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.24.1)
-      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.24.1)
-      '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.24.1)
-      '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.24.1)
-      '@babel/plugin-syntax-unicode-sets-regex': 7.18.6(@babel/core@7.24.1)
-      '@babel/plugin-transform-arrow-functions': 7.24.1(@babel/core@7.24.1)
-      '@babel/plugin-transform-async-generator-functions': 7.24.1(@babel/core@7.24.1)
-      '@babel/plugin-transform-async-to-generator': 7.24.1(@babel/core@7.24.1)
-      '@babel/plugin-transform-block-scoped-functions': 7.24.1(@babel/core@7.24.1)
-      '@babel/plugin-transform-block-scoping': 7.24.1(@babel/core@7.24.1)
-      '@babel/plugin-transform-class-properties': 7.24.1(@babel/core@7.24.1)
-      '@babel/plugin-transform-class-static-block': 7.24.1(@babel/core@7.24.1)
-      '@babel/plugin-transform-classes': 7.24.1(@babel/core@7.24.1)
-      '@babel/plugin-transform-computed-properties': 7.24.1(@babel/core@7.24.1)
-      '@babel/plugin-transform-destructuring': 7.24.1(@babel/core@7.24.1)
-      '@babel/plugin-transform-dotall-regex': 7.24.1(@babel/core@7.24.1)
-      '@babel/plugin-transform-duplicate-keys': 7.24.1(@babel/core@7.24.1)
-      '@babel/plugin-transform-dynamic-import': 7.24.1(@babel/core@7.24.1)
-      '@babel/plugin-transform-exponentiation-operator': 7.24.1(@babel/core@7.24.1)
-      '@babel/plugin-transform-export-namespace-from': 7.24.1(@babel/core@7.24.1)
-      '@babel/plugin-transform-for-of': 7.24.1(@babel/core@7.24.1)
-      '@babel/plugin-transform-function-name': 7.24.1(@babel/core@7.24.1)
-      '@babel/plugin-transform-json-strings': 7.24.1(@babel/core@7.24.1)
-      '@babel/plugin-transform-literals': 7.24.1(@babel/core@7.24.1)
-      '@babel/plugin-transform-logical-assignment-operators': 7.24.1(@babel/core@7.24.1)
-      '@babel/plugin-transform-member-expression-literals': 7.24.1(@babel/core@7.24.1)
-      '@babel/plugin-transform-modules-amd': 7.24.1(@babel/core@7.24.1)
-      '@babel/plugin-transform-modules-commonjs': 7.24.1(@babel/core@7.24.1)
-      '@babel/plugin-transform-modules-systemjs': 7.24.1(@babel/core@7.24.1)
-      '@babel/plugin-transform-modules-umd': 7.24.1(@babel/core@7.24.1)
-      '@babel/plugin-transform-named-capturing-groups-regex': 7.22.5(@babel/core@7.24.1)
-      '@babel/plugin-transform-new-target': 7.24.1(@babel/core@7.24.1)
-      '@babel/plugin-transform-nullish-coalescing-operator': 7.24.1(@babel/core@7.24.1)
-      '@babel/plugin-transform-numeric-separator': 7.24.1(@babel/core@7.24.1)
-      '@babel/plugin-transform-object-rest-spread': 7.24.1(@babel/core@7.24.1)
-      '@babel/plugin-transform-object-super': 7.24.1(@babel/core@7.24.1)
-      '@babel/plugin-transform-optional-catch-binding': 7.24.1(@babel/core@7.24.1)
-      '@babel/plugin-transform-optional-chaining': 7.24.1(@babel/core@7.24.1)
-      '@babel/plugin-transform-parameters': 7.24.1(@babel/core@7.24.1)
-      '@babel/plugin-transform-private-methods': 7.24.1(@babel/core@7.24.1)
-      '@babel/plugin-transform-private-property-in-object': 7.24.1(@babel/core@7.24.1)
-      '@babel/plugin-transform-property-literals': 7.24.1(@babel/core@7.24.1)
-      '@babel/plugin-transform-regenerator': 7.24.1(@babel/core@7.24.1)
-      '@babel/plugin-transform-reserved-words': 7.24.1(@babel/core@7.24.1)
-      '@babel/plugin-transform-shorthand-properties': 7.24.1(@babel/core@7.24.1)
-      '@babel/plugin-transform-spread': 7.24.1(@babel/core@7.24.1)
-      '@babel/plugin-transform-sticky-regex': 7.24.1(@babel/core@7.24.1)
-      '@babel/plugin-transform-template-literals': 7.24.1(@babel/core@7.24.1)
-      '@babel/plugin-transform-typeof-symbol': 7.24.1(@babel/core@7.24.1)
-      '@babel/plugin-transform-unicode-escapes': 7.24.1(@babel/core@7.24.1)
-      '@babel/plugin-transform-unicode-property-regex': 7.24.1(@babel/core@7.24.1)
-      '@babel/plugin-transform-unicode-regex': 7.24.1(@babel/core@7.24.1)
-      '@babel/plugin-transform-unicode-sets-regex': 7.24.1(@babel/core@7.24.1)
-      '@babel/preset-modules': 0.1.6-no-external-plugins(@babel/core@7.24.1)
-      babel-plugin-polyfill-corejs2: 0.4.10(@babel/core@7.24.1)
-      babel-plugin-polyfill-corejs3: 0.10.1(@babel/core@7.24.1)
-      babel-plugin-polyfill-regenerator: 0.6.1(@babel/core@7.24.1)
+      '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression': 7.24.1(@babel/core@7.24.3)
+      '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.24.1(@babel/core@7.24.3)
+      '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly': 7.24.1(@babel/core@7.24.3)
+      '@babel/plugin-proposal-private-property-in-object': 7.21.0-placeholder-for-preset-env.2(@babel/core@7.24.3)
+      '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.24.3)
+      '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.24.3)
+      '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.24.3)
+      '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.24.3)
+      '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.24.3)
+      '@babel/plugin-syntax-import-assertions': 7.24.1(@babel/core@7.24.3)
+      '@babel/plugin-syntax-import-attributes': 7.24.1(@babel/core@7.24.3)
+      '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.24.3)
+      '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.24.3)
+      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.24.3)
+      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.24.3)
+      '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.24.3)
+      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.24.3)
+      '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.24.3)
+      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.24.3)
+      '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.24.3)
+      '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.24.3)
+      '@babel/plugin-syntax-unicode-sets-regex': 7.18.6(@babel/core@7.24.3)
+      '@babel/plugin-transform-arrow-functions': 7.24.1(@babel/core@7.24.3)
+      '@babel/plugin-transform-async-generator-functions': 7.24.3(@babel/core@7.24.3)
+      '@babel/plugin-transform-async-to-generator': 7.24.1(@babel/core@7.24.3)
+      '@babel/plugin-transform-block-scoped-functions': 7.24.1(@babel/core@7.24.3)
+      '@babel/plugin-transform-block-scoping': 7.24.1(@babel/core@7.24.3)
+      '@babel/plugin-transform-class-properties': 7.24.1(@babel/core@7.24.3)
+      '@babel/plugin-transform-class-static-block': 7.24.1(@babel/core@7.24.3)
+      '@babel/plugin-transform-classes': 7.24.1(@babel/core@7.24.3)
+      '@babel/plugin-transform-computed-properties': 7.24.1(@babel/core@7.24.3)
+      '@babel/plugin-transform-destructuring': 7.24.1(@babel/core@7.24.3)
+      '@babel/plugin-transform-dotall-regex': 7.24.1(@babel/core@7.24.3)
+      '@babel/plugin-transform-duplicate-keys': 7.24.1(@babel/core@7.24.3)
+      '@babel/plugin-transform-dynamic-import': 7.24.1(@babel/core@7.24.3)
+      '@babel/plugin-transform-exponentiation-operator': 7.24.1(@babel/core@7.24.3)
+      '@babel/plugin-transform-export-namespace-from': 7.24.1(@babel/core@7.24.3)
+      '@babel/plugin-transform-for-of': 7.24.1(@babel/core@7.24.3)
+      '@babel/plugin-transform-function-name': 7.24.1(@babel/core@7.24.3)
+      '@babel/plugin-transform-json-strings': 7.24.1(@babel/core@7.24.3)
+      '@babel/plugin-transform-literals': 7.24.1(@babel/core@7.24.3)
+      '@babel/plugin-transform-logical-assignment-operators': 7.24.1(@babel/core@7.24.3)
+      '@babel/plugin-transform-member-expression-literals': 7.24.1(@babel/core@7.24.3)
+      '@babel/plugin-transform-modules-amd': 7.24.1(@babel/core@7.24.3)
+      '@babel/plugin-transform-modules-commonjs': 7.24.1(@babel/core@7.24.3)
+      '@babel/plugin-transform-modules-systemjs': 7.24.1(@babel/core@7.24.3)
+      '@babel/plugin-transform-modules-umd': 7.24.1(@babel/core@7.24.3)
+      '@babel/plugin-transform-named-capturing-groups-regex': 7.22.5(@babel/core@7.24.3)
+      '@babel/plugin-transform-new-target': 7.24.1(@babel/core@7.24.3)
+      '@babel/plugin-transform-nullish-coalescing-operator': 7.24.1(@babel/core@7.24.3)
+      '@babel/plugin-transform-numeric-separator': 7.24.1(@babel/core@7.24.3)
+      '@babel/plugin-transform-object-rest-spread': 7.24.1(@babel/core@7.24.3)
+      '@babel/plugin-transform-object-super': 7.24.1(@babel/core@7.24.3)
+      '@babel/plugin-transform-optional-catch-binding': 7.24.1(@babel/core@7.24.3)
+      '@babel/plugin-transform-optional-chaining': 7.24.1(@babel/core@7.24.3)
+      '@babel/plugin-transform-parameters': 7.24.1(@babel/core@7.24.3)
+      '@babel/plugin-transform-private-methods': 7.24.1(@babel/core@7.24.3)
+      '@babel/plugin-transform-private-property-in-object': 7.24.1(@babel/core@7.24.3)
+      '@babel/plugin-transform-property-literals': 7.24.1(@babel/core@7.24.3)
+      '@babel/plugin-transform-regenerator': 7.24.1(@babel/core@7.24.3)
+      '@babel/plugin-transform-reserved-words': 7.24.1(@babel/core@7.24.3)
+      '@babel/plugin-transform-shorthand-properties': 7.24.1(@babel/core@7.24.3)
+      '@babel/plugin-transform-spread': 7.24.1(@babel/core@7.24.3)
+      '@babel/plugin-transform-sticky-regex': 7.24.1(@babel/core@7.24.3)
+      '@babel/plugin-transform-template-literals': 7.24.1(@babel/core@7.24.3)
+      '@babel/plugin-transform-typeof-symbol': 7.24.1(@babel/core@7.24.3)
+      '@babel/plugin-transform-unicode-escapes': 7.24.1(@babel/core@7.24.3)
+      '@babel/plugin-transform-unicode-property-regex': 7.24.1(@babel/core@7.24.3)
+      '@babel/plugin-transform-unicode-regex': 7.24.1(@babel/core@7.24.3)
+      '@babel/plugin-transform-unicode-sets-regex': 7.24.1(@babel/core@7.24.3)
+      '@babel/preset-modules': 0.1.6-no-external-plugins(@babel/core@7.24.3)
+      babel-plugin-polyfill-corejs2: 0.4.10(@babel/core@7.24.3)
+      babel-plugin-polyfill-corejs3: 0.10.4(@babel/core@7.24.3)
+      babel-plugin-polyfill-regenerator: 0.6.1(@babel/core@7.24.3)
       core-js-compat: 3.36.1
       semver: 6.3.1
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  '@babel/preset-modules@0.1.6-no-external-plugins(@babel/core@7.24.1)':
+  '@babel/preset-modules@0.1.6-no-external-plugins(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/types': 7.24.0
       esutils: 2.0.3
     dev: true
 
-  '@babel/preset-react@7.24.1(@babel/core@7.24.1)':
+  '@babel/preset-react@7.24.1(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/helper-validator-option': 7.23.5
-      '@babel/plugin-transform-react-display-name': 7.24.1(@babel/core@7.24.1)
-      '@babel/plugin-transform-react-jsx': 7.23.4(@babel/core@7.24.1)
-      '@babel/plugin-transform-react-jsx-development': 7.22.5(@babel/core@7.24.1)
-      '@babel/plugin-transform-react-pure-annotations': 7.24.1(@babel/core@7.24.1)
+      '@babel/plugin-transform-react-display-name': 7.24.1(@babel/core@7.24.3)
+      '@babel/plugin-transform-react-jsx': 7.23.4(@babel/core@7.24.3)
+      '@babel/plugin-transform-react-jsx-development': 7.22.5(@babel/core@7.24.3)
+      '@babel/plugin-transform-react-pure-annotations': 7.24.1(@babel/core@7.24.3)
     dev: true
 
-  '@babel/preset-typescript@7.24.1(@babel/core@7.24.1)':
+  '@babel/preset-typescript@7.24.1(@babel/core@7.24.3)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/helper-validator-option': 7.23.5
-      '@babel/plugin-syntax-jsx': 7.24.1(@babel/core@7.24.1)
-      '@babel/plugin-transform-modules-commonjs': 7.24.1(@babel/core@7.24.1)
-      '@babel/plugin-transform-typescript': 7.24.1(@babel/core@7.24.1)
+      '@babel/plugin-syntax-jsx': 7.24.1(@babel/core@7.24.3)
+      '@babel/plugin-transform-modules-commonjs': 7.24.1(@babel/core@7.24.3)
+      '@babel/plugin-transform-typescript': 7.24.1(@babel/core@7.24.3)
     dev: true
 
   '@babel/regjsgen@0.8.0':
@@ -7093,14 +7129,14 @@ snapshots:
 
   '@babel/template@7.24.0':
     dependencies:
-      '@babel/code-frame': 7.24.1
+      '@babel/code-frame': 7.24.2
       '@babel/parser': 7.24.1
       '@babel/types': 7.24.0
     dev: true
 
   '@babel/traverse@7.24.1':
     dependencies:
-      '@babel/code-frame': 7.24.1
+      '@babel/code-frame': 7.24.2
       '@babel/generator': 7.24.1
       '@babel/helper-environment-visitor': 7.22.20
       '@babel/helper-function-name': 7.23.0
@@ -7610,7 +7646,7 @@ snapshots:
 
   '@jest/transform@29.7.0':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@jest/types': 29.6.3
       '@jridgewell/trace-mapping': 0.3.25
       babel-plugin-istanbul: 6.1.1
@@ -7854,9 +7890,9 @@ snapshots:
       react: 18.2.0
     dev: true
 
-  '@rollup/plugin-babel@6.0.4(@babel/core@7.24.1)(rollup@4.13.0)':
+  '@rollup/plugin-babel@6.0.4(@babel/core@7.24.3)(rollup@4.13.0)':
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/helper-module-imports': 7.24.1
       '@rollup/pluginutils': 5.1.0(rollup@4.13.0)
       rollup: 4.13.0
@@ -8226,13 +8262,13 @@ snapshots:
       '@types/node': 20.11.30
     optional: true
 
-  '@typescript-eslint/eslint-plugin@7.3.1(@typescript-eslint/parser@7.3.1(eslint@8.57.0)(typescript@5.4.2))(eslint@8.57.0)(typescript@5.4.2)':
+  '@typescript-eslint/eslint-plugin@7.3.1(@typescript-eslint/parser@7.3.1(eslint@8.57.0)(typescript@5.4.3))(eslint@8.57.0)(typescript@5.4.3)':
     dependencies:
       '@eslint-community/regexpp': 4.10.0
-      '@typescript-eslint/parser': 7.3.1(eslint@8.57.0)(typescript@5.4.2)
+      '@typescript-eslint/parser': 7.3.1(eslint@8.57.0)(typescript@5.4.3)
       '@typescript-eslint/scope-manager': 7.3.1
-      '@typescript-eslint/type-utils': 7.3.1(eslint@8.57.0)(typescript@5.4.2)
-      '@typescript-eslint/utils': 7.3.1(eslint@8.57.0)(typescript@5.4.2)
+      '@typescript-eslint/type-utils': 7.3.1(eslint@8.57.0)(typescript@5.4.3)
+      '@typescript-eslint/utils': 7.3.1(eslint@8.57.0)(typescript@5.4.3)
       '@typescript-eslint/visitor-keys': 7.3.1
       debug: 4.3.4
       eslint: 8.57.0
@@ -8240,21 +8276,21 @@ snapshots:
       ignore: 5.3.1
       natural-compare: 1.4.0
       semver: 7.6.0
-      ts-api-utils: 1.3.0(typescript@5.4.2)
-      typescript: 5.4.2
+      ts-api-utils: 1.3.0(typescript@5.4.3)
+      typescript: 5.4.3
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  '@typescript-eslint/parser@7.3.1(eslint@8.57.0)(typescript@5.4.2)':
+  '@typescript-eslint/parser@7.3.1(eslint@8.57.0)(typescript@5.4.3)':
     dependencies:
       '@typescript-eslint/scope-manager': 7.3.1
       '@typescript-eslint/types': 7.3.1
-      '@typescript-eslint/typescript-estree': 7.3.1(typescript@5.4.2)
+      '@typescript-eslint/typescript-estree': 7.3.1(typescript@5.4.3)
       '@typescript-eslint/visitor-keys': 7.3.1
       debug: 4.3.4
       eslint: 8.57.0
-      typescript: 5.4.2
+      typescript: 5.4.3
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -8265,14 +8301,14 @@ snapshots:
       '@typescript-eslint/visitor-keys': 7.3.1
     dev: true
 
-  '@typescript-eslint/type-utils@7.3.1(eslint@8.57.0)(typescript@5.4.2)':
+  '@typescript-eslint/type-utils@7.3.1(eslint@8.57.0)(typescript@5.4.3)':
     dependencies:
-      '@typescript-eslint/typescript-estree': 7.3.1(typescript@5.4.2)
-      '@typescript-eslint/utils': 7.3.1(eslint@8.57.0)(typescript@5.4.2)
+      '@typescript-eslint/typescript-estree': 7.3.1(typescript@5.4.3)
+      '@typescript-eslint/utils': 7.3.1(eslint@8.57.0)(typescript@5.4.3)
       debug: 4.3.4
       eslint: 8.57.0
-      ts-api-utils: 1.3.0(typescript@5.4.2)
-      typescript: 5.4.2
+      ts-api-utils: 1.3.0(typescript@5.4.3)
+      typescript: 5.4.3
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -8280,7 +8316,7 @@ snapshots:
   '@typescript-eslint/types@7.3.1':
     dev: true
 
-  '@typescript-eslint/typescript-estree@7.3.1(typescript@5.4.2)':
+  '@typescript-eslint/typescript-estree@7.3.1(typescript@5.4.3)':
     dependencies:
       '@typescript-eslint/types': 7.3.1
       '@typescript-eslint/visitor-keys': 7.3.1
@@ -8289,20 +8325,20 @@ snapshots:
       is-glob: 4.0.3
       minimatch: 9.0.3
       semver: 7.6.0
-      ts-api-utils: 1.3.0(typescript@5.4.2)
-      typescript: 5.4.2
+      ts-api-utils: 1.3.0(typescript@5.4.3)
+      typescript: 5.4.3
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  '@typescript-eslint/utils@7.3.1(eslint@8.57.0)(typescript@5.4.2)':
+  '@typescript-eslint/utils@7.3.1(eslint@8.57.0)(typescript@5.4.3)':
     dependencies:
       '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0)
       '@types/json-schema': 7.0.15
       '@types/semver': 7.5.8
       '@typescript-eslint/scope-manager': 7.3.1
       '@typescript-eslint/types': 7.3.1
-      '@typescript-eslint/typescript-estree': 7.3.1(typescript@5.4.2)
+      '@typescript-eslint/typescript-estree': 7.3.1(typescript@5.4.3)
       eslint: 8.57.0
       semver: 7.6.0
     transitivePeerDependencies:
@@ -8343,7 +8379,7 @@ snapshots:
       '@vue/shared': 3.4.21
       estree-walker: 2.0.2
       magic-string: 0.30.8
-      postcss: 8.4.37
+      postcss: 8.4.38
       source-map-js: 1.2.0
     dev: true
 
@@ -8447,22 +8483,22 @@ snapshots:
       '@xtuc/long': 4.2.2
     dev: true
 
-  '@webpack-cli/configtest@2.1.1(webpack-cli@5.1.4(webpack-bundle-analyzer@4.10.1)(webpack@5.90.3))(webpack@5.90.3(esbuild@0.20.2)(webpack-cli@5.1.4))':
+  '@webpack-cli/configtest@2.1.1(webpack-cli@5.1.4(webpack-bundle-analyzer@4.10.1)(webpack@5.91.0))(webpack@5.91.0(esbuild@0.20.2)(webpack-cli@5.1.4))':
     dependencies:
-      webpack: 5.90.3(esbuild@0.20.2)(webpack-cli@5.1.4)
-      webpack-cli: 5.1.4(webpack-bundle-analyzer@4.10.1)(webpack@5.90.3)
+      webpack: 5.91.0(esbuild@0.20.2)(webpack-cli@5.1.4)
+      webpack-cli: 5.1.4(webpack-bundle-analyzer@4.10.1)(webpack@5.91.0)
     dev: true
 
-  '@webpack-cli/info@2.0.2(webpack-cli@5.1.4(webpack-bundle-analyzer@4.10.1)(webpack@5.90.3))(webpack@5.90.3(esbuild@0.20.2)(webpack-cli@5.1.4))':
+  '@webpack-cli/info@2.0.2(webpack-cli@5.1.4(webpack-bundle-analyzer@4.10.1)(webpack@5.91.0))(webpack@5.91.0(esbuild@0.20.2)(webpack-cli@5.1.4))':
     dependencies:
-      webpack: 5.90.3(esbuild@0.20.2)(webpack-cli@5.1.4)
-      webpack-cli: 5.1.4(webpack-bundle-analyzer@4.10.1)(webpack@5.90.3)
+      webpack: 5.91.0(esbuild@0.20.2)(webpack-cli@5.1.4)
+      webpack-cli: 5.1.4(webpack-bundle-analyzer@4.10.1)(webpack@5.91.0)
     dev: true
 
-  '@webpack-cli/serve@2.0.5(webpack-cli@5.1.4(webpack-bundle-analyzer@4.10.1)(webpack@5.90.3))(webpack@5.90.3(esbuild@0.20.2)(webpack-cli@5.1.4))':
+  '@webpack-cli/serve@2.0.5(webpack-cli@5.1.4(webpack-bundle-analyzer@4.10.1)(webpack@5.91.0))(webpack@5.91.0(esbuild@0.20.2)(webpack-cli@5.1.4))':
     dependencies:
-      webpack: 5.90.3(esbuild@0.20.2)(webpack-cli@5.1.4)
-      webpack-cli: 5.1.4(webpack-bundle-analyzer@4.10.1)(webpack@5.90.3)
+      webpack: 5.91.0(esbuild@0.20.2)(webpack-cli@5.1.4)
+      webpack-cli: 5.1.4(webpack-bundle-analyzer@4.10.1)(webpack@5.91.0)
     dev: true
 
   '@wixc3/board-core@2.4.1':
@@ -8786,13 +8822,13 @@ snapshots:
       possible-typed-array-names: 1.0.0
     dev: true
 
-  babel-jest@29.7.0(@babel/core@7.24.1):
+  babel-jest@29.7.0(@babel/core@7.24.3):
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@jest/transform': 29.7.0
       '@types/babel__core': 7.20.5
       babel-plugin-istanbul: 6.1.1
-      babel-preset-jest: 29.6.3(@babel/core@7.24.1)
+      babel-preset-jest: 29.6.3(@babel/core@7.24.3)
       chalk: 4.1.2
       graceful-fs: 4.2.11
       slash: 3.0.0
@@ -8800,12 +8836,12 @@ snapshots:
       - supports-color
     dev: true
 
-  babel-loader@9.1.3(@babel/core@7.24.1)(webpack@5.90.3(esbuild@0.20.2)(webpack-cli@5.1.4)):
+  babel-loader@9.1.3(@babel/core@7.24.3)(webpack@5.91.0(esbuild@0.20.2)(webpack-cli@5.1.4)):
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       find-cache-dir: 4.0.0
       schema-utils: 4.2.0
-      webpack: 5.90.3(esbuild@0.20.2)(webpack-cli@5.1.4)
+      webpack: 5.91.0(esbuild@0.20.2)(webpack-cli@5.1.4)
     dev: true
 
   babel-plugin-istanbul@6.1.1:
@@ -8834,55 +8870,64 @@ snapshots:
       resolve: 1.22.8
     dev: true
 
-  babel-plugin-polyfill-corejs2@0.4.10(@babel/core@7.24.1):
+  babel-plugin-polyfill-corejs2@0.4.10(@babel/core@7.24.3):
     dependencies:
       '@babel/compat-data': 7.24.1
-      '@babel/core': 7.24.1
-      '@babel/helper-define-polyfill-provider': 0.6.1(@babel/core@7.24.1)
+      '@babel/core': 7.24.3
+      '@babel/helper-define-polyfill-provider': 0.6.1(@babel/core@7.24.3)
       semver: 6.3.1
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  babel-plugin-polyfill-corejs3@0.10.1(@babel/core@7.24.1):
+  babel-plugin-polyfill-corejs3@0.10.1(@babel/core@7.24.3):
+    dependencies:
+      '@babel/core': 7.24.3
+      '@babel/helper-define-polyfill-provider': 0.6.1(@babel/core@7.24.3)
+      core-js-compat: 3.36.1
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  babel-plugin-polyfill-corejs3@0.10.4(@babel/core@7.24.3):
     dependencies:
-      '@babel/core': 7.24.1
-      '@babel/helper-define-polyfill-provider': 0.6.1(@babel/core@7.24.1)
+      '@babel/core': 7.24.3
+      '@babel/helper-define-polyfill-provider': 0.6.1(@babel/core@7.24.3)
       core-js-compat: 3.36.1
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  babel-plugin-polyfill-regenerator@0.6.1(@babel/core@7.24.1):
+  babel-plugin-polyfill-regenerator@0.6.1(@babel/core@7.24.3):
     dependencies:
-      '@babel/core': 7.24.1
-      '@babel/helper-define-polyfill-provider': 0.6.1(@babel/core@7.24.1)
+      '@babel/core': 7.24.3
+      '@babel/helper-define-polyfill-provider': 0.6.1(@babel/core@7.24.3)
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  babel-preset-current-node-syntax@1.0.1(@babel/core@7.24.1):
+  babel-preset-current-node-syntax@1.0.1(@babel/core@7.24.3):
     dependencies:
-      '@babel/core': 7.24.1
-      '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.24.1)
-      '@babel/plugin-syntax-bigint': 7.8.3(@babel/core@7.24.1)
-      '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.24.1)
-      '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.24.1)
-      '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.24.1)
-      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.24.1)
-      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.24.1)
-      '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.24.1)
-      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.24.1)
-      '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.24.1)
-      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.24.1)
-      '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.24.1)
+      '@babel/core': 7.24.3
+      '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.24.3)
+      '@babel/plugin-syntax-bigint': 7.8.3(@babel/core@7.24.3)
+      '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.24.3)
+      '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.24.3)
+      '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.24.3)
+      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.24.3)
+      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.24.3)
+      '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.24.3)
+      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.24.3)
+      '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.24.3)
+      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.24.3)
+      '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.24.3)
     dev: true
 
-  babel-preset-jest@29.6.3(@babel/core@7.24.1):
+  babel-preset-jest@29.6.3(@babel/core@7.24.3):
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       babel-plugin-jest-hoist: 29.6.3
-      babel-preset-current-node-syntax: 1.0.1(@babel/core@7.24.1)
+      babel-preset-current-node-syntax: 1.0.1(@babel/core@7.24.3)
     dev: true
 
   balanced-match@1.0.2:
@@ -9157,10 +9202,10 @@ snapshots:
       source-map: 0.6.1
     dev: true
 
-  clean-webpack-plugin@4.0.0(webpack@5.90.3(esbuild@0.20.2)(webpack-cli@5.1.4)):
+  clean-webpack-plugin@4.0.0(webpack@5.91.0(esbuild@0.20.2)(webpack-cli@5.1.4)):
     dependencies:
       del: 4.1.1
-      webpack: 5.90.3(esbuild@0.20.2)(webpack-cli@5.1.4)
+      webpack: 5.91.0(esbuild@0.20.2)(webpack-cli@5.1.4)
     dev: true
 
   cli-boxes@2.2.1:
@@ -9332,7 +9377,7 @@ snapshots:
   config-file-ts@0.2.6:
     dependencies:
       glob: 10.3.10
-      typescript: 5.4.2
+      typescript: 5.4.3
     dev: true
 
   configstore@5.0.1:
@@ -9431,22 +9476,22 @@ snapshots:
   crypto-random-string@2.0.0:
     dev: true
 
-  css-declaration-sorter@6.4.1(postcss@8.4.37):
+  css-declaration-sorter@6.4.1(postcss@8.4.38):
     dependencies:
-      postcss: 8.4.37
+      postcss: 8.4.38
     dev: true
 
-  css-loader@6.10.0(webpack@5.90.3(esbuild@0.20.2)(webpack-cli@5.1.4)):
+  css-loader@6.10.0(webpack@5.91.0(esbuild@0.20.2)(webpack-cli@5.1.4)):
     dependencies:
-      icss-utils: 5.1.0(postcss@8.4.37)
-      postcss: 8.4.37
-      postcss-modules-extract-imports: 3.0.0(postcss@8.4.37)
-      postcss-modules-local-by-default: 4.0.4(postcss@8.4.37)
-      postcss-modules-scope: 3.1.1(postcss@8.4.37)
-      postcss-modules-values: 4.0.0(postcss@8.4.37)
+      icss-utils: 5.1.0(postcss@8.4.38)
+      postcss: 8.4.38
+      postcss-modules-extract-imports: 3.0.0(postcss@8.4.38)
+      postcss-modules-local-by-default: 4.0.4(postcss@8.4.38)
+      postcss-modules-scope: 3.1.1(postcss@8.4.38)
+      postcss-modules-values: 4.0.0(postcss@8.4.38)
       postcss-value-parser: 4.2.0
       semver: 7.6.0
-      webpack: 5.90.3(esbuild@0.20.2)(webpack-cli@5.1.4)
+      webpack: 5.91.0(esbuild@0.20.2)(webpack-cli@5.1.4)
     dev: true
 
   css-select@4.3.0:
@@ -9470,50 +9515,50 @@ snapshots:
   cssesc@3.0.0:
     dev: true
 
-  cssnano-preset-default@5.2.14(postcss@8.4.37):
-    dependencies:
-      css-declaration-sorter: 6.4.1(postcss@8.4.37)
-      cssnano-utils: 3.1.0(postcss@8.4.37)
-      postcss: 8.4.37
-      postcss-calc: 8.2.4(postcss@8.4.37)
-      postcss-colormin: 5.3.1(postcss@8.4.37)
-      postcss-convert-values: 5.1.3(postcss@8.4.37)
-      postcss-discard-comments: 5.1.2(postcss@8.4.37)
-      postcss-discard-duplicates: 5.1.0(postcss@8.4.37)
-      postcss-discard-empty: 5.1.1(postcss@8.4.37)
-      postcss-discard-overridden: 5.1.0(postcss@8.4.37)
-      postcss-merge-longhand: 5.1.7(postcss@8.4.37)
-      postcss-merge-rules: 5.1.4(postcss@8.4.37)
-      postcss-minify-font-values: 5.1.0(postcss@8.4.37)
-      postcss-minify-gradients: 5.1.1(postcss@8.4.37)
-      postcss-minify-params: 5.1.4(postcss@8.4.37)
-      postcss-minify-selectors: 5.2.1(postcss@8.4.37)
-      postcss-normalize-charset: 5.1.0(postcss@8.4.37)
-      postcss-normalize-display-values: 5.1.0(postcss@8.4.37)
-      postcss-normalize-positions: 5.1.1(postcss@8.4.37)
-      postcss-normalize-repeat-style: 5.1.1(postcss@8.4.37)
-      postcss-normalize-string: 5.1.0(postcss@8.4.37)
-      postcss-normalize-timing-functions: 5.1.0(postcss@8.4.37)
-      postcss-normalize-unicode: 5.1.1(postcss@8.4.37)
-      postcss-normalize-url: 5.1.0(postcss@8.4.37)
-      postcss-normalize-whitespace: 5.1.1(postcss@8.4.37)
-      postcss-ordered-values: 5.1.3(postcss@8.4.37)
-      postcss-reduce-initial: 5.1.2(postcss@8.4.37)
-      postcss-reduce-transforms: 5.1.0(postcss@8.4.37)
-      postcss-svgo: 5.1.0(postcss@8.4.37)
-      postcss-unique-selectors: 5.1.1(postcss@8.4.37)
-    dev: true
-
-  cssnano-utils@3.1.0(postcss@8.4.37):
-    dependencies:
-      postcss: 8.4.37
-    dev: true
-
-  cssnano@5.1.15(postcss@8.4.37):
-    dependencies:
-      cssnano-preset-default: 5.2.14(postcss@8.4.37)
+  cssnano-preset-default@5.2.14(postcss@8.4.38):
+    dependencies:
+      css-declaration-sorter: 6.4.1(postcss@8.4.38)
+      cssnano-utils: 3.1.0(postcss@8.4.38)
+      postcss: 8.4.38
+      postcss-calc: 8.2.4(postcss@8.4.38)
+      postcss-colormin: 5.3.1(postcss@8.4.38)
+      postcss-convert-values: 5.1.3(postcss@8.4.38)
+      postcss-discard-comments: 5.1.2(postcss@8.4.38)
+      postcss-discard-duplicates: 5.1.0(postcss@8.4.38)
+      postcss-discard-empty: 5.1.1(postcss@8.4.38)
+      postcss-discard-overridden: 5.1.0(postcss@8.4.38)
+      postcss-merge-longhand: 5.1.7(postcss@8.4.38)
+      postcss-merge-rules: 5.1.4(postcss@8.4.38)
+      postcss-minify-font-values: 5.1.0(postcss@8.4.38)
+      postcss-minify-gradients: 5.1.1(postcss@8.4.38)
+      postcss-minify-params: 5.1.4(postcss@8.4.38)
+      postcss-minify-selectors: 5.2.1(postcss@8.4.38)
+      postcss-normalize-charset: 5.1.0(postcss@8.4.38)
+      postcss-normalize-display-values: 5.1.0(postcss@8.4.38)
+      postcss-normalize-positions: 5.1.1(postcss@8.4.38)
+      postcss-normalize-repeat-style: 5.1.1(postcss@8.4.38)
+      postcss-normalize-string: 5.1.0(postcss@8.4.38)
+      postcss-normalize-timing-functions: 5.1.0(postcss@8.4.38)
+      postcss-normalize-unicode: 5.1.1(postcss@8.4.38)
+      postcss-normalize-url: 5.1.0(postcss@8.4.38)
+      postcss-normalize-whitespace: 5.1.1(postcss@8.4.38)
+      postcss-ordered-values: 5.1.3(postcss@8.4.38)
+      postcss-reduce-initial: 5.1.2(postcss@8.4.38)
+      postcss-reduce-transforms: 5.1.0(postcss@8.4.38)
+      postcss-svgo: 5.1.0(postcss@8.4.38)
+      postcss-unique-selectors: 5.1.1(postcss@8.4.38)
+    dev: true
+
+  cssnano-utils@3.1.0(postcss@8.4.38):
+    dependencies:
+      postcss: 8.4.38
+    dev: true
+
+  cssnano@5.1.15(postcss@8.4.38):
+    dependencies:
+      cssnano-preset-default: 5.2.14(postcss@8.4.38)
       lilconfig: 2.1.0
-      postcss: 8.4.37
+      postcss: 8.4.38
       yaml: 1.10.2
     dev: true
 
@@ -10099,12 +10144,12 @@ snapshots:
   es6-error@4.1.1:
     optional: true
 
-  esbuild-loader@4.1.0(webpack@5.90.3(esbuild@0.20.2)(webpack-cli@5.1.4)):
+  esbuild-loader@4.1.0(webpack@5.91.0(esbuild@0.20.2)(webpack-cli@5.1.4)):
     dependencies:
       esbuild: 0.20.2
       get-tsconfig: 4.7.3
       loader-utils: 2.0.4
-      webpack: 5.90.3(esbuild@0.20.2)(webpack-cli@5.1.4)
+      webpack: 5.91.0(esbuild@0.20.2)(webpack-cli@5.1.4)
       webpack-sources: 1.4.3
     dev: true
 
@@ -10372,11 +10417,11 @@ snapshots:
       flat-cache: 3.2.0
     dev: true
 
-  file-loader@6.2.0(webpack@5.90.3(esbuild@0.20.2)(webpack-cli@5.1.4)):
+  file-loader@6.2.0(webpack@5.91.0(esbuild@0.20.2)(webpack-cli@5.1.4)):
     dependencies:
       loader-utils: 2.0.4
       schema-utils: 3.3.0
-      webpack: 5.90.3(esbuild@0.20.2)(webpack-cli@5.1.4)
+      webpack: 5.91.0(esbuild@0.20.2)(webpack-cli@5.1.4)
     dev: true
 
   filelist@1.0.4:
@@ -10802,11 +10847,11 @@ snapshots:
   html-escaper@2.0.2:
     dev: true
 
-  html-loader@5.0.0(webpack@5.90.3(esbuild@0.20.2)(webpack-cli@5.1.4)):
+  html-loader@5.0.0(webpack@5.91.0(esbuild@0.20.2)(webpack-cli@5.1.4)):
     dependencies:
       html-minifier-terser: 7.2.0
       parse5: 7.1.2
-      webpack: 5.90.3(esbuild@0.20.2)(webpack-cli@5.1.4)
+      webpack: 5.91.0(esbuild@0.20.2)(webpack-cli@5.1.4)
     dev: true
 
   html-minifier-terser@6.1.0:
@@ -10831,14 +10876,14 @@ snapshots:
       terser: 5.29.2
     dev: true
 
-  html-webpack-plugin@5.6.0(webpack@5.90.3(esbuild@0.20.2)(webpack-cli@5.1.4)):
+  html-webpack-plugin@5.6.0(webpack@5.91.0(esbuild@0.20.2)(webpack-cli@5.1.4)):
     dependencies:
       '@types/html-minifier-terser': 6.1.0
       html-minifier-terser: 6.1.0
       lodash: 4.17.21
       pretty-error: 4.0.0
       tapable: 2.2.1
-      webpack: 5.90.3(esbuild@0.20.2)(webpack-cli@5.1.4)
+      webpack: 5.91.0(esbuild@0.20.2)(webpack-cli@5.1.4)
     dev: true
 
   htmlparser2@6.1.0:
@@ -10895,9 +10940,9 @@ snapshots:
   icss-replace-symbols@1.1.0:
     dev: true
 
-  icss-utils@5.1.0(postcss@8.4.37):
+  icss-utils@5.1.0(postcss@8.4.38):
     dependencies:
-      postcss: 8.4.37
+      postcss: 8.4.38
     dev: true
 
   ieee754@1.2.1:
@@ -11255,7 +11300,7 @@ snapshots:
 
   istanbul-lib-instrument@5.2.1:
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/parser': 7.24.1
       '@istanbuljs/schema': 0.1.3
       istanbul-lib-coverage: 3.2.2
@@ -11266,7 +11311,7 @@ snapshots:
 
   istanbul-lib-instrument@6.0.2:
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/parser': 7.24.1
       '@istanbuljs/schema': 0.1.3
       istanbul-lib-coverage: 3.2.2
@@ -11377,11 +11422,11 @@ snapshots:
 
   jest-config@29.7.0(@types/node@20.11.30):
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@jest/test-sequencer': 29.7.0
       '@jest/types': 29.6.3
       '@types/node': 20.11.30
-      babel-jest: 29.7.0(@babel/core@7.24.1)
+      babel-jest: 29.7.0(@babel/core@7.24.3)
       chalk: 4.1.2
       ci-info: 3.9.0
       deepmerge: 4.3.1
@@ -11577,15 +11622,15 @@ snapshots:
 
   jest-snapshot@29.7.0:
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       '@babel/generator': 7.24.1
-      '@babel/plugin-syntax-jsx': 7.24.1(@babel/core@7.24.1)
-      '@babel/plugin-syntax-typescript': 7.24.1(@babel/core@7.24.1)
+      '@babel/plugin-syntax-jsx': 7.24.1(@babel/core@7.24.3)
+      '@babel/plugin-syntax-typescript': 7.24.1(@babel/core@7.24.3)
       '@babel/types': 7.24.0
       '@jest/expect-utils': 29.7.0
       '@jest/transform': 29.7.0
       '@jest/types': 29.6.3
-      babel-preset-current-node-syntax: 1.0.1(@babel/core@7.24.1)
+      babel-preset-current-node-syntax: 1.0.1(@babel/core@7.24.3)
       chalk: 4.1.2
       expect: 29.7.0
       graceful-fs: 4.2.11
@@ -11985,11 +12030,11 @@ snapshots:
   min-indent@1.0.1:
     dev: true
 
-  mini-css-extract-plugin@2.8.1(webpack@5.90.3(esbuild@0.20.2)(webpack-cli@5.1.4)):
+  mini-css-extract-plugin@2.8.1(webpack@5.91.0(esbuild@0.20.2)(webpack-cli@5.1.4)):
     dependencies:
       schema-utils: 4.2.0
       tapable: 2.2.1
-      webpack: 5.90.3(esbuild@0.20.2)(webpack-cli@5.1.4)
+      webpack: 5.91.0(esbuild@0.20.2)(webpack-cli@5.1.4)
     dev: true
 
   minimatch@3.1.2:
@@ -12045,11 +12090,11 @@ snapshots:
   monaco-editor-nls@3.1.0:
     dev: false
 
-  monaco-editor-webpack-plugin@7.1.0(monaco-editor@0.47.0)(webpack@5.90.3(esbuild@0.20.2)(webpack-cli@5.1.4)):
+  monaco-editor-webpack-plugin@7.1.0(monaco-editor@0.47.0)(webpack@5.91.0(esbuild@0.20.2)(webpack-cli@5.1.4)):
     dependencies:
       loader-utils: 2.0.4
       monaco-editor: 0.47.0
-      webpack: 5.90.3(esbuild@0.20.2)(webpack-cli@5.1.4)
+      webpack: 5.91.0(esbuild@0.20.2)(webpack-cli@5.1.4)
     dev: true
 
   monaco-editor@0.47.0: {}
@@ -12476,210 +12521,210 @@ snapshots:
   possible-typed-array-names@1.0.0:
     dev: true
 
-  postcss-calc@8.2.4(postcss@8.4.37):
+  postcss-calc@8.2.4(postcss@8.4.38):
     dependencies:
-      postcss: 8.4.37
+      postcss: 8.4.38
       postcss-selector-parser: 6.0.16
       postcss-value-parser: 4.2.0
     dev: true
 
-  postcss-colormin@5.3.1(postcss@8.4.37):
+  postcss-colormin@5.3.1(postcss@8.4.38):
     dependencies:
       browserslist: 4.23.0
       caniuse-api: 3.0.0
       colord: 2.9.3
-      postcss: 8.4.37
+      postcss: 8.4.38
       postcss-value-parser: 4.2.0
     dev: true
 
-  postcss-convert-values@5.1.3(postcss@8.4.37):
+  postcss-convert-values@5.1.3(postcss@8.4.38):
     dependencies:
       browserslist: 4.23.0
-      postcss: 8.4.37
+      postcss: 8.4.38
       postcss-value-parser: 4.2.0
     dev: true
 
-  postcss-discard-comments@5.1.2(postcss@8.4.37):
+  postcss-discard-comments@5.1.2(postcss@8.4.38):
     dependencies:
-      postcss: 8.4.37
+      postcss: 8.4.38
     dev: true
 
-  postcss-discard-duplicates@5.1.0(postcss@8.4.37):
+  postcss-discard-duplicates@5.1.0(postcss@8.4.38):
     dependencies:
-      postcss: 8.4.37
+      postcss: 8.4.38
     dev: true
 
-  postcss-discard-empty@5.1.1(postcss@8.4.37):
+  postcss-discard-empty@5.1.1(postcss@8.4.38):
     dependencies:
-      postcss: 8.4.37
+      postcss: 8.4.38
     dev: true
 
-  postcss-discard-overridden@5.1.0(postcss@8.4.37):
+  postcss-discard-overridden@5.1.0(postcss@8.4.38):
     dependencies:
-      postcss: 8.4.37
+      postcss: 8.4.38
     dev: true
 
-  postcss-load-config@3.1.4(postcss@8.4.37):
+  postcss-load-config@3.1.4(postcss@8.4.38):
     dependencies:
       lilconfig: 2.1.0
-      postcss: 8.4.37
+      postcss: 8.4.38
       yaml: 1.10.2
     dev: true
 
-  postcss-merge-longhand@5.1.7(postcss@8.4.37):
+  postcss-merge-longhand@5.1.7(postcss@8.4.38):
     dependencies:
-      postcss: 8.4.37
+      postcss: 8.4.38
       postcss-value-parser: 4.2.0
-      stylehacks: 5.1.1(postcss@8.4.37)
+      stylehacks: 5.1.1(postcss@8.4.38)
     dev: true
 
-  postcss-merge-rules@5.1.4(postcss@8.4.37):
+  postcss-merge-rules@5.1.4(postcss@8.4.38):
     dependencies:
       browserslist: 4.23.0
       caniuse-api: 3.0.0
-      cssnano-utils: 3.1.0(postcss@8.4.37)
-      postcss: 8.4.37
+      cssnano-utils: 3.1.0(postcss@8.4.38)
+      postcss: 8.4.38
       postcss-selector-parser: 6.0.16
     dev: true
 
-  postcss-minify-font-values@5.1.0(postcss@8.4.37):
+  postcss-minify-font-values@5.1.0(postcss@8.4.38):
     dependencies:
-      postcss: 8.4.37
+      postcss: 8.4.38
       postcss-value-parser: 4.2.0
     dev: true
 
-  postcss-minify-gradients@5.1.1(postcss@8.4.37):
+  postcss-minify-gradients@5.1.1(postcss@8.4.38):
     dependencies:
       colord: 2.9.3
-      cssnano-utils: 3.1.0(postcss@8.4.37)
-      postcss: 8.4.37
+      cssnano-utils: 3.1.0(postcss@8.4.38)
+      postcss: 8.4.38
       postcss-value-parser: 4.2.0
     dev: true
 
-  postcss-minify-params@5.1.4(postcss@8.4.37):
+  postcss-minify-params@5.1.4(postcss@8.4.38):
     dependencies:
       browserslist: 4.23.0
-      cssnano-utils: 3.1.0(postcss@8.4.37)
-      postcss: 8.4.37
+      cssnano-utils: 3.1.0(postcss@8.4.38)
+      postcss: 8.4.38
       postcss-value-parser: 4.2.0
     dev: true
 
-  postcss-minify-selectors@5.2.1(postcss@8.4.37):
+  postcss-minify-selectors@5.2.1(postcss@8.4.38):
     dependencies:
-      postcss: 8.4.37
+      postcss: 8.4.38
       postcss-selector-parser: 6.0.16
     dev: true
 
-  postcss-modules-extract-imports@3.0.0(postcss@8.4.37):
+  postcss-modules-extract-imports@3.0.0(postcss@8.4.38):
     dependencies:
-      postcss: 8.4.37
+      postcss: 8.4.38
     dev: true
 
-  postcss-modules-local-by-default@4.0.4(postcss@8.4.37):
+  postcss-modules-local-by-default@4.0.4(postcss@8.4.38):
     dependencies:
-      icss-utils: 5.1.0(postcss@8.4.37)
-      postcss: 8.4.37
+      icss-utils: 5.1.0(postcss@8.4.38)
+      postcss: 8.4.38
       postcss-selector-parser: 6.0.16
       postcss-value-parser: 4.2.0
     dev: true
 
-  postcss-modules-scope@3.1.1(postcss@8.4.37):
+  postcss-modules-scope@3.1.1(postcss@8.4.38):
     dependencies:
-      postcss: 8.4.37
+      postcss: 8.4.38
       postcss-selector-parser: 6.0.16
     dev: true
 
-  postcss-modules-values@4.0.0(postcss@8.4.37):
+  postcss-modules-values@4.0.0(postcss@8.4.38):
     dependencies:
-      icss-utils: 5.1.0(postcss@8.4.37)
-      postcss: 8.4.37
+      icss-utils: 5.1.0(postcss@8.4.38)
+      postcss: 8.4.38
     dev: true
 
-  postcss-modules@4.3.1(postcss@8.4.37):
+  postcss-modules@4.3.1(postcss@8.4.38):
     dependencies:
       generic-names: 4.0.0
       icss-replace-symbols: 1.1.0
       lodash.camelcase: 4.3.0
-      postcss: 8.4.37
-      postcss-modules-extract-imports: 3.0.0(postcss@8.4.37)
-      postcss-modules-local-by-default: 4.0.4(postcss@8.4.37)
-      postcss-modules-scope: 3.1.1(postcss@8.4.37)
-      postcss-modules-values: 4.0.0(postcss@8.4.37)
+      postcss: 8.4.38
+      postcss-modules-extract-imports: 3.0.0(postcss@8.4.38)
+      postcss-modules-local-by-default: 4.0.4(postcss@8.4.38)
+      postcss-modules-scope: 3.1.1(postcss@8.4.38)
+      postcss-modules-values: 4.0.0(postcss@8.4.38)
       string-hash: 1.1.3
     dev: true
 
-  postcss-normalize-charset@5.1.0(postcss@8.4.37):
+  postcss-normalize-charset@5.1.0(postcss@8.4.38):
     dependencies:
-      postcss: 8.4.37
+      postcss: 8.4.38
     dev: true
 
-  postcss-normalize-display-values@5.1.0(postcss@8.4.37):
+  postcss-normalize-display-values@5.1.0(postcss@8.4.38):
     dependencies:
-      postcss: 8.4.37
+      postcss: 8.4.38
       postcss-value-parser: 4.2.0
     dev: true
 
-  postcss-normalize-positions@5.1.1(postcss@8.4.37):
+  postcss-normalize-positions@5.1.1(postcss@8.4.38):
     dependencies:
-      postcss: 8.4.37
+      postcss: 8.4.38
       postcss-value-parser: 4.2.0
     dev: true
 
-  postcss-normalize-repeat-style@5.1.1(postcss@8.4.37):
+  postcss-normalize-repeat-style@5.1.1(postcss@8.4.38):
     dependencies:
-      postcss: 8.4.37
+      postcss: 8.4.38
       postcss-value-parser: 4.2.0
     dev: true
 
-  postcss-normalize-string@5.1.0(postcss@8.4.37):
+  postcss-normalize-string@5.1.0(postcss@8.4.38):
     dependencies:
-      postcss: 8.4.37
+      postcss: 8.4.38
       postcss-value-parser: 4.2.0
     dev: true
 
-  postcss-normalize-timing-functions@5.1.0(postcss@8.4.37):
+  postcss-normalize-timing-functions@5.1.0(postcss@8.4.38):
     dependencies:
-      postcss: 8.4.37
+      postcss: 8.4.38
       postcss-value-parser: 4.2.0
     dev: true
 
-  postcss-normalize-unicode@5.1.1(postcss@8.4.37):
+  postcss-normalize-unicode@5.1.1(postcss@8.4.38):
     dependencies:
       browserslist: 4.23.0
-      postcss: 8.4.37
+      postcss: 8.4.38
       postcss-value-parser: 4.2.0
     dev: true
 
-  postcss-normalize-url@5.1.0(postcss@8.4.37):
+  postcss-normalize-url@5.1.0(postcss@8.4.38):
     dependencies:
       normalize-url: 6.1.0
-      postcss: 8.4.37
+      postcss: 8.4.38
       postcss-value-parser: 4.2.0
     dev: true
 
-  postcss-normalize-whitespace@5.1.1(postcss@8.4.37):
+  postcss-normalize-whitespace@5.1.1(postcss@8.4.38):
     dependencies:
-      postcss: 8.4.37
+      postcss: 8.4.38
       postcss-value-parser: 4.2.0
     dev: true
 
-  postcss-ordered-values@5.1.3(postcss@8.4.37):
+  postcss-ordered-values@5.1.3(postcss@8.4.38):
     dependencies:
-      cssnano-utils: 3.1.0(postcss@8.4.37)
-      postcss: 8.4.37
+      cssnano-utils: 3.1.0(postcss@8.4.38)
+      postcss: 8.4.38
       postcss-value-parser: 4.2.0
     dev: true
 
-  postcss-reduce-initial@5.1.2(postcss@8.4.37):
+  postcss-reduce-initial@5.1.2(postcss@8.4.38):
     dependencies:
       browserslist: 4.23.0
       caniuse-api: 3.0.0
-      postcss: 8.4.37
+      postcss: 8.4.38
     dev: true
 
-  postcss-reduce-transforms@5.1.0(postcss@8.4.37):
+  postcss-reduce-transforms@5.1.0(postcss@8.4.38):
     dependencies:
-      postcss: 8.4.37
+      postcss: 8.4.38
       postcss-value-parser: 4.2.0
     dev: true
 
@@ -12689,23 +12734,23 @@ snapshots:
       util-deprecate: 1.0.2
     dev: true
 
-  postcss-svgo@5.1.0(postcss@8.4.37):
+  postcss-svgo@5.1.0(postcss@8.4.38):
     dependencies:
-      postcss: 8.4.37
+      postcss: 8.4.38
       postcss-value-parser: 4.2.0
       svgo: 2.8.0
     dev: true
 
-  postcss-unique-selectors@5.1.1(postcss@8.4.37):
+  postcss-unique-selectors@5.1.1(postcss@8.4.38):
     dependencies:
-      postcss: 8.4.37
+      postcss: 8.4.38
       postcss-selector-parser: 6.0.16
     dev: true
 
   postcss-value-parser@4.2.0:
     dev: true
 
-  postcss@8.4.37:
+  postcss@8.4.38:
     dependencies:
       nanoid: 3.3.7
       picocolors: 1.0.0
@@ -13205,17 +13250,17 @@ snapshots:
       rollup: 4.13.0
     dev: true
 
-  rollup-plugin-postcss@4.0.2(postcss@8.4.37):
+  rollup-plugin-postcss@4.0.2(postcss@8.4.38):
     dependencies:
       chalk: 4.1.2
       concat-with-sourcemaps: 1.1.0
-      cssnano: 5.1.15(postcss@8.4.37)
+      cssnano: 5.1.15(postcss@8.4.38)
       import-cwd: 3.0.0
       p-queue: 6.6.2
       pify: 5.0.0
-      postcss: 8.4.37
-      postcss-load-config: 3.1.4(postcss@8.4.37)
-      postcss-modules: 4.3.1(postcss@8.4.37)
+      postcss: 8.4.38
+      postcss-load-config: 3.1.4(postcss@8.4.38)
+      postcss-modules: 4.3.1(postcss@8.4.38)
       promise.series: 0.2.0
       resolve: 1.22.8
       rollup-pluginutils: 2.8.2
@@ -13312,11 +13357,11 @@ snapshots:
       truncate-utf8-bytes: 1.0.2
     dev: true
 
-  sass-loader@14.1.1(sass@1.72.0)(webpack@5.90.3(esbuild@0.20.2)(webpack-cli@5.1.4)):
+  sass-loader@14.1.1(sass@1.72.0)(webpack@5.91.0(esbuild@0.20.2)(webpack-cli@5.1.4)):
     dependencies:
       neo-async: 2.6.2
       sass: 1.72.0
-      webpack: 5.90.3(esbuild@0.20.2)(webpack-cli@5.1.4)
+      webpack: 5.91.0(esbuild@0.20.2)(webpack-cli@5.1.4)
     dev: true
 
   sass@1.72.0:
@@ -13499,10 +13544,10 @@ snapshots:
       - utf-8-validate
     dev: true
 
-  sofill@1.0.76(@sillot/bridge@0.0.3)(typescript@5.4.2):
+  sofill@1.0.76(@sillot/bridge@0.0.3)(typescript@5.4.3):
     dependencies:
       '@sillot/bridge': 0.0.3
-      typescript: 5.4.2
+      typescript: 5.4.3
     dev: true
 
   sortablejs@1.15.2:
@@ -13693,15 +13738,15 @@ snapshots:
   style-inject@0.3.0:
     dev: true
 
-  style-loader@3.3.4(webpack@5.90.3(esbuild@0.20.2)(webpack-cli@5.1.4)):
+  style-loader@3.3.4(webpack@5.91.0(esbuild@0.20.2)(webpack-cli@5.1.4)):
     dependencies:
-      webpack: 5.90.3(esbuild@0.20.2)(webpack-cli@5.1.4)
+      webpack: 5.91.0(esbuild@0.20.2)(webpack-cli@5.1.4)
     dev: true
 
-  stylehacks@5.1.1(postcss@8.4.37):
+  stylehacks@5.1.1(postcss@8.4.38):
     dependencies:
       browserslist: 4.23.0
-      postcss: 8.4.37
+      postcss: 8.4.38
       postcss-selector-parser: 6.0.16
     dev: true
 
@@ -13785,7 +13830,7 @@ snapshots:
       fs-extra: 10.1.0
     dev: true
 
-  terser-webpack-plugin@5.3.10(esbuild@0.20.2)(webpack@5.90.3(esbuild@0.20.2)(webpack-cli@5.1.4)):
+  terser-webpack-plugin@5.3.10(esbuild@0.20.2)(webpack@5.91.0(esbuild@0.20.2)(webpack-cli@5.1.4)):
     dependencies:
       '@jridgewell/trace-mapping': 0.3.25
       esbuild: 0.20.2
@@ -13793,7 +13838,7 @@ snapshots:
       schema-utils: 3.3.0
       serialize-javascript: 6.0.2
       terser: 5.29.2
-      webpack: 5.90.3(esbuild@0.20.2)(webpack-cli@5.1.4)
+      webpack: 5.91.0(esbuild@0.20.2)(webpack-cli@5.1.4)
     dev: true
 
   terser@5.29.2:
@@ -13874,17 +13919,17 @@ snapshots:
       utf8-byte-length: 1.0.4
     dev: true
 
-  ts-api-utils@1.3.0(typescript@5.4.2):
+  ts-api-utils@1.3.0(typescript@5.4.3):
     dependencies:
-      typescript: 5.4.2
+      typescript: 5.4.3
     dev: true
 
   ts-interface-checker@0.1.13:
     dev: true
 
-  ts-jest@29.1.2(@babel/core@7.24.1)(esbuild@0.20.2)(jest@29.7.0(@types/node@20.11.30))(typescript@5.4.2):
+  ts-jest@29.1.2(@babel/core@7.24.3)(esbuild@0.20.2)(jest@29.7.0(@types/node@20.11.30))(typescript@5.4.3):
     dependencies:
-      '@babel/core': 7.24.1
+      '@babel/core': 7.24.3
       bs-logger: 0.2.6
       esbuild: 0.20.2
       fast-json-stable-stringify: 2.1.0
@@ -13894,19 +13939,19 @@ snapshots:
       lodash.memoize: 4.1.2
       make-error: 1.3.6
       semver: 7.6.0
-      typescript: 5.4.2
+      typescript: 5.4.3
       yargs-parser: 21.1.1
     dev: true
 
-  ts-loader@9.5.1(typescript@5.4.2)(webpack@5.90.3(esbuild@0.20.2)(webpack-cli@5.1.4)):
+  ts-loader@9.5.1(typescript@5.4.3)(webpack@5.91.0(esbuild@0.20.2)(webpack-cli@5.1.4)):
     dependencies:
       chalk: 4.1.2
       enhanced-resolve: 5.16.0
       micromatch: 4.0.5
       semver: 7.6.0
       source-map: 0.7.4
-      typescript: 5.4.2
-      webpack: 5.90.3(esbuild@0.20.2)(webpack-cli@5.1.4)
+      typescript: 5.4.3
+      webpack: 5.91.0(esbuild@0.20.2)(webpack-cli@5.1.4)
     dev: true
 
   tslib@1.14.1:
@@ -13985,7 +14030,7 @@ snapshots:
       is-typedarray: 1.0.0
     dev: true
 
-  typescript@5.4.2:
+  typescript@5.4.3:
     dev: true
 
   unbox-primitive@1.0.2:
@@ -14134,12 +14179,12 @@ snapshots:
       - utf-8-validate
     dev: true
 
-  webpack-cli@5.1.4(webpack-bundle-analyzer@4.10.1)(webpack@5.90.3):
+  webpack-cli@5.1.4(webpack-bundle-analyzer@4.10.1)(webpack@5.91.0):
     dependencies:
       '@discoveryjs/json-ext': 0.5.7
-      '@webpack-cli/configtest': 2.1.1(webpack-cli@5.1.4(webpack-bundle-analyzer@4.10.1)(webpack@5.90.3))(webpack@5.90.3(esbuild@0.20.2)(webpack-cli@5.1.4))
-      '@webpack-cli/info': 2.0.2(webpack-cli@5.1.4(webpack-bundle-analyzer@4.10.1)(webpack@5.90.3))(webpack@5.90.3(esbuild@0.20.2)(webpack-cli@5.1.4))
-      '@webpack-cli/serve': 2.0.5(webpack-cli@5.1.4(webpack-bundle-analyzer@4.10.1)(webpack@5.90.3))(webpack@5.90.3(esbuild@0.20.2)(webpack-cli@5.1.4))
+      '@webpack-cli/configtest': 2.1.1(webpack-cli@5.1.4(webpack-bundle-analyzer@4.10.1)(webpack@5.91.0))(webpack@5.91.0(esbuild@0.20.2)(webpack-cli@5.1.4))
+      '@webpack-cli/info': 2.0.2(webpack-cli@5.1.4(webpack-bundle-analyzer@4.10.1)(webpack@5.91.0))(webpack@5.91.0(esbuild@0.20.2)(webpack-cli@5.1.4))
+      '@webpack-cli/serve': 2.0.5(webpack-cli@5.1.4(webpack-bundle-analyzer@4.10.1)(webpack@5.91.0))(webpack@5.91.0(esbuild@0.20.2)(webpack-cli@5.1.4))
       colorette: 2.0.20
       commander: 10.0.1
       cross-spawn: 7.0.3
@@ -14148,7 +14193,7 @@ snapshots:
       import-local: 3.1.0
       interpret: 3.1.1
       rechoir: 0.8.0
-      webpack: 5.90.3(esbuild@0.20.2)(webpack-cli@5.1.4)
+      webpack: 5.91.0(esbuild@0.20.2)(webpack-cli@5.1.4)
       webpack-bundle-analyzer: 4.10.1
       webpack-merge: 5.10.0
     dev: true
@@ -14169,7 +14214,7 @@ snapshots:
   webpack-sources@3.2.3:
     dev: true
 
-  webpack@5.90.3(esbuild@0.20.2)(webpack-cli@5.1.4):
+  webpack@5.91.0(esbuild@0.20.2)(webpack-cli@5.1.4):
     dependencies:
       '@types/eslint-scope': 3.7.7
       '@types/estree': 1.0.5
@@ -14192,9 +14237,9 @@ snapshots:
       neo-async: 2.6.2
       schema-utils: 3.3.0
       tapable: 2.2.1
-      terser-webpack-plugin: 5.3.10(esbuild@0.20.2)(webpack@5.90.3(esbuild@0.20.2)(webpack-cli@5.1.4))
+      terser-webpack-plugin: 5.3.10(esbuild@0.20.2)(webpack@5.91.0(esbuild@0.20.2)(webpack-cli@5.1.4))
       watchpack: 2.4.1
-      webpack-cli: 5.1.4(webpack-bundle-analyzer@4.10.1)(webpack@5.90.3)
+      webpack-cli: 5.1.4(webpack-bundle-analyzer@4.10.1)(webpack@5.91.0)
       webpack-sources: 3.2.3
     transitivePeerDependencies:
       - '@swc/core'

From afde0e47c8c398895a4ddde32bcfbd8efec6ec15 Mon Sep 17 00:00:00 2001
From: Soltus <liaoshanyi@qq.com>
Date: Thu, 21 Mar 2024 21:03:24 +0800
Subject: [PATCH 23/77] 6

---
 app/package.json                  | 2 +-
 scripts/parse-changelog-sillot.py | 2 +-
 scripts/parse-changelog.py        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/package.json b/app/package.json
index d41e97b6fd..2a3d8d1d3e 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sillot",
-  "version": "0.27.14",
+  "version": "0.27.15",
   "syv": "3.0.4",
   "description": "Build Your Eternal Digital Garden",
   "homepage": "https://github.com/Hi-Windom/Sillot",
diff --git a/scripts/parse-changelog-sillot.py b/scripts/parse-changelog-sillot.py
index 7b03b0d9e7..a1636cdbe4 100644
--- a/scripts/parse-changelog-sillot.py
+++ b/scripts/parse-changelog-sillot.py
@@ -81,7 +81,7 @@ def find_milestone(repo, title, lastestRelease):
 ---
 
 ''')
-    for milestone in repo.get_milestones(state=all):
+    for milestone in repo.get_milestones(state="all"):
       # REF https://docs.github.com/en/rest/issues/milestones?apiVersion=2022-11-28#list-milestones
         if version in milestone.title:
             return milestone
diff --git a/scripts/parse-changelog.py b/scripts/parse-changelog.py
index 9466442b71..182c0631eb 100644
--- a/scripts/parse-changelog.py
+++ b/scripts/parse-changelog.py
@@ -71,7 +71,7 @@ def find_milestone(repo, title, lastestRelease):
 # ---
 
 # ''')
-    for milestone in repo.get_milestones(state=all):
+    for milestone in repo.get_milestones(state="all"):
         if version in milestone.title:
             return milestone
 

From 83190df97e6a746ff90cf571f5ba04eb674678be Mon Sep 17 00:00:00 2001
From: Soltus <liaoshanyi@qq.com>
Date: Thu, 21 Mar 2024 21:09:14 +0800
Subject: [PATCH 24/77] 6

---
 app/package.json           | 2 +-
 scripts/parse-changelog.py | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/package.json b/app/package.json
index 2a3d8d1d3e..87ea5fc597 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sillot",
-  "version": "0.27.15",
+  "version": "0.27.16",
   "syv": "3.0.4",
   "description": "Build Your Eternal Digital Garden",
   "homepage": "https://github.com/Hi-Windom/Sillot",
diff --git a/scripts/parse-changelog.py b/scripts/parse-changelog.py
index 182c0631eb..9b90f92520 100644
--- a/scripts/parse-changelog.py
+++ b/scripts/parse-changelog.py
@@ -71,7 +71,11 @@ def find_milestone(repo, title, lastestRelease):
 # ---
 
 # ''')
-    for milestone in repo.get_milestones(state="all"):
+    for milestone in repo.get_milestones(state="open"):
+        if version in milestone.title:
+            return milestone
+    # 相比 state="all" ，先从 open（state参数默认值）里面找，找不到再找 closed 的做法用代码量换时间
+    for milestone in repo.get_milestones(state="closed"):
         if version in milestone.title:
             return milestone
 

From bd4938b6c76301d2fb990d3ae852f5bcc581fddc Mon Sep 17 00:00:00 2001
From: Soltus <liaoshanyi@qq.com>
Date: Thu, 21 Mar 2024 21:35:28 +0800
Subject: [PATCH 25/77] =?UTF-8?q?=EF=BC=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/cd.yml          | 2 ++
 app/package.json                  | 2 +-
 scripts/parse-changelog-sillot.py | 9 ++++++---
 scripts/parse-changelog.py        | 4 ++--
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 27d9541093..305235ed50 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -279,8 +279,10 @@ jobs:
           overwrite-settings: true
       - name: Setup Android SDK
         uses: android-actions/setup-android@v3.2.0
+        if: contains( matrix.config.goos, 'windows')
       - name: Install Android NDK
         uses: nttld/setup-ndk@v1
+        if: contains( matrix.config.goos, 'windows')
         with:
           ndk-version: r25b
           add-to-path: true
diff --git a/app/package.json b/app/package.json
index 87ea5fc597..9d74dda9a4 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sillot",
-  "version": "0.27.16",
+  "version": "0.27.17",
   "syv": "3.0.4",
   "description": "Build Your Eternal Digital Garden",
   "homepage": "https://github.com/Hi-Windom/Sillot",
diff --git a/scripts/parse-changelog-sillot.py b/scripts/parse-changelog-sillot.py
index a1636cdbe4..da8c926d7f 100644
--- a/scripts/parse-changelog-sillot.py
+++ b/scripts/parse-changelog-sillot.py
@@ -81,11 +81,14 @@ def find_milestone(repo, title, lastestRelease):
 ---
 
 ''')
-    for milestone in repo.get_milestones(state="all"):
-      # REF https://docs.github.com/en/rest/issues/milestones?apiVersion=2022-11-28#list-milestones
+    # REF https://docs.github.com/en/rest/issues/milestones?apiVersion=2022-11-28#list-milestones
+    for milestone in repo.get_milestones():
+        if version in milestone.title:
+            return milestone
+    # 别问为什么不用 state="all" ，先从 open（state参数默认值）里面找，问就是代码按行算（doge
+    for milestone in repo.get_milestones(state="closed"):
         if version in milestone.title:
             return milestone
-
 
 def get_issue_first_label(issue):
     """Get the first label from issue, if no labels, return empty string."""
diff --git a/scripts/parse-changelog.py b/scripts/parse-changelog.py
index 9b90f92520..f2b4bcc103 100644
--- a/scripts/parse-changelog.py
+++ b/scripts/parse-changelog.py
@@ -71,10 +71,10 @@ def find_milestone(repo, title, lastestRelease):
 # ---
 
 # ''')
-    for milestone in repo.get_milestones(state="open"):
+    for milestone in repo.get_milestones():
         if version in milestone.title:
             return milestone
-    # 相比 state="all" ，先从 open（state参数默认值）里面找，找不到再找 closed 的做法用代码量换时间
+    # 别问为什么不用 state="all" ，先从 open（state参数默认值）里面找，问就是代码按行算（doge
     for milestone in repo.get_milestones(state="closed"):
         if version in milestone.title:
             return milestone

From 2120637c06c9bb15e4573fbc80b3cbc8e99ec230 Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Thu, 21 Mar 2024 22:35:21 +0800
Subject: [PATCH 26/77] :art: One-click upgrade of downloaded marketplace
 packages https://github.com/siyuan-note/siyuan/issues/8390

---
 app/appearance/langs/en_US.json  |  6 ++-
 app/appearance/langs/es_ES.json  |  6 ++-
 app/appearance/langs/fr_FR.json  |  6 ++-
 app/appearance/langs/zh_CHT.json |  6 ++-
 app/appearance/langs/zh_CN.json  |  6 ++-
 kernel/api/bazaar.go             | 13 +++++
 kernel/api/router.go             |  3 +-
 kernel/bazaar/package.go         | 20 ++++++-
 kernel/model/bazzar.go           | 89 ++++++++++++++++++++++++++++++--
 9 files changed, 144 insertions(+), 11 deletions(-)

diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json
index 1c9dd76755..700b6adfdf 100644
--- a/app/appearance/langs/en_US.json
+++ b/app/appearance/langs/en_US.json
@@ -1440,6 +1440,10 @@
     "231": "Deleting unreferenced data objects in cloud storage...",
     "232": "The cloud data storage has been purged. [%d] snapshots and [%d] data objects have been deleted, and a total of [%s] disk space has been released",
     "233": "Closing user guide...",
-    "234": "[%d/%d] Updated [%d] of readable paths of doc [%s]"
+    "234": "[%d/%d] Updated [%d] of readable paths of doc [%s]",
+    "235": "[%d/%d] is updating the marketplace package...",
+    "236": "[%d/%d] is updating the marketplace package [%s]...",
+    "237": "[%d] marketplace packages have all been updated successfully",
+    "238": "Marketplace package [%s] update failed, please try again later"
   }
 }
diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json
index 23f6c89aee..939aeecce6 100644
--- a/app/appearance/langs/es_ES.json
+++ b/app/appearance/langs/es_ES.json
@@ -1440,6 +1440,10 @@
     "231": "Eliminar objetos de datos no referenciados en el almacenamiento en la nube...",
     "232": "Se ha eliminado el almacenamiento de datos en la nube. Se han eliminado [%d] instantáneas y [%d] objetos de datos, y se ha liberado un total de [%s] espacio en disco",
     "233": "Cerrando la guía del usuario...",
-    "234": "[%d/%d] Actualizado [%d] de rutas legibles del documento [%s]"
+    "234": "[%d/%d] Actualizado [%d] de rutas legibles del documento [%s]",
+    "235": "[%d/%d] está actualizando el paquete del mercado...",
+    "236": "[%d/%d] está actualizando el paquete del mercado [%s]...",
+    "237": "[%d] todos los paquetes del mercado se han actualizado correctamente",
+    "238": "Error en la actualización del paquete Marketplace [%s], inténtalo de nuevo más tarde"
   }
 }
diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json
index a63e956b0e..472757fe0f 100644
--- a/app/appearance/langs/fr_FR.json
+++ b/app/appearance/langs/fr_FR.json
@@ -1440,6 +1440,10 @@
     "231": "Suppression des objets de données non référencés dans le stockage cloud...",
     "232": "Le stockage de données cloud a été purgé. [%d] instantanés et [%d] objets de données ont été supprimés, et un total de [%s] espace disque a été libéré",
     "233": "Fermeture du guide de l'utilisateur...",
-    "234": "[%d/%d] Mise à jour de [%d] des chemins lisibles du document [%s]"
+    "234": "[%d/%d] Mise à jour de [%d] des chemins lisibles du document [%s]",
+    "235": "[%d/%d] met à jour le package Marketplace...",
+    "236": "[%d/%d] met à jour le package Marketplace [%s]...",
+    "237": "[%d] packages Marketplace ont tous été mis à jour avec succès",
+    "238": "La mise à jour du package Marketplace [%s] a échoué, veuillez réessayer plus tard"
   }
 }
diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json
index 6eebbae4ff..b6b79c421f 100644
--- a/app/appearance/langs/zh_CHT.json
+++ b/app/appearance/langs/zh_CHT.json
@@ -1440,6 +1440,10 @@
     "231": "正在刪除雲端儲存未引用資料物件...",
     "232": "雲端資料儲存清理完畢，已刪除 [%d] 個快照和 [%d] 個資料對象，共釋放 [%s] 磁碟空間",
     "233": "正在關閉用戶指南...",
-    "234": "[%d/%d] 已經更新 [%d] 個文件的可讀路徑 [%s]"
+    "234": "[%d/%d] 已經更新 [%d] 個文件的可讀路徑 [%s]",
+    "235": "[%d/%d] 正在更新市集包...",
+    "236": "[%d/%d] 正在更新市集包 [%s]...",
+    "237": "[%d] 個市集包已經全部更新成功",
+    "238": "市集包 [%s] 更新失敗，請稍後再試"
   }
 }
diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json
index 80775476c1..12213464db 100644
--- a/app/appearance/langs/zh_CN.json
+++ b/app/appearance/langs/zh_CN.json
@@ -1440,6 +1440,10 @@
     "231": "正在删除云端存储未引用数据对象...",
     "232": "云端数据存储清理完毕，已删除 [%d] 个快照和 [%d] 个数据对象，共释放 [%s] 磁盘空间",
     "233": "正在关闭用户指南...",
-    "234": "[%d/%d] 已经更新 [%d] 个文档的可读路径 [%s]"
+    "234": "[%d/%d] 已经更新 [%d] 个文档的可读路径 [%s]",
+    "235": "[%d/%d] 正在更新集市包...",
+    "236": "[%d/%d] 正在更新集市包 [%s]...",
+    "237": "[%d] 个集市包已经全部更新成功",
+    "238": "集市包 [%s] 更新失败，请稍后再试"
   }
 }
diff --git a/kernel/api/bazaar.go b/kernel/api/bazaar.go
index d8fbcc73fe..eeaf0fc5ff 100644
--- a/kernel/api/bazaar.go
+++ b/kernel/api/bazaar.go
@@ -25,6 +25,19 @@ import (
 	"github.com/siyuan-note/siyuan/kernel/util"
 )
 
+func batchUpdatePackage(c *gin.Context) {
+	ret := gulu.Ret.NewResult()
+	defer c.JSON(http.StatusOK, ret)
+
+	arg, ok := util.JsonArg(c, ret)
+	if !ok {
+		return
+	}
+
+	frontend := arg["frontend"].(string)
+	model.BatchUpdateBazaarPackages(frontend)
+}
+
 func getUpdatedPackage(c *gin.Context) {
 	ret := gulu.Ret.NewResult()
 	defer c.JSON(http.StatusOK, ret)
diff --git a/kernel/api/router.go b/kernel/api/router.go
index d4bc60b9b9..88d40ab059 100644
--- a/kernel/api/router.go
+++ b/kernel/api/router.go
@@ -330,7 +330,6 @@ func ServeAPI(ginServer *gin.Engine) {
 	ginServer.Handle("POST", "/api/graph/getGraph", model.CheckAuth, getGraph)
 	ginServer.Handle("POST", "/api/graph/getLocalGraph", model.CheckAuth, getLocalGraph)
 
-	ginServer.Handle("POST", "/api/bazaar/getUpdatedPackage", model.CheckAuth, getUpdatedPackage)
 	ginServer.Handle("POST", "/api/bazaar/getBazaarPlugin", model.CheckAuth, getBazaarPlugin)
 	ginServer.Handle("POST", "/api/bazaar/getInstalledPlugin", model.CheckAuth, getInstalledPlugin)
 	ginServer.Handle("POST", "/api/bazaar/installBazaarPlugin", model.CheckAuth, model.CheckReadonly, installBazaarPlugin)
@@ -352,6 +351,8 @@ func ServeAPI(ginServer *gin.Engine) {
 	ginServer.Handle("POST", "/api/bazaar/installBazaarTheme", model.CheckAuth, model.CheckReadonly, installBazaarTheme)
 	ginServer.Handle("POST", "/api/bazaar/uninstallBazaarTheme", model.CheckAuth, model.CheckReadonly, uninstallBazaarTheme)
 	ginServer.Handle("POST", "/api/bazaar/getBazaarPackageREAME", model.CheckAuth, getBazaarPackageREAME)
+	ginServer.Handle("POST", "/api/bazaar/getUpdatedPackage", model.CheckAuth, getUpdatedPackage)
+	ginServer.Handle("POST", "/api/bazaar/batchUpdatePackage", model.CheckAuth, batchUpdatePackage)
 
 	ginServer.Handle("POST", "/api/repo/initRepoKey", model.CheckAuth, model.CheckReadonly, initRepoKey)
 	ginServer.Handle("POST", "/api/repo/initRepoKeyFromPassphrase", model.CheckAuth, model.CheckReadonly, initRepoKeyFromPassphrase)
diff --git a/kernel/bazaar/package.go b/kernel/bazaar/package.go
index 5720e31c52..6d0d106ac7 100644
--- a/kernel/bazaar/package.go
+++ b/kernel/bazaar/package.go
@@ -530,9 +530,25 @@ func renderREADME(repoURL string, mdData []byte) (ret string, err error) {
 	return
 }
 
+var (
+	packageLocks     = map[string]*sync.Mutex{}
+	packageLocksLock = sync.Mutex{}
+)
+
 func downloadPackage(repoURLHash string, pushProgress bool, systemID string) (data []byte, err error) {
+	packageLocksLock.Lock()
+	defer packageLocksLock.Unlock()
+
 	// repoURLHash: https://github.com/88250/Comfortably-Numb@6286912c381ef3f83e455d06ba4d369c498238dc
-	pushID := repoURLHash[:strings.LastIndex(repoURLHash, "@")]
+	repoURL := repoURLHash[:strings.LastIndex(repoURLHash, "@")]
+	lock, ok := packageLocks[repoURLHash]
+	if !ok {
+		lock = &sync.Mutex{}
+		packageLocks[repoURLHash] = lock
+	}
+	lock.Lock()
+	defer lock.Unlock()
+
 	repoURLHash = strings.TrimPrefix(repoURLHash, "https://github.com/")
 	u := util.BazaarOSSServer + "/package/" + repoURLHash
 	buf := &bytes.Buffer{}
@@ -540,7 +556,7 @@ func downloadPackage(repoURLHash string, pushProgress bool, systemID string) (da
 		if pushProgress {
 			progress := float32(info.DownloadedSize) / float32(info.Response.ContentLength)
 			//logging.LogDebugf("downloading bazaar package [%f]", progress)
-			util.PushDownloadProgress(pushID, progress)
+			util.PushDownloadProgress(repoURL, progress)
 		}
 	}).Get(u)
 	if nil != err {
diff --git a/kernel/model/bazzar.go b/kernel/model/bazzar.go
index ffe71755b8..432369ca20 100644
--- a/kernel/model/bazzar.go
+++ b/kernel/model/bazzar.go
@@ -19,17 +19,100 @@ package model
 import (
 	"errors"
 	"fmt"
+	"github.com/88250/gulu"
+	"github.com/siyuan-note/logging"
+	"github.com/siyuan-note/siyuan/kernel/util"
 	"path"
 	"path/filepath"
 	"strings"
 	"sync"
-
-	"github.com/88250/gulu"
-	"github.com/siyuan-note/siyuan/kernel/util"
+	"time"
 
 	"github.com/siyuan-note/siyuan/kernel/bazaar"
 )
 
+func BatchUpdateBazaarPackages(frontend string) {
+	plugins, widgets, icons, themes, templates := UpdatedPackages(frontend)
+
+	total := len(plugins) + len(widgets) + len(icons) + len(themes) + len(templates)
+	if 1 > total {
+		return
+	}
+
+	util.PushEndlessProgress(fmt.Sprintf(Conf.language(235), 1, total))
+	defer util.PushClearProgress()
+	count := 1
+	for _, plugin := range plugins {
+		err := bazaar.InstallPlugin(plugin.RepoURL, plugin.RepoHash, filepath.Join(util.DataDir, "plugins", plugin.Name), Conf.System.ID)
+		if nil != err {
+			logging.LogErrorf("update plugin [%s] failed: %s", plugin.Name, err)
+			util.PushErrMsg(fmt.Sprintf(Conf.language(238)), 5000)
+			return
+		}
+
+		count++
+		util.PushEndlessProgress(fmt.Sprintf(Conf.language(236), count, total, plugin.Name))
+	}
+
+	for _, widget := range widgets {
+		err := bazaar.InstallWidget(widget.RepoURL, widget.RepoHash, filepath.Join(util.DataDir, "widgets", widget.Name), Conf.System.ID)
+		if nil != err {
+			logging.LogErrorf("update widget [%s] failed: %s", widget.Name, err)
+			util.PushErrMsg(fmt.Sprintf(Conf.language(238)), 5000)
+			return
+		}
+
+		count++
+		util.PushEndlessProgress(fmt.Sprintf(Conf.language(236), count, total, widget.Name))
+	}
+
+	for _, icon := range icons {
+		err := bazaar.InstallIcon(icon.RepoURL, icon.RepoHash, filepath.Join(util.IconsPath, icon.Name), Conf.System.ID)
+		if nil != err {
+			logging.LogErrorf("update icon [%s] failed: %s", icon.Name, err)
+			util.PushErrMsg(fmt.Sprintf(Conf.language(238)), 5000)
+			return
+		}
+
+		count++
+		util.PushEndlessProgress(fmt.Sprintf(Conf.language(236), count, total, icon.Name))
+	}
+
+	for _, template := range templates {
+		err := bazaar.InstallTemplate(template.RepoURL, template.RepoHash, filepath.Join(util.DataDir, "templates", template.Name), Conf.System.ID)
+		if nil != err {
+			logging.LogErrorf("update template [%s] failed: %s", template.Name, err)
+			util.PushErrMsg(fmt.Sprintf(Conf.language(238)), 5000)
+			return
+		}
+
+		count++
+		util.PushEndlessProgress(fmt.Sprintf(Conf.language(236), count, total, template.Name))
+	}
+
+	for _, theme := range themes {
+		err := bazaar.InstallTheme(theme.RepoURL, theme.RepoHash, filepath.Join(util.ThemesPath, theme.Name), Conf.System.ID)
+		if nil != err {
+			logging.LogErrorf("update theme [%s] failed: %s", theme.Name, err)
+			util.PushErrMsg(fmt.Sprintf(Conf.language(238)), 5000)
+			return
+		}
+
+		count++
+		util.PushEndlessProgress(fmt.Sprintf(Conf.language(236), count, total, theme.Name))
+	}
+
+	util.ReloadUI()
+
+	go func() {
+		util.WaitForUILoaded()
+		time.Sleep(500)
+		util.PushMsg(fmt.Sprintf(Conf.language(237), total), 5000)
+	}()
+
+	return
+}
+
 func UpdatedPackages(frontend string) (plugins []*bazaar.Plugin, widgets []*bazaar.Widget, icons []*bazaar.Icon, themes []*bazaar.Theme, templates []*bazaar.Template) {
 	wg := &sync.WaitGroup{}
 	wg.Add(5)

From 893f645a82d9dcc4d2a323d450044975528e74e5 Mon Sep 17 00:00:00 2001
From: Vanessa <lly219@gmail.com>
Date: Thu, 21 Mar 2024 22:55:14 +0800
Subject: [PATCH 27/77] :art: https://github.com/siyuan-note/siyuan/issues/8390

---
 app/src/config/bazaar.ts | 68 ++++++++++++++++++++++++++--------------
 1 file changed, 45 insertions(+), 23 deletions(-)

diff --git a/app/src/config/bazaar.ts b/app/src/config/bazaar.ts
index 741bf227b4..682f42bd7b 100644
--- a/app/src/config/bazaar.ts
+++ b/app/src/config/bazaar.ts
@@ -293,49 +293,64 @@ export const bazaar = {
     </div>
 </div>`;
     },
-    _genUpdateItemHTML (item: IBazaarItem) {
-        return `<div class="b3-card">
+    _genUpdateItemHTML(item: IBazaarItem, bazaarType: TBazaarType) {
+        const dataObj = {
+            bazaarType,
+            themeMode: item.modes?.toString(),
+            updated: item.updated,
+            name: item.name,
+            repoURL: item.repoURL,
+            repoHash: item.repoHash,
+            downloaded: true
+        };
+        return `<div class="b3-card" data-obj='${JSON.stringify(dataObj)}'>
     <div class="b3-card__img"><img src="${item.iconURL}" onerror="this.src='/stage/images/icon.png'"/></div>
-        <div class="fn__flex-1 fn__flex-column">
-    <div class="b3-card__info b3-card__info--left fn__flex-1">
-    ${item.preferredName} <span class="ft__on-surface ft__smaller">${item.name}</span>
-        <div class="b3-card__desc" title="${escapeAttr(item.preferredDesc) || ""}">${item.preferredDesc || ""}</div>
-    </div>
+    <div class="fn__flex-1 fn__flex-column">
+        <div class="b3-card__info b3-card__info--left fn__flex-1">
+            ${item.preferredName} <span class="ft__on-surface ft__smaller">${item.name}</span>
+            <div class="b3-card__desc" title="${escapeAttr(item.preferredDesc) || ""}">${item.preferredDesc || ""}</div>
+        </div>
     </div>
     <div class="b3-card__actions b3-card__actions--right">
-        ${item.incompatible ? `<span class="fn__flex-center b3-tooltips b3-tooltips__nw b3-chip b3-chip--error b3-chip--small" aria-label="${window.siyuan.languages.incompatiblePluginTip}">${window.siyuan.languages.incompatible}</span>` : ""}
-        ${item.preferredFunding ? `<span class="fn__space"></span><a target="_blank" href="${item.preferredFunding}" class="block__icon block__icon--show ariaLabel" aria-label="${window.siyuan.languages.sponsor} ${item.preferredFunding}"><svg class="ft__pink"><use xlink:href="#iconHeart"></use></svg></a>` : ""}
+        ${item.incompatible ? `<span class="fn__space"></span><span class="fn__flex-center b3-tooltips b3-tooltips__nw b3-chip b3-chip--error b3-chip--small" aria-label="${window.siyuan.languages.incompatiblePluginTip}">${window.siyuan.languages.incompatible}</span>` : ""}
+        ${item.preferredFunding ? `<a target="_blank" href="${item.preferredFunding}" class="block__icon block__icon--show ariaLabel" aria-label="${window.siyuan.languages.sponsor} ${item.preferredFunding}"><svg class="ft__pink"><use xlink:href="#iconHeart"></use></svg></a>` : ""}
+        <span class="b3-tooltips b3-tooltips__nw block__icon block__icon--show${isBrowser() ? " fn__none" : ""}" data-type="open" aria-label="${window.siyuan.languages.showInFolder}">
+            <svg><use xlink:href="#iconFolder"></use></svg>
+        </span>
+        <span data-type="install-t" aria-label="${window.siyuan.languages.update}" class="b3-tooltips b3-tooltips__nw block__icon block__icon--show">
+            <svg class="ft__primary"><use xlink:href="#iconRefresh"></use></svg>
+        </span>
     </div>
-</div>`
+</div>`;
     },
     _getUpdate() {
         fetchPost("/api/bazaar/getUpdatedPackage", {frontend: getFrontend()}, (response) => {
             let html = "";
             response.data.plugins.forEach((item: IBazaarItem) => {
-                html += this._genUpdateItemHTML(item);
+                html += this._genUpdateItemHTML(item, "plugins");
             });
             response.data.themes.forEach((item: IBazaarItem) => {
-                html += this._genUpdateItemHTML(item);
+                html += this._genUpdateItemHTML(item, "themes");
             });
             response.data.icons.forEach((item: IBazaarItem) => {
-                html += this._genUpdateItemHTML(item);
+                html += this._genUpdateItemHTML(item, "icons");
             });
             response.data.templates.forEach((item: IBazaarItem) => {
-                html += this._genUpdateItemHTML(item);
+                html += this._genUpdateItemHTML(item, "templates");
             });
             response.data.widgets.forEach((item: IBazaarItem) => {
-                html += this._genUpdateItemHTML(item);
+                html += this._genUpdateItemHTML(item, "widgets");
             });
             this.element.querySelector('[data-type="downloaded-update"]').innerHTML = `<div class="fn__flex config-bazaar__title">
     <div class="fn__flex-1"></div>
-    <button class="b3-button">${window.siyuan.languages.update}</button>
+    <button class="b3-button" data-type="install-all">${window.siyuan.languages.update}</button>
     <span class="fn__space"></span>
     <div class="counter counter--bg fn__flex-center">${response.data.themes.length + response.data.icons.length + response.data.widgets.length + response.data.plugins.length + response.data.templates.length}</div>
 </div>
 <div class="config-bazaar__content">${html}</div>`;
         })
     },
-    _genMyHTML(bazaarType: TBazaarType, app: App) {
+    _genMyHTML(bazaarType: TBazaarType, app: App, updateUpdate = true) {
         const contentElement = bazaar.element.querySelector("#configBazaarDownloaded");
         if (contentElement.getAttribute("data-loading") === "true" ||
             contentElement.previousElementSibling.querySelector(`[data-type="my${bazaarType.replace(bazaarType[0], bazaarType[0].toUpperCase()).substring(0, bazaarType.length - 1)}"]`).classList.contains("b3-button--outline")) {
@@ -430,6 +445,9 @@ export const bazaar = {
             }
             contentElement.innerHTML = html ? html : `<div class="fn__hr"></div><ul class="b3-list b3-list--background"><li class="b3-list--empty">${window.siyuan.languages.emptyContent}</li></ul>`;
         });
+        if (updateUpdate) {
+            this._getUpdate();
+        }
     },
     _data: {
         themes: [] as IBazaarItem[],
@@ -578,7 +596,6 @@ export const bazaar = {
             return;
         }
         this._genMyHTML("plugins", app);
-        this._getUpdate();
         bazaar.element.firstElementChild.addEventListener("click", (event) => {
             let target = event.target as HTMLElement;
             const dataElement = hasClosestByAttribute(target, "data-obj", null);
@@ -611,7 +628,7 @@ export const bazaar = {
                             }
                         });
                         target.classList.remove("b3-button--outline");
-                        this._genMyHTML(type.replace("my", "").toLowerCase() + "s" as TBazaarType, app);
+                        this._genMyHTML(type.replace("my", "").toLowerCase() + "s" as TBazaarType, app, false);
                     }
                     event.preventDefault();
                     event.stopPropagation();
@@ -662,7 +679,7 @@ export const bazaar = {
                                 }
                             }
                             bazaar._onBazaar(response, bazaarType, ["themes", "icons"].includes(bazaarType));
-                            bazaar._genMyHTML(bazaarType, app);
+                            bazaar._genMyHTML(bazaarType, app, false);
                             if (bazaarType === "plugins") {
                                 if (window.siyuan.config.bazaar.petalDisabled) {
                                     confirmDialog(window.siyuan.languages.confirm, window.siyuan.languages.enablePluginTip2);
@@ -674,7 +691,7 @@ export const bazaar = {
                                             frontend: getFrontend()
                                         }, (response) => {
                                             loadPlugin(app, response.data);
-                                            bazaar._genMyHTML(bazaarType, app);
+                                            bazaar._genMyHTML(bazaarType, app, false);
                                         });
                                     });
                                 }
@@ -684,6 +701,11 @@ export const bazaar = {
                     event.preventDefault();
                     event.stopPropagation();
                     break;
+                } else if (type === "install-all") {
+                    fetchPost("/api/bazaar/batchUpdatePackage", {frontend: getFrontend()});
+                    event.preventDefault();
+                    event.stopPropagation();
+                    break;
                 } else if (type === "install-t") {
                     if (!target.classList.contains("b3-button--progress")) {
                         confirmDialog(window.siyuan.languages.update, window.siyuan.languages.exportTplTip, () => {
@@ -790,7 +812,7 @@ export const bazaar = {
                         fetchPost("/api/setting/setAppearance", Object.assign({}, window.siyuan.config.appearance, {
                             icon: packageName,
                         }), (appearanceResponse) => {
-                            this._genMyHTML(bazaarType, app);
+                            this._genMyHTML(bazaarType, app, false);
                             fetchPost("/api/bazaar/getBazaarIcon", {}, response => {
                                 response.data.appearance = appearanceResponse.data;
                                 bazaar._onBazaar(response, "icons", true);
@@ -827,7 +849,7 @@ export const bazaar = {
                                     return;
                                 }
                             }
-                            this._genMyHTML("themes", app);
+                            this._genMyHTML("themes", app, false);
                             fetchPost("/api/bazaar/getBazaarTheme", {}, response => {
                                 response.data.appearance = appearanceResponse.data;
                                 bazaar._onBazaar(response, "themes", true);

From 896197347fc26a0ca5a318d0e21d46ab1fa0dea5 Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Thu, 21 Mar 2024 23:04:12 +0800
Subject: [PATCH 28/77] :art: One-click upgrade of downloaded marketplace
 packages https://github.com/siyuan-note/siyuan/issues/8390

---
 app/appearance/langs/en_US.json  | 3 +++
 app/appearance/langs/fr_FR.json  | 3 +++
 app/appearance/langs/zh_CHT.json | 3 +++
 app/appearance/langs/zh_CN.json  | 3 +++
 4 files changed, 12 insertions(+)

diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json
index 700b6adfdf..6bc631cd3a 100644
--- a/app/appearance/langs/en_US.json
+++ b/app/appearance/langs/en_US.json
@@ -1,4 +1,7 @@
 {
+  "updateAll": "Update all",
+  "confirmUpdateAll": "Are you sure you want to update all?",
+  "confirmUpdate": "Are you sure you want to update?",
   "insertRowBefore": "Insert rows ${x} above",
   "insertRowAfter": "Insert rows ${x} below",
   "setDueTime": "Set expiration time",
diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json
index 472757fe0f..a2ebd624dd 100644
--- a/app/appearance/langs/fr_FR.json
+++ b/app/appearance/langs/fr_FR.json
@@ -1,4 +1,7 @@
 {
+  "updateAll": "Tout mettre à jour",
+  "confirmUpdateAll": "Etes-vous sûr de vouloir tout mettre à jour ?",
+  "confirmUpdate": "Êtes-vous sûr de vouloir mettre à jour ?",
   "insertRowBefore": "Insérer les lignes ${x} ci-dessus",
   "insertRowAfter": "Insérer les lignes ${x} ci-dessous",
   "setDueTime": "Définir le délai d'expiration",
diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json
index b6b79c421f..d4444e2ae6 100644
--- a/app/appearance/langs/zh_CHT.json
+++ b/app/appearance/langs/zh_CHT.json
@@ -1,4 +1,7 @@
 {
+  "updateAll": "全部更新",
+  "confirmUpdateAll": "確定全部更新嗎？",
+  "confirmUpdate": "確定更新嗎？",
   "insertRowBefore": "在上方插入${x}行",
   "insertRowAfter": "在下方插入${x}行",
   "setDueTime": "設定到期時間",
diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json
index 12213464db..ae3ce17f78 100644
--- a/app/appearance/langs/zh_CN.json
+++ b/app/appearance/langs/zh_CN.json
@@ -1,4 +1,7 @@
 {
+  "updateAll": "全部更新",
+  "confirmUpdateAll": "确定全部更新吗？",
+  "confirmUpdate": "确定更新吗？",
   "insertRowBefore": "在上方插入${x}行",
   "insertRowAfter": "在下方插入${x}行",
   "setDueTime": "设置到期时间",

From dac164a8e1747ac9103558c098122d9d27661660 Mon Sep 17 00:00:00 2001
From: Vanessa <lly219@gmail.com>
Date: Thu, 21 Mar 2024 23:10:02 +0800
Subject: [PATCH 29/77] :art: https://github.com/siyuan-note/siyuan/issues/8390

---
 app/src/config/bazaar.ts | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/src/config/bazaar.ts b/app/src/config/bazaar.ts
index 682f42bd7b..8e06652a2f 100644
--- a/app/src/config/bazaar.ts
+++ b/app/src/config/bazaar.ts
@@ -341,11 +341,16 @@ export const bazaar = {
             response.data.widgets.forEach((item: IBazaarItem) => {
                 html += this._genUpdateItemHTML(item, "widgets");
             });
+
+            const allCount = response.data.themes.length + response.data.icons.length + response.data.widgets.length + response.data.plugins.length + response.data.templates.length
+            if (allCount === 0) {
+                return;
+            }
             this.element.querySelector('[data-type="downloaded-update"]').innerHTML = `<div class="fn__flex config-bazaar__title">
     <div class="fn__flex-1"></div>
-    <button class="b3-button" data-type="install-all">${window.siyuan.languages.update}</button>
+    <button class="b3-button" data-type="install-all">${window.siyuan.languages.updateAll}</button>
     <span class="fn__space"></span>
-    <div class="counter counter--bg fn__flex-center">${response.data.themes.length + response.data.icons.length + response.data.widgets.length + response.data.plugins.length + response.data.templates.length}</div>
+    <div class="counter counter--bg fn__flex-center">${allCount}</div>
 </div>
 <div class="config-bazaar__content">${html}</div>`;
         })
@@ -702,13 +707,15 @@ export const bazaar = {
                     event.stopPropagation();
                     break;
                 } else if (type === "install-all") {
-                    fetchPost("/api/bazaar/batchUpdatePackage", {frontend: getFrontend()});
+                    confirmDialog(window.siyuan.languages.updateAll, window.siyuan.languages.confirmUpdateAll, () => {
+                        fetchPost("/api/bazaar/batchUpdatePackage", {frontend: getFrontend()});
+                    });
                     event.preventDefault();
                     event.stopPropagation();
                     break;
                 } else if (type === "install-t") {
                     if (!target.classList.contains("b3-button--progress")) {
-                        confirmDialog(window.siyuan.languages.update, window.siyuan.languages.exportTplTip, () => {
+                        confirmDialog(window.siyuan.languages.update, window.siyuan.languages.confirmUpdate, () => {
                             const bazaarType = dataObj.bazaarType as TBazaarType;
                             let url = "/api/bazaar/installBazaarTemplate";
                             if (bazaarType === "themes") {

From b64770d595ce8b3fe737b4bf35902b06cb82590d Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Thu, 21 Mar 2024 23:17:43 +0800
Subject: [PATCH 30/77] :art: One-click upgrade of downloaded marketplace
 packages https://github.com/siyuan-note/siyuan/issues/8390

---
 app/appearance/langs/es_ES.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json
index 939aeecce6..c0afc04d93 100644
--- a/app/appearance/langs/es_ES.json
+++ b/app/appearance/langs/es_ES.json
@@ -1,4 +1,7 @@
 {
+  "updateAll": "Actualizar todo",
+  "confirmUpdateAll": "¿Estás seguro de que deseas actualizar todo?",
+  "confirmUpdate": "¿Estás seguro de que deseas actualizar?",
   "insertRowBefore": "Insertar filas ${x} arriba",
   "insertRowAfter": "Insertar filas ${x} debajo",
   "setDueTime": "Establecer tiempo de vencimiento",

From 180bac66efd7abd3f25e514d3f8f4244d6abd9b8 Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Thu, 21 Mar 2024 23:21:16 +0800
Subject: [PATCH 31/77] :art: One-click upgrade of downloaded marketplace
 packages https://github.com/siyuan-note/siyuan/issues/8390

---
 app/src/config/bazaar.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/config/bazaar.ts b/app/src/config/bazaar.ts
index 8e06652a2f..6e53b4b5dd 100644
--- a/app/src/config/bazaar.ts
+++ b/app/src/config/bazaar.ts
@@ -707,7 +707,7 @@ export const bazaar = {
                     event.stopPropagation();
                     break;
                 } else if (type === "install-all") {
-                    confirmDialog(window.siyuan.languages.updateAll, window.siyuan.languages.confirmUpdateAll, () => {
+                    confirmDialog('⬆️ ' + window.siyuan.languages.updateAll, window.siyuan.languages.confirmUpdateAll, () => {
                         fetchPost("/api/bazaar/batchUpdatePackage", {frontend: getFrontend()});
                     });
                     event.preventDefault();
@@ -715,7 +715,7 @@ export const bazaar = {
                     break;
                 } else if (type === "install-t") {
                     if (!target.classList.contains("b3-button--progress")) {
-                        confirmDialog(window.siyuan.languages.update, window.siyuan.languages.confirmUpdate, () => {
+                        confirmDialog('⬆️ ' + window.siyuan.languages.update, window.siyuan.languages.confirmUpdate, () => {
                             const bazaarType = dataObj.bazaarType as TBazaarType;
                             let url = "/api/bazaar/installBazaarTemplate";
                             if (bazaarType === "themes") {

From 4917e183696f253854adfbc455f481e2a064b145 Mon Sep 17 00:00:00 2001
From: Soltus <liaoshanyi@qq.com>
Date: Fri, 22 Mar 2024 00:07:18 +0800
Subject: [PATCH 32/77] =?UTF-8?q?=E8=AF=95=E8=AF=95=E8=BE=93=E5=87=BA?=
 =?UTF-8?q?=E4=B8=A4=E4=B8=AA=E6=80=9D=E6=BA=90=E7=89=88=E6=9C=ACissue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .editorconfig              |  2 +-
 .github/workflows/cd.yml   |  8 +++++++-
 app/package.json           |  5 +++--
 scripts/parse-changelog.py | 25 +++++++++++++++----------
 4 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 0bb4ad6ecd..6f47929bcc 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -7,7 +7,7 @@ root = true
 charset = utf-8
 end_of_line = lf
 indent_size = 2
-indent_style = tab
+indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = false
 
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 305235ed50..bdf8bb74ac 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -36,6 +36,12 @@ jobs:
         with:
           cmd: "jq .syv app/package.json -r"
 
+      - name: Extract SiYuan version from package.json
+        uses: sergeysova/jq-action@v2
+        id: sypv
+        with:
+            cmd: "jq .sypv app/package.json -r"
+
       - id: thislatestR
         uses: pozetroninc/github-action-get-latest-release@master
         with:
@@ -67,7 +73,7 @@ jobs:
       - name: Gather SiYuan Release Information
         id: release_info_siyuan
         run: |
-          changelog=$(python scripts/parse-changelog.py -t v${{ steps.syv.outputs.value }} siyuan-note/siyuan)
+          changelog=$(python scripts/parse-changelog.py -t v${{ steps.syv.outputs.value }} -b v${{ steps.sypv.outputs.value }} siyuan-note/siyuan)
           EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)
           echo "release_body_siyuan<<$EOF" >> $GITHUB_ENV
           echo "$changelog" >> $GITHUB_ENV
diff --git a/app/package.json b/app/package.json
index 9d74dda9a4..5f39423b7a 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,7 +1,8 @@
 {
   "name": "sillot",
-  "version": "0.27.17",
-  "syv": "3.0.4",
+  "version": "0.27.18",
+  "syv": "3.0.5",
+  "sypv": "3.0.4",
   "description": "Build Your Eternal Digital Garden",
   "homepage": "https://github.com/Hi-Windom/Sillot",
   "repository": "https://github.com/Hi-Windom/Sillot",
diff --git a/scripts/parse-changelog.py b/scripts/parse-changelog.py
index f2b4bcc103..02c4fa5b3c 100644
--- a/scripts/parse-changelog.py
+++ b/scripts/parse-changelog.py
@@ -29,21 +29,27 @@ def generate_msg_from_repo(repo_name, tag_name, lastestRelease):
     """
     hostname = os.getenv("GITHUB_HOST") or "api.github.com"
     token = os.getenv("GITHUB_TOKEN")
-    desc_mapping = defaultdict(list)
 
     gh = github.Github(token, base_url=f"https://{hostname}")
     repo = gh.get_repo(repo_name)
-    milestone = find_milestone(repo, tag_name, lastestRelease)
+    print('## [@SiYuan](https://github.com/siyuan-note/siyuan)\n')
+    for v in [tag_name, lastestRelease]:
+      print(f'''---
+
+### v{v}
 
-    for issue in repo.get_issues(state="closed", milestone=milestone):  # type: ignore
-        # REF https://pygithub.readthedocs.io/en/latest/github_objects/Issue.html#github.Issue.Issue
-        desc_mapping[get_issue_first_label(issue)].append(
-            {"title": issue.title, "url": issue.html_url}
-        )
-    generate_msg(desc_mapping)
+''')
+      desc_mapping = defaultdict(list)
+      milestone = find_milestone(repo, v)
+      for issue in repo.get_issues(state="closed", milestone=milestone):  # type: ignore
+          # REF https://pygithub.readthedocs.io/en/latest/github_objects/Issue.html#github.Issue.Issue
+          desc_mapping[get_issue_first_label(issue)].append(
+              {"title": issue.title, "url": issue.html_url}
+          )
+      generate_msg(desc_mapping)
 
 
-def find_milestone(repo, title, lastestRelease):
+def find_milestone(repo, title):
     """Find the milestone in a repository that is similar to milestone title
 
     Args:
@@ -91,7 +97,6 @@ def get_issue_first_label(issue):
 def generate_msg(desc_mapping):
     """Print changelogs from direction."""
     print()
-    print('## [@SiYuan](https://github.com/siyuan-note/siyuan)\n')
     for header in docmap:
         if not desc_mapping[header]:
             continue

From 53cab5902ef110fb3f9fb94d97201ed15ae6debb Mon Sep 17 00:00:00 2001
From: Soltus <liaoshanyi@qq.com>
Date: Fri, 22 Mar 2024 00:11:09 +0800
Subject: [PATCH 33/77] 6

---
 scripts/parse-changelog-sillot.py | 2 +-
 scripts/parse-changelog.py        | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/parse-changelog-sillot.py b/scripts/parse-changelog-sillot.py
index da8c926d7f..def7a0cd4c 100644
--- a/scripts/parse-changelog-sillot.py
+++ b/scripts/parse-changelog-sillot.py
@@ -101,7 +101,7 @@ def get_issue_first_label(issue):
 def generate_msg(desc_mapping):
     """Print changelogs from direction."""
     print()
-    print('## [@Sillot](https://github.com/Hi-Windom/Sillot)\n')
+    print('# [@Sillot](https://github.com/Hi-Windom/Sillot)\n')
     for header in docmap:
         if not desc_mapping[header]:
             continue
diff --git a/scripts/parse-changelog.py b/scripts/parse-changelog.py
index 02c4fa5b3c..e51920df70 100644
--- a/scripts/parse-changelog.py
+++ b/scripts/parse-changelog.py
@@ -32,11 +32,11 @@ def generate_msg_from_repo(repo_name, tag_name, lastestRelease):
 
     gh = github.Github(token, base_url=f"https://{hostname}")
     repo = gh.get_repo(repo_name)
-    print('## [@SiYuan](https://github.com/siyuan-note/siyuan)\n')
+    print('# [@SiYuan](https://github.com/siyuan-note/siyuan)\n')
     for v in [tag_name, lastestRelease]:
-      print(f'''---
+      print(f'''
 
-### v{v}
+## {v}
 
 ''')
       desc_mapping = defaultdict(list)

From ea5626d0ffc50f93104d06fcb0233ced120f38b6 Mon Sep 17 00:00:00 2001
From: Soltus <liaoshanyi@qq.com>
Date: Fri, 22 Mar 2024 01:01:30 +0800
Subject: [PATCH 34/77] =?UTF-8?q?=E6=94=AF=E6=8C=81=E8=BE=93=E5=87=BA?=
 =?UTF-8?q?=E5=AE=89=E5=8D=93repo=E7=9A=84issue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/cd.yml          |  8 +++-
 app/package.json                  |  2 +-
 scripts/parse-changelog-HEAD.py   | 61 +++++++++++++++++++++++++++++++
 scripts/parse-changelog-sillot.py | 25 ++-----------
 4 files changed, 71 insertions(+), 25 deletions(-)
 create mode 100644 scripts/parse-changelog-HEAD.py

diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index bdf8bb74ac..d98a132695 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -62,10 +62,14 @@ jobs:
         run: |
           echo "release_title=$(git show --format=%s --no-patch | head -1)" >> $GITHUB_OUTPUT
           echo "release_version=v${{ steps.version.outputs.value }}_$(TZ=Asia/Shanghai date +'%Y%m%d')_syv${{ steps.syv.outputs.value }}" >> $GITHUB_OUTPUT
-          changelog=$(python scripts/parse-changelog-sillot.py -t ${{ github.ref }} -b ${{ steps.thislatestR.outputs.release }} Hi-Windom/Sillot)
+          changelog1=$(python scripts/parse-changelog-HEAD.py -t ${{ github.ref }} -b ${{ steps.thislatestR.outputs.release }} Hi-Windom/Sillot)
+          changelog2=$(python scripts/parse-changelog-sillot.py -t ${{ github.ref }} Hi-Windom/Sillot)
+          changelog3=$(python scripts/parse-changelog-sillot.py -t ${{ github.ref }} Hi-Windom/Sillot-android)
           EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)
           echo "release_body_sillot<<$EOF" >> $GITHUB_ENV
-          echo "$changelog" >> $GITHUB_ENV
+          echo "$changelog1" >> $GITHUB_ENV
+          echo "$changelog2" >> $GITHUB_ENV
+          echo "$changelog3" >> $GITHUB_ENV
           echo "$EOF" >> $GITHUB_ENV
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/app/package.json b/app/package.json
index 5f39423b7a..057904cd4d 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sillot",
-  "version": "0.27.18",
+  "version": "0.27.19",
   "syv": "3.0.5",
   "sypv": "3.0.4",
   "description": "Build Your Eternal Digital Garden",
diff --git a/scripts/parse-changelog-HEAD.py b/scripts/parse-changelog-HEAD.py
new file mode 100644
index 0000000000..89ffbe78e5
--- /dev/null
+++ b/scripts/parse-changelog-HEAD.py
@@ -0,0 +1,61 @@
+import os
+import re
+from argparse import ArgumentParser
+from collections import defaultdict
+
+import github # pip install PyGithub
+
+# ensure the milestone is open before run this
+docmap = {
+    "Feature": "引入特性 | Feature",
+    "Enhancement": "改进功能 | Enhancement",
+    "Bug": "修复错误 | Bugfix",
+    "Security": "安全相关 | Security",
+    "Document": "文档相关 | Document",
+    "Refactor": "开发重构 | Refactor",
+    "Abolishment": "移除废止 | Abolishment",
+    "Shinning": "闪亮之名 | Shinning",
+}
+
+
+def generate_msg_from_repo(repo_name, tag_name, lastestRelease):
+    thisRelease = tag_name.split("/")[-1]
+    pat = re.search("v([0-9.]+)", thisRelease)
+    if not pat:
+        return None
+
+    print(f'''
+---
+<p align="center">
+<a href="https://github.com/Hi-Windom/Sillot/actions/workflows/ci.yml"><img src="https://img.shields.io/github/actions/workflow/status/Hi-Windom/Sillot/ci.yml?event=push&label=ci.yml%20Action&logo=github" style="cursor:pointer;height: 30px;margin: 3px auto;"/></a>
+<a href="https://github.com/Hi-Windom/Sillot/releases/{thisRelease}/"><img src="https://img.shields.io/github/downloads/Hi-Windom/Sillot/{thisRelease}/total?logo=github" style="cursor:pointer;height: 30px;margin: 3px auto;"/></a>
+<img alt="GitHub commits difference between two branches/tags/commits" src="https://img.shields.io/github/commits-difference/Hi-Windom/Sillot?base={lastestRelease}&head={thisRelease}&logo=git" style="cursor:pointer;height: 30px;margin: 3px auto;"/>
+</p>
+
+⚠️ 这是自动构建的开发者版本！数据无价，请勿用于生产环节
+❤️ 欢迎共建汐洛 694357845@qq.com
+🚧 [{repo_name} is currently in active development](https://github.com/orgs/Hi-Windom/projects/2/views/2)
+
+🚢 [Docker image](https://hub.docker.com/r/soltus/sillot/tags?page=1&ordering=last_updated)  📱 [Android application package](https://github.com/Hi-Windom/Sillot-android/releases)  📦 [Chromium Browser Extension](https://github.com/K-Sillot/Sillot-Be/releases)
+<span>
+<img src="https://img.shields.io/badge/Chromium 94+-black?logo=Google Chrome&logoColor=white" alt="" title=""/><img src="https://img.shields.io/badge/Windows 10+-black?logo=Windows 11" title=""/><img src="https://img.shields.io/badge/macOS-black?logo=apple" title=""/><img src="https://img.shields.io/badge/Docker-black?logo=docker" title=""/><img src="https://img.shields.io/badge/Android 11+-black?logo=android" title=""/>
+</span>
+
+---
+
+''')
+
+
+if __name__ == "__main__":
+    parser = ArgumentParser(
+        description="Automaticly generate information from issues by tag."
+    )
+    parser.add_argument("-t", "--tag", help="the tag to filter issues.")
+    parser.add_argument("-b", "--lastestRelease", help="lastest Release")
+    parser.add_argument("repo", help="The repository name")
+    args = parser.parse_args()
+
+    try:
+        generate_msg_from_repo(args.repo, args.tag, args.lastestRelease)
+    except AssertionError:
+        print(args.tag)
diff --git a/scripts/parse-changelog-sillot.py b/scripts/parse-changelog-sillot.py
index def7a0cd4c..71abc5ba67 100644
--- a/scripts/parse-changelog-sillot.py
+++ b/scripts/parse-changelog-sillot.py
@@ -29,6 +29,7 @@ def generate_msg_from_repo(repo_name, tag_name, lastestRelease):
         repo_name (str): The repository name
         tag_name (str): the tag name
     """
+    print(f'# [@{repo_name.split("/")[-1]}](https://github.com/{repo_name})\n')
     hostname = os.getenv("GITHUB_HOST") or "api.github.com"
     token = os.getenv("GITHUB_TOKEN")
     desc_mapping = defaultdict(list)
@@ -45,7 +46,7 @@ def generate_msg_from_repo(repo_name, tag_name, lastestRelease):
     generate_msg(desc_mapping)
 
 
-def find_milestone(repo, title, lastestRelease):
+def find_milestone(repo, title):
     """Find the milestone in a repository that is similar to milestone title
 
     Args:
@@ -61,26 +62,7 @@ def find_milestone(repo, title, lastestRelease):
     if not pat:
         return None
     version = ".".join(pat.group(1).split(".")[:2])
-    print(f'''
----
-<p align="center">
-<a href="https://github.com/Hi-Windom/Sillot/actions/workflows/ci.yml"><img src="https://img.shields.io/github/actions/workflow/status/Hi-Windom/Sillot/ci.yml?event=push&label=ci.yml%20Action&logo=github" style="cursor:pointer;height: 30px;margin: 3px auto;"/></a>
-<a href="https://github.com/Hi-Windom/Sillot/releases/{thisRelease}/"><img src="https://img.shields.io/github/downloads/Hi-Windom/Sillot/{thisRelease}/total?logo=github" style="cursor:pointer;height: 30px;margin: 3px auto;"/></a>
-<img alt="GitHub commits difference between two branches/tags/commits" src="https://img.shields.io/github/commits-difference/Hi-Windom/Sillot?base={lastestRelease}&head={thisRelease}&logo=git" style="cursor:pointer;height: 30px;margin: 3px auto;"/>
-</p>
-
-⚠️ 这是自动构建的开发者版本！数据无价，请勿用于生产环节
-❤️ 欢迎共建汐洛 694357845@qq.com
-🚧 [Sillot is currently in active development](https://github.com/orgs/Hi-Windom/projects/2/views/2)
-
-🚢 [Docker image](https://hub.docker.com/r/soltus/sillot/tags?page=1&ordering=last_updated)  📱 [Android application package](https://github.com/Hi-Windom/Sillot-android/releases)  📦 [Chromium Browser Extension](https://github.com/K-Sillot/Sillot-Be/releases)
-<span>
-<img src="https://img.shields.io/badge/Chromium 94+-black?logo=Google Chrome&logoColor=white" alt="" title=""/><img src="https://img.shields.io/badge/Windows 10+-black?logo=Windows 11" title=""/><img src="https://img.shields.io/badge/macOS-black?logo=apple" title=""/><img src="https://img.shields.io/badge/Docker-black?logo=docker" title=""/><img src="https://img.shields.io/badge/Android 11+-black?logo=android" title=""/>
-</span>
-
----
-
-''')
+
     # REF https://docs.github.com/en/rest/issues/milestones?apiVersion=2022-11-28#list-milestones
     for milestone in repo.get_milestones():
         if version in milestone.title:
@@ -101,7 +83,6 @@ def get_issue_first_label(issue):
 def generate_msg(desc_mapping):
     """Print changelogs from direction."""
     print()
-    print('# [@Sillot](https://github.com/Hi-Windom/Sillot)\n')
     for header in docmap:
         if not desc_mapping[header]:
             continue

From d196348932d1511728d5863a859b79130bbd459d Mon Sep 17 00:00:00 2001
From: Soltus <liaoshanyi@qq.com>
Date: Fri, 22 Mar 2024 01:04:59 +0800
Subject: [PATCH 35/77] 6

---
 app/package.json                  | 2 +-
 scripts/parse-changelog-sillot.py | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/package.json b/app/package.json
index 057904cd4d..4605184142 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sillot",
-  "version": "0.27.19",
+  "version": "0.27.20",
   "syv": "3.0.5",
   "sypv": "3.0.4",
   "description": "Build Your Eternal Digital Garden",
diff --git a/scripts/parse-changelog-sillot.py b/scripts/parse-changelog-sillot.py
index 71abc5ba67..bae51ae94c 100644
--- a/scripts/parse-changelog-sillot.py
+++ b/scripts/parse-changelog-sillot.py
@@ -18,7 +18,7 @@
 }
 
 
-def generate_msg_from_repo(repo_name, tag_name, lastestRelease):
+def generate_msg_from_repo(repo_name, tag_name):
     """Generate changelog messages from repository and tag name.
 
     Envs:
@@ -36,7 +36,7 @@ def generate_msg_from_repo(repo_name, tag_name, lastestRelease):
 
     gh = github.Github(token, base_url=f"https://{hostname}")
     repo = gh.get_repo(repo_name)
-    milestone = find_milestone(repo, tag_name, lastestRelease)
+    milestone = find_milestone(repo, tag_name)
 
     for issue in repo.get_issues(state="closed", milestone=milestone): # type: ignore
         # REF https://pygithub.readthedocs.io/en/latest/github_objects/Issue.html#github.Issue.Issue
@@ -102,6 +102,6 @@ def generate_msg(desc_mapping):
     args = parser.parse_args()
 
     try:
-        generate_msg_from_repo(args.repo, args.tag, args.lastestRelease)
+        generate_msg_from_repo(args.repo, args.tag)
     except AssertionError:
         print(args.tag)

From d4a5ac3298a200f42160ecee30ec3b3c6bda3f25 Mon Sep 17 00:00:00 2001
From: Soltus <liaoshanyi@qq.com>
Date: Fri, 22 Mar 2024 01:21:15 +0800
Subject: [PATCH 36/77] #570

---
 scripts/parse-changelog-HEAD.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/parse-changelog-HEAD.py b/scripts/parse-changelog-HEAD.py
index 89ffbe78e5..433aee874e 100644
--- a/scripts/parse-changelog-HEAD.py
+++ b/scripts/parse-changelog-HEAD.py
@@ -38,7 +38,7 @@ def generate_msg_from_repo(repo_name, tag_name, lastestRelease):
 
 🚢 [Docker image](https://hub.docker.com/r/soltus/sillot/tags?page=1&ordering=last_updated)  📱 [Android application package](https://github.com/Hi-Windom/Sillot-android/releases)  📦 [Chromium Browser Extension](https://github.com/K-Sillot/Sillot-Be/releases)
 <span>
-<img src="https://img.shields.io/badge/Chromium 94+-black?logo=Google Chrome&logoColor=white" alt="" title=""/><img src="https://img.shields.io/badge/Windows 10+-black?logo=Windows 11" title=""/><img src="https://img.shields.io/badge/macOS-black?logo=apple" title=""/><img src="https://img.shields.io/badge/Docker-black?logo=docker" title=""/><img src="https://img.shields.io/badge/Android 11+-black?logo=android" title=""/>
+<img src="https://img.shields.io/badge/Chromium 94+-black?logo=Google Chrome&logoColor=white" alt="" title=""/><img src="https://img.shields.io/badge/Windows 10+-black?logo=Windows 11" title=""/><img src="https://img.shields.io/badge/Docker-black?logo=docker" title=""/><img src="https://img.shields.io/badge/Android 11+-black?logo=android" title=""/>
 </span>
 
 ---

From ec3c0188b2cf669308351bfc1cf4f1430b0ede18 Mon Sep 17 00:00:00 2001
From: Soltus <liaoshanyi@qq.com>
Date: Fri, 22 Mar 2024 04:16:44 +0800
Subject: [PATCH 37/77] https://github.com/Hi-Windom/Sillot-android/issues/14

---
 app/src/protyle/export/util.ts | 1 +
 app/src/types/index.d.ts       | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/src/protyle/export/util.ts b/app/src/protyle/export/util.ts
index ee478b465a..55e91bac98 100644
--- a/app/src/protyle/export/util.ts
+++ b/app/src/protyle/export/util.ts
@@ -75,6 +75,7 @@ export const exportImage = (id: string) => {
                         formData.append("type", "image/png");
                         fetchPost("/api/export/exportAsFile", formData, (response) => {
                             openByMobile(response.data.file);
+                            window.JSAndroid.savePictureByURL(response.data.file);
                         });
                         hideMessage(msgId);
                         exportDialog.destroy();
diff --git a/app/src/types/index.d.ts b/app/src/types/index.d.ts
index ecbe28527b..d166579e74 100644
--- a/app/src/types/index.d.ts
+++ b/app/src/types/index.d.ts
@@ -169,6 +169,7 @@ interface Window {
 				showBiometricPrompt(): void
 				requestPermission(p: string): void
         exitSillotAndroid(): void
+        savePictureByURL(contentHeight: number): void
 				// sillot extend end
         returnDesktop(): void
         openExternal(url: string): void

From 92d7604e9bbcfe19fc4f2e3b2bed6785d202e332 Mon Sep 17 00:00:00 2001
From: Soltus <liaoshanyi@qq.com>
Date: Fri, 22 Mar 2024 04:28:47 +0800
Subject: [PATCH 38/77] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BC=80=E5=8F=91?=
 =?UTF-8?q?=E4=BD=93=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/package.cli.mjs | 17 ++++++++++++++++-
 app/package.json    |  2 +-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/app/package.cli.mjs b/app/package.cli.mjs
index 502ca032ad..59628a55d2 100644
--- a/app/package.cli.mjs
+++ b/app/package.cli.mjs
@@ -19,6 +19,20 @@ if (!shell.which("go")) {
 }
 
 const spinner = ora("正在执行, 请稍后...\n");
+let startTime = new Date().getTime();
+
+function updateSpinnerText() {
+    const currentTime = new Date().getTime();
+    const elapsedTime = currentTime - startTime;
+    const hours = Math.floor(elapsedTime / (1000 * 60 * 60));
+    const minutes = Math.floor((elapsedTime % (1000 * 60 * 60)) / (1000 * 60));
+    const seconds = Math.floor((elapsedTime % (1000 * 60)) / 1000);
+
+    spinner.text = `正在执行, 请稍后...\n\n\n\t\t\t已用时 ${hours}时${minutes}分${seconds}秒\n\n\n`;
+}
+
+// 每秒更新一次spinner文本
+const intervalId = setInterval(updateSpinnerText, 1000);
 const works = {
   a: { a01: "构建 build", a02: "检查 check", a03: "开发 dev" },
   a01: { a0101: "Win App 构建", a0102: "安卓构建" },
@@ -67,6 +81,7 @@ function exeHandler(cmds, silent) {
     cmds,
     { encoding: silent ? "base64" : "utf8", silent: silent },
     function (code, stdout, stderr) {
+      clearInterval(intervalId); // 停止更新spinner文本
       console.log("Exit code:", code);
       console.log(
         "Program output:",
@@ -98,7 +113,7 @@ function doit(obj) {
       },
     ])
     .then((answers) => {
-      console.warn("建议暂时退出杀毒软件，避免弹窗影响体验");
+      console.warn("\n建议暂时退出杀毒软件，避免弹窗影响体验\n");
       switch (answers.b) {
         case works.a01.a0101:
           exeHandler("cd .. && .\\scripts\\sillot-win-build.bat", true);
diff --git a/app/package.json b/app/package.json
index 4605184142..39a76d3226 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sillot",
-  "version": "0.27.20",
+  "version": "0.27.21",
   "syv": "3.0.5",
   "sypv": "3.0.4",
   "description": "Build Your Eternal Digital Garden",

From 9d740f26c1a1a547acebedc49234f04bfbf019c3 Mon Sep 17 00:00:00 2001
From: Vanessa <lly219@gmail.com>
Date: Fri, 22 Mar 2024 08:59:42 +0800
Subject: [PATCH 39/77] :bug: fix
 https://github.com/siyuan-note/siyuan/issues/10686

---
 app/src/protyle/wysiwyg/enter.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/protyle/wysiwyg/enter.ts b/app/src/protyle/wysiwyg/enter.ts
index 274493374e..c64d5d169e 100644
--- a/app/src/protyle/wysiwyg/enter.ts
+++ b/app/src/protyle/wysiwyg/enter.ts
@@ -219,9 +219,10 @@ export const enter = (blockElement: HTMLElement, range: Range, protyle: IProtyle
     // 回车之前的块为 1\n\n2 时会产生多个块
     Array.from(enterElement.children).forEach((item: HTMLElement) => {
         if (item.dataset.nodeId === id) {
-            const previousElement = blockElement.previousElementSibling;
+            const blockPreviousElement = blockElement.previousElementSibling;
+            const blockParentElement = blockElement.parentElement;
             blockElement.outerHTML = item.outerHTML;
-            blockElement = (previousElement?.nextElementSibling || protyle.wysiwyg.element.firstElementChild) as HTMLElement;
+            blockElement = (blockPreviousElement ? blockPreviousElement.nextElementSibling : blockParentElement.firstElementChild) as HTMLElement;
             doOperation.push({
                 action: "update",
                 data: blockElement.outerHTML,

From 5937c14e2f4c12319f13b940d54755cd20428a08 Mon Sep 17 00:00:00 2001
From: Vanessa <lly219@gmail.com>
Date: Fri, 22 Mar 2024 09:09:58 +0800
Subject: [PATCH 40/77] :art: fix
 https://github.com/siyuan-note/siyuan/issues/10676

---
 app/src/config/image.ts | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/src/config/image.ts b/app/src/config/image.ts
index b503e2ee5e..33b94b7f1f 100644
--- a/app/src/config/image.ts
+++ b/app/src/config/image.ts
@@ -89,7 +89,7 @@ export const image = {
                     event.stopPropagation();
                     break;
                 } else if (type === "copy") {
-                    writeText(target.parentElement.querySelector(".b3-list-item__text").textContent.trim());
+                    writeText(target.parentElement.querySelector(".b3-list-item__text").textContent.trim().replace("assets/", ""));
                 } else if (type === "open") {
                     /// #if !BROWSER
                     openBy(target.parentElement.getAttribute("data-path"), "folder");
@@ -138,18 +138,14 @@ export const image = {
         let html = "";
         let boxOpenHTML = "";
         if (!isBrowser() && action) {
-            boxOpenHTML = `<span data-type="open" class="b3-tooltips b3-tooltips__w b3-list-item__action" aria-label="${window.siyuan.languages.showInFolder}">
+            boxOpenHTML = `<span data-type="open" class="ariaLabel b3-list-item__action" aria-label="${window.siyuan.languages.showInFolder}">
     <svg><use xlink:href="#iconFolder"></use></svg>
 </span>`;
         }
         let boxClearHTML = "";
         if (action) {
-            boxClearHTML = `<span data-type="clear" class="b3-tooltips b3-tooltips__w b3-list-item__action" aria-label="${window.siyuan.languages.delete}">
+            boxClearHTML = `<span data-type="clear" class="ariaLabel b3-list-item__action" aria-label="${window.siyuan.languages.delete}">
     <svg><use xlink:href="#iconTrashcan"></use></svg>
-</span>`;
-        } else {
-            boxClearHTML = `<span data-type="copy" class="b3-tooltips b3-tooltips__w b3-list-item__action" aria-label="${window.siyuan.languages.copy}">
-    <svg><use xlink:href="#iconCopy"></use></svg>
 </span>`;
         }
         data.forEach((item) => {
@@ -157,6 +153,9 @@ export const image = {
             const dataPath = item.substr(idx);
             html += `<li data-path="${dataPath}"  class="b3-list-item b3-list-item--hide-action">
     <span class="b3-list-item__text">${escapeHtml(item)}</span>
+    <span data-type="copy" class="ariaLabel b3-list-item__action" aria-label="${window.siyuan.languages.copy}">
+        <svg><use xlink:href="#iconCopy"></use></svg>
+    </span>
     ${boxOpenHTML}
     ${boxClearHTML}
 </li>`;

From 0770b160ff370bec4fff5264ca38377e994de4c7 Mon Sep 17 00:00:00 2001
From: Vanessa <lly219@gmail.com>
Date: Fri, 22 Mar 2024 09:35:26 +0800
Subject: [PATCH 41/77] :art:
 https://github.com/siyuan-note/siyuan/issues/10682

---
 app/src/config/keymap.ts | 3 +++
 app/src/plugin/loader.ts | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/app/src/config/keymap.ts b/app/src/config/keymap.ts
index 2a38054fe5..c7b54e2006 100644
--- a/app/src/config/keymap.ts
+++ b/app/src/config/keymap.ts
@@ -52,6 +52,9 @@ export const keymap = {
             });
             Object.keys(item.docks).forEach(key => {
                 const dockConfig = item.docks[key].config;
+                if (!dockConfig.hotkey) {
+                    return;
+                }
                 const dockKeymap =  window.siyuan.config.keymap.plugin[item.name][key];
                 const keyValue = updateHotkeyTip(dockKeymap.custom);
                 commandHTML += `<label class="b3-list-item b3-list-item--narrow b3-list-item--hide-action">
diff --git a/app/src/plugin/loader.ts b/app/src/plugin/loader.ts
index b5c77ddc2d..b8b9564cf0 100644
--- a/app/src/plugin/loader.ts
+++ b/app/src/plugin/loader.ts
@@ -140,6 +140,9 @@ const mergePluginHotkey = (plugin: Plugin) => {
     }
     Object.keys(plugin.docks).forEach(dockKey => {
         const dock = plugin.docks[dockKey];
+        if (!dock.config.hotkey) {
+            return;
+        }
         if (!window.siyuan.config.keymap.plugin[plugin.name]) {
             window.siyuan.config.keymap.plugin[plugin.name] = {
                 [dockKey]: {

From d306076b228de28d7d9bdcfad1be89ba34dfdb3f Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Fri, 22 Mar 2024 09:35:34 +0800
Subject: [PATCH 42/77] :art: Update create workspace dialog

---
 app/src/menus/workspace.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/menus/workspace.ts b/app/src/menus/workspace.ts
index ee2b3242e4..71894aa599 100644
--- a/app/src/menus/workspace.ts
+++ b/app/src/menus/workspace.ts
@@ -98,7 +98,7 @@ export const workspaceMenu = (app: App, rect: DOMRect) => {
                         if (response.data.isWorkspace) {
                             openWorkspace(localPath.filePaths[0]);
                         } else {
-                            confirmDialog(window.siyuan.languages.createWorkspace, window.siyuan.languages.createWorkspaceTip + `<br><br><code class="fn__code">${localPath.filePaths[0]}</code>`, () => {
+                            confirmDialog('🏗️ ' + window.siyuan.languages.createWorkspace, window.siyuan.languages.createWorkspaceTip + `<br><br><code class="fn__code">${localPath.filePaths[0]}</code>`, () => {
                                 openWorkspace(localPath.filePaths[0]);
                             });
                         }

From 2e524a3d44f30dff65b3866b13a83062d21a6fb2 Mon Sep 17 00:00:00 2001
From: Vanessa <lly219@gmail.com>
Date: Fri, 22 Mar 2024 09:45:26 +0800
Subject: [PATCH 43/77] :art:

---
 app/src/plugin/loader.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/plugin/loader.ts b/app/src/plugin/loader.ts
index b8b9564cf0..bbe66899fd 100644
--- a/app/src/plugin/loader.ts
+++ b/app/src/plugin/loader.ts
@@ -225,7 +225,7 @@ export const afterLoadPlugin = (plugin: Plugin) => {
     });
     Object.keys(plugin.docks).forEach(key => {
         const dock = plugin.docks[key];
-        const hotkey = window.siyuan.config.keymap.plugin[plugin.name][key].custom;
+        const hotkey = window.siyuan.config.keymap.plugin[plugin.name] ? window.siyuan.config.keymap.plugin[plugin.name][key]?.custom : undefined;
         if (dock.config.position.startsWith("Left")) {
             window.siyuan.layout.leftDock.genButton([{
                 type: key,

From 13e9680d18ac01301bd5383b44d4f78b6c513231 Mon Sep 17 00:00:00 2001
From: Vanessa <lly219@gmail.com>
Date: Fri, 22 Mar 2024 09:51:39 +0800
Subject: [PATCH 44/77] :art:
 https://github.com/siyuan-note/siyuan/issues/10691

---
 app/src/config/bazaar.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/config/bazaar.ts b/app/src/config/bazaar.ts
index 6e53b4b5dd..e39a0929b6 100644
--- a/app/src/config/bazaar.ts
+++ b/app/src/config/bazaar.ts
@@ -344,6 +344,7 @@ export const bazaar = {
 
             const allCount = response.data.themes.length + response.data.icons.length + response.data.widgets.length + response.data.plugins.length + response.data.templates.length
             if (allCount === 0) {
+                this.element.querySelector('[data-type="downloaded-update"]').innerHTML = "";
                 return;
             }
             this.element.querySelector('[data-type="downloaded-update"]').innerHTML = `<div class="fn__flex config-bazaar__title">

From 755d27c5da3f9220ab3240d270b32dc6ad992a7a Mon Sep 17 00:00:00 2001
From: Vanessa <lly219@gmail.com>
Date: Fri, 22 Mar 2024 10:03:52 +0800
Subject: [PATCH 45/77] :art:
 https://github.com/siyuan-note/siyuan/issues/10694

---
 app/src/protyle/gutter/index.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/protyle/gutter/index.ts b/app/src/protyle/gutter/index.ts
index b3c6d9ee82..f97b4d4786 100644
--- a/app/src/protyle/gutter/index.ts
+++ b/app/src/protyle/gutter/index.ts
@@ -755,6 +755,7 @@ export class Gutter {
                     });
                 });
                 copyPlainText(html.trimEnd());
+                focusBlock(selectsElement[0]);
             }
         }, {
             label: window.siyuan.languages.duplicate,
@@ -1227,6 +1228,7 @@ export class Gutter {
                     text += item.textContent + "\n";
                 });
                 copyPlainText(text.trimEnd());
+                focusBlock(nodeElement);
             }
         }, {
             label: window.siyuan.languages.duplicate,

From 7e60208fc3dc543fdb3d72d79b56b254a2721f47 Mon Sep 17 00:00:00 2001
From: Soltus <liaoshanyi@qq.com>
Date: Fri, 22 Mar 2024 10:34:24 +0800
Subject: [PATCH 46/77] 6

---
 app/src/mobile/settings/about.ts      | 9 ++++-----
 app/src/protyle/util/compatibility.ts | 8 +++++++-
 app/src/types/index.d.ts              | 4 ++--
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/app/src/mobile/settings/about.ts b/app/src/mobile/settings/about.ts
index 96249de695..7a89f08364 100644
--- a/app/src/mobile/settings/about.ts
+++ b/app/src/mobile/settings/about.ts
@@ -244,14 +244,14 @@ export const initAbout = () => {
                         break;
                     } else if (target.id === "exportData") {
                         fetchPost("/api/export/exportData", {}, response => {
-                            openByMobile(response.data.zip);
+                            openByMobile(response.data.zip, "exportData");
                         });
                         event.preventDefault();
                         event.stopPropagation();
                         break;
                     } else if (target.id === "exportLog") {
                         fetchPost("/api/system/exportLog", {}, (response) => {
-                            openByMobile(response.data.zip);
+                            openByMobile(response.data.zip, "exportLog");
                         });
                         event.preventDefault();
                         event.stopPropagation();
@@ -363,11 +363,10 @@ export const initAbout = () => {
             networkServeElement.addEventListener("change", () => {
                 fetchPost("/api/system/setNetworkServe", {networkServe: networkServeElement.checked}, () => {
                     if(networkServeElement.checked){
-                        const _r = window.JSAndroid.requestPermission("android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS");
+                        const _r = window.JSAndroid.requestPermission("Battery","注意：后台稳定伺服会消耗额外电量");
                         console.warn(_r);
-                    } else {
-                        exitSiYuan();
                     }
+                    exitSiYuan();
                 });
             });
             const tokenElement = modelMainElement.querySelector("#token") as HTMLInputElement;
diff --git a/app/src/protyle/util/compatibility.ts b/app/src/protyle/util/compatibility.ts
index 9f0b1a6a18..9d0bd95f9f 100644
--- a/app/src/protyle/util/compatibility.ts
+++ b/app/src/protyle/util/compatibility.ts
@@ -2,13 +2,19 @@ import {focusByRange} from "./selection";
 import {fetchPost} from "../../util/fetch";
 import {Constants} from "../../constants";
 
-export const openByMobile = (uri: string) => {
+export const openByMobile = (uri: string, from?: string) => {
     if (!uri) {
         return;
     }
     if (window.siyuan.config.system.container === "ios") {
         window.location.href = uri;
     } else if (isInAndroid()) {
+        console.warn(uri);
+        if (["exportLog", "exportData"].includes(from)) {
+          // 在设置界面没有顶栏打开图标，直接调用
+          window.JSAndroid.openExternal(uri);
+          return;
+        }
 				const toolbarOpenBy = document.querySelector("#toolbarOpenBy");
 				const toolbarConsole = document.querySelector("#toolbarConsole");
 				if (toolbarOpenBy && toolbarConsole) {
diff --git a/app/src/types/index.d.ts b/app/src/types/index.d.ts
index d166579e74..d290bd7bbf 100644
--- a/app/src/types/index.d.ts
+++ b/app/src/types/index.d.ts
@@ -167,9 +167,9 @@ interface Window {
 				// sillot extend
 				setMMKV(key: string, value: string): void
 				showBiometricPrompt(): void
-				requestPermission(p: string): void
+				requestPermission(p: string, Msg: string): void
         exitSillotAndroid(): void
-        savePictureByURL(contentHeight: number): void
+        savePictureByURL(uri: string): void
 				// sillot extend end
         returnDesktop(): void
         openExternal(url: string): void

From 76b2036eed82290fa4e44376e72262489b8c9c38 Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Fri, 22 Mar 2024 10:33:24 +0800
Subject: [PATCH 47/77] :art: Support opening assets through other apps on the
 Android https://github.com/siyuan-note/siyuan/issues/10657

---
 kernel/mobile/kernel.go | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/kernel/mobile/kernel.go b/kernel/mobile/kernel.go
index adc6a0bf13..7aff63245d 100644
--- a/kernel/mobile/kernel.go
+++ b/kernel/mobile/kernel.go
@@ -24,6 +24,7 @@ import (
 	"time"
 
 	"github.com/siyuan-note/filelock"
+	"github.com/siyuan-note/logging"
 	"github.com/siyuan-note/siyuan/kernel/cache"
 	"github.com/siyuan-note/siyuan/kernel/job"
 	"github.com/siyuan-note/siyuan/kernel/model"
@@ -89,6 +90,15 @@ func GetCurrentWorkspacePath() string {
 	return util.WorkspaceDir
 }
 
+func GetAssetAbsPath(asset string) (ret string) {
+	ret, err := model.GetAssetAbsPath(asset)
+	if nil != err {
+		logging.LogErrorf("get asset [%s] abs path failed: %s", asset, err)
+		ret = asset
+	}
+	return
+}
+
 func SetTimezone(container, appDir, timezoneID string) {
 	if "ios" == container {
 		os.Setenv("ZONEINFO", filepath.Join(appDir, "app", "zoneinfo.zip"))

From b159b5c7d53af5f9146663a459135864281896b0 Mon Sep 17 00:00:00 2001
From: Vanessa <lly219@gmail.com>
Date: Fri, 22 Mar 2024 11:08:21 +0800
Subject: [PATCH 48/77] :art:
 https://github.com/siyuan-note/siyuan/issues/10685

---
 app/src/protyle/render/av/cell.ts    | 11 +++++++++++
 app/src/protyle/render/av/keydown.ts |  6 +++++-
 app/src/protyle/render/av/render.ts  | 17 ++++++++++++++++-
 app/src/protyle/wysiwyg/index.ts     |  5 +++--
 4 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/app/src/protyle/render/av/cell.ts b/app/src/protyle/render/av/cell.ts
index 22e65a6a79..7fe978f14f 100644
--- a/app/src/protyle/render/av/cell.ts
+++ b/app/src/protyle/render/av/cell.ts
@@ -340,6 +340,7 @@ export const popTextCell = (protyle: IProtyle, cellElements: HTMLElement[], type
         }
         if (!hasClosestByClassName(cellElements[0], "custom-attr")) {
             cellElements[0].classList.add("av__cell--select");
+            addDragFill(cellElements[0]);
         }
         return;
     }
@@ -379,6 +380,7 @@ export const popTextCell = (protyle: IProtyle, cellElements: HTMLElement[], type
                     protyle.toolbar.range.selectNodeContents(cellElements[0].lastChild);
                     focusByRange(protyle.toolbar.range);
                     cellElements[0].classList.add("av__cell--select");
+                    addDragFill(cellElements[0]);
                     hintRef(inputElement.value.substring(2), protyle, "av");
                     avMaskElement?.remove();
                     event.preventDefault();
@@ -453,6 +455,7 @@ const updateCellValueByInput = (protyle: IProtyle, type: TAVCol, blockElement: H
     if (cellElements[0] // 兼容新增行后台隐藏
         && !hasClosestByClassName(cellElements[0], "custom-attr")) {
         cellElements[0].classList.add("av__cell--select");
+        addDragFill(cellElements[0]);
     }
     //  单元格编辑中 ctrl+p 光标定位
     if (!document.querySelector(".b3-dialog")) {
@@ -819,3 +822,11 @@ export const dragFillCellsValue = (protyle: IProtyle, nodeElement: HTMLElement,
         transaction(protyle, doOperations, undoOperations);
     }
 };
+
+export const addDragFill = (cellElement: Element) => {
+    if (!cellElement) {
+        return;
+    }
+    cellElement.classList.add("av__cell--active");
+    cellElement.insertAdjacentHTML("beforeend", `<div aria-label="${window.siyuan.languages.dragFill}" class="av__drag-fill ariaLabel"></div>`);
+}
diff --git a/app/src/protyle/render/av/keydown.ts b/app/src/protyle/render/av/keydown.ts
index 3e9ae0079b..779f2166c1 100644
--- a/app/src/protyle/render/av/keydown.ts
+++ b/app/src/protyle/render/av/keydown.ts
@@ -1,6 +1,6 @@
 import {matchHotKey} from "../../util/hotKey";
 import {deleteRow, selectRow} from "./row";
-import {cellScrollIntoView, popTextCell, updateCellsValue} from "./cell";
+import {addDragFill, cellScrollIntoView, popTextCell, updateCellsValue} from "./cell";
 import {avContextmenu} from "./action";
 import {hasClosestByClassName} from "../../util/hasClosest";
 import {Constants} from "../../../constants";
@@ -62,6 +62,7 @@ export const avKeydown = (event: KeyboardEvent, nodeElement: HTMLElement, protyl
             if (newCellElement) {
                 selectCellElement.classList.remove("av__cell--select");
                 newCellElement.classList.add("av__cell--select");
+                addDragFill(newCellElement);
                 cellScrollIntoView(nodeElement, newCellElement, false);
             }
             event.preventDefault();
@@ -79,6 +80,7 @@ export const avKeydown = (event: KeyboardEvent, nodeElement: HTMLElement, protyl
             if (newCellElement) {
                 selectCellElement.classList.remove("av__cell--select");
                 newCellElement.classList.add("av__cell--select");
+                addDragFill(newCellElement);
                 cellScrollIntoView(nodeElement, newCellElement, false);
             }
             event.preventDefault();
@@ -92,6 +94,7 @@ export const avKeydown = (event: KeyboardEvent, nodeElement: HTMLElement, protyl
             if (newCellElement) {
                 selectCellElement.classList.remove("av__cell--select");
                 newCellElement.classList.add("av__cell--select");
+                addDragFill(newCellElement);
                 cellScrollIntoView(nodeElement, newCellElement);
             }
             event.preventDefault();
@@ -105,6 +108,7 @@ export const avKeydown = (event: KeyboardEvent, nodeElement: HTMLElement, protyl
             if (newCellElement) {
                 selectCellElement.classList.remove("av__cell--select");
                 newCellElement.classList.add("av__cell--select");
+                addDragFill(newCellElement);
                 cellScrollIntoView(nodeElement, newCellElement);
             }
             event.preventDefault();
diff --git a/app/src/protyle/render/av/render.ts b/app/src/protyle/render/av/render.ts
index bec47edb13..913c18dbb3 100644
--- a/app/src/protyle/render/av/render.ts
+++ b/app/src/protyle/render/av/render.ts
@@ -1,7 +1,7 @@
 import {fetchPost} from "../../../util/fetch";
 import {getColIconByType} from "./col";
 import {Constants} from "../../../constants";
-import {renderCell} from "./cell";
+import {addDragFill, renderCell} from "./cell";
 import {unicode2Emoji} from "../../../emoji";
 import {focusBlock} from "../../util/selection";
 import {hasClosestBlock, hasClosestByClassName} from "../../util/hasClosest";
@@ -50,6 +50,15 @@ export const avRender = (element: Element, protyle: IProtyle, cb?: () => void, v
             if (selectCellElement) {
                 selectCellId = (hasClosestByClassName(selectCellElement, "av__row") as HTMLElement).dataset.id + Constants.ZWSP + selectCellElement.getAttribute("data-col-id");
             }
+            let dragFillId = ""
+            const dragFillElement = e.querySelector(".av__drag-fill") as HTMLElement;
+            if (dragFillElement) {
+                dragFillId = (hasClosestByClassName(dragFillElement, "av__row") as HTMLElement).dataset.id + Constants.ZWSP + dragFillElement.parentElement.getAttribute("data-col-id");
+            }
+            const activeIds: string[] = [];
+            e.querySelectorAll(".av__cell--active").forEach((item: HTMLElement) => {
+                activeIds.push((hasClosestByClassName(item, "av__row") as HTMLElement).dataset.id + Constants.ZWSP + item.getAttribute("data-col-id"));
+            })
             const created = protyle.options.history?.created;
             const snapshot = protyle.options.history?.snapshot;
             let newViewID = e.getAttribute(Constants.CUSTOM_SY_AV_VIEW) || "";
@@ -278,6 +287,12 @@ ${cell.color ? `color:${cell.color};` : ""}">${renderCell(cell.value)}</div>`;
                         focusBlock(e);
                     }
                 }
+                if (dragFillId) {
+                    addDragFill(e.querySelector(`.av__row[data-id="${dragFillId.split(Constants.ZWSP)[0]}"] .av__cell[data-col-id="${dragFillId.split(Constants.ZWSP)[1]}"]`))
+                }
+                activeIds.forEach(activeId => {
+                    e.querySelector(`.av__row[data-id="${activeId.split(Constants.ZWSP)[0]}"] .av__cell[data-col-id="${activeId.split(Constants.ZWSP)[1]}"]`)?.classList.add("av__cell--active")
+                })
                 if (getSelection().rangeCount > 0) {
                     // 修改表头后光标重新定位
                     const range = getSelection().getRangeAt(0);
diff --git a/app/src/protyle/wysiwyg/index.ts b/app/src/protyle/wysiwyg/index.ts
index 6d062429d5..bd88ffe798 100644
--- a/app/src/protyle/wysiwyg/index.ts
+++ b/app/src/protyle/wysiwyg/index.ts
@@ -82,6 +82,7 @@ import {openViewMenu} from "../render/av/view";
 import {avRender} from "../render/av/render";
 import {checkFold} from "../../util/noRelyPCFunction";
 import {
+    addDragFill,
     dragFillCellsValue,
     genCellValueByElement,
     getCellText,
@@ -517,7 +518,7 @@ export class WYSIWYG {
                     documentSelf.onselect = null;
                     if (lastCellElement) {
                         dragFillCellsValue(protyle, nodeElement, originData, originCellIds);
-                        lastCellElement.insertAdjacentHTML("beforeend", `<div aria-label="${window.siyuan.languages.dragFill}" class="av__drag-fill ariaLabel"></div>`);
+                        addDragFill(lastCellElement);
                     }
                     return false;
                 };
@@ -589,7 +590,7 @@ export class WYSIWYG {
                     if (lastCellElement) {
                         selectRow(nodeElement.querySelector(".av__firstcol"), "unselectAll");
                         focusBlock(nodeElement);
-                        lastCellElement.insertAdjacentHTML("beforeend", `<div aria-label="${window.siyuan.languages.dragFill}" class="av__drag-fill ariaLabel"></div>`);
+                        addDragFill(lastCellElement);
                         this.preventClick = true;
                     }
                     return false;

From 41d01f3f95ad90f46e376e91e2724a9da02dcca5 Mon Sep 17 00:00:00 2001
From: Soltus <liaoshanyi@qq.com>
Date: Fri, 22 Mar 2024 11:20:36 +0800
Subject: [PATCH 49/77] https://github.com/Hi-Windom/Sillot/issues/587

---
 app/src/menus/commonMenuItem.ts       | 4 ++--
 app/src/protyle/util/compatibility.ts | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/menus/commonMenuItem.ts b/app/src/menus/commonMenuItem.ts
index 85965be811..fbb58157e9 100644
--- a/app/src/menus/commonMenuItem.ts
+++ b/app/src/menus/commonMenuItem.ts
@@ -520,7 +520,7 @@ export const exportMd = (id: string) => {
                     id,
                 }, response => {
                     hideMessage(msgId);
-                    openByMobile(response.data.zip);
+                    openByMobile(response.data.zip, "exportMd");
                 });
             }
         }, {
@@ -532,7 +532,7 @@ export const exportMd = (id: string) => {
                     id,
                 }, response => {
                     hideMessage(msgId);
-                    openByMobile(response.data.zip);
+                    openByMobile(response.data.zip, "exportSY");
                 });
             }
         }, {
diff --git a/app/src/protyle/util/compatibility.ts b/app/src/protyle/util/compatibility.ts
index 9d0bd95f9f..2adbfb52e8 100644
--- a/app/src/protyle/util/compatibility.ts
+++ b/app/src/protyle/util/compatibility.ts
@@ -10,8 +10,8 @@ export const openByMobile = (uri: string, from?: string) => {
         window.location.href = uri;
     } else if (isInAndroid()) {
         console.warn(uri);
-        if (["exportLog", "exportData"].includes(from)) {
-          // 在设置界面没有顶栏打开图标，直接调用
+        if (from?.startsWith("export")) {
+          // 特殊情况直接调用
           window.JSAndroid.openExternal(uri);
           return;
         }

From c5cc3ff779c875e163d295b57cb6c789752ddfcc Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Fri, 22 Mar 2024 11:29:08 +0800
Subject: [PATCH 50/77] :art: Support opening assets through other apps on the
 Android https://github.com/siyuan-note/siyuan/issues/10657

---
 kernel/mobile/kernel.go |  4 ++++
 kernel/util/file.go     | 17 +++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/kernel/mobile/kernel.go b/kernel/mobile/kernel.go
index 7aff63245d..8ecd3d9f70 100644
--- a/kernel/mobile/kernel.go
+++ b/kernel/mobile/kernel.go
@@ -99,6 +99,10 @@ func GetAssetAbsPath(asset string) (ret string) {
 	return
 }
 
+func GetMimeTypeByExt(ext string) string {
+	return util.GetMimeTypeByExt(ext)
+}
+
 func SetTimezone(container, appDir, timezoneID string) {
 	if "ios" == container {
 		os.Setenv("ZONEINFO", filepath.Join(appDir, "app", "zoneinfo.zip"))
diff --git a/kernel/util/file.go b/kernel/util/file.go
index 9dafed651d..4af6e40b06 100644
--- a/kernel/util/file.go
+++ b/kernel/util/file.go
@@ -20,6 +20,7 @@ import (
 	"bytes"
 	"io"
 	"io/fs"
+	"mime"
 	"os"
 	"path"
 	"path/filepath"
@@ -28,10 +29,26 @@ import (
 
 	"github.com/88250/gulu"
 	"github.com/88250/lute/ast"
+	"github.com/gabriel-vasile/mimetype"
 	"github.com/siyuan-note/filelock"
 	"github.com/siyuan-note/logging"
 )
 
+func GetMimeTypeByExt(filePath string) (ret string) {
+	ret = mime.TypeByExtension(filepath.Ext(filePath))
+	if "" == ret {
+		m, err := mimetype.DetectFile(filePath)
+		if nil != err {
+			logging.LogErrorf("detect mime type of [%s] failed: %s", filePath, err)
+			return
+		}
+		if nil != m {
+			ret = m.String()
+		}
+	}
+	return
+}
+
 func IsSymlinkPath(absPath string) bool {
 	fi, err := os.Lstat(absPath)
 	if nil != err {

From 4f1013a35e7e68d859a211195eed6a6c4991afd6 Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Fri, 22 Mar 2024 11:47:18 +0800
Subject: [PATCH 51/77] :art: Search type filtering supports Audio, Video,
 IFrame and Widget block https://github.com/siyuan-note/siyuan/issues/10645

---
 kernel/conf/search.go  | 37 ++++++++++++++++++++++++++++++++-----
 kernel/model/search.go |  8 ++++++++
 2 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/kernel/conf/search.go b/kernel/conf/search.go
index 31b36d163e..1eb93f3966 100644
--- a/kernel/conf/search.go
+++ b/kernel/conf/search.go
@@ -38,6 +38,10 @@ type Search struct {
 	HTMLBlock     bool `json:"htmlBlock"`
 	EmbedBlock    bool `json:"embedBlock"`
 	DatabaseBlock bool `json:"databaseBlock"`
+	AudioBlock    bool `json:"audioBlock"`
+	VideoBlock    bool `json:"videoBlock"`
+	IFrameBlock   bool `json:"iframeBlock"`
+	WidgetBlock   bool `json:"widgetBlock"`
 
 	Limit         int  `json:"limit"`
 	CaseSensitive bool `json:"caseSensitive"`
@@ -76,6 +80,10 @@ func NewSearch() *Search {
 		HTMLBlock:     true,
 		EmbedBlock:    false,
 		DatabaseBlock: true,
+		AudioBlock:    true,
+		VideoBlock:    true,
+		IFrameBlock:   true,
+		WidgetBlock:   true,
 
 		Limit:         64,
 		CaseSensitive: false,
@@ -195,11 +203,30 @@ func (s *Search) TypeFilter() string {
 		buf.WriteByte('\'')
 		buf.WriteString(",")
 	}
-
-	// 无法搜索到 iframe 块、视频块和音频块 https://github.com/siyuan-note/siyuan/issues/3604
-	buf.WriteString("'iframe','video','audio',")
-	// 挂件块支持内置属性搜索 https://github.com/siyuan-note/siyuan/issues/4497
-	buf.WriteString("'widget',")
+	if s.AudioBlock {
+		buf.WriteByte('\'')
+		buf.WriteString(treenode.TypeAbbr(ast.NodeAudio.String()))
+		buf.WriteByte('\'')
+		buf.WriteString(",")
+	}
+	if s.VideoBlock {
+		buf.WriteByte('\'')
+		buf.WriteString(treenode.TypeAbbr(ast.NodeVideo.String()))
+		buf.WriteByte('\'')
+		buf.WriteString(",")
+	}
+	if s.IFrameBlock {
+		buf.WriteByte('\'')
+		buf.WriteString(treenode.TypeAbbr(ast.NodeIFrame.String()))
+		buf.WriteByte('\'')
+		buf.WriteString(",")
+	}
+	if s.WidgetBlock {
+		buf.WriteByte('\'')
+		buf.WriteString(treenode.TypeAbbr(ast.NodeWidget.String()))
+		buf.WriteByte('\'')
+		buf.WriteString(",")
+	}
 
 	ret := buf.String()
 	if "" == ret {
diff --git a/kernel/model/search.go b/kernel/model/search.go
index 925ca5b145..0fcd5f4845 100644
--- a/kernel/model/search.go
+++ b/kernel/model/search.go
@@ -971,6 +971,10 @@ func buildTypeFilter(types map[string]bool) string {
 		s.HTMLBlock = types["htmlBlock"]
 		s.EmbedBlock = types["embedBlock"]
 		s.DatabaseBlock = types["databaseBlock"]
+		s.AudioBlock = types["audioBlock"]
+		s.VideoBlock = types["videoBlock"]
+		s.IFrameBlock = types["iFrameBlock"]
+		s.WidgetBlock = types["widgetBlock"]
 	} else {
 		s.Document = Conf.Search.Document
 		s.Heading = Conf.Search.Heading
@@ -985,6 +989,10 @@ func buildTypeFilter(types map[string]bool) string {
 		s.HTMLBlock = Conf.Search.HTMLBlock
 		s.EmbedBlock = Conf.Search.EmbedBlock
 		s.DatabaseBlock = Conf.Search.DatabaseBlock
+		s.AudioBlock = Conf.Search.AudioBlock
+		s.VideoBlock = Conf.Search.VideoBlock
+		s.IFrameBlock = Conf.Search.IFrameBlock
+		s.WidgetBlock = Conf.Search.WidgetBlock
 	}
 	return s.TypeFilter()
 }

From 5a761ab54a27cfc6d1cadddb1b4643bab30e106a Mon Sep 17 00:00:00 2001
From: Vanessa <lly219@gmail.com>
Date: Fri, 22 Mar 2024 11:49:32 +0800
Subject: [PATCH 52/77] :art: 
 https://github.com/siyuan-note/siyuan/issues/10695

---
 app/src/protyle/render/av/render.ts |   7 ++
 app/src/protyle/util/insertHTML.ts  | 180 +++++++++++++++-------------
 2 files changed, 104 insertions(+), 83 deletions(-)

diff --git a/app/src/protyle/render/av/render.ts b/app/src/protyle/render/av/render.ts
index 913c18dbb3..564b9dde29 100644
--- a/app/src/protyle/render/av/render.ts
+++ b/app/src/protyle/render/av/render.ts
@@ -397,6 +397,13 @@ export const refreshAV = (protyle: IProtyle, operation: IOperation) => {
             Array.from(protyle.wysiwyg.element.querySelectorAll(`[data-av-id="${operation.avID}"]`)).forEach((item: HTMLElement) => {
                 item.removeAttribute("data-render");
                 const updateRow = item.querySelector('.av__row[data-need-update="true"]');
+                if (operation.action === "sortAttrViewCol" || operation.action === "sortAttrViewRow") {
+                    item.querySelectorAll(".av__cell--active").forEach((item: HTMLElement) => {
+                        item.classList.remove("av__cell--active");
+                        item.querySelector(".av__drag-fill")?.remove();
+                    });
+                    addDragFill(item.querySelector(".av__cell--select"));
+                }
                 avRender(item, protyle, () => {
                     const attrElement = document.querySelector(`.b3-dialog--open[data-key="${Constants.DIALOG_ATTR}"] div[data-av-id="${operation.avID}"]`) as HTMLElement;
                     if (attrElement) {
diff --git a/app/src/protyle/util/insertHTML.ts b/app/src/protyle/util/insertHTML.ts
index 997316176a..1c2877564a 100644
--- a/app/src/protyle/util/insertHTML.ts
+++ b/app/src/protyle/util/insertHTML.ts
@@ -12,101 +12,115 @@ import {input} from "../wysiwyg/input";
 import {objEquals} from "../../util/functions";
 
 const processAV = (range: Range, html: string, protyle: IProtyle, blockElement: HTMLElement) => {
+    const tempElement = document.createElement("template")
+    tempElement.innerHTML = html;
+    let values: IAVCellValue[] = [];
     if (html.endsWith("]") && html.startsWith("[")) {
         try {
-            const values = JSON.parse(html);
-            const cellElements: Element[] = Array.from(blockElement.querySelectorAll(".av__cell--active, .av__cell--select")) || [];
-            if (cellElements.length === 0) {
-                blockElement.querySelectorAll(".av__row--select:not(.av__row--header)").forEach(rowElement => {
-                    rowElement.querySelectorAll(".av__cell").forEach(cellElement => {
-                        cellElements.push(cellElement);
-                    });
+            values = JSON.parse(html);
+        } catch (e) {
+            console.warn("insert cell: JSON.parse error");
+        }
+    } else if (tempElement.content.querySelector("table")) {
+        tempElement.content.querySelectorAll("tr").forEach(item => {
+            Array.from(item.children).forEach(cell => {
+                values.push({
+                    text: {content: cell.textContent},
+                    type: "text"
+                })
+            })
+        })
+    }
+    if (values && Array.isArray(values) && values.length > 0) {
+        const cellElements: Element[] = Array.from(blockElement.querySelectorAll(".av__cell--active, .av__cell--select")) || [];
+        if (cellElements.length === 0) {
+            blockElement.querySelectorAll(".av__row--select:not(.av__row--header)").forEach(rowElement => {
+                rowElement.querySelectorAll(".av__cell").forEach(cellElement => {
+                    cellElements.push(cellElement);
                 });
-            }
-            const doOperations: IOperation[] = [];
-            const undoOperations: IOperation[] = [];
+            });
+        }
+        const doOperations: IOperation[] = [];
+        const undoOperations: IOperation[] = [];
 
-            const avID = blockElement.dataset.avId;
-            const id = blockElement.dataset.nodeId;
-            cellElements.forEach((item: HTMLElement, elementIndex) => {
-                let cellValue: IAVCellValue = values[elementIndex];
-                if (!cellValue) {
-                    return;
-                }
-                const rowElement = hasClosestByClassName(item, "av__row");
-                if (!rowElement) {
-                    return;
-                }
-                if (!blockElement.contains(item)) {
-                    item = cellElements[elementIndex] = blockElement.querySelector(`.av__row[data-id="${rowElement.dataset.id}"] .av__cell[data-col-id="${item.dataset.colId}"]`) as HTMLElement;
-                }
-                const type = getTypeByCellElement(item) || item.dataset.type as TAVCol;
-                if (["created", "updated", "template", "rollup"].includes(type)) {
-                    return;
-                }
+        const avID = blockElement.dataset.avId;
+        const id = blockElement.dataset.nodeId;
+        cellElements.forEach((item: HTMLElement, elementIndex) => {
+            let cellValue: IAVCellValue = values[elementIndex];
+            if (!cellValue) {
+                return;
+            }
+            const rowElement = hasClosestByClassName(item, "av__row");
+            if (!rowElement) {
+                return;
+            }
+            if (!blockElement.contains(item)) {
+                item = cellElements[elementIndex] = blockElement.querySelector(`.av__row[data-id="${rowElement.dataset.id}"] .av__cell[data-col-id="${item.dataset.colId}"]`) as HTMLElement;
+            }
+            const type = getTypeByCellElement(item) || item.dataset.type as TAVCol;
+            if (["created", "updated", "template", "rollup"].includes(type)) {
+                return;
+            }
 
-                const rowID = rowElement.getAttribute("data-id");
-                const cellId = item.getAttribute("data-id");
-                const colId = item.getAttribute("data-col-id");
+            const rowID = rowElement.getAttribute("data-id");
+            const cellId = item.getAttribute("data-id");
+            const colId = item.getAttribute("data-col-id");
 
-                const oldValue = genCellValueByElement(type, item);
-                if (cellValue.type !== type) {
-                    if (type === "date") {
-                        // 类型不能转换时就不进行替换
-                        return;
-                    }
-                    const content = cellValue[cellValue.type as "text"].content;
-                    if (!content) {
-                        return;
-                    }
-                    cellValue = genCellValue(type, cellValue[cellValue.type as "text"].content.toString());
-                } else if (cellValue.type === "block") {
-                    cellValue.isDetached = true;
-                    delete cellValue.block.id;
-                }
-                cellValue.id = cellId;
-                if ((cellValue.type === "date" && typeof cellValue.date === "string") ||
-                    (cellValue.type === "relation" && typeof cellValue.relation === "string")) {
+            const oldValue = genCellValueByElement(type, item);
+            if (cellValue.type !== type) {
+                if (type === "date") {
+                    // 类型不能转换时就不进行替换
                     return;
                 }
-                if (objEquals(cellValue, oldValue)) {
+                const content = cellValue[cellValue.type as "text"].content;
+                if (!content) {
                     return;
                 }
-                doOperations.push({
-                    action: "updateAttrViewCell",
-                    id: cellId,
-                    avID,
-                    keyID: colId,
-                    rowID,
-                    data: cellValue
-                });
-                undoOperations.push({
-                    action: "updateAttrViewCell",
-                    id: cellId,
-                    avID,
-                    keyID: colId,
-                    rowID,
-                    data: oldValue
-                });
-                updateAttrViewCellAnimation(item, cellValue);
-            });
-            if (doOperations.length > 0) {
-                doOperations.push({
-                    action: "doUpdateUpdated",
-                    id,
-                    data: dayjs().format("YYYYMMDDHHmmss"),
-                });
-                undoOperations.push({
-                    action: "doUpdateUpdated",
-                    id,
-                    data: blockElement.getAttribute("updated"),
-                });
-                transaction(protyle, doOperations, undoOperations);
+                cellValue = genCellValue(type, cellValue[cellValue.type as "text"].content.toString());
+            } else if (cellValue.type === "block") {
+                cellValue.isDetached = true;
+                delete cellValue.block.id;
             }
-            return;
-        } catch (e) {
-            console.warn("insert cell: JSON.parse error");
+            cellValue.id = cellId;
+            if ((cellValue.type === "date" && typeof cellValue.date === "string") ||
+                (cellValue.type === "relation" && typeof cellValue.relation === "string")) {
+                return;
+            }
+            if (objEquals(cellValue, oldValue)) {
+                return;
+            }
+            doOperations.push({
+                action: "updateAttrViewCell",
+                id: cellId,
+                avID,
+                keyID: colId,
+                rowID,
+                data: cellValue
+            });
+            undoOperations.push({
+                action: "updateAttrViewCell",
+                id: cellId,
+                avID,
+                keyID: colId,
+                rowID,
+                data: oldValue
+            });
+            updateAttrViewCellAnimation(item, cellValue);
+        });
+        if (doOperations.length > 0) {
+            doOperations.push({
+                action: "doUpdateUpdated",
+                id,
+                data: dayjs().format("YYYYMMDDHHmmss"),
+            });
+            undoOperations.push({
+                action: "doUpdateUpdated",
+                id,
+                data: blockElement.getAttribute("updated"),
+            });
+            transaction(protyle, doOperations, undoOperations);
         }
+        return;
     }
     const text = protyle.lute.BlockDOM2EscapeMarkerContent(html);
     const cellsElement: HTMLElement[] = Array.from(blockElement.querySelectorAll(".av__cell--select"));

From 09b4304df20d6a1bf489793c80b18b17fa076d6a Mon Sep 17 00:00:00 2001
From: Vanessa <lly219@gmail.com>
Date: Fri, 22 Mar 2024 16:55:32 +0800
Subject: [PATCH 53/77] :art:
 https://github.com/siyuan-note/siyuan/issues/10645

---
 app/appearance/langs/en_US.json  |  2 ++
 app/appearance/langs/es_ES.json  |  2 ++
 app/appearance/langs/fr_FR.json  |  2 ++
 app/appearance/langs/zh_CHT.json |  2 ++
 app/appearance/langs/zh_CN.json  |  2 ++
 app/src/config/query.ts          | 42 +++++++++++++++++++++++++-
 app/src/search/menu.ts           | 36 ++++++++++++++++++++++
 app/src/search/util.ts           |  8 +++++
 app/src/types/index.d.ts         | 51 ++++++++++++++------------------
 9 files changed, 117 insertions(+), 30 deletions(-)

diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json
index 6bc631cd3a..bcd1e479e8 100644
--- a/app/appearance/langs/en_US.json
+++ b/app/appearance/langs/en_US.json
@@ -1,4 +1,6 @@
 {
+  "video": "Video",
+  "audio": "Audio",
   "updateAll": "Update all",
   "confirmUpdateAll": "Are you sure you want to update all?",
   "confirmUpdate": "Are you sure you want to update?",
diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json
index c0afc04d93..53ecf44603 100644
--- a/app/appearance/langs/es_ES.json
+++ b/app/appearance/langs/es_ES.json
@@ -1,4 +1,6 @@
 {
+  "vídeo": "Vídeo",
+  "audio": "Audio",
   "updateAll": "Actualizar todo",
   "confirmUpdateAll": "¿Estás seguro de que deseas actualizar todo?",
   "confirmUpdate": "¿Estás seguro de que deseas actualizar?",
diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json
index a2ebd624dd..8b3890563b 100644
--- a/app/appearance/langs/fr_FR.json
+++ b/app/appearance/langs/fr_FR.json
@@ -1,4 +1,6 @@
 {
+  "video": "Vidéo",
+  "audio": "Audio",
   "updateAll": "Tout mettre à jour",
   "confirmUpdateAll": "Etes-vous sûr de vouloir tout mettre à jour ?",
   "confirmUpdate": "Êtes-vous sûr de vouloir mettre à jour ?",
diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json
index d4444e2ae6..77af86eb6e 100644
--- a/app/appearance/langs/zh_CHT.json
+++ b/app/appearance/langs/zh_CHT.json
@@ -1,4 +1,6 @@
 {
+  "video": "影片",
+  "audio": "音訊",
   "updateAll": "全部更新",
   "confirmUpdateAll": "確定全部更新嗎？",
   "confirmUpdate": "確定更新嗎？",
diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json
index ae3ce17f78..f83d74dc39 100644
--- a/app/appearance/langs/zh_CN.json
+++ b/app/appearance/langs/zh_CN.json
@@ -1,4 +1,6 @@
 {
+  "video": "视频",
+  "audio": "音频",
   "updateAll": "全部更新",
   "confirmUpdateAll": "确定全部更新吗？",
   "confirmUpdate": "确定更新吗？",
diff --git a/app/src/config/query.ts b/app/src/config/query.ts
index 59171f24ce..421af1f187 100644
--- a/app/src/config/query.ts
+++ b/app/src/config/query.ts
@@ -122,7 +122,43 @@ export const query = {
             </div>
             <span class="fn__space"></span>
             <input class="b3-switch" id="databaseBlock" type="checkbox"${window.siyuan.config.search.databaseBlock ? " checked" : ""}/>
-        </label>        
+        </label>
+        <label class="fn__flex">
+            <svg class="svg"><use xlink:href="#iconVideo"></use></svg>
+            <span class="fn__space"></span>
+            <div class="fn__flex-1">
+                ${window.siyuan.languages.video}
+            </div>
+            <span class="fn__space"></span>
+            <input class="b3-switch" id="videoBlock" type="checkbox"${window.siyuan.config.search.videoBlock ? " checked" : ""}/>
+        </label>
+        <label class="fn__flex">
+            <svg class="svg"><use xlink:href="#iconRecord"></use></svg>
+            <span class="fn__space"></span>
+            <div class="fn__flex-1">
+                ${window.siyuan.languages.audio}
+            </div>
+            <span class="fn__space"></span>
+            <input class="b3-switch" id="audioBlock" type="checkbox"${window.siyuan.config.search.audioBlock ? " checked" : ""}/>
+        </label>
+        <label class="fn__flex">
+            <svg class="svg"><use xlink:href="#iconLanguage"></use></svg>
+            <span class="fn__space"></span>
+            <div class="fn__flex-1">
+                IFrame
+            </div>
+            <span class="fn__space"></span>
+            <input class="b3-switch" id="iFrameBlock" type="checkbox"${window.siyuan.config.search.iFrameBlock ? " checked" : ""}/>
+        </label>
+        <label class="fn__flex">
+            <svg class="svg"><use xlink:href="#iconBoth"></use></svg>
+            <span class="fn__space"></span>
+            <div class="fn__flex-1">
+                ${window.siyuan.languages.widget}
+            </div>
+            <span class="fn__space"></span>
+            <input class="b3-switch" id="widgetBlock" type="checkbox"${window.siyuan.config.search.widgetBlock ? " checked" : ""}/>
+        </label>
     </div>
 </div>
 <div class="b3-label">
@@ -279,6 +315,10 @@ export const query = {
                     htmlBlock: (query.element.querySelector("#htmlBlock") as HTMLInputElement).checked,
                     embedBlock: (query.element.querySelector("#embedBlock") as HTMLInputElement).checked,
                     databaseBlock: (query.element.querySelector("#databaseBlock") as HTMLInputElement).checked,
+                    audioBlock: (query.element.querySelector("#audioBlock") as HTMLInputElement).checked,
+                    videoBlock: (query.element.querySelector("#videoBlock") as HTMLInputElement).checked,
+                    iFrameBlock: (query.element.querySelector("#iFrameBlock") as HTMLInputElement).checked,
+                    widgetBlock: (query.element.querySelector("#widgetBlock") as HTMLInputElement).checked,
                     mathBlock: (query.element.querySelector("#mathBlock") as HTMLInputElement).checked,
                     table: (query.element.querySelector("#table") as HTMLInputElement).checked,
                     blockquote: (query.element.querySelector("#blockquote") as HTMLInputElement).checked,
diff --git a/app/src/search/menu.ts b/app/src/search/menu.ts
index cd7fd2481d..e3f6a407c8 100644
--- a/app/src/search/menu.ts
+++ b/app/src/search/menu.ts
@@ -130,6 +130,42 @@ export const filterMenu = (config: ISearchOption, cb: () => void) => {
         <span class="fn__space"></span>
         <input class="b3-switch fn__flex-center" data-type="databaseBlock" type="checkbox"${config.types.databaseBlock ? " checked" : ""}>
     </label>
+    <label class="fn__flex b3-label">
+        <svg class="ft__on-surface svg fn__flex-center"><use xlink:href="#iconVideo"></use></svg>
+        <span class="fn__space"></span>
+        <div class="fn__flex-1 fn__flex-center">
+            ${window.siyuan.languages.video}
+        </div>
+        <span class="fn__space"></span>
+        <input class="b3-switch fn__flex-center" data-type="videoBlock" type="checkbox"${config.types.videoBlock ? " checked" : ""}>
+    </label>
+    <label class="fn__flex b3-label">
+        <svg class="ft__on-surface svg fn__flex-center"><use xlink:href="#iconRecord"></use></svg>
+        <span class="fn__space"></span>
+        <div class="fn__flex-1 fn__flex-center">
+            ${window.siyuan.languages.audio}
+        </div>
+        <span class="fn__space"></span>
+        <input class="b3-switch fn__flex-center" data-type="audioBlock" type="checkbox"${config.types.audioBlock ? " checked" : ""}>
+    </label>
+    <label class="fn__flex b3-label">
+        <svg class="ft__on-surface svg fn__flex-center"><use xlink:href="#iconLanguage"></use></svg>
+        <span class="fn__space"></span>
+        <div class="fn__flex-1 fn__flex-center">
+            IFrame
+        </div>
+        <span class="fn__space"></span>
+        <input class="b3-switch fn__flex-center" data-type="iFrameBlock" type="checkbox"${config.types.iFrameBlock ? " checked" : ""}>
+    </label>
+    <label class="fn__flex b3-label">
+        <svg class="ft__on-surface svg fn__flex-center"><use xlink:href="#iconBoth"></use></svg>
+        <span class="fn__space"></span>
+        <div class="fn__flex-1 fn__flex-center">
+            ${window.siyuan.languages.widget}
+        </div>
+        <span class="fn__space"></span>
+        <input class="b3-switch fn__flex-center" data-type="widgetBlock" type="checkbox"${config.types.widgetBlock ? " checked" : ""}>
+    </label>
 </div>
 <div class="b3-dialog__action">
     <button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button><div class="fn__space"></div>
diff --git a/app/src/search/util.ts b/app/src/search/util.ts
index a450011fd8..5d5ca91598 100644
--- a/app/src/search/util.ts
+++ b/app/src/search/util.ts
@@ -507,6 +507,10 @@ export const genSearch = (app: App, config: ISearchOption, element: Element, clo
                     r: "",
                     page: 1,
                     types: {
+                        audioBlock: window.siyuan.config.search.audioBlock,
+                        videoBlock: window.siyuan.config.search.videoBlock,
+                        iFrameBlock: window.siyuan.config.search.iFrameBlock,
+                        widgetBlock: window.siyuan.config.search.widgetBlock,
                         document: window.siyuan.config.search.document,
                         heading: window.siyuan.config.search.heading,
                         list: window.siyuan.config.search.list,
@@ -763,6 +767,10 @@ export const genSearch = (app: App, config: ISearchOption, element: Element, clo
                         r: "",
                         page: 1,
                         types: {
+                            audioBlock: window.siyuan.config.search.audioBlock,
+                            videoBlock: window.siyuan.config.search.videoBlock,
+                            iFrameBlock: window.siyuan.config.search.iFrameBlock,
+                            widgetBlock: window.siyuan.config.search.widgetBlock,
                             document: window.siyuan.config.search.document,
                             heading: window.siyuan.config.search.heading,
                             list: window.siyuan.config.search.list,
diff --git a/app/src/types/index.d.ts b/app/src/types/index.d.ts
index 3412b3b8b8..13f817b70f 100644
--- a/app/src/types/index.d.ts
+++ b/app/src/types/index.d.ts
@@ -268,26 +268,32 @@ interface ISearchOption {
     idPath: string[]
     k: string
     r: string
-    types: {
-        mathBlock: boolean
-        table: boolean
-        blockquote: boolean
-        superBlock: boolean
-        paragraph: boolean
-        document: boolean
-        heading: boolean
-        list: boolean
-        listItem: boolean
-        codeBlock: boolean
-        htmlBlock: boolean
-        embedBlock: boolean
-        databaseBlock: boolean
-    },
+    types: ISearchType,
     replaceTypes: {
         [key: string]: boolean;
     },
 }
 
+interface ISearchType {
+    audioBlock: boolean
+    videoBlock: boolean
+    iFrameBlock: boolean
+    widgetBlock: boolean
+    mathBlock: boolean
+    table: boolean
+    blockquote: boolean
+    superBlock: boolean
+    paragraph: boolean
+    document: boolean
+    heading: boolean
+    list: boolean
+    listItem: boolean
+    codeBlock: boolean
+    htmlBlock: boolean
+    embedBlock: boolean
+    databaseBlock: boolean
+}
+
 interface ITextOption {
     color?: string,
     type: string
@@ -823,20 +829,7 @@ interface IConfig {
     tag: {
         sort: number
     }
-    search: {
-        databaseBlock: boolean
-        embedBlock: boolean
-        htmlBlock: boolean
-        document: boolean
-        heading: boolean
-        list: boolean
-        listItem: boolean
-        codeBlock: boolean
-        mathBlock: boolean
-        table: boolean
-        blockquote: boolean
-        superBlock: boolean
-        paragraph: boolean
+    search: ISearchType & {
         name: boolean
         alias: boolean
         memo: boolean

From ab69eb57322e15b27efaba6c876acce12f1e2833 Mon Sep 17 00:00:00 2001
From: Vanessa <lly219@gmail.com>
Date: Fri, 22 Mar 2024 16:58:25 +0800
Subject: [PATCH 54/77] :rotating_light:

---
 app/src/config/bazaar.ts            |  8 ++--
 app/src/menus/workspace.ts          |  2 +-
 app/src/mobile/menu/search.ts       | 17 +-------
 app/src/protyle/render/av/action.ts |  8 ++--
 app/src/protyle/render/av/cell.ts   |  2 +-
 app/src/protyle/render/av/render.ts | 10 ++---
 app/src/protyle/render/av/row.ts    |  2 +-
 app/src/protyle/util/insertHTML.ts  |  8 ++--
 app/src/search/util.ts              | 61 +++++++++++------------------
 9 files changed, 45 insertions(+), 73 deletions(-)

diff --git a/app/src/config/bazaar.ts b/app/src/config/bazaar.ts
index e39a0929b6..ad242fc0fd 100644
--- a/app/src/config/bazaar.ts
+++ b/app/src/config/bazaar.ts
@@ -342,7 +342,7 @@ export const bazaar = {
                 html += this._genUpdateItemHTML(item, "widgets");
             });
 
-            const allCount = response.data.themes.length + response.data.icons.length + response.data.widgets.length + response.data.plugins.length + response.data.templates.length
+            const allCount = response.data.themes.length + response.data.icons.length + response.data.widgets.length + response.data.plugins.length + response.data.templates.length;
             if (allCount === 0) {
                 this.element.querySelector('[data-type="downloaded-update"]').innerHTML = "";
                 return;
@@ -354,7 +354,7 @@ export const bazaar = {
     <div class="counter counter--bg fn__flex-center">${allCount}</div>
 </div>
 <div class="config-bazaar__content">${html}</div>`;
-        })
+        });
     },
     _genMyHTML(bazaarType: TBazaarType, app: App, updateUpdate = true) {
         const contentElement = bazaar.element.querySelector("#configBazaarDownloaded");
@@ -708,7 +708,7 @@ export const bazaar = {
                     event.stopPropagation();
                     break;
                 } else if (type === "install-all") {
-                    confirmDialog('⬆️ ' + window.siyuan.languages.updateAll, window.siyuan.languages.confirmUpdateAll, () => {
+                    confirmDialog("⬆️ " + window.siyuan.languages.updateAll, window.siyuan.languages.confirmUpdateAll, () => {
                         fetchPost("/api/bazaar/batchUpdatePackage", {frontend: getFrontend()});
                     });
                     event.preventDefault();
@@ -716,7 +716,7 @@ export const bazaar = {
                     break;
                 } else if (type === "install-t") {
                     if (!target.classList.contains("b3-button--progress")) {
-                        confirmDialog('⬆️ ' + window.siyuan.languages.update, window.siyuan.languages.confirmUpdate, () => {
+                        confirmDialog("⬆️ " + window.siyuan.languages.update, window.siyuan.languages.confirmUpdate, () => {
                             const bazaarType = dataObj.bazaarType as TBazaarType;
                             let url = "/api/bazaar/installBazaarTemplate";
                             if (bazaarType === "themes") {
diff --git a/app/src/menus/workspace.ts b/app/src/menus/workspace.ts
index 71894aa599..582a5e3e9b 100644
--- a/app/src/menus/workspace.ts
+++ b/app/src/menus/workspace.ts
@@ -98,7 +98,7 @@ export const workspaceMenu = (app: App, rect: DOMRect) => {
                         if (response.data.isWorkspace) {
                             openWorkspace(localPath.filePaths[0]);
                         } else {
-                            confirmDialog('🏗️ ' + window.siyuan.languages.createWorkspace, window.siyuan.languages.createWorkspaceTip + `<br><br><code class="fn__code">${localPath.filePaths[0]}</code>`, () => {
+                            confirmDialog("🏗️ " + window.siyuan.languages.createWorkspace, window.siyuan.languages.createWorkspaceTip + `<br><br><code class="fn__code">${localPath.filePaths[0]}</code>`, () => {
                                 openWorkspace(localPath.filePaths[0]);
                             });
                         }
diff --git a/app/src/mobile/menu/search.ts b/app/src/mobile/menu/search.ts
index 268d035519..4d62457bc8 100644
--- a/app/src/mobile/menu/search.ts
+++ b/app/src/mobile/menu/search.ts
@@ -25,6 +25,7 @@ import {
 } from "../../search/assets";
 import {addClearButton} from "../../util/addClearButton";
 import {checkFold} from "../../util/noRelyPCFunction";
+import {getDefaultType} from "../../search/util";
 
 const replace = (element: Element, config: ISearchOption, isAll: boolean) => {
     if (config.method === 1 || config.method === 2) {
@@ -484,21 +485,7 @@ const initSearchEvent = (app: App, element: Element, config: ISearchOption) => {
                         k: "",
                         r: "",
                         page: 1,
-                        types: {
-                            document: window.siyuan.config.search.document,
-                            heading: window.siyuan.config.search.heading,
-                            list: window.siyuan.config.search.list,
-                            listItem: window.siyuan.config.search.listItem,
-                            codeBlock: window.siyuan.config.search.codeBlock,
-                            htmlBlock: window.siyuan.config.search.htmlBlock,
-                            mathBlock: window.siyuan.config.search.mathBlock,
-                            table: window.siyuan.config.search.table,
-                            blockquote: window.siyuan.config.search.blockquote,
-                            superBlock: window.siyuan.config.search.superBlock,
-                            paragraph: window.siyuan.config.search.paragraph,
-                            embedBlock: window.siyuan.config.search.embedBlock,
-                            databaseBlock: window.siyuan.config.search.databaseBlock,
-                        },
+                        types: getDefaultType(),
                         replaceTypes: Object.assign({}, Constants.SIYUAN_DEFAULT_REPLACETYPES),
                     }, config);
                 });
diff --git a/app/src/protyle/render/av/action.ts b/app/src/protyle/render/av/action.ts
index 2bf064b982..931ceeff9c 100644
--- a/app/src/protyle/render/av/action.ts
+++ b/app/src/protyle/render/av/action.ts
@@ -317,13 +317,13 @@ export const avContextmenu = (protyle: IProtyle, rowElement: HTMLElement, positi
 ${window.siyuan.languages.insertRowBefore.replace("${x}", '<span class="fn__space"></span><input style="width:64px" type="number" step="1" min="1" placeholder="Enter" class="b3-text-field"><span class="fn__space"></span>')}
 </div>`,
                 bind(element) {
-                    const inputElement = element.querySelector("input")
+                    const inputElement = element.querySelector("input");
                     inputElement.addEventListener("keydown", (event: KeyboardEvent) => {
                         if (!event.isComposing && event.key === "Enter") {
                             insertRows(blockElement, protyle, parseInt(inputElement.value), rowElements[0].previousElementSibling.getAttribute("data-id"));
                             menu.close();
                         }
-                    })
+                    });
                 }
             });
             menu.addItem({
@@ -333,13 +333,13 @@ ${window.siyuan.languages.insertRowBefore.replace("${x}", '<span class="fn__spac
 ${window.siyuan.languages.insertRowAfter.replace("${x}", '<span class="fn__space"></span><input style="width:64px" type="number" step="1" min="1" placeholder="Enter" class="b3-text-field"><span class="fn__space"></span>')}
 </div>`,
                 bind(element) {
-                    const inputElement = element.querySelector("input")
+                    const inputElement = element.querySelector("input");
                     inputElement.addEventListener("keydown", (event: KeyboardEvent) => {
                         if (!event.isComposing && event.key === "Enter") {
                             insertRows(blockElement, protyle, parseInt(inputElement.value), rowElements[0].getAttribute("data-id"));
                             menu.close();
                         }
-                    })
+                    });
                 }
             });
             menu.addSeparator();
diff --git a/app/src/protyle/render/av/cell.ts b/app/src/protyle/render/av/cell.ts
index 7fe978f14f..0665c69d81 100644
--- a/app/src/protyle/render/av/cell.ts
+++ b/app/src/protyle/render/av/cell.ts
@@ -829,4 +829,4 @@ export const addDragFill = (cellElement: Element) => {
     }
     cellElement.classList.add("av__cell--active");
     cellElement.insertAdjacentHTML("beforeend", `<div aria-label="${window.siyuan.languages.dragFill}" class="av__drag-fill ariaLabel"></div>`);
-}
+};
diff --git a/app/src/protyle/render/av/render.ts b/app/src/protyle/render/av/render.ts
index 564b9dde29..ff26c13419 100644
--- a/app/src/protyle/render/av/render.ts
+++ b/app/src/protyle/render/av/render.ts
@@ -50,7 +50,7 @@ export const avRender = (element: Element, protyle: IProtyle, cb?: () => void, v
             if (selectCellElement) {
                 selectCellId = (hasClosestByClassName(selectCellElement, "av__row") as HTMLElement).dataset.id + Constants.ZWSP + selectCellElement.getAttribute("data-col-id");
             }
-            let dragFillId = ""
+            let dragFillId = "";
             const dragFillElement = e.querySelector(".av__drag-fill") as HTMLElement;
             if (dragFillElement) {
                 dragFillId = (hasClosestByClassName(dragFillElement, "av__row") as HTMLElement).dataset.id + Constants.ZWSP + dragFillElement.parentElement.getAttribute("data-col-id");
@@ -58,7 +58,7 @@ export const avRender = (element: Element, protyle: IProtyle, cb?: () => void, v
             const activeIds: string[] = [];
             e.querySelectorAll(".av__cell--active").forEach((item: HTMLElement) => {
                 activeIds.push((hasClosestByClassName(item, "av__row") as HTMLElement).dataset.id + Constants.ZWSP + item.getAttribute("data-col-id"));
-            })
+            });
             const created = protyle.options.history?.created;
             const snapshot = protyle.options.history?.snapshot;
             let newViewID = e.getAttribute(Constants.CUSTOM_SY_AV_VIEW) || "";
@@ -288,11 +288,11 @@ ${cell.color ? `color:${cell.color};` : ""}">${renderCell(cell.value)}</div>`;
                     }
                 }
                 if (dragFillId) {
-                    addDragFill(e.querySelector(`.av__row[data-id="${dragFillId.split(Constants.ZWSP)[0]}"] .av__cell[data-col-id="${dragFillId.split(Constants.ZWSP)[1]}"]`))
+                    addDragFill(e.querySelector(`.av__row[data-id="${dragFillId.split(Constants.ZWSP)[0]}"] .av__cell[data-col-id="${dragFillId.split(Constants.ZWSP)[1]}"]`));
                 }
                 activeIds.forEach(activeId => {
-                    e.querySelector(`.av__row[data-id="${activeId.split(Constants.ZWSP)[0]}"] .av__cell[data-col-id="${activeId.split(Constants.ZWSP)[1]}"]`)?.classList.add("av__cell--active")
-                })
+                    e.querySelector(`.av__row[data-id="${activeId.split(Constants.ZWSP)[0]}"] .av__cell[data-col-id="${activeId.split(Constants.ZWSP)[1]}"]`)?.classList.add("av__cell--active");
+                });
                 if (getSelection().rangeCount > 0) {
                     // 修改表头后光标重新定位
                     const range = getSelection().getRangeAt(0);
diff --git a/app/src/protyle/render/av/row.ts b/app/src/protyle/render/av/row.ts
index ef7e5c0799..62e4c7122f 100644
--- a/app/src/protyle/render/av/row.ts
+++ b/app/src/protyle/render/av/row.ts
@@ -380,4 +380,4 @@ export const insertRows = (blockElement: HTMLElement, protyle: IProtyle, count:
     }]);
     insertAttrViewBlockAnimation(protyle, blockElement, srcIDs, previousID, avID);
     blockElement.setAttribute("updated", newUpdated);
-}
+};
diff --git a/app/src/protyle/util/insertHTML.ts b/app/src/protyle/util/insertHTML.ts
index 1c2877564a..b462653d6b 100644
--- a/app/src/protyle/util/insertHTML.ts
+++ b/app/src/protyle/util/insertHTML.ts
@@ -12,7 +12,7 @@ import {input} from "../wysiwyg/input";
 import {objEquals} from "../../util/functions";
 
 const processAV = (range: Range, html: string, protyle: IProtyle, blockElement: HTMLElement) => {
-    const tempElement = document.createElement("template")
+    const tempElement = document.createElement("template");
     tempElement.innerHTML = html;
     let values: IAVCellValue[] = [];
     if (html.endsWith("]") && html.startsWith("[")) {
@@ -27,9 +27,9 @@ const processAV = (range: Range, html: string, protyle: IProtyle, blockElement:
                 values.push({
                     text: {content: cell.textContent},
                     type: "text"
-                })
-            })
-        })
+                });
+            });
+        });
     }
     if (values && Array.isArray(values) && values.length > 0) {
         const cellElements: Element[] = Array.from(blockElement.querySelectorAll(".av__cell--active, .av__cell--select")) || [];
diff --git a/app/src/search/util.ts b/app/src/search/util.ts
index 5d5ca91598..065caebe44 100644
--- a/app/src/search/util.ts
+++ b/app/src/search/util.ts
@@ -51,6 +51,27 @@ import {addClearButton} from "../util/addClearButton";
 import {checkFold} from "../util/noRelyPCFunction";
 import {getUnRefList, openSearchUnRef, unRefMoreMenu} from "./unRef";
 
+export const getDefaultType = () => {
+    return {
+        audioBlock: window.siyuan.config.search.audioBlock,
+        videoBlock: window.siyuan.config.search.videoBlock,
+        iFrameBlock: window.siyuan.config.search.iFrameBlock,
+        widgetBlock: window.siyuan.config.search.widgetBlock,
+        document: window.siyuan.config.search.document,
+        heading: window.siyuan.config.search.heading,
+        list: window.siyuan.config.search.list,
+        listItem: window.siyuan.config.search.listItem,
+        codeBlock: window.siyuan.config.search.codeBlock,
+        htmlBlock: window.siyuan.config.search.htmlBlock,
+        mathBlock: window.siyuan.config.search.mathBlock,
+        table: window.siyuan.config.search.table,
+        blockquote: window.siyuan.config.search.blockquote,
+        superBlock: window.siyuan.config.search.superBlock,
+        paragraph: window.siyuan.config.search.paragraph,
+        embedBlock: window.siyuan.config.search.embedBlock,
+        databaseBlock: window.siyuan.config.search.databaseBlock,
+    };
+};
 export const toggleReplaceHistory = (searchElement: Element) => {
     const list = window.siyuan.storage[Constants.LOCAL_SEARCHKEYS];
     if (!list.replaceKeys || list.replaceKeys.length === 0) {
@@ -506,25 +527,7 @@ export const genSearch = (app: App, config: ISearchOption, element: Element, clo
                     k: "",
                     r: "",
                     page: 1,
-                    types: {
-                        audioBlock: window.siyuan.config.search.audioBlock,
-                        videoBlock: window.siyuan.config.search.videoBlock,
-                        iFrameBlock: window.siyuan.config.search.iFrameBlock,
-                        widgetBlock: window.siyuan.config.search.widgetBlock,
-                        document: window.siyuan.config.search.document,
-                        heading: window.siyuan.config.search.heading,
-                        list: window.siyuan.config.search.list,
-                        listItem: window.siyuan.config.search.listItem,
-                        codeBlock: window.siyuan.config.search.codeBlock,
-                        htmlBlock: window.siyuan.config.search.htmlBlock,
-                        mathBlock: window.siyuan.config.search.mathBlock,
-                        table: window.siyuan.config.search.table,
-                        blockquote: window.siyuan.config.search.blockquote,
-                        superBlock: window.siyuan.config.search.superBlock,
-                        paragraph: window.siyuan.config.search.paragraph,
-                        embedBlock: window.siyuan.config.search.embedBlock,
-                        databaseBlock: window.siyuan.config.search.databaseBlock,
-                    },
+                    types: getDefaultType(),
                     replaceTypes: Object.assign({}, Constants.SIYUAN_DEFAULT_REPLACETYPES),
                 }, config, edit);
                 element.querySelector(".b3-chip--current")?.classList.remove("b3-chip--current");
@@ -766,25 +769,7 @@ export const genSearch = (app: App, config: ISearchOption, element: Element, clo
                         k: "",
                         r: "",
                         page: 1,
-                        types: {
-                            audioBlock: window.siyuan.config.search.audioBlock,
-                            videoBlock: window.siyuan.config.search.videoBlock,
-                            iFrameBlock: window.siyuan.config.search.iFrameBlock,
-                            widgetBlock: window.siyuan.config.search.widgetBlock,
-                            document: window.siyuan.config.search.document,
-                            heading: window.siyuan.config.search.heading,
-                            list: window.siyuan.config.search.list,
-                            listItem: window.siyuan.config.search.listItem,
-                            codeBlock: window.siyuan.config.search.codeBlock,
-                            htmlBlock: window.siyuan.config.search.htmlBlock,
-                            mathBlock: window.siyuan.config.search.mathBlock,
-                            table: window.siyuan.config.search.table,
-                            blockquote: window.siyuan.config.search.blockquote,
-                            superBlock: window.siyuan.config.search.superBlock,
-                            paragraph: window.siyuan.config.search.paragraph,
-                            embedBlock: window.siyuan.config.search.embedBlock,
-                            databaseBlock: window.siyuan.config.search.databaseBlock,
-                        },
+                        types: getDefaultType(),
                         replaceTypes: Object.assign({}, Constants.SIYUAN_DEFAULT_REPLACETYPES),
                     }, config, edit);
                     element.querySelector("#criteria .b3-chip--current")?.classList.remove("b3-chip--current");

From 5f25b74e49f2ea8e9cc59dedcad881a737ed7ba5 Mon Sep 17 00:00:00 2001
From: Vanessa <lly219@gmail.com>
Date: Fri, 22 Mar 2024 17:07:07 +0800
Subject: [PATCH 55/77] :rotating_light:

---
 app/src/mobile/menu/search.ts |  2 +-
 app/src/search/getDefault.ts  | 22 ++++++++++++++++++++++
 app/src/search/util.ts        | 22 +---------------------
 3 files changed, 24 insertions(+), 22 deletions(-)
 create mode 100644 app/src/search/getDefault.ts

diff --git a/app/src/mobile/menu/search.ts b/app/src/mobile/menu/search.ts
index 4d62457bc8..d0de71a653 100644
--- a/app/src/mobile/menu/search.ts
+++ b/app/src/mobile/menu/search.ts
@@ -25,7 +25,7 @@ import {
 } from "../../search/assets";
 import {addClearButton} from "../../util/addClearButton";
 import {checkFold} from "../../util/noRelyPCFunction";
-import {getDefaultType} from "../../search/util";
+import {getDefaultType} from "../../search/getDefault";
 
 const replace = (element: Element, config: ISearchOption, isAll: boolean) => {
     if (config.method === 1 || config.method === 2) {
diff --git a/app/src/search/getDefault.ts b/app/src/search/getDefault.ts
new file mode 100644
index 0000000000..79f0215ad5
--- /dev/null
+++ b/app/src/search/getDefault.ts
@@ -0,0 +1,22 @@
+
+export const getDefaultType = () => {
+    return {
+        audioBlock: window.siyuan.config.search.audioBlock,
+        videoBlock: window.siyuan.config.search.videoBlock,
+        iFrameBlock: window.siyuan.config.search.iFrameBlock,
+        widgetBlock: window.siyuan.config.search.widgetBlock,
+        document: window.siyuan.config.search.document,
+        heading: window.siyuan.config.search.heading,
+        list: window.siyuan.config.search.list,
+        listItem: window.siyuan.config.search.listItem,
+        codeBlock: window.siyuan.config.search.codeBlock,
+        htmlBlock: window.siyuan.config.search.htmlBlock,
+        mathBlock: window.siyuan.config.search.mathBlock,
+        table: window.siyuan.config.search.table,
+        blockquote: window.siyuan.config.search.blockquote,
+        superBlock: window.siyuan.config.search.superBlock,
+        paragraph: window.siyuan.config.search.paragraph,
+        embedBlock: window.siyuan.config.search.embedBlock,
+        databaseBlock: window.siyuan.config.search.databaseBlock,
+    };
+};
diff --git a/app/src/search/util.ts b/app/src/search/util.ts
index 065caebe44..476373c981 100644
--- a/app/src/search/util.ts
+++ b/app/src/search/util.ts
@@ -50,28 +50,8 @@ import {Menu} from "../plugin/Menu";
 import {addClearButton} from "../util/addClearButton";
 import {checkFold} from "../util/noRelyPCFunction";
 import {getUnRefList, openSearchUnRef, unRefMoreMenu} from "./unRef";
+import {getDefaultType} from "./getDefault";
 
-export const getDefaultType = () => {
-    return {
-        audioBlock: window.siyuan.config.search.audioBlock,
-        videoBlock: window.siyuan.config.search.videoBlock,
-        iFrameBlock: window.siyuan.config.search.iFrameBlock,
-        widgetBlock: window.siyuan.config.search.widgetBlock,
-        document: window.siyuan.config.search.document,
-        heading: window.siyuan.config.search.heading,
-        list: window.siyuan.config.search.list,
-        listItem: window.siyuan.config.search.listItem,
-        codeBlock: window.siyuan.config.search.codeBlock,
-        htmlBlock: window.siyuan.config.search.htmlBlock,
-        mathBlock: window.siyuan.config.search.mathBlock,
-        table: window.siyuan.config.search.table,
-        blockquote: window.siyuan.config.search.blockquote,
-        superBlock: window.siyuan.config.search.superBlock,
-        paragraph: window.siyuan.config.search.paragraph,
-        embedBlock: window.siyuan.config.search.embedBlock,
-        databaseBlock: window.siyuan.config.search.databaseBlock,
-    };
-};
 export const toggleReplaceHistory = (searchElement: Element) => {
     const list = window.siyuan.storage[Constants.LOCAL_SEARCHKEYS];
     if (!list.replaceKeys || list.replaceKeys.length === 0) {

From c752df919ae6b55ede607b353e849602689b7eec Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Fri, 22 Mar 2024 17:25:48 +0800
Subject: [PATCH 56/77] :art: Search type filtering supports Audio, Video,
 IFrame and Widget block https://github.com/siyuan-note/siyuan/issues/10645

---
 kernel/model/storage.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/kernel/model/storage.go b/kernel/model/storage.go
index 397dc1339e..818ee9bbad 100644
--- a/kernel/model/storage.go
+++ b/kernel/model/storage.go
@@ -187,6 +187,10 @@ type CriterionTypes struct {
 	HtmlBlock     bool `json:"htmlBlock"`
 	EmbedBlock    bool `json:"embedBlock"`
 	DatabaseBlock bool `json:"databaseBlock"`
+	AudioBlock    bool `json:"audioBlock"`
+	VideoBlock    bool `json:"videoBlock"`
+	IFrameBlock   bool `json:"iframeBlock"`
+	WidgetBlock   bool `json:"widgetBlock"`
 }
 
 type CriterionReplaceTypes struct {

From 85eb116ac24e8ba608bbb7dda568aeeb0e9b37a1 Mon Sep 17 00:00:00 2001
From: Soltus <liaoshanyi@qq.com>
Date: Fri, 22 Mar 2024 17:39:39 +0800
Subject: [PATCH 57/77] 6

---
 scripts/parse-changelog.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/scripts/parse-changelog.py b/scripts/parse-changelog.py
index e51920df70..1ae03fc51d 100644
--- a/scripts/parse-changelog.py
+++ b/scripts/parse-changelog.py
@@ -6,12 +6,12 @@
 import github  # pip install PyGithub
 # ensure the milestone is open before run this
 docmap = {
-    "Feature": "Feature",
-    "Enhancement": "Enhancement",
-    "Bug": "Bugfix",
-    "Document": "Document",
-    "Refactor": "Refactor",
-    "Abolishment": "Abolishment",
+    "Feature": "引入特性 | Feature",
+    "Enhancement": "改进功能 | Enhancement",
+    "Bug": "修复错误 | Bugfix",
+    "Document": "文档相关 | Document",
+    "Refactor": "开发重构 | Refactor",
+    "Abolishment": "移除废止 | Abolishment",
     "Development": "Development",
 }
 
@@ -36,7 +36,7 @@ def generate_msg_from_repo(repo_name, tag_name, lastestRelease):
     for v in [tag_name, lastestRelease]:
       print(f'''
 
-## {v}
+## ⚓ [{v}](https://github.com/siyuan-note/siyuan/releases/tag/{v})
 
 ''')
       desc_mapping = defaultdict(list)

From 45df03aede6857e25a91c8b2dd4128a6f242e7a0 Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Fri, 22 Mar 2024 19:28:59 +0800
Subject: [PATCH 58/77] :bug: Unable to search replace hyperlink anchor text
 https://github.com/siyuan-note/siyuan/issues/10689

---
 kernel/model/search.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/model/search.go b/kernel/model/search.go
index 0fcd5f4845..698ea925c4 100644
--- a/kernel/model/search.go
+++ b/kernel/model/search.go
@@ -592,7 +592,7 @@ func FindReplace(keyword, replacement string, replaceTypes map[string]bool, ids
 					} else if n.IsTextMarkType("a") {
 						if replaceTypes["aText"] {
 							if 0 == method {
-								if bytes.Contains(n.Tokens, []byte(keyword)) {
+								if strings.Contains(n.TextMarkTextContent, keyword) {
 									n.TextMarkTextContent = strings.ReplaceAll(n.TextMarkTextContent, keyword, replacement)
 								}
 							} else if 3 == method {

From 8b7e6661f5b0290ffff4919dbe845cebd0bc1d60 Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Fri, 22 Mar 2024 19:46:48 +0800
Subject: [PATCH 59/77] :art: Creating a dailynote template supports doc
 attributes https://github.com/siyuan-note/siyuan/issues/10698

---
 kernel/api/template.go   |  2 +-
 kernel/model/file.go     | 18 +++++++++++++-----
 kernel/model/template.go | 28 ++++++++++++++--------------
 3 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/kernel/api/template.go b/kernel/api/template.go
index c706f2eb6a..2913e3a9b9 100644
--- a/kernel/api/template.go
+++ b/kernel/api/template.go
@@ -85,7 +85,7 @@ func renderTemplate(c *gin.Context) {
 		preview = previewArg.(bool)
 	}
 
-	content, err := model.RenderTemplate(p, id, preview)
+	_, content, err := model.RenderTemplate(p, id, preview)
 	if nil != err {
 		ret.Code = -1
 		ret.Msg = util.EscapeHTML(err.Error())
diff --git a/kernel/model/file.go b/kernel/model/file.go
index 69663ff2a1..4a1021222a 100644
--- a/kernel/model/file.go
+++ b/kernel/model/file.go
@@ -1096,26 +1096,28 @@ func CreateDailyNote(boxID string) (p string, existed bool, err error) {
 		return
 	}
 
-	var dom string
+	var templateTree *parse.Tree
+	var templateDom string
 	if "" != boxConf.DailyNoteTemplatePath {
 		tplPath := filepath.Join(util.DataDir, "templates", boxConf.DailyNoteTemplatePath)
 		if !filelock.IsExist(tplPath) {
 			logging.LogWarnf("not found daily note template [%s]", tplPath)
 		} else {
-			dom, err = renderTemplate(tplPath, id, false)
-			if nil != err {
+			var renderErr error
+			templateTree, templateDom, renderErr = RenderTemplate(tplPath, id, false)
+			if nil != renderErr {
 				logging.LogWarnf("render daily note template [%s] failed: %s", boxConf.DailyNoteTemplatePath, err)
 			}
 		}
 	}
-	if "" != dom {
+	if "" != templateDom {
 		var tree *parse.Tree
 		tree, err = LoadTreeByBlockID(id)
 		if nil == err {
 			tree.Root.FirstChild.Unlink()
 
 			luteEngine := util.NewLute()
-			newTree := luteEngine.BlockDOM2Tree(dom)
+			newTree := luteEngine.BlockDOM2Tree(templateDom)
 			var children []*ast.Node
 			for c := newTree.Root.FirstChild; nil != c; c = c.Next {
 				children = append(children, c)
@@ -1123,6 +1125,12 @@ func CreateDailyNote(boxID string) (p string, existed bool, err error) {
 			for _, c := range children {
 				tree.Root.AppendChild(c)
 			}
+			templateIALs := parse.IAL2Map(templateTree.Root.KramdownIAL)
+			for k, v := range templateIALs {
+				if "name" == k || "alias" == k || "bookmark" == k || "memo" == k || "title" == k || strings.HasPrefix(k, "custom-") {
+					tree.Root.SetIALAttr(k, v)
+				}
+			}
 			tree.Root.SetIALAttr("updated", util.CurrentTimeSecondsStr())
 			if err = indexWriteJSONQueue(tree); nil != err {
 				return
diff --git a/kernel/model/template.go b/kernel/model/template.go
index 2ccf1606c2..bc71bb049e 100644
--- a/kernel/model/template.go
+++ b/kernel/model/template.go
@@ -183,24 +183,21 @@ func DocSaveAsTemplate(id, name string, overwrite bool) (code int, err error) {
 	return
 }
 
-func RenderTemplate(p, id string, preview bool) (string, error) {
-	return renderTemplate(p, id, preview)
-}
-
-func renderTemplate(p, id string, preview bool) (string, error) {
-	tree, err := LoadTreeByBlockID(id)
+func RenderTemplate(p, id string, preview bool) (tree *parse.Tree, dom string, err error) {
+	tree, err = LoadTreeByBlockID(id)
 	if nil != err {
-		return "", err
+		return
 	}
 
 	node := treenode.GetNodeInTree(tree, id)
 	if nil == node {
-		return "", ErrBlockNotFound
+		err = ErrBlockNotFound
+		return
 	}
 	block := sql.BuildBlockFromNode(node, tree)
 	md, err := os.ReadFile(p)
 	if nil != err {
-		return "", err
+		return
 	}
 
 	dataModel := map[string]string{}
@@ -222,20 +219,23 @@ func renderTemplate(p, id string, preview bool) (string, error) {
 	goTpl = goTpl.Funcs(tplFuncMap)
 	tpl, err := goTpl.Funcs(tplFuncMap).Parse(gulu.Str.FromBytes(md))
 	if nil != err {
-		return "", errors.New(fmt.Sprintf(Conf.Language(44), err.Error()))
+		err = errors.New(fmt.Sprintf(Conf.Language(44), err.Error()))
+		return
 	}
 
 	buf := &bytes.Buffer{}
 	buf.Grow(4096)
 	if err = tpl.Execute(buf, dataModel); nil != err {
-		return "", errors.New(fmt.Sprintf(Conf.Language(44), err.Error()))
+		err = errors.New(fmt.Sprintf(Conf.Language(44), err.Error()))
+		return
 	}
 	md = buf.Bytes()
 	tree = parseKTree(md)
 	if nil == tree {
 		msg := fmt.Sprintf("parse tree [%s] failed", p)
 		logging.LogErrorf(msg)
-		return "", errors.New(msg)
+		err = errors.New(msg)
+		return
 	}
 
 	var nodesNeedAppendChild, unlinks []*ast.Node
@@ -357,8 +357,8 @@ func renderTemplate(p, id string, preview bool) (string, error) {
 	})
 
 	luteEngine := NewLute()
-	dom := luteEngine.Tree2BlockDOM(tree, luteEngine.RenderOptions)
-	return dom, nil
+	dom = luteEngine.Tree2BlockDOM(tree, luteEngine.RenderOptions)
+	return
 }
 
 func addBlockIALNodes(tree *parse.Tree, removeUpdated bool) {

From 5c6be798f4a50ec26fd7cf398158a40b6c70e00b Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Fri, 22 Mar 2024 19:47:03 +0800
Subject: [PATCH 60/77] :art: Creating a dailynote template supports doc
 attributes https://github.com/siyuan-note/siyuan/issues/10698

---
 kernel/model/file.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/kernel/model/file.go b/kernel/model/file.go
index 4a1021222a..53b7300a0d 100644
--- a/kernel/model/file.go
+++ b/kernel/model/file.go
@@ -1125,12 +1125,15 @@ func CreateDailyNote(boxID string) (p string, existed bool, err error) {
 			for _, c := range children {
 				tree.Root.AppendChild(c)
 			}
+
+			// Creating a dailynote template supports doc attributes https://github.com/siyuan-note/siyuan/issues/10698
 			templateIALs := parse.IAL2Map(templateTree.Root.KramdownIAL)
 			for k, v := range templateIALs {
 				if "name" == k || "alias" == k || "bookmark" == k || "memo" == k || "title" == k || strings.HasPrefix(k, "custom-") {
 					tree.Root.SetIALAttr(k, v)
 				}
 			}
+
 			tree.Root.SetIALAttr("updated", util.CurrentTimeSecondsStr())
 			if err = indexWriteJSONQueue(tree); nil != err {
 				return

From 8a8ac2f45d933b0112f6636bb6d4e2568a43a4bc Mon Sep 17 00:00:00 2001
From: Vanessa <lly219@gmail.com>
Date: Fri, 22 Mar 2024 19:52:04 +0800
Subject: [PATCH 61/77] :art:
 https://github.com/siyuan-note/siyuan/issues/10692

---
 app/src/protyle/render/av/action.ts | 14 ++++++++++-
 app/src/util/backForward.ts         | 38 +++++++++++++++++++++++++++--
 2 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/app/src/protyle/render/av/action.ts b/app/src/protyle/render/av/action.ts
index 931ceeff9c..70b0c36fbd 100644
--- a/app/src/protyle/render/av/action.ts
+++ b/app/src/protyle/render/av/action.ts
@@ -3,7 +3,15 @@ import {hasClosestBlock, hasClosestByAttribute, hasClosestByClassName} from "../
 import {transaction} from "../../wysiwyg/transaction";
 import {openEditorTab} from "../../../menus/util";
 import {copySubMenu} from "../../../menus/commonMenuItem";
-import {getCellText, getTypeByCellElement, popTextCell, renderCell, renderCellAttr, updateHeaderCell} from "./cell";
+import {
+    addDragFill,
+    getCellText,
+    getTypeByCellElement,
+    popTextCell,
+    renderCell,
+    renderCellAttr,
+    updateHeaderCell
+} from "./cell";
 import {getColIconByType, showColMenu} from "./col";
 import {deleteRow, insertRows, setPageSize, updateHeader} from "./row";
 import {emitOpenMenu} from "../../../plugin/EventBus";
@@ -450,7 +458,11 @@ export const updateAttrViewCellAnimation = (cellElement: HTMLElement, value: IAV
     if (headerValue) {
         updateHeaderCell(cellElement, headerValue);
     } else {
+        const hasDragFill = cellElement.querySelector(".av__drag-fill");
         cellElement.innerHTML = renderCell(value);
+        if (hasDragFill) {
+            addDragFill(cellElement);
+        }
         renderCellAttr(cellElement, value);
     }
 };
diff --git a/app/src/util/backForward.ts b/app/src/util/backForward.ts
index 4e86246e59..c84fd9cd1d 100644
--- a/app/src/util/backForward.ts
+++ b/app/src/util/backForward.ts
@@ -2,7 +2,7 @@ import {hasClosestBlock, hasClosestByAttribute} from "../protyle/util/hasClosest
 import {getContenteditableElement} from "../protyle/wysiwyg/getBlock";
 import {focusByOffset, focusByRange, getSelectionOffset} from "../protyle/util/selection";
 import {hideElements} from "../protyle/ui/hideElements";
-import {fetchSyncPost} from "./fetch";
+import {fetchPost, fetchSyncPost} from "./fetch";
 import {Constants} from "../constants";
 import {Wnd} from "../layout/Wnd";
 import {getInstanceById, getWndByLayout} from "../layout/util";
@@ -14,6 +14,7 @@ import {showMessage} from "../dialog/message";
 import {saveScroll} from "../protyle/scroll/saveScroll";
 import {getAllModels} from "../layout/getAll";
 import {App} from "../index";
+import {onGet} from "../protyle/util/onGet";
 
 let forwardStack: IBackStack[] = [];
 let previousIsBack = false;
@@ -143,7 +144,6 @@ const focusStack = async (app: App, stack: IBackStack) => {
         });
         return true;
     }
-    // 缩放
     if (stack.protyle.element.parentElement) {
         const response = await fetchSyncPost("/api/block/checkBlockExist", {id: stack.id});
         if (!response.data) {
@@ -153,6 +153,40 @@ const focusStack = async (app: App, stack: IBackStack) => {
             }
             return false;
         }
+        // 动态加载导致内容移除 https://github.com/siyuan-note/siyuan/issues/10692
+        if (!blockElement && !stack.zoomId && !stack.protyle.scroll.element.classList.contains("fn__none")) {
+            fetchPost("/api/filetree/getDoc", {
+                id: stack.id,
+                mode: 3,
+                size: window.siyuan.config.editor.dynamicLoadBlocks,
+            }, getResponse => {
+                onGet({
+                    data: getResponse,
+                    protyle: stack.protyle,
+                    action: [Constants.CB_GET_FOCUS],
+                    afterCB() {
+                        Array.from(stack.protyle.wysiwyg.element.querySelectorAll(`[data-node-id="${stack.id}"]`)).find((item: HTMLElement) => {
+                            if (!hasClosestByAttribute(item, "data-type", "NodeBlockQueryEmbed")) {
+                                blockElement = item;
+                                return true;
+                            }
+                        });
+                        if (!blockElement) {
+                            return;
+                        }
+                        getAllModels().outline.forEach(item => {
+                            if (item.blockId === stack.protyle.block.rootID) {
+                                item.setCurrent(blockElement);
+                            }
+                        });
+                        focusByOffset(getContenteditableElement(blockElement), stack.position.start, stack.position.end);
+                    }
+                });
+            });
+            return true;
+        }
+
+        // 缩放
         zoomOut({
             protyle: stack.protyle,
             id: stack.zoomId || stack.protyle.block.rootID,

From 8be272bfc6a14d3fec376dc83bf0cee35ced3b38 Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Fri, 22 Mar 2024 20:36:18 +0800
Subject: [PATCH 62/77] :art: Creating a dailynote template supports doc
 attributes https://github.com/siyuan-note/siyuan/issues/10698

---
 kernel/model/template.go | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/kernel/model/template.go b/kernel/model/template.go
index bc71bb049e..909fb2eb9e 100644
--- a/kernel/model/template.go
+++ b/kernel/model/template.go
@@ -169,6 +169,16 @@ func DocSaveAsTemplate(id, name string, overwrite bool) (code int, err error) {
 	luteEngine := NewLute()
 	formatRenderer := render.NewFormatRenderer(tree, luteEngine.RenderOptions)
 	md := formatRenderer.Render()
+
+	// 单独渲染根节点的 IAL
+	if 0 < len(tree.Root.KramdownIAL) {
+		// 把 docIAL 中的 id 调整到第一个
+		tree.Root.RemoveIALAttr("id")
+		tree.Root.KramdownIAL = append([][]string{{"id", tree.Root.ID}}, tree.Root.KramdownIAL...)
+		md = append(md, []byte("\n")...)
+		md = append(md, parse.IAL2Tokens(tree.Root.KramdownIAL)...)
+	}
+
 	name = util.FilterFileName(name) + ".md"
 	name = util.TruncateLenFileName(name)
 	savePath := filepath.Join(util.DataDir, "templates", name)

From 04bbcc6eed6d303c1eee356e3bf50e07e68eb006 Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Fri, 22 Mar 2024 20:40:54 +0800
Subject: [PATCH 63/77] :art: Creating a dailynote template supports doc
 attributes https://github.com/siyuan-note/siyuan/issues/10698

---
 kernel/model/file.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/model/file.go b/kernel/model/file.go
index 53b7300a0d..2e1a236639 100644
--- a/kernel/model/file.go
+++ b/kernel/model/file.go
@@ -1129,7 +1129,7 @@ func CreateDailyNote(boxID string) (p string, existed bool, err error) {
 			// Creating a dailynote template supports doc attributes https://github.com/siyuan-note/siyuan/issues/10698
 			templateIALs := parse.IAL2Map(templateTree.Root.KramdownIAL)
 			for k, v := range templateIALs {
-				if "name" == k || "alias" == k || "bookmark" == k || "memo" == k || "title" == k || strings.HasPrefix(k, "custom-") {
+				if "name" == k || "alias" == k || "bookmark" == k || "memo" == k || strings.HasPrefix(k, "custom-") {
 					tree.Root.SetIALAttr(k, v)
 				}
 			}

From 39220af36cf1866dc4c64b28b103ce79f6827f11 Mon Sep 17 00:00:00 2001
From: Vanessa <lly219@gmail.com>
Date: Fri, 22 Mar 2024 23:09:12 +0800
Subject: [PATCH 64/77] :art:
 https://github.com/siyuan-note/siyuan/issues/10692

---
 app/src/util/backForward.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/util/backForward.ts b/app/src/util/backForward.ts
index c84fd9cd1d..7a58abfe62 100644
--- a/app/src/util/backForward.ts
+++ b/app/src/util/backForward.ts
@@ -163,7 +163,6 @@ const focusStack = async (app: App, stack: IBackStack) => {
                 onGet({
                     data: getResponse,
                     protyle: stack.protyle,
-                    action: [Constants.CB_GET_FOCUS],
                     afterCB() {
                         Array.from(stack.protyle.wysiwyg.element.querySelectorAll(`[data-node-id="${stack.id}"]`)).find((item: HTMLElement) => {
                             if (!hasClosestByAttribute(item, "data-type", "NodeBlockQueryEmbed")) {
@@ -180,6 +179,7 @@ const focusStack = async (app: App, stack: IBackStack) => {
                             }
                         });
                         focusByOffset(getContenteditableElement(blockElement), stack.position.start, stack.position.end);
+                        scrollCenter(stack.protyle, blockElement, true);
                     }
                 });
             });

From a72cafa65246f680a030f022ef365e0e183b33a8 Mon Sep 17 00:00:00 2001
From: Soltus <liaoshanyi@qq.com>
Date: Sat, 23 Mar 2024 02:49:38 +0800
Subject: [PATCH 65/77] =?UTF-8?q?=E2=99=BB=EF=B8=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/electron/error.html                    |  9 ++--
 app/electron/init.html                     |  4 +-
 app/electron/main.js                       | 21 +++++++--
 app/package.json                           |  6 ++-
 app/pnpm-lock.yaml                         | 10 ++---
 app/src/asset/renderAssets.ts              |  6 +--
 app/src/boot/globalEvent/keydown.ts        |  6 +--
 app/src/card/openCard.ts                   |  6 +--
 app/src/card/viewCards.ts                  |  8 ++--
 app/src/dialog/processSystem.ts            | 21 +++++++++
 app/src/history/diff.ts                    | 14 +++---
 app/src/history/doc.ts                     |  4 +-
 app/src/history/history.ts                 |  6 +--
 app/src/layout/topBar.ts                   |  4 +-
 app/src/menus/commonMenuItem.ts            | 12 +++---
 app/src/menus/protyle.ts                   | 50 +++++++++++-----------
 app/src/protyle/gutter/index.ts            |  7 +--
 app/src/protyle/header/Title.ts            |  4 +-
 app/src/protyle/header/openTitleMenu.ts    |  4 +-
 app/src/protyle/render/av/action.ts        |  4 +-
 app/src/protyle/render/av/blockAttr.ts     | 10 ++---
 app/src/protyle/render/av/cell.ts          | 14 +++---
 app/src/protyle/render/av/col.ts           | 36 ++++++++--------
 app/src/protyle/render/av/date.ts          | 18 ++++----
 app/src/protyle/render/av/filter.ts        | 10 ++---
 app/src/protyle/render/av/openMenuPanel.ts |  4 +-
 app/src/protyle/render/av/render.ts        |  2 +-
 app/src/protyle/render/av/row.ts           |  6 +--
 app/src/protyle/toolbar/index.ts           |  8 ++--
 app/src/protyle/util/editorCommonEvent.ts  |  6 +--
 app/src/protyle/util/insertHTML.ts         |  8 ++--
 app/src/protyle/wysiwyg/commonHotkey.ts    |  6 +--
 app/src/protyle/wysiwyg/index.ts           |  6 +--
 app/src/protyle/wysiwyg/input.ts           |  4 +-
 app/src/protyle/wysiwyg/keydown.ts         |  4 +-
 app/src/protyle/wysiwyg/list.ts            |  8 ++--
 app/src/protyle/wysiwyg/turnIntoList.ts    |  4 +-
 app/src/sillot/index.ts                    |  4 +-
 kernel/util/working_mobile.go              |  2 +-
 39 files changed, 203 insertions(+), 163 deletions(-)

diff --git a/app/electron/error.html b/app/electron/error.html
index 3294430b1d..deedf449a3 100644
--- a/app/electron/error.html
+++ b/app/electron/error.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title>Error - SiYuan</title>
+    <title>Error - Sillot</title>
     <meta charset="UTF-8">
     <style>
         body {
@@ -145,9 +145,10 @@ <h2 id="title"></h2>
     <div id="content"></div>
     <div class="fn__flex-1"></div>
     <div class="feedback">
-        <span>🧡 <a href="https://github.com/siyuan-note/siyuan/issues" target="_blank">SiYuan-Note Issues</a></span>
+        <span>🧡 <a href="https://github.com/siyuan-note/siyuan/issues" target="_blank">SiYuan Issues</a></span>
         <span>💜 <a href="https://github.com/Hi-Windom/Sillot/issues" target="_blank">Sillot Issues</a></span>
-        <span><a href="https://github.com/Hi-Windom/Sillot/releases" target="_blank" class="version"></a></span>
+        <span><div id="openAppLogFolder" onclick="javascript:ipcRenderer.send('siyuan-open-folder', 'openAppLogFolder');" style="color: #1f5ab3;">📁 App Log Folder</div></span>
+        <span><div id="openWorkspacesLogFolder" onclick="javascript:ipcRenderer.send('siyuan-open-folder', 'openWorkspacesLogFolder');" style="color: #1f5ab3;">🗂️ Workspaces Log Folder</div></span>
     </div>
     <div class="fn__flex-1"></div>
 </div>
@@ -177,7 +178,7 @@ <h2 id="title"></h2>
     }
 
     (() => {
-        document.querySelector('#icon').innerHTML = `<img src="${decodeURIComponent(getSearch('icon'))}"> SiYuan v${getSearch('v')}`
+        document.querySelector('#icon').innerHTML = `<img src="${decodeURIComponent(getSearch('icon'))}"> Sillot v${getSearch('v')}`
 
         document.getElementById('title').innerHTML = decodeURIComponent(getSearch('title'))
         document.getElementById('content').innerHTML = decodeURIComponent(getSearch('content'))
diff --git a/app/electron/init.html b/app/electron/init.html
index 1fda6ad3b7..eeaabf476d 100644
--- a/app/electron/init.html
+++ b/app/electron/init.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title>SiYuan</title>
+    <title>Sillot</title>
     <meta charset="UTF-8">
     <style>
         body {
@@ -356,7 +356,7 @@ <h2 class="BBN">汐洛 - Sillot</h2>
             const path = require('path')
             const fs = require('fs')
 
-            const defaultWorkspace = path.join(decodeURIComponent(getSearch('home')), "SiYuan")
+            const defaultWorkspace = path.join(decodeURIComponent(getSearch('home')), "Sillot")
             if (!fs.existsSync(defaultWorkspace)) {
                 fs.mkdirSync(defaultWorkspace, {mode: 0o755, recursive: true})
             }
diff --git a/app/electron/main.js b/app/electron/main.js
index 17ee59f8d4..6106a930bb 100644
--- a/app/electron/main.js
+++ b/app/electron/main.js
@@ -38,13 +38,13 @@ const remote = require("@electron/remote/main");
 process.noAsar = true;
 const appDir = path.dirname(app.getAppPath());
 const isDevEnv = process.env.NODE_ENV === "development";
-const appVer = app.getVersion();
-// const branchVer = app.getVersion();
+let appVer = app.getVersion();
 try { require("electron-reloader")(module); } catch {}
 
 let pkg = {};
 if (isDevEnv) {
   pkg = JSON.parse(fs.readFileSync(path.join(appDir, "package.json")).toString());
+  if (pkg.version) { appVer = pkg.version;}
 } else {
   pkg = JSON.parse(fs.readFileSync(path.join(appDir, "app", "package.json")).toString());
 }
@@ -70,7 +70,7 @@ try {
     }
 } catch (e) {
     console.error(e);
-    require("electron").dialog.showErrorBox("创建配置目录失败 Failed to create config directory", "思源需要在用户家目录下创建配置文件夹（~/.config/siyuan），请确保该路径具有写入权限。\n\nSiYuan needs to create a configuration folder (~/.config/siyuan) in the user's home directory. Please make sure that the path has write permissions.");
+    require("electron").dialog.showErrorBox("创建配置目录失败 Failed to create config directory", "思源（汐洛）需要在用户家目录下创建配置文件夹（~/.config/sillot），请确保该路径具有写入权限。\n\nSiYuan needs to create a configuration folder (~/.config/sillot) in the user's home directory. Please make sure that the path has write permissions.");
     app.exit();
 }
 
@@ -203,6 +203,11 @@ const showErrorWindow = (title, content) => {
             icon: path.join(appDir, "stage", "icon-large.png"),
         },
     });
+    errWindow.webContents.on('did-finish-load', () => {
+      errWindow.webContents.executeJavaScript(`
+          const { ipcRenderer } = require('electron');
+      `);
+  });
     errWindow.show();
     return errWindow.id;
 };
@@ -775,6 +780,16 @@ app.whenReady().then(() => {
     };
 
     ipcMain.on("siyuan-open-folder", (event, filePath) => {
+        if (filePath === "openAppLogFolder") {
+          filePath = path.join(confDir, "app.log");
+        }
+        if (filePath === "openWorkspacesLogFolder") {
+          let ws = JSON.parse(fs.readFileSync(path.join(confDir, "workspace.json")).toString());
+          ws.forEach((workspacePath) => {
+            shell.showItemInFolder(path.join(workspacePath, "temp", "siyuan.log"));
+          });
+          return;
+        }
         shell.showItemInFolder(filePath);
     });
     ipcMain.on("siyuan-first-quit", () => {
diff --git a/app/package.json b/app/package.json
index 39a76d3226..48b4fc2fa2 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sillot",
-  "version": "0.27.21",
+  "version": "0.27.22",
   "syv": "3.0.5",
   "sypv": "3.0.4",
   "description": "Build Your Eternal Digital Garden",
@@ -17,6 +17,8 @@
     "v": "pnpm version && echo '\npnpm:' && pnpm -v && echo '\n'",
     "git:tag": "git push origin --tags",
     "git:proxy": "git config --global http.proxy http://127.0.0.1:7890 && git config --global https.proxy http://127.0.0.1:7890",
+    "link:sofill": "pnpm install ../../sofillBuilder/out -D && echo '仅用于开发调试，推送前请恢复'",
+    "unlink:sofill": "pnpm uninstall sofill && pnpm i sofill -D",
     "check": "NPM_CHECK_INSTALLER=pnpm npm-check -u",
     "check:electron": "pnpm install electron@alpha",
     "gentpl": "echo '危险操作警告：生成替换前请确认版本合并冲突已解决' && pause && pnpm run '/gentpl:.*/'",
@@ -154,7 +156,7 @@
     "sass-loader": "^14.1.1",
     "shelljs": "^0.8.5",
     "socket.io": "^4.7.5",
-    "sofill": "^1.0.76",
+    "sofill": "^1.1.4",
     "sout": "^1.1.0",
     "style-loader": "^3.3.4",
     "sweetalert2": "^11.10.6",
diff --git a/app/pnpm-lock.yaml b/app/pnpm-lock.yaml
index 21f933af52..70a0d32f9a 100644
--- a/app/pnpm-lock.yaml
+++ b/app/pnpm-lock.yaml
@@ -262,8 +262,8 @@ importers:
         specifier: ^4.7.5
         version: 4.7.5
       sofill:
-        specifier: ^1.0.76
-        version: 1.0.76(@sillot/bridge@0.0.3)(typescript@5.4.3)
+        specifier: ^1.1.4
+        version: 1.1.4(@sillot/bridge@0.0.3)(typescript@5.4.3)
       sout:
         specifier: ^1.1.0
         version: 1.1.0
@@ -5532,8 +5532,8 @@ packages:
     resolution: {integrity: sha512-DmeAkF6cwM9jSfmp6Dr/5/mfMwb5Z5qRrSXLpo3Fq5SqyU8CMF15jIN4ZhfSwu35ksM1qmHZDQ/DK5XTccSTvA==}
     engines: {node: '>=10.2.0'}
 
-  sofill@1.0.76:
-    resolution: {integrity: sha512-eHkhkP7UIuBz839ESfHmw17W2B4Bj4YsvuHtlKZv+fgvqmULBTTDvgmralStxJ7wvGD5kzqVWxnTmwBCQrHC6g==}
+  sofill@1.1.4:
+    resolution: {integrity: sha512-eowy89UHjTz0h1ieFoUsI3YTheXLNmuNQKjp6UeX+aUxPNe5iucF9zM87JS1IHeAoQFOlB0Q+GH2zO5qdZ5/gw==}
     peerDependencies:
       '@sillot/bridge': ^0.0.3
       localforage: ^1.10.0
@@ -13544,7 +13544,7 @@ snapshots:
       - utf-8-validate
     dev: true
 
-  sofill@1.0.76(@sillot/bridge@0.0.3)(typescript@5.4.3):
+  sofill@1.1.4(@sillot/bridge@0.0.3)(typescript@5.4.3):
     dependencies:
       '@sillot/bridge': 0.0.3
       typescript: 5.4.3
diff --git a/app/src/asset/renderAssets.ts b/app/src/asset/renderAssets.ts
index fee0d58ba9..fe7c21e79e 100644
--- a/app/src/asset/renderAssets.ts
+++ b/app/src/asset/renderAssets.ts
@@ -4,7 +4,7 @@ import {getAllModels} from "../layout/getAll";
 /// #endif
 import {pathPosix} from "../util/pathName";
 // import * as dayjs from "dayjs";
-import {format} from "date-fns";
+import {formatDate} from "sofill/mid";
 
 export const renderAssetsPreview = (pathString: string) => {
     if (!pathString) {
@@ -63,7 +63,7 @@ export const pdfResize = () => {
 export const genAssetHTML = (type: string, pathString: string, imgName: string, linkName: string) => {
     let html = "";
     if (Constants.SIYUAN_ASSETS_AUDIO.includes(type)) {
-        html = `<div data-node-id="${Lute.NewNodeID()}" data-type="NodeAudio" class="iframe" updated="${format(new Date(), 'yyyyMMddHHmmss')}"><div class="iframe-content"><audio controls="controls" src="${pathString}" data-src="${pathString}"></audio>${Constants.ZWSP}</div><div class="protyle-attr" contenteditable="false">${Constants.ZWSP}</div></div>`;
+        html = `<div data-node-id="${Lute.NewNodeID()}" data-type="NodeAudio" class="iframe" updated="${formatDate(new Date(), 'yyyyMMddHHmmss')}"><div class="iframe-content"><audio controls="controls" src="${pathString}" data-src="${pathString}"></audio>${Constants.ZWSP}</div><div class="protyle-attr" contenteditable="false">${Constants.ZWSP}</div></div>`;
     } else if (Constants.SIYUAN_ASSETS_IMAGE.includes(type)) {
         let netHTML = "";
         if (!pathString.startsWith("assets/")) {
@@ -71,7 +71,7 @@ export const genAssetHTML = (type: string, pathString: string, imgName: string,
         }
         html = `<span contenteditable="false" data-type="img" class="img"><span> </span><span><span class="protyle-action protyle-icons"><span class="protyle-icon protyle-icon--only"><svg><use xlink:href="#iconMore"></use></svg></span></span><img src="${pathString}" data-src="${pathString}" alt="${imgName}" /><span class="protyle-action__drag"></span>${netHTML}<span class="protyle-action__title"></span></span><span> </span></span>`;
     } else if (Constants.SIYUAN_ASSETS_VIDEO.includes(type)) {
-        html = `<div data-node-id="${Lute.NewNodeID()}" data-type="NodeVideo" class="iframe" updated="${format(new Date(), 'yyyyMMddHHmmss')}"><div class="iframe-content">${Constants.ZWSP}<video controls="controls" src="${pathString}" data-src="${pathString}"></video><span class="protyle-action__drag" contenteditable="false"></span></div><div class="protyle-attr" contenteditable="false">${Constants.ZWSP}</div></div>`;
+        html = `<div data-node-id="${Lute.NewNodeID()}" data-type="NodeVideo" class="iframe" updated="${formatDate(new Date(), 'yyyyMMddHHmmss')}"><div class="iframe-content">${Constants.ZWSP}<video controls="controls" src="${pathString}" data-src="${pathString}"></video><span class="protyle-action__drag" contenteditable="false"></span></div><div class="protyle-attr" contenteditable="false">${Constants.ZWSP}</div></div>`;
     } else {
         html = `<span data-type="a" data-href="${pathString}">${linkName}</span>`;
     }
diff --git a/app/src/boot/globalEvent/keydown.ts b/app/src/boot/globalEvent/keydown.ts
index 7d64fc18b4..d48d13185e 100644
--- a/app/src/boot/globalEvent/keydown.ts
+++ b/app/src/boot/globalEvent/keydown.ts
@@ -77,7 +77,7 @@ import {historyKeydown} from "../../history/keydown";
 import {zoomOut} from "../../menus/protyle";
 import {openSearchAV} from "../../protyle/render/av/relation";
 // import * as dayjs from "dayjs";
-import {format} from "date-fns";
+import {formatDate} from "sofill/mid";
 
 const switchDialogEvent = (app: App, event: MouseEvent) => {
     event.preventDefault();
@@ -323,7 +323,7 @@ const editKeydown = (app: App, event: KeyboardEvent) => {
                 }, {
                     action: "doUpdateUpdated",
                     id: listItemElement.dataset.nodeId,
-                    data: format(new Date(), 'yyyyMMddHHmmss'),
+                    data: formatDate(new Date(), 'yyyyMMddHHmmss'),
                 }], [{
                     action: "removeAttrViewBlock",
                     srcIDs: sourceIds,
@@ -357,7 +357,7 @@ const editKeydown = (app: App, event: KeyboardEvent) => {
                 }, {
                     action: "doUpdateUpdated",
                     id: listItemElement.dataset.blockId,
-                    data: format(new Date(), 'yyyyMMddHHmmss'),
+                    data: formatDate(new Date(), 'yyyyMMddHHmmss'),
                 }], [{
                     action: "removeAttrViewBlock",
                     srcIDs: sourceIds,
diff --git a/app/src/card/openCard.ts b/app/src/card/openCard.ts
index 8c4d7e367d..acd802d273 100644
--- a/app/src/card/openCard.ts
+++ b/app/src/card/openCard.ts
@@ -14,7 +14,7 @@ import {escapeHtml} from "../util/escape";
 import {openFile} from "../editor/util";
 /// #endif
 // import * as dayjs from "dayjs";
-import {format} from "date-fns";
+import {formatDate} from "sofill/mid";
 import {getDisplayName, movePathTo} from "../util/pathName";
 import {App} from "../index";
 import {resize} from "../protyle/util/resize";
@@ -311,7 +311,7 @@ export const bindCardEvent = async (options: {
                             fetchPost("/api/riff/batchSetRiffCardsDueTime", {
                                 cardDues: [{
                                     id: currentCard.cardID,
-                                    due: format(parseInt(inputElement.value) * 1000, 'yyyyMMddHHmmss')
+                                    due: formatDate(parseInt(inputElement.value) * 1000, 'yyyyMMddHHmmss')
                                 }]
                             }, () => {
                                 actionElements[0].classList.add("fn__none");
@@ -401,7 +401,7 @@ export const bindCardEvent = async (options: {
 </div><div class="fn__flex${currentCard.lastReview > 0 ? "" : " fn__none"}">
     <div class="fn__flex-1">${window.siyuan.languages.lastReviewTime}</div>
     <div class="fn__space"></div>
-    <div>${dayjs(currentCard.lastReview).format("YYYY-MM-DD")}</div>
+    <div>${formatDate(new Date(currentCard.lastReview), 'yyyy-MM-dd')}</div>
 </div>`,
                 });
                 /// #if MOBILE
diff --git a/app/src/card/viewCards.ts b/app/src/card/viewCards.ts
index ce3da8c11a..c58d75502b 100644
--- a/app/src/card/viewCards.ts
+++ b/app/src/card/viewCards.ts
@@ -1,4 +1,4 @@
-import {format} from "date-fns";
+import {formatDate} from "sofill/mid";
 import {Protyle} from "../protyle";
 import {fetchPost} from "../util/fetch";
 import {Dialog} from "../dialog";
@@ -171,7 +171,7 @@ export const viewCards = (app: App, deckID: string, title: string, deckType: "Tr
                         id: deckID,
                         blockIDs: [target.getAttribute("data-id")],
                     }, () => {
-                        target.parentElement.querySelector(".ariaLabel.b3-list-item__meta").textContent = format(new Date(), 'yyyy-MM-dd');
+                        target.parentElement.querySelector(".ariaLabel.b3-list-item__meta").textContent = formatDate(new Date(), 'yyyy-MM-dd');
                     });
                     event.stopPropagation();
                     event.preventDefault();
@@ -185,7 +185,7 @@ export const viewCards = (app: App, deckID: string, title: string, deckType: "Tr
                                 id: deckID,
                             }, () => {
                                 dialog.element.querySelectorAll(".ariaLabel.b3-list-item__meta").forEach(item => {
-                                    item.textContent = format(new Date(), 'yyyy-MM-dd');
+                                    item.textContent = formatDate(new Date(), 'yyyy-MM-dd');
                                 });
                             });
                         });
@@ -260,7 +260,7 @@ ${unicode2Emoji(item.ial.icon, "b3-list-item__graphic", true)}
 <span class="b3-list-item__text">${item.content || Constants.ZWSP}</span>
 <span class="${(isMobile() || !hPath) ? "fn__none " : ""}b3-list-item__meta b3-list-item__meta--ellipsis" title="${escapeAttr(hPath)}">${escapeHtml(hPath)}</span>
 <span data-position="parentE" aria-label="${window.siyuan.languages.revisionCount}" class="ariaLabel counter${item.riffCard?.reps === 0 ? " fn__none" : ""}">${item.riffCard?.reps}</span>
-<span data-position="parentE" aria-label="${window.siyuan.languages.nextDue}" class="ariaLabel b3-list-item__meta${!item.riffCard?.due ? " fn__none" : ""}">${format(new Date(item.riffCard?.due), 'yyyy-MM-dd')}</span>
+<span data-position="parentE" aria-label="${window.siyuan.languages.nextDue}" class="ariaLabel b3-list-item__meta${!item.riffCard?.due ? " fn__none" : ""}">${formatDate(new Date(item.riffCard?.due), 'yyyy-MM-dd')}</span>
 <span data-position="parentE" data-type="reset" data-id="${item.id}" class="b3-list-item__action ariaLabel" aria-label="${window.siyuan.languages.reset}">
     <svg><use xlink:href="#iconUndo"></use></svg>
 </span>
diff --git a/app/src/dialog/processSystem.ts b/app/src/dialog/processSystem.ts
index bf705d1ec2..3ba6e63be9 100644
--- a/app/src/dialog/processSystem.ts
+++ b/app/src/dialog/processSystem.ts
@@ -180,7 +180,28 @@ export const kernelError = () => {
     }
 };
 
+// 在退出时禁用整个 HTML 页面的交互
+function disableInteractions() {
+  // 创建一个遮罩层
+  const overlay = document.createElement('div');
+  overlay.style.position = 'fixed';
+  overlay.style.top = '0';
+  overlay.style.left = '0';
+  overlay.style.width = '100%';
+  overlay.style.height = '100%';
+  overlay.style.backgroundColor = 'rgba(0, 0, 0, 0.5)';
+  overlay.style.zIndex = '9999'; // 确保在最上层
+  document.body.appendChild(overlay);
+
+  // 禁用遮罩层上的点击事件
+  overlay.addEventListener('click', (event) => {
+      event.preventDefault();
+      event.stopPropagation();
+  });
+}
+
 export const exitSiYuan = () => {
+    disableInteractions();
     exportIDB().then(() => {
     hideAllElements(["util"]);
     /// #if MOBILE
diff --git a/app/src/history/diff.ts b/app/src/history/diff.ts
index ecea38ad2c..dba832b689 100644
--- a/app/src/history/diff.ts
+++ b/app/src/history/diff.ts
@@ -6,7 +6,7 @@ import {disabledProtyle, onGet} from "../protyle/util/onGet";
 import {hasClosestByClassName} from "../protyle/util/hasClosest";
 import {escapeAttr, escapeHtml} from "../util/escape";
 // import * as dayjs from "dayjs";
-import {format} from "date-fns";
+import {formatDate} from "sofill/mid";
 import {isMobile} from "../util/functions";
 import {App} from "../index";
 import {pathPosix} from "../util/pathName";
@@ -102,7 +102,7 @@ const renderCompare = (app: App, element: HTMLElement) => {
                 action: [Constants.CB_GET_HISTORY, Constants.CB_GET_HTML],
             });
         }
-        leftElement.querySelector(".history__date").textContent = format(new Date(response.data.updated), 'yyyy-MM-dd HH:mm');
+        leftElement.querySelector(".history__date").textContent = formatDate(new Date(response.data.updated), 'yyyy-MM-dd HH:mm');
     });
     const id2 = element.getAttribute("data-id2");
     if (id2) {
@@ -131,7 +131,7 @@ const renderCompare = (app: App, element: HTMLElement) => {
                     action: [Constants.CB_GET_HISTORY, Constants.CB_GET_HTML],
                 });
             }
-            rightElement.querySelector(".history__date").textContent = format(new Date(response.data.updated), 'yyyy-MM-dd HH:mm');
+            rightElement.querySelector(".history__date").textContent = formatDate(new Date(response.data.updated), 'yyyy-MM-dd HH:mm');
         });
     } else {
         rightElement.classList.add("fn__none");
@@ -216,13 +216,13 @@ const genHTML = (left: string, right: string, dialog: Dialog, direct: string) =>
     <span class="fn__flex-1"></span>
     <code class="fn__code${isPhone ? " fn__none" : ""}" data-snapshot="${left}">${left.substring(0, 7)}</code>
     ${isPhone ? "" : '<span class="fn__space"></span>'}
-    ${format(new Date(response.data.left.created), 'yyyy-MM-dd HH:mm')}
+    ${formatDate(new Date(response.data.left.created), 'yyyy-MM-dd HH:mm')}
     <span class="fn__space"></span>
     <span class="block__icon block__icon--show b3-tooltips b3-tooltips__s" aria-label="${window.siyuan.languages.switchDirect}" data-direct="${direct}"><svg><use xlink:href="#iconScrollHoriz"></use></svg></span>
     <span class="fn__space"></span>
     <code class="fn__code${isPhone ? " fn__none" : ""}" data-snapshot="${right}">${right.substring(0, 7)}</code>
     ${isPhone ? "" : '<span class="fn__space"></span>'}
-    ${format(new Date(response.data.right.created), 'yyyy-MM-dd HH:mm')}
+    ${formatDate(new Date(response.data.right.created), 'yyyy-MM-dd HH:mm')}
     <span class="fn__flex-1"></span>
 </div>`;
         headElement.nextElementSibling.innerHTML = `<div class="fn__flex history__panel" style="height: 100%">
@@ -260,13 +260,13 @@ const genHTML = (left: string, right: string, dialog: Dialog, direct: string) =>
     </div>
     <div class="fn__flex-1 fn__flex">
         <div class="fn__none fn__flex-1 fn__flex-column">
-            <div class="history__date">${format(response.data.left.created, 'yyyy-MM-dd HH:mm')}</div>
+            <div class="history__date">${formatDate(response.data.left.created, 'yyyy-MM-dd HH:mm')}</div>
             <div class="ft__center"></div>
             <textarea class="history__text fn__none fn__flex-1" readonly></textarea>
             <div class="fn__flex-1"></div>
         </div>
         <div class="fn__none fn__flex-1 fn__flex-column" style="border-left: 1px solid var(--b3-border-color);">
-            <div class="history__date">${format(response.data.right.created, 'yyyy-MM-dd HH:mm')}</div>
+            <div class="history__date">${formatDate(response.data.right.created, 'yyyy-MM-dd HH:mm')}</div>
             <div class="ft__center"></div>
             <textarea class="history__text fn__none fn__flex-1" readonly></textarea>
             <div class="fn__flex-1"></div>
diff --git a/app/src/history/doc.ts b/app/src/history/doc.ts
index 2d91d52933..9030d6ad62 100644
--- a/app/src/history/doc.ts
+++ b/app/src/history/doc.ts
@@ -3,7 +3,7 @@ import {confirmDialog} from "../dialog/confirmDialog";
 import {Constants} from "../constants";
 import {Protyle} from "../protyle";
 import {disabledProtyle, onGet} from "../protyle/util/onGet";
-import {format} from "date-fns";
+import {formatDate} from "sofill/mid";
 import {fetchPost} from "../util/fetch";
 import {isMobile} from "../util/functions";
 import {App} from "../index";
@@ -43,7 +43,7 @@ const renderDoc = (element: HTMLElement, currentPage: number, id: string) => {
         let logsHTML = "";
         response.data.histories.forEach((item: string) => {
             logsHTML += `<li class="b3-list-item b3-list-item--hide-action" data-created="${item}">
-    <span class="b3-list-item__text">${format(parseInt(item) * 1000, 'yyyy-MM-dd HH:mm')}</span>
+    <span class="b3-list-item__text">${formatDate(parseInt(item) * 1000, 'yyyy-MM-dd HH:mm')}</span>
     <span class="fn__space"></span>
     <span class="b3-list-item__action b3-tooltips b3-tooltips__w" data-type="rollback" aria-label="${window.siyuan.languages.rollback}">
         <svg><use xlink:href="#iconUndo"></use></svg>
diff --git a/app/src/history/history.ts b/app/src/history/history.ts
index d967e811e0..a4131ed193 100644
--- a/app/src/history/history.ts
+++ b/app/src/history/history.ts
@@ -6,7 +6,7 @@ import {renderAssetsPreview} from "../asset/renderAssets";
 import {Protyle} from "../protyle";
 import {disabledProtyle, onGet} from "../protyle/util/onGet";
 // import * as dayjs from "dayjs";
-import {format} from "date-fns";
+import {formatDate} from "sofill/mid";
 import {fetchPost} from "../util/fetch";
 import {escapeAttr, escapeHtml} from "../util/escape";
 import {isMobile} from "../util/functions";
@@ -70,7 +70,7 @@ const renderDoc = (element: HTMLElement, currentPage: number) => {
         response.data.histories.forEach((item: string) => {
             logsHTML += `<li class="b3-list-item" data-type="toggle" data-created="${item}">
     <span class="b3-list-item__toggle b3-list-item__toggle--hl"><svg class="b3-list-item__arrow"><use xlink:href="#iconRight"></use></svg></span>
-    <span style="padding-left: 4px" class="b3-list-item__text">${format(parseInt(item) * 1000, 'yyyy-MM-dd HH:mm:ss')}</span>
+    <span style="padding-left: 4px" class="b3-list-item__text">${formatDate(parseInt(item) * 1000, 'yyyy-MM-dd HH:mm:ss')}</span>
 </li>`;
         });
         element.lastElementChild.firstElementChild.innerHTML = logsHTML;
@@ -713,7 +713,7 @@ const bindEvent = (app: App, element: Element, dialog?: Dialog) => {
                 const genTagDialog = new Dialog({
                     title: window.siyuan.languages.tagSnapshot,
                     content: `<div class="b3-dialog__content">
-    <input class="b3-text-field fn__block" value="${format(new Date(), 'yyyyMMddHHmmss')}" placeholder="${window.siyuan.languages.tagSnapshotTip}">
+    <input class="b3-text-field fn__block" value="${formatDate(new Date(), 'yyyyMMddHHmmss')}" placeholder="${window.siyuan.languages.tagSnapshotTip}">
 </div>
 <div class="b3-dialog__action">
     <button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button><div class="fn__space"></div>
diff --git a/app/src/layout/topBar.ts b/app/src/layout/topBar.ts
index 13f8afed29..4e3ea3b028 100644
--- a/app/src/layout/topBar.ts
+++ b/app/src/layout/topBar.ts
@@ -17,7 +17,7 @@ import {isBrowser, isWindow} from "../util/functions";
 import {Menu} from "../plugin/Menu";
 import {fetchPost} from "../util/fetch";
 import {needSubscribe} from "../util/needSubscribe";
-import {format} from "date-fns";
+import {formatDate} from "sofill/mid";
 import {commandPanel} from "../plugin/commandPanel";
 import {exportLayout} from "./util";
 
@@ -230,7 +230,7 @@ export const initBar = (app: App) => {
             if (!window.siyuan.config.sync.enabled || (0 === window.siyuan.config.sync.provider && needSubscribe(""))) {
                 html = response.data.stat;
             } else {
-                html = window.siyuan.languages._kernel[82].replace("%s", format(new Date(response.data.synced), 'yyyy-MM-dd HH:mm')) + "<br>";
+                html = window.siyuan.languages._kernel[82].replace("%s", formatDate(new Date(response.data.synced), 'yyyy-MM-dd HH:mm')) + "<br>";
                 html += "&emsp;" + response.data.stat;
                 if (response.data.kernels.length > 0) {
                     html += "<br>";
diff --git a/app/src/menus/commonMenuItem.ts b/app/src/menus/commonMenuItem.ts
index fbb58157e9..37d97ddb60 100644
--- a/app/src/menus/commonMenuItem.ts
+++ b/app/src/menus/commonMenuItem.ts
@@ -16,7 +16,7 @@ import {openAsset, openBy} from "../editor/util";
 /// #endif
 import {rename, replaceFileName} from "../editor/rename";
 // import * as dayjs from "dayjs";
-import {format} from "date-fns";
+import {formatDate} from "sofill/mid";
 import {Constants} from "../constants";
 import {exportImage} from "../protyle/export/util";
 import {App} from "../index";
@@ -38,7 +38,7 @@ export const openWechatNotify = (nodeElement: Element) => {
     const reminder = nodeElement.getAttribute(Constants.CUSTOM_REMINDER_WECHAT);
     let reminderFormat = "";
     if (reminder) {
-        reminderFormat = format(new Date(~~reminder), 'yyyy-MM-dd HH:mm');
+        reminderFormat = formatDate(new Date(~~reminder), 'yyyy-MM-dd HH:mm');
     }
     const dialog = new Dialog({
         width: isMobile() ? "92vw" : "50vw",
@@ -86,7 +86,7 @@ export const openWechatNotify = (nodeElement: Element) => {
                 return;
             }
             btnsElement[2].setAttribute("disabled", "disabled");
-            const timed = format(new Date(~~date), 'yyyyMMddHHmmss');
+            const timed = formatDate(new Date(~~date), 'yyyyMMddHHmmss');
             fetchPost("/api/block/setBlockReminder", {id, timed}, () => {
                 nodeElement.setAttribute(Constants.CUSTOM_REMINDER_WECHAT, timed);
                 dialog.destroy();
@@ -104,7 +104,7 @@ export const openFileWechatNotify = (protyle: IProtyle) => {
         const reminder = response.data.ial[Constants.CUSTOM_REMINDER_WECHAT];
         let reminderFormat = "";
         if (reminder) {
-            reminderFormat = format(new Date(~~reminder), 'yyyy-MM-dd HH:mm');
+            reminderFormat = formatDate(new Date(~~reminder), 'yyyy-MM-dd HH:mm');
         }
         const dialog = new Dialog({
             width: isMobile() ? "92vw" : "50vw",
@@ -142,7 +142,7 @@ export const openFileWechatNotify = (protyle: IProtyle) => {
                 }
                 fetchPost("/api/block/setBlockReminder", {
                     id: protyle.block.rootID,
-                    timed: format(new Date(~~date), 'yyyyMMddHHmmss')
+                    timed: formatDate(new Date(~~date), 'yyyyMMddHHmmss')
                 }, () => {
                     dialog.destroy();
                 });
@@ -166,7 +166,7 @@ export const openFileAttr = (attrs: IObject, focusName = "bookmark", protyle?: I
             notifyHTML = `<label class="b3-label b3-label--noborder">
     ${window.siyuan.languages.wechatReminder}
     <div class="fn__hr"></div>
-    <input class="b3-text-field fn__block" type="datetime-local" max="9999-12-31 23:59" readonly data-name="${item}" value="${format(new Date(~~attrs[item]), 'yyyy-MM-dd HH:mm')}">
+    <input class="b3-text-field fn__block" type="datetime-local" max="9999-12-31 23:59" readonly data-name="${item}" value="${formatDate(new Date(~~attrs[item]), 'yyyy-MM-dd HH:mm')}">
 </label>`;
         } else if (item.indexOf("custom-av") > -1) {
             hasAV = true;
diff --git a/app/src/menus/protyle.ts b/app/src/menus/protyle.ts
index 8a38792384..7c831807f5 100644
--- a/app/src/menus/protyle.ts
+++ b/app/src/menus/protyle.ts
@@ -37,7 +37,7 @@ import {openNewWindowById} from "../window/openNewWindow";
 import {getSearch, isMobile} from "../util/functions";
 import {removeFoldHeading} from "../protyle/util/heading";
 import {lineNumberRender} from "../protyle/render/highlightRender";
-import {format} from "date-fns";
+import {formatDate} from "sofill/mid";
 import {blockRender} from "../protyle/render/blockRender";
 import {renameAsset} from "../editor/rename";
 import {electronUndo} from "../protyle/undo";
@@ -257,7 +257,7 @@ export const fileAnnotationRefMenu = (protyle: IProtyle, refElement: HTMLElement
         label: `${window.siyuan.languages.turnInto} <b>${window.siyuan.languages.text}</b>`,
         icon: "iconRefresh",
         click() {
-            nodeElement.setAttribute("updated", format(new Date(), 'yyyyMMddHHmmss'));
+            nodeElement.setAttribute("updated", formatDate(new Date(), 'yyyyMMddHHmmss'));
             removeInlineType(refElement, "file-annotation-ref", protyle.toolbar.range);
             updateTransaction(protyle, id, nodeElement.outerHTML, oldHTML);
             oldHTML = nodeElement.outerHTML;
@@ -269,7 +269,7 @@ export const fileAnnotationRefMenu = (protyle: IProtyle, refElement: HTMLElement
         click() {
             refElement.insertAdjacentHTML("afterend", "<wbr>");
             refElement.remove();
-            nodeElement.setAttribute("updated", format(new Date(), 'yyyyMMddHHmmss'));
+            nodeElement.setAttribute("updated", formatDate(new Date(), 'yyyyMMddHHmmss'));
             updateTransaction(protyle, id, nodeElement.outerHTML, oldHTML);
             focusByWbr(nodeElement, protyle.toolbar.range);
             oldHTML = nodeElement.outerHTML;
@@ -299,7 +299,7 @@ export const fileAnnotationRefMenu = (protyle: IProtyle, refElement: HTMLElement
     anchorElement.select();
     window.siyuan.menus.menu.removeCB = () => {
         if (nodeElement.outerHTML !== oldHTML) {
-            nodeElement.setAttribute("updated", format(new Date(), 'yyyyMMddHHmmss'));
+            nodeElement.setAttribute("updated", formatDate(new Date(), 'yyyyMMddHHmmss'));
             updateTransaction(protyle, id, nodeElement.outerHTML, oldHTML);
         }
 
@@ -464,7 +464,7 @@ export const refMenu = (protyle: IProtyle, element: HTMLElement) => {
                     element.setAttribute("data-subtype", "d");
                     fetchPost("/api/block/getRefText", {id: refBlockId}, (response) => {
                         element.innerHTML = response.data;
-                        nodeElement.setAttribute("updated", format(new Date(), 'yyyyMMddHHmmss'));
+                        nodeElement.setAttribute("updated", formatDate(new Date(), 'yyyyMMddHHmmss'));
                         updateTransaction(protyle, id, nodeElement.outerHTML, oldHTML);
                         oldHTML = nodeElement.outerHTML;
                     });
@@ -476,7 +476,7 @@ export const refMenu = (protyle: IProtyle, element: HTMLElement) => {
                 label: window.siyuan.languages.turnToStatic,
                 click() {
                     element.setAttribute("data-subtype", "s");
-                    nodeElement.setAttribute("updated", format(new Date(), 'yyyyMMddHHmmss'));
+                    nodeElement.setAttribute("updated", formatDate(new Date(), 'yyyyMMddHHmmss'));
                     updateTransaction(protyle, id, nodeElement.outerHTML, oldHTML);
                     focusByRange(protyle.toolbar.range);
                     oldHTML = nodeElement.outerHTML;
@@ -486,7 +486,7 @@ export const refMenu = (protyle: IProtyle, element: HTMLElement) => {
         submenu = submenu.concat([{
             label: window.siyuan.languages.text,
             click() {
-                nodeElement.setAttribute("updated", format(new Date(), 'yyyyMMddHHmmss'));
+                nodeElement.setAttribute("updated", formatDate(new Date(), 'yyyyMMddHHmmss'));
                 removeInlineType(element, "block-ref", protyle.toolbar.range);
                 updateTransaction(protyle, id, nodeElement.outerHTML, oldHTML);
                 oldHTML = nodeElement.outerHTML;
@@ -496,7 +496,7 @@ export const refMenu = (protyle: IProtyle, element: HTMLElement) => {
             click() {
                 element.setAttribute("data-subtype", "s");
                 element.textContent = "*";
-                nodeElement.setAttribute("updated", format(new Date(), 'yyyyMMddHHmmss'));
+                nodeElement.setAttribute("updated", formatDate(new Date(), 'yyyyMMddHHmmss'));
                 updateTransaction(protyle, id, nodeElement.outerHTML, oldHTML);
                 focusByRange(protyle.toolbar.range);
                 oldHTML = nodeElement.outerHTML;
@@ -507,7 +507,7 @@ export const refMenu = (protyle: IProtyle, element: HTMLElement) => {
                 element.insertAdjacentHTML("beforebegin", element.innerHTML + " ");
                 element.setAttribute("data-subtype", "s");
                 element.textContent = "*";
-                nodeElement.setAttribute("updated", format(new Date(), 'yyyyMMddHHmmss'));
+                nodeElement.setAttribute("updated", formatDate(new Date(), 'yyyyMMddHHmmss'));
                 updateTransaction(protyle, id, nodeElement.outerHTML, oldHTML);
                 focusByRange(protyle.toolbar.range);
                 oldHTML = nodeElement.outerHTML;
@@ -517,7 +517,7 @@ export const refMenu = (protyle: IProtyle, element: HTMLElement) => {
             icon: "iconLink",
             click() {
                 element.outerHTML = `<span data-type="a" data-href="siyuan://blocks/${element.getAttribute("data-id")}">${element.innerHTML}</span><wbr>`;
-                nodeElement.setAttribute("updated", format(new Date(), 'yyyyMMddHHmmss'));
+                nodeElement.setAttribute("updated", formatDate(new Date(), 'yyyyMMddHHmmss'));
                 updateTransaction(protyle, id, nodeElement.outerHTML, oldHTML);
                 focusByWbr(nodeElement, protyle.toolbar.range);
                 oldHTML = nodeElement.outerHTML;
@@ -528,7 +528,7 @@ export const refMenu = (protyle: IProtyle, element: HTMLElement) => {
                 label: window.siyuan.languages.blockEmbed,
                 icon: "iconSQL",
                 click() {
-                    const html = `<div data-content="select * from blocks where id='${refBlockId}'" data-node-id="${id}" data-type="NodeBlockQueryEmbed" class="render-node" updated="${format(new Date(), 'yyyyMMddHHmmss')}">${nodeElement.querySelector(".protyle-attr").outerHTML}</div>`;
+                    const html = `<div data-content="select * from blocks where id='${refBlockId}'" data-node-id="${id}" data-type="NodeBlockQueryEmbed" class="render-node" updated="${formatDate(new Date(), 'yyyyMMddHHmmss')}">${nodeElement.querySelector(".protyle-attr").outerHTML}</div>`;
                     nodeElement.outerHTML = html;
                     updateTransaction(protyle, id, html, oldHTML);
                     blockRender(protyle, protyle.wysiwyg.element);
@@ -577,7 +577,7 @@ export const refMenu = (protyle: IProtyle, element: HTMLElement) => {
             click() {
                 element.insertAdjacentHTML("afterend", "<wbr>");
                 element.remove();
-                nodeElement.setAttribute("updated", format(new Date(), 'yyyyMMddHHmmss'));
+                nodeElement.setAttribute("updated", formatDate(new Date(), 'yyyyMMddHHmmss'));
                 updateTransaction(protyle, id, nodeElement.outerHTML, oldHTML);
                 focusByWbr(nodeElement, protyle.toolbar.range);
                 oldHTML = nodeElement.outerHTML;
@@ -608,7 +608,7 @@ export const refMenu = (protyle: IProtyle, element: HTMLElement) => {
         window.siyuan.menus.menu.element.querySelector("input").select();
         window.siyuan.menus.menu.removeCB = () => {
             if (nodeElement.outerHTML !== oldHTML) {
-                nodeElement.setAttribute("updated", format(new Date(), 'yyyyMMddHHmmss'));
+                nodeElement.setAttribute("updated", formatDate(new Date(), 'yyyyMMddHHmmss'));
                 updateTransaction(protyle, id, nodeElement.outerHTML, oldHTML);
             }
             const currentRange = getSelection().rangeCount === 0 ? undefined : getSelection().getRangeAt(0);
@@ -951,7 +951,7 @@ export const imgMenu = (protyle: IProtyle, range: Range, assetElement: HTMLEleme
             click() {
                 writeText(protyle.lute.BlockDOM2StdMd(assetElement.outerHTML));
                 (assetElement as HTMLElement).outerHTML = "<wbr>";
-                nodeElement.setAttribute("updated", format(new Date(), 'yyyyMMddHHmmss'));
+                nodeElement.setAttribute("updated", formatDate(new Date(), 'yyyyMMddHHmmss'));
                 updateTransaction(protyle, id, nodeElement.outerHTML, html);
                 focusByWbr(protyle.wysiwyg.element, range);
             }
@@ -962,7 +962,7 @@ export const imgMenu = (protyle: IProtyle, range: Range, assetElement: HTMLEleme
             label: window.siyuan.languages.delete,
             click: function () {
                 (assetElement as HTMLElement).outerHTML = "<wbr>";
-                nodeElement.setAttribute("updated", format(new Date(), 'yyyyMMddHHmmss'));
+                nodeElement.setAttribute("updated", formatDate(new Date(), 'yyyyMMddHHmmss'));
                 updateTransaction(protyle, id, nodeElement.outerHTML, html);
                 focusByWbr(protyle.wysiwyg.element, range);
             }
@@ -1048,7 +1048,7 @@ export const imgMenu = (protyle: IProtyle, range: Range, assetElement: HTMLEleme
                             rangeElement.parentElement.setAttribute("aria-label", `${rangeElement.value}%`);
                         });
                         rangeElement.addEventListener("change", () => {
-                            nodeElement.setAttribute("updated", format(new Date(), 'yyyyMMddHHmmss'));
+                            nodeElement.setAttribute("updated", formatDate(new Date(), 'yyyyMMddHHmmss'));
                             updateTransaction(protyle, id, nodeElement.outerHTML, html);
                             window.siyuan.menus.menu.remove();
                             focusBlock(nodeElement);
@@ -1096,7 +1096,7 @@ export const imgMenu = (protyle: IProtyle, range: Range, assetElement: HTMLEleme
                 });
             }
             imgElement.setAttribute("alt", textElements[2].value.replace(/\n|\r\n|\r|\u2028|\u2029/g, ""));
-            nodeElement.setAttribute("updated", format(new Date(), 'yyyyMMddHHmmss'));
+            nodeElement.setAttribute("updated", formatDate(new Date(), 'yyyyMMddHHmmss'));
             updateTransaction(protyle, id, nodeElement.outerHTML, html);
         };
     }
@@ -1228,7 +1228,7 @@ export const linkMenu = (protyle: IProtyle, linkElement: HTMLElement, focusText
                 inputElements[2].value = "";
                 linkElement.removeAttribute("data-href");
                 linkElement.removeAttribute("data-title");
-                nodeElement.setAttribute("updated", format(new Date(), 'yyyyMMddHHmmss'));
+                nodeElement.setAttribute("updated", formatDate(new Date(), 'yyyyMMddHHmmss'));
                 updateTransaction(protyle, id, nodeElement.outerHTML, html);
                 protyle.toolbar.range.selectNode(linkElement);
                 protyle.toolbar.range.collapse(false);
@@ -1243,7 +1243,7 @@ export const linkMenu = (protyle: IProtyle, linkElement: HTMLElement, focusText
         click() {
             inputElements[0].value = "";
             inputElements[2].value = "";
-            nodeElement.setAttribute("updated", format(new Date(), 'yyyyMMddHHmmss'));
+            nodeElement.setAttribute("updated", formatDate(new Date(), 'yyyyMMddHHmmss'));
             removeInlineType(linkElement, "a", protyle.toolbar.range);
             updateTransaction(protyle, id, nodeElement.outerHTML, html);
             html = nodeElement.outerHTML;
@@ -1255,7 +1255,7 @@ export const linkMenu = (protyle: IProtyle, linkElement: HTMLElement, focusText
         click() {
             linkElement.insertAdjacentHTML("afterend", "<wbr>");
             linkElement.remove();
-            nodeElement.setAttribute("updated", format(new Date(), 'yyyyMMddHHmmss'));
+            nodeElement.setAttribute("updated", formatDate(new Date(), 'yyyyMMddHHmmss'));
             updateTransaction(protyle, id, nodeElement.outerHTML, html);
             focusByWbr(nodeElement, protyle.toolbar.range);
             html = nodeElement.outerHTML;
@@ -1303,7 +1303,7 @@ export const linkMenu = (protyle: IProtyle, linkElement: HTMLElement, focusText
             focusByRange(protyle.toolbar.range);
         }
         if (html !== nodeElement.outerHTML) {
-            nodeElement.setAttribute("updated", format(new Date(), 'yyyyMMddHHmmss'));
+            nodeElement.setAttribute("updated", formatDate(new Date(), 'yyyyMMddHHmmss'));
             updateTransaction(protyle, id, nodeElement.outerHTML, html);
         }
     };
@@ -1346,7 +1346,7 @@ export const tagMenu = (protyle: IProtyle, tagElement: HTMLElement) => {
                         const oldHTML = nodeElement.outerHTML;
                         tagElement.insertAdjacentHTML("afterend", "<wbr>");
                         tagElement.remove();
-                        nodeElement.setAttribute("updated", format(new Date(), 'yyyyMMddHHmmss'));
+                        nodeElement.setAttribute("updated", formatDate(new Date(), 'yyyyMMddHHmmss'));
                         updateTransaction(protyle, id, nodeElement.outerHTML, oldHTML);
                         focusByWbr(nodeElement, protyle.toolbar.range);
                     } else {
@@ -1395,7 +1395,7 @@ export const tagMenu = (protyle: IProtyle, tagElement: HTMLElement) => {
             const oldHTML = nodeElement.outerHTML;
             tagElement.insertAdjacentHTML("afterend", "<wbr>");
             tagElement.remove();
-            nodeElement.setAttribute("updated", format(new Date(), 'yyyyMMddHHmmss'));
+            nodeElement.setAttribute("updated", formatDate(new Date(), 'yyyyMMddHHmmss'));
             updateTransaction(protyle, id, nodeElement.outerHTML, oldHTML);
             focusByWbr(nodeElement, protyle.toolbar.range);
         }
@@ -1429,7 +1429,7 @@ const genImageWidthMenu = (label: string, assetElement: HTMLElement, imgElement:
         iconHTML: "",
         label,
         click() {
-            nodeElement.setAttribute("updated", format(new Date(), 'yyyyMMddHHmmss'));
+            nodeElement.setAttribute("updated", formatDate(new Date(), 'yyyyMMddHHmmss'));
             if (label === window.siyuan.languages.default) {
                 const isCenter = assetElement.style.display === "block";
                 assetElement.removeAttribute("style");
@@ -1943,4 +1943,4 @@ export const setFold = (protyle: IProtyle, nodeElement: Element, isOpen?: boolea
     // 折叠后，防止滚动条滚动后调用 get 请求 https://github.com/siyuan-note/siyuan/issues/2248
     preventScroll(protyle);
     return fold;
-};
\ No newline at end of file
+};
diff --git a/app/src/protyle/gutter/index.ts b/app/src/protyle/gutter/index.ts
index 884b058153..5e25f0ae4c 100644
--- a/app/src/protyle/gutter/index.ts
+++ b/app/src/protyle/gutter/index.ts
@@ -26,6 +26,7 @@ import {blockRender} from "../render/blockRender";
 import {removeEmbed} from "../wysiwyg/removeEmbed";
 import {getContenteditableElement, getTopAloneElement, isNotEditBlock} from "../wysiwyg/getBlock";
 // import * as dayjs from "dayjs";
+import {formatDate} from "sofill/mid";
 import { parseNumber2FormatString } from "../../sillot/util/date";
 import {fetchPost, fetchSyncPost} from "../../util/fetch";
 import {cancelSB, genEmptyElement, insertEmptyBlock, jumpToParentNext} from "../../block/util";
@@ -231,7 +232,7 @@ export class Gutter {
                     const avID = blockElement.getAttribute("data-av-id");
                     const srcIDs = [Lute.NewNodeID()];
                     const previousID = event.altKey ? (rowElement.previousElementSibling.getAttribute("data-id") || "") : buttonElement.dataset.rowId;
-                    const newUpdated = format(new Date(), 'yyyyMMddHHmmss');
+                    const newUpdated = formatDate(new Date(), 'yyyyMMddHHmmss');
                     transaction(protyle, [{
                         action: "insertAttrViewBlock",
                         avID,
@@ -843,7 +844,7 @@ export class Gutter {
                     }, {
                         action: "doUpdateUpdated",
                         id: listItemElement.dataset.blockId,
-                        data: format(new Date(), 'yyyyMMddHHmmss'),
+                        data: formatDate(new Date(), 'yyyyMMddHHmmss'),
                     }], [{
                         action: "removeAttrViewBlock",
                         srcIDs: sourceIds,
@@ -1334,7 +1335,7 @@ export class Gutter {
                         }, {
                             action: "doUpdateUpdated",
                             id: listItemElement.dataset.blockId,
-                            data: format(new Date(), 'yyyyMMddHHmmss'),
+                            data: formatDate(new Date(), 'yyyyMMddHHmmss'),
                         }], [{
                             action: "removeAttrViewBlock",
                             srcIDs: sourceIds,
diff --git a/app/src/protyle/header/Title.ts b/app/src/protyle/header/Title.ts
index a63ad6c330..1dedb83d20 100644
--- a/app/src/protyle/header/Title.ts
+++ b/app/src/protyle/header/Title.ts
@@ -13,7 +13,7 @@ import {Constants} from "../../constants";
 import {matchHotKey} from "../util/hotKey";
 import {isMac, readText, writeText} from "../util/compatibility";
 // import * as dayjs from "dayjs";
-import {format,parse} from "date-fns";
+import {formatDate,parseDate} from "sofill/mid";
 import {setPanelFocus} from "../../layout/util";
 import {openFileById, updatePanelByEditor} from "../../editor/util";
 import {setTitle} from "../../dialog/processSystem";
@@ -309,7 +309,7 @@ export class Title {
             this.element.querySelector(".protyle-attr").insertAdjacentHTML("beforeend", `<div class="protyle-attr--refcount popover__block" data-defids='${JSON.stringify([protyle.block.rootID])}' data-id='${JSON.stringify(response.data.refIDs)}'>${response.data.refCount}</div>`);
         }
         // 存在设置新建文档名模板，不能使用 Untitled 进行判断，https://ld246.com/article/1649301009888
-        if (new Date().getTime() - parse(response.data.id.split("-")[0],"yyyyMMdd",new Date()).getTime() < 2000) {
+        if (new Date().getTime() - parseDate(response.data.id.split("-")[0],"yyyyMMdd",new Date()).getTime() < 2000) {
             const range = this.editElement.ownerDocument.createRange();
             range.selectNodeContents(this.editElement);
             focusByRange(range);
diff --git a/app/src/protyle/header/openTitleMenu.ts b/app/src/protyle/header/openTitleMenu.ts
index 74259aeb06..786214b234 100644
--- a/app/src/protyle/header/openTitleMenu.ts
+++ b/app/src/protyle/header/openTitleMenu.ts
@@ -19,7 +19,7 @@ import {viewCards} from "../../card/viewCards";
 import {getDisplayName, getNotebookName, pathPosix, showFileInFolder} from "../../util/pathName";
 import {makeCard, quickMakeCard} from "../../card/makeCard";
 import {emitOpenMenu} from "../../plugin/EventBus";
-import {format} from "date-fns";
+import {formatDate} from "sofill/mid";
 import {hideTooltip} from "../../dialog/tooltip";
 import {popSearch} from "../../mobile/menu/search";
 import {openSearch} from "../../search/spread";
@@ -69,7 +69,7 @@ export const openTitleMenu = (protyle: IProtyle, position: IPosition) => {
                         }, {
                             action: "doUpdateUpdated",
                             id: listItemElement.dataset.nodeId,
-                            data: format(new Date(), 'yyyyMMddHHmmss'),
+                            data: formatDate(new Date(), 'yyyyMMddHHmmss'),
                         }], [{
                             action: "removeAttrViewBlock",
                             srcIDs: sourceIds,
diff --git a/app/src/protyle/render/av/action.ts b/app/src/protyle/render/av/action.ts
index 48383cfebc..3f80623649 100644
--- a/app/src/protyle/render/av/action.ts
+++ b/app/src/protyle/render/av/action.ts
@@ -29,7 +29,7 @@ import {openAsset, openBy} from "../../../editor/util";
 import {getSearch} from "../../../util/functions";
 import {unicode2Emoji} from "../../../emoji";
 import {selectRow} from "./row";
-import {format} from "date-fns";
+import {formatDate} from "sofill/mid";
 import {openCalcMenu} from "./calc";
 import {avRender} from "./render";
 import {addView, openViewMenu} from "./view";
@@ -414,7 +414,7 @@ export const updateAVName = (protyle: IProtyle, blockElement: Element) => {
     if (newData === nameElement.dataset.title.trim()) {
         return;
     }
-    const newUpdated = format(new Date(), 'yyyyMMddHHmmss');
+    const newUpdated = formatDate(new Date(), 'yyyyMMddHHmmss');
     transaction(protyle, [{
         action: "setAttrViewName",
         id: avId,
diff --git a/app/src/protyle/render/av/blockAttr.ts b/app/src/protyle/render/av/blockAttr.ts
index 0947610e18..7b95766b3e 100644
--- a/app/src/protyle/render/av/blockAttr.ts
+++ b/app/src/protyle/render/av/blockAttr.ts
@@ -2,7 +2,7 @@ import {fetchPost} from "../../../util/fetch";
 import {addCol, getColIconByType} from "./col";
 import {escapeAttr} from "../../../util/escape";
 // import * as dayjs from "dayjs";
-import {format} from "date-fns";
+import {formatDate} from "sofill/mid";
 import {popTextCell} from "./cell";
 import {hasClosestBlock, hasClosestByClassName} from "../../util/hasClosest";
 import {unicode2Emoji} from "../../../emoji";
@@ -27,10 +27,10 @@ const genAVRollupHTML = (value: IAVCellValue) => {
             break;
         case "date":
             if (value[value.type] && value[value.type].isNotEmpty) {
-                html = format(value[value.type].content, value[value.type].isNotTime ? "yyyy-MM-dd" : "yyyy-MM-dd HH:mm");
+                html = formatDate(value[value.type].content, value[value.type].isNotTime ? "yyyy-MM-dd" : "yyyy-MM-dd HH:mm");
             }
             if (value[value.type] && value[value.type].hasEndDate && value[value.type].isNotEmpty && value[value.type].isNotEmpty2) {
-                html += `<svg class="av__cellicon"><use xlink:href="#iconForward"></use></svg>${format(value[value.type].content2, value[value.type].isNotTime ? "yyyy-MM-dd" : "yyyy-MM-dd HH:mm")}`;
+                html += `<svg class="av__cellicon"><use xlink:href="#iconForward"></use></svg>${formatDate(value[value.type].content2, value[value.type].isNotTime ? "yyyy-MM-dd" : "yyyy-MM-dd HH:mm")}`;
             }
             if (html) {
                 html = `<span class="av__celltext">${html}</span>`;
@@ -79,10 +79,10 @@ export const genAVValueHTML = (value: IAVCellValue) => {
         case "date":
             html = `<span class="av__celltext" data-value='${JSON.stringify(value[value.type])}'>`;
             if (value[value.type] && value[value.type].isNotEmpty) {
-                html += format(new Date(value[value.type].content), value[value.type].isNotTime ? "yyyy-MM-dd" : "yyyy-MM-dd HH:mm");
+                html += formatDate(new Date(value[value.type].content), value[value.type].isNotTime ? "yyyy-MM-dd" : "yyyy-MM-dd HH:mm");
             }
             if (value[value.type] && value[value.type].hasEndDate && value[value.type].isNotEmpty && value[value.type].isNotEmpty2) {
-                html += `<svg class="av__cellicon"><use xlink:href="#iconForward"></use></svg>${format(new Date(value[value.type].content2), value[value.type].isNotTime ? "yyyy-MM-dd" : "yyyy-MM-dd HH:mm")}`;
+                html += `<svg class="av__cellicon"><use xlink:href="#iconForward"></use></svg>${formatDate(new Date(value[value.type].content2), value[value.type].isNotTime ? "yyyy-MM-dd" : "yyyy-MM-dd HH:mm")}`;
             }
             html += "</span>";
             break;
diff --git a/app/src/protyle/render/av/cell.ts b/app/src/protyle/render/av/cell.ts
index 469bc575e4..cadbd565fc 100644
--- a/app/src/protyle/render/av/cell.ts
+++ b/app/src/protyle/render/av/cell.ts
@@ -7,7 +7,7 @@ import {objEquals} from "../../../util/functions";
 import {fetchPost} from "../../../util/fetch";
 import {focusBlock, focusByRange} from "../../util/selection";
 // import * as dayjs from "dayjs";
-import {format} from "date-fns";
+import {formatDate} from "sofill/mid";
 import {unicode2Emoji} from "../../../emoji";
 import {getColIconByType} from "./col";
 import {genAVValueHTML} from "./blockAttr";
@@ -565,7 +565,7 @@ export const updateCellsValue = (protyle: IProtyle, nodeElement: HTMLElement, va
         doOperations.push({
             action: "doUpdateUpdated",
             id,
-            data: format(new Date(), 'yyyyMMddHHmmss'),
+            data: formatDate(new Date(), 'yyyyMMddHHmmss'),
         });
         undoOperations.push({
             action: "doUpdateUpdated",
@@ -624,17 +624,17 @@ export const renderCell = (cellValue: IAVCellValue) => {
         const dataValue = cellValue ? cellValue.date : null;
         text = `<span class="av__celltext" data-value='${JSON.stringify(dataValue)}'>`;
         if (dataValue && dataValue.isNotEmpty) {
-            text += format(dataValue.content, dataValue.isNotTime ? "yyyy-MM-dd" : "yyyy-MM-dd HH:mm");
+            text += formatDate(dataValue.content, dataValue.isNotTime ? "yyyy-MM-dd" : "yyyy-MM-dd HH:mm");
         }
         if (dataValue && dataValue.hasEndDate && dataValue.isNotEmpty && dataValue.isNotEmpty2) {
-            text += `<svg class="av__cellicon"><use xlink:href="#iconForward"></use></svg>${format(dataValue.content2, dataValue.isNotTime ? "yyyy-MM-dd" : "yyyy-MM-dd HH:mm")}`;
+            text += `<svg class="av__cellicon"><use xlink:href="#iconForward"></use></svg>${formatDate(dataValue.content2, dataValue.isNotTime ? "yyyy-MM-dd" : "yyyy-MM-dd HH:mm")}`;
         }
         text += "</span>";
     } else if (["created", "updated"].includes(cellValue.type)) {
         const dataValue = cellValue ? cellValue[cellValue.type as "date"] : null;
         text = `<span class="av__celltext" data-value='${JSON.stringify(dataValue)}'>`;
         if (dataValue && dataValue.isNotEmpty) {
-            text += format(dataValue.content, "yyyy-MM-dd HH:mm");
+            text += formatDate(dataValue.content, "yyyy-MM-dd HH:mm");
         }
         text += "</span>";
     } else if (cellValue.type === "mAsset") {
@@ -698,10 +698,10 @@ const renderRollup = (cellValue: IAVCellValue) => {
     } else if (cellValue.type === "date") {
         const dataValue = cellValue ? cellValue.date : null;
         if (dataValue && dataValue.isNotEmpty) {
-            text += format(dataValue.content, dataValue.isNotTime ? "yyyy-MM-dd" : "yyyy-MM-dd HH:mm");
+            text += formatDate(dataValue.content, dataValue.isNotTime ? "yyyy-MM-dd" : "yyyy-MM-dd HH:mm");
         }
         if (dataValue && dataValue.hasEndDate && dataValue.isNotEmpty && dataValue.isNotEmpty2) {
-            text += `<svg class="av__cellicon"><use xlink:href="#iconForward"></use></svg>${format(dataValue.content2, dataValue.isNotTime ? "yyyy-MM-dd" : "yyyy-MM-dd HH:mm")}`;
+            text += `<svg class="av__cellicon"><use xlink:href="#iconForward"></use></svg>${formatDate(dataValue.content2, dataValue.isNotTime ? "yyyy-MM-dd" : "yyyy-MM-dd HH:mm")}`;
         }
         if (text) {
             text = `<span class="av__celltext">${text}</span>`;
diff --git a/app/src/protyle/render/av/col.ts b/app/src/protyle/render/av/col.ts
index 0707f1589e..8af08e5008 100644
--- a/app/src/protyle/render/av/col.ts
+++ b/app/src/protyle/render/av/col.ts
@@ -12,7 +12,7 @@ import {toggleUpdateRelationBtn} from "./relation";
 import {bindRollupData, getRollupHTML} from "./rollup";
 import {Constants} from "../../../constants";
 // import * as dayjs from "dayjs";
-import {format} from "date-fns";
+import {formatDate} from "sofill/mid";
 
 export const duplicateCol = (options: {
     protyle: IProtyle,
@@ -31,7 +31,7 @@ export const duplicateCol = (options: {
     } else {
         options.newValue = `${options.newValue} (1)`;
     }
-    const newUpdated = format(new Date(), 'yyyyMMddHHmmss');
+    const newUpdated = formatDate(new Date(), 'yyyyMMddHHmmss');
     const blockId = options.blockElement.getAttribute("data-node-id");
     if (["select", "mSelect", "rollup"].includes(options.type)) {
         fetchPost("/api/av/renderAttributeView", {
@@ -789,7 +789,7 @@ export const showColMenu = (protyle: IProtyle, blockElement: Element, cellElemen
             icon: "iconTrashcan",
             label: window.siyuan.languages.delete,
             click() {
-                const newUpdated = format(new Date(), 'yyyyMMddHHmmss');
+                const newUpdated = formatDate(new Date(), 'yyyyMMddHHmmss');
                 transaction(protyle, [{
                     action: "removeAttrViewCol",
                     id: colId,
@@ -871,7 +871,7 @@ export const addCol = (protyle: IProtyle, blockElement: Element, previousID?: st
         label: window.siyuan.languages.text,
         click() {
             const id = Lute.NewNodeID();
-            const newUpdated = format(new Date(), 'yyyyMMddHHmmss');
+            const newUpdated = formatDate(new Date(), 'yyyyMMddHHmmss');
             transaction(protyle, [{
                 action: "addAttrViewCol",
                 name: window.siyuan.languages.text,
@@ -908,7 +908,7 @@ export const addCol = (protyle: IProtyle, blockElement: Element, previousID?: st
         label: window.siyuan.languages.number,
         click() {
             const id = Lute.NewNodeID();
-            const newUpdated = format(new Date(), 'yyyyMMddHHmmss');
+            const newUpdated = formatDate(new Date(), 'yyyyMMddHHmmss');
             transaction(protyle, [{
                 action: "addAttrViewCol",
                 name: window.siyuan.languages.number,
@@ -945,7 +945,7 @@ export const addCol = (protyle: IProtyle, blockElement: Element, previousID?: st
         label: window.siyuan.languages.select,
         click() {
             const id = Lute.NewNodeID();
-            const newUpdated = format(new Date(), 'yyyyMMddHHmmss');
+            const newUpdated = formatDate(new Date(), 'yyyyMMddHHmmss');
             transaction(protyle, [{
                 action: "addAttrViewCol",
                 name: window.siyuan.languages.select,
@@ -982,7 +982,7 @@ export const addCol = (protyle: IProtyle, blockElement: Element, previousID?: st
         label: window.siyuan.languages.multiSelect,
         click() {
             const id = Lute.NewNodeID();
-            const newUpdated = format(new Date(), 'yyyyMMddHHmmss');
+            const newUpdated = formatDate(new Date(), 'yyyyMMddHHmmss');
             transaction(protyle, [{
                 action: "addAttrViewCol",
                 name: window.siyuan.languages.multiSelect,
@@ -1019,7 +1019,7 @@ export const addCol = (protyle: IProtyle, blockElement: Element, previousID?: st
         label: window.siyuan.languages.date,
         click() {
             const id = Lute.NewNodeID();
-            const newUpdated = format(new Date(), 'yyyyMMddHHmmss');
+            const newUpdated = formatDate(new Date(), 'yyyyMMddHHmmss');
             transaction(protyle, [{
                 action: "addAttrViewCol",
                 name: window.siyuan.languages.date,
@@ -1056,7 +1056,7 @@ export const addCol = (protyle: IProtyle, blockElement: Element, previousID?: st
         label: window.siyuan.languages.assets,
         click() {
             const id = Lute.NewNodeID();
-            const newUpdated = format(new Date(), 'yyyyMMddHHmmss');
+            const newUpdated = formatDate(new Date(), 'yyyyMMddHHmmss');
             transaction(protyle, [{
                 action: "addAttrViewCol",
                 name: window.siyuan.languages.assets,
@@ -1093,7 +1093,7 @@ export const addCol = (protyle: IProtyle, blockElement: Element, previousID?: st
         label: window.siyuan.languages.checkbox,
         click() {
             const id = Lute.NewNodeID();
-            const newUpdated = format(new Date(), 'yyyyMMddHHmmss');
+            const newUpdated = formatDate(new Date(), 'yyyyMMddHHmmss');
             transaction(protyle, [{
                 action: "addAttrViewCol",
                 name: window.siyuan.languages.checkbox,
@@ -1130,7 +1130,7 @@ export const addCol = (protyle: IProtyle, blockElement: Element, previousID?: st
         label: window.siyuan.languages.link,
         click() {
             const id = Lute.NewNodeID();
-            const newUpdated = format(new Date(), 'yyyyMMddHHmmss');
+            const newUpdated = formatDate(new Date(), 'yyyyMMddHHmmss');
             transaction(protyle, [{
                 action: "addAttrViewCol",
                 name: window.siyuan.languages.link,
@@ -1167,7 +1167,7 @@ export const addCol = (protyle: IProtyle, blockElement: Element, previousID?: st
         label: window.siyuan.languages.email,
         click() {
             const id = Lute.NewNodeID();
-            const newUpdated = format(new Date(), 'yyyyMMddHHmmss');
+            const newUpdated = formatDate(new Date(), 'yyyyMMddHHmmss');
             transaction(protyle, [{
                 action: "addAttrViewCol",
                 name: window.siyuan.languages.email,
@@ -1204,7 +1204,7 @@ export const addCol = (protyle: IProtyle, blockElement: Element, previousID?: st
         label: window.siyuan.languages.phone,
         click() {
             const id = Lute.NewNodeID();
-            const newUpdated = format(new Date(), 'yyyyMMddHHmmss');
+            const newUpdated = formatDate(new Date(), 'yyyyMMddHHmmss');
             transaction(protyle, [{
                 action: "addAttrViewCol",
                 name: window.siyuan.languages.phone,
@@ -1241,7 +1241,7 @@ export const addCol = (protyle: IProtyle, blockElement: Element, previousID?: st
         label: window.siyuan.languages.template,
         click() {
             const id = Lute.NewNodeID();
-            const newUpdated = format(new Date(), 'yyyyMMddHHmmss');
+            const newUpdated = formatDate(new Date(), 'yyyyMMddHHmmss');
             transaction(protyle, [{
                 action: "addAttrViewCol",
                 name: window.siyuan.languages.template,
@@ -1278,7 +1278,7 @@ export const addCol = (protyle: IProtyle, blockElement: Element, previousID?: st
         label: window.siyuan.languages.relation,
         click() {
             const id = Lute.NewNodeID();
-            const newUpdated = format(new Date(), 'yyyyMMddHHmmss');
+            const newUpdated = formatDate(new Date(), 'yyyyMMddHHmmss');
             transaction(protyle, [{
                 action: "addAttrViewCol",
                 name: window.siyuan.languages.relation,
@@ -1315,7 +1315,7 @@ export const addCol = (protyle: IProtyle, blockElement: Element, previousID?: st
         label: window.siyuan.languages.rollup,
         click() {
             const id = Lute.NewNodeID();
-            const newUpdated = format(new Date(), 'yyyyMMddHHmmss');
+            const newUpdated = formatDate(new Date(), 'yyyyMMddHHmmss');
             transaction(protyle, [{
                 action: "addAttrViewCol",
                 name: window.siyuan.languages.rollup,
@@ -1352,7 +1352,7 @@ export const addCol = (protyle: IProtyle, blockElement: Element, previousID?: st
         label: window.siyuan.languages.createdTime,
         click() {
             const id = Lute.NewNodeID();
-            const newUpdated = format(new Date(), 'yyyyMMddHHmmss');
+            const newUpdated = formatDate(new Date(), 'yyyyMMddHHmmss');
             transaction(protyle, [{
                 action: "addAttrViewCol",
                 name: window.siyuan.languages.createdTime,
@@ -1389,7 +1389,7 @@ export const addCol = (protyle: IProtyle, blockElement: Element, previousID?: st
         label: window.siyuan.languages.updatedTime,
         click() {
             const id = Lute.NewNodeID();
-            const newUpdated = format(new Date(), 'yyyyMMddHHmmss');
+            const newUpdated = formatDate(new Date(), 'yyyyMMddHHmmss');
             transaction(protyle, [{
                 action: "addAttrViewCol",
                 name: window.siyuan.languages.updatedTime,
diff --git a/app/src/protyle/render/av/date.ts b/app/src/protyle/render/av/date.ts
index d2f908e7e5..094492f35e 100644
--- a/app/src/protyle/render/av/date.ts
+++ b/app/src/protyle/render/av/date.ts
@@ -1,5 +1,5 @@
 // import * as dayjs from "dayjs";
-import {format} from "date-fns";
+import {formatDate} from "sofill/mid";
 import {hasClosestByClassName} from "../../util/hasClosest";
 import {updateCellsValue} from "./cell";
 
@@ -29,20 +29,20 @@ export const getDateHTML = (data: IAVTable, cellElements: HTMLElement[]) => {
     let value = "";
     const currentDate = new Date().getTime();
     if (cellValue?.value?.date?.isNotEmpty) {
-        value = format(new Date(cellValue.value.date.content), isNotTime ? "yyyy-MM-dd" : "yyyy-MM-dd HH:mm");
+        value = formatDate(new Date(cellValue.value.date.content), isNotTime ? "yyyy-MM-dd" : "yyyy-MM-dd HH:mm");
     } else {
-        value = format(currentDate, isNotTime ? "yyyy-MM-dd" : "yyyy-MM-dd HH:mm");
+        value = formatDate(currentDate, isNotTime ? "yyyy-MM-dd" : "yyyy-MM-dd HH:mm");
     }
     let value2 = "";
     if (cellValue?.value?.date?.isNotEmpty2) {
-        value2 = format(new Date(cellValue.value.date.content2), isNotTime ? "yyyy-MM-dd" : "yyyy-MM-dd HH:mm");
+        value2 = formatDate(new Date(cellValue.value.date.content2), isNotTime ? "yyyy-MM-dd" : "yyyy-MM-dd HH:mm");
     } else if (hasEndDate) {
-        value2 = format(currentDate, isNotTime ? "yyyy-MM-dd" : "yyyy-MM-dd HH:mm");
+        value2 = formatDate(currentDate, isNotTime ? "yyyy-MM-dd" : "yyyy-MM-dd HH:mm");
     }
     return `<div class="b3-menu__items">
 <div>
-    <input type="${isNotTime ? "date" : "datetime-local"}" max="${isNotTime ? "9999-12-31" : "9999-12-31 23:59"}" value="${value}" data-value="${format(new Date(cellValue?.value?.date?.content || currentDate), "yyyy-MM-dd HH:mm")}" class="b3-text-field fn__size200" style="margin-top: 4px;"><br>
-    <input type="${isNotTime ? "date" : "datetime-local"}" max="${isNotTime ? "9999-12-31" : "9999-12-31 23:59"}" value="${value2}" data-value="${cellValue?.value?.date?.isNotEmpty2 ? format(new Date(cellValue.value.date.content2), "yyyy-MM-dd HH:mm") : ""}" style="margin-top: 8px;margin-bottom: 4px" class="b3-text-field fn__size200${hasEndDate ? "" : " fn__none"}">
+    <input type="${isNotTime ? "date" : "datetime-local"}" max="${isNotTime ? "9999-12-31" : "9999-12-31 23:59"}" value="${value}" data-value="${formatDate(new Date(cellValue?.value?.date?.content || currentDate), "yyyy-MM-dd HH:mm")}" class="b3-text-field fn__size200" style="margin-top: 4px;"><br>
+    <input type="${isNotTime ? "date" : "datetime-local"}" max="${isNotTime ? "9999-12-31" : "9999-12-31 23:59"}" value="${value2}" data-value="${cellValue?.value?.date?.isNotEmpty2 ? formatDate(new Date(cellValue.value.date.content2), "yyyy-MM-dd HH:mm") : ""}" style="margin-top: 8px;margin-bottom: 4px" class="b3-text-field fn__size200${hasEndDate ? "" : " fn__none"}">
     <button class="b3-menu__separator"></button>
     <label class="b3-menu__item">
         <span class="fn__flex-center">${window.siyuan.languages.endDate}</span>
@@ -81,8 +81,8 @@ export const bindDateEvent = (options: {
         if (inputElements[2].checked) {
             if (!inputElements[1].dataset.value) {
                 const currentDate = new Date().getTime();
-                inputElements[1].dataset.value = format(currentDate, "yyyy-MM-dd HH:mm");
-                inputElements[1].value = format(currentDate, inputElements[3].checked ? "yyyy-MM-dd HH:mm" : "yyyy-MM-dd");
+                inputElements[1].dataset.value = formatDate(currentDate, "yyyy-MM-dd HH:mm");
+                inputElements[1].value = formatDate(currentDate, inputElements[3].checked ? "yyyy-MM-dd HH:mm" : "yyyy-MM-dd");
             }
             inputElements[1].classList.remove("fn__none");
         } else {
diff --git a/app/src/protyle/render/av/filter.ts b/app/src/protyle/render/av/filter.ts
index 0c49952d6b..e25830e2b4 100644
--- a/app/src/protyle/render/av/filter.ts
+++ b/app/src/protyle/render/av/filter.ts
@@ -6,7 +6,7 @@ import {setPosition} from "../../../util/setPosition";
 import {objEquals} from "../../../util/functions";
 import {genCellValue} from "./cell";
 // import * as dayjs from "dayjs";
-import {format} from "date-fns";
+import {formatDate} from "sofill/mid";
 import {unicode2Emoji} from "../../../emoji";
 import {openMenuPanel} from "./openMenuPanel";
 import {fetchSyncPost} from "../../../util/fetch";
@@ -374,7 +374,7 @@ export const setFilter = async (options: {
     </div>
     <div class="fn__hr"></div>
     <div class="fn__size200 ${options.filter.relativeDate ? "fn__none" : ""}">
-        <input value="${(dateValue && (dateValue.isNotEmpty || filterValue.type !== "date")) ? format(new Date(dateValue.content), "yyyy-MM-dd") : ""}" type="date" max="9999-12-31" class="b3-text-field fn__block">
+        <input value="${(dateValue && (dateValue.isNotEmpty || filterValue.type !== "date")) ? formatDate(new Date(dateValue.content), "yyyy-MM-dd") : ""}" type="date" max="9999-12-31" class="b3-text-field fn__block">
     </div>
     <div class="fn__flex fn__size200 ${options.filter.relativeDate ? "" : "fn__none"}">
         <select class="b3-select" data-type="dataDirection">
@@ -397,7 +397,7 @@ export const setFilter = async (options: {
 <div data-type="filter2 fn__none">
     <div class="fn__hr--small"></div>
     <div class="fn__size200 ${options.filter.relativeDate2 ? "fn__none" : ""}">
-        <input value="${(dateValue && dateValue.isNotEmpty2) ? format(new Date(dateValue.content2), "yyyy-MM-dd") : ""}" type="date" max="9999-12-31" class="b3-text-field fn__block">
+        <input value="${(dateValue && dateValue.isNotEmpty2) ? formatDate(new Date(dateValue.content2), "yyyy-MM-dd") : ""}" type="date" max="9999-12-31" class="b3-text-field fn__block">
     </div>
     <div class="fn__flex fn__size200 ${options.filter.relativeDate2 ? "" : "fn__none"}">
         <select class="b3-select" data-type="dataDirection">
@@ -587,8 +587,8 @@ export const getFiltersHTML = (data: IAVTable) => {
  ${window.siyuan.languages[["day", "week", "month", "year"][filter.relativeDate2.unit]]}`;
                         }
                     } else if (filterValue && filterValue[filterValue.type as "date"]?.content) {
-                        dateValue = format(filterValue[filterValue.type as "date"].content, "yyyy-MM-dd");
-                        dateValue2 = format(filterValue[filterValue.type as "date"].content2, "yyyy-MM-dd");
+                        dateValue = formatDate(filterValue[filterValue.type as "date"].content, "yyyy-MM-dd");
+                        dateValue2 = formatDate(filterValue[filterValue.type as "date"].content2, "yyyy-MM-dd");
                     }
                     if (dateValue) {
                         if (filter.operator === "Is between") {
diff --git a/app/src/protyle/render/av/openMenuPanel.ts b/app/src/protyle/render/av/openMenuPanel.ts
index fc5fcd59c0..9d544cb5fc 100644
--- a/app/src/protyle/render/av/openMenuPanel.ts
+++ b/app/src/protyle/render/av/openMenuPanel.ts
@@ -31,7 +31,7 @@ import {bindRollupData, getRollupHTML, goSearchRollupCol} from "./rollup";
 import {updateCellsValue} from "./cell";
 import {openCalcMenu} from "./calc";
 // import * as dayjs from "dayjs";
-import {format} from "date-fns";
+import {formatDate} from "sofill/mid";
 
 export const openMenuPanel = (options: {
     protyle: IProtyle,
@@ -1034,7 +1034,7 @@ export const openMenuPanel = (options: {
                             return true;
                         }
                     });
-                    const newUpdated = format(new Date(), 'yyyyMMddHHmmss');
+                    const newUpdated = formatDate(new Date(), 'yyyyMMddHHmmss');
                     transaction(options.protyle, [{
                         action: "removeAttrViewCol",
                         id: colId,
diff --git a/app/src/protyle/render/av/render.ts b/app/src/protyle/render/av/render.ts
index f3158abaf4..bb515c31fa 100644
--- a/app/src/protyle/render/av/render.ts
+++ b/app/src/protyle/render/av/render.ts
@@ -10,7 +10,7 @@ import {getCalcValue} from "./calc";
 import {renderAVAttribute} from "./blockAttr";
 import {showMessage} from "../../../dialog/message";
 import {addClearButton} from "../../../util/addClearButton";
-import {format} from "date-fns";
+import {formatDate} from "sofill/mid";
 
 export const avRender = (element: Element, protyle: IProtyle, cb?: () => void, viewID?: string) => {
     let avElements: Element[] = [];
diff --git a/app/src/protyle/render/av/row.ts b/app/src/protyle/render/av/row.ts
index 647b0ff6b2..1034d6c66f 100644
--- a/app/src/protyle/render/av/row.ts
+++ b/app/src/protyle/render/av/row.ts
@@ -6,7 +6,7 @@ import {genCellValueByElement, getTypeByCellElement, popTextCell, renderCell, re
 import {fetchPost} from "../../../util/fetch";
 import {showMessage} from "../../../dialog/message";
 // import * as dayjs from "dayjs";
-import {format} from "date-fns";
+import {formatDate} from "sofill/mid";
 
 export const selectRow = (checkElement: Element, type: "toggle" | "select" | "unselect" | "unselectAll") => {
     const rowElement = hasClosestByClassName(checkElement, "av__row");
@@ -329,7 +329,7 @@ export const deleteRow = (blockElement: HTMLElement, protyle: IProtyle) => {
             blockID: blockElement.dataset.nodeId
         });
     });
-    const newUpdated = format(new Date(), 'yyyyMMddHHmmss');
+    const newUpdated = formatDate(new Date(), 'yyyyMMddHHmmss');
     undoOperations.push({
         action: "doUpdateUpdated",
         id: blockElement.dataset.nodeId,
@@ -358,7 +358,7 @@ export const insertRows = (blockElement: HTMLElement, protyle: IProtyle, count:
     new Array(count).fill(0).forEach(() => {
         srcIDs.push(Lute.NewNodeID());
     });
-    const newUpdated = dayjs().format("YYYYMMDDHHmmss");
+    const newUpdated = formatDate(new Date(), 'yyyyMMddHHmmss');
     transaction(protyle, [{
         action: "insertAttrViewBlock",
         avID,
diff --git a/app/src/protyle/toolbar/index.ts b/app/src/protyle/toolbar/index.ts
index 2933a9fcb8..4156d90df4 100644
--- a/app/src/protyle/toolbar/index.ts
+++ b/app/src/protyle/toolbar/index.ts
@@ -34,7 +34,7 @@ import {moveResize} from "../../dialog/moveResize";
 import {fetchPost} from "../../util/fetch";
 import {isArrayEqual, isMobile} from "../../util/functions";
 // import * as dayjs from "dayjs";
-import {format} from "date-fns";
+import {formatDate} from "sofill/mid";
 import {insertEmptyBlock} from "../../block/util";
 import {matchHotKey} from "../util/hotKey";
 import {hideElements} from "../ui/hideElements";
@@ -745,7 +745,7 @@ export class Toolbar {
                 this.range.collapse(false);
             }
         }
-        nodeElement.setAttribute("updated", format(new Date(), 'yyyyMMddHHmmss'));
+        nodeElement.setAttribute("updated", formatDate(new Date(), 'yyyyMMddHHmmss'));
         updateTransaction(protyle, nodeElement.getAttribute("data-node-id"), nodeElement.outerHTML, html);
         const wbrElement = nodeElement.querySelector("wbr");
         if (wbrElement) {
@@ -1105,7 +1105,7 @@ export class Toolbar {
                 nodeElement.querySelector("wbr")?.remove();
             }
 
-            nodeElement.setAttribute("updated", format(new Date(), 'yyyyMMddHHmmss'));
+            nodeElement.setAttribute("updated", formatDate(new Date(), 'yyyyMMddHHmmss'));
             // HTML 块中包含多个 <pre> 时只能保存第一个 https://github.com/siyuan-note/siyuan/issues/5732
             if (types.includes("NodeHTMLBlock")) {
                 const tempElement = document.createElement("template");
@@ -1159,7 +1159,7 @@ export class Toolbar {
             editElement.removeAttribute("data-render");
             highlightRender(nodeElement);
         }
-        nodeElement.setAttribute("updated", dayjs().format("YYYYMMDDHHmmss"));
+        nodeElement.setAttribute("updated", formatDate(new Date(), 'yyyyMMddHHmmss'));
         updateTransaction(protyle, id, nodeElement.outerHTML, oldHtml);
         this.subElement.classList.add("fn__none");
         focusByRange(this.range);
diff --git a/app/src/protyle/util/editorCommonEvent.ts b/app/src/protyle/util/editorCommonEvent.ts
index f926fcc5e7..2c212cc8cc 100644
--- a/app/src/protyle/util/editorCommonEvent.ts
+++ b/app/src/protyle/util/editorCommonEvent.ts
@@ -28,7 +28,7 @@ import {hideElements} from "../ui/hideElements";
 import {insertAttrViewBlockAnimation} from "../render/av/row";
 import {dragUpload} from "../render/av/asset";
 // import * as dayjs from "dayjs";
-import {format} from "date-fns";
+import {formatDate} from "sofill/mid";
 
 const moveToNew = (protyle: IProtyle, sourceElements: Element[], targetElement: Element, newSourceElement: Element,
                    isSameDoc: boolean, isBottom: boolean, isCopy: boolean) => {
@@ -892,7 +892,7 @@ export const dropEvent = (protyle: IProtyle, editorElement: HTMLElement) => {
                             });
                             transaction(protyle, doOperations, undoOperations);
                         } else {
-                            const newUpdated = format(new Date(), 'yyyyMMddHHmmss');
+                            const newUpdated = formatDate(new Date(), 'yyyyMMddHHmmss');
                             transaction(protyle, [{
                                 action: "insertAttrViewBlock",
                                 avID,
@@ -963,7 +963,7 @@ export const dropEvent = (protyle: IProtyle, editorElement: HTMLElement) => {
                         previousID = targetElement.previousElementSibling?.getAttribute("data-id") || "";
                     }
                     const avID = blockElement.getAttribute("data-av-id");
-                    const newUpdated = format(new Date(), 'yyyyMMddHHmmss');
+                    const newUpdated = formatDate(new Date(), 'yyyyMMddHHmmss');
                     transaction(protyle, [{
                         action: "insertAttrViewBlock",
                         avID,
diff --git a/app/src/protyle/util/insertHTML.ts b/app/src/protyle/util/insertHTML.ts
index 71aa4bf56d..4566e8389d 100644
--- a/app/src/protyle/util/insertHTML.ts
+++ b/app/src/protyle/util/insertHTML.ts
@@ -1,6 +1,6 @@
 import {hasClosestBlock, hasClosestByAttribute, hasClosestByClassName, hasClosestByMatchTag} from "./hasClosest";
 // import * as dayjs from "dayjs";
-import {format} from "date-fns";
+import {formatDate} from "sofill/mid";
 import {transaction, updateTransaction} from "../wysiwyg/transaction";
 import {getContenteditableElement} from "../wysiwyg/getBlock";
 import {fixTableRange, focusBlock, focusByWbr, getEditorRange} from "./selection";
@@ -112,7 +112,7 @@ const processAV = (range: Range, html: string, protyle: IProtyle, blockElement:
             doOperations.push({
                 action: "doUpdateUpdated",
                 id,
-                data: format(new Date(), 'yyyyMMddHHmmss'),
+                data: formatDate(new Date(), 'yyyyMMddHHmmss'),
             });
             undoOperations.push({
                 action: "doUpdateUpdated",
@@ -187,7 +187,7 @@ export const insertHTML = (html: string, protyle: IProtyle, isBlock = false,
         } else {
             focusByWbr(blockElement, range);
         }
-        blockElement.setAttribute("updated", format(new Date(), 'yyyyMMddHHmmss'));
+        blockElement.setAttribute("updated", formatDate(new Date(), 'yyyyMMddHHmmss'));
         updateTransaction(protyle, id, blockElement.outerHTML, oldHTML);
         setTimeout(() => {
             scrollCenter(protyle, blockElement, false, "smooth");
@@ -302,7 +302,7 @@ export const insertHTML = (html: string, protyle: IProtyle, isBlock = false,
                 liElement.setAttribute("data-subtype", item.getAttribute("data-subtype"));
                 liElement.setAttribute("data-node-id", addId);
                 liElement.setAttribute("data-type", "NodeList");
-                liElement.setAttribute("updated", format(new Date(), 'yyyyMMddHHmmss'));
+                liElement.setAttribute("updated", formatDate(new Date(), 'yyyyMMddHHmmss'));
                 liElement.classList.add("list");
                 liElement.append(item);
                 item = liElement;
diff --git a/app/src/protyle/wysiwyg/commonHotkey.ts b/app/src/protyle/wysiwyg/commonHotkey.ts
index 3d01679a4a..b3ebd94b74 100644
--- a/app/src/protyle/wysiwyg/commonHotkey.ts
+++ b/app/src/protyle/wysiwyg/commonHotkey.ts
@@ -16,7 +16,7 @@ import {onGet} from "../util/onGet";
 import {Constants} from "../../constants";
 // import * as dayjs from "dayjs";
 import {net2LocalAssets} from "../breadcrumb/action";
-import {format} from "date-fns";
+import {formatDate} from "sofill/mid";
 
 export const commonHotkey = (protyle: IProtyle, event: KeyboardEvent, nodeElement?: HTMLElement) => {
     if (matchHotKey(window.siyuan.config.keymap.editor.general.copyHPath.custom, event)) {
@@ -261,7 +261,7 @@ export const goEnd = (protyle: IProtyle) => {
 };
 
 export const alignImgCenter = (protyle: IProtyle, nodeElement: Element, assetElements: Element[], id: string, html: string) => {
-    nodeElement.setAttribute("updated", format(new Date(), 'yyyyMMddHHmmss'));
+    nodeElement.setAttribute("updated", formatDate(new Date(), 'yyyyMMddHHmmss'));
     assetElements.forEach((item: HTMLElement) => {
         item.style.display = "block";
         let nextSibling = item.nextSibling;
@@ -291,7 +291,7 @@ export const alignImgCenter = (protyle: IProtyle, nodeElement: Element, assetEle
 };
 
 export const alignImgLeft = (protyle: IProtyle, nodeElement: Element, assetElements: Element[], id: string, html: string) => {
-    nodeElement.setAttribute("updated", format(new Date(), 'yyyyMMddHHmmss'));
+    nodeElement.setAttribute("updated", formatDate(new Date(), 'yyyyMMddHHmmss'));
     assetElements.forEach((item: HTMLElement) => {
         item.style.display = "";
         if (!hasNextSibling(item)) {
diff --git a/app/src/protyle/wysiwyg/index.ts b/app/src/protyle/wysiwyg/index.ts
index da71f56c43..aadea2d58a 100644
--- a/app/src/protyle/wysiwyg/index.ts
+++ b/app/src/protyle/wysiwyg/index.ts
@@ -32,7 +32,7 @@ import {
     zoomOut
 } from "../../menus/protyle";
 // import * as dayjs from "dayjs";
-import {format} from "date-fns";
+import {formatDate} from "sofill/mid";
 import {dropEvent} from "../util/editorCommonEvent";
 import {input} from "./input";
 import {
@@ -1456,7 +1456,7 @@ export class WYSIWYG {
                         editableElement.innerHTML = "";
                     }
                 }
-                nodeElement.setAttribute("updated", format(new Date(), 'yyyyMMddHHmmss'));
+                nodeElement.setAttribute("updated", formatDate(new Date(), 'yyyyMMddHHmmss'));
                 if (nodeElement.getAttribute("data-type") === "NodeCodeBlock") {
                     range.insertNode(document.createElement("wbr"));
                     getContenteditableElement(nodeElement).removeAttribute("data-render");
@@ -2350,7 +2350,7 @@ if  (tableElement && tableElement.isSameNode(item) && item.querySelector(".table
                                     actionElement.querySelector("use").setAttribute("xlink:href", "#iconCheck");
                                     actionElement.parentElement.classList.add("protyle-task--done");
                                 }
-                                actionElement.parentElement.setAttribute("updated", format(new Date(), 'yyyyMMddHHmmss'));
+                                actionElement.parentElement.setAttribute("updated", formatDate(new Date(), 'yyyyMMddHHmmss'));
                                 updateTransaction(protyle, actionId, actionElement.parentElement.outerHTML, html);
                             }
                         } else if (window.siyuan.config.editor.listItemDotNumberClickFocus) {
diff --git a/app/src/protyle/wysiwyg/input.ts b/app/src/protyle/wysiwyg/input.ts
index aec8e275cc..5febf636a2 100644
--- a/app/src/protyle/wysiwyg/input.ts
+++ b/app/src/protyle/wysiwyg/input.ts
@@ -2,7 +2,7 @@ import {log} from "../util/log";
 import {focusBlock, focusByWbr} from "../util/selection";
 import {Constants} from "../../constants";
 // import * as dayjs from "dayjs";
-import {format} from "date-fns";
+import {formatDate} from "sofill/mid";
 import {transaction, updateTransaction} from "./transaction";
 import {mathRender} from "../render/mathRender";
 import {highlightRender} from "../render/highlightRender";
@@ -46,7 +46,7 @@ export const input = async (protyle: IProtyle, blockElement: HTMLElement, range:
         focusByWbr(blockElement, range);
         return;
     }
-    blockElement.setAttribute("updated", format(new Date(), 'yyyyMMddHHmmss'));
+    blockElement.setAttribute("updated", formatDate(new Date(), 'yyyyMMddHHmmss'));
     const wbrElement = document.createElement("wbr");
     range.insertNode(wbrElement);
     const id = blockElement.getAttribute("data-node-id");
diff --git a/app/src/protyle/wysiwyg/keydown.ts b/app/src/protyle/wysiwyg/keydown.ts
index 528bcb7020..2619b2accd 100644
--- a/app/src/protyle/wysiwyg/keydown.ts
+++ b/app/src/protyle/wysiwyg/keydown.ts
@@ -58,7 +58,7 @@ import {fetchPost} from "../../util/fetch";
 import {scrollCenter} from "../../util/highlightById";
 import {BlockPanel} from "../../block/Panel";
 // import * as dayjs from "dayjs";
-import {format} from "date-fns";
+import {formatDate} from "sofill/mid";
 import {highlightRender} from "../render/highlightRender";
 import {countBlockWord} from "../../layout/status";
 import {moveToDown, moveToUp} from "./move";
@@ -1327,7 +1327,7 @@ export const keydown = (protyle: IProtyle, editorElement: HTMLElement) => {
                 taskItemElement.querySelector("use").setAttribute("xlink:href", "#iconCheck");
                 taskItemElement.classList.add("protyle-task--done");
             }
-            taskItemElement.setAttribute("updated", format(new Date(), 'yyyyMMddHHmmss'));
+            taskItemElement.setAttribute("updated", formatDate(new Date(), 'yyyyMMddHHmmss'));
             updateTransaction(protyle, taskItemElement.getAttribute("data-node-id"), taskItemElement.outerHTML, html);
             event.preventDefault();
             event.stopPropagation();
diff --git a/app/src/protyle/wysiwyg/list.ts b/app/src/protyle/wysiwyg/list.ts
index 2dc8a119e2..4ab366cf44 100644
--- a/app/src/protyle/wysiwyg/list.ts
+++ b/app/src/protyle/wysiwyg/list.ts
@@ -2,7 +2,7 @@ import {focusByWbr} from "../util/selection";
 import {transaction, updateTransaction} from "./transaction";
 import {genEmptyBlock} from "../../block/util";
 // import * as dayjs from "dayjs";
-import {format} from "date-fns";
+import {formatDate} from "sofill/mid";
 import {Constants} from "../../constants";
 import {moveToPrevious} from "./remove";
 
@@ -217,7 +217,7 @@ export const breakList = (protyle: IProtyle, blockElement: Element, range: Range
         }
     });
     undoOperations.reverse();
-    newListHTML = `<div data-subtype="${listItemElement.getAttribute("data-subtype")}" data-node-id="${newListId}" data-type="NodeList" class="list" updated="${format(new Date(), 'yyyyMMddHHmmss')}">${newListHTML}<div class="protyle-attr" contenteditable="false">${Constants.ZWSP}</div></div>`;
+    newListHTML = `<div data-subtype="${listItemElement.getAttribute("data-subtype")}" data-node-id="${newListId}" data-type="NodeList" class="list" updated="${formatDate(new Date(), 'yyyyMMddHHmmss')}">${newListHTML}<div class="protyle-attr" contenteditable="false">${Constants.ZWSP}</div></div>`;
     listItemElement.parentElement.insertAdjacentHTML("afterend", newListHTML);
     doOperations.push({
         id: newListId,
@@ -352,7 +352,7 @@ export const listOutdent = (protyle: IProtyle, liItemElements: Element[], range:
                 lastBlockElement.setAttribute("data-subtype", nextElement.getAttribute("data-subtype"));
                 lastBlockElement.setAttribute("data-node-id", newId);
                 lastBlockElement.setAttribute("data-type", "NodeList");
-                lastBlockElement.setAttribute("updated", format(new Date(), 'yyyyMMddHHmmss'));
+                lastBlockElement.setAttribute("updated", formatDate(new Date(), 'yyyyMMddHHmmss'));
                 lastBlockElement.innerHTML = `<div class="protyle-attr" contenteditable="false">${Constants.ZWSP}</div>`;
                 previousElement.after(lastBlockElement);
                 doOperations.push({
@@ -557,7 +557,7 @@ export const listOutdent = (protyle: IProtyle, liItemElements: Element[], range:
             lastBlockElement.setAttribute("data-subtype", nextElement.getAttribute("data-subtype"));
             lastBlockElement.setAttribute("data-node-id", newId);
             lastBlockElement.setAttribute("data-type", "NodeList");
-            lastBlockElement.setAttribute("updated", format(new Date(), 'yyyyMMddHHmmss'));
+            lastBlockElement.setAttribute("updated", formatDate(new Date(), 'yyyyMMddHHmmss'));
             lastBlockElement.innerHTML = `<div class="protyle-attr" contenteditable="false">${Constants.ZWSP}</div>`;
             doOperations.push({
                 action: "insert",
diff --git a/app/src/protyle/wysiwyg/turnIntoList.ts b/app/src/protyle/wysiwyg/turnIntoList.ts
index 11d8c23fe7..0511983395 100644
--- a/app/src/protyle/wysiwyg/turnIntoList.ts
+++ b/app/src/protyle/wysiwyg/turnIntoList.ts
@@ -1,7 +1,7 @@
 import {transaction, updateTransaction} from "./transaction";
 import {focusByWbr} from "../util/selection";
 // import * as dayjs from "dayjs";
-import {format} from "date-fns";
+import {formatDate} from "sofill/mid";
 
 export const turnIntoTaskList = (protyle: IProtyle, type: string, blockElement: HTMLElement, editElement: HTMLElement, range: Range) => {
     if (type !== "NodeCodeBlock" &&
@@ -22,7 +22,7 @@ export const turnIntoTaskList = (protyle: IProtyle, type: string, blockElement:
                 const liElement = blockElement.parentElement.parentElement;
                 const oldHTML = liElement.outerHTML;
                 liElement.setAttribute("data-subtype", "t");
-                liElement.setAttribute("updated", format(new Date(), 'yyyyMMddHHmmss'));
+                liElement.setAttribute("updated", formatDate(new Date(), 'yyyyMMddHHmmss'));
                 blockElement.parentElement.setAttribute("data-subtype", "t");
                 if (isDone) {
                     blockElement.parentElement.classList.add("protyle-task--done");
diff --git a/app/src/sillot/index.ts b/app/src/sillot/index.ts
index 416e3f9d5e..da843dab62 100644
--- a/app/src/sillot/index.ts
+++ b/app/src/sillot/index.ts
@@ -6,7 +6,7 @@ import { HotToast } from "./react-hot-toast";
 import * as React from "react"; // 兼容性好
 import * as ReactDOM from "react-dom"; // 兼容性好
 import Swal from "sweetalert2";
-import exSout from 'sout/console'
+import {sout} from 'sofill/core'
 import { MusicPlayer } from "./react-music-player";
 import {
   focusBlock,
@@ -18,7 +18,7 @@ import { bS } from "./bridge";
 
 export class SillotEnv {
   constructor() {
-    exSout();
+    window.sout = sout();
     window.Sillot = {
       status: { IDBloaded: false, disableDocSetPadding: false },
       funs: { hljsRender: highlightRender },
diff --git a/kernel/util/working_mobile.go b/kernel/util/working_mobile.go
index 920d917950..c5624d122e 100644
--- a/kernel/util/working_mobile.go
+++ b/kernel/util/working_mobile.go
@@ -61,7 +61,7 @@ func BootMobile(container, appDir, workspaceBaseDir, lang string) {
 	initWorkspaceDirMobile(workspaceBaseDir)
 
 	initPathDir()
-	bootBanner := figure.NewFigure("SiYuan", "", true)
+	bootBanner := figure.NewFigure("Sillot", "", true)
 	logging.LogInfof("\n" + bootBanner.String())
 	logBootInfo()
 }

From 8707ba1a4e675b2e47beec331a92afd422f93efe Mon Sep 17 00:00:00 2001
From: Eduardo Garcia Cebollero <me@egarcia.info>
Date: Fri, 22 Mar 2024 18:35:16 -0600
Subject: [PATCH 66/77] Fix some strings in es_ES translation (#10704)

---
 app/appearance/langs/es_ES.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json
index 53ecf44603..b18f3fd76e 100644
--- a/app/appearance/langs/es_ES.json
+++ b/app/appearance/langs/es_ES.json
@@ -315,7 +315,7 @@
   "apiProviderTip": "Utilice el proveedor de API seleccionado para implementar funciones relacionadas con la IA",
   "skip": "barco",
   "nextRound": "Siguiente ronda",
-  "save": "Ahorrar",
+  "save": "Guardar",
   "ai": "Inteligencia Artificial",
   "aiContinueWrite": "Continuar escribiendo",
   "aiTranslate": "Traducir",
@@ -328,12 +328,12 @@
   "spaceRepetition": "Repetición Espaciada",
   "space": "Espacio",
   "pdfIsLoading": "El PDF se está cargando, inténtalo de nuevo más tarde",
-  "cardShowAnswer": "Afficher la réponse",
+  "cardShowAnswer": "Mostrar la respuesta",
   "cardRatingAgain": "Otra vez",
   "cardRatingHard": "Difícil",
   "cardRatingGood": "Bueno",
   "cardRatingEasy": "Fácil",
-  "addToDeck": "Agregar a la plataforma...",
+  "addToDeck": "Agregar al mazo...",
   "quickMakeCard": "Tarjeta de creación rápida",
   "allAttrs": "Todos los nombres de atributos y valores de atributos",
   "chooseSyncDirection": "Elegir dirección de sincronización",

From 96cba40a00feb07026c0a78336a18fec5aebf0ea Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Sat, 23 Mar 2024 10:00:07 +0800
Subject: [PATCH 67/77] :arrow_up: Upgrade kernel deps

---
 kernel/go.mod | 12 ++++++------
 kernel/go.sum | 27 ++++++++++++++-------------
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/kernel/go.mod b/kernel/go.mod
index f012df9acf..3031c09091 100644
--- a/kernel/go.mod
+++ b/kernel/go.mod
@@ -51,11 +51,11 @@ require (
 	github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06
 	github.com/sashabaranov/go-openai v1.20.2
 	github.com/shirou/gopsutil/v3 v3.24.2
-	github.com/siyuan-note/dejavu v0.0.0-20240312083319-7cf60efe5c66
+	github.com/siyuan-note/dejavu v0.0.0-20240323004223-25eaaad1f650
 	github.com/siyuan-note/encryption v0.0.0-20231219001248-1e028a4d13b4
 	github.com/siyuan-note/eventbus v0.0.0-20240318125243-801c98e8f025
 	github.com/siyuan-note/filelock v0.0.0-20240128091141-94d7bb3e0772
-	github.com/siyuan-note/httpclient v0.0.0-20240312073515-af29be1cfb4e
+	github.com/siyuan-note/httpclient v0.0.0-20240323002956-eaba148a7247
 	github.com/siyuan-note/logging v0.0.0-20231208035918-61f884c854f0
 	github.com/siyuan-note/riff v0.0.0-20240315100323-cc554b704bcc
 	github.com/spf13/cast v1.6.0
@@ -98,7 +98,7 @@ require (
 	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
 	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
 	github.com/golang/glog v1.2.0 // indirect
-	github.com/google/pprof v0.0.0-20240227163752-401108e1b7e7 // indirect
+	github.com/google/pprof v0.0.0-20240320155624-b11c3daa6f07 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/gopherjs/gopherjs v1.17.2 // indirect
 	github.com/gorilla/context v1.1.2 // indirect
@@ -127,14 +127,14 @@ require (
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
 	github.com/olekukonko/tablewriter v0.0.5 // indirect
-	github.com/onsi/ginkgo/v2 v2.16.0 // indirect
+	github.com/onsi/ginkgo/v2 v2.17.0 // indirect
 	github.com/otiai10/gosseract/v2 v2.4.1 // indirect
 	github.com/pelletier/go-toml/v2 v2.1.1 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
 	github.com/qiniu/go-sdk/v7 v7.19.0 // indirect
 	github.com/quic-go/qpack v0.4.0 // indirect
-	github.com/quic-go/quic-go v0.41.0 // indirect
+	github.com/quic-go/quic-go v0.42.0 // indirect
 	github.com/refraction-networking/utls v1.6.3 // indirect
 	github.com/restic/chunker v0.4.0 // indirect
 	github.com/richardlehane/mscfb v1.0.4 // indirect
@@ -156,7 +156,7 @@ require (
 	go.uber.org/mock v0.4.0 // indirect
 	golang.org/x/arch v0.7.0 // indirect
 	golang.org/x/crypto v0.21.0 // indirect
-	golang.org/x/exp v0.0.0-20240314144324-c7f7c6466f7f // indirect
+	golang.org/x/exp v0.0.0-20240318143956-a85f2c67cd81 // indirect
 	golang.org/x/net v0.22.0 // indirect
 	golang.org/x/sync v0.6.0 // indirect
 	golang.org/x/sys v0.18.0 // indirect
diff --git a/kernel/go.sum b/kernel/go.sum
index bd78b078f9..c9fbd23bb9 100644
--- a/kernel/go.sum
+++ b/kernel/go.sum
@@ -166,8 +166,8 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
 github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/pprof v0.0.0-20240227163752-401108e1b7e7 h1:y3N7Bm7Y9/CtpiVkw/ZWj6lSlDF3F74SfKwfTCer72Q=
-github.com/google/pprof v0.0.0-20240227163752-401108e1b7e7/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik=
+github.com/google/pprof v0.0.0-20240320155624-b11c3daa6f07 h1:57oOH2Mu5Nw16KnZAVLdlUjmPH/TSYCKTJgG0OVfX0Y=
+github.com/google/pprof v0.0.0-20240320155624-b11c3daa6f07/go.mod h1:kf6iHlnVGwgKolg33glAes7Yg/8iWP8ukqeldJSO7jw=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -277,8 +277,8 @@ github.com/olahol/melody v1.1.4/go.mod h1:GgkTl6Y7yWj/HtfD48Q5vLKPVoZOH+Qqgfa7Cv
 github.com/olekukonko/tablewriter v0.0.0-20180506121414-d4647c9c7a84/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
 github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
 github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
-github.com/onsi/ginkgo/v2 v2.16.0 h1:7q1w9frJDzninhXxjZd+Y/x54XNjG/UlRLIYPZafsPM=
-github.com/onsi/ginkgo/v2 v2.16.0/go.mod h1:llBI3WDLL9Z6taip6f33H76YcWtJv+7R3HigUjbIBOs=
+github.com/onsi/ginkgo/v2 v2.17.0 h1:kdnunFXpBjbzN56hcJHrXZ8M+LOkenKA7NnBzTNigTI=
+github.com/onsi/ginkgo/v2 v2.17.0/go.mod h1:llBI3WDLL9Z6taip6f33H76YcWtJv+7R3HigUjbIBOs=
 github.com/onsi/gomega v1.31.1 h1:KYppCUK+bUgAZwHOu7EXVBKyQA6ILvOESHkn/tgoqvo=
 github.com/onsi/gomega v1.31.1/go.mod h1:y40C95dwAD1Nz36SsEnxvfFe8FFfNxzI5eJ0EYGyAy0=
 github.com/open-spaced-repetition/go-fsrs v1.2.0 h1:cHCggDk/gEsQGyXybWn1NchrvSSzTknaN1fTpI9ihhI=
@@ -311,8 +311,8 @@ github.com/qiniu/go-sdk/v7 v7.19.0/go.mod h1:nqoYCNo53ZlGA521RvRethvxUDvXKt4gtYX
 github.com/qiniu/x v1.10.5/go.mod h1:03Ni9tj+N2h2aKnAz+6N0Xfl8FwMEDRC2PAlxekASDs=
 github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo=
 github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A=
-github.com/quic-go/quic-go v0.41.0 h1:aD8MmHfgqTURWNJy48IYFg2OnxwHT3JL7ahGs73lb4k=
-github.com/quic-go/quic-go v0.41.0/go.mod h1:qCkNjqczPEvgsOnxZ0eCD14lv+B2LHlFAB++CNOh9hA=
+github.com/quic-go/quic-go v0.42.0 h1:uSfdap0eveIl8KXnipv9K7nlwZ5IqLlYOpJ58u5utpM=
+github.com/quic-go/quic-go v0.42.0/go.mod h1:132kz4kL3F9vxhW3CtQJLDVwcFe5wdWeJXXijhsO57M=
 github.com/radovskyb/watcher v1.0.7 h1:AYePLih6dpmS32vlHfhCeli8127LzkIgwJGcwwe8tUE=
 github.com/radovskyb/watcher v1.0.7/go.mod h1:78okwvY5wPdzcb1UYnip1pvrZNIVEIh/Cm+ZuvsUYIg=
 github.com/refraction-networking/utls v1.6.3 h1:MFOfRN35sSx6K5AZNIoESsBuBxS2LCgRilRIdHb6fDc=
@@ -351,16 +351,16 @@ github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFR
 github.com/shurcooL/gofontwoff v0.0.0-20181114050219-180f79e6909d h1:lvCTyBbr36+tqMccdGMwuEU+hjux/zL6xSmf5S9ITaA=
 github.com/shurcooL/gofontwoff v0.0.0-20181114050219-180f79e6909d/go.mod h1:05UtEgK5zq39gLST6uB0cf3NEHjETfB4Fgr3Gx5R9Vw=
 github.com/simplereach/timeutils v1.2.0/go.mod h1:VVbQDfN/FHRZa1LSqcwo4kNZ62OOyqLLGQKYB3pB0Q8=
-github.com/siyuan-note/dejavu v0.0.0-20240312083319-7cf60efe5c66 h1:9r9Op9nZBHi5IfRQxLoxKOEwajrMVRJCHWQXgt8jsbY=
-github.com/siyuan-note/dejavu v0.0.0-20240312083319-7cf60efe5c66/go.mod h1:lMrCZfigfQNC89yr1UF/PYbFenBQLzSWiWV1TcqUkVY=
+github.com/siyuan-note/dejavu v0.0.0-20240323004223-25eaaad1f650 h1:9JNpROqJ7qI9Gh2uYQBe9bauDzlJdEb7M8cN13D6a20=
+github.com/siyuan-note/dejavu v0.0.0-20240323004223-25eaaad1f650/go.mod h1:KaDNYNjshJqls1vWdoP3CKRTw/3tWssrKMu9CInWu0k=
 github.com/siyuan-note/encryption v0.0.0-20231219001248-1e028a4d13b4 h1:kJaw5L/evyW6LcB9IQT8PR4ppx8JVqOFP9Ix3rfwSrc=
 github.com/siyuan-note/encryption v0.0.0-20231219001248-1e028a4d13b4/go.mod h1:UYcCCY+0wh+GmUoDOaO63j1sV5lgy7laLAk1XhEiUis=
 github.com/siyuan-note/eventbus v0.0.0-20240318125243-801c98e8f025 h1:crQmKw5vZz3MljAP/xKMWY/rksMX634jJK9kcsOIbkw=
 github.com/siyuan-note/eventbus v0.0.0-20240318125243-801c98e8f025/go.mod h1:1/nGgthl89FPA7GzAcEWKl6zRRnfgyTjzLZj9bW7kuw=
 github.com/siyuan-note/filelock v0.0.0-20240128091141-94d7bb3e0772 h1:ceX49LJmN8FMwWpkCkZIV9dHG4Ya2ZMrhu9T6VyDiKs=
 github.com/siyuan-note/filelock v0.0.0-20240128091141-94d7bb3e0772/go.mod h1:CYJQjSyKYLhEJJC+5I+R4uNcpyW0X2CaUYwMVbkelDk=
-github.com/siyuan-note/httpclient v0.0.0-20240312073515-af29be1cfb4e h1:2DeWT+8qGw2mqF03Z7R9gwPJ7WTUqDrQSv5Yo/NxxYA=
-github.com/siyuan-note/httpclient v0.0.0-20240312073515-af29be1cfb4e/go.mod h1:v/O6xcc3HomxJR1dLwENGan9RB08WqSPv4kxyzaTSUI=
+github.com/siyuan-note/httpclient v0.0.0-20240323002956-eaba148a7247 h1:C9El7Df3SWiBNei0ThztkJK/+FmFdIVzJRHz+3ZZ8lo=
+github.com/siyuan-note/httpclient v0.0.0-20240323002956-eaba148a7247/go.mod h1:VBH3FUilz0ERt/R4+RMV8S3B/JBd6GwcFzZ3GLnljFU=
 github.com/siyuan-note/logging v0.0.0-20231208035918-61f884c854f0 h1:+XjUr9UMXsczdO2bGA72p/k9wa2ShPb8ybi7CDBJ7HQ=
 github.com/siyuan-note/logging v0.0.0-20231208035918-61f884c854f0/go.mod h1:6mRFtAAvYPn3cDzqvyv+t8BVPGqpONDMMb5ywOhY1D4=
 github.com/siyuan-note/riff v0.0.0-20240315100323-cc554b704bcc h1:/xkXmPKwQZRnpJYW2WBv0VAGQeRaGN72KUqAZiar60Q=
@@ -440,8 +440,8 @@ golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf
 golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
 golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
 golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
-golang.org/x/exp v0.0.0-20240314144324-c7f7c6466f7f h1:3CW0unweImhOzd5FmYuRsD4Y4oQFKZIjAnKbjV4WIrw=
-golang.org/x/exp v0.0.0-20240314144324-c7f7c6466f7f/go.mod h1:CxmFvTBINI24O/j8iY7H1xHzx2i4OsyguNBmN/uPtqc=
+golang.org/x/exp v0.0.0-20240318143956-a85f2c67cd81 h1:6R2FC06FonbXQ8pK11/PDFY6N6LWlf9KlzibaCapmqc=
+golang.org/x/exp v0.0.0-20240318143956-a85f2c67cd81/go.mod h1:CQ1k9gNrJ50XIzaKCRR2hssIjF07kZFEiieALBM/ARQ=
 golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
 golang.org/x/image v0.15.0 h1:kOELfmgrmJlw4Cdb7g/QGuB3CvDrXbqEIww/pNtNBm8=
 golang.org/x/image v0.15.0/go.mod h1:HUYqC05R2ZcZ3ejNQsIHQDQiwWM4JBqmm6MKANTp4LE=
@@ -517,8 +517,9 @@ golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
 golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
+golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=

From 28d38beb04e0654c7b5e66121c180df93c11bb13 Mon Sep 17 00:00:00 2001
From: Vanessa <lly219@gmail.com>
Date: Sat, 23 Mar 2024 10:25:15 +0800
Subject: [PATCH 68/77] :art:
 https://github.com/siyuan-note/siyuan/issues/10695

---
 app/src/protyle/render/av/cell.ts  |   7 +-
 app/src/protyle/util/insertHTML.ts | 123 ++++++++++++++++-------------
 app/src/protyle/wysiwyg/index.ts   |   6 ++
 3 files changed, 79 insertions(+), 57 deletions(-)

diff --git a/app/src/protyle/render/av/cell.ts b/app/src/protyle/render/av/cell.ts
index 0665c69d81..527dcaeb6d 100644
--- a/app/src/protyle/render/av/cell.ts
+++ b/app/src/protyle/render/av/cell.ts
@@ -473,7 +473,7 @@ export const updateCellsValue = (protyle: IProtyle, nodeElement: HTMLElement, va
     const avID = nodeElement.dataset.avId;
     const id = nodeElement.dataset.nodeId;
     let text = "";
-    const json: IAVCellValue[] = [];
+    const json: IAVCellValue[][] = [];
     let cellElements: Element[];
     if (cElements?.length > 0) {
         cellElements = cElements;
@@ -511,7 +511,10 @@ export const updateCellsValue = (protyle: IProtyle, nodeElement: HTMLElement, va
 
         text += getCellText(item) + ((cellElements[elementIndex + 1] && item.nextElementSibling && item.nextElementSibling.isSameNode(cellElements[elementIndex + 1])) ? "\t" : "\n\n");
         const oldValue = genCellValueByElement(type, item);
-        json.push(oldValue);
+        if (elementIndex === 0 || !cellElements[elementIndex - 1].isSameNode(item.previousElementSibling)) {
+           json.push([]);
+        }
+        json[json.length - 1].push(oldValue);
         // relation 为全部更新，以下类型为添加
         if (type === "mAsset") {
             if (Array.isArray(value)) {
diff --git a/app/src/protyle/util/insertHTML.ts b/app/src/protyle/util/insertHTML.ts
index b462653d6b..782c678e93 100644
--- a/app/src/protyle/util/insertHTML.ts
+++ b/app/src/protyle/util/insertHTML.ts
@@ -14,7 +14,7 @@ import {objEquals} from "../../util/functions";
 const processAV = (range: Range, html: string, protyle: IProtyle, blockElement: HTMLElement) => {
     const tempElement = document.createElement("template");
     tempElement.innerHTML = html;
-    let values: IAVCellValue[] = [];
+    let values: IAVCellValue[][] = [];
     if (html.endsWith("]") && html.startsWith("[")) {
         try {
             values = JSON.parse(html);
@@ -23,8 +23,9 @@ const processAV = (range: Range, html: string, protyle: IProtyle, blockElement:
         }
     } else if (tempElement.content.querySelector("table")) {
         tempElement.content.querySelectorAll("tr").forEach(item => {
+            values.push([])
             Array.from(item.children).forEach(cell => {
-                values.push({
+                values[values.length - 1].push({
                     text: {content: cell.textContent},
                     type: "text"
                 });
@@ -40,72 +41,84 @@ const processAV = (range: Range, html: string, protyle: IProtyle, blockElement:
                 });
             });
         }
+        if (cellElements.length === 0) {
+            cellElements.push(blockElement.querySelector(".av__row:not(.av__row--header) .av__cell"));
+        }
         const doOperations: IOperation[] = [];
         const undoOperations: IOperation[] = [];
 
         const avID = blockElement.dataset.avId;
         const id = blockElement.dataset.nodeId;
-        cellElements.forEach((item: HTMLElement, elementIndex) => {
-            let cellValue: IAVCellValue = values[elementIndex];
-            if (!cellValue) {
-                return;
-            }
-            const rowElement = hasClosestByClassName(item, "av__row");
-            if (!rowElement) {
-                return;
+        let currentRowElement: Element;
+        const firstColIndex = cellElements[0].getAttribute("data-col-id")
+        values.find(rowItem => {
+            if (!currentRowElement) {
+                currentRowElement = cellElements[0].parentElement;
+            } else {
+                currentRowElement = currentRowElement.nextElementSibling;
             }
-            if (!blockElement.contains(item)) {
-                item = cellElements[elementIndex] = blockElement.querySelector(`.av__row[data-id="${rowElement.dataset.id}"] .av__cell[data-col-id="${item.dataset.colId}"]`) as HTMLElement;
-            }
-            const type = getTypeByCellElement(item) || item.dataset.type as TAVCol;
-            if (["created", "updated", "template", "rollup"].includes(type)) {
-                return;
+            if (!currentRowElement.classList.contains("av__row")) {
+                return true;
             }
+            let cellElement: HTMLElement;
+            rowItem.find(cellValue => {
+                if (!cellElement) {
+                    cellElement = currentRowElement.querySelector(`.av__cell[data-col-id="${firstColIndex}"]`) as HTMLElement
+                } else {
+                    cellElement = cellElement.nextElementSibling as HTMLElement
+                }
+                if (!cellElement.classList.contains("av__cell")) {
+                    return true;
+                }
+                const type = getTypeByCellElement(cellElement) || cellElement.dataset.type as TAVCol;
+                if (["created", "updated", "template", "rollup"].includes(type)) {
+                    return;
+                }
+                const rowID = currentRowElement.getAttribute("data-id");
+                const cellId = cellElement.getAttribute("data-id");
+                const colId = cellElement.getAttribute("data-col-id");
 
-            const rowID = rowElement.getAttribute("data-id");
-            const cellId = item.getAttribute("data-id");
-            const colId = item.getAttribute("data-col-id");
-
-            const oldValue = genCellValueByElement(type, item);
-            if (cellValue.type !== type) {
-                if (type === "date") {
-                    // 类型不能转换时就不进行替换
+                const oldValue = genCellValueByElement(type, cellElement);
+                if (cellValue.type !== type) {
+                    if (type === "date") {
+                        // 类型不能转换时就不进行替换
+                        return;
+                    }
+                    const content = cellValue[cellValue.type as "text"].content;
+                    if (!content) {
+                        return;
+                    }
+                    cellValue = genCellValue(type, cellValue[cellValue.type as "text"].content.toString());
+                } else if (cellValue.type === "block") {
+                    cellValue.isDetached = true;
+                    delete cellValue.block.id;
+                }
+                cellValue.id = cellId;
+                if ((cellValue.type === "date" && typeof cellValue.date === "string") ||
+                    (cellValue.type === "relation" && typeof cellValue.relation === "string")) {
                     return;
                 }
-                const content = cellValue[cellValue.type as "text"].content;
-                if (!content) {
+                if (objEquals(cellValue, oldValue)) {
                     return;
                 }
-                cellValue = genCellValue(type, cellValue[cellValue.type as "text"].content.toString());
-            } else if (cellValue.type === "block") {
-                cellValue.isDetached = true;
-                delete cellValue.block.id;
-            }
-            cellValue.id = cellId;
-            if ((cellValue.type === "date" && typeof cellValue.date === "string") ||
-                (cellValue.type === "relation" && typeof cellValue.relation === "string")) {
-                return;
-            }
-            if (objEquals(cellValue, oldValue)) {
-                return;
-            }
-            doOperations.push({
-                action: "updateAttrViewCell",
-                id: cellId,
-                avID,
-                keyID: colId,
-                rowID,
-                data: cellValue
-            });
-            undoOperations.push({
-                action: "updateAttrViewCell",
-                id: cellId,
-                avID,
-                keyID: colId,
-                rowID,
-                data: oldValue
+                doOperations.push({
+                    action: "updateAttrViewCell",
+                    id: cellId,
+                    avID,
+                    keyID: colId,
+                    rowID,
+                    data: cellValue
+                });
+                undoOperations.push({
+                    action: "updateAttrViewCell",
+                    id: cellId,
+                    avID,
+                    keyID: colId,
+                    rowID,
+                    data: oldValue
+                });
+                updateAttrViewCellAnimation(cellElement, cellValue);
             });
-            updateAttrViewCellAnimation(item, cellValue);
         });
         if (doOperations.length > 0) {
             doOperations.push({
diff --git a/app/src/protyle/wysiwyg/index.ts b/app/src/protyle/wysiwyg/index.ts
index bd88ffe798..2e67cc4d66 100644
--- a/app/src/protyle/wysiwyg/index.ts
+++ b/app/src/protyle/wysiwyg/index.ts
@@ -308,7 +308,13 @@ export class WYSIWYG {
                     html = "[";
                     cellElements.forEach((item: HTMLElement, index) => {
                         const cellText = getCellText(item);
+                        if (index === 0 || !cellElements[index - 1].isSameNode(item.previousElementSibling)) {
+                            html += "[";
+                        }
                         html += JSON.stringify(genCellValueByElement(getTypeByCellElement(item), item)) + ",";
+                        if (index === cellElements.length - 1 || !cellElements[index + 1].isSameNode(item.nextElementSibling)) {
+                            html = html.substring(0, html.length - 1) + "],";
+                        }
                         textPlain += cellText + ((cellElements[index + 1] && item.nextElementSibling && item.nextElementSibling.isSameNode(cellElements[index + 1])) ? "\t" : "\n\n");
                     });
                     textPlain = textPlain.substring(0, textPlain.length - 2);

From cd08097aa0f4fb64e5bb5b9a1cc78c537667a14b Mon Sep 17 00:00:00 2001
From: Soltus <liaoshanyi@qq.com>
Date: Sun, 24 Mar 2024 06:38:40 +0800
Subject: [PATCH 69/77] 6

---
 app/src/mobile/settings/about.ts | 6 ++++--
 app/src/types/index.d.ts         | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/src/mobile/settings/about.ts b/app/src/mobile/settings/about.ts
index 7a89f08364..feeaf3d62f 100644
--- a/app/src/mobile/settings/about.ts
+++ b/app/src/mobile/settings/about.ts
@@ -360,11 +360,13 @@ export const initAbout = () => {
                 fetchPost("/api/import/importData", formData);
             });
             const networkServeElement = modelMainElement.querySelector("#networkServe") as HTMLInputElement;
+            if(networkServeElement.checked){
+                window.JSAndroid?.showWifi();
+            }
             networkServeElement.addEventListener("change", () => {
                 fetchPost("/api/system/setNetworkServe", {networkServe: networkServeElement.checked}, () => {
                     if(networkServeElement.checked){
-                        const _r = window.JSAndroid.requestPermission("Battery","注意：后台稳定伺服会消耗额外电量");
-                        console.warn(_r);
+                        window.JSAndroid?.requestPermissionActivity("Battery","注意：后台稳定伺服会消耗额外电量");
                     }
                     exitSiYuan();
                 });
diff --git a/app/src/types/index.d.ts b/app/src/types/index.d.ts
index 2705ab3d08..5b1d1d8c2f 100644
--- a/app/src/types/index.d.ts
+++ b/app/src/types/index.d.ts
@@ -165,9 +165,11 @@ interface Window {
     }) => Promise<any>;
     JSAndroid: {
 				// sillot extend
+        showWifi(): void
 				setMMKV(key: string, value: string): void
 				showBiometricPrompt(): void
-				requestPermission(p: string, Msg: string): void
+				requestPermissionActivity(id: string, Msg: string): void
+        requestPermission(id: string, Msg: string): boolean
         exitSillotAndroid(): void
         savePictureByURL(uri: string): void
 				// sillot extend end

From 5a9ce91d03ec1eccc5e5f459d4d3fdb8d6b55198 Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Sun, 24 Mar 2024 09:24:41 +0800
Subject: [PATCH 70/77] :art: Improve / menu for database

---
 app/src/protyle/hint/extend.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/protyle/hint/extend.ts b/app/src/protyle/hint/extend.ts
index 2a137d804e..906da641b9 100644
--- a/app/src/protyle/hint/extend.ts
+++ b/app/src/protyle/hint/extend.ts
@@ -47,7 +47,7 @@ export const hintSlash = (key: string, protyle: IProtyle) => {
         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>',
     },{
-        filter: ["数据库", "属性视图", "shujuku", "shuxingshitu", "sjk", "sxst", "database", "attribute view"],
+        filter: ["数据库", "视图", "shujuku", "shitu", "sjk", "st", "database", "view", "db"],
         value: '<div data-type="NodeAttributeView" data-av-type="table"></div>',
         html: `<div class="b3-list-item__first"><svg class="b3-list-item__graphic"><use xlink:href="#iconDatabase"></use></svg><span class="b3-list-item__text">${window.siyuan.languages.database}</span></div>`,
     }, {

From 35b6e4c374a9b2791c3ed8ed77d7f6930993279f Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Sun, 24 Mar 2024 09:25:05 +0800
Subject: [PATCH 71/77] :bug: Fix paste as escaped text for list
 https://ld246.com/article/1711182399696

---
 app/src/protyle/util/paste.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/protyle/util/paste.ts b/app/src/protyle/util/paste.ts
index 2fa2311a63..e12ea5bee0 100644
--- a/app/src/protyle/util/paste.ts
+++ b/app/src/protyle/util/paste.ts
@@ -19,7 +19,7 @@ import {cellScrollIntoView} from "../render/av/cell";
 
 export const pasteEscaped = async (protyle: IProtyle, nodeElement: Element) => {
     try {
-        // * _ [ ] ! \ ` < > & ~ { } ( ) = # $ ^ |
+        // * _ [ ] ! \ ` < > & ~ { } ( ) = # $ ^ | .
         let clipText = await readText();
         // https://github.com/siyuan-note/siyuan/issues/5446
         // A\B\C\D\
@@ -47,7 +47,8 @@ export const pasteEscaped = async (protyle: IProtyle, nodeElement: Element) => {
             .replace(/#/g, "\\#")
             .replace(/\$/g, "\\$")
             .replace(/\^/g, "\\^")
-            .replace(/\|/g, "\\|");
+            .replace(/\|/g, "\\|")
+            .replace(/\./g, "\\.");
         pasteText(protyle, clipText, nodeElement);
     } catch (e) {
         console.log(e);

From 9ff9303672755c9081d8cf528fdbfed588cc6261 Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Sun, 24 Mar 2024 09:42:11 +0800
Subject: [PATCH 72/77] :art: Search result content snippet returns more text
 https://github.com/siyuan-note/siyuan/issues/10707

---
 kernel/model/search.go | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/kernel/model/search.go b/kernel/model/search.go
index 698ea925c4..3f5a69a217 100644
--- a/kernel/model/search.go
+++ b/kernel/model/search.go
@@ -1161,13 +1161,13 @@ func fullTextSearchByFTS(query, boxFilter, pathFilter, typeFilter, orderBy strin
 		table = "blocks_fts_case_insensitive"
 	}
 	projections := "id, parent_id, root_id, hash, box, path, " +
-		// Improve the highlight snippet when search result content is too long https://github.com/siyuan-note/siyuan/issues/9215
-		"snippet(" + table + ", 6, '" + search.SearchMarkLeft + "', '" + search.SearchMarkRight + "', '...', 192) AS hpath, " +
-		"snippet(" + table + ", 7, '" + search.SearchMarkLeft + "', '" + search.SearchMarkRight + "', '...', 192) AS name, " +
-		"snippet(" + table + ", 8, '" + search.SearchMarkLeft + "', '" + search.SearchMarkRight + "', '...', 192) AS alias, " +
-		"snippet(" + table + ", 9, '" + search.SearchMarkLeft + "', '" + search.SearchMarkRight + "', '...', 192) AS memo, " +
+		// Search result content snippet returns more text https://github.com/siyuan-note/siyuan/issues/10707
+		"snippet(" + table + ", 6, '" + search.SearchMarkLeft + "', '" + search.SearchMarkRight + "', '...', 512) AS hpath, " +
+		"snippet(" + table + ", 7, '" + search.SearchMarkLeft + "', '" + search.SearchMarkRight + "', '...', 512) AS name, " +
+		"snippet(" + table + ", 8, '" + search.SearchMarkLeft + "', '" + search.SearchMarkRight + "', '...', 512) AS alias, " +
+		"snippet(" + table + ", 9, '" + search.SearchMarkLeft + "', '" + search.SearchMarkRight + "', '...', 512) AS memo, " +
 		"tag, " +
-		"snippet(" + table + ", 11, '" + search.SearchMarkLeft + "', '" + search.SearchMarkRight + "', '...', 192) AS content, " +
+		"snippet(" + table + ", 11, '" + search.SearchMarkLeft + "', '" + search.SearchMarkRight + "', '...', 512) AS content, " +
 		"fcontent, markdown, length, type, subtype, ial, sort, created, updated"
 	stmt := "SELECT " + projections + " FROM " + table + " WHERE (`" + table + "` MATCH '" + columnFilter() + ":(" + query + ")'"
 	stmt += ") AND type IN " + typeFilter

From bdbd7e13c93ad9930928ef7cae1dff100f8c5338 Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Sun, 24 Mar 2024 10:06:48 +0800
Subject: [PATCH 73/77] :art: Improve export PDF window
 https://github.com/siyuan-note/siyuan/issues/10711

---
 app/electron/main.js               | 25 +++++++++++++++++++------
 app/src/protyle/util/insertHTML.ts |  8 ++++----
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/app/electron/main.js b/app/electron/main.js
index a815dd0b71..5fa46356a9 100644
--- a/app/electron/main.js
+++ b/app/electron/main.js
@@ -855,19 +855,32 @@ app.whenReady().then(() => {
             }
             data.filePaths = result.filePaths;
             data.webContentsId = event.sender.id;
-            getWindowByContentId(event.sender.id).getParentWindow().send("siyuan-export-pdf", data);
+            const wnd = getWindowByContentId(event.sender.id);
+            if (!wnd) {
+                // 文档已经被删除的情况下关闭窗口，下同
+                event.sender.destroy();
+                return;
+            }
+            const parentWnd = wnd.getParentWindow();
+            if (!parentWnd) {
+                event.sender.destroy();
+                return;
+            }
+            parentWnd.send("siyuan-export-pdf", data);
         });
     });
     ipcMain.on("siyuan-export-newwindow", (event, data) => {
         const parentWnd = getWindowByContentId(event.sender.id);
+        const parentWndBounds = parentWnd.getBounds();
+        const parentWndScreen = screen.getDisplayNearestPoint({x: parentWndBounds.x, y: parentWndBounds.y});
+        parentWndScreen.size.width;
+
         // The PDF/Word export preview window automatically adjusts according to the size of the main window https://github.com/siyuan-note/siyuan/issues/10554
         const printWin = new BrowserWindow({
-            parent: parentWnd,
-            modal: false,
             show: true,
-            width: Math.floor(parentWnd.getBounds().width * 0.8),
-            height: Math.floor(parentWnd.getBounds().height * 0.8),
-            resizable: false,
+            width: parentWndScreen.size.width * 0.9,
+            height: parentWndScreen.size.height * 0.9,
+            resizable: true,
             frame: "darwin" === process.platform,
             icon: path.join(appDir, "stage", "icon-large.png"),
             titleBarStyle: "hidden",
diff --git a/app/src/protyle/util/insertHTML.ts b/app/src/protyle/util/insertHTML.ts
index 782c678e93..56ec30365e 100644
--- a/app/src/protyle/util/insertHTML.ts
+++ b/app/src/protyle/util/insertHTML.ts
@@ -23,7 +23,7 @@ const processAV = (range: Range, html: string, protyle: IProtyle, blockElement:
         }
     } else if (tempElement.content.querySelector("table")) {
         tempElement.content.querySelectorAll("tr").forEach(item => {
-            values.push([])
+            values.push([]);
             Array.from(item.children).forEach(cell => {
                 values[values.length - 1].push({
                     text: {content: cell.textContent},
@@ -50,7 +50,7 @@ const processAV = (range: Range, html: string, protyle: IProtyle, blockElement:
         const avID = blockElement.dataset.avId;
         const id = blockElement.dataset.nodeId;
         let currentRowElement: Element;
-        const firstColIndex = cellElements[0].getAttribute("data-col-id")
+        const firstColIndex = cellElements[0].getAttribute("data-col-id");
         values.find(rowItem => {
             if (!currentRowElement) {
                 currentRowElement = cellElements[0].parentElement;
@@ -63,9 +63,9 @@ const processAV = (range: Range, html: string, protyle: IProtyle, blockElement:
             let cellElement: HTMLElement;
             rowItem.find(cellValue => {
                 if (!cellElement) {
-                    cellElement = currentRowElement.querySelector(`.av__cell[data-col-id="${firstColIndex}"]`) as HTMLElement
+                    cellElement = currentRowElement.querySelector(`.av__cell[data-col-id="${firstColIndex}"]`) as HTMLElement;
                 } else {
-                    cellElement = cellElement.nextElementSibling as HTMLElement
+                    cellElement = cellElement.nextElementSibling as HTMLElement;
                 }
                 if (!cellElement.classList.contains("av__cell")) {
                     return true;

From f0fd8f9b90c4266a3b85332f05a8ed0ff02c229f Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Sun, 24 Mar 2024 10:51:19 +0800
Subject: [PATCH 74/77] :art: Unable to replace `{{foo}}` in code block Fix
 https://github.com/siyuan-note/siyuan/issues/10706

---
 kernel/go.mod          |  2 +-
 kernel/go.sum          |  4 ++--
 kernel/model/search.go | 15 ++++++++++++++-
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/kernel/go.mod b/kernel/go.mod
index 3031c09091..c2834e8298 100644
--- a/kernel/go.mod
+++ b/kernel/go.mod
@@ -8,7 +8,7 @@ require (
 	code.sajari.com/docconv v1.3.8
 	github.com/88250/clipboard v0.1.5
 	github.com/88250/epub v0.0.0-20230830085737-c19055cd1f48
-	github.com/88250/gulu v1.2.3-0.20231209020950-b7b6994e395c
+	github.com/88250/gulu v1.2.3-0.20240324024901-3c1bb82cba30
 	github.com/88250/lute v1.7.7-0.20240317033923-b5d564e25df7
 	github.com/88250/pdfcpu v0.3.14-0.20230401044135-c7369a99720c
 	github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1
diff --git a/kernel/go.sum b/kernel/go.sum
index c9fbd23bb9..bc79630381 100644
--- a/kernel/go.sum
+++ b/kernel/go.sum
@@ -8,8 +8,8 @@ github.com/88250/epub v0.0.0-20230830085737-c19055cd1f48 h1:qiE88Pw/9GG8hvMfpfB4
 github.com/88250/epub v0.0.0-20230830085737-c19055cd1f48/go.mod h1:UgVSq5iO9pOvqs3hIGNVk6WXDiAB0v3Dlg4nssQJ7W4=
 github.com/88250/go-sqlite3 v1.14.13-0.20231214121541-e7f54c482950 h1:Pa5hMiBceTVVqrYaDlLio2QSKbXMUmAZPbzCwT5eNCw=
 github.com/88250/go-sqlite3 v1.14.13-0.20231214121541-e7f54c482950/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
-github.com/88250/gulu v1.2.3-0.20231209020950-b7b6994e395c h1:Fas3hxqP33xA9KKDV50jUmppiiOukk5bdV00Hk5VSSk=
-github.com/88250/gulu v1.2.3-0.20231209020950-b7b6994e395c/go.mod h1:pTWnjt+6qUqNnP9xltswsJxgCBVu3C7eW09u48LWX0k=
+github.com/88250/gulu v1.2.3-0.20240324024901-3c1bb82cba30 h1:IeE4DVRWnVpcbMj7gGZoSMiBWs3h/ihiyOmualS1Mas=
+github.com/88250/gulu v1.2.3-0.20240324024901-3c1bb82cba30/go.mod h1:MUfzyfmbPrRDZLqxc7aPrVYveatTHRfoUa5TynPS0i8=
 github.com/88250/lute v1.7.7-0.20240317033923-b5d564e25df7 h1:egkoxNZeGBDcUCd4kUHgeYIZZ7uNHTK+TT+K2yZTHm0=
 github.com/88250/lute v1.7.7-0.20240317033923-b5d564e25df7/go.mod h1:VDAzL8b+oCh+e3NAlmwwLzC53ten0rZlS8NboB7ljtk=
 github.com/88250/pdfcpu v0.3.14-0.20230401044135-c7369a99720c h1:Dl/8S9iLyPMTElnWIBxmjaLiWrkI5P4a21ivwAn5pU0=
diff --git a/kernel/model/search.go b/kernel/model/search.go
index 3f5a69a217..21f7a18dd1 100644
--- a/kernel/model/search.go
+++ b/kernel/model/search.go
@@ -1299,7 +1299,20 @@ func fromSQLBlock(sqlBlock *sql.Block, terms string, beforeLen int) (block *Bloc
 	}
 
 	id := sqlBlock.ID
-	content := util.EscapeHTML(sqlBlock.Content) // Search dialog XSS https://github.com/siyuan-note/siyuan/issues/8525
+	content := sqlBlock.Content
+	if 1 < strings.Count(content, search.SearchMarkRight) && strings.HasSuffix(content, search.SearchMarkRight+"...") {
+		// 返回多个关键字命中时需要检查最后一个关键字是否被截断
+		firstKeyword := gulu.Str.SubStringBetween(content, search.SearchMarkLeft, search.SearchMarkRight)
+		lastKeyword := gulu.Str.LastSubStringBetween(content, search.SearchMarkLeft, search.SearchMarkRight)
+		if firstKeyword != lastKeyword {
+			// 如果第一个关键字和最后一个关键字不相同，说明最后一个关键字被截断了
+			// 此时需要将 content 中的最后一个关键字替换为完整的关键字
+			content = strings.TrimSuffix(content, search.SearchMarkLeft+lastKeyword+search.SearchMarkRight+"...")
+			content += search.SearchMarkLeft + firstKeyword + search.SearchMarkRight + "..."
+		}
+	}
+
+	content = util.EscapeHTML(content) // Search dialog XSS https://github.com/siyuan-note/siyuan/issues/8525
 	content, _ = markSearch(content, terms, beforeLen)
 	content = maxContent(content, 5120)
 	markdown := maxContent(sqlBlock.Markdown, 5120)

From 14c00f926c0b4f63137462880d8025398eecaace Mon Sep 17 00:00:00 2001
From: Soltus <liaoshanyi@qq.com>
Date: Sun, 24 Mar 2024 11:23:58 +0800
Subject: [PATCH 75/77] 6

---
 app/package.json   |   6 +-
 app/pnpm-lock.yaml | 140 ++++++++++++++++++++++-----------------------
 2 files changed, 73 insertions(+), 73 deletions(-)

diff --git a/app/package.json b/app/package.json
index 48b4fc2fa2..57fc49e1c5 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sillot",
-  "version": "0.27.22",
+  "version": "0.27.23",
   "syv": "3.0.5",
   "sypv": "3.0.4",
   "description": "Build Your Eternal Digital Garden",
@@ -102,7 +102,7 @@
     "@types/jest": "^29.5.12",
     "@types/lodash": "^4.17.0",
     "@types/node": "^20.11.29",
-    "@types/react": "^18.2.67",
+    "@types/react": "^18.2.69",
     "@types/react-dom": "^18.2.22",
     "@typescript-eslint/eslint-plugin": "^7.3.1",
     "@typescript-eslint/parser": "^7.3.1",
@@ -159,7 +159,7 @@
     "sofill": "^1.1.4",
     "sout": "^1.1.0",
     "style-loader": "^3.3.4",
-    "sweetalert2": "^11.10.6",
+    "sweetalert2": "^11.10.7",
     "terser-webpack-plugin": "^5.3.10",
     "ts-jest": "^29.1.2",
     "ts-loader": "^9.5.1",
diff --git a/app/pnpm-lock.yaml b/app/pnpm-lock.yaml
index 70a0d32f9a..b910fe66fa 100644
--- a/app/pnpm-lock.yaml
+++ b/app/pnpm-lock.yaml
@@ -56,19 +56,19 @@ importers:
         version: 7.24.1
       '@emotion/react':
         specifier: ^11.11.4
-        version: 11.11.4(@types/react@18.2.67)(react@18.2.0)
+        version: 11.11.4(@types/react@18.2.69)(react@18.2.0)
       '@emotion/styled':
         specifier: ^11.11.0
-        version: 11.11.0(@emotion/react@11.11.4(@types/react@18.2.67)(react@18.2.0))(@types/react@18.2.67)(react@18.2.0)
+        version: 11.11.0(@emotion/react@11.11.4(@types/react@18.2.69)(react@18.2.0))(@types/react@18.2.69)(react@18.2.0)
       '@mui/icons-material':
         specifier: ^5.15.13
-        version: 5.15.14(@mui/material@5.15.14(@emotion/react@11.11.4(@types/react@18.2.67)(react@18.2.0))(@emotion/styled@11.11.0(@emotion/react@11.11.4(@types/react@18.2.67)(react@18.2.0))(@types/react@18.2.67)(react@18.2.0))(@types/react@18.2.67)(react-dom@18.2.0(react@18.2.0))(react@18.2.0))(@types/react@18.2.67)(react@18.2.0)
+        version: 5.15.14(@mui/material@5.15.14(@emotion/react@11.11.4(@types/react@18.2.69)(react@18.2.0))(@emotion/styled@11.11.0(@emotion/react@11.11.4(@types/react@18.2.69)(react@18.2.0))(@types/react@18.2.69)(react@18.2.0))(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0))(@types/react@18.2.69)(react@18.2.0)
       '@mui/joy':
         specifier: 5.0.0-alpha.77
-        version: 5.0.0-alpha.77(@emotion/react@11.11.4(@types/react@18.2.67)(react@18.2.0))(@emotion/styled@11.11.0(@emotion/react@11.11.4(@types/react@18.2.67)(react@18.2.0))(@types/react@18.2.67)(react@18.2.0))(@types/react@18.2.67)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+        version: 5.0.0-alpha.77(@emotion/react@11.11.4(@types/react@18.2.69)(react@18.2.0))(@emotion/styled@11.11.0(@emotion/react@11.11.4(@types/react@18.2.69)(react@18.2.0))(@types/react@18.2.69)(react@18.2.0))(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@mui/material':
         specifier: ^5.15.13
-        version: 5.15.14(@emotion/react@11.11.4(@types/react@18.2.67)(react@18.2.0))(@emotion/styled@11.11.0(@emotion/react@11.11.4(@types/react@18.2.67)(react@18.2.0))(@types/react@18.2.67)(react@18.2.0))(@types/react@18.2.67)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+        version: 5.15.14(@emotion/react@11.11.4(@types/react@18.2.69)(react@18.2.0))(@emotion/styled@11.11.0(@emotion/react@11.11.4(@types/react@18.2.69)(react@18.2.0))(@types/react@18.2.69)(react@18.2.0))(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@rollup/plugin-babel':
         specifier: ^6.0.4
         version: 6.0.4(@babel/core@7.24.3)(rollup@4.13.0)
@@ -100,8 +100,8 @@ importers:
         specifier: ^20.11.29
         version: 20.11.30
       '@types/react':
-        specifier: ^18.2.67
-        version: 18.2.67
+        specifier: ^18.2.69
+        version: 18.2.69
       '@types/react-dom':
         specifier: ^18.2.22
         version: 18.2.22
@@ -224,7 +224,7 @@ importers:
         version: 4.24.2(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       react-monaco-editor:
         specifier: ^0.55.0
-        version: 0.55.0(@types/react@18.2.67)(monaco-editor@0.47.0)(react@18.2.0)
+        version: 0.55.0(@types/react@18.2.69)(monaco-editor@0.47.0)(react@18.2.0)
       react-spinners:
         specifier: ^0.13.8
         version: 0.13.8(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
@@ -271,8 +271,8 @@ importers:
         specifier: ^3.3.4
         version: 3.3.4(webpack@5.91.0(esbuild@0.20.2)(webpack-cli@5.1.4))
       sweetalert2:
-        specifier: ^11.10.6
-        version: 11.10.6
+        specifier: ^11.10.7
+        version: 11.10.7
       terser-webpack-plugin:
         specifier: ^5.3.10
         version: 5.3.10(esbuild@0.20.2)(webpack@5.91.0(esbuild@0.20.2)(webpack-cli@5.1.4))
@@ -1833,8 +1833,8 @@ packages:
   '@types/react-transition-group@4.4.10':
     resolution: {integrity: sha512-hT/+s0VQs2ojCX823m60m5f0sL5idt9SO6Tj6Dg+rdphGPIeJbJ6CxvBYkgkGKrYeDjvIpKTR38UzmtHJOGW3Q==}
 
-  '@types/react@18.2.67':
-    resolution: {integrity: sha512-vkIE2vTIMHQ/xL0rgmuoECBCkZFZeHr49HeWSc24AptMbNRo7pwSBvj73rlJJs9fGKj0koS+V7kQB1jHS0uCgw==}
+  '@types/react@18.2.69':
+    resolution: {integrity: sha512-W1HOMUWY/1Yyw0ba5TkCV+oqynRjG7BnteBB+B7JmAK7iw3l2SW+VGOxL+akPweix6jk2NNJtyJKpn4TkpfK3Q==}
 
   '@types/resolve@1.20.2':
     resolution: {integrity: sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==}
@@ -5734,8 +5734,8 @@ packages:
     engines: {node: '>=10.13.0'}
     hasBin: true
 
-  sweetalert2@11.10.6:
-    resolution: {integrity: sha512-CINZPLZXZRSZqSOE7H7j1F7X8e8O1kLOiXPmtJn1DYxvXsKBr3d16d90+IcwTTs7dJww20h8r8QIxIwsLGX+6A==}
+  sweetalert2@11.10.7:
+    resolution: {integrity: sha512-5Jlzrmaitay6KzU+2+LhYu9q+L4v/dZ8oZyEDH14ep0C/QilCnFLHmqAyD/Lhq/lm5DiwsOs6Tr58iv8k3wyGg==}
 
   tapable@2.2.1:
     resolution: {integrity: sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==}
@@ -7269,7 +7269,7 @@ snapshots:
   '@emotion/memoize@0.8.1':
     dev: true
 
-  '@emotion/react@11.11.4(@types/react@18.2.67)(react@18.2.0)':
+  '@emotion/react@11.11.4(@types/react@18.2.69)(react@18.2.0)':
     dependencies:
       '@babel/runtime': 7.24.1
       '@emotion/babel-plugin': 11.11.0
@@ -7278,7 +7278,7 @@ snapshots:
       '@emotion/use-insertion-effect-with-fallbacks': 1.0.1(react@18.2.0)
       '@emotion/utils': 1.2.1
       '@emotion/weak-memoize': 0.3.1
-      '@types/react': 18.2.67
+      '@types/react': 18.2.69
       hoist-non-react-statics: 3.3.2
       react: 18.2.0
     dev: true
@@ -7295,16 +7295,16 @@ snapshots:
   '@emotion/sheet@1.2.2':
     dev: true
 
-  '@emotion/styled@11.11.0(@emotion/react@11.11.4(@types/react@18.2.67)(react@18.2.0))(@types/react@18.2.67)(react@18.2.0)':
+  '@emotion/styled@11.11.0(@emotion/react@11.11.4(@types/react@18.2.69)(react@18.2.0))(@types/react@18.2.69)(react@18.2.0)':
     dependencies:
       '@babel/runtime': 7.24.1
       '@emotion/babel-plugin': 11.11.0
       '@emotion/is-prop-valid': 1.2.2
-      '@emotion/react': 11.11.4(@types/react@18.2.67)(react@18.2.0)
+      '@emotion/react': 11.11.4(@types/react@18.2.69)(react@18.2.0)
       '@emotion/serialize': 1.1.3
       '@emotion/use-insertion-effect-with-fallbacks': 1.0.1(react@18.2.0)
       '@emotion/utils': 1.2.1
-      '@types/react': 18.2.67
+      '@types/react': 18.2.69
       react: 18.2.0
     dev: true
 
@@ -7729,14 +7729,14 @@ snapshots:
       state-local: 1.0.7
     dev: false
 
-  '@mui/base@5.0.0-alpha.127(@types/react@18.2.67)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
+  '@mui/base@5.0.0-alpha.127(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@babel/runtime': 7.24.1
       '@emotion/is-prop-valid': 1.2.2
-      '@mui/types': 7.2.14(@types/react@18.2.67)
-      '@mui/utils': 5.15.14(@types/react@18.2.67)(react@18.2.0)
+      '@mui/types': 7.2.14(@types/react@18.2.69)
+      '@mui/utils': 5.15.14(@types/react@18.2.69)(react@18.2.0)
       '@popperjs/core': 2.11.8
-      '@types/react': 18.2.67
+      '@types/react': 18.2.69
       clsx: 1.2.1
       prop-types: 15.8.1
       react: 18.2.0
@@ -7744,14 +7744,14 @@ snapshots:
       react-is: 18.2.0
     dev: true
 
-  '@mui/base@5.0.0-beta.40(@types/react@18.2.67)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
+  '@mui/base@5.0.0-beta.40(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@babel/runtime': 7.24.1
       '@floating-ui/react-dom': 2.0.8(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@mui/types': 7.2.14(@types/react@18.2.67)
-      '@mui/utils': 5.15.14(@types/react@18.2.67)(react@18.2.0)
+      '@mui/types': 7.2.14(@types/react@18.2.69)
+      '@mui/utils': 5.15.14(@types/react@18.2.69)(react@18.2.0)
       '@popperjs/core': 2.11.8
-      '@types/react': 18.2.67
+      '@types/react': 18.2.69
       clsx: 2.1.0
       prop-types: 15.8.1
       react: 18.2.0
@@ -7761,25 +7761,25 @@ snapshots:
   '@mui/core-downloads-tracker@5.15.14':
     dev: true
 
-  '@mui/icons-material@5.15.14(@mui/material@5.15.14(@emotion/react@11.11.4(@types/react@18.2.67)(react@18.2.0))(@emotion/styled@11.11.0(@emotion/react@11.11.4(@types/react@18.2.67)(react@18.2.0))(@types/react@18.2.67)(react@18.2.0))(@types/react@18.2.67)(react-dom@18.2.0(react@18.2.0))(react@18.2.0))(@types/react@18.2.67)(react@18.2.0)':
+  '@mui/icons-material@5.15.14(@mui/material@5.15.14(@emotion/react@11.11.4(@types/react@18.2.69)(react@18.2.0))(@emotion/styled@11.11.0(@emotion/react@11.11.4(@types/react@18.2.69)(react@18.2.0))(@types/react@18.2.69)(react@18.2.0))(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0))(@types/react@18.2.69)(react@18.2.0)':
     dependencies:
       '@babel/runtime': 7.24.1
-      '@mui/material': 5.15.14(@emotion/react@11.11.4(@types/react@18.2.67)(react@18.2.0))(@emotion/styled@11.11.0(@emotion/react@11.11.4(@types/react@18.2.67)(react@18.2.0))(@types/react@18.2.67)(react@18.2.0))(@types/react@18.2.67)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@types/react': 18.2.67
+      '@mui/material': 5.15.14(@emotion/react@11.11.4(@types/react@18.2.69)(react@18.2.0))(@emotion/styled@11.11.0(@emotion/react@11.11.4(@types/react@18.2.69)(react@18.2.0))(@types/react@18.2.69)(react@18.2.0))(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@types/react': 18.2.69
       react: 18.2.0
     dev: true
 
-  '@mui/joy@5.0.0-alpha.77(@emotion/react@11.11.4(@types/react@18.2.67)(react@18.2.0))(@emotion/styled@11.11.0(@emotion/react@11.11.4(@types/react@18.2.67)(react@18.2.0))(@types/react@18.2.67)(react@18.2.0))(@types/react@18.2.67)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
+  '@mui/joy@5.0.0-alpha.77(@emotion/react@11.11.4(@types/react@18.2.69)(react@18.2.0))(@emotion/styled@11.11.0(@emotion/react@11.11.4(@types/react@18.2.69)(react@18.2.0))(@types/react@18.2.69)(react@18.2.0))(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@babel/runtime': 7.24.1
-      '@emotion/react': 11.11.4(@types/react@18.2.67)(react@18.2.0)
-      '@emotion/styled': 11.11.0(@emotion/react@11.11.4(@types/react@18.2.67)(react@18.2.0))(@types/react@18.2.67)(react@18.2.0)
-      '@mui/base': 5.0.0-alpha.127(@types/react@18.2.67)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@emotion/react': 11.11.4(@types/react@18.2.69)(react@18.2.0)
+      '@emotion/styled': 11.11.0(@emotion/react@11.11.4(@types/react@18.2.69)(react@18.2.0))(@types/react@18.2.69)(react@18.2.0)
+      '@mui/base': 5.0.0-alpha.127(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@mui/core-downloads-tracker': 5.15.14
-      '@mui/system': 5.15.14(@emotion/react@11.11.4(@types/react@18.2.67)(react@18.2.0))(@emotion/styled@11.11.0(@emotion/react@11.11.4(@types/react@18.2.67)(react@18.2.0))(@types/react@18.2.67)(react@18.2.0))(@types/react@18.2.67)(react@18.2.0)
-      '@mui/types': 7.2.14(@types/react@18.2.67)
-      '@mui/utils': 5.15.14(@types/react@18.2.67)(react@18.2.0)
-      '@types/react': 18.2.67
+      '@mui/system': 5.15.14(@emotion/react@11.11.4(@types/react@18.2.69)(react@18.2.0))(@emotion/styled@11.11.0(@emotion/react@11.11.4(@types/react@18.2.69)(react@18.2.0))(@types/react@18.2.69)(react@18.2.0))(@types/react@18.2.69)(react@18.2.0)
+      '@mui/types': 7.2.14(@types/react@18.2.69)
+      '@mui/utils': 5.15.14(@types/react@18.2.69)(react@18.2.0)
+      '@types/react': 18.2.69
       clsx: 1.2.1
       csstype: 3.1.3
       prop-types: 15.8.1
@@ -7788,17 +7788,17 @@ snapshots:
       react-is: 18.2.0
     dev: true
 
-  '@mui/material@5.15.14(@emotion/react@11.11.4(@types/react@18.2.67)(react@18.2.0))(@emotion/styled@11.11.0(@emotion/react@11.11.4(@types/react@18.2.67)(react@18.2.0))(@types/react@18.2.67)(react@18.2.0))(@types/react@18.2.67)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
+  '@mui/material@5.15.14(@emotion/react@11.11.4(@types/react@18.2.69)(react@18.2.0))(@emotion/styled@11.11.0(@emotion/react@11.11.4(@types/react@18.2.69)(react@18.2.0))(@types/react@18.2.69)(react@18.2.0))(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@babel/runtime': 7.24.1
-      '@emotion/react': 11.11.4(@types/react@18.2.67)(react@18.2.0)
-      '@emotion/styled': 11.11.0(@emotion/react@11.11.4(@types/react@18.2.67)(react@18.2.0))(@types/react@18.2.67)(react@18.2.0)
-      '@mui/base': 5.0.0-beta.40(@types/react@18.2.67)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@emotion/react': 11.11.4(@types/react@18.2.69)(react@18.2.0)
+      '@emotion/styled': 11.11.0(@emotion/react@11.11.4(@types/react@18.2.69)(react@18.2.0))(@types/react@18.2.69)(react@18.2.0)
+      '@mui/base': 5.0.0-beta.40(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@mui/core-downloads-tracker': 5.15.14
-      '@mui/system': 5.15.14(@emotion/react@11.11.4(@types/react@18.2.67)(react@18.2.0))(@emotion/styled@11.11.0(@emotion/react@11.11.4(@types/react@18.2.67)(react@18.2.0))(@types/react@18.2.67)(react@18.2.0))(@types/react@18.2.67)(react@18.2.0)
-      '@mui/types': 7.2.14(@types/react@18.2.67)
-      '@mui/utils': 5.15.14(@types/react@18.2.67)(react@18.2.0)
-      '@types/react': 18.2.67
+      '@mui/system': 5.15.14(@emotion/react@11.11.4(@types/react@18.2.69)(react@18.2.0))(@emotion/styled@11.11.0(@emotion/react@11.11.4(@types/react@18.2.69)(react@18.2.0))(@types/react@18.2.69)(react@18.2.0))(@types/react@18.2.69)(react@18.2.0)
+      '@mui/types': 7.2.14(@types/react@18.2.69)
+      '@mui/utils': 5.15.14(@types/react@18.2.69)(react@18.2.0)
+      '@types/react': 18.2.69
       '@types/react-transition-group': 4.4.10
       clsx: 2.1.0
       csstype: 3.1.3
@@ -7809,52 +7809,52 @@ snapshots:
       react-transition-group: 4.4.5(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
     dev: true
 
-  '@mui/private-theming@5.15.14(@types/react@18.2.67)(react@18.2.0)':
+  '@mui/private-theming@5.15.14(@types/react@18.2.69)(react@18.2.0)':
     dependencies:
       '@babel/runtime': 7.24.1
-      '@mui/utils': 5.15.14(@types/react@18.2.67)(react@18.2.0)
-      '@types/react': 18.2.67
+      '@mui/utils': 5.15.14(@types/react@18.2.69)(react@18.2.0)
+      '@types/react': 18.2.69
       prop-types: 15.8.1
       react: 18.2.0
     dev: true
 
-  '@mui/styled-engine@5.15.14(@emotion/react@11.11.4(@types/react@18.2.67)(react@18.2.0))(@emotion/styled@11.11.0(@emotion/react@11.11.4(@types/react@18.2.67)(react@18.2.0))(@types/react@18.2.67)(react@18.2.0))(react@18.2.0)':
+  '@mui/styled-engine@5.15.14(@emotion/react@11.11.4(@types/react@18.2.69)(react@18.2.0))(@emotion/styled@11.11.0(@emotion/react@11.11.4(@types/react@18.2.69)(react@18.2.0))(@types/react@18.2.69)(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@babel/runtime': 7.24.1
       '@emotion/cache': 11.11.0
-      '@emotion/react': 11.11.4(@types/react@18.2.67)(react@18.2.0)
-      '@emotion/styled': 11.11.0(@emotion/react@11.11.4(@types/react@18.2.67)(react@18.2.0))(@types/react@18.2.67)(react@18.2.0)
+      '@emotion/react': 11.11.4(@types/react@18.2.69)(react@18.2.0)
+      '@emotion/styled': 11.11.0(@emotion/react@11.11.4(@types/react@18.2.69)(react@18.2.0))(@types/react@18.2.69)(react@18.2.0)
       csstype: 3.1.3
       prop-types: 15.8.1
       react: 18.2.0
     dev: true
 
-  '@mui/system@5.15.14(@emotion/react@11.11.4(@types/react@18.2.67)(react@18.2.0))(@emotion/styled@11.11.0(@emotion/react@11.11.4(@types/react@18.2.67)(react@18.2.0))(@types/react@18.2.67)(react@18.2.0))(@types/react@18.2.67)(react@18.2.0)':
+  '@mui/system@5.15.14(@emotion/react@11.11.4(@types/react@18.2.69)(react@18.2.0))(@emotion/styled@11.11.0(@emotion/react@11.11.4(@types/react@18.2.69)(react@18.2.0))(@types/react@18.2.69)(react@18.2.0))(@types/react@18.2.69)(react@18.2.0)':
     dependencies:
       '@babel/runtime': 7.24.1
-      '@emotion/react': 11.11.4(@types/react@18.2.67)(react@18.2.0)
-      '@emotion/styled': 11.11.0(@emotion/react@11.11.4(@types/react@18.2.67)(react@18.2.0))(@types/react@18.2.67)(react@18.2.0)
-      '@mui/private-theming': 5.15.14(@types/react@18.2.67)(react@18.2.0)
-      '@mui/styled-engine': 5.15.14(@emotion/react@11.11.4(@types/react@18.2.67)(react@18.2.0))(@emotion/styled@11.11.0(@emotion/react@11.11.4(@types/react@18.2.67)(react@18.2.0))(@types/react@18.2.67)(react@18.2.0))(react@18.2.0)
-      '@mui/types': 7.2.14(@types/react@18.2.67)
-      '@mui/utils': 5.15.14(@types/react@18.2.67)(react@18.2.0)
-      '@types/react': 18.2.67
+      '@emotion/react': 11.11.4(@types/react@18.2.69)(react@18.2.0)
+      '@emotion/styled': 11.11.0(@emotion/react@11.11.4(@types/react@18.2.69)(react@18.2.0))(@types/react@18.2.69)(react@18.2.0)
+      '@mui/private-theming': 5.15.14(@types/react@18.2.69)(react@18.2.0)
+      '@mui/styled-engine': 5.15.14(@emotion/react@11.11.4(@types/react@18.2.69)(react@18.2.0))(@emotion/styled@11.11.0(@emotion/react@11.11.4(@types/react@18.2.69)(react@18.2.0))(@types/react@18.2.69)(react@18.2.0))(react@18.2.0)
+      '@mui/types': 7.2.14(@types/react@18.2.69)
+      '@mui/utils': 5.15.14(@types/react@18.2.69)(react@18.2.0)
+      '@types/react': 18.2.69
       clsx: 2.1.0
       csstype: 3.1.3
       prop-types: 15.8.1
       react: 18.2.0
     dev: true
 
-  '@mui/types@7.2.14(@types/react@18.2.67)':
+  '@mui/types@7.2.14(@types/react@18.2.69)':
     dependencies:
-      '@types/react': 18.2.67
+      '@types/react': 18.2.69
     dev: true
 
-  '@mui/utils@5.15.14(@types/react@18.2.67)(react@18.2.0)':
+  '@mui/utils@5.15.14(@types/react@18.2.69)(react@18.2.0)':
     dependencies:
       '@babel/runtime': 7.24.1
       '@types/prop-types': 15.7.11
-      '@types/react': 18.2.67
+      '@types/react': 18.2.69
       prop-types: 15.8.1
       react: 18.2.0
       react-is: 18.2.0
@@ -8214,15 +8214,15 @@ snapshots:
 
   '@types/react-dom@18.2.22':
     dependencies:
-      '@types/react': 18.2.67
+      '@types/react': 18.2.69
     dev: true
 
   '@types/react-transition-group@4.4.10':
     dependencies:
-      '@types/react': 18.2.67
+      '@types/react': 18.2.69
     dev: true
 
-  '@types/react@18.2.67':
+  '@types/react@18.2.69':
     dependencies:
       '@types/prop-types': 15.7.11
       '@types/scheduler': 0.16.8
@@ -12970,9 +12970,9 @@ snapshots:
       sortablejs: 1.15.2
     dev: true
 
-  react-monaco-editor@0.55.0(@types/react@18.2.67)(monaco-editor@0.47.0)(react@18.2.0):
+  react-monaco-editor@0.55.0(@types/react@18.2.69)(monaco-editor@0.47.0)(react@18.2.0):
     dependencies:
-      '@types/react': 18.2.67
+      '@types/react': 18.2.69
       monaco-editor: 0.47.0
       prop-types: 15.8.1
       react: 18.2.0
@@ -13799,7 +13799,7 @@ snapshots:
       stable: 0.1.8
     dev: true
 
-  sweetalert2@11.10.6:
+  sweetalert2@11.10.7:
     dev: true
 
   tapable@2.2.1:

From 9f0bf17237cc5e8090fbeaebf1c9b9428cfda12e Mon Sep 17 00:00:00 2001
From: Soltus <liaoshanyi@qq.com>
Date: Sun, 24 Mar 2024 21:55:05 +0800
Subject: [PATCH 76/77] https://github.com/Hi-Windom/Sillot-android/issues/15

---
 README.md => .github/README.md                | 10 +++---
 README_Sillot.md => .github/README_Sillot.md  | 11 +++----
 .../README_Sillot_Docker.md                   |  0
 .github/about.readme.md                       |  3 ++
 app/package.cli.mjs                           | 14 ++++++--
 app/src/index.ts                              |  2 --
 app/src/menus/workspace.ts                    |  2 +-
 app/src/mobile/index.ts                       | 32 ++++---------------
 app/src/mobile/util/initFramework.ts          |  5 +++
 app/src/mobile/util/keyboardToolbar.ts        |  4 +--
 app/src/protyle/breadcrumb/index.ts           |  4 +--
 app/src/protyle/scroll/saveScroll.ts          |  4 +--
 app/src/protyle/util/onGet.ts                 |  6 ++--
 app/src/protyle/wysiwyg/index.ts              |  4 +--
 app/src/search/util.ts                        |  2 +-
 app/src/sillot/index.ts                       | 18 +++++++++++
 app/src/util/pathName.ts                      |  6 ++++
 17 files changed, 73 insertions(+), 54 deletions(-)
 rename README.md => .github/README.md (89%)
 rename README_Sillot.md => .github/README_Sillot.md (88%)
 rename README_Sillot_Docker.md => .github/README_Sillot_Docker.md (100%)
 create mode 100644 .github/about.readme.md

diff --git a/README.md b/.github/README.md
similarity index 89%
rename from README.md
rename to .github/README.md
index 3bfa977154..e8e08b33db 100644
--- a/README.md
+++ b/.github/README.md
@@ -12,21 +12,21 @@
 
 <p align="center">
 <br><br>
-<a href="README_zh_CN.md">思源（SiYuan）</a>&emsp;|&emsp;<a href="README_Sillot.md">汐洛（Sillot）</a>
+<a href="../README_zh_CN.md">思源（SiYuan）</a> | <a href="README_Sillot.md">汐洛（Sillot）</a>
 </p>
 
 <p align="center">
 <br><br><br><br><br>
-<img alt="split" src="./.github/split.png"/>
+<img alt="split" src="./split.png"/>
 </p>
 
 ## 浏览器兼容性
 
-<img src="screenshots/sillot/es2022.png"/>
+<img src="../screenshots/sillot/es2022.png"/>
 
 <p align="center">
 <br><br><br><br><br>
-<img alt="split" src="./.github/split.png"/>
+<img alt="split" src="./split.png"/>
 </p>
 
 ## 🛠️ Contributors
@@ -37,7 +37,7 @@
 
 <p align="center">
 <br><br><br><br><br>
-<img alt="split" src="./.github/split.png"/>
+<img alt="split" src="./split.png"/>
 </p>
 
 ## 🔭 Roadmap
diff --git a/README_Sillot.md b/.github/README_Sillot.md
similarity index 88%
rename from README_Sillot.md
rename to .github/README_Sillot.md
index 6024fcbb69..e58b9a8d0a 100644
--- a/README_Sillot.md
+++ b/.github/README_Sillot.md
@@ -1,9 +1,9 @@
 <p align="center">
-<img alt="Sillot" src="./app/stage/icon.png">
+<img alt="Sillot" src="../app/stage/icon.png">
 </p>
 
 <p align="center">
-<a href="README_zh_CN.md">思源（SiYuan）</a> | 汐洛（Sillot）
+<a href="../README_zh_CN.md">思源（SiYuan）</a> | 汐洛（Sillot）
 
 </p>
 
@@ -33,7 +33,7 @@
 汐洛始终代表先进恣产力，始终拥护全球先进开源力量，坚定不移推动新彖乄面向未来持续发展。
 
 <p align="center">
-<img alt="framework" src="./screenshots/sillot/framework.png">
+<img alt="framework" src="../screenshots/sillot/framework.png">
 </p>
 
 ## 极致优雅
@@ -45,7 +45,7 @@
 汐洛始终坚持精品路线，从不在任何一个细节上妥协。专注于为目标用户提供最好的使用体验，这是实现极致优雅的必由之路。汐洛尊重非目标用户的声音，但并不关心。
 
 <p align="center">
-<img alt="framework" src="./screenshots/sillot/booting1.png">
+<img alt="framework" src="../screenshots/sillot/booting1.png">
 </p>
 
 ## 开发者友好
@@ -64,7 +64,6 @@ go install github.com/ofabry/go-callvis
 
 然后在新终端 `go-callvis main.go`
 
-
 ### 合并冲突
 
 注意事项：
@@ -72,5 +71,5 @@ go install github.com/ofabry/go-callvis
 1. tpl 模板直接合并冲突没有作用，汐洛是通过 JS 生成的 tpl ，因此需要修改 genTPLData.js 等 JS 文件
 
 <p align="center">
-<img alt="split" src="./.github/split.png">
+<img alt="split" src="./split.png">
 </p>
diff --git a/README_Sillot_Docker.md b/.github/README_Sillot_Docker.md
similarity index 100%
rename from README_Sillot_Docker.md
rename to .github/README_Sillot_Docker.md
diff --git a/.github/about.readme.md b/.github/about.readme.md
new file mode 100644
index 0000000000..afcbadce8a
--- /dev/null
+++ b/.github/about.readme.md
@@ -0,0 +1,3 @@
+# [REF](https://docs.github.com/zh/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-readmes)
+
+如果存储库包含多个自述文件，则按以下顺序从各位置中选择显示的文件：.github 目录，然后是存储库的根目录，最后是 docs 目录。
diff --git a/app/package.cli.mjs b/app/package.cli.mjs
index 59628a55d2..5b13c7ede8 100644
--- a/app/package.cli.mjs
+++ b/app/package.cli.mjs
@@ -31,6 +31,17 @@ function updateSpinnerText() {
     spinner.text = `正在执行, 请稍后...\n\n\n\t\t\t已用时 ${hours}时${minutes}分${seconds}秒\n\n\n`;
 }
 
+function getCurrentDateTime() {
+  const now = new Date();
+  const year = now.getFullYear();
+  const month = String(now.getMonth() + 1).padStart(2, '0');
+  const day = String(now.getDate()).padStart(2, '0');
+  const hour = String(now.getHours()).padStart(2, '0');
+  const minute = String(now.getMinutes()).padStart(2, '0');
+  const second = String(now.getSeconds()).padStart(2, '0');
+  return `${year}-${month}-${day} ${hour}:${minute}:${second}`;
+}
+
 // 每秒更新一次spinner文本
 const intervalId = setInterval(updateSpinnerText, 1000);
 const works = {
@@ -92,8 +103,7 @@ function exeHandler(cmds, silent) {
         silent ? iconv.decode(iconv.encode(stderr, "base64"), "gb2312") : stderr
       );
       if (code === 0) {
-        // console.log("cli work done.");
-        spinner.succeed("Sillot mini cli work done.");
+        spinner.succeed("Sillot mini cli work done. \t" + getCurrentDateTime());
       } else {
         spinner.fail("Sillot mini cli work failed.");
       }
diff --git a/app/src/index.ts b/app/src/index.ts
index a0372ac3d9..29b02ea37a 100644
--- a/app/src/index.ts
+++ b/app/src/index.ts
@@ -200,8 +200,6 @@ window.openFileByURL = (openURL) => {
     return false;
 };
 
-window.vConsole = new VConsole({ theme: 'dark' });
-window.vConsole.hideSwitch();
 
 /// #if BROWSER
 window.showKeyboardToolbar = () => {
diff --git a/app/src/menus/workspace.ts b/app/src/menus/workspace.ts
index 1ea181fdce..719fd0843e 100644
--- a/app/src/menus/workspace.ts
+++ b/app/src/menus/workspace.ts
@@ -432,7 +432,7 @@ export const workspaceMenu = (app: App, rect: DOMRect) => {
             label: "vConsole",
             icon: "iconBug",
             click: () => {
-                window.vConsole.show();
+                window.vConsole?.show();
             }
         }).element);
         window.siyuan.menus.menu.popup({x: rect.left, y: rect.bottom});
diff --git a/app/src/mobile/index.ts b/app/src/mobile/index.ts
index 4db43e2b4a..5b218c9768 100644
--- a/app/src/mobile/index.ts
+++ b/app/src/mobile/index.ts
@@ -23,7 +23,6 @@ import {openChangelog} from "../boot/openChangelog";
 import {registerServiceWorker} from "../util/serviceWorker";
 import {loadPlugins} from "../plugin/loader";
 import { SillotEnv } from "../sillot";
-import VConsole from 'vconsole';
 import {saveScroll} from "../protyle/scroll/saveScroll";
 import {removeBlock} from "../protyle/wysiwyg/remove";
 import {isNotEditBlock} from "../protyle/wysiwyg/getBlock";
@@ -78,10 +77,10 @@ class App {
             }
         });
         window.addEventListener("beforeunload", () => {
-            saveScroll(window.siyuan.mobile.editor.protyle);
+            saveScroll(window.siyuan.mobile.editor?.protyle);
         }, false);
         window.addEventListener("pagehide", () => {
-            saveScroll(window.siyuan.mobile.editor.protyle);
+            saveScroll(window.siyuan.mobile.editor?.protyle);
         }, false);
         // 判断手机横竖屏状态
         window.matchMedia("(orientation:portrait)").addEventListener("change", () => {
@@ -105,9 +104,10 @@ class App {
                         fetchPost("/api/system/getEmojiConf", {}, emojiResponse => {
                             window.siyuan.emojis = emojiResponse.data as IEmoji[];
                             setNoteBook(() => {
+                                initRightMenu(this); // 前置避免 initFramework crash 影响
+                                console.log("initRightMenu() resolved");
                                 initFramework(this, confResponse.data.start);
-                            console.log("initFramework() invoked");
-                                initRightMenu(this);
+                                console.log("initFramework() resolved");
                                 openChangelog();
                             });
                         });
@@ -149,7 +149,7 @@ const siyuanApp = new App();
 window.reconnectWebSocket = () => {
     window.siyuan.ws.send("ping", {});
     window.siyuan.mobile.files.send("ping", {});
-    window.siyuan.mobile.editor.protyle.ws.send("ping", {});
+    window.siyuan.mobile.editor?.protyle.ws.send("ping", {});
     window.siyuan.mobile.popEditor?.protyle.ws.send("ping", {});
 };
 window.goBack = goBack;
@@ -166,23 +166,3 @@ window.openFileByURL = (openURL) => {
     }
     return false;
 };
-
-
-window.vConsole = new VConsole({ theme: 'dark' });
-window.vConsole.hideSwitch();
-
-// 接下来即可照常使用 `console` 等方法
-console.log(window.vConsole.version);
-const toolbarConsole = document.querySelector("#toolbarConsole");
-toolbarConsole?.addEventListener("click", () => {
-  if (toolbarConsole.getAttribute("data-mode") === "0") {
-    window.vConsole.showSwitch();
-    toolbarConsole.setAttribute("data-mode", "1");
-  } else {
-    window.vConsole.hideSwitch();
-    toolbarConsole.setAttribute("data-mode", "0");
-  }
-});
-
-// 结束调试后，可移除掉
-// window.vConsole.destroy();
diff --git a/app/src/mobile/util/initFramework.ts b/app/src/mobile/util/initFramework.ts
index df00e572ae..04e26ea3c9 100644
--- a/app/src/mobile/util/initFramework.ts
+++ b/app/src/mobile/util/initFramework.ts
@@ -60,8 +60,11 @@ const openDockMenu = (app: App) => {
 
 export const initFramework = (app: App, isStart: boolean) => {
     setInlineStyle();
+    console.log("initFramework()->setInlineStyle() resolved");
     renderSnippet();
+    console.log("initFramework()->renderSnippet() resolved");
     initKeyboardToolbar();
+    console.log("initFramework()->initKeyboardToolbar() resolved");
     const sidebarElement = document.getElementById("sidebar");
     let outline: MobileOutline;
     let backlink: MobileBacklinks;
@@ -164,11 +167,13 @@ export const initFramework = (app: App, isStart: boolean) => {
         closeModel();
     });
     initEditorName();
+    console.log("initFramework()->initEditorName() resolved");
     if (getOpenNotebookCount() > 0) {
         if (window.JSAndroid && window.openFileByURL(window.JSAndroid.getBlockURL())) {
             return;
         }
         const idZoomIn = getIdZoomInByPath();
+        console.log("initFramework()->getIdZoomInByPath() resolved");
         if (idZoomIn.id) {
             openMobileFileById(app, idZoomIn.id,
                 idZoomIn.isZoomIn ? [Constants.CB_GET_ALL, Constants.CB_GET_HL] : [Constants.CB_GET_HL, Constants.CB_GET_CONTEXT, Constants.CB_GET_ROOTSCROLL]);
diff --git a/app/src/mobile/util/keyboardToolbar.ts b/app/src/mobile/util/keyboardToolbar.ts
index 452659973b..09a0dc3014 100644
--- a/app/src/mobile/util/keyboardToolbar.ts
+++ b/app/src/mobile/util/keyboardToolbar.ts
@@ -412,7 +412,7 @@ export const showKeyboardToolbar = () => {
     if (editor?.protyle.wysiwyg.element.contains(range.startContainer)) {
         editor.protyle.element.parentElement.style.paddingBottom = "42px";
     }
-    getCurrentEditor().protyle.app.plugins.forEach(item => {
+    getCurrentEditor()?.protyle?.app.plugins.forEach(item => {
         item.eventBus.emit("mobile-keyboard-show");
     });
     setTimeout(() => {
@@ -450,7 +450,7 @@ export const hideKeyboardToolbar = () => {
     if (modelElement.style.transform === "translateY(0px)") {
         modelElement.style.paddingBottom = "";
     }
-    getCurrentEditor().protyle.app.plugins.forEach(item => {
+    getCurrentEditor()?.protyle?.app.plugins.forEach(item => {
         item.eventBus.emit("mobile-keyboard-hide");
     });
 };
diff --git a/app/src/protyle/breadcrumb/index.ts b/app/src/protyle/breadcrumb/index.ts
index fe09cdf258..77b2eb6cff 100644
--- a/app/src/protyle/breadcrumb/index.ts
+++ b/app/src/protyle/breadcrumb/index.ts
@@ -222,7 +222,7 @@ ${padHTML}
         let blockElement: Element;
         if (getSelection().rangeCount > 0) {
             const range = getSelection().getRangeAt(0);
-            if (!protyle.wysiwyg.element.isEqualNode(range.startContainer) && !protyle.wysiwyg.element.contains(range.startContainer)) {
+            if (!protyle.wysiwyg?.element.isEqualNode(range.startContainer) && !protyle.wysiwyg?.element.contains(range.startContainer)) {
                 blockElement = getNoContainerElement(protyle.wysiwyg.element.firstElementChild) || protyle.wysiwyg.element.firstElementChild;
             } else {
                 blockElement = hasClosestBlock(range.startContainer) as Element;
@@ -571,7 +571,7 @@ ${padHTML}
         let blockElement: Element;
         if (getSelection().rangeCount > 0) {
             range = getSelection().getRangeAt(0);
-            if (!protyle.wysiwyg.element.isEqualNode(range.startContainer) && !protyle.wysiwyg.element.contains(range.startContainer)) {
+            if (!protyle?.wysiwyg.element.isEqualNode(range.startContainer) && !protyle?.wysiwyg.element.contains(range.startContainer)) {
                 if (protyle.element.id === "searchPreview") {
                     // https://github.com/siyuan-note/siyuan/issues/8807
                     blockElement = hasClosestBlock(protyle.wysiwyg.element.querySelector('[data-type="search-mark"]')) as Element;
diff --git a/app/src/protyle/scroll/saveScroll.ts b/app/src/protyle/scroll/saveScroll.ts
index 90d2c2a677..ef879aa5d4 100644
--- a/app/src/protyle/scroll/saveScroll.ts
+++ b/app/src/protyle/scroll/saveScroll.ts
@@ -6,7 +6,7 @@ import {Constants} from "../../constants";
 import {setStorageVal} from "../util/compatibility";
 
 export const saveScroll = (protyle: IProtyle, getObject = false) => {
-    if (!protyle.wysiwyg.element.firstElementChild || window.siyuan.config.readonly) {
+    if (!protyle.wysiwyg?.element.firstElementChild || window.siyuan.config.readonly) {
         // 报错或者空白页面
         return undefined;
     }
@@ -20,7 +20,7 @@ export const saveScroll = (protyle: IProtyle, getObject = false) => {
     if (getSelection().rangeCount > 0) {
         range = getSelection().getRangeAt(0);
     }
-    if (!range || !protyle.wysiwyg.element.contains(range.startContainer)) {
+    if (!range || !protyle.wysiwyg?.element.contains(range.startContainer)) {
         range = protyle.toolbar.range;
     }
     if (range && protyle.wysiwyg.element.contains(range.startContainer)) {
diff --git a/app/src/protyle/util/onGet.ts b/app/src/protyle/util/onGet.ts
index 0a789f426f..b2d37aae0a 100644
--- a/app/src/protyle/util/onGet.ts
+++ b/app/src/protyle/util/onGet.ts
@@ -131,10 +131,10 @@ const setHTML = (options: {
     const updateReadonly = typeof options.updateReadonly === "undefined" ? protyle.wysiwyg.element.innerHTML === "" : options.updateReadonly;
     if (options.action.includes(Constants.CB_GET_APPEND)) {
         // 动态加载移除
-        if (!protyle.wysiwyg.element.querySelector(".protyle-wysiwyg--select") && !protyle.scroll.keepLazyLoad && protyle.contentElement.scrollHeight > REMOVED_OVER_HEIGHT) {
+        if (!protyle.wysiwyg?.element.querySelector(".protyle-wysiwyg--select") && !protyle.scroll.keepLazyLoad && protyle.contentElement.scrollHeight > REMOVED_OVER_HEIGHT) {
             let removeElement = protyle.wysiwyg.element.firstElementChild as HTMLElement;
             const removeElements = [];
-            while (protyle.wysiwyg.element.childElementCount > 2 && removeElements && !protyle.wysiwyg.element.lastElementChild.isSameNode(removeElement)) {
+            while (protyle.wysiwyg?.element.childElementCount > 2 && removeElements && !protyle.wysiwyg?.element.lastElementChild.isSameNode(removeElement)) {
                 if (protyle.contentElement.scrollHeight - removeElement.offsetTop > REMOVED_OVER_HEIGHT) {
                     removeElements.push(removeElement);
                 } else {
@@ -158,7 +158,7 @@ const setHTML = (options: {
         protyle.contentElement.scrollTop = protyle.contentElement.scrollTop + (firstElement.getBoundingClientRect().top - lastTop);
         protyle.scroll.lastScrollTop = protyle.contentElement.scrollTop;
         // 动态加载移除
-        if (!protyle.wysiwyg.element.querySelector(".protyle-wysiwyg--select") && !protyle.scroll.keepLazyLoad) {
+        if (!protyle.wysiwyg?.element.querySelector(".protyle-wysiwyg--select") && !protyle.scroll?.keepLazyLoad) {
             const removeElements: Element[] = [];
             let childCount = protyle.wysiwyg.element.childElementCount;
             let scrollHeight = protyle.contentElement.scrollHeight;
diff --git a/app/src/protyle/wysiwyg/index.ts b/app/src/protyle/wysiwyg/index.ts
index 183cb126a1..5b7c75f8de 100644
--- a/app/src/protyle/wysiwyg/index.ts
+++ b/app/src/protyle/wysiwyg/index.ts
@@ -2481,7 +2481,7 @@ if  (tableElement && tableElement.isSameNode(item) && item.querySelector(".table
                     protyle.toolbar.range = newRange;
                 }
                 /// #endif
-                if (!protyle.wysiwyg.element.querySelector(".protyle-wysiwyg--select")) {
+                if (!protyle.wysiwyg?.element.querySelector(".protyle-wysiwyg--select")) {
                     countSelectWord(newRange, protyle.block.rootID);
                 }
                 if (getSelection().rangeCount === 0) {
@@ -2568,7 +2568,7 @@ if  (tableElement && tableElement.isSameNode(item) && item.querySelector(".table
                         this.shiftStartElement = undefined;
                     } else {
                         const ids: string[] = [];
-                        if (!protyle.wysiwyg.element.querySelector(".protyle-wysiwyg--select") && protyle.scroll && !protyle.scroll.element.classList.contains("fn__none") && !protyle.scroll.keepLazyLoad &&
+                        if (!protyle?.wysiwyg.element.querySelector(".protyle-wysiwyg--select") && protyle.scroll && !protyle.scroll.element.classList.contains("fn__none") && !protyle.scroll.keepLazyLoad &&
                             (startElement.getBoundingClientRect().top < -protyle.contentElement.clientHeight * 2 || endElement.getBoundingClientRect().bottom > protyle.contentElement.clientHeight * 2)) {
                             showMessage(window.siyuan.languages.crossKeepLazyLoad);
                         }
diff --git a/app/src/search/util.ts b/app/src/search/util.ts
index 476373c981..1638e47f42 100644
--- a/app/src/search/util.ts
+++ b/app/src/search/util.ts
@@ -1296,7 +1296,7 @@ export const inputEvent = (element: Element, config: ISearchOption, edit: Protyl
         element.querySelector("#searchList").scrollTo(0, 0);
         const previousElement = element.querySelector('[data-type="previous"]');
         const nextElement = element.querySelector('[data-type="next"]');
-        edit.protyle?.app.plugins.forEach(item => {
+        edit?.protyle?.app?.plugins.forEach(item => {
             item.eventBus.emit("input-search", {
                 protyle: edit,
                 config,
diff --git a/app/src/sillot/index.ts b/app/src/sillot/index.ts
index da843dab62..499d39e232 100644
--- a/app/src/sillot/index.ts
+++ b/app/src/sillot/index.ts
@@ -8,6 +8,7 @@ import * as ReactDOM from "react-dom"; // 兼容性好
 import Swal from "sweetalert2";
 import {sout} from 'sofill/core'
 import { MusicPlayer } from "./react-music-player";
+import VConsole from 'vconsole';
 import {
   focusBlock,
   focusByOffset,
@@ -44,5 +45,22 @@ export class SillotEnv {
       bS: new bS(),
       ///#endif
     };
+    window.vConsole = new VConsole({ theme: 'dark' });
+    window.vConsole.hideSwitch();
+
+    // 接下来即可照常使用 `console` 等方法
+    console.log(window.vConsole.version);
+    document.querySelector("#toolbarConsole")?.addEventListener("click", () => {
+      if (document.querySelector("#toolbarConsole")?.getAttribute("data-mode") === "0") {
+        window.vConsole?.showSwitch();
+        document.querySelector("#toolbarConsole")?.setAttribute("data-mode", "1");
+      } else {
+        window.vConsole?.hideSwitch();
+        document.querySelector("#toolbarConsole")?.setAttribute("data-mode", "0");
+      }
+    });
+    // 结束调试后，可移除掉
+    // window.vConsole.destroy();
+
   }
 }
diff --git a/app/src/util/pathName.ts b/app/src/util/pathName.ts
index dccec6c657..b1928e4bfe 100644
--- a/app/src/util/pathName.ts
+++ b/app/src/util/pathName.ts
@@ -25,11 +25,13 @@ export const getIdZoomInByPath = () => {
     let isZoomIn = false;
     if (/^web\+siyuan:\/\/blocks\/\d{14}-\w{7}/.test(PWAURL)) {
         // PWA 捕获 web+siyuan://blocks/20221031001313-rk7sd0e?focus=1
+        console.log("getIdZoomInByPath()->PWAURL: ", PWAURL, "\tsubstring p: (20, 20 + 22)");
         id = PWAURL.substring(20, 20 + 22);
         isZoomIn = getSearch("focus", PWAURL) === "1";
     } else if (window.JSAndroid) {
         // PAD 通过思源协议打开
         const SYURL = window.JSAndroid.getBlockURL();
+        console.log("getIdZoomInByPath()->SYURL: ", SYURL);
         id = getIdFromSYProtocol(SYURL);
         isZoomIn = getSearch("focus", SYURL) === "1";
     } else {
@@ -37,6 +39,7 @@ export const getIdZoomInByPath = () => {
         id = searchParams.get("id");
         isZoomIn = searchParams.get("focus") === "1";
     }
+    console.log("getIdZoomInByPath()->id, isZoomIn: ", id, isZoomIn);
     return {
         id, isZoomIn
     };
@@ -47,6 +50,7 @@ export const isSYProtocol = (url: string) => {
 };
 
 export const getIdFromSYProtocol = (url: string) => {
+    console.log("getIdFromSYProtocol()->url: ", url, "\tsubstring p: (16, 16 + 22)");
     return url.substring(16, 16 + 22);
 };
 
@@ -74,12 +78,14 @@ export const getDisplayName = (filePath: string, basename = true, removeSY = fal
         name = pathPosix().basename(filePath);
     }
     if (removeSY && name.endsWith(".sy")) {
+        console.log("getDisplayName()->name: ", name, "\tsubstring p: (0, name.length - 3)");
         name = name.substring(0, name.length - 3);
     }
     return name;
 };
 
 export const getAssetName = (assetPath: string) => {
+    console.log("getAssetName()->assetPath: ", name, "\tsubstring p: (7, assetPath.length - pathPosix().extname(assetPath).length - 23 + 7)");
     return assetPath.substring(7, assetPath.length - pathPosix().extname(assetPath).length - 23 + 7);
 };
 

From 527ad087f87376b67292d9de6c0f253e79de694a Mon Sep 17 00:00:00 2001
From: Soltus <liaoshanyi@qq.com>
Date: Sun, 24 Mar 2024 22:15:54 +0800
Subject: [PATCH 77/77] =?UTF-8?q?=F0=9F=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/package.json b/app/package.json
index 57fc49e1c5..c825843116 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sillot",
-  "version": "0.27.23",
+  "version": "0.27.24",
   "syv": "3.0.5",
   "sypv": "3.0.4",
   "description": "Build Your Eternal Digital Garden",