amos-tool 1.6.12 → 1.6.14

package/README.md

@@ -650,6 +650,9 @@ convert2Blob(canvas, fn, options)
 
 ## changelog
 
+* v1.6.13
+  `*` fix color Log
+
 * v1.6.3
   `*` fix Log
 

package/docs/Logger.html

@@ -490,7 +490,7 @@ isDebug: true
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.6</a> on Thu May 23 2024 21:25:31 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 Wed Jun 12 2024 13:51:57 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

@@ -17768,7 +17768,11 @@ schedule <code>callback</code> to execute after <code>delay</code> ms.</p></td>
     <pre class="prettyprint"><code>toHexColor('rgba(241,112,19)'); // #f17013
  toHexColor('rgba(241,112,19, 1)'); // #f17013
  toHexColor('rgba(241,112,19, 0.1)'); // #f17013
- toHexColor('red'); // #ff0000</code></pre>
+ toHexColor('red'); // #ff0000
+ toHexColor(); // ''
+ toHexColor(null); // ''
+ toHexColor(123456); // ''
+ toHexColor(0x123456123456); // ''</code></pre>
 
 
 
@@ -18901,7 +18905,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 May 23 2024 21:25:31 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 Wed Jun 12 2024 13:51:57 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.13
+<code>*</code> fix color Log</p>
+</li>
+<li>
 <p>v1.6.3
 <code>*</code> fix Log</p>
 </li>
@@ -793,7 +797,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 May 23 2024 21:25:31 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 Wed Jun 12 2024 13:51:57 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

@@ -245,12 +245,12 @@ declare namespace LocationParam {
   /**
    * 获取 url 中参数集合
    * @param url
-   * @param decode 是否解码
+   * @param decode 是否解码， 默认为 false
    * @example
    *  extractParamAll('/vizmixpub?appId=1536262837746302978&id=1536264796842786817&designerType=vizmix&isPreview=true', 'id');
    * // { appId: '1536262837746302978', id: '1536264796842786817', designerType: 'vizmix', isPreview: 'true' }
    */
-  export function extractParamAll(url: string, decode = false): Object;
+  export function extractParamAll(url: string, decode?: boolean): Object;
   /**
    * 补全参数
    * @param {Object} param
@@ -515,6 +515,10 @@ declare namespace colorUtil {
    *  toHexColor('rgba(241,112,19, 1)'); // #f17013
    *  toHexColor('rgba(241,112,19, 0.1)'); // #f17013
    *  toHexColor('red'); // #ff0000
+   *  toHexColor(); // ''
+   *  toHexColor(null); // ''
+   *  toHexColor(123456); // ''
+   *  toHexColor(0x123456123456); // ''
    */
   export function toHexColor(stringRgb: string): string;
   /**
@@ -747,7 +751,7 @@ declare namespace arrayUtils {
    * @param source 原始数组
    * @param compareFn 排序方法
    */
-  export function deduplicateAndSort(source: [], compareFn: (a: T, b: T) => number): [];
+  export function deduplicateAndSort(source: [], compareFn: (a: any, b: any) => number): [];
   /**
    * 通过索引删除数组指定位置的数据。
    *
@@ -771,7 +775,7 @@ declare namespace arrayUtils {
    *  const array2 = [[5, 6], [7, 8]];
    *  merge2DArraysDiagonally(array1, array2); // 输出: [[1, 2, 5, 6], [3, 4, 7, 8]]
    */
-  export function merge2DArraysDiagonally(arr1: T[][], arr2: T[][]): T[][];
+  export function merge2DArraysDiagonally(arr1: any[][], arr2: any[][]): any[][];
 }
 
 declare namespace algor {
@@ -897,26 +901,26 @@ export function subtraction(arg1, arg2): number;
  * 小数乘法
  * @param arg1 被乘数（接受小数和整数）
  * @param arg2 乘数（接受小数和整数）
- * @param fix 乘积保留几位（接受正负整数以及0）
+ * @param fix 乘积保留几位（接受正负整数以及0），默认值为 0
  * @returns {Number}
  * @example
  *  accMul(0.56, 100); // 56
  *  accMul(0.5679, 100); // 57
  *  accMul(0.5679, 100.2); // 57
 */
-export function accMul(arg1: Number, arg2: Number, fix = 0): number;
+export function accMul(arg1: Number, arg2: Number, fix?: Number): number;
 /**
  * 小数除法
  * @param arg1 被乘数（接受小数和整数）
  * @param arg2 乘数（接受小数和整数）
- * @param fix 乘积保留几位（接受正负整数以及0）
+ * @param fix 除法保留几位（接受正负整数以及0）,默认值为 0
  * @returns {Number}
  * @example
  *  accDivide(56, 100); // 0.56
  *  accDivide(5679, 100, 2); // 56.79
  *  accDivide(5679, 100.2, 2); // 56.68
  */
-export function accDivide(arg1: Number, arg2: Number, fix = 0): number;
+export function accDivide(arg1: Number, arg2: Number, fix?: Number): number;
 
 /**
  * 将数值格式化成金额形式
@@ -1360,7 +1364,7 @@ declare namespace flat {
   /**
    * 获取树结构数据 flat keys
    * @param item
-   * @param options
+   * @param options 默认值为 { uniqueKey: 'key', childrenKey: 'children' }
    */
-  export function getTreeFlatKeys(item: Object | any[], options = { uniqueKey: 'key', childrenKey: 'children' }): String[] | Number[];
+  export function getTreeFlatKeys(item: Object | any[], options?: { uniqueKey?: 'key', childrenKey?: 'children' }): String[] | Number[];
 }

package/lib/arrayUtils.js

@@ -18,9 +18,11 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
     return t;
   },
   merge2DArraysDiagonally: function(r, e) {
-    for (var t = [], n = Math.max(r.length, e.length), u = 0; u < n; u++) {
-      var a = r[u] || [], o = e[u] || [];
-      t[u] = [].concat((0, _toConsumableArray2.default)(a), (0, _toConsumableArray2.default)(o));
+    for (var t = [], n = Math.max(r.length, e.length), u = r[0].length, a = e[0].length, l = function(r) {
+      return Array(r).fill(null);
+    }, o = 0; o < n; o++) {
+      var i = r[o] || l(u), s = e[o] || l(a);
+      t[o] = [].concat((0, _toConsumableArray2.default)(i), (0, _toConsumableArray2.default)(s));
     }
     return t;
   },
@@ -41,8 +43,8 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
     for (var e = {}, t = r.slice().sort((function(r, e) {
       return r - e;
     })), n = 1, u = t[0], a = 0; a < t.length; a++) {
-      var o = t[a];
-      o !== u && (n = a + 1, u = o), e[o] ? (e[o].count++, e[o].sum += n) : e[o] = {
+      var l = t[a];
+      l !== u && (n = a + 1, u = l), e[l] ? (e[l].count++, e[l].sum += n) : e[l] = {
         count: 1,
         sum: n
       };

package/lib/math/colorUtil.js

@@ -21,8 +21,10 @@ var utils = require("./../utils"), colorKeyWordsHexStr = require("./_keyColor"),
     return a;
   }
 }, toHexColor = function(r) {
+  if (utils.isNil(r)) return "";
   if (isHexColor(r)) return r;
   if (isKeyColor(r)) return colorKeyWordsHexStr[r];
+  if (!utils.isString(r)) return "";
   var e = r;
   r.indexOf("rgb") > -1 && (e = e.replace(rgbaRegex, ""));
   for (var t = e.split(","), o = "#", n = 0; n < t.length; n++) if (n < 3) {

package/package.json

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