@10yun/cv-mobile-ui 0.5.23 → 0.5.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@10yun/cv-mobile-ui",
-  "version": "0.5.23",
+  "version": "0.5.26",
   "description": "十云cvjs移动端ui，适用uniapp",
   "author": "10yun",
   "license": "Apache-2.0",
@@ -12,8 +12,7 @@
     "type": "git",
     "url": "https://gitee.com/cvjs/cv-mobile-ui"
   },
-  "dependencies": {},
-  "devDependencies": {},
+  "scripts": {},
   "browserslist": [
     "Android >= 7",
     "ios >= 9"

package/plugins/request.js

@@ -29,16 +29,37 @@ function showErrorMsg(msg) {
     title: msg || ''
   });
 }
+/*
+ * 收集错误信息
+ */
+const EnumStatusToTitle = {
+  400: '请求错误',
+  400: '无效请求',
+  401: '未经授权',
+  403: '拒绝访问',
+  404: '请求出错',
+  408: '请求超时',
+  422: '请求参数错误',
+  500: '服务器错误',
+  501: '服务未实现',
+  502: '网络错误',
+  503: '服务不可用',
+  504: '网络超时',
+  505: 'HTTP版本不受支持',
+  10001: '未登录',
+  10002: 'token过期',
+  10009: '退出登录'
+};
+const EnumStatusToMsg = {
+  401: '没有权限，请重新登录'
+};
 
 class RequestClass {
   constructor(options = {}) {
-    this.storeHandle = options.storeHandle || null;
-    this.jumpHandle = options.jumpHandle || null;
-    /* 新创建 axios 实例配置 */
     this.flagMap = options.flagMap || {};
     this.flagFunc = options.flagFunc;
     this.baseURL = options.baseURL || '';
-    this.requests = options.requests || {};
+    this.requests = Object.assign({}, options.requests || {});
     /**
      * 内置的，支持的 methods
      * 处理，需要转换的 methods
@@ -64,9 +85,13 @@ class RequestClass {
     };
 
     this.headers = Object.assign({}, {}, options.headers || {});
-
+    // 需要加密的url
+    this.encryptURL = options.encryptURL || [];
+    this.encryptFlag = false;
     this.canshuOpt = {};
-
+    this.retries = 3;
+    this.debugState = options.debug || false;
+    this.requestHandle = null;
     /* 新创建 axios 实例配置 */
     this.creSett = Object.assign(
       {},
@@ -80,13 +105,16 @@ class RequestClass {
       },
       {}
     );
-
     this._initReqHandle();
-    // this.flagApi = this.flagApi.bind(this);
   }
-  /*初始化 request 句柄 */
+  debugLog() {
+    if (this.debugState) {
+      console.log('[调试]', ...arguments);
+    }
+  }
+  /* 初始化 request 句柄 */
   _initReqHandle() {
-    var _this = this;
+    let _this = this;
   }
 
   /**
@@ -115,7 +143,7 @@ class RequestClass {
    */
   setDefHeaders(options) {
     this.headers = Object.assign({}, this.headers, options || {});
-    this.reqObj.defaults.headers = this.headers;
+    // this.reqObj.defaults.headers = this.headers;
     return this;
   }
   setHeaders(options) {
@@ -129,7 +157,7 @@ class RequestClass {
    */
   setDefRequests(options) {
     this.requests = Object.assign({}, this.requests, options || {});
-    this.reqObj.defaults.requests = this.requests;
+    // this.reqObj.defaults.requests = this.requests;
     return this;
   }
   setRequests(options) {
@@ -137,41 +165,95 @@ class RequestClass {
     return this;
   }
   /**
-   * 设置响应
+   * 设置body 参数
+   * 设置 额外参数
+   * @param {Object} options
+   * @returns {Class} this
+   */
+  setOptions(options = {}) {
+    this.canshuOpt = Object.assign({}, this.canshuOpt, options || {});
+    return this;
+  }
+  /**
+   * 设置 signal
+   */
+  setSignal(signal) {}
+  /**
+   * 请求前置
+   * 请求后置
    */
-  setResponse(apiResData) {
-    var apiResStatus = apiResData.status || -1;
+  requestBefore(callFunc) {
+    this.requestBeforeCall = callFunc;
+  }
+  requestAfter(callFunc) {
+    this.requestAfterCall = callFunc;
+  }
+  /**
+   * 加密
+   */
+  encrypt() {
+    this.encryptFlag = true;
+    return this;
+  }
+  /***
+   * ================== ================== ================== ==================
+   * 允许重写
+   * ================== ================== ================== ==================
+   */
+  /**
+   * 设置错误时响应
+   */
+  resetNetError(error) {
+    showErrorMsg(error.message || '');
+    console.log(error.message || '');
+  }
+  /**
+   * 设置网络请求响应
+   * 设置自定义业务响应
+   */
+  resetNetResponse(apiResData) {
+    // 修改请求状态
+    _hideUniapp();
+
+    let apiResStatus = apiResData.status || apiResData.code || -1;
+    let apiResMessage = apiResData.msg || apiResData.message || '操作失败';
+    apiResStatus = parseInt(apiResStatus);
     // 这里根据后端提供的数据进行对应的处理
     switch (apiResStatus) {
       // 没有凭证，请登录
-      case '100101':
       case 100101:
-        _hideUniapp();
-        this.storeHandle.dispatch('storeUser/ssLogout', false);
-        this.jumpHandle.jumpsLogin();
+        // 【退出登录操作】
+        this.resetNetError({ type: 'error', message: apiResMessage });
         break;
       // 无效凭证，请重新登录
-      case '100102':
       case 100102:
-        _hideUniapp();
-        this.storeHandle.dispatch('storeUser/ssLogout', false);
-        this.jumpHandle.jumpsLogin();
+        // 【退出登录操作】
+        let errorData = Object.assign(apiResData, { type: 'error', message: apiResMessage });
+        this.resetNetError(errorData);
         break;
       // 凭证过期，请重新登录
-      case '100103':
       case 100103:
-        _hideUniapp();
-        this.storeHandle.dispatch('storeUser/ssLogout', false);
-        this.jumpHandle.jumpsLogin();
+        // 【退出登录操作】
         return;
         break;
-      // 无效凭证，请重新登录
-      case '100109':
+      // syOpenAppToken 错误
+      case 100109:
+        break;
+      case 422:
+      case 100422:
+        let msg422 = apiResMessage || '操作失败';
+        this.resetNetError({ type: 'error', message: `${msg422}` });
+        return Promise.reject(apiResData);
         break;
+      case 404:
+      case 100404:
+        let msg404 = apiResMessage || '操作失败';
+        this.resetNetError({ type: 'error', message: `${msg404}` });
+        return Promise.reject(apiResData);
+      // return new Promise((resolve, reject) => {});
       case '8002':
       case 8002: // uni.login 微信注册
-        _hideUniapp();
-        this.jumpHandle.jumpsLogin();
+        //
         break;
       case '13001':
       case 13001:
@@ -189,35 +271,20 @@ class RequestClass {
         });
         break;
       // 处理成功
-      case '200':
       case 200:
-        // if (apiResData.length == 0) {
-        //
-        // }
+        // this.requestAfterCall?.();
         return apiResData;
+        return Promise.resolve(apiResData);
+        break;
+      // 调试
+      case -1:
+        return Promise.reject({ message: 'error' });
         break;
-      // 默认错误
       default:
-        // clearTimeout(time);
-        _hideUniapp();
-        var apiResMsg = apiResData.msg || '';
-        if (apiResMsg == 'Unknown') {
-          apiResMsg = '';
-        }
-        uni.showModal({
-          title: '提示',
-          content: apiResMsg || '目前服务繁忙，请稍后重试',
-          showCancel: false,
-          success: function (res) {
-            if (res.confirm) {
-              console.log('用户点击确定');
-            }
-          }
-        });
+        return apiResData;
         break;
     }
-    //返回reject状态 会被最后catch捕获。
-    return new Promise((resolve, reject) => {});
+    console.log('---');
   }
   /**
    * 调用 API 统一 请求 方法
@@ -226,18 +293,26 @@ class RequestClass {
    * @version 2018-12-20
    * @param apiUrl 不需要域名，域名统一拼接，只填写相关请求接口 【必须】
    * @param reqData 提交参数
-   * @returns
+   * @return
    *
    */
   apiAll(type, apiUrl, reqData) {
-    var _this = this;
-    let request_setttings = {
-      url: this.baseURL + apiUrl,
-      header: this.headers
-    };
-    if (apiUrl.indexOf('http://') != -1 || apiUrl.indexOf('https://') != -1) {
-      request_setttings.url = apiUrl;
+    let request_url = this.baseURL + apiUrl;
+    // if (apiUrl.indexOf('http://') != -1 || apiUrl.indexOf('https://') != -1) {
+    if (apiUrl.includes('http://') || apiUrl.includes('https://')) {
+      request_url = apiUrl;
     }
+    /**
+     * TODO 过滤除了 https:// 和 http:// 以外的 // 和 ///，但保留 ? 后面的内容
+     * request_url = request_url.replace(/^(https?:\/\/[^/]+)\/+/g, '$1/');
+     */
+    /**
+     * 使用正则表达式进行过滤
+     * 过滤除了 https:// 和 http:// 以外的 // 和 ///
+     */
+    request_url = request_url.replace(/([^:]\/)\/+/g, '$1');
+
+    var _this = this;
 
     reqData = reqData || {};
     reqData = Object.assign({}, this.requests, reqData);
@@ -251,7 +326,10 @@ class RequestClass {
 
     // 初始化句柄
     let $requestHandle = null;
-
+    let request_setttings = {
+      url: request_url,
+      header: this.headers
+    };
     if (type == 'upload') {
       /* 文件上传 */
       // 一定要删除这个，让uni.uploadFile自己携带
@@ -297,124 +375,103 @@ class RequestClass {
       // }
       $requestHandle = uni.request(request_setttings);
     }
-    return $requestHandle
-      .then((uniRes) => {
-        // uniRes 为微信返回 + 接口返回 拼接的数据
-        if (uniRes.statusCode == 200) {
-          uni.hideNavigationBarLoading();
-          // apiResData 为 接口返回 拼接的数据，一般 success 成功，开发者只需要 apiResData
-          // let apiResData = JSON.parse(uniRes.data, true);
-          let apiResData = uniRes.data || {};
+    return $requestHandle.then((uniRes) => {
+      _hideUniapp();
+      // console.log('----开始请求啊  ------', uniRes);
+      let apiResData = uniRes.data || {};
+      // uniRes 为微信返回 + 接口返回 拼接的数据
+      if (uniRes.statusCode == 200) {
+        // uni.hideNavigationBarLoading();
 
-          // upload需要json转数组
-          if (type == 'upload') {
-            apiResData = JSON.parse(apiResData, true);
-          }
-          return _this.setResponse(apiResData);
-        } else if (uniRes.statusCode == 502) {
-        } else {
-          _hideUniapp();
-          if (type == 'POST') {
-            uni.showModal({
-              content: '加载错误！请稍后重试',
-              showCancel: false,
-              success: function (res) {
-                if (res.confirm) {
-                  console.log('用户点击确定');
-                } else {
-                  console.log('用户点击取消');
-                }
-              }
-            });
-          }
+        // apiResData 为 接口返回 拼接的数据，一般 success 成功，开发者只需要 apiResData
+        // let apiResData = JSON.parse(uniRes.data, true);
+
+        // upload需要json转数组
+        if (type == 'upload') {
+          apiResData = JSON.parse(apiResData, true);
         }
-      })
-      .catch(function (uniRes) {
-        _hideUniapp();
-        console.log('--catch--', uniRes);
-        // MessageTip.info('网络繁忙，请稍后再试');
-        // uni.showModal({
-        //   content: '请求超时！请检查网络',
-        //   showCancel: false,
-        //   success: function (res) {
-        //     if (res.confirm) {
-        //       console.log('用户点击确定');
-        //     }
-        //   }
-        // });
-      });
+        return _this.resetNetResponse(apiResData);
+      } else if (uniRes.statusCode == 502) {
+      } else {
+        return _this.resetNetResponse(apiResData);
+      }
+    });
+    // .catch((uniRes) => {
+    //   console.log('--request-catch--', uniRes);
+    //   return Promise.reject(uniRes);
+    // });
   }
   /**
    * GET 请求
    */
   flagGet() {
-    let argumentsArr = arguments;
+    const argumentsArr = arguments;
     return this.unifyApi('flag', 'GET', argumentsArr);
   }
   urlGet() {
-    let argumentsArr = arguments;
+    const argumentsArr = arguments;
     return this.unifyApi('url', 'GET', argumentsArr);
   }
   /**
    * POST 请求
    */
   flagPost() {
-    let argumentsArr = arguments;
+    const argumentsArr = arguments;
     return this.unifyApi('flag', 'POST', argumentsArr);
   }
   urlPost() {
-    let argumentsArr = arguments;
+    const argumentsArr = arguments;
     return this.unifyApi('url', 'POST', argumentsArr);
   }
   /**
    * PUT 请求
    */
   flagPut() {
-    let argumentsArr = arguments;
+    const argumentsArr = arguments;
     return this.unifyApi('flag', 'PUT', argumentsArr);
   }
   urlPut() {
-    let argumentsArr = arguments;
+    const argumentsArr = arguments;
     return this.unifyApi('url', 'PUT', argumentsArr);
   }
   /**
    * PATCH 请求
    */
   flagPatch() {
-    let argumentsArr = arguments;
+    const argumentsArr = arguments;
     return this.unifyApi('flag', 'PATCH', argumentsArr);
   }
   urlPatch() {
-    let argumentsArr = arguments;
+    const argumentsArr = arguments;
     return this.unifyApi('url', 'PATCH', argumentsArr);
   }
   /**
    * DELETE 请求
    */
   flagDel() {
-    let argumentsArr = arguments;
+    const argumentsArr = arguments;
     return this.unifyApi('flag', 'DELETE', argumentsArr);
   }
   urlDel() {
-    let argumentsArr = arguments;
+    const argumentsArr = arguments;
     return this.unifyApi('url', 'DELETE', argumentsArr);
   }
   /* 文件上传通用 */
   flagUpload() {
-    let argumentsArr = arguments;
+    const argumentsArr = arguments;
     return this.unifyApi('flag', 'UPLOAD', argumentsArr);
   }
   urlUpload() {
-    let argumentsArr = arguments;
+    const argumentsArr = arguments;
     return this.unifyApi('url', 'UPLOAD', argumentsArr);
   }
   /* 图片上传通用 */
   flagUpImg() {
-    let argumentsArr = arguments;
+    const argumentsArr = arguments;
     return this.unifyApi('flag', 'UPLOAD', argumentsArr);
   }
   urlUpImg() {
-    let argumentsArr = arguments;
+    const argumentsArr = arguments;
     return this.unifyApi('url', 'UPLOAD', argumentsArr);
   }
   /**
@@ -425,8 +482,10 @@ class RequestClass {
     let argNum = argumentsArr.length || 0;
     if (argNum <= 0 || argNum > 3) {
       let errorMsg = `-- ${methodType} ： 参数为(1-3)个---`;
-      console.warn('[cv-ui warn]: ', errorMsg);
-      return false;
+      return new Promise((resolve, reject) => {
+        this.resetNetError({ message: errorMsg });
+        return reject({ message: errorMsg });
+      });
     }
     let apiUrl = '';
     let apiUrlNoMsg = '';
@@ -447,8 +506,8 @@ class RequestClass {
     }
     if (apiUrl == '') {
       return new Promise((resolve, reject) => {
-        showErrorMsg(apiUrlNoMsg);
-        return reject({ msg: apiUrlNoMsg });
+        this.resetNetError({ message: apiUrlNoMsg });
+        return reject({ message: apiUrlNoMsg });
       });
     }
 
@@ -463,13 +522,15 @@ class RequestClass {
       let arg2Type = Object.prototype.toString.call(arg2Val);
       // let argType2_2 = typeof argumentsArr[1] === 'object';
       if (arg2Type === '[object String]' || arg2Type === '[object Number]') {
-        // console.log('----转换-----', parseInt(arg2Val), Number(arg2Val));
-        var isEndId = Number(arg2Val);
-        if (!isNaN(isEndId)) {
+        // console.log('----转换-----', BigInt(arg2Val), Number(arg2Val)); 超过17位
+        if (!isNaN(arg2Val)) {
           // console.log('---数字');
-          let isEndStr = confirmEnding(apiUrl, '/');
-          let endAppendStr = isEndStr ? isEndId : '/' + isEndId;
-          apiUrl = apiUrl + endAppendStr;
+          let bigIntNum = BigInt(`${arg2Val}`);
+          let isEndId = bigIntNum.toString();
+          if (!confirmEnding(apiUrl, '/')) {
+            apiUrl = apiUrl + '/';
+          }
+          apiUrl = apiUrl + isEndId;
         } else {
           // console.log('---字符');
         }
@@ -486,7 +547,7 @@ class RequestClass {
       return _this.apiAll(methodType, apiUrl, reqData);
     } else {
       return new Promise((resolve, reject) => {
-        return reject({ msg: ' 请求错误 ' });
+        return reject({ message: ' 请求错误 ' });
       });
     }
   }

package/plugins/storage.js

@@ -20,11 +20,13 @@ class StorageClass {
   constructor(options = {}) {
     this.config = Object.assign(
       {
+        cache_keys: 'syCacheKeys',
         prefix: '',
         suffix: ''
       },
       options
     );
+    this.KEYS_CACHE_FLAG = this.config.cache_keys;
   }
   _getAllCache() {
     let fullKey = this._getFullKey('___') || {};
@@ -54,6 +56,46 @@ class StorageClass {
     }
     return key;
   }
+  localGet(key) {
+    return this.getSync(key) || '';
+  }
+  localSet(key, value) {
+    this.updateKey(key);
+    this.setAsync(key, value);
+    this.setSync(key, value);
+  }
+  localDel(key) {
+    this.removeAsync(key);
+    this.removeSync(key);
+  }
+  updateKey(key) {
+    let allCacheKeys = this.getSync(this.KEYS_CACHE_FLAG) || {};
+    // 当前时间
+    let currTime = parseInt(new Date().getTime() / 1000);
+    allCacheKeys[key] = currTime + 60 * 60 * 24 * 7; // 7天
+    this.setSync(this.KEYS_CACHE_FLAG, allCacheKeys);
+  }
+  checkKey(key) {
+    // 所有缓存keys
+    let allCacheKeys = this.getSync(this.KEYS_CACHE_FLAG) || {};
+    // 缓存时间
+    let currCacheExpires = allCacheKeys[key] || 0;
+    if (currCacheExpires > 0) {
+      return true;
+    }
+    // 当前时间
+    let currTime = parseInt(new Date().getTime() / 1000);
+    // 当前缓存
+    let currCache = this.getSync(key) || null;
+    if (!currCache) {
+      return false;
+    }
+    console.log(currCache);
+    if (currCache.length == 0 || currTime > currCacheExpires) {
+      return false;
+    }
+    return true;
+  }
   /**
    * 设置缓存 - 异步
    * @param  {[type]} key [键名]

package/plugins/storage2.js

@@ -14,9 +14,8 @@ const SECRET_KEY = CryptoJS.enc.Utf8.parse('3333e6e143439161');
 // 十六位十六进制数作为密钥偏移量
 const SECRET_IV = CryptoJS.enc.Utf8.parse('e3bbe7e3ba84431a');
 
-// 类型 window.localStorage,window.sessionStorage,
 const config = {
-  type: 'localStorage', // 本地存储类型 sessionStorage
+  type: 'localStorage', // 本地存储类型localStorage、 sessionStorage
   prefix: 'SDF_0.0.1', // 名称前缀 建议：项目名 + 项目版本
   expire: 1, //过期时间 单位：秒
   isEncrypt: true // 默认加密 为了调试方便, 开发过程中可以不加密

package/plugins/storage3.js

@@ -1,5 +1,5 @@
 let cacheMap = new Map();
-let timeoutDefault = 86400; // 设置默认超时时间，单位秒 3600*24
+let timeoutDefault = 86400; // 设置默认超时时间，单位秒 60 * 60 * 24 (1天)
 
 function isTimeout(name) {
   const data = cacheMap.get(name);