From 6a3095c56cd648475a588b1e30b6b0adccc758c6 Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Thu, 29 Aug 2024 16:53:02 +0800
Subject: [PATCH 1/2] :art: No longer limits the number of dynamically loaded
 blocks in the editor https://github.com/siyuan-note/siyuan/issues/12359

---
 app/src/config/editor.ts          | 6 +-----
 app/src/mobile/settings/editor.ts | 2 +-
 kernel/conf/editor.go             | 1 -
 kernel/model/conf.go              | 3 ---
 4 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/app/src/config/editor.ts b/app/src/config/editor.ts
index 851b2c65e..64543078e 100644
--- a/app/src/config/editor.ts
+++ b/app/src/config/editor.ts
@@ -165,7 +165,7 @@ export const editor = {
         <div class="b3-label__text">${window.siyuan.languages.dynamicLoadBlocksTip}</div>
     </div>
     <span class="fn__space"></span>
-    <input class="b3-text-field fn__flex-center fn__size200" id="dynamicLoadBlocks" type="number" min="48" max="1024" value="${window.siyuan.config.editor.dynamicLoadBlocks}"/>
+    <input class="b3-text-field fn__flex-center fn__size200" id="dynamicLoadBlocks" type="number" min="48" value="${window.siyuan.config.editor.dynamicLoadBlocks}"/>
 </div>
 <div class="fn__flex b3-label config__item">
     <div class="fn__flex-1">
@@ -328,10 +328,6 @@ export const editor = {
                 dynamicLoadBlocks = 48;
                 (editor.element.querySelector("#dynamicLoadBlocks") as HTMLInputElement).value = "48";
             }
-            if (1024 < dynamicLoadBlocks) {
-                dynamicLoadBlocks = 1024;
-                (editor.element.querySelector("#dynamicLoadBlocks") as HTMLInputElement).value = "1024";
-            }
 
             fetchPost("/api/setting/setEditor", {
                 fullWidth: (editor.element.querySelector("#fullWidth") as HTMLInputElement).checked,
diff --git a/app/src/mobile/settings/editor.ts b/app/src/mobile/settings/editor.ts
index 66f88b761..6e6506d58 100644
--- a/app/src/mobile/settings/editor.ts
+++ b/app/src/mobile/settings/editor.ts
@@ -195,7 +195,7 @@ export const initEditor = () => {
 <div class="b3-label">
     ${window.siyuan.languages.dynamicLoadBlocks}
     <span class="fn__hr"></span>
-    <input class="b3-text-field fn__block" id="dynamicLoadBlocks" type="number" min="48" max="1024" value="${window.siyuan.config.editor.dynamicLoadBlocks}"/>
+    <input class="b3-text-field fn__block" id="dynamicLoadBlocks" type="number" min="48" value="${window.siyuan.config.editor.dynamicLoadBlocks}"/>
     <div class="b3-label__text">${window.siyuan.languages.dynamicLoadBlocksTip}</div>
 </div>
 <div class="b3-label">
diff --git a/kernel/conf/editor.go b/kernel/conf/editor.go
index d94d72915..71a567966 100644
--- a/kernel/conf/editor.go
+++ b/kernel/conf/editor.go
@@ -56,7 +56,6 @@ type Editor struct {
 
 const (
 	MinDynamicLoadBlocks = 48
-	MaxDynamicLoadBlocks = 1024
 )
 
 func NewEditor() *Editor {
diff --git a/kernel/model/conf.go b/kernel/model/conf.go
index e4e101501..bc6286db2 100644
--- a/kernel/model/conf.go
+++ b/kernel/model/conf.go
@@ -247,9 +247,6 @@ func InitConf() {
 	if conf.MinDynamicLoadBlocks > Conf.Editor.DynamicLoadBlocks {
 		Conf.Editor.DynamicLoadBlocks = conf.MinDynamicLoadBlocks
 	}
-	if conf.MaxDynamicLoadBlocks < Conf.Editor.DynamicLoadBlocks {
-		Conf.Editor.DynamicLoadBlocks = conf.MaxDynamicLoadBlocks
-	}
 	if 0 > Conf.Editor.BacklinkExpandCount {
 		Conf.Editor.BacklinkExpandCount = 0
 	}

From b924452eab0627e23ebc29d469a0c51a731ec8b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yingyi=20/=20=E9=A2=96=E9=80=B8?=
 <49649786+Zuoqiu-Yingyi@users.noreply.github.com>
Date: Fri, 30 Aug 2024 09:43:16 +0800
Subject: [PATCH 2/2] :technologist: Fix API `/api/asset/upload` response body
 `succMap` field (#12361)

* :bug: Fix API `/api/asset/upload` response body `succMap` field

* :bug: Fix #12255
---
 app/src/protyle/util/Options.ts | 2 +-
 kernel/model/upload.go          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/protyle/util/Options.ts b/app/src/protyle/util/Options.ts
index bf0f132a3..020be99a8 100644
--- a/app/src/protyle/util/Options.ts
+++ b/app/src/protyle/util/Options.ts
@@ -126,7 +126,7 @@ export class Options {
             url: Constants.UPLOAD_ADDRESS,
             extraData: {},
             fieldName: "file[]",
-            filename: (name: string) => name.replace(/[\\/:*?"'<>|]/g, ""),
+            filename: (name: string) => name.replace(/[\\/:*?"'<>|\[\]\(\)~!`&{}=#%$]/g, ""),
             linkToImgUrl: "",
             withCredentials: false,
         }
diff --git a/kernel/model/upload.go b/kernel/model/upload.go
index 65e7d80a3..ad57efe60 100644
--- a/kernel/model/upload.go
+++ b/kernel/model/upload.go
@@ -100,7 +100,7 @@ func InsertLocalAssets(id string, assetPaths []string, isUpload bool) (succMap m
 				return
 			}
 			f.Close()
-			succMap[fName] = "assets/" + fName
+			succMap[baseName] = "assets/" + fName
 		}
 	}
 	IncSync()
@@ -284,7 +284,7 @@ func Upload(c *gin.Context) {
 				os.RemoveAll(tmpDir2)
 			}
 
-			succMap[fName] = strings.TrimPrefix(path.Join(relAssetsDirPath, fName), "/")
+			succMap[baseName] = strings.TrimPrefix(path.Join(relAssetsDirPath, fName), "/")
 		}
 	}