[fix] Fix the issue where the “Civitai resources” field cannot be par…

…sed in the image of A1111
hbl917070 · Nov 10, 2023 · 03afe05 · 03afe05
1 parent 30883b6
commit 03afe05
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 34 deletions.
diff --git a/Www/ts/Lib.ts b/Www/ts/Lib.ts
@@ -522,8 +522,6 @@ class Lib {
             domBox.setAttribute("open", "true");
             funcChange("true");
         }
-
-
     }
 
 
@@ -575,7 +573,10 @@ class Lib {
         if (typeof str === "object") {
             jsonFormat = JSON.stringify(str, null, space);
             ok = true;
-        } else if (str.startsWith('{') && str.endsWith('}')) {
+        } else if (
+            (str.startsWith('{') && str.endsWith('}'))
+            || (str.startsWith('[') && str.endsWith(']'))
+        ) {
             try {
                 json = JSON.parse(str);
                 jsonFormat = JSON.stringify(json, null, space);
@@ -666,4 +667,4 @@ class Throttle {
             this.timer(); //遞迴
         }, this.timeout);
     }
-}
+}
diff --git a/Www/ts/MainWindow/AiDrawingPrompt.ts b/Www/ts/MainWindow/AiDrawingPrompt.ts
@@ -27,19 +27,28 @@ class AiDrawingPrompt {
 			let stack = [];
 			let partStart = 0;
 			for (let i = 0; i < input.length; i++) {
-				if (input[i] === '{') {
+				if (input[i] === '[') {
+					stack.push('[');
+				} else if (input[i] === ']') {
+					if (stack.length > 0 && stack[stack.length - 1] === '[') {
+						stack.pop();
+					}
+				}
+				else if (input[i] === '{') {
 					stack.push('{');
 				} else if (input[i] === '}') {
 					if (stack.length > 0 && stack[stack.length - 1] === '{') {
 						stack.pop();
 					}
-				} else if (input[i] === '"') {
+				}
+				else if (input[i] === '"') {
 					if (stack.length > 0 && stack[stack.length - 1] === '"') {
 						stack.pop();
 					} else {
 						stack.push('"');
 					}
-				} else if (input[i] === ',' && stack.length === 0) {
+				}
+				else if (input[i] === ',' && stack.length === 0) {
 					parts.push(input.slice(partStart, i));
 					partStart = i + 1;
 				}
@@ -106,12 +115,10 @@ class AiDrawingPrompt {
 
 		function retPush(title: string, text: string | undefined) {
 			if (text !== undefined && text !== "") {
-				retData.push(
-					{
-						title: title,
-						text: text
-					}
-				);
+				retData.push({
+					title: title,
+					text: text
+				});
 			}
 		}
 
@@ -164,12 +171,10 @@ class AiDrawingPrompt {
 
 		function retPush(title: string, text: string | undefined) {
 			if (text !== undefined && text !== null && text !== "") {
-				retData.push(
-					{
-						title: title,
-						text: text.toString().trim()
-					}
-				);
+				retData.push({
+					title: title,
+					text: text.toString().trim()
+				});
 			}
 		}
 		function getKey(obj: any) {
@@ -351,12 +356,10 @@ class AiDrawingPrompt {
 
 		function retPush(title: string, text: string | undefined) {
 			if (text !== undefined && text !== null && text !== "") {
-				retData.push(
-					{
-						title: title,
-						text: text.toString().trim()
-					}
-				);
+				retData.push({
+					title: title,
+					text: text.toString().trim()
+				});
 			}
 		}
 
@@ -380,9 +383,7 @@ class AiDrawingPrompt {
 			retPush(title, text);
 		}
 
-
 		if (objImage !== undefined) {
-
 			let prompt = objImage.prompt[0].prompt;
 			let seed = objImage.seed;
 			let steps = objImage.steps;
@@ -417,12 +418,10 @@ class AiDrawingPrompt {
 
 		function retPush(title: string, text: string | undefined) {
 			if (text !== undefined && text !== null && text !== "") {
-				retData.push(
-					{
-						title: title,
-						text: text.toString().trim()
-					}
-				);
+				retData.push({
+					title: title,
+					text: text.toString().trim()
+				});
 			}
 		}
 
@@ -439,4 +438,4 @@ class AiDrawingPrompt {
 
 		return retData;
 	}
-}
+}