@10yun/cv-pc-ui 0.2.34 → 0.2.37

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@10yun/cv-pc-ui",
-  "version": "0.2.34",
+  "version": "0.2.37",
   "description": "cvjs-pc-ui组件",
   "author": "10yun",
   "private": false,
@@ -27,23 +27,21 @@
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
     "lint": "vue-cli-service lint",
-    "build-bundle": "vue-cli-service build --target lib --name cv-pc-ui --dest ./lib/ ./src/index.js",
+    "build-bundle": "vue-cli-service build --target lib --name cv-pc-ui --dest ./npmpack/ ./src/index.js",
     "build-lib": "vue-cli-service build --target lib --name cv-pc-ui --dest ./lib/ ./src/index.js  --no-clean "
   },
   "dependencies": {
-    "async-validator": "^4.0.8",
-    "core-js": "^3.22.2",
-    "element-ui": "^2.15.8",
-    "vue": "^2.6.14",
+    "async-validator": "^4.1.1",
+    "core-js": "^3.24.1",
+    "element-ui": "^2.15.9",
+    "vue": "^2.7.8",
     "vue-router": "^3.5.3"
   },
   "devDependencies": {
-    "axios": "^0.26.1",
-    "@vue/cli-plugin-babel": "~4.5.15",
-    "@vue/cli-plugin-eslint": "~4.5.15",
-    "@vue/cli-service": "~4.5.15",
-    "babel-eslint": "^10.1.0",
+    "axios": "^0.27.2",
+    "@vue/cli-plugin-babel": "~4.5.19",
+    "@vue/cli-service": "~4.5.19",
     "babel-plugin-transform-remove-console": "^6.9.4",
-    "vue-template-compiler": "^2.6.14"
+    "vue-template-compiler": "^2.7.8"
   }
 }

package/plugins/_httpStatus.js

@@ -13,9 +13,9 @@ const showStatus = {
   503: '服务不可用(503)',
   504: '网络超时(504)',
   505: 'HTTP版本不受支持(505)',
-  10001: "未登录",
-  10002: "token过期",
-  10009: "退出登录",
+  10001: '未登录',
+  10002: 'token过期',
+  10009: '退出登录'
 };
 
-export default showStatus;
+export default showStatus;

package/plugins/request.js

@@ -1,5 +1,5 @@
-import AxiosClassBase from "axios";
-import { Message } from "element-ui";
+import AxiosClassBase from 'axios';
+import { Message } from 'element-ui';
 
 // import showStatus from './_httpStatus';
 function confirmEnding(str, target) {
@@ -22,7 +22,6 @@ function showErrorMsg(msg) {
   });
 }
 
-
 function showPromiError(err) {
   // console.log('=======showPromiError', err);
   var errorMsg = '';
@@ -38,7 +37,7 @@ function showPromiError(err) {
     // The request was made but no response was received
     // `err.request` is an instance of XMLHttpRequest in the browser and an instance of
     // http.ClientRequest in node.js
-    console.log(err.request);
+    // console.log(err.request);
   } else {
     // Something happened in setting up the request that triggered an Error
     // console.log('Error', );
@@ -49,11 +48,17 @@ function showPromiError(err) {
   var errorMethod = errorConf.method;
   var errHtml = '';
   errHtml += '<div style="color:#333;">请求异常，请重试';
-  errHtml += '<br><span>Error：</span> ' + "请求异常，请重试";
-  errHtml += '<br><div><span style="float:left;">url：</span> <div style="min-height:50px;width:300px;word-wrap: break-word;">' + errorUrl + '</div></div>';
+  errHtml += '<br><span>Error：</span> ' + '请求异常，请重试';
+  errHtml +=
+    '<br><div><span style="float:left;">url：</span> <div style="min-height:50px;width:300px;word-wrap: break-word;">' +
+    errorUrl +
+    '</div></div>';
   errHtml += '<br><span>method：</span> ' + errorMethod;
   errHtml += '<br><span>状态码：</span> ' + errorStatus;
-  errHtml += '<br><div><span style="float:left;">错误信息：</span> <div style="min-height:50px;width:300px;word-wrap: break-word;">' + errorMsg + '</div></div>';
+  errHtml +=
+    '<br><div><span style="float:left;">错误信息：</span> <div style="min-height:50px;width:300px;word-wrap: break-word;">' +
+    errorMsg +
+    '</div></div>';
   errHtml += '</div>';
 
   // 非401错误直接返回错误
@@ -71,22 +76,19 @@ function showPromiError(err) {
   /**
    * 以下是，是否重新请求
    */
-  MessageBox.confirm('超出重新请求次数~', "提示", {
-    confirmButtonText: "确定",
+  MessageBox.confirm('超出重新请求次数~', '提示', {
+    confirmButtonText: '确定',
     showCancelButton: false,
     showClose: false,
     closeOnClickModal: false,
     closeOnPressEscape: false,
-    customClass: "auth401box"
-  }).then(() => {
-
-  }).catch(() => {
-
-  });
+    customClass: 'auth401box'
+  })
+    .then(() => {})
+    .catch(() => {});
   if (!errorConf || !errorConf.retry) return Promise.reject(err);
   errorConf.__retryCount = errorConf.__retryCount || 0;
   if (errorConf.__retryCount >= errorConf.retry) {
-
     // Reject with the error
     return Promise.reject(err);
   }
@@ -111,22 +113,24 @@ class RequestClass {
 
     this.flagMap = options.flagMap || {};
     this.baseURL = options.baseURL || '';
-    this.requests = Object.assign({}, {
-    }, (options.requests || {}));
-    this.headers = Object.assign({}, {
-    }, (options.headers || {}));
+    this.requests = Object.assign({}, {}, options.requests || {});
+    this.headers = Object.assign({}, {}, options.headers || {});
 
     this.canshuOpt = {};
 
     /* 新创建 axios 实例配置 */
-    this.creSett = Object.assign({}, {
-      timeout: options.timeout || 5000, // request timeout
-      // 表示跨域请求时是否需要使用凭证;
-      // 开启withCredentials后，服务器才能拿到你的cookie
-      // 当然后端服务器也要设置允许你获取你开启了才有用
-      // withCredentials: true, // 开启跨域身份凭证
-      retry: 2
-    }, {});
+    this.creSett = Object.assign(
+      {},
+      {
+        timeout: options.timeout || 5000, // request timeout
+        // 表示跨域请求时是否需要使用凭证;
+        // 开启withCredentials后，服务器才能拿到你的cookie
+        // 当然后端服务器也要设置允许你获取你开启了才有用
+        // withCredentials: true, // 开启跨域身份凭证
+        retry: 2
+      },
+      {}
+    );
 
     this._initReqHandle();
     // this.flagApi = this.flagApi.bind(this);
@@ -146,7 +150,7 @@ class RequestClass {
       ...this.creSett,
       baseURL: this.baseURL,
       headers: {
-        ...this.headers,
+        ...this.headers
         // 'currPage':location.pathname,
         // 'syOpenAppCsrfToken': '',
         // 'syOpenAppSessionId': Lockr.get("sessionId"),
@@ -164,8 +168,8 @@ class RequestClass {
         // }
       },
       requests: {
-        ...this.requests,
-      },
+        ...this.requests
+      }
       // transformRequest: [(data) => {
       //   data = JSON.stringify(data)
       //   return data
@@ -188,76 +192,113 @@ class RequestClass {
     this.reqObj.defaults.retryDelay = 1000;
 
     /**
-    * 请求拦截器：request拦截器==>对请求参数做处理
-    */
-    this.reqObj.interceptors.request.use((config) => {
-      // 每次发送请求之前判断是否存在token，如果存在，则统一在http请求的header都加上token，不用每次请求都手动添加了
-      // 即使本地存在token，也有可能token是过期的，所以在响应拦截器中要对返回状态进行判断
-      // const token = store.state.token;
-      // token && (config.headers.Authorization = token);
-      // let token = localGet('token');
-      // if (token) config.headers.Authorization = token;
-      return config;
-    }, (error) => {
-      // 错误抛到业务代码
-      error.data = {}
-      error.data.message = '服务器异常，请联系管理员！'
-      return showPromiError(error);
-    });
+     * 请求拦截器：request拦截器==>对请求参数做处理
+     */
+    this.reqObj.interceptors.request.use(
+      (config) => {
+        // 每次发送请求之前判断是否存在token，如果存在，则统一在http请求的header都加上token，不用每次请求都手动添加了
+        // 即使本地存在token，也有可能token是过期的，所以在响应拦截器中要对返回状态进行判断
+        // const token = store.state.token;
+        // token && (config.headers.Authorization = token);
+        // let token = localGet('token');
+        // if (token) config.headers.Authorization = token;
+        return config;
+      },
+      (error) => {
+        // 错误抛到业务代码
+        error.data = {};
+        error.data.message = '服务器异常，请联系管理员！';
+        return showPromiError(error);
+      }
+    );
 
     /**
      * 响应拦截器：respone拦截器==>对响应做处理
      */
-    this.reqObj.interceptors.response.use((response) => {
-      const responseStatus = response.status
-      // let msg = ''
-      // if (responseStatus < 200 || responseStatus >= 300) {
-      //   // 处理http错误，抛到业务代码
-      //   msg = showStatus[responseStatus] || `连接出错(${responseStatus})!`;
-      //   msg = `${msg}，请检查网络或联系管理员！`
-      //   if (typeof response.data === 'string') {
-      //     response.data = { msg }
-      //   } else {
-      //     response.data.msg = msg
-      //   }
-      // }
-      // 成功请求到数据
-      if (responseStatus !== 100200 && responseStatus !== 200) {
-        showPromiError(response);
-      }
+    this.reqObj.interceptors.response.use(
+      (response) => {
+        const responseStatus = response.status;
+        // let msg = ''
+        // if (responseStatus < 200 || responseStatus >= 300) {
+        //   // 处理http错误，抛到业务代码
+        //   msg = showStatus[responseStatus] || `连接出错(${responseStatus})!`;
+        //   msg = `${msg}，请检查网络或联系管理员！`
+        //   if (typeof response.data === 'string') {
+        //     response.data = { msg }
+        //   } else {
+        //     response.data.msg = msg
+        //   }
+        // }
+        // 成功请求到数据
+        if (responseStatus !== 100200 && responseStatus !== 200) {
+          // let netStatus = responseStatus;
+          // netStatus = parseInt(netStatus) || 0;
+          // netStatus = isNaN(netStatus) ? netStatus : 0;
+          // let errMsg = this.setNetResponse(netStatus)
+          return showPromiError(response);
+        }
 
-      var apiResData = response.data;
-      return _this.setResponse(apiResData);
+        var apiResData = response.data;
+        return _this.setResponse(apiResData);
 
-      // return response;
-    }, (error) => {
-      // 错误抛到业务代码
-      error.data = {}
-      error.data.message = '请求超时或服务器异常，请检查网络或联系管理员！'
-      // 响应错误处理
-      return showPromiError(error);
-    });
+        // return response;
+      },
+      (error) => {
+        // 错误抛到业务代码
+        error.data = {};
+        error.data.message = '请求超时或服务器异常，请检查网络或联系管理员！';
+        // 响应错误处理
+        return showPromiError(error);
+      }
+    );
   }
   /**
    * 设置header参数
+   * @param {Object} options
+   * @returns {Class} this
    */
-  setHeaders(options) {
-    this.headers = Object.assign({}, this.headers, (options || {}));
+  setHeaders(options = {}) {
+    this.headers = Object.assign({}, this.headers, options || {});
     return this;
   }
   /**
    * 设置requests参数
+   * @param {Object} options
+   * @returns {Class} this
    */
-  setRequests(options) {
-    this.requests = Object.assign({}, this.requests, (options || {}));
+  setRequests(options = {}) {
+    this.requests = Object.assign({}, this.requests, options || {});
     return this;
   }
-  setOptions(options) {
-    this.canshuOpt = Object.assign({}, this.canshuOpt, (options || {}));
+  /**
+   * 设置axios参数
+   * @param {Object} options
+   * @returns {Class} this
+   */
+  setOptions(options = {}) {
+    this.canshuOpt = Object.assign({}, this.canshuOpt, options || {});
     return this;
   }
   /**
-   * 设置响应
+   * 设置网络请求响应
+   */
+  setNetResponse(netStatus) {
+    switch (netStatus) {
+      case 401:
+        msg = '未经授权,没有权限';
+        break;
+      case 400:
+        msg = '无效请求';
+        break;
+    }
+    return msg;
+  }
+  /**
+   * 设置错误时响应
+   */
+  setErrShow() {}
+  /**
+   * 设置自定义业务响应
    */
   setResponse(apiResData) {
     var apiResStatus = apiResData.status || -1;
@@ -282,7 +323,7 @@ class RequestClass {
         this.storeHandle.dispatch('storeUser/ssLogout');
         window.location.href = '/';
         break;
-      case 10009:// 退出登录
+      case 10009: // 退出登录
       case '10009':
         this.storeHandle.dispatch('storeUser/ssLogout');
         window.location.href = '/';
@@ -290,7 +331,7 @@ class RequestClass {
       case 100404:
       case 404:
       case '404':
-        let msg404 = apiResData.msg || "操作失败";
+        let msg404 = apiResData.msg || '操作失败';
         Message({
           showClose: true,
           type: 'error',
@@ -319,13 +360,13 @@ class RequestClass {
   }
   /**
    * 调用 API 统一 请求 方法
-   * 
+   *
    * @author ctocode-zhw
    * @version 2018-12-20
    * @param apiUrl 不需要域名，域名统一拼接，只填写相关请求接口 【必须】
    * @param reqData 提交参数
    * @returns
-   * 
+   *
    */
   apiAll(type, apiUrl, reqData) {
     if (apiUrl.indexOf('http://') != -1 || apiUrl.indexOf('https://') != -1) {
@@ -338,7 +379,7 @@ class RequestClass {
 
     if (type == 'POST') {
       return this.reqObj.post(apiUrl, reqData, {
-        ...canshuOpt,
+        ...canshuOpt
         // headers: {
         // 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
         // 'Accept': 'application/json, text/javascript, */*; q=0.01',
@@ -352,7 +393,6 @@ class RequestClass {
         }
       });
     } else if (type == 'PUT') {
-      console.log(apiUrl);
       return this.reqObj.put(apiUrl, {
         ...reqData
       });
@@ -370,68 +410,82 @@ class RequestClass {
       return this.reqObj.post(apiUrl, reqData, {
         ...canshuOpt,
         headers: {
-          "Content-Type": "multipart/form-data"
+          'Content-Type': 'multipart/form-data'
         }
       });
     }
   }
   /**
-    * GET 请求
-    */
+   * GET 请求
+   */
   flagGet() {
-    let argumentsArr = arguments; return this.unifyApi('flag', 'GET', argumentsArr);
+    let argumentsArr = arguments;
+    return this.unifyApi('flag', 'GET', argumentsArr);
   }
   urlGet() {
-    let argumentsArr = arguments; return this.unifyApi('url', 'GET', argumentsArr);
+    let argumentsArr = arguments;
+    return this.unifyApi('url', 'GET', argumentsArr);
   }
   /**
-    * POST 请求
-    */
+   * POST 请求
+   */
   flagPost() {
-    let argumentsArr = arguments; return this.unifyApi('flag', 'POST', argumentsArr);
+    let argumentsArr = arguments;
+    return this.unifyApi('flag', 'POST', argumentsArr);
   }
   urlPost() {
-    let argumentsArr = arguments; return this.unifyApi('url', 'POST', argumentsArr);
+    let argumentsArr = arguments;
+    return this.unifyApi('url', 'POST', argumentsArr);
   }
   /**
-    * PUT 请求
-    */
+   * PUT 请求
+   */
   flagPut() {
-    let argumentsArr = arguments; return this.unifyApi('flag', 'PUT', argumentsArr);
+    let argumentsArr = arguments;
+    return this.unifyApi('flag', 'PUT', argumentsArr);
   }
   urlPut() {
-    let argumentsArr = arguments; return this.unifyApi('url', 'PUT', argumentsArr);
+    let argumentsArr = arguments;
+    return this.unifyApi('url', 'PUT', argumentsArr);
   }
   /**
-    * PATCH 请求
-    */
+   * PATCH 请求
+   */
   flagPatch() {
-    let argumentsArr = arguments; return this.unifyApi('flag', 'PATCH', argumentsArr);
+    let argumentsArr = arguments;
+    return this.unifyApi('flag', 'PATCH', argumentsArr);
   }
   urlPatch() {
-    let argumentsArr = arguments; return this.unifyApi('url', 'PATCH', argumentsArr);
+    let argumentsArr = arguments;
+    return this.unifyApi('url', 'PATCH', argumentsArr);
   }
   /**
-    * DELETE 请求
-    */
+   * DELETE 请求
+   */
   flagDel() {
-    let argumentsArr = arguments; return this.unifyApi('flag', 'DELETE', argumentsArr);
+    let argumentsArr = arguments;
+    return this.unifyApi('flag', 'DELETE', argumentsArr);
   }
   urlDel() {
-    let argumentsArr = arguments; return this.unifyApi('url', 'DELETE', argumentsArr);
+    let argumentsArr = arguments;
+    return this.unifyApi('url', 'DELETE', argumentsArr);
   }
   /* 图片上传通用 */
   flagUpload() {
-    let argumentsArr = arguments; return this.unifyApi('flag', 'UPLOAD', argumentsArr);
+    let argumentsArr = arguments;
+    return this.unifyApi('flag', 'UPLOAD', argumentsArr);
   }
   urlUpload() {
-    let argumentsArr = arguments; return this.unifyApi('url', 'UPLOAD', argumentsArr);
+    let argumentsArr = arguments;
+    return this.unifyApi('url', 'UPLOAD', argumentsArr);
   }
   flagUpImg() {
-    let argumentsArr = arguments; return this.unifyApi('flag', 'UPLOAD', argumentsArr);
+    let argumentsArr = arguments;
+    return this.unifyApi('flag', 'UPLOAD', argumentsArr);
   }
   urlUpImg() {
-    let argumentsArr = arguments; return this.unifyApi('url', 'UPLOAD', argumentsArr);
+    let argumentsArr = arguments;
+    return this.unifyApi('url', 'UPLOAD', argumentsArr);
   }
   /**
    * 统一请求
@@ -452,7 +506,7 @@ class RequestClass {
       let apiFlag = argumentsArr[0];
       if (typeof apiFlag === 'string') {
         apiFlag = apiFlag || '';
-        apiUrl = apiFlag == '' ? '' : (this.flagMap[apiFlag] || '');
+        apiUrl = apiFlag == '' ? '' : this.flagMap[apiFlag] || '';
       }
       apiUrlNoMsg = ' flag' + methodType + '：传入的标示 { ' + `${apiFlag}` + ' }，未匹配到 apiUrl ';
     }
@@ -474,15 +528,15 @@ class RequestClass {
     if (argNum == 1) {
       return function (reqData) {
         return _this.apiAll(methodType, apiUrl, reqData);
-      }
+      };
     } else if (argNum == 2 || argNum == 3) {
       let reqData = {};
       let arg2Val = argumentsArr[1];
       let arg2Type = Object.prototype.toString.call(arg2Val);
       // let argType2_2 = typeof argumentsArr[1] === 'object';
-      if (arg2Type === "[object String]" || arg2Type === "[object Number]") {
+      if (arg2Type === '[object String]' || arg2Type === '[object Number]') {
         // console.log('----转换-----', parseInt(arg2Val), Number(arg2Val));
-        var isEndId = Number(arg2Val)
+        var isEndId = Number(arg2Val);
         if (!isNaN(isEndId)) {
           // console.log('---数字');
           let isEndStr = confirmEnding(apiUrl, '/');
@@ -494,13 +548,13 @@ class RequestClass {
         if (argNum == 3) {
           let arg3Val = argumentsArr[2];
           let arg3Type = Object.prototype.toString.call(arg3Val);
-          if (arg3Type === "[object Object]") {
+          if (arg3Type === '[object Object]') {
             reqData = arg3Val || {};
           }
         }
-      } else if (arg2Type === "[object Object]") {
+      } else if (arg2Type === '[object Object]') {
         reqData = arg2Val || {};
-      } else if (arg2Type === "[object FormData]") {
+      } else if (arg2Type === '[object FormData]') {
         reqData = arg2Val || new FormData();
       }
       return _this.apiAll(methodType, apiUrl, reqData);
@@ -510,7 +564,6 @@ class RequestClass {
       });
     }
   }
-
 }
 
-export default RequestClass;
+export default RequestClass;