amos-tool 1.4.4 → 1.4.8

package/lib/qs/utils.js

@@ -1,94 +1,75 @@
 "use strict";
 
-function _typeof(e) {
-  return (_typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(e) {
-    return typeof e
-  } : function(e) {
-    return e && "function" == typeof Symbol && e.constructor === Symbol && e !== Symbol.prototype ? "symbol" : typeof e
-  })(e)
-}
-var has = Object.prototype.hasOwnProperty,
-  hexTable = function() {
-    for (var e = [], r = 0; r < 256; ++r) e.push("%" + ((r < 16 ? "0" : "") + r.toString(16)).toUpperCase());
-    return e
-  }(),
-  compactQueue = function(e) {
-    for (; e.length;) {
-      var r = e.pop(),
-        t = r.obj[r.prop];
-      if (Array.isArray(t)) {
-        for (var o = [], n = 0; n < t.length; ++n) void 0 !== t[n] && o.push(t[n]);
-        r.obj[r.prop] = o
-      }
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault"), _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof")), has = Object.prototype.hasOwnProperty, hexTable = function() {
+  for (var e = [], r = 0; r < 256; ++r) e.push("%" + ((r < 16 ? "0" : "") + r.toString(16)).toUpperCase());
+  return e;
+}(), compactQueue = function(e) {
+  for (var r; e.length; ) {
+    var t = e.pop();
+    if (r = t.obj[t.prop], Array.isArray(r)) {
+      for (var o = [], a = 0; a < r.length; ++a) void 0 !== r[a] && o.push(r[a]);
+      t.obj[t.prop] = o;
     }
-    return t
-  },
-  arrayToObject = function(e, r) {
-    for (var t = r && r.plainObjects ? Object.create(null) : {}, o = 0; o < e.length; ++o) void 0 !== e[o] && (t[o] = e[o]);
-    return t
-  },
-  merge = function o(t, n, c) {
-    if (!n) return t;
-    if ("object" !== _typeof(n)) {
-      if (Array.isArray(t)) t.push(n);
-      else {
-        if ("object" !== _typeof(t)) return [t, n];
-        !c.plainObjects && !c.allowPrototypes && has.call(Object.prototype, n) || (t[n] = !0)
-      }
-      return t
+  }
+  return r;
+}, arrayToObject = function(e, r) {
+  for (var t = r && r.plainObjects ? Object.create(null) : {}, o = 0; o < e.length; ++o) void 0 !== e[o] && (t[o] = e[o]);
+  return t;
+}, merge = function e(r, t, o) {
+  if (!t) return r;
+  if ("object" !== (0, _typeof2.default)(t)) {
+    if (Array.isArray(r)) r.push(t); else {
+      if ("object" !== (0, _typeof2.default)(r)) return [ r, t ];
+      (o.plainObjects || o.allowPrototypes || !has.call(Object.prototype, t)) && (r[t] = !0);
     }
-    if ("object" !== _typeof(t)) return [t].concat(n);
-    var e = t;
-    return Array.isArray(t) && !Array.isArray(n) && (e = arrayToObject(t, c)), Array.isArray(t) && Array.isArray(n) ? (n.forEach(function(e, r) {
-      has.call(t, r) ? t[r] && "object" === _typeof(t[r]) ? t[r] = o(t[r], e, c) : t.push(e) : t[r] = e
-    }), t) : Object.keys(n).reduce(function(e, r) {
-      var t = n[r];
-      return has.call(e, r) ? e[r] = o(e[r], t, c) : e[r] = t, e
-    }, e)
-  },
-  assign = function(e, t) {
-    return Object.keys(t).reduce(function(e, r) {
-      return e[r] = t[r], e
-    }, e)
-  },
-  decode = function(r) {
-    try {
-      return decodeURIComponent(r.replace(/\+/g, " "))
-    } catch (e) {
-      return r
-    }
-  },
-  encode = function(e) {
-    if (0 === e.length) return e;
-    for (var r = "string" == typeof e ? e : String(e), t = "", o = 0; o < r.length; ++o) {
-      var n = r.charCodeAt(o);
-      45 === n || 46 === n || 95 === n || 126 === n || 48 <= n && n <= 57 || 65 <= n && n <= 90 || 97 <= n && n <= 122 ? t += r.charAt(o) : n < 128 ? t += hexTable[n] : n < 2048 ? t += hexTable[192 | n >> 6] + hexTable[128 | 63 & n] : n < 55296 || 57344 <= n ? t += hexTable[224 | n >> 12] + hexTable[128 | n >> 6 & 63] + hexTable[128 | 63 & n] : (o += 1, n = 65536 + ((1023 & n) << 10 | 1023 & r.charCodeAt(o)), t += hexTable[240 | n >> 18] + hexTable[128 | n >> 12 & 63] + hexTable[128 | n >> 6 & 63] + hexTable[128 | 63 & n])
-    }
-    return t
-  },
-  compact = function(e) {
-    for (var r = [{
-        obj: {
-          o: e
-        },
-        prop: "o"
-      }], t = [], o = 0; o < r.length; ++o)
-      for (var n = r[o], c = n.obj[n.prop], a = Object.keys(c), u = 0; u < a.length; ++u) {
-        var f = a[u],
-          p = c[f];
-        "object" === _typeof(p) && null !== p && -1 === t.indexOf(p) && (r.push({
-          obj: c,
-          prop: f
-        }), t.push(p))
-      }
-    return compactQueue(r)
-  },
-  isRegExp = function(e) {
-    return "[object RegExp]" === Object.prototype.toString.call(e)
-  },
-  isBuffer = function(e) {
-    return null != e && !!(e.constructor && e.constructor.isBuffer && e.constructor.isBuffer(e))
-  };
+    return r;
+  }
+  if ("object" !== (0, _typeof2.default)(r)) return [ r ].concat(t);
+  var a = r;
+  return Array.isArray(r) && !Array.isArray(t) && (a = arrayToObject(r, o)), Array.isArray(r) && Array.isArray(t) ? (t.forEach((function(t, a) {
+    has.call(r, a) ? r[a] && "object" === (0, _typeof2.default)(r[a]) ? r[a] = e(r[a], t, o) : r.push(t) : r[a] = t;
+  })), r) : Object.keys(t).reduce((function(r, a) {
+    var n = t[a];
+    return has.call(r, a) ? r[a] = e(r[a], n, o) : r[a] = n, r;
+  }), a);
+}, assign = function(e, r) {
+  return Object.keys(r).reduce((function(e, t) {
+    return e[t] = r[t], e;
+  }), e);
+}, decode = function(e) {
+  try {
+    return decodeURIComponent(e.replace(/\+/g, " "));
+  } catch (r) {
+    return e;
+  }
+}, encode = function(e) {
+  if (0 === e.length) return e;
+  for (var r = "string" == typeof e ? e : String(e), t = "", o = 0; o < r.length; ++o) {
+    var a = r.charCodeAt(o);
+    45 === a || 46 === a || 95 === a || 126 === a || a >= 48 && a <= 57 || a >= 65 && a <= 90 || a >= 97 && a <= 122 ? t += r.charAt(o) : a < 128 ? t += hexTable[a] : a < 2048 ? t += hexTable[192 | a >> 6] + hexTable[128 | 63 & a] : a < 55296 || a >= 57344 ? t += hexTable[224 | a >> 12] + hexTable[128 | a >> 6 & 63] + hexTable[128 | 63 & a] : (o += 1, 
+    a = 65536 + ((1023 & a) << 10 | 1023 & r.charCodeAt(o)), t += hexTable[240 | a >> 18] + hexTable[128 | a >> 12 & 63] + hexTable[128 | a >> 6 & 63] + hexTable[128 | 63 & a]);
+  }
+  return t;
+}, compact = function(e) {
+  for (var r = [ {
+    obj: {
+      o: e
+    },
+    prop: "o"
+  } ], t = [], o = 0; o < r.length; ++o) for (var a = r[o], n = a.obj[a.prop], c = Object.keys(n), u = 0; u < c.length; ++u) {
+    var i = c[u], f = n[i];
+    "object" === (0, _typeof2.default)(f) && null !== f && -1 === t.indexOf(f) && (r.push({
+      obj: n,
+      prop: i
+    }), t.push(f));
+  }
+  return compactQueue(r);
+}, isRegExp = function(e) {
+  return "[object RegExp]" === Object.prototype.toString.call(e);
+}, isBuffer = function(e) {
+  return null != e && !!(e.constructor && e.constructor.isBuffer && e.constructor.isBuffer(e));
+};
+
 module.exports = {
   arrayToObject: arrayToObject,
   assign: assign,
@@ -98,4 +79,4 @@ module.exports = {
   isBuffer: isBuffer,
   isRegExp: isRegExp,
   merge: merge
-};
+};

package/lib/random.js

@@ -1,15 +1,16 @@
 "use strict";
 
 function randomInt(n, r) {
-  return null == r && (r = n, n = 0), n + Math.floor(Math.random() * (r - n + 1))
+  return null == r && (r = n, n = 0), n + Math.floor(Math.random() * (r - n + 1));
 }
 
 function random(n) {
-  n = n || 6;
+  n || (n = 6);
   for (var r = "", o = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz", t = o.length, a = 0; a < n; a++) r += o.charAt(randomInt(0, t - 1));
-  return r
+  return r;
 }
+
 module.exports = {
   random: random,
   randomInt: randomInt
-};
+};

package/lib/shallowEqual.js

@@ -1,36 +1,26 @@
 "use strict";
 
-function _typeof(t) {
-  return (_typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(t) {
-    return typeof t
-  } : function(t) {
-    return t && "function" == typeof Symbol && t.constructor === Symbol && t !== Symbol.prototype ? "symbol" : typeof t
-  })(t)
-}
-var shallowEqual = function(t, e) {
-    if (t === e) return !0;
-    if ("object" !== _typeof(t) || null === t || "object" !== _typeof(e) || null === e) return !1;
-    var o = Object.keys(t),
-      r = Object.keys(e);
-    if (o.length !== r.length) return !1;
-    for (var n = Object.prototype.hasOwnProperty.bind(e), u = 0; u < o.length; u++)
-      if (!n(o[u]) || t[o[u]] !== e[o[u]]) return !1;
-    return !0
-  },
-  customEqual = function(t, e, o, r) {
-    if (void 0 !== (c = o ? o.call(r, t, e) : void 0)) return !!c;
-    if (t === e) return !0;
-    if ("object" !== _typeof(t) || !t || "object" !== _typeof(e) || !e) return !1;
-    var n = Object.keys(t),
-      u = Object.keys(e);
-    if (n.length !== u.length) return !1;
-    for (var l = Object.prototype.hasOwnProperty.bind(e), f = 0; f < n.length; f++) {
-      var y = n[f];
-      if (!l(y)) return !1;
-      var c, i = t[y],
-        p = e[y];
-      if ((!1 === (c = o ? o.call(r, i, p, y) : void 0) || void 0 === c) && i !== p) return !1
-    }
-    return !0
-  };
-module.exports = shallowEqual, module.exports.customEqual = customEqual;
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault"), _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof")), shallowEqual = function(e, t) {
+  if (e === t) return !0;
+  if ("object" !== (0, _typeof2.default)(e) || null === e || "object" !== (0, _typeof2.default)(t) || null === t) return !1;
+  var r = Object.keys(e), u = Object.keys(t);
+  if (r.length !== u.length) return !1;
+  for (var l = Object.prototype.hasOwnProperty.bind(t), o = 0; o < r.length; o++) if (!l(r[o]) || e[r[o]] !== t[r[o]]) return !1;
+  return !0;
+}, customEqual = function(e, t, r, u) {
+  var l = r ? r.call(u, e, t) : void 0;
+  if (void 0 !== l) return !!l;
+  if (e === t) return !0;
+  if ("object" !== (0, _typeof2.default)(e) || !e || "object" !== (0, _typeof2.default)(t) || !t) return !1;
+  var o = Object.keys(e), n = Object.keys(t);
+  if (o.length !== n.length) return !1;
+  for (var i = Object.prototype.hasOwnProperty.bind(t), a = 0; a < o.length; a++) {
+    var f = o[a];
+    if (!i(f)) return !1;
+    var p = e[f], c = t[f];
+    if ((!1 === (l = r ? r.call(u, p, c, f) : void 0) || void 0 === l) && p !== c) return !1;
+  }
+  return !0;
+};
+
+module.exports = shallowEqual, module.exports.customEqual = customEqual;

package/lib/store.js

@@ -1,103 +1,98 @@
 "use strict";
-var _Base64 = require("./encrypt/_base64"),
-  trim = require("./_trim"),
-  Global = "undefined" != typeof window ? window : global,
-  doc = Global.document,
-  _localStorage = {
-    localStorage: Global.localStorage,
-    read: function(e) {
-      return _localStorage.localStorage.getItem(e)
-    },
-    write: function(e, o) {
-      return _localStorage.localStorage.setItem(e, o)
-    },
-    each: function(e) {
-      for (var o = _localStorage.localStorage.length - 1; 0 <= o; o--) {
-        var r = _localStorage.localStorage.key(o);
-        e(_localStorage.read(r), r)
-      }
-    },
-    remove: function(e) {
-      return _localStorage.localStorage.removeItem(e)
-    },
-    clearAll: function() {
-      return _localStorage.localStorage.clear()
+
+var _Base64 = require("./encrypt/_base64"), trim = require("./_trim"), Global = "undefined" != typeof window ? window : global, doc = Global.document, _localStorage = {
+  localStorage: Global.localStorage,
+  read: function(e) {
+    return _localStorage.localStorage.getItem(e);
+  },
+  write: function(e, o) {
+    return _localStorage.localStorage.setItem(e, o);
+  },
+  each: function(e) {
+    for (var o = _localStorage.localStorage.length - 1; o >= 0; o--) {
+      var r = _localStorage.localStorage.key(o);
+      e(_localStorage.read(r), r);
+    }
+  },
+  remove: function(e) {
+    return _localStorage.localStorage.removeItem(e);
+  },
+  clearAll: function() {
+    return _localStorage.localStorage.clear();
+  }
+}, _sessionStorage = {
+  sessionStorage: Global.sessionStorage,
+  read: function(e) {
+    return _sessionStorage.sessionStorage.getItem(e);
+  },
+  write: function(e, o) {
+    return _sessionStorage.sessionStorage.setItem(e, o);
+  },
+  each: function(e) {
+    for (var o = _sessionStorage.sessionStorage.length - 1; o >= 0; o--) {
+      var r = _sessionStorage.sessionStorage.key(o);
+      e(_sessionStorage.read(r), r);
     }
   },
-  _sessionStorage = {
-    sessionStorage: Global.sessionStorage,
-    read: function(e) {
-      return _sessionStorage.sessionStorage.getItem(e)
-    },
-    write: function(e, o) {
-      return _sessionStorage.sessionStorage.setItem(e, o)
-    },
-    each: function(e) {
-      for (var o = _sessionStorage.sessionStorage.length - 1; 0 <= o; o--) {
-        var r = _sessionStorage.sessionStorage.key(o);
-        e(_sessionStorage.read(r), r)
-      }
-    },
-    remove: function(e) {
-      return _sessionStorage.sessionStorage.removeItem(e)
-    },
-    clearAll: function() {
-      return _sessionStorage.sessionStorage.clear()
+  remove: function(e) {
+    return _sessionStorage.sessionStorage.removeItem(e);
+  },
+  clearAll: function() {
+    return _sessionStorage.sessionStorage.clear();
+  }
+}, Store = {
+  encrypt: function(e) {
+    var o = (new _Base64).encode(e);
+    return o;
+  },
+  decrypt: function(e) {
+    var o = (new _Base64).decode(e);
+    return o = escape(o), o = o.replace(/%00/g, ""), o = unescape(o), o;
+  },
+  setCookieByDays: function(e, o) {
+    var r = arguments.length > 2 && void 0 !== arguments[2] ? arguments[2] : 1, t = e + "=" + escape(o);
+    if ("number" == typeof r) {
+      var a = new Date;
+      a.setTime(a.getTime() + 24 * r * 60 * 60 * 1e3), t += "; expires=" + a.toUTCString();
+    }
+    doc.cookie = t;
+  },
+  getAllCookies: function() {
+    var e = {}, o = doc.cookie;
+    if ("" === o) return e;
+    for (var r = o.split("; "), t = 0; t < r.length; t++) {
+      var a = r[t], n = a.indexOf("="), s = a.substring(0, n), i = a.substring(n + 1);
+      i = JSON.parse(unescape(i)), e[s] = i;
+    }
+    return e;
+  },
+  setCookieByHour: function(e, o, r) {
+    var t = new Date;
+    t.setTime(t.getTime() + 60 * r * 60 * 1e3), doc.cookie = e + "=" + escape(o) + ";expires=" + t.toGMTString();
+  },
+  getCookieByName: function(e) {
+    var o = doc.cookie.match(new RegExp("(^| )" + e + "=([^;]*)(;|$)"));
+    return null != o ? unescape(o[2]) : null;
+  },
+  removeCookieByName: function(e) {
+    e && Store._has(e) && (doc.cookie = escape(e) + "=; expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/");
+  },
+  clearAllCookie: function() {
+    Store._each((function(e, o) {
+      Store.removeCookieByName(o);
+    }));
+  },
+  _has: function(e) {
+    return new RegExp("(?:^|;\\s*)" + escape(e).replace(/[\-\.\+\*]/g, "\\$&") + "\\s*\\=").test(doc.cookie);
+  },
+  _each: function(e) {
+    for (var o = doc.cookie.split(/; ?/g), r = o.length - 1; r >= 0; r--) if (trim(o[r])) {
+      var t = o[r].split("="), a = unescape(t[0]);
+      e(unescape(t[1]), a);
     }
   },
-  Store = {
-    encrypt: function(e) {
-      var o = (new _Base64).encode(e);
-      return o
-    },
-    decrypt: function(e) {
-      var o = (new _Base64).decode(e);
-      return o = escape(o), o = o.replace(/%00/g, ""), o = unescape(o), o
-    },
-    setCookieByDays: function(e, o, r) {
-      var t, a = 2 < arguments.length && void 0 !== r ? r : 1,
-        n = e + "=" + escape(o);
-      "number" == typeof a && ((t = new Date).setTime(t.getTime() + 24 * a * 60 * 60 * 1e3), n += "; expires=" + t.toUTCString()), doc.cookie = n
-    },
-    getAllCookies: function() {
-      var e = {},
-        o = doc.cookie;
-      if ("" === o) return e;
-      for (var r = o.split("; "), t = 0; t < r.length; t++) {
-        var a = r[t],
-          n = a.indexOf("="),
-          s = a.substring(0, n),
-          c = a.substring(n + 1),
-          c = JSON.parse(unescape(c));
-        e[s] = c
-      }
-      return e
-    },
-    setCookieByHour: function(e, o, r) {
-      var t = new Date;
-      t.setTime(t.getTime() + 60 * r * 60 * 1e3), doc.cookie = e + "=" + escape(o) + ";expires=" + t.toGMTString()
-    },
-    getCookieByName: function(e) {
-      var o = doc.cookie.match(new RegExp("(^| )" + e + "=([^;]*)(;|$)"));
-      return null != o ? unescape(o[2]) : null
-    },
-    removeCookieByName: function(e) {
-      e && Store._has(e) && (doc.cookie = escape(e) + "=; expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/")
-    },
-    clearAllCookie: function() {
-      Store._each(function(e, o) {
-        Store.removeCookieByName(o)
-      })
-    },
-    _has: function(e) {
-      return new RegExp("(?:^|;\\s*)" + escape(e).replace(/[\-\.\+\*]/g, "\\$&") + "\\s*\\=").test(doc.cookie)
-    },
-    _each: function(e) {
-      for (var o, r, t = doc.cookie.split(/; ?/g), a = t.length - 1; 0 <= a; a--) {
-        trim(t[a]) && (o = t[a].split("="), r = unescape(o[0]), e(unescape(o[1]), r))
-      }
-    },
-    lsTool: _localStorage,
-    session: _sessionStorage
-  };
-module.exports = Store;
+  lsTool: _localStorage,
+  session: _sessionStorage
+};
+
+module.exports = Store;

package/lib/strUtils.js

@@ -1,43 +1,46 @@
 "use strict";
-var deepCopy = require("./_deepCopy"),
-  utils = require("./utils");
+
+var deepCopy = require("./_deepCopy"), utils = require("./utils");
+
 module.exports = {
   toCapitalStr: function(e) {
-    return !utils.isNil(e) && utils.isString(e) ? e[0].toUpperCase() + e.slice(1, e.length) : e
+    return utils.isNil(e) ? e : utils.isString(e) ? e[0].toUpperCase() + e.slice(1, e.length) : e;
   },
   camelCase: function(e) {
-    return e.charAt(0).toUpperCase() + e.slice(1).replace(/-(\w)/g, function(e, r) {
-      return r.toUpperCase()
-    })
+    return e.charAt(0).toUpperCase() + e.slice(1).replace(/-(\w)/g, (function(e, r) {
+      return r.toUpperCase();
+    }));
   },
   transCamel: function(e) {
-    return (e = e.toLowerCase()).replace(/-(\w)/g, function(e, r) {
-      return r.toUpperCase()
-    })
+    return (e = e.toLowerCase()).replace(/-(\w)/g, (function(e, r) {
+      return r.toUpperCase();
+    }));
   },
   capFirst: function(e) {
-    return e && "" !== e ? e.replace(/(\w)/, function(e) {
-      return e.toUpperCase()
-    }) : e
+    return e && "" !== e ? e.replace(/(\w)/, (function(e) {
+      return e.toUpperCase();
+    })) : e;
   },
   hashCode: function(e) {
     if (e) {
       e = e.toString();
-      for (var r = 0, t = 0; t < e.length; t++) r = 31 * r + e.charCodeAt(t), r = 2147483647 < (n = r) || n < -2147483648 ? 4294967295 & n : n;
-      return r
+      for (var r = 0, t = 0; t < e.length; t++) r = 31 * r + e.charCodeAt(t), r = (n = r) > 2147483647 || n < -2147483648 ? 4294967295 & n : n;
+      return r;
     }
     var n;
-    return null
+    return null;
   },
   dealScaleAndUnit: function(e, r) {
-    var t = (t = deepCopy.clone(r)) || {
+    var t = deepCopy.clone(r);
+    if (t || (t = {
       selfenable: !1,
       fixnumber: 2,
       thousandsplitchar: !0
-    };
-    if (!utils.isFloat(e)) return e;
+    }), !utils.isFloat(e)) return e;
     var n = "";
-    "-" == (e = e.toString()).charAt(0) && (n = "-", e = e.substring(1, e.length)), null != t.selfscale && "" != t.selfscale || null != t.selfunit && "" != t.selfunit || (t.selfscale = "1000,1000,1000", t.selfunit = "K,M,B");
+    "-" == (e = e.toString()).charAt(0) && (n = "-", e = e.substring(1, e.length)), 
+    null != t.selfscale && "" != t.selfscale || null != t.selfunit && "" != t.selfunit || (t.selfscale = "1000,1000,1000", 
+    t.selfunit = "K,M,B");
     var l = 2;
     null != t.fixnumber && "NaN" != parseInt(t.fixnumber).toString() && (l = parseInt(t.fixnumber));
     var a = "";
@@ -45,31 +48,37 @@ module.exports = {
       var i = t.selfunit;
       null == i && (i = "");
       var s = t.selfscale;
-      if (null == s || "" == s.toString().trim()) a = i + a;
-      else {
-        for (var o = i.split(","), u = s.split(","), f = [], p = !0, c = 0; c < u.length; c++)
-          if (null != u[c] && "NaN" != parseFloat(u[c]).toString()) {
-            if ("NaN" == parseFloat(u[c]).toString() || "0" == parseFloat(u[c]).toString() || parseFloat(u[c]) < 0) {
-              p = !1;
-              break
-            }
-            0 == f.length ? f[0] = u[c] : f[f.length] = parseFloat(u[c]) * parseFloat(f[f.length - 1])
-          } if (u = f, p)
-          for (var h = u.length - 1; 0 <= h; h--)
-            if (!(h > o.length - 1)) {
-              null == o[h] && (o[h] = "");
-              var g, d = parseFloat(e) / u[h];
-              if (-1 < e.indexOf(".") && (g = e.substr(e.indexOf(".") + 1, e.length).length, d = parseFloat(e) * Math.pow(10, g) / (u[h] * Math.pow(10, g))), 1 <= Math.abs(d)) {
-                e = d, a = o[h] + a;
-                break
-              }
-            }
+      if (null == s || "" == s.toString().trim()) a = i + a; else {
+        for (var o = i.split(","), u = s.split(","), f = [], p = !0, c = 0; c < u.length; c++) if (null != u[c] && "NaN" != parseFloat(u[c]).toString()) {
+          if ("NaN" == parseFloat(u[c]).toString() || "0" == parseFloat(u[c]).toString() || parseFloat(u[c]) < 0) {
+            p = !1;
+            break;
+          }
+          0 == f.length ? f[0] = u[c] : f[f.length] = parseFloat(u[c]) * parseFloat(f[f.length - 1]);
+        }
+        if (u = f, p) for (var h = u.length - 1; h >= 0; h--) if (!(h > o.length - 1)) {
+          null == o[h] && (o[h] = "");
+          var g = parseFloat(e) / u[h];
+          if (e.indexOf(".") > -1) {
+            var d = e.substr(e.indexOf(".") + 1, e.length).length;
+            g = parseFloat(e) * Math.pow(10, d) / (u[h] * Math.pow(10, d));
+          }
+          if (Math.abs(g) >= 1) {
+            e = g, a = o[h] + a;
+            break;
+          }
+        }
       }
     }
-    return -1 < l && (e = parseFloat(e).toFixed(l) + ""), t.fillzero || (e = parseFloat(e) + ""), null != t.thousandsplitchar && !t.thousandsplitchar || (e = -1 < e.indexOf(".") ? e.substr(0, e.indexOf(".")).replace(/\d{1,3}(?=(\d{3})+$)/g, "$&,") + e.substr(e.indexOf("."), e.length) : e.replace(/\d{1,3}(?=(\d{3})+$)/g, "$&,")), e = n + e, null != t.prefix && (e = t.prefix + e), e += a
+    return l > -1 && (e = parseFloat(e).toFixed(l) + ""), t.fillzero || (e = parseFloat(e) + ""), 
+    (null == t.thousandsplitchar || t.thousandsplitchar) && (e = e.indexOf(".") > -1 ? e.substr(0, e.indexOf(".")).replace(/\d{1,3}(?=(\d{3})+$)/g, "$&,") + e.substr(e.indexOf("."), e.length) : e.replace(/\d{1,3}(?=(\d{3})+$)/g, "$&,")), 
+    e = n + e, null != t.prefix && (e = t.prefix + e), e += a;
   },
   toUTF8: function(e) {
-    for (var r, t = "", n = e.length, l = 0; l < n; l++) 1 <= (r = e.charCodeAt(l)) && r <= 127 ? t += e.charAt(l) : (2047 < r ? (t += String.fromCharCode(224 | r >> 12 & 15), t += String.fromCharCode(128 | r >> 6 & 63)) : t += String.fromCharCode(192 | r >> 6 & 31), t += String.fromCharCode(128 | r >> 0 & 63));
-    return t
+    var r, t, n, l = "";
+    for (t = e.length, r = 0; r < t; r++) (n = e.charCodeAt(r)) >= 1 && n <= 127 ? l += e.charAt(r) : n > 2047 ? (l += String.fromCharCode(224 | n >> 12 & 15), 
+    l += String.fromCharCode(128 | n >> 6 & 63), l += String.fromCharCode(128 | n >> 0 & 63)) : (l += String.fromCharCode(192 | n >> 6 & 31), 
+    l += String.fromCharCode(128 | n >> 0 & 63));
+    return l;
   }
-};
+};