fix lint & add error handling for json parse

didi · Jun 21, 2024 · 457aa05 · 457aa05
1 parent 5e2740e
commit 457aa05
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/packages/api-proxy/__tests__/web/create-selector-query.spec.js b/packages/api-proxy/__tests__/web/create-selector-query.spec.js
@@ -13,8 +13,8 @@ describe('test create-selector-query', () => {
       template: `
         <div>
           <div class="class1">child class1</div>
-          <div class="class2" data-re="class2" style="background-color:red">child class2</div>
-          <div class="class2" data-re="class2" style="background-color:red">child class2</div>
+          <div class="class2" data-re='"class2"' style="background-color:red">child class2</div>
+          <div class="class2" data-re='"class2"' style="background-color:red">child class2</div>
         </div>
       `,
       mounted () {

diff --git a/packages/api-proxy/src/common/js/utils.js b/packages/api-proxy/src/common/js/utils.js
@@ -79,6 +79,7 @@ function warn (msg) {
 function error (msg) {
   console.error && console.error(`[@mpxjs/api-proxy error]:\n ${msg}`)
 }
+
 function envError (method) {
   return () => {
     console.error && console.error(`[@mpxjs/api-proxy error]:\n ${__mpx_mode__}环境不支持${method}方法`)
@@ -99,7 +100,11 @@ function parseDataset (dataset) {
   const parsed = {}
   for (const key in dataset) {
     if (hasOwn(dataset, key)) {
-      parsed[key] = JSON.parse(dataset[key])
+      try {
+        parsed[key] = JSON.parse(dataset[key])
+      } catch (e) {
+        parsed[key] = dataset[key]
+      }
     }
   }
   return parsed

diff --git a/packages/utils/src/element.js b/packages/utils/src/element.js
@@ -60,7 +60,15 @@ function collectDataset (props, needParse = false) {
     if (hasOwn(props, key)) {
       const matched = datasetReg.exec(key)
       if (matched) {
-        dataset[matched[1]] = needParse ? JSON.parse(props[key]) : props[key]
+        if (needParse) {
+          try {
+            dataset[matched[1]] = JSON.parse(props[key])
+          } catch (e) {
+            dataset[matched[1]] = props[key]
+          }
+        } else {
+          dataset[matched[1]] = props[key]
+        }
       }
     }
   }