Browse Source

feat: 合并dev

奔跑的面条 2 years ago
parent
commit
0fdbde1cc1
3 changed files with 9 additions and 6 deletions
  1. 2 0
      src/api/axios.ts
  2. 6 5
      src/api/mock/test.mock.ts
  3. 1 1
      src/utils/utils.ts

+ 2 - 0
src/api/axios.ts

@@ -55,6 +55,8 @@ axiosInstance.interceptors.response.use(
     }
     const { code } = res.data as { code: number }
 
+    if (code === undefined || code === null) return Promise.resolve(res)
+
     // 成功
     if (code === ResultEnum.SUCCESS) {
       return Promise.resolve(res.data)

+ 6 - 5
src/api/mock/test.mock.ts

@@ -10,8 +10,8 @@ export default {
     status: 200,
     msg: '请求成功',
     data: {
-      dimensions: ['product', 'dataOne'],
-      'source|50': [
+    dimensions: ['product', 'dataOne'],
+      'source|20': [
         {
           product: '@name',
           'dataOne|0-900': 3
@@ -37,12 +37,13 @@ export default {
     status: 200,
     msg: '请求成功',
     data: {
-      dimensions: ['product', 'dataOne', 'dataTwo'],
-      'source|50': [
+      dimensions: ['product', 'dataOne', 'dataTwo', 'dataThree'],
+      'source|20': [
         {
           product: '@name',
           'dataOne|100-900': 3,
-          'dataTwo|100-900': 3
+          'dataTwo|100-900': 3,
+          'dataThree|100-900': 3
         }
       ]
     }

+ 1 - 1
src/utils/utils.ts

@@ -282,7 +282,7 @@ export const JSONStringify = <T>(data: T) => {
       }
       // 处理 undefined 丢失问题
       if (typeof val === 'undefined') {
-        return 'undefined'
+        return null
       }
       return val
     },