Update PNG_info_web.js

PNG_info_web.js

@@ -348,16 +348,16 @@ let imgStorage=(img)=>{
   //此节点render-tree是否已形成
   function isElementRendered(el) {
     const style = window.getComputedStyle(el);
-  
+
     if (style.getPropertyValue('display') === 'none') {
       return false;
     }
-  
+
     // 判断是否有宽高
     if (el.offsetWidth <= 0 || el.offsetHeight <= 0) {
       return false;
     }
-  
+
     return true;
   }
 
@@ -597,9 +597,11 @@ let imgStorage=(img)=>{
       hr_checkpoint_element.dispatchEvent(focus);
       queueMicrotask(() => {
       // 将函数加入到任务队列待下一次轮询延迟下拉框加载完毕后执行
-      let Hirescheckpoint=result.Hirescheckpoint.replace(/ [.*]$/,"")
-        const Hirescheckpoint_list_elem = shadowRoot.querySelector(
-        `[data-value="${Hirescheckpoint || "Use same ckpt"}"]`
+      var Hirescheckpoint=result.Hirescheckpoint
+          // ?result.Hirescheckpoint.replace(/ \[.*\]$/,""):""
+        console.log(Hirescheckpoint)
+        const Hirescheckpoint_list_elem = document.querySelector(
+        `[data-value="${Hirescheckpoint || "Use same checkpoint"}"]`
       );
       Hirescheckpoint_list_elem.dispatchEvent(mousevent);
     });
@@ -853,20 +855,21 @@ let imgStorage=(img)=>{
         // const match = inputString.match(/(?<=prompt:)(.*)(?=Negative prompt:)/s)[0].trim();]
         let tempRes=res[0].text
         console.log(1223)
-        result.prompt = res[0].text.match(/(.+)(?=(Negative prompt|Steps))/s)[0].trim();
+        result.prompt = res[0].text.match(/(.+)(?=(\nNegative prompt))/s)?
+            res[0].text.match(/(.+)(?=(\nNegative prompt))/s)[0].trim():res[0].text.match(/(.+)(?=(\nSteps))/s)[0].trim()
       console.log(result.prompt)
-        result.negativePrompt = res[0].text.match(/(?<=Negative prompt:)(.*)(?=Steps:)/s)?
-             res[0].text.match(/(?<=Negative prompt:)(.*)(?=Steps:)/s)[0]:""
-        result.HiresPrompt = res[0].text.match(/(?<=Hires prompt:)(.*)(?=Hires negative prompt| Hires upscale)/s)?
-             res[0].text.match(/(?<=Hires prompt:)(.*)(?=Hires negative prompt|Hires upscale)/s)[0]:""
+        result.negativePrompt = res[0].text.match(/(?<=Negative prompt:)(.*)(?=\nSteps:)/s)?
+             res[0].text.match(/(?<=Negative prompt:)(.*)(?=\nSteps:)/s)[0]:""
+      //否定预查来确认第一个或者最后一个来确保不重复
+        result.HiresPrompt = res[0].text.match(/(?<=Hires prompt:)(.*?)(?=(?!Hires negative prompt) Hires upscale|Hires negative prompt)/s)?
+             res[0].text.match(/(?<=Hires prompt:)(.*?)(?=(?!Hires negative prompt) Hires upscale|Hires negative prompt)/s)[0]:""
         result.HiresNegativePrompt =res[0].text.match(/(?<=Hires negative prompt:)(.*)(?=Hires upscale)/s)?
-             res[0].text.match(/(?<=Hires negative prompt:)(.*)(?=Hires upscale)/s)[0]:""
-      console.log(result.HiresNegativePrompt)
-        tempRes=tempRes.replace(result.prompt,"")
+             res[0].text.match(/(?<=Hires negative prompt:)(.*)(?=Hires upscale[^r])/s)[0].trim():""
+      console.log(result.prompt)
+        tempRes=tempRes.replace(`${result.prompt}`,"").replace(`\nNegative prompt:${result.negativePrompt}`,"")
+            .replace(` Hires prompt:${result.HiresPrompt}`,"").replace(` Hires negative prompt:${result.HiresNegativePrompt}`,"")
       console.log(tempRes)
-        let resArr = tempRes.replace(/"([^"]*)"/g, function(match, group) {
-            return match.replace(/,/g, "<comma>").replace(/:/g, "<maohao>");
-          }).trim().split(",");
+        let resArr = tempRes.trim().split(",");
         console.log(resArr)
         resArr.forEach((e) => {
           result[e.split(":")[0].replace(/\s+/g, "")] = e.split(":")[1].replace(/<comma>/g, ",").replace(/<maohao>/g, ":").trim();