amos-tool 1.5.3 → 1.6.1

package/README.md

@@ -650,6 +650,9 @@ convert2Blob(canvas, fn, options)
 
 ## changelog
 
+* v1.6.1
+  `*` fix saver
+
 * v1.4.1
   `*` add `pathToRoutes`
 

package/docs/Logger.html

@@ -336,7 +336,7 @@ isDebug: true
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.6</a> on Thu Mar 16 2023 10:03:24 GMT+0800 (GMT+08:00) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.6</a> on Fri Aug 11 2023 16:41:39 GMT+0800 (GMT+08:00) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/global.html

@@ -8892,7 +8892,7 @@ Object 对象，typeof === object &amp;&amp; toString === '[object Object]'</p>
 
             
 
-            <td class="description last"></td>
+            <td class="description last"><p>如果 obj 是 null or undefined 则直接 返回 false</p></td>
         </tr>
 
     
@@ -10030,7 +10030,7 @@ isNil(NaN)
 
             
 
-            <td class="description last"></td>
+            <td class="description last"><p>如果 obj 是 null or undefined 则直接 返回 false</p></td>
         </tr>
 
     
@@ -14217,7 +14217,7 @@ clear 是否清理前一次的事件，如果清理，则重新设置定时器</
 
     
 
-    <h4 class="name" id="slpitArray"><span class="type-signature"></span>slpitArray<span class="signature">(arr, num)</span><span class="type-signature"></span></h4>
+    <h4 class="name" id="slpitArray"><span class="type-signature"></span>slpitArray<span class="signature">(arr, num)</span><span class="type-signature"> &rarr; {Array}</span></h4>
 
     
 
@@ -14374,6 +14374,18 @@ clear 是否清理前一次的事件，如果清理，则重新设置定时器</
         
 
 
+<dl class="param-type">
+    <dt>
+        Type
+    </dt>
+    <dd>
+        
+<span class="param-type">Array</span>
+
+
+    </dd>
+</dl>
+
     
 
 
@@ -16595,7 +16607,7 @@ schedule <code>callback</code> to execute after <code>delay</code> ms.</p></td>
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.6</a> on Thu Mar 16 2023 10:03:24 GMT+0800 (GMT+08:00) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.6</a> on Fri Aug 11 2023 16:41:39 GMT+0800 (GMT+08:00) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/index.html

@@ -743,6 +743,10 @@ convert2BMP(canvas, width, height)</p>
 <h2>changelog</h2>
 <ul>
 <li>
+<p>v1.6.1
+<code>*</code> fix saver</p>
+</li>
+<li>
 <p>v1.4.1
 <code>*</code> add <code>pathToRoutes</code></p>
 </li>
@@ -785,7 +789,7 @@ convert2BMP(canvas, width, height)</p>
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.6</a> on Thu Mar 16 2023 10:03:24 GMT+0800 (GMT+08:00) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.6</a> on Fri Aug 11 2023 16:41:39 GMT+0800 (GMT+08:00) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/index.d.ts

@@ -685,6 +685,7 @@ export function omit(obj: object, keys: string | Array<String>): any;
  * @example
  *  pick({ name: 'ilex', age: 16 }, ['age']); // { age: 16 }
  *  pick({ name: 'ilex', age: 16 }, ['']); // {}
+ *  pick({ name: 'ilex', age: 16 }, ['you']); // {}，如果指定对象中无指定的 key，则不拾取
  */
 export function pick(obj: Object | Function, keys: string | Array<String>): Object;
 /**
@@ -1032,6 +1033,8 @@ declare namespace utils {
    * isUrl('www.baidu.com') // false
    * isUrl('http://172.16.1.2') // true
    * isUrl('172.16.1.2') // false
+   * isUrl('/a/b/c') // false
+   * isUrl('main/dd/d') // false
    */
   export function isUrl(value: string): boolean;
   export function isBuiltInObject(value: any): boolean;
@@ -1059,14 +1062,14 @@ declare namespace utils {
    * 判断key是否在object内
    * （采用 in 判断，继承属性均会判断）
    * @param keys
-   * @param obj
+   * @param obj 如果 obj 是 null or undefined, 或者 非 object，则直接 返回 false
    */
   export function isKeyInObject(keys: string | string[], obj: any): boolean;
   /**
    * 判断key是否在object内
    * （采用 hasOwnProperty 判断，继承属性不会判断）
    * @param keys
-   * @param obj
+   * @param obj 如果 obj 是 null or undefined, 或者 非 object，则直接 返回 false
    */
   export function isOwnKeyInObject(keys: string | string[], obj: any): boolean;
   /**

package/lib/dom/fileSaveAs.js

@@ -1,61 +1,83 @@
 "use strict";
 
-var _saveAs = function(e) {
-  if (!(void 0 === e || "undefined" != typeof navigator && /MSIE [1-9]\./.test(navigator.userAgent))) {
-    var t = e.document, n = function() {
-      return e.URL || e.webkitURL || e;
-    }, o = t.createElementNS("http://www.w3.org/1999/xhtml", "a"), r = "download" in o, a = /constructor/i.test(e.HTMLElement) || e.safari, i = /CriOS\/[\d]+/.test(navigator.userAgent), c = function(t) {
-      (e.setImmediate || e.setTimeout)((function() {
-        throw t;
-      }), 0);
-    }, d = function(e) {
-      setTimeout((function() {
-        "string" == typeof e ? n().revokeObjectURL(e) : e.remove();
-      }), 4e4);
-    }, s = function(e) {
-      return /^\s*(?:text\/\S*|application\/xml|\S*\/\S*\+xml)\s*;.*charset\s*=\s*utf-8/i.test(e.type) ? new Blob([ String.fromCharCode(65279), e ], {
-        type: e.type
-      }) : e;
-    }, f = function(t, f, u) {
-      u || (t = s(t));
-      var l, v = this, p = "application/octet-stream" === t.type, w = function() {
-        !function(e, t, n) {
-          for (var o = (t = [].concat(t)).length; o--; ) {
-            var r = e["on" + t[o]];
-            if ("function" == typeof r) try {
-              r.call(e, n || e);
-            } catch (e) {
-              c(e);
-            }
-          }
-        }(v, "writestart progress write writeend".split(" "));
-      };
-      if (v.readyState = v.INIT, r) return l = n().createObjectURL(t), void setTimeout((function() {
-        var e, t;
-        o.href = l, o.download = f, e = o, t = new MouseEvent("click"), e.dispatchEvent(t), 
-        w(), d(l), v.readyState = v.DONE;
-      }));
-      !function() {
-        if ((i || p && a) && e.FileReader) {
-          var o = new FileReader;
-          return o.onloadend = function() {
-            var t = i ? o.result : o.result.replace(/^data:[^;]*;/, "data:attachment/file;");
-            e.open(t, "_blank") || (e.location.href = t), t = void 0, v.readyState = v.DONE, 
-            w();
-          }, o.readAsDataURL(t), void (v.readyState = v.INIT);
-        }
-        (l || (l = n().createObjectURL(t)), p) ? e.location.href = l : e.open(l, "_blank") || (e.location.href = l);
-        v.readyState = v.DONE, w(), d(l);
-      }();
-    }, u = f.prototype;
-    return "undefined" != typeof navigator && navigator.msSaveOrOpenBlob ? function(e, t, n) {
-      return t = t || e.name || "download", n || (e = s(e)), navigator.msSaveOrOpenBlob(e, t);
-    } : (u.abort = function() {}, u.readyState = u.INIT = 0, u.WRITING = 1, u.DONE = 2, 
-    u.error = u.onwritestart = u.onprogress = u.onwrite = u.onabort = u.onerror = u.onwriteend = null, 
-    function(e, t, n) {
-      return new f(e, t || e.name || "download", n);
-    });
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault"), _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof")), _global = "object" === ("undefined" == typeof window ? "undefined" : (0, 
+_typeof2.default)(window)) && window.window === window ? window : "object" === ("undefined" == typeof self ? "undefined" : (0, 
+_typeof2.default)(self)) && self.self === self ? self : "object" === ("undefined" == typeof global ? "undefined" : (0, 
+_typeof2.default)(global)) && global.global === global ? global : void 0;
+
+function bom(e, t) {
+  return void 0 === t ? t = {
+    autoBom: !1
+  } : "object" !== (0, _typeof2.default)(t) && (console.warn("Deprecated: Expected third argument to be a object"), 
+  t = {
+    autoBom: !t
+  }), t.autoBom && /^\s*(?:text\/\S*|application\/xml|\S*\/\S*\+xml)\s*;.*charset\s*=\s*utf-8/i.test(e.type) ? new Blob([ String.fromCharCode(65279), e ], {
+    type: e.type
+  }) : e;
+}
+
+function download(e, t, o) {
+  var n = new XMLHttpRequest;
+  n.open("GET", e), n.responseType = "blob", n.onload = function() {
+    saveAs(n.response, t, o);
+  }, n.onerror = function() {
+    console.error("could not download file");
+  }, n.send();
+}
+
+function corsEnabled(e) {
+  var t = new XMLHttpRequest;
+  t.open("HEAD", e, !1);
+  try {
+    t.send();
+  } catch (e) {}
+  return t.status >= 200 && t.status <= 299;
+}
+
+function click(e) {
+  try {
+    e.dispatchEvent(new MouseEvent("click"));
+  } catch (o) {
+    var t = document.createEvent("MouseEvents");
+    t.initMouseEvent("click", !0, !0, window, 0, 0, 0, 80, 20, !1, !1, !1, !1, 0, null), 
+    e.dispatchEvent(t);
+  }
+}
+
+var isMacOSWebView = _global.navigator && /Macintosh/.test(navigator.userAgent) && /AppleWebKit/.test(navigator.userAgent) && !/Safari/.test(navigator.userAgent), saveAs = "object" !== ("undefined" == typeof window ? "undefined" : (0, 
+_typeof2.default)(window)) || window !== _global ? function() {} : "download" in HTMLAnchorElement.prototype && !isMacOSWebView ? function(e, t, o) {
+  var n = _global.URL || _global.webkitURL, a = document.createElement("a");
+  t = t || e.name || "download", a.download = t, a.rel = "noopener", "string" == typeof e ? (a.href = e, 
+  a.origin !== location.origin ? corsEnabled(a.href) ? download(e, t, o) : click(a, a.target = "_blank") : click(a)) : (a.href = n.createObjectURL(e), 
+  setTimeout((function() {
+    n.revokeObjectURL(a.href);
+  }), 4e4), setTimeout((function() {
+    click(a);
+  }), 0));
+} : "msSaveOrOpenBlob" in navigator ? function(e, t, o) {
+  if (t = t || e.name || "download", "string" == typeof e) if (corsEnabled(e)) download(e, t, o); else {
+    var n = document.createElement("a");
+    n.href = e, n.target = "_blank", setTimeout((function() {
+      click(n);
+    }));
+  } else navigator.msSaveOrOpenBlob(bom(e, o), t);
+} : function(e, t, o, n) {
+  if ((n = n || open("", "_blank")) && (n.document.title = n.document.body.innerText = "downloading..."), 
+  "string" == typeof e) return download(e, t, o);
+  var a = "application/octet-stream" === e.type, i = /constructor/i.test(_global.HTMLElement) || _global.safari, l = /CriOS\/[\d]+/.test(navigator.userAgent);
+  if ((l || a && i || isMacOSWebView) && "undefined" != typeof FileReader) {
+    var r = new FileReader;
+    r.onloadend = function() {
+      var e = r.result;
+      e = l ? e : e.replace(/^data:[^;]*;/, "data:attachment/file;"), n ? n.location.href = e : location = e, 
+      n = null;
+    }, r.readAsDataURL(e);
+  } else {
+    var d = _global.URL || _global.webkitURL, c = d.createObjectURL(e);
+    n ? n.location = c : location.href = c, n = null, setTimeout((function() {
+      d.revokeObjectURL(c);
+    }), 4e4);
   }
-}, view = "undefined" != typeof self && self || "undefined" != typeof window && window || (void 0).content;
+};
 
-module.exports = _saveAs(view);
+module.exports = saveAs;

package/lib/utils.js

@@ -117,12 +117,14 @@ var stringIsJson = function(e) {
     return _isJSON(e);
   }
 }, isKeyInObject = function(e, t) {
+  if (isNil(t) || !isObject(t)) return !1;
   isString(e) && (e = [ e ]);
   var n = 0;
   return e.forEach((function(e) {
     e in t && n++;
   })), e.length === n;
 }, isOwnKeyInObject = function(e, t) {
+  if (isNil(t) || !isObject(t)) return !1;
   isString(e) && (e = [ e ]);
   var n = 0;
   return e.forEach((function(e) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amos-tool",
-  "version": "1.5.3",
+  "version": "1.6.1",
   "description": "amos ui tool",
   "main": "index.js",
   "directories": {
@@ -14,7 +14,8 @@
     "build": "ac-build babel-es5",
     "build2": "rollup -c",
     "doc": "ac-doc docall",
-    "pub": "npm run doc && npm run build && npm publish"
+    "pub": "npm run doc && npm run build && npm publish",
+    "pub2": "npm run doc && npm run build && gulp move && npm publish"
   },
   "repository": {
     "type": "git",