xe-utils - npm Package Compare versions

Comparing version 1.5.23 to 1.5.24

dist/xe-utils.js

 /**
- * xe-utils.js v1.5.23
+ * xe-utils.js v1.5.24
  * (c) 2017-2018 Xu Liangzhan
@@ -16,3 +16,3 @@ * ISC License.
 
-  XEUtils.version = '1.5.23'
+  XEUtils.version = '1.5.24'
 
@@ -57,3 +57,3 @@ /**
     * @param {Array} arr 数组
-    * @param {Function, String} iteratee 方法或属性
+    * @param {Function/String} iteratee 方法或属性
     * @return {Array}
@@ -119,8 +119,9 @@ */
     if (obj) {
+      context = context || this
       if (baseExports.isArray(obj)) {
-        return obj.some(iteratee, context || this)
+        return obj.some(iteratee, context)
       } else {
         for (var index in obj) {
           if (obj.hasOwnProperty(index)) {
-            if (iteratee.call(context || this, obj[index], index, obj)) {
+            if (iteratee.call(context, obj[index], index, obj)) {
               return true
@@ -146,8 +147,9 @@ }
     if (obj) {
+      context = context || this
       if (baseExports.isArray(obj)) {
-        return obj.every(iteratee, context || this)
+        return obj.every(iteratee, context)
       } else {
         for (var index in obj) {
           if (obj.hasOwnProperty(index)) {
-            if (!iteratee.call(context || this, obj[index], index, obj)) {
+            if (!iteratee.call(context, obj[index], index, obj)) {
               return false
@@ -173,8 +175,9 @@ }
     if (obj) {
+      context = context || this
       if (baseExports.isArray(obj)) {
-        return obj.filter(iteratee, context || this)
+        return obj.filter(iteratee, context)
       } else {
         var result = {}
         baseExports.each(obj, function (val, key) {
-          if (iteratee.call(context || this, val, key, obj)) {
+          if (iteratee.call(context, val, key, obj)) {
             result[key] = val
@@ -200,8 +203,9 @@ }
     if (obj) {
+      context = context || this
       if (baseExports.isArray(obj)) {
-        return obj.find(iteratee, context || this)
+        return obj.find(iteratee, context)
       } else {
         for (var key in obj) {
           if (obj.hasOwnProperty(key)) {
-            if (iteratee.call(context || this, obj[key], key, obj)) {
+            if (iteratee.call(context, obj[key], key, obj)) {
               return obj[key]
@@ -227,7 +231,8 @@ }
     if (obj) {
+      context = context || this
       if (baseExports.isArray(obj)) {
-        return obj.map(iteratee, context || this)
+        return obj.map(iteratee, context)
       } else {
         baseExports.each(obj, function () {
-          result.push(iteratee.apply(context || this, arguments))
+          result.push(iteratee.apply(context, arguments))
         })
@@ -240,2 +245,23 @@ }
 
+  /**
+   * 求和函数，将数值相加
+    * @param {Array} array 数组
+    * @param {Function/String} iteratee 方法或属性
+    * @param {Object} context 上下文
+    * @return {Number}
+   */
+  function arraySum (array, iteratee, context) {
+    var result = 0
+    context = context || this
+    baseExports.each(array, iteratee ? baseExports.isFunction(iteratee) ? function () {
+      result += iteratee.apply(context, arguments)
+    } : function (val, key) {
+      result += val[iteratee]
+    } : function (val, key) {
+      result += val
+    })
+    return result
+  }
+  var sum = arraySum
+
   var arrayExports = {
@@ -261,3 +287,5 @@ arrayUniq: arrayUniq,
     arrayMap: arrayMap,
-    map: map
+    map: map,
+    arraySum: arraySum,
+    sum: sum
   }
@@ -965,10 +993,11 @@
     * cookie操作函数
-    * @param String/Array/Object name 键/数组/对象
-    * @param String value 值
-    * @param Object options 参数
-    *   @param String name: 键
-    *   @param Object value: 值
-    *   @param String path: 路径
-    *   @param String domain: 作用域
-    *   @param Number expires: 几天后过期
+    * @param {String/Array/Object} name 键/数组/对象
+    * @param {String} value 值
+    * @param {Object} options 参数
+    *   @param {String} name: 键
+    *   @param {Object} value: 值
+    *   @param {String} path: 路径
+    *   @param {String} domain: 作用域
+    *   @param {Boolean} secure: 设置为安全的,只能用https协议
+    *   @param {Number} expires: 几天后过期
     */
@@ -1000,3 +1029,3 @@ function cookie (name, value, options) {
               if (opts[key] !== undefined) {
-                values.push(key + '=' + opts[key])
+                values.push(opts[key] && key === 'secure' ? key : (key + '=' + opts[key]))
               }
@@ -1215,3 +1244,3 @@ })
   /**
-    * 返回两个日期之间差距
+    * 返回两个日期之间差距,如果结束日期小于开始日期done为fasle
     *
@@ -1224,3 +1253,3 @@ * @param {Date} startDate 开始日期
   function getDateDiff (startDate, endDate, rules) {
-    var result = {}
+    var result = { done: false }
     var startTime = stringToDate(startDate).getTime()
@@ -1232,2 +1261,3 @@ var endTime = endDate ? stringToDate(endDate).getTime() : new Date()
       var rule = rules && rules.length > 0 ? rules : dateDiffRules
+      result.done = true
       for (var index = 0, len = rule.length; index < len; index++) {
@@ -1234,0 +1264,0 @@ item = rule[index]

dist/xe-utils.min.js

 /**
- * xe-utils.js v1.5.23
+ * xe-utils.js v1.5.24
  * (c) 2017-2018 Xu Liangzhan
@@ -7,2 +7,2 @@ * ISC License.
  */
-!function(n,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):n.XEUtils=t()}(this,function(){"use strict";function n(){}function t(n){var t=[];return en.isArray(n)&&en.arrayEach(n,function(n){t.includes(n)||t.push(n)}),t}function e(){for(var n=[],e=0,r=arguments.length;e<r;e++)n=n.concat(arguments[e]);return t(n)}function r(n,t,e){return en.isArray(n)?n.sort(t?en.isFunction(t)?t.bind(e||this):function(n,e){return n[t]>e[t]?1:-1}:function(n,t){return n>t?1:-1}):n}function i(n){for(var t=[],e=en.objectValues(n),r=e.length-1;r>=0;r--){var i=r>0?pn.getRandom(0,r):0;t.push(e[i]),e.splice(i,1)}return t}function o(n,t){var e=i(n);return 1===arguments.length?e[0]:(t<e.length&&(e.length=t||0),e)}function u(n,t,e){if(n){if(en.isArray(n))return n.some(t,e||this);for(var r in n)if(n.hasOwnProperty(r)&&t.call(e||this,n[r],r,n))return!0}return!1}function a(n,t,e){if(n){if(en.isArray(n))return n.every(t,e||this);for(var r in n)if(n.hasOwnProperty(r)&&!t.call(e||this,n[r],r,n))return!1}return!0}function s(n,t,e){if(n){if(en.isArray(n))return n.filter(t,e||this);var r={};return en.each(n,function(i,o){t.call(e||this,i,o,n)&&(r[o]=i)}),r}return[]}function c(n,t,e){if(n){if(en.isArray(n))return n.find(t,e||this);for(var r in n)if(n.hasOwnProperty(r)&&t.call(e||this,n[r],r,n))return n[r]}}function f(n,t,e){var r=[];if(n){if(en.isArray(n))return n.map(t,e||this);en.each(n,function(){r.push(t.apply(e||this,arguments))})}return r}function l(n){return"function"==typeof n}function h(n){return"string"==typeof n}function y(n){return"number"==typeof n}function p(n){return"object"==typeof n}function g(n){return!!n&&n.constructor===Object}function d(n){return"[object Date]"===B.call(n)}function m(n){return"undefined"!=typeof Symbol&&Symbol.isSymbol?Symbol.isSymbol(n):"symbol"==typeof n}function v(n){return function(t,e){if(t){if(h(t)||z(t))return n(t,e);for(var r in t)if(e===t[r])return r}return-1}}function b(n,t){return-1!==L(n,t)}function S(n,t,e){for(var r,i=1,o=t.length;i<o;i++)r=t[i],E(j(t[i]),function(t){n[t]=e?F(r[t],e):r[t]});return n}function j(n){var t=[];if(n){if(Object.keys)return Object.keys(n);w(n,function(n,e){t.push(e)})}return t}function M(n){if(Object.values)return n?Object.values(n):[];var t=[];return E(j(n),function(e){t.push(n[e])}),t}function O(n){if(Object.entries)return n?Object.entries(n):[];var t=[];return E(j(n),function(e){t.push([e,n[e]])}),t}function x(n){return M(n)[0]}function D(n){var t=M(n);return t[t.length-1]}function w(n,t,e){for(var r in n)n.hasOwnProperty(r)&&t.call(e||this,n[r],r,n)}function E(n,t,e){for(var r=0,i=n.length||0;r<i;r++)t.call(e||this,n[r],r,n)}function N(n,t,e){return n?z(n)?l(n.forEach)?n.forEach(t,e||this):E(n,t,e||this):w(n,t,e||this):n}function A(t){return g(t)?function(n){var t={};return N(n,function(n,e){t[e]=A(n)}),t}(t):z(t)?function(t){return n.arrayMap(t,A)}(t):t}function F(n,t){return n?t?A(n):X(g(n)?{}:[],n):n}function T(n,t,e){var r=[],i="undefined"!=typeof document;if(this&&this.$context&&(this.$context=null),en.isArray(n)?r=n:arguments.length>1?r=[en.objectAssign({name:n,value:t},e)]:en.isObject(n)&&(r=[n]),!(r.length>0)){var o={};return i&&document.cookie&&en.arrayEach(document.cookie.split("; "),function(n){var t=n.indexOf("=");o[on(n.substring(0,t))]=on(n.substring(t+1)||"")}),1===arguments.length?o[n]:o}i&&en.arrayEach(r,function(n){var t=en.objectAssign({},n),e=[];t.name&&(e.push(un(t.name)+"="+un(en.isObject(t.value)?JSON.stringify(t.value):t.value)),void 0!==t.expires&&(t.expires=new Date((new Date).getTime()+864e5*parseFloat(t.expires)).toUTCString()),en.arrayEach(["expires","path","domain","secure"],function(n){void 0!==t[n]&&e.push(n+"="+t[n])})),document.cookie=e.join("; ")})}function I(n,t){if(n){if(en.isDate(n))return n;if(!isNaN(n))return new Date(n);if(en.isString(n)){t=t||"yyyy-MM-dd HH:mm:ss.SSS";var e=[];return en.arrayEach(cn,function(r){for(var i,o,u=0,a=r.rules,s=a.length;u<s;u++){if(i=a[u],(o=t.indexOf(i[0]))>-1){e.push(parseFloat(n.substring(o,o+i[1])||0)+(r.offset||0));break}u===s-1&&e.push(0)}}),new Date(e[0],e[1],e[2],e[3],e[4],e[5],e[6])}}return"Invalid Date"}function k(n,t,e){var r=I(n),i=t&&!isNaN(t)?t:0,o=r.getHours(),u=r.getMinutes(),a=r.getSeconds(),s=r.getMilliseconds();if("first"===e){var c=r.getFullYear(),f=r.getMonth();return(f+=i)<0?new Date(c-Math.ceil((f=Math.abs(f))/12),12-(f%12||1),1,o,u,a,s):new Date(c+Math.floor(f/12),f%12,1,o,u,a,s)}if("last"===e)return new Date(k(r,i+1,"first").getTime()-864e5);var l=r.getDate(),h=k(r,i,"first"),y=h.getMonth();for(h.setDate(l);y<h.getMonth();)h.setDate(--l);return h}function H(n){var t={},e=n.split("?")[1]||"";return e&&en.arrayEach(e.split("&"),function(n){var e=n.split("=");t[decodeURIComponent(e[0])]=decodeURIComponent(e[1]||"")}),t}function P(){return hn?hn.origin||hn.protocol+"//"+hn.host:""}function R(n){var t=""+n;0===t.indexOf("/")&&(t=P()+t);var e=t.replace(/#.*/,"").match(/(\?.*)/),r={href:t,hash:"",host:"",hostname:"",protocol:"",port:"",search:e?e[1]:""};r.path=t.replace(/^([a-z0-9.+-]*:)\/\//,function(n,t){return r.protocol=t,""}).replace(/^([a-z0-9.+-]*)(:\d+)?\//,function(n,t,e){var i=e||"";return r.port=i.replace(":",""),r.hostname=t,r.host=t+i,"/"}).replace(/(#.*)/,function(n,t){return r.hash=t,""});var i=r.hash.match(/#((.*)\?|(.*))/);return r.pathname=r.path.replace(/(\?|#.*).*/,""),r.origin=r.protocol+"//"+r.host,r.hashKey=i?i[2]||"":"",r.hashQuery=H(r.hash),r.searchQuery=H(r.search),r}function U(n,t){return en.isFunction(t)?$.arraySort($.arrayMap(n,t,this)):$.arraySort(n,t)}function C(){return U.apply(this,arguments)[0]}function q(){return U.apply(this,arguments).reverse()[0]}function J(n){if(n){var t=parseFloat(n);return isNaN(t)?0:t}return 0}function W(n){var t=new RegExp("(?:"+en.objectKeys(n).join("|")+")","g");return function(e){return String(e||"").replace(t,function(t){return n[t]})}}n.version="1.5.23";var $={arrayUniq:t,uniq:t,arrayUnion:e,union:e,arraySort:r,sort:r,arrayShuffle:i,shuffle:i,arraySample:o,sample:o,arraySome:u,some:u,arrayEvery:a,every:a,arrayFilter:s,filter:s,arrayFind:c,find:c,arrayMap:f,map:f},B=Object.prototype.toString,z=Array.isArray||function(n){return"[object Array]"===B.call(n)},K=Number.isInteger,Y=0,L=v(function(n,t){if(n.indexOf)return n.indexOf(t);for(var e=0,r=n.length;e<r;e++)if(t===n[e])return e}),Q=v(function(n,t){if(n.lastIndexOf)return n.lastIndexOf(t);for(var e=n.length-1;e>=0;e--)if(t===n[e])return e;return-1}),V=b,X=function(n){if(n){var t=arguments;if(!0!==n)return Object.assign?Object.assign.apply(Object,t):S(n,t);if(t.length>1)return n=z(n[1])?[]:{},S(n,t,!0)}return n},G=j,Z=M,_=O,nn=x,tn=D,en={isNaN:isNaN,isFinite:isFinite,isArray:z,isFloat:function(n){return null!==n&&!isNaN(n)&&!K(n)},isInteger:K,isFunction:l,isBoolean:function(n){return"boolean"==typeof n},isString:h,isNumber:y,isRegExp:function(n){return"[object RegExp]"===B.call(n)},isObject:p,isPlainObject:g,isDate:d,isError:function(n){return"[object Error]"===B.call(n)},isTypeError:function(n){return!!n&&n.constructor===TypeError},isEmpty:function(n){if(0===n||!y(n)){for(var t in n)return!1;return!0}return!1},isNull:function(n){return null===n},isSymbol:m,isArguments:function(n){return"[object Arguments]"===B.call(n)},isElement:function(n){return n&&h(n.nodeName)&&y(n.nodeType)},isDocument:function(n){return n&&9===n.nodeType&&"undefined"!=typeof document},isWindow:function(n){return n&&n===n.window&&"undefined"!=typeof window},isFormData:function(n){return"undefined"!=typeof FormData&&n instanceof FormData},isLeapYear:function(t){var e=(t?n.stringToDate(t):new Date).getFullYear();return e%4==0&&(e%100!=0||e%400==0)},getType:function(n){return null===n?""+n:m(n)?"symbol":d(n)?"date":z(n)?"array":typeof n},uniqueId:function(){return++Y},getSize:function(n){var t=0;return h(n)||z(n)?n.length:(N(n,function(){t++}),t)},lastIndexOf:Q,includes:b,contains:V,objectAssign:X,assign:X,extend:X,stringToJson:function(n){if(p(n))return n;if(h(n))try{return JSON.parse(n)}catch(n){console.error(n)}return{}},jsonToString:function(n){if(p(n))try{return JSON.stringify(n)}catch(n){console.error(n)}return n?""+n:""},objectKeys:j,keys:G,objectValues:M,values:Z,objectEntries:O,entries:_,arrayFirst:x,first:nn,arrayLast:D,last:tn,objectEach:w,arrayEach:E,each:N,groupBy:function(n,t,e){var r,i,o={};return n&&(h(t)?(i=t,t=null):t=l(t)?t.bind(e||this):i=null,N(n,function(e,u){r=t?t(e,u,n):i?e[i]:e,o[r]?o[r].push(e):o[r]=[e]})),o},objectMap:function(n,t,e){var r={};return N(n,function(i,o){r[o]=t.call(e||this,i,o,n)}),r},clone:F},rn={browse:function(){var n={isNode:!1,isMobile:!1,isPC:!1};if("undefined"==typeof window&&"undefined"!=typeof process)n.nodeJS=!0;else if(n.isMobile=function(){for(var n=["Android","webOS","iPhone","iPad","iPod","SymbianOS","BlackBerry","Windows Phone"],t=navigator.userAgent,e=0;e<n.length;e++)if(t.indexOf(n[e])>0)return!0;return!1}(),n.isPC=!n.isMobile,"undefined"!=typeof document){var t=document.body||document.documentElement;en.arrayEach(["webkit","khtml","moz","ms","o"],function(e){n["-"+e]=!!t[e+"MatchesSelector"]})}return n}},on=decodeURIComponent,un=encodeURIComponent;en.objectAssign(T,{setItem:function(n,t){T(n,t)},getItem:function(n){return T(n)},removeItem:function(n){T(n,null,{expires:-1})},getJSON:function(){return T()}});var an={cookie:T},sn=Date.now||function(){return(new Date).getTime()},cn=[{rules:[["yyyy",4],["yyy",3],["yy",2]]},{rules:[["MM",2],["M",1]],offset:-1},{rules:[["dd",2],["d",1]]},{rules:[["HH",2],["H",1]]},{rules:[["mm",2],["m",1]]},{rules:[["ss",2],["s",1]]},{rules:[["SSS",3],["SS",2],["S",1]]}],fn=[["yyyy",31536e6],["MM",2592e6],["dd",864e5],["HH",36e5],["mm",6e4],["ss",1e3],["S",0]],ln={timestamp:sn,now:sn,stringToDate:I,dateToString:function(n,t){if(n){if(n=I(n),en.isDate(n)){var e=["日","一","二","三","四","五","六"],r={"q+":Math.floor((n.getMonth()+3)/3),"M+":n.getMonth()+1,"E+":n.getDay(),"d+":n.getDate(),"H+":n.getHours(),"m+":n.getMinutes(),"s+":n.getSeconds(),S:n.getMilliseconds()},i=String(t||"yyyy-MM-dd HH:mm:ss").replace(/(y+)/,function(t){return(""+n.getFullYear()).substr(4-t.length)});for(var o in r)if(r.hasOwnProperty(o)){var u=""+r[o];i=i.replace(new RegExp("("+o+")"),function(n){return"q+"===o||"E+"===o?e[u]:1===n.length?u:("00"+u).substr(u.length)})}return i}return n}return""},getWhatMonth:k,getWhatWeek:function(n,t,e){var r=I(n),i=Number(/^[0-7]$/.test(e)?e:r.getDay()),o=r.getDay(),u=r.getTime()+864e5*((0===i?7:i)-(0===o?7:o));return t&&!isNaN(t)&&(u+=6048e5*t),new Date(u)},getWhatDay:function(n,t){return new Date(I(n).getTime()+(t&&!isNaN(t)?864e5*t:0))},getDaysOfMonth:function(n,t){return Math.floor((k(n,t,"last").getTime()-k(n,t,"first").getTime())/864e5)+1},getDateDiff:function(n,t,e){var r={},i=I(n).getTime(),o=t?I(t).getTime():new Date;if(i<o)for(var u,a=o-i,s=e&&e.length>0?e:fn,c=0,f=s.length;c<f;c++)a>=(u=s[c])[1]?c===f-1?r[u[0]]=a||0:(r[u[0]]=Math.floor(a/u[1]),a-=r[u[0]]*u[1]):r[u[0]]=0;return r}},hn=null;"undefined"!=typeof location&&(hn=location);var yn={parseUrl:R,getBaseURL:function(){if(hn){var n=hn.pathname,t=en.lastIndexOf(n,"/")+1;return P()+(t===n.length?n:n.substring(0,t))}return""},locat:function(){return hn?R(hn.href):{}}},pn={getRandom:function(n,t){return n>=t?n:(n>>=0)+Math.round(Math.random()*((t||9)-n))},arrayMin:C,min:C,arrayMax:q,max:q,commafy:function(n,t){var e=en.objectAssign({spaceNumber:3,separator:",",fixed:0},t),r=parseFloat((""+n).replace(/,/g,"")||0).toFixed(e.fixed).split(".");return r[0].replace(new RegExp("(?=(?!(\\b))(\\d{"+e.spaceNumber+"})+$)","g"),e.separator)+(r[1]?"."+r[1]:"")},toNumber:J,stringToNumber:J},gn={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#x27;","`":"&#x60;"},dn={};en.arrayEach(en.objectKeys(gn),function(n){dn[gn[n]]=n});var mn={escape:W(gn),unescape:W(dn)},vn={};return en.objectAssign(vn,$,en,rn,an,ln,yn,pn,mn),n.mixin=function(t){vn.objectEach(t,function(t,e){n[e]=-1==="cookie".indexOf(e)&&vn.isFunction(t)?function(){var e=t.apply(n.$context,arguments);return n.$context=null,e}:t})},n.mixin(vn),n});
+!function(n,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):n.XEUtils=e()}(this,function(){"use strict";function n(){}function e(n){var e=[];return rn.isArray(n)&&rn.arrayEach(n,function(n){e.includes(n)||e.push(n)}),e}function t(){for(var n=[],t=0,r=arguments.length;t<r;t++)n=n.concat(arguments[t]);return e(n)}function r(n,e,t){return rn.isArray(n)?n.sort(e?rn.isFunction(e)?e.bind(t||this):function(n,t){return n[e]>t[e]?1:-1}:function(n,e){return n>e?1:-1}):n}function i(n){for(var e=[],t=rn.objectValues(n),r=t.length-1;r>=0;r--){var i=r>0?gn.getRandom(0,r):0;e.push(t[i]),t.splice(i,1)}return e}function o(n,e){var t=i(n);return 1===arguments.length?t[0]:(e<t.length&&(t.length=e||0),t)}function u(n,e,t){if(n){if(t=t||this,rn.isArray(n))return n.some(e,t);for(var r in n)if(n.hasOwnProperty(r)&&e.call(t,n[r],r,n))return!0}return!1}function a(n,e,t){if(n){if(t=t||this,rn.isArray(n))return n.every(e,t);for(var r in n)if(n.hasOwnProperty(r)&&!e.call(t,n[r],r,n))return!1}return!0}function s(n,e,t){if(n){if(t=t||this,rn.isArray(n))return n.filter(e,t);var r={};return rn.each(n,function(i,o){e.call(t,i,o,n)&&(r[o]=i)}),r}return[]}function c(n,e,t){if(n){if(t=t||this,rn.isArray(n))return n.find(e,t);for(var r in n)if(n.hasOwnProperty(r)&&e.call(t,n[r],r,n))return n[r]}}function f(n,e,t){var r=[];if(n){if(t=t||this,rn.isArray(n))return n.map(e,t);rn.each(n,function(){r.push(e.apply(t,arguments))})}return r}function l(n,e,t){var r=0;return t=t||this,rn.each(n,e?rn.isFunction(e)?function(){r+=e.apply(t,arguments)}:function(n,t){r+=n[e]}:function(n,e){r+=n}),r}function y(n){return"function"==typeof n}function h(n){return"string"==typeof n}function p(n){return"number"==typeof n}function g(n){return"object"==typeof n}function d(n){return!!n&&n.constructor===Object}function m(n){return"[object Date]"===z.call(n)}function v(n){return"undefined"!=typeof Symbol&&Symbol.isSymbol?Symbol.isSymbol(n):"symbol"==typeof n}function b(n){return function(e,t){if(e){if(h(e)||K(e))return n(e,t);for(var r in e)if(t===e[r])return r}return-1}}function S(n,e){return-1!==Q(n,e)}function j(n,e,t){for(var r,i=1,o=e.length;i<o;i++)r=e[i],N(M(e[i]),function(e){n[e]=t?T(r[e],t):r[e]});return n}function M(n){var e=[];if(n){if(Object.keys)return Object.keys(n);E(n,function(n,t){e.push(t)})}return e}function O(n){if(Object.values)return n?Object.values(n):[];var e=[];return N(M(n),function(t){e.push(n[t])}),e}function x(n){if(Object.entries)return n?Object.entries(n):[];var e=[];return N(M(n),function(t){e.push([t,n[t]])}),e}function D(n){return O(n)[0]}function w(n){var e=O(n);return e[e.length-1]}function E(n,e,t){for(var r in n)n.hasOwnProperty(r)&&e.call(t||this,n[r],r,n)}function N(n,e,t){for(var r=0,i=n.length||0;r<i;r++)e.call(t||this,n[r],r,n)}function A(n,e,t){return n?K(n)?y(n.forEach)?n.forEach(e,t||this):N(n,e,t||this):E(n,e,t||this):n}function F(e){return d(e)?function(n){var e={};return A(n,function(n,t){e[t]=F(n)}),e}(e):K(e)?function(e){return n.arrayMap(e,F)}(e):e}function T(n,e){return n?e?F(n):G(d(n)?{}:[],n):n}function I(n,e,t){var r=[],i="undefined"!=typeof document;if(this&&this.$context&&(this.$context=null),rn.isArray(n)?r=n:arguments.length>1?r=[rn.objectAssign({name:n,value:e},t)]:rn.isObject(n)&&(r=[n]),!(r.length>0)){var o={};return i&&document.cookie&&rn.arrayEach(document.cookie.split("; "),function(n){var e=n.indexOf("=");o[un(n.substring(0,e))]=un(n.substring(e+1)||"")}),1===arguments.length?o[n]:o}i&&rn.arrayEach(r,function(n){var e=rn.objectAssign({},n),t=[];e.name&&(t.push(an(e.name)+"="+an(rn.isObject(e.value)?JSON.stringify(e.value):e.value)),void 0!==e.expires&&(e.expires=new Date((new Date).getTime()+864e5*parseFloat(e.expires)).toUTCString()),rn.arrayEach(["expires","path","domain","secure"],function(n){void 0!==e[n]&&t.push(e[n]&&"secure"===n?n:n+"="+e[n])})),document.cookie=t.join("; ")})}function k(n,e){if(n){if(rn.isDate(n))return n;if(!isNaN(n))return new Date(n);if(rn.isString(n)){e=e||"yyyy-MM-dd HH:mm:ss.SSS";var t=[];return rn.arrayEach(fn,function(r){for(var i,o,u=0,a=r.rules,s=a.length;u<s;u++){if(i=a[u],(o=e.indexOf(i[0]))>-1){t.push(parseFloat(n.substring(o,o+i[1])||0)+(r.offset||0));break}u===s-1&&t.push(0)}}),new Date(t[0],t[1],t[2],t[3],t[4],t[5],t[6])}}return"Invalid Date"}function H(n,e,t){var r=k(n),i=e&&!isNaN(e)?e:0,o=r.getHours(),u=r.getMinutes(),a=r.getSeconds(),s=r.getMilliseconds();if("first"===t){var c=r.getFullYear(),f=r.getMonth();return(f+=i)<0?new Date(c-Math.ceil((f=Math.abs(f))/12),12-(f%12||1),1,o,u,a,s):new Date(c+Math.floor(f/12),f%12,1,o,u,a,s)}if("last"===t)return new Date(H(r,i+1,"first").getTime()-864e5);var l=r.getDate(),y=H(r,i,"first"),h=y.getMonth();for(y.setDate(l);h<y.getMonth();)y.setDate(--l);return y}function P(n){var e={},t=n.split("?")[1]||"";return t&&rn.arrayEach(t.split("&"),function(n){var t=n.split("=");e[decodeURIComponent(t[0])]=decodeURIComponent(t[1]||"")}),e}function R(){return hn?hn.origin||hn.protocol+"//"+hn.host:""}function U(n){var e=""+n;0===e.indexOf("/")&&(e=R()+e);var t=e.replace(/#.*/,"").match(/(\?.*)/),r={href:e,hash:"",host:"",hostname:"",protocol:"",port:"",search:t?t[1]:""};r.path=e.replace(/^([a-z0-9.+-]*:)\/\//,function(n,e){return r.protocol=e,""}).replace(/^([a-z0-9.+-]*)(:\d+)?\//,function(n,e,t){var i=t||"";return r.port=i.replace(":",""),r.hostname=e,r.host=e+i,"/"}).replace(/(#.*)/,function(n,e){return r.hash=e,""});var i=r.hash.match(/#((.*)\?|(.*))/);return r.pathname=r.path.replace(/(\?|#.*).*/,""),r.origin=r.protocol+"//"+r.host,r.hashKey=i?i[2]||"":"",r.hashQuery=P(r.hash),r.searchQuery=P(r.search),r}function C(n,e){return rn.isFunction(e)?B.arraySort(B.arrayMap(n,e,this)):B.arraySort(n,e)}function q(){return C.apply(this,arguments)[0]}function J(){return C.apply(this,arguments).reverse()[0]}function W(n){if(n){var e=parseFloat(n);return isNaN(e)?0:e}return 0}function $(n){var e=new RegExp("(?:"+rn.objectKeys(n).join("|")+")","g");return function(t){return String(t||"").replace(e,function(e){return n[e]})}}n.version="1.5.24";var B={arrayUniq:e,uniq:e,arrayUnion:t,union:t,arraySort:r,sort:r,arrayShuffle:i,shuffle:i,arraySample:o,sample:o,arraySome:u,some:u,arrayEvery:a,every:a,arrayFilter:s,filter:s,arrayFind:c,find:c,arrayMap:f,map:f,arraySum:l,sum:l},z=Object.prototype.toString,K=Array.isArray||function(n){return"[object Array]"===z.call(n)},Y=Number.isInteger,L=0,Q=b(function(n,e){if(n.indexOf)return n.indexOf(e);for(var t=0,r=n.length;t<r;t++)if(e===n[t])return t}),V=b(function(n,e){if(n.lastIndexOf)return n.lastIndexOf(e);for(var t=n.length-1;t>=0;t--)if(e===n[t])return t;return-1}),X=S,G=function(n){if(n){var e=arguments;if(!0!==n)return Object.assign?Object.assign.apply(Object,e):j(n,e);if(e.length>1)return n=K(n[1])?[]:{},j(n,e,!0)}return n},Z=M,_=O,nn=x,en=D,tn=w,rn={isNaN:isNaN,isFinite:isFinite,isArray:K,isFloat:function(n){return null!==n&&!isNaN(n)&&!Y(n)},isInteger:Y,isFunction:y,isBoolean:function(n){return"boolean"==typeof n},isString:h,isNumber:p,isRegExp:function(n){return"[object RegExp]"===z.call(n)},isObject:g,isPlainObject:d,isDate:m,isError:function(n){return"[object Error]"===z.call(n)},isTypeError:function(n){return!!n&&n.constructor===TypeError},isEmpty:function(n){if(0===n||!p(n)){for(var e in n)return!1;return!0}return!1},isNull:function(n){return null===n},isSymbol:v,isArguments:function(n){return"[object Arguments]"===z.call(n)},isElement:function(n){return n&&h(n.nodeName)&&p(n.nodeType)},isDocument:function(n){return n&&9===n.nodeType&&"undefined"!=typeof document},isWindow:function(n){return n&&n===n.window&&"undefined"!=typeof window},isFormData:function(n){return"undefined"!=typeof FormData&&n instanceof FormData},isLeapYear:function(e){var t=(e?n.stringToDate(e):new Date).getFullYear();return t%4==0&&(t%100!=0||t%400==0)},getType:function(n){return null===n?""+n:v(n)?"symbol":m(n)?"date":K(n)?"array":typeof n},uniqueId:function(){return++L},getSize:function(n){var e=0;return h(n)||K(n)?n.length:(A(n,function(){e++}),e)},lastIndexOf:V,includes:S,contains:X,objectAssign:G,assign:G,extend:G,stringToJson:function(n){if(g(n))return n;if(h(n))try{return JSON.parse(n)}catch(n){console.error(n)}return{}},jsonToString:function(n){if(g(n))try{return JSON.stringify(n)}catch(n){console.error(n)}return n?""+n:""},objectKeys:M,keys:Z,objectValues:O,values:_,objectEntries:x,entries:nn,arrayFirst:D,first:en,arrayLast:w,last:tn,objectEach:E,arrayEach:N,each:A,groupBy:function(n,e,t){var r,i,o={};return n&&(h(e)?(i=e,e=null):e=y(e)?e.bind(t||this):i=null,A(n,function(t,u){r=e?e(t,u,n):i?t[i]:t,o[r]?o[r].push(t):o[r]=[t]})),o},objectMap:function(n,e,t){var r={};return A(n,function(i,o){r[o]=e.call(t||this,i,o,n)}),r},clone:T},on={browse:function(){var n={isNode:!1,isMobile:!1,isPC:!1};if("undefined"==typeof window&&"undefined"!=typeof process)n.nodeJS=!0;else if(n.isMobile=function(){for(var n=["Android","webOS","iPhone","iPad","iPod","SymbianOS","BlackBerry","Windows Phone"],e=navigator.userAgent,t=0;t<n.length;t++)if(e.indexOf(n[t])>0)return!0;return!1}(),n.isPC=!n.isMobile,"undefined"!=typeof document){var e=document.body||document.documentElement;rn.arrayEach(["webkit","khtml","moz","ms","o"],function(t){n["-"+t]=!!e[t+"MatchesSelector"]})}return n}},un=decodeURIComponent,an=encodeURIComponent;rn.objectAssign(I,{setItem:function(n,e){I(n,e)},getItem:function(n){return I(n)},removeItem:function(n){I(n,null,{expires:-1})},getJSON:function(){return I()}});var sn={cookie:I},cn=Date.now||function(){return(new Date).getTime()},fn=[{rules:[["yyyy",4],["yyy",3],["yy",2]]},{rules:[["MM",2],["M",1]],offset:-1},{rules:[["dd",2],["d",1]]},{rules:[["HH",2],["H",1]]},{rules:[["mm",2],["m",1]]},{rules:[["ss",2],["s",1]]},{rules:[["SSS",3],["SS",2],["S",1]]}],ln=[["yyyy",31536e6],["MM",2592e6],["dd",864e5],["HH",36e5],["mm",6e4],["ss",1e3],["S",0]],yn={timestamp:cn,now:cn,stringToDate:k,dateToString:function(n,e){if(n){if(n=k(n),rn.isDate(n)){var t=["日","一","二","三","四","五","六"],r={"q+":Math.floor((n.getMonth()+3)/3),"M+":n.getMonth()+1,"E+":n.getDay(),"d+":n.getDate(),"H+":n.getHours(),"m+":n.getMinutes(),"s+":n.getSeconds(),S:n.getMilliseconds()},i=String(e||"yyyy-MM-dd HH:mm:ss").replace(/(y+)/,function(e){return(""+n.getFullYear()).substr(4-e.length)});for(var o in r)if(r.hasOwnProperty(o)){var u=""+r[o];i=i.replace(new RegExp("("+o+")"),function(n){return"q+"===o||"E+"===o?t[u]:1===n.length?u:("00"+u).substr(u.length)})}return i}return n}return""},getWhatMonth:H,getWhatWeek:function(n,e,t){var r=k(n),i=Number(/^[0-7]$/.test(t)?t:r.getDay()),o=r.getDay(),u=r.getTime()+864e5*((0===i?7:i)-(0===o?7:o));return e&&!isNaN(e)&&(u+=6048e5*e),new Date(u)},getWhatDay:function(n,e){return new Date(k(n).getTime()+(e&&!isNaN(e)?864e5*e:0))},getDaysOfMonth:function(n,e){return Math.floor((H(n,e,"last").getTime()-H(n,e,"first").getTime())/864e5)+1},getDateDiff:function(n,e,t){var r={done:!1},i=k(n).getTime(),o=e?k(e).getTime():new Date;if(i<o){var u,a=o-i,s=t&&t.length>0?t:ln;r.done=!0;for(var c=0,f=s.length;c<f;c++)a>=(u=s[c])[1]?c===f-1?r[u[0]]=a||0:(r[u[0]]=Math.floor(a/u[1]),a-=r[u[0]]*u[1]):r[u[0]]=0}return r}},hn=null;"undefined"!=typeof location&&(hn=location);var pn={parseUrl:U,getBaseURL:function(){if(hn){var n=hn.pathname,e=rn.lastIndexOf(n,"/")+1;return R()+(e===n.length?n:n.substring(0,e))}return""},locat:function(){return hn?U(hn.href):{}}},gn={getRandom:function(n,e){return n>=e?n:(n>>=0)+Math.round(Math.random()*((e||9)-n))},arrayMin:q,min:q,arrayMax:J,max:J,commafy:function(n,e){var t=rn.objectAssign({spaceNumber:3,separator:",",fixed:0},e),r=parseFloat((""+n).replace(/,/g,"")||0).toFixed(t.fixed).split(".");return r[0].replace(new RegExp("(?=(?!(\\b))(\\d{"+t.spaceNumber+"})+$)","g"),t.separator)+(r[1]?"."+r[1]:"")},toNumber:W,stringToNumber:W},dn={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#x27;","`":"&#x60;"},mn={};rn.arrayEach(rn.objectKeys(dn),function(n){mn[dn[n]]=n});var vn={escape:$(dn),unescape:$(mn)},bn={};return rn.objectAssign(bn,B,rn,on,sn,yn,pn,gn,vn),n.mixin=function(e){bn.objectEach(e,function(e,t){n[t]=-1==="cookie".indexOf(t)&&bn.isFunction(e)?function(){var t=e.apply(n.$context,arguments);return n.$context=null,t}:e})},n.mixin(bn),n});

package.json

 {
   "name": "xe-utils",
-  "version": "1.5.23",
+  "version": "1.5.24",
   "description": "XEUtils 函数库",
@@ -5,0 +5,0 @@ "main": "index.js",

README.md

@@ -19,3 +19,3 @@ # XEUtils 函数库
 [点击浏览](https://cdn.jsdelivr.net/npm/xe-utils/)已发布的所有 npm 包源码
-``` shell
+```HTML
 <script src="https://cdn.jsdelivr.net/npm/xe-utils/dist/xe-utils.js"></script>
@@ -25,3 +25,3 @@ ```
 [点击浏览](https://unpkg.com/xe-utils/)已发布的所有 npm 包源码
-``` shell
+```HTML
 <script src="https://unpkg.com/xe-utils/dist/xe-utils.js"></script>
@@ -32,3 +32,3 @@ ```
 ### require.js
-``` shell
+```JavaScript
 // require 配置
@@ -44,3 +44,3 @@ require.config({
 ## NPM 安装
-``` shell
+```JavaScript
 npm install xe-utils --save
@@ -50,3 +50,3 @@ ```
 ### NodeJS 导入
-``` shell
+```JavaScript
 const XEUtils = require('xe-utils')
@@ -56,3 +56,3 @@ ```
 ### ES6 Module import 部分导入
-``` shell
+```JavaScript
 import { dateToString, stringToDate } from 'xe-utils'
@@ -62,3 +62,3 @@ ```
 ### ES6 Module import 导入所有
-``` shell
+```JavaScript
 import XEUtils from 'xe-utils'
@@ -69,3 +69,3 @@ ```
 ### isNaN (val) 判断是否非数值
-```shell
+```JavaScript
 import XEUtils from 'xe-utils'
@@ -81,3 +81,3 @@
 ### isFinite (val) 判断是否为有限数值
-```shell
+```JavaScript
 import XEUtils from 'xe-utils'
@@ -90,3 +90,3 @@
 ### isArray (val) 判断是否数组
-```shell
+```JavaScript
 import XEUtils from 'xe-utils'
@@ -99,3 +99,3 @@
 ### isFloat (val) 判断是否小数
-```shell
+```JavaScript
 import XEUtils from 'xe-utils'
@@ -109,3 +109,3 @@
 ### isInteger (val) 判断是否整数
-```shell
+```JavaScript
 import XEUtils from 'xe-utils'
@@ -119,3 +119,3 @@
 #### isFunction (val) 判断是否方法
-```shell
+```JavaScript
 import XEUtils from 'xe-utils'
@@ -127,3 +127,3 @@
 ### isBoolean (val) 判断是否Boolean对象
-```shell
+```JavaScript
 import XEUtils from 'xe-utils'
@@ -135,3 +135,3 @@
 ### isString (val) 判断是否String对象
-```shell
+```JavaScript
 import XEUtils from 'xe-utils'
@@ -145,3 +145,3 @@
 ### isNumber (val) 判断是否Number对象
-```shell
+```JavaScript
 import XEUtils from 'xe-utils'
@@ -154,3 +154,3 @@
 ### isRegExp (val) 判断是否RegExp对象
-```shell
+```JavaScript
 import XEUtils from 'xe-utils'
@@ -164,3 +164,3 @@
 ### isObject (val) 判断是否Object对象
-```shell
+```JavaScript
 import XEUtils from 'xe-utils'
@@ -174,3 +174,3 @@
 ### isPlainObject (val) 判断是否是一个对象
-```shell
+```JavaScript
 import XEUtils from 'xe-utils'
@@ -184,3 +184,3 @@
 ### isDate (val) 判断是否Date对象
-```shell
+```JavaScript
 import XEUtils from 'xe-utils'
@@ -194,3 +194,3 @@
 ### isError (val) 判断是否Error对象
-```shell
+```JavaScript
 import XEUtils from 'xe-utils'
@@ -203,3 +203,3 @@
 ### isTypeError (val) 判断是否TypeError对象
-```shell
+```JavaScript
 import XEUtils from 'xe-utils'
@@ -212,3 +212,3 @@
 ### isEmpty (val) 判断是否为空,包括空对象、空数值、空字符串
-```shell
+```JavaScript
 import XEUtils from 'xe-utils'
@@ -223,3 +223,3 @@
 ### isNull (val) 判断是否为Null
-```shell
+```JavaScript
 import XEUtils from 'xe-utils'
@@ -232,3 +232,3 @@
 ### isSymbol (val) 判断是否Symbol对象
-```shell
+```JavaScript
 import XEUtils from 'xe-utils'
@@ -240,3 +240,3 @@
 ### isArguments (val) 判断是否Arguments对象
-```shell
+```JavaScript
 import { isArguments } from 'xe-utils'
@@ -248,3 +248,3 @@
 ### isElement (val) 判断是否Element对象
-```shell
+```JavaScript
 import XEUtils from 'xe-utils'
@@ -256,3 +256,3 @@
 ### isDocument (val) 判断是否Document对象
-```shell
+```JavaScript
 import XEUtils from 'xe-utils'
@@ -264,3 +264,3 @@
 ### isWindow (val) 判断是否Window对象
-```shell
+```JavaScript
 import XEUtils from 'xe-utils'
@@ -272,3 +272,3 @@
 ### isFormData (val) 判断是否FormData对象
-```shell
+```JavaScript
 import { isFormData } from 'xe-utils'
@@ -280,3 +280,3 @@
 ### isLeapYear (date) 判断是否闰年
-```shell
+```JavaScript
 import XEUtils from 'xe-utils'
@@ -289,3 +289,3 @@
 ### getType (obj) 获取对象类型
-```shell
+```JavaScript
 import XEUtils from 'xe-utils'
@@ -302,3 +302,3 @@
 ### uniqueId (  ) 获取一个全局唯一标识
-```shell
+```JavaScript
 import XEUtils from 'xe-utils'
@@ -310,3 +310,3 @@
 ### getSize ( obj ) 返回对象的长度
-```shell
+```JavaScript
 import XEUtils from 'xe-utils'
@@ -319,3 +319,3 @@
 ### indexOf (obj, val) 返回对象第一个索引值
-```shell
+```JavaScript
 import XEUtils from 'xe-utils'
@@ -327,3 +327,3 @@
 ### lastIndexOf (obj, val) 从最后开始的索引值,返回对象第一个索引值
-```shell
+```JavaScript
 import XEUtils from 'xe-utils'
@@ -335,3 +335,3 @@
 ### includes (obj, val) 判断对象是否包含该值,成功返回true否则false
-```shell
+```JavaScript
 import XEUtils from 'xe-utils'
@@ -343,3 +343,3 @@
 ### assign/objectAssign/extend ([deep], target, ...) 浅拷贝一个或者多个对象到目标对象中，如果第一值是true，则使用深拷贝
-```shell
+```JavaScript
 import XEUtils, { objectAssign } from 'xe-utils'
@@ -363,3 +363,3 @@
 ### stringToJson (str) 字符串转JSON
-```shell
+```JavaScript
 import XEUtils from 'xe-utils'
@@ -371,3 +371,3 @@
 ### jsonToString (obj) JSON转字符串
-```shell
+```JavaScript
 import XEUtils from 'xe-utils'
@@ -379,3 +379,3 @@
 ### keys/objectKeys (obj) 获取对象所有属性
-```shell
+```JavaScript
 import XEUtils, { objectKeys } from 'xe-utils'
@@ -387,3 +387,3 @@
 ### values/objectValues (obj) 获取对象所有值
-```shell
+```JavaScript
 import XEUtils, { objectValues } from 'xe-utils'
@@ -395,3 +395,3 @@
 ### entries/objectEntries (obj) 获取对象所有属性、值
-```shell
+```JavaScript
 import XEUtils from 'xe-utils'
@@ -403,3 +403,3 @@
 ### first/arrayFirst (obj) 获取对象第一个值
-```shell
+```JavaScript
 import XEUtils, { arrayFirst } from 'xe-utils'
@@ -411,3 +411,3 @@
 ### last/arrayLast (obj) 获取对象最后一个值
-```shell
+```JavaScript
 import XEUtils, { arrayLast } from 'xe-utils'
@@ -419,3 +419,3 @@
 ### each/objectEach/arrayEach ( obj, iteratee, context ) 迭代器
-```shell
+```JavaScript
 import XEUtils, { objectEach, arrayEach } from 'xe-utils'
@@ -434,7 +434,7 @@
 ### groupBy ( obj, iteratee, context ) 集合分组,默认使用键值分组,如果有iteratee则使用结果进行分组
-```shell
+```JavaScript
 import XEUtils from 'xe-utils'
 
-const result1 = XEUtils.groupBy([{type: 'a'}, {type: 'b'}]], 'type') // {a: [{a: 'a'}], b: [{b: 'b'}]}
-const result2 = XEUtils.groupBy([{type: 'a'}, {type: 'b'}]], (item, key) => {
+const result1 = XEUtils.groupBy([{type: 'a'}, {type: 'b'}], 'type') // {a: [{a: 'a'}], b: [{b: 'b'}]}
+const result2 = XEUtils.groupBy([{type: 'a'}, {type: 'b'}], (item, key) => {
   return item.type
@@ -444,7 +444,7 @@ }) // {a: [{a: 'a'}], b: [{b: 'b'}]}
 ### objectMap ( obj, iteratee, context ) 指定方法后的返回值组成的新对象
-```shell
+```JavaScript
 import XEUtils from 'xe-utils'
 
 const result = []
-XEUtils.objectMap([{type: 'a'}, {type: 'b'}]], (item, key) => {
+XEUtils.objectMap([{type: 'a'}, {type: 'b'}], (item, key) => {
   return item.type
@@ -454,3 +454,3 @@ }) // {a: {type: 'a', b: {type: 'b'}}}
 ### clone (obj, deep) 浅拷贝/深拷贝
-```shell
+```JavaScript
 import XEUtils from 'xe-utils'
@@ -470,3 +470,3 @@
 ### uniq/arrayUniq ( array ) 数组去重
-```shell
+```JavaScript
 import XEUtils, { arrayUniq } from 'xe-utils'
@@ -478,3 +478,3 @@
 ### union/arrayUnion ( ...array ) 将多个数的值返回唯一的并集数组
-```shell
+```JavaScript
 import XEUtils, { arrayUnion } from 'xe-utils'
@@ -486,3 +486,3 @@
 ### sort/arraySort ( arr, iteratee, context ) 数组按属性值升序
-```shell
+```JavaScript
 import XEUtils, { arraySort } from 'xe-utils'
@@ -497,3 +497,3 @@
 ### shuffle/arrayShuffle ( array ) 将一个数组随机打乱，返回一个新的数组
-```shell
+```JavaScript
 import XEUtils, { arrayShuffle } from 'xe-utils'
@@ -505,3 +505,3 @@
 ### sample/arraySample ( array, number ) 从一个数组中随机返回几个元素
-```shell
+```JavaScript
 import XEUtils, { arraySample } from 'xe-utils'
@@ -513,9 +513,9 @@
 ### some/arraySome ( obj, iteratee, context ) 对象中的值中的每一项运行给定函数,如果函数对任一项返回true,则返回true,否则返回false
-```shell
+```JavaScript
 import XEUtils, { arraySome } from 'xe-utils'
 
-XEUtils.some([{a: 11}, {a: 22}]], (item, key) => {
+XEUtils.some([{a: 11}, {a: 22}], (item, key) => {
   return item.a === 55
 }) // false
-arraySome([{a: 11}, {a: 22}]], (item, key) => {
+arraySome([{a: 11}, {a: 22}], (item, key) => {
   return item.a === 11
@@ -525,6 +525,6 @@ }) // true
 ### every/arrayEvery ( obj, iteratee, context ) 对象中的值中的每一项运行给定函数,如果该函数对每一项都返回true,则返回true,否则返回false
-```shell
+```JavaScript
 import XEUtils, { arrayEvery } from 'xe-utils'
 
-XEUtils.every([{a: 11}, {a: 22}]], (item, key) => {
+XEUtils.every([{a: 11}, {a: 22}], (item, key) => {
   return item.a === 11
@@ -537,9 +537,9 @@ }) // false
 ### filter/arrayFilter ( obj, iteratee, context ) 根据回调过滤数据
-```shell
+```JavaScript
 import XEUtils, { arrayFilter } from 'xe-utils'
 
-XEUtils.filter([{a: 11}, {a: 22}]], (item, key) => {
+XEUtils.filter([{a: 11}, {a: 22}], (item, key) => {
   return item.a > 11
 }) // [{a: 22}]
-arrayFilter([{a: 11}, {a: 22}]], (item, key) => {
+arrayFilter([{a: 11}, {a: 22}], (item, key) => {
   return item.a > 11
@@ -549,9 +549,9 @@ }) // [{a: 22}]
 ### find/arrayFind ( obj, iteratee, context ) 查找匹配第一条数据
-```shell
+```JavaScript
 import XEUtils, { arrayFind } from 'xe-utils'
 
-XEUtils.find([{a: 11}, {a: 22}]], (item, key) => {
+XEUtils.find([{a: 11}, {a: 22}], (item, key) => {
   return item.a === 55
 }) // null
-arrayFind([{a: 11}, {a: 22}]], (item, key) => {
+arrayFind([{a: 11}, {a: 22}], (item, key) => {
   return item.a === 22
@@ -561,9 +561,9 @@ }) // {a: 22}
 ### map/arrayMap ( obj, iteratee, context ) 指定方法后的返回值组成的新数组
-```shell
+```JavaScript
 import XEUtils, { arrayMap } from 'xe-utils'
 
-XEUtils.map([{a: 11}, {a: 22}]], (item, key) => {
+XEUtils.map([{a: 11}, {a: 22}], (item, key) => {
   return item.a
 }) // [11, 22]
-arrayMap([{a: 11}, {a: 22}]], (item, key) => {
+arrayMap([{a: 11}, {a: 22}], (item, key) => {
   return item.a
@@ -573,4 +573,15 @@ }) // [11, 22]
 
+### sum/arraySum ( obj, iteratee, context ) 求和函数，将数值相加
+```JavaScript
+import XEUtils, { arraySum } from 'xe-utils'
+
+XEUtils.sum([22, 66, 88]) // 176
+XEUtils.sum([{aa: 11}, {aa: 22}, {aa: 66}], 'aa') // 99
+arraySum([{aa: 11}, {aa: 22}, {aa: 66}], (item, key) => {
+  return item.aa * 2
+}) // 198
+```
+
 ### now/timestamp ( ) 返回时间戳
-```shell
+```JavaScript
 import XEUtils, { timestamp } from 'xe-utils'
@@ -582,3 +593,3 @@
 ### stringToDate ( str, format ) 任意格式字符串转为日期(yyyy年份、MM月份、dd天、HH小时、mm分钟、ss秒、SSS毫秒)
-```shell
+```JavaScript
 import XEUtils from 'xe-utils'
@@ -593,3 +604,3 @@
 ### dateToString ( date, format ) 日期化为任意格式字符串(yyyy年份、MM月份、dd天、HH小时、mm分钟、ss秒、S毫秒、E星期几、q季度)
-```shell
+```JavaScript
 import XEUtils from 'xe-utils'
@@ -605,3 +616,3 @@
 ### getWhatMonth ( date, mode, month ) 返回前几个月或后几个月的日期,可以指定月初或月末，默认当前
-```shell
+```JavaScript
 import XEUtils from 'xe-utils'
@@ -617,3 +628,3 @@
 ### getWhatWeek ( date, mode, week ) 返回前几周或后几周的日期,可以指定星期几，默认当前
-```shell
+```JavaScript
 import XEUtils from 'xe-utils'
@@ -629,3 +640,3 @@
 ### getWhatDay ( date, day ) 返回前几天或后几天的日期
-```shell
+```JavaScript
 import XEUtils from 'xe-utils'
@@ -639,3 +650,3 @@
 ### getDaysOfMonth ( date, month ) 返回当前日期月份的天数,可以指定前几个月或后几个月，默认当前
-```shell
+```JavaScript
 import XEUtils from 'xe-utils'
@@ -650,3 +661,3 @@
 ### getDateDiff ( startDate, endDate, rules ) 返回两个日期之间差距,如果结束日期小于开始日期done为fasle
-```shell
+```JavaScript
 import XEUtils from 'xe-utils'
@@ -663,3 +674,3 @@
 ### getRandom ( min, max ) 获取一个指定范围内随机数
-```shell
+```JavaScript
 import XEUtils from 'xe-utils'
@@ -672,3 +683,3 @@
 ### min/arrayMin ( arr, iteratee ) 获取最小值
-```shell
+```JavaScript
 import XEUtils, { arrayMin } from 'xe-utils'
@@ -683,3 +694,3 @@
 ### max/arrayMax ( arr, iteratee ) 获取最大值
-```shell
+```JavaScript
 import XEUtils, { arrayMax } from 'xe-utils'
@@ -695,12 +706,15 @@
 ### commafy ( num, options ) 数值千分位分隔符、小数点
-```shell
+```JavaScript
 import XEUtils from 'xe-utils'
 
-XEUtils.commafy(1000000) // 千分位格式化 1,000,000
-XEUtils.commafy(1000000, {fixed: 2}) // 格式化金额 1,000,000.00
-XEUtils.commafy(1234123412341234, {spaceNumber: 4, separator: ' ', fixed: 0}) // 格式化银行卡 1234 1234 1234 1234
+// 千分位格式化 1,000,000
+XEUtils.commafy(1000000)
+// 格式化金额 1,000,000.00
+XEUtils.commafy(1000000, {fixed: 2})
+// 格式化银行卡 1234 1234 1234 1234
+XEUtils.commafy(1234123412341234, {spaceNumber: 4, separator: ' ', fixed: 0})
 ```
 
 ### toNumber/stringToNumber ( num ) 转数值
-```shell
+```JavaScript
 import XEUtils from 'xe-utils'
@@ -714,38 +728,65 @@
 ### escape ( str ) 转义HTML字符串，替换&, <, >, ", ', `字符
-```shell
+```JavaScript
 import XEUtils from 'xe-utils'
 
-XEUtils.escape('<a>link</a>') // '&lt;a&gt;link&lt;/a&gt;'
+// 转义
+XEUtils.escape('<a>link</a>') 
+// '&lt;a&gt;link&lt;/a&gt;'
 ```
 ### unescape ( str ) 反转escape
-```shell
+```JavaScript
 import XEUtils from 'xe-utils'
 
-XEUtils.unescape('&lt;a&gt;link&lt;/a&gt;') // '<a>link</a>'
+// 反转
+XEUtils.unescape('&lt;a&gt;link&lt;/a&gt;') 
+// '<a>link</a>'
 ```
 
 ### browse ( ) 获取浏览器内核
-```shell
+```JavaScript
 import XEUtils from 'xe-utils'
 
 XEUtils.browse()
-// {-khtml: false, -moz: false, -ms: fasle, -o: false, -webkit: true, isMobile: false, isNode: false, isPC: true}
+// {
+//   "-khtml": false, 
+//   "-moz": false, 
+//   "-ms": fasle, 
+//   "-o": false, 
+//   "-webkit": true, 
+//   isMobile: false, 
+//   isNode: false,
+//   isPC: true
+// }
 ```
 
 ### locat ( ) 获取地址栏信息
-```shell
+```JavaScript
 import XEUtils from 'xe-utils'
 
-XEUtils.locat() // {hash: '', hostname: '', protocol: '', port: '', origin: '', ...}
+XEUtils.locat()
+// {
+//   hash: '', 
+//   hostname: '', 
+//   protocol: '', 
+//   port: '', 
+//   origin: '', 
+//   ...
+// }
 ```
 
 ### parseUrl ( url ) 解析 URL 参数
-```shell
+```JavaScript
 import XEUtils from 'xe-utils'
 
-XEUtils.parseUrl('http://xuliangzhan.com:8080/demo/') // {hostname: 'xuliangzhan.com', protocol: 'http:', port: '8080', ...}
+XEUtils.parseUrl('http://xuliangzhan.com:8080/demo/')
+// {
+//   hostname: 'xuliangzhan.com', 
+//   protocol: 'http:', 
+//   port: '8080', 
+//   ...
+// }
 ```
 
 ### getBaseURL ( ) 获取上下文路径
-```shell
+```JavaScript
 import XEUtils from 'xe-utils'
@@ -757,18 +798,22 @@
 ### cookie ( ) Cookie操作函数
-```shell
+```JavaScript
 import XEUtils from 'xe-utils'
 
-XEUtils.cookie() // 获取所有
-XEUtils.cookie('name') // 根据name获取
-XEUtils.cookie('name', null, {expires: -1}) // 删除
-XEUtils.cookie([{name: 'name', expires: -1}]) // 批量删除
-XEUtils.cookie('name', 'value') // 添加/修改
-XEUtils.cookie([{name: 'name', value: 'value'}]) // 批量添加/修改
-XEUtils.cookie('name', 'value', {domain: 'xxx.com', path: '/', expires: 7, secure: true}) // 添加并设置domain/path/secure/expires 7天后过期
-XEUtils.cookie([{name: 'name', value: 'value', domain: 'xxx.com', path: '/', expires: 7, secure: true}]) // 批量添加并设置domain/path/secure/expires 7天后过期
+// 获取所有
+XEUtils.cookie()
+// 根据name获取
+XEUtils.cookie('name')
+// 删除
+XEUtils.cookie('name', null, {expires: -1})
+// 添加/修改
+XEUtils.cookie('name', 'value')
+// 添加并设置domain/path/secure/expires 7天后过期
+XEUtils.cookie('name', 'value', {domain: 'xxx.com', path: '/', expires: 7, secure: true})
 
-XEUtils.cookie.getJSON() // 获取所有
-XEUtils.cookie.setItem('name', 'value') // 添加/修改
-XEUtils.cookie.getItem('name') // 根据name获取
-XEUtils.cookie.removeItem('name') // 删除
+// 批量删除
+XEUtils.cookie([{name: 'name', expires: -1}])
+// 批量添加/修改
+XEUtils.cookie([{name: 'name', value: 'value'}])
+// 批量添加并设置domain/path/secure/expires 7天后过期
+XEUtils.cookie([{name: 'name', value: 'value', domain: 'xxx.com', path: '/', expires: 7, secure: true}])
 ```
@@ -778,3 +823,3 @@
 ### 文件 ./customs.js
-``` shell
+```JavaScript
 import XEUtils from 'xe-utils'
@@ -787,3 +832,3 @@
 ### 示例 ./main.js
-``` shell
+```JavaScript
 import Vue from 'vue'
@@ -790,0 +835,0 @@ import XEUtils from 'xe-utils'

src/core/utils.js

@@ -5,4 +5,4 @@ 'use strict'
 
-XEUtils.version = '1.5.23'
+XEUtils.version = '1.5.24'
 
 module.exports = XEUtils

src/method/array.js

@@ -44,3 +44,3 @@ 'use strict'
   * @param {Array} arr 数组
-  * @param {Function, String} iteratee 方法或属性
+  * @param {Function/String} iteratee 方法或属性
   * @return {Array}
@@ -106,8 +106,9 @@ */
   if (obj) {
+    context = context || this
     if (baseExports.isArray(obj)) {
-      return obj.some(iteratee, context || this)
+      return obj.some(iteratee, context)
     } else {
       for (var index in obj) {
         if (obj.hasOwnProperty(index)) {
-          if (iteratee.call(context || this, obj[index], index, obj)) {
+          if (iteratee.call(context, obj[index], index, obj)) {
             return true
@@ -133,8 +134,9 @@ }
   if (obj) {
+    context = context || this
     if (baseExports.isArray(obj)) {
-      return obj.every(iteratee, context || this)
+      return obj.every(iteratee, context)
     } else {
       for (var index in obj) {
         if (obj.hasOwnProperty(index)) {
-          if (!iteratee.call(context || this, obj[index], index, obj)) {
+          if (!iteratee.call(context, obj[index], index, obj)) {
             return false
@@ -160,8 +162,9 @@ }
   if (obj) {
+    context = context || this
     if (baseExports.isArray(obj)) {
-      return obj.filter(iteratee, context || this)
+      return obj.filter(iteratee, context)
     } else {
       var result = {}
       baseExports.each(obj, function (val, key) {
-        if (iteratee.call(context || this, val, key, obj)) {
+        if (iteratee.call(context, val, key, obj)) {
           result[key] = val
@@ -187,8 +190,9 @@ }
   if (obj) {
+    context = context || this
     if (baseExports.isArray(obj)) {
-      return obj.find(iteratee, context || this)
+      return obj.find(iteratee, context)
     } else {
       for (var key in obj) {
         if (obj.hasOwnProperty(key)) {
-          if (iteratee.call(context || this, obj[key], key, obj)) {
+          if (iteratee.call(context, obj[key], key, obj)) {
             return obj[key]
@@ -214,7 +218,8 @@ }
   if (obj) {
+    context = context || this
     if (baseExports.isArray(obj)) {
-      return obj.map(iteratee, context || this)
+      return obj.map(iteratee, context)
     } else {
       baseExports.each(obj, function () {
-        result.push(iteratee.apply(context || this, arguments))
+        result.push(iteratee.apply(context, arguments))
       })
@@ -227,2 +232,23 @@ }
 
+/**
+ * 求和函数，将数值相加
+  * @param {Array} array 数组
+  * @param {Function/String} iteratee 方法或属性
+  * @param {Object} context 上下文
+  * @return {Number}
+ */
+function arraySum (array, iteratee, context) {
+  var result = 0
+  context = context || this
+  baseExports.each(array, iteratee ? baseExports.isFunction(iteratee) ? function () {
+    result += iteratee.apply(context, arguments)
+  } : function (val, key) {
+    result += val[iteratee]
+  } : function (val, key) {
+    result += val
+  })
+  return result
+}
+var sum = arraySum
+
 var arrayExports = {
@@ -248,5 +274,7 @@ arrayUniq: arrayUniq,
   arrayMap: arrayMap,
-  map: map
+  map: map,
+  arraySum: arraySum,
+  sum: sum
 }
 
 module.exports = arrayExports

src/method/cookie.js

@@ -10,10 +10,11 @@ 'use strict'
   * cookie操作函数
-  * @param String/Array/Object name 键/数组/对象
-  * @param String value 值
-  * @param Object options 参数
-  *   @param String name: 键
-  *   @param Object value: 值
-  *   @param String path: 路径
-  *   @param String domain: 作用域
-  *   @param Number expires: 几天后过期
+  * @param {String/Array/Object} name 键/数组/对象
+  * @param {String} value 值
+  * @param {Object} options 参数
+  *   @param {String} name: 键
+  *   @param {Object} value: 值
+  *   @param {String} path: 路径
+  *   @param {String} domain: 作用域
+  *   @param {Boolean} secure: 设置为安全的,只能用https协议
+  *   @param {Number} expires: 几天后过期
   */
@@ -45,3 +46,3 @@ function cookie (name, value, options) {
             if (opts[key] !== undefined) {
-              values.push(key + '=' + opts[key])
+              values.push(opts[key] && key === 'secure' ? key : (key + '=' + opts[key]))
             }
@@ -48,0 +49,0 @@ })

No alert changes

Improved metrics

Total package byte prevSize

115492

increased by2.37%

Lines of code

2844

increased by2.05%

Number of lines in readme file

770

increased by6.21%

No dependency changes