@10yun/cv-mobile-ui 0.5.37 → 0.5.38

package/README.md

@@ -4,4 +4,4 @@
 
 ## cv-mobile-ui
 
-详见手册：[https://cvjs.cn/cv-mobile-ui/](https://cvjs.cn/cv-mobile-ui/)
+详见手册：[http://cvjs.cn/cv-mobile-ui/](http://cvjs.cn/cv-mobile-ui/)

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@10yun/cv-mobile-ui",
-  "version": "0.5.37",
+  "version": "0.5.38",
   "description": "十云cvjs移动端ui，适用uniapp",
   "author": "10yun",
   "license": "Apache-2.0",
-  "homepage": "https://cvjs.cn/cv-mobile-ui/",
+  "homepage": "http://cvjs.cn/cv-mobile-ui/",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
   },

package/plugins/luch-request/utils/clone.js

@@ -1,5 +1,5 @@
 /* eslint-disable */
-var clone = (function() {
+var clone = (function () {
   'use strict';
 
   function _instanceof(obj, type) {
@@ -9,24 +9,24 @@ var clone = (function() {
   var nativeMap;
   try {
     nativeMap = Map;
-  } catch(_) {
+  } catch (_) {
     // maybe a reference error because no `Map`. Give it a dummy value that no
     // value will ever be an instanceof.
-    nativeMap = function() {};
+    nativeMap = function () {};
   }
 
   var nativeSet;
   try {
     nativeSet = Set;
-  } catch(_) {
-    nativeSet = function() {};
+  } catch (_) {
+    nativeSet = function () {};
   }
 
   var nativePromise;
   try {
     nativePromise = Promise;
-  } catch(_) {
-    nativePromise = function() {};
+  } catch (_) {
+    nativePromise = function () {};
   }
 
   /**
@@ -64,20 +64,16 @@ var clone = (function() {
 
     var useBuffer = typeof Buffer != 'undefined';
 
-    if (typeof circular == 'undefined')
-      circular = true;
+    if (typeof circular == 'undefined') circular = true;
 
-    if (typeof depth == 'undefined')
-      depth = Infinity;
+    if (typeof depth == 'undefined') depth = Infinity;
 
     // recurse this function so we don't reset allParents and allChildren
     function _clone(parent, depth) {
       // cloning null always returns null
-      if (parent === null)
-        return null;
+      if (parent === null) return null;
 
-      if (depth === 0)
-        return parent;
+      if (depth === 0) return parent;
 
       var child;
       var proto;
@@ -91,11 +87,14 @@ var clone = (function() {
         child = new nativeSet();
       } else if (_instanceof(parent, nativePromise)) {
         child = new nativePromise(function (resolve, reject) {
-          parent.then(function(value) {
-            resolve(_clone(value, depth - 1));
-          }, function(err) {
-            reject(_clone(err, depth - 1));
-          });
+          parent.then(
+            function (value) {
+              resolve(_clone(value, depth - 1));
+            },
+            function (err) {
+              reject(_clone(err, depth - 1));
+            }
+          );
         });
       } else if (clone.__isArray(parent)) {
         child = [];
@@ -120,8 +119,7 @@ var clone = (function() {
         if (typeof prototype == 'undefined') {
           proto = Object.getPrototypeOf(parent);
           child = Object.create(proto);
-        }
-        else {
+        } else {
           child = Object.create(prototype);
           proto = prototype;
         }
@@ -138,14 +136,14 @@ var clone = (function() {
       }
 
       if (_instanceof(parent, nativeMap)) {
-        parent.forEach(function(value, key) {
+        parent.forEach(function (value, key) {
           var keyChild = _clone(key, depth - 1);
           var valueChild = _clone(value, depth - 1);
           child.set(keyChild, valueChild);
         });
       }
       if (_instanceof(parent, nativeSet)) {
-        parent.forEach(function(value) {
+        parent.forEach(function (value) {
           var entryChild = _clone(value, depth - 1);
           child.add(entryChild);
         });
@@ -164,17 +162,16 @@ var clone = (function() {
             continue;
           }
           child[i] = _clone(parent[i], depth - 1);
-        } catch(e){
+        } catch (e) {
           if (e instanceof TypeError) {
             // when in strict mode, TypeError will be thrown if child[i] property only has a getter
             // we can't do anything about this, other than inform the user that this property cannot be set.
-            continue
+            continue;
           } else if (e instanceof ReferenceError) {
             //this may happen in non strict mode
-            continue
+            continue;
           }
         }
-
       }
 
       if (Object.getOwnPropertySymbols) {
@@ -219,15 +216,14 @@ var clone = (function() {
    * works.
    */
   clone.clonePrototype = function clonePrototype(parent) {
-    if (parent === null)
-      return null;
+    if (parent === null) return null;
 
     var c = function () {};
     c.prototype = parent;
     return new c();
   };
 
-// private utility functions
+  // private utility functions
 
   function __objToStr(o) {
     return Object.prototype.toString.call(o);
@@ -261,4 +257,4 @@ var clone = (function() {
   return clone;
 })();
 
-export default clone
+export default clone;

package/ui-cv/components/cv-code-sms/cv-code-sms.vue

@@ -72,6 +72,10 @@ export default {
     btnType: {
       type: [String],
       default: 'default'
+    },
+    onSendBefore: {
+      type: Function,
+      default: null
     }
   },
   watch: {
@@ -120,6 +124,11 @@ export default {
     },
     /******获取短信验证码************************************* */
     getSmsCode() {
+      if (this.onSendBefore && typeof this.onSendBefore == 'function') {
+        if (!this.onSendBefore()) {
+          return false;
+        }
+      }
       if (!this.localMobile) {
         this.showDiyMsg('手机号不正确');
         return;

package/uview-plus/libs/luch-request/adapters/index.js

@@ -1,7 +1,7 @@
-import buildURL from '../helpers/buildURL'
-import buildFullPath from '../core/buildFullPath'
-import settle from '../core/settle'
-import { isUndefined } from '../utils'
+import buildURL from '../helpers/buildURL';
+import buildFullPath from '../core/buildFullPath';
+import settle from '../core/settle';
+import { isUndefined } from '../utils';
 
 /**
  * 返回可选值存在的配置
@@ -10,88 +10,122 @@ import { isUndefined } from '../utils'
  * @return {{}} - 存在的配置项
  */
 const mergeKeys = (keys, config2) => {
-    const config = {}
-    keys.forEach((prop) => {
-        if (!isUndefined(config2[prop])) {
-            config[prop] = config2[prop]
-        }
-    })
-    return config
-}
-export default (config) => new Promise((resolve, reject) => {
-    const fullPath = buildURL(buildFullPath(config.baseURL, config.url), config.params)
-    const _config = {
-        url: fullPath,
-        header: config.header,
-        complete: (response) => {
-            config.fullPath = fullPath
-            response.config = config
-            try {
-                // 对可能字符串不是json 的情况容错
-                if (typeof response.data === 'string') {
-                    response.data = JSON.parse(response.data)
-                }
-                // eslint-disable-next-line no-empty
-            } catch (e) {
-            }
-            settle(resolve, reject, response)
-        }
+  let config = {};
+  keys.forEach((prop) => {
+    if (!isUndefined(config2[prop])) {
+      config[prop] = config2[prop];
     }
-    let requestTask
+  });
+  return config;
+};
+export default (config) => {
+  return new Promise((resolve, reject) => {
+    let fullPath = buildURL(buildFullPath(config.baseURL, config.url), config.params, config.paramsSerializer);
+    const _config = {
+      url: fullPath,
+      header: config.header,
+      complete: (response) => {
+        config.fullPath = fullPath;
+        response.config = config;
+        response.rawData = response.data;
+        try {
+          let jsonParseHandle = false;
+          const forcedJSONParsingType = typeof config.forcedJSONParsing;
+          if (forcedJSONParsingType === 'boolean') {
+            jsonParseHandle = config.forcedJSONParsing;
+          } else if (forcedJSONParsingType === 'object') {
+            const includesMethod = config.forcedJSONParsing.include || [];
+            jsonParseHandle = includesMethod.includes(config.method);
+          }
+
+          // 对可能字符串不是json 的情况容错
+          if (jsonParseHandle && typeof response.data === 'string') {
+            response.data = JSON.parse(response.data);
+          }
+          // eslint-disable-next-line no-empty
+        } catch (e) {}
+        settle(resolve, reject, response);
+      }
+    };
+    let requestTask;
     if (config.method === 'UPLOAD') {
-        delete _config.header['content-type']
-        delete _config.header['Content-Type']
-        const otherConfig = {
+      delete _config.header['content-type'];
+      delete _config.header['Content-Type'];
+      let otherConfig = {
         // #ifdef MP-ALIPAY
-            fileType: config.fileType,
-            // #endif
-            filePath: config.filePath,
-            name: config.name
-        }
-        const optionalKeys = [
+        fileType: config.fileType,
+        // #endif
+        filePath: config.filePath,
+        name: config.name
+      };
+      const optionalKeys = [
         // #ifdef APP-PLUS || H5
-            'files',
-            // #endif
-            // #ifdef H5
-            'file',
-            // #endif
-            // #ifdef H5 || APP-PLUS
-            'timeout',
-            // #endif
-            'formData'
-        ]
-        requestTask = uni.uploadFile({ ..._config, ...otherConfig, ...mergeKeys(optionalKeys, config) })
+        'files',
+        // #endif
+        // #ifdef H5
+        'file',
+        // #endif
+        // #ifdef H5 || APP-PLUS || MP-WEIXIN || MP-ALIPAY || MP-TOUTIAO || MP-KUAISHOU
+        'timeout',
+        // #endif
+        'formData'
+      ];
+      requestTask = uni.uploadFile({ ..._config, ...otherConfig, ...mergeKeys(optionalKeys, config) });
     } else if (config.method === 'DOWNLOAD') {
-        // #ifdef H5 || APP-PLUS
-        if (!isUndefined(config.timeout)) {
-            _config.timeout = config.timeout
-        }
+      const optionalKeys = [
+        // #ifdef H5 || APP-PLUS || MP-WEIXIN || MP-ALIPAY || MP-TOUTIAO || MP-KUAISHOU
+        'timeout',
+        // #endif
+        // #ifdef MP
+        'filePath'
         // #endif
-        requestTask = uni.downloadFile(_config)
+      ];
+      requestTask = uni.downloadFile({ ..._config, ...mergeKeys(optionalKeys, config) });
     } else {
-        const optionalKeys = [
-            'data',
-            'method',
-            // #ifdef H5 || APP-PLUS || MP-ALIPAY || MP-WEIXIN
-            'timeout',
-            // #endif
-            'dataType',
-            // #ifndef MP-ALIPAY
-            'responseType',
-            // #endif
-            // #ifdef APP-PLUS
-            'sslVerify',
-            // #endif
-            // #ifdef H5
-            'withCredentials',
-            // #endif
-            // #ifdef APP-PLUS
-            'firstIpv4'
-        // #endif
-        ]
-        requestTask = uni.request({ ..._config, ...mergeKeys(optionalKeys, config) })
+      const optionalKeys = [
+        'data',
+        'method',
+        // #ifdef H5 || APP-PLUS || MP-ALIPAY || MP-WEIXIN
+        'timeout',
+        // #endif
+        'dataType',
+        // #ifndef MP-ALIPAY
+        'responseType',
+        // #endif
+        // #ifdef APP-PLUS
+        'sslVerify',
+        // #endif
+        // #ifdef H5
+        'withCredentials',
+        // #endif
+        // #ifdef APP-PLUS
+        'firstIpv4',
+        // #endif
+        // #ifdef MP-WEIXIN
+        'enableHttp2',
+        'enableQuic',
+        // #endif
+        // #ifdef MP-TOUTIAO || MP-WEIXIN
+        'enableCache',
+        // #endif
+        // #ifdef MP-WEIXIN
+        'enableHttpDNS',
+        'httpDNSServiceId',
+        'enableChunked',
+        'forceCellularNetwork',
+        // #endif
+        // #ifdef MP-ALIPAY
+        'enableCookie',
+        // #endif
+        // #ifdef MP-BAIDU
+        'cloudCache',
+        'defer'
+        // #endif
+      ];
+      requestTask = uni.request({ ..._config, ...mergeKeys(optionalKeys, config) });
     }
     if (config.getTask) {
-        config.getTask(requestTask, config)
+      config.getTask(requestTask, config);
     }
-})
+  });
+};

package/uview-plus/libs/luch-request/core/InterceptorManager.js

@@ -1,7 +1,7 @@
-'use strict'
+'use strict';
 
 function InterceptorManager() {
-    this.handlers = []
+  this.handlers = [];
 }
 
 /**
@@ -13,12 +13,12 @@ function InterceptorManager() {
  * @return {Number} An ID used to remove interceptor later
  */
 InterceptorManager.prototype.use = function use(fulfilled, rejected) {
-    this.handlers.push({
-        fulfilled,
-        rejected
-    })
-    return this.handlers.length - 1
-}
+  this.handlers.push({
+    fulfilled: fulfilled,
+    rejected: rejected
+  });
+  return this.handlers.length - 1;
+};
 
 /**
  * Remove an interceptor from the stack
@@ -26,10 +26,10 @@ InterceptorManager.prototype.use = function use(fulfilled, rejected) {
  * @param {Number} id The ID that was returned by `use`
  */
 InterceptorManager.prototype.eject = function eject(id) {
-    if (this.handlers[id]) {
-        this.handlers[id] = null
-    }
-}
+  if (this.handlers[id]) {
+    this.handlers[id] = null;
+  }
+};
 
 /**
  * Iterate over all the registered interceptors
@@ -40,11 +40,11 @@ InterceptorManager.prototype.eject = function eject(id) {
  * @param {Function} fn The function to call for each interceptor
  */
 InterceptorManager.prototype.forEach = function forEach(fn) {
-    this.handlers.forEach((h) => {
-        if (h !== null) {
-            fn(h)
-        }
-    })
-}
+  this.handlers.forEach((h) => {
+    if (h !== null) {
+      fn(h);
+    }
+  });
+};
 
-export default InterceptorManager
+export default InterceptorManager;