doway-coms 1.4.34 → 1.4.36

package/dist/package.json

@@ -0,0 +1,12 @@
+{
+  "name": "doway-coms",
+  "version": "1.0.0",
+  "description": "",
+  "main": "doway-coms.common.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC"
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doway-coms",
-  "version": "1.4.34",
+  "version": "1.4.36",
   "description": "doway组件库",
   "author": "dowaysoft",
   "main": "packages/index.js",

package/packages/BaseSearch/src/index.vue

@@ -337,7 +337,6 @@ import {
   Icon,
   Select,
   SelectOption,
-  RangePicker,
   Tag,
   DatePicker,
   InputGroup,
@@ -355,9 +354,9 @@ export default {
     Icon,
     Select,
     SelectOption: Select.Option,
-    RangePicker,
     Tag,
     DatePicker,
+    RangePicker: DatePicker.RangePicker,
     Input,
     InputGroup: Input.Group,
     InputNumber,

package/packages/utils/request.js

@@ -28,12 +28,28 @@ service.interceptors.request.use(
 // respone interceptor
 service.interceptors.response.use(
   response => {
-    // store.dispatch(
-    //   "setLastRequireTime",
-    //   moment().format("YYYY-MM-DD HH:mm:ss")
-    // );
-
     const res = response.data
+    // 导出文件进入判断
+    if (res instanceof Blob) {
+      if (res.type === 'application/json') {
+        const enc = new TextDecoder('utf-8');
+        res.arrayBuffer().then((buffer) => {
+          const tempData = JSON.parse(enc.decode(new Uint8Array(buffer))) || {};
+          if (tempData['code'] && tempData['code'] === 500) {
+            notification.error({
+              message: '错误信息',
+              top:"100px",
+              description: h => {
+                return h('div', null, [
+                  h('p', { domProps: { innerHTML: tempData['msg'] } }, null)
+                ])
+              }
+            })
+          }
+        });
+      }
+      return response;
+    }
     if (res.status === 200 || res.code === 200) {
       return response.data
     }
@@ -41,7 +57,6 @@ service.interceptors.response.use(
       return response.data
     }
     if (res.code === 401) {
-      // alert('会话过期2');
       store.dispatch('logOut')
       return Promise.reject(res.msg)
     }
@@ -53,10 +68,7 @@ service.interceptors.response.use(
           h('p', { domProps: { innerHTML: res.msg } }, null)
         ])
       }
-      // description:parseContent.content
     })
-
-    // notification['error']({ message: '错误信息', description: res.msg })
     return Promise.reject(res.msg)
   },
   error => {