amos-tool 1.4.9 → 1.4.12

package/docs/styles/prettify.css

@@ -0,0 +1,79 @@
+.pln {
+  color: #ddd;
+}
+
+/* string content */
+.str {
+  color: #61ce3c;
+}
+
+/* a keyword */
+.kwd {
+  color: #fbde2d;
+}
+
+/* a comment */
+.com {
+  color: #aeaeae;
+}
+
+/* a type name */
+.typ {
+  color: #8da6ce;
+}
+
+/* a literal value */
+.lit {
+  color: #fbde2d;
+}
+
+/* punctuation */
+.pun {
+  color: #ddd;
+}
+
+/* lisp open bracket */
+.opn {
+  color: #000000;
+}
+
+/* lisp close bracket */
+.clo {
+  color: #000000;
+}
+
+/* a markup tag name */
+.tag {
+  color: #8da6ce;
+}
+
+/* a markup attribute name */
+.atn {
+  color: #fbde2d;
+}
+
+/* a markup attribute value */
+.atv {
+  color: #ddd;
+}
+
+/* a declaration */
+.dec {
+  color: #EF5050;
+}
+
+/* a variable name */
+.var {
+  color: #c82829;
+}
+
+/* a function name */
+.fun {
+  color: #4271ae;
+}
+
+/* Specify class=linenums on a pre to get line numbering */
+ol.linenums {
+  margin-top: 0;
+  margin-bottom: 0;
+}

package/index.d.ts

@@ -927,10 +927,18 @@ declare namespace utils {
   export function stringIsJson(value: any): boolean;
   /**
    * 判断key是否在object内
+   * （采用 in 判断，继承属性均会判断）
    * @param keys
    * @param obj
    */
   export function isKeyInObject(keys: string | string[], obj: any): boolean;
+  /**
+   * 判断key是否在object内
+   * （采用 hasOwnProperty 判断，继承属性不会判断）
+   * @param keys
+   * @param obj
+   */
+  export function isOwnKeyInObject(keys: string | string[], obj: any): boolean;
   export function simpleEqual(objA: object, objB: object): boolean;
   /**
    * 判断是一个 image 的路径
@@ -953,6 +961,38 @@ declare namespace utils {
    */
   export function encodeNumber(number: Number, start?: number, len?: number, sign?: string): String;
 
+  /**
+   * 获取扩展名
+   *
+   * 可快速使用 `filePath.split('.').pop();` 获取扩展名
+   * @param filePath
+   * @return {String} ext
+   * @example
+   *  getFileExtension('a.png'); // png
+   *  getFileExtension('a/a/a.png'); // png
+   *  getFileExtension('a.a.a.png.jpg'); // jpg
+   *  getFileExtension('a'); // ''
+   */
+  export function getFileExtension(filePath: string): String;
+
+  /**
+   * 将指定 size 中的数据，转化为 byte
+   *  - 默认不区分大小写， mb/MB/Mb 均表示 mb
+   *  - 默认去除内部所有空格， 1024 MB -> 1024mb
+   *  - 无单位或者 number 类型，将直接转化为 number值，默认当 byte 处理
+   * @param size 带有单位的 size，不带单位时，直接返回该值
+   * @returns byte
+   * @example
+   *  fileSizeToByte('1kb'); // 1024
+   *  fileSizeToByte('1mb'); // 1048576
+   *  fileSizeToByte('1MB'); // 1048576
+   *  fileSizeToByte('1gb'); // 1073741824
+   *  fileSizeToByte('1tb'); // 1099511627776
+   *  fileSizeToByte('123'); // 123
+   *  fileSizeToByte(123); // 123
+   */
+  export function fileSizeToByte(size: string): String;
+
   export function some(arr: Array<any>, fun: Function /*, thisArg */): boolean;
   export function every(arr: Array<any>, callbackfn: Function, thisArg): boolean;
   export function reduce(arr: Array<any>, callback: Function /*, initialValue*/);

package/lib/completeUnit.js

@@ -2,14 +2,13 @@
 
 var utils = require("./utils");
 
-function completeUnit(e) {
-  var t = arguments.length > 1 && void 0 !== arguments[1] ? arguments[1] : "px";
-  return utils.isString(e) || (e += ""), e.endsWith(t) ? e : "".concat(e).concat(t);
+function completeUnit(e, t) {
+  return utils.isString(e) || (e += ""), utils.isNumber(e) ? (t || (t = "px"), e.endsWith(t) ? e : "".concat(e).concat(t)) : e;
 }
 
 function toPixel(e) {
   var t = e;
-  return e && (utils.isNumber(e) ? t = completeUnit(Number(e)) : utils.isString(e) && e.endsWith("%") ? t = completeUnit(Number(e.replace("%", "")), "%") : utils.isString(e) && e.endsWith("px") ? t = completeUnit(Number(e.replace("px", "")), "px") : utils.isString(e) && e.endsWith("vh") ? t = completeUnit(Number(e.replace("vh", "")), "vh") : utils.isString(e) && e.endsWith("vw") ? t = completeUnit(Number(e.replace("vw", "")), "vw") : utils.isString(e) && e.endsWith("rem") ? t = completeUnit(Number(e.replace("rem", "")), "rem") : utils.isString(e) && e.endsWith("em") && (t = completeUnit(Number(e.replace("em", "")), "em"))), 
+  return e && (utils.isNumber(e) ? t = completeUnit(Number(e)) : utils.isString(e) && (e.endsWith("%") ? t = completeUnit(Number(e.replace("%", "")), "%") : e.endsWith("px") ? t = completeUnit(Number(e.replace("px", "")), "px") : e.endsWith("vh") ? t = completeUnit(Number(e.replace("vh", "")), "vh") : e.endsWith("vw") ? t = completeUnit(Number(e.replace("vw", "")), "vw") : e.endsWith("rem") ? t = completeUnit(Number(e.replace("rem", "")), "rem") : e.endsWith("em") && (t = completeUnit(Number(e.replace("em", "")), "em")))), 
   t;
 }
 

package/lib/utils.js

@@ -97,6 +97,12 @@ var null2default = function(e) {
   return e.forEach((function(e) {
     e in t && n++;
   })), e.length === n;
+}, isOwnKeyInObject = function(e, t) {
+  isString(e) && (e = [ e ]);
+  var n = 0;
+  return e.forEach((function(e) {
+    e in t && hasOwnProperty.call(t, e) && n++;
+  })), e.length === n;
 }, simpleEqual = 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;
@@ -118,6 +124,18 @@ var null2default = function(e) {
     return t > 0 ? e.substring(t + 1) : "";
   }
   return "";
+}, fileSizeToByte = function(e) {
+  var t = {
+    t: 1099511627776,
+    g: 1073741824,
+    m: 1048576,
+    k: 1024
+  };
+  if (!e) return 0;
+  if (!isString(e)) return e;
+  e = e.toLocaleLowerCase().replace(/\s*/g, "");
+  var n = (e = /^([0-9\.]+)([tgmk]?)b?$/i.exec(e))[2];
+  return e = +e[1], t.hasOwnProperty(n) && (e *= t[n]), e;
 }, some = function(e, t) {
   if (null == e) throw new TypeError;
   var n = Object(e), r = n.length >>> 0;
@@ -223,10 +241,12 @@ module.exports = {
   isJson: isJson,
   stringIsJson: stringIsJson,
   isKeyInObject: isKeyInObject,
+  isOwnKeyInObject: isOwnKeyInObject,
   simpleEqual: simpleEqual,
   isImageSrc: isImageSrc,
   encodeNumber: encodeNumber,
   getFileExtension: getFileExtension,
+  fileSizeToByte: fileSizeToByte,
   some: some,
   every: every,
   reduce: reduce,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amos-tool",
-  "version": "1.4.9",
+  "version": "1.4.12",
   "description": "amos ui tool",
   "main": "index.js",
   "directories": {