修复JSON bigint key失真问题；修复chatgpt工具小bug

zxlie · Mar 22, 2023 · 677aed6 · arsentiii · Mar 27, 2023 · 677aed6
1 parent 371059f
commit 677aed6
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 5 deletions.
diff --git a/apps/chatgpt/index.js b/apps/chatgpt/index.js
@@ -74,7 +74,8 @@ new Vue({
             if(this.showLoading) return;
             let sendTime = (new Date()).format('yyyy/MM/dd HH:mm:ss');
             // 先加入队列，先展示，获取成功后会移除
-            this.results.push({sendTime,message:configs.data.prompt});
+            let prompt = configs.data.prompt || configs.data.messages[0].content;
+            this.results.push({sendTime,message:prompt});
             this.toggleLoading();
             this.$nextTick(() => {
                 this.letMsgScrollIntoView();
@@ -126,7 +127,7 @@ new Vue({
 
                 return configs.buildResponse(json).then(respContent => {
                     this.results.pop(); // 把最后一个节点移除掉，重新添加一个干净的
-                    this.results.push({ id,sendTime,message:configs.data.prompt,respTime,respContent });
+                    this.results.push({ id,sendTime,message:prompt,respTime,respContent });
                     this.saveConversation();
                     this.toggleLoading();
                     this.$nextTick(() => {
@@ -159,7 +160,7 @@ new Vue({
                     return new Promise(resolve => {
                         let respText ;
                         if(this.isGPT35) {
-                            respText = json.choices[0].message.coontent.replace(/^\？\n\n/,'')
+                            respText = json.choices[0].message.content.replace(/^\？\n\n/,'')
                         }else{
                             respText = json.choices[0].text.replace(/^\？\n\n/,'');
                         }

diff --git a/apps/code-beautify/content-script.js b/apps/code-beautify/content-script.js
@@ -51,7 +51,9 @@ window.codebeautifyContentScript = (() => {
             // 用webwork的方式来进行格式化，效率更高
             let worker = new Worker(URL.createObjectURL(new Blob(["(" + highlightWebWorker.toString() + ")()"], {type: 'text/javascript'})));
             worker.onmessage = (event) => {
-                code.innerHTML = "<ol><li><span>" + event.data.replace(/\n/gm, '</span></li><li><span>') + '</span></li></ol>';
+                code.innerHTML = "<ol><li><span>" + event.data
+                    .replace(/</gm,'&lt;').replace(/>/gm,'&gt;')
+                    .replace(/\n/gm, '</span></li><li><span>') + '</span></li></ol>';
                 callback && callback();
             };
             worker.postMessage(txtResult);

diff --git a/apps/json-format/index.js b/apps/json-format/index.js
@@ -104,6 +104,7 @@ new Vue({
                 }
                 // 这里可能会throw exception
                 jsonObj = JSON.parse(source);
+
             } catch (ex) {
                 // new Function的方式，能自动给key补全双引号，但是不支持bigint，所以是下下策，放在try-catch里搞
                 try {
@@ -127,6 +128,15 @@ new Vue({
                 }
             }
 
+            try{
+                // 这里多做一个动作，给没有携带双引号的Key都自动加上，防止Long类型失真
+                const regex = /([{,]\s*)(\w+)(\s*:)/g;
+                source = source.replace(regex, '$1"$2"$3');
+                jsonObj = JSON.parse(source);
+            }catch(e){
+                this.errorMsg = e.message;
+            }
+
             // 是json格式，可以进行JSON自动格式化
             if (jsonObj != null && typeof jsonObj === "object" && !this.errorMsg.length) {
                 try {

diff --git a/apps/manifest.json b/apps/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "FeHelper(前端助手)-Dev",
   "short_name": "FeHelper",
-  "version": "2023.03.0410",
+  "version": "2023.03.2212",
   "manifest_version": 3,
   "description": "JSON自动格式化、手动格式化，支持排序、解码、下载等，更多功能可在配置页按需安装！",
   "icons": {

diff --git a/output/fehelper.zip b/output/fehelper.zip