@10yun/cv-pc-ui 0.2.13 → 0.2.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@10yun/cv-pc-ui",
-  "version": "0.2.13",
+  "version": "0.2.17",
   "description": "cvjs-pc-ui组件",
   "author": "10yun",
   "private": false,
@@ -31,8 +31,8 @@
   },
   "dependencies": {
     "async-validator": "^4.0.7",
-    "axios": "^0.24.0",
-    "core-js": "^3.20.2",
+    "axios": "^0.26.0",
+    "core-js": "^3.21.0",
     "element-ui": "^2.15.6",
     "vue": "^2.6.14",
     "vue-router": "^3.5.3"
@@ -43,8 +43,8 @@
     "@vue/cli-service": "~4.5.15",
     "babel-eslint": "^10.1.0",
     "babel-plugin-transform-remove-console": "^6.9.4",
-    "eslint": "^8.6.0",
-    "eslint-plugin-vue": "^8.2.0",
+    "eslint": "^8.9.0",
+    "eslint-plugin-vue": "^8.4.1 ",
     "vue-template-compiler": "^2.6.14"
   }
 }

package/plugins/request.js

@@ -66,6 +66,7 @@ function showPromiError(err) {
     dangerouslyUseHTMLString: true,
     message: errHtml
   });
+
   return Promise.reject(err);
   /**
    * 以下是，是否重新请求
@@ -115,10 +116,11 @@ class RequestClass {
     this.headers = Object.assign({}, {
     }, (options.headers || {}));
 
+    this.canshuOpt = {};
 
     /* 新创建 axios 实例配置 */
     this.creSett = Object.assign({}, {
-      timeout: 5000, // request timeout
+      timeout: options.timeout || 5000, // request timeout
       // 表示跨域请求时是否需要使用凭证;
       // 开启withCredentials后，服务器才能拿到你的cookie
       // 当然后端服务器也要设置允许你获取你开启了才有用
@@ -250,6 +252,10 @@ class RequestClass {
     this.requests = Object.assign({}, this.requests, (options || {}));
     return this;
   }
+  setOptions(options) {
+    this.canshuOpt = Object.assign({}, this.canshuOpt, (options || {}));
+    return this;
+  }
   /**
    * 设置响应
    */
@@ -284,7 +290,13 @@ class RequestClass {
       case 100404:
       case 404:
       case '404':
-        Message({ showClose: true, type: 'error', message: apiResData.msg || "操作失败", });
+        let msg404 = apiResData.msg || "操作失败";
+        Message({
+          showClose: true,
+          type: 'error',
+          dangerouslyUseHTMLString: true,
+          message: `${msg404}`
+        });
         return Promise.reject(apiResData);
         return;
         break;
@@ -320,8 +332,13 @@ class RequestClass {
       // request_setttings.url = apiUrl
     }
     this.reqObj.headers = this.headers;
+
+    let canshuOpt = this.canshuOpt || {};
+    this.canshuOpt = {};
+
     if (type == 'POST') {
       return this.reqObj.post(apiUrl, reqData, {
+        ...canshuOpt,
         // headers: {
         // 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
         // 'Accept': 'application/json, text/javascript, */*; q=0.01',
@@ -329,6 +346,7 @@ class RequestClass {
       });
     } else if (type == 'GET') {
       return this.reqObj.get(apiUrl, {
+        ...canshuOpt,
         params: {
           ...reqData
         }
@@ -348,6 +366,13 @@ class RequestClass {
           ...reqData
         }
       });
+    } else if (type == 'UPLOAD') {
+      return this.reqObj.post(apiUrl, reqData, {
+        ...canshuOpt,
+        headers: {
+          "Content-Type": "multipart/form-data"
+        }
+      });
     }
   }
   /**
@@ -396,6 +421,12 @@ class RequestClass {
     let argumentsArr = arguments; return this.unifyApi('url', 'DELETE', argumentsArr);
   }
   /* 图片上传通用 */
+  flagUpload() {
+    let argumentsArr = arguments; return this.unifyApi('flag', 'UPLOAD', argumentsArr);
+  }
+  urlUpload() {
+    let argumentsArr = arguments; return this.unifyApi('url', 'UPLOAD', argumentsArr);
+  }
   flagUpImg() {
     let argumentsArr = arguments; return this.unifyApi('flag', 'UPLOAD', argumentsArr);
   }
@@ -469,6 +500,8 @@ class RequestClass {
         }
       } else if (arg2Type === "[object Object]") {
         reqData = arg2Val || {};
+      } else if (arg2Type === "[object FormData]") {
+        reqData = arg2Val || new FormData();
       }
       return _this.apiAll(methodType, apiUrl, reqData);
     } else {