tools-min-ns 1.18.0 → 1.18.3

package/README.md

@@ -5,6 +5,16 @@ pnpm i tools-min-ns --save
 ```
 
 # updates
+## v1.18.3
+请求校验
+## v1.18.2
+防抖节流函数声明
+## v1.18.1
+>CheckUtil 
+fix: getFormItemRules
+>TreeUtil 
+fix: tree2strSplit
+
 ## v1.18.0
 >StorageUtil 
 采用xor压缩算法加解密

package/esm/array/TreeUtil.js

@@ -390,7 +390,7 @@ var TreeUtil;
       var _a, _b, _c;
       item[parent] = "".concat((_a = parentData === null || parentData === void 0 ? void 0 : parentData[parent]) !== null && _a !== void 0 ? _a : '', "/").concat((_b = parentData === null || parentData === void 0 ? void 0 : parentData[label]) !== null && _b !== void 0 ? _b : '');
       if (parentData && !((_c = item === null || item === void 0 ? void 0 : item[children]) === null || _c === void 0 ? void 0 : _c.length)) {
-        strArr.push("".concat(item[parent], "/").concat(item[label]).split(splitStr).filter(function (e) {
+        strArr.push("".concat(item[parent], "/").concat(item[label]).split('/').filter(function (e) {
           return e;
         }).join(splitStr));
       }

package/esm/check/CheckUtil.d.ts

@@ -110,7 +110,7 @@ console.log(isValidFileName("invalid:name.txt")); // false
      * @param type 类型
      * @param options
      */
-    function getFormItemRules(type: StrType, options?: {
+    function getFormItemRules(type: StrType | 'MOBILE_AES' | 'ID_CARD_AES', options?: {
         label?: string;
         required?: boolean;
         errMsg?: string;

package/esm/check/CheckUtil.js

@@ -150,6 +150,7 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
  * @author nanshen
  * @creat 2021-09-15 10:30:46
  */
+import PasswordUtil from '../pwd/PasswordUtil';
 import BaseUtil from '../base/BaseUtil';
 import { STR_TYPE } from '../common';
 var CheckUtil;
@@ -519,7 +520,16 @@ var CheckUtil;
       validator: function validator(_, value, c) {
         return __awaiter(_this, void 0, void 0, function () {
           return __generator(this, function (_a) {
-            if (!value || CheckUtil.checkAny(value, type)) return [2 /*return*/, Promise.resolve()];
+            if (!value) return [2 /*return*/, Promise.resolve()];
+            if (type === 'MOBILE_AES') {
+              if (CheckUtil.checkAny(PasswordUtil.strDecrypt(value), 'MOBILE')) return [2 /*return*/, Promise.resolve()];
+              return [2 /*return*/, Promise.reject(new Error((options === null || options === void 0 ? void 0 : options.errMsg) || "\u683C\u5F0F\u9519\u8BEF\uFF0C\u8BF7\u8F93\u5165\u6B63\u786E\u7684".concat(msg, "\uFF01")))];
+            }
+            if (type === 'ID_CARD_AES') {
+              if (CheckUtil.checkAny(PasswordUtil.strDecrypt(value), 'ID_CARD')) return [2 /*return*/, Promise.resolve()];
+              return [2 /*return*/, Promise.reject(new Error((options === null || options === void 0 ? void 0 : options.errMsg) || "\u683C\u5F0F\u9519\u8BEF\uFF0C\u8BF7\u8F93\u5165\u6B63\u786E\u7684".concat(msg, "\uFF01")))];
+            }
+            if (CheckUtil.checkAny(value, type)) return [2 /*return*/, Promise.resolve()];
             if (type === 'LOGIN_NAME') {
               return [2 /*return*/, Promise.reject(new Error((options === null || options === void 0 ? void 0 : options.errMsg) || "".concat(msg, "\u53EA\u5305\u542B\u5B57\u6BCD\u3001\u6570\u5B57\u3001\u4E0B\u5212\u7EBF\u6216\u51CF\u53F7\uFF1B\u9996\u5B57\u6BCD\u5FC5\u987B\u4E3A\u5B57\u6BCD\uFF1B\u957F\u5EA6\u4E3A6-18\u4E2A\u5B57\u7B26\uFF1B\u4E0D\u80FD\u5305\u542B\u7279\u6B8A\u5B57\u7B26")))];
             }

package/esm/func/FunctionUtil.d.ts

@@ -34,7 +34,7 @@ declare namespace FunctionUtil {
      * query()
      * query() => 3
      */
-    function debounceFn<T extends (...args: any[]) => any>(fn: T, t?: number, immediate?: boolean): T;
+    function debounceFn<T extends Function>(fn: T, t?: number, immediate?: boolean): T;
     /**
      * 函数节流
      * @param fn 需要节流的函数
@@ -45,7 +45,7 @@ declare namespace FunctionUtil {
      * query()
      * query()
      */
-    function throttleFn<T extends (...args: any[]) => any>(fn: T, t?: number): T;
+    function throttleFn<T extends Function>(fn: T, t?: number): T;
     /**
      * 函数只能调用一次
      * @param { Function } fn  需要被处理的函数

package/esm/request/RequestUtil.d.ts

@@ -11,9 +11,9 @@ import nsPromiseFn from './nsPromiseFn';
 export type PromiseInput<T> = Array<(() => Promise<T>) | Promise<T>> | (() => Promise<T>) | Promise<T>;
 declare namespace RequestUtil {
     /** @name 浙里办请求工具设置默认请求头 */
-    const mgopSetDefaultHeader: typeof setDefaultHeader;
+    export const mgopSetDefaultHeader: typeof setDefaultHeader;
     /** @name 浙里办请求工具 */
-    const mgopRequest: typeof mgop;
+    export const mgopRequest: typeof mgop;
     /**
    * @name 简单发起请求
    * @example
@@ -30,7 +30,7 @@ declare namespace RequestUtil {
         dataType: 'json'
       }).then(response => {}).catch(error => {});
   */
-    const uniRquest: typeof uniRquestFn;
+    export const uniRquest: typeof uniRquestFn;
     /**
    * @name jsonp请求工具
      @example
@@ -41,7 +41,7 @@ declare namespace RequestUtil {
       //...
      });
    */
-    const jsonp: typeof jsonpFn;
+    export const jsonp: typeof jsonpFn;
     /**
    * @name jsonpRquest请求工具
      @example
@@ -49,14 +49,14 @@ declare namespace RequestUtil {
         url: 'https:/xxxx.com?key=1&output=jsonp'
       }).then(response => {}).catch(error => {});
    */
-    const jsonpRquest: typeof jsonpRquestFn;
+    export const jsonpRquest: typeof jsonpRquestFn;
     /**
      * 异步请求并发处理
      * @param requests 请求列表
      * @param options limit同时处理几个请求默认6个，onUploadProgress进度条
      * @returns
      */
-    function handleRequests<T = any>(requests: PromiseInput<T>, options?: {
+    export function handleRequests<T = any>(requests: PromiseInput<T>, options?: {
         limit?: number;
         onUploadProgress?: (opt: {
             total: number;
@@ -129,6 +129,18 @@ function exampleAsyncFunction() {
   console.log('Array Is Stopped:', arrayIsStopped); //Array Is Stopped: false
 })();
  */
-    const nsPromise: typeof nsPromiseFn;
+    export const nsPromise: typeof nsPromiseFn;
+    type RequestParam = {
+        /** 请求接口路径 */
+        url?: string;
+        /** POST请求参数 */
+        data?: any;
+        /** 前端传参方式（默认form）json => body; form=> query */
+        requestType?: any;
+        /** 前端接受类型（默认json） */
+        responseType?: any;
+    };
+    export function getAuthorization(opt: RequestParam): string;
+    export {};
 }
 export default RequestUtil;

package/esm/request/RequestUtil.js

@@ -123,6 +123,8 @@ import mgop, { setDefaultHeader } from './mgop';
 import uniRquestFn from './uniRquest';
 import jsonpFn, { jsonpRquest as jsonpRquestFn } from './jsonp';
 import nsPromiseFn from './nsPromiseFn';
+import StringUtil from 'src/string/StringUtil';
+import PasswordUtil from 'src/pwd/PasswordUtil';
 var RequestUtil;
 (function (RequestUtil) {
   /** @name 浙里办请求工具设置默认请求头 */
@@ -300,5 +302,35 @@ var RequestUtil;
   })();
   */
   RequestUtil.nsPromise = nsPromiseFn;
+  function getAuthorization(opt) {
+    try {
+      var uuid = StringUtil.getUuiD(16);
+      var _a = opt.data,
+        data_1 = _a === void 0 ? {} : _a,
+        url = opt.url,
+        _b = opt.requestType,
+        requestType = _b === void 0 ? 'form' : _b,
+        _c = opt.responseType,
+        responseType = _c === void 0 ? 'json' : _c;
+      var ts = new Date().getTime();
+      var paramStr = JSON.stringify(data_1);
+      if (responseType === 'json') {
+        if (requestType === 'form') {
+          var _data_1 = {};
+          var sortedKeys = Object.keys(data_1).sort(); // 对键进行排序
+          sortedKeys.forEach(function (k) {
+            if (!['null', 'undefined'].includes(String(data_1[k]))) _data_1[k] = String(data_1[k]);
+          });
+          paramStr = JSON.stringify(_data_1);
+        }
+      }
+      var str = url + paramStr + ts + uuid;
+      return ts + PasswordUtil.str2MD5(str, uuid) + uuid;
+    } catch (error) {
+      console.error(error);
+      return '';
+    }
+  }
+  RequestUtil.getAuthorization = getAuthorization;
 })(RequestUtil || (RequestUtil = {}));
 export default RequestUtil;

package/lib/array/TreeUtil.js

@@ -400,7 +400,7 @@ var TreeUtil;
       var _a, _b, _c;
       item[parent] = "".concat((_a = parentData === null || parentData === void 0 ? void 0 : parentData[parent]) !== null && _a !== void 0 ? _a : '', "/").concat((_b = parentData === null || parentData === void 0 ? void 0 : parentData[label]) !== null && _b !== void 0 ? _b : '');
       if (parentData && !((_c = item === null || item === void 0 ? void 0 : item[children]) === null || _c === void 0 ? void 0 : _c.length)) {
-        strArr.push("".concat(item[parent], "/").concat(item[label]).split(splitStr).filter(function (e) {
+        strArr.push("".concat(item[parent], "/").concat(item[label]).split('/').filter(function (e) {
           return e;
         }).join(splitStr));
       }

package/lib/check/CheckUtil.d.ts

@@ -110,7 +110,7 @@ console.log(isValidFileName("invalid:name.txt")); // false
      * @param type 类型
      * @param options
      */
-    function getFormItemRules(type: StrType, options?: {
+    function getFormItemRules(type: StrType | 'MOBILE_AES' | 'ID_CARD_AES', options?: {
         label?: string;
         required?: boolean;
         errMsg?: string;

package/lib/check/CheckUtil.js

@@ -160,6 +160,7 @@ Object.defineProperty(exports, "__esModule", {
  * @author nanshen
  * @creat 2021-09-15 10:30:46
  */
+var PasswordUtil_1 = __importDefault(require("../pwd/PasswordUtil"));
 var BaseUtil_1 = __importDefault(require("../base/BaseUtil"));
 var common_1 = require("../common");
 var CheckUtil;
@@ -529,7 +530,16 @@ var CheckUtil;
       validator: function validator(_, value, c) {
         return __awaiter(_this, void 0, void 0, function () {
           return __generator(this, function (_a) {
-            if (!value || CheckUtil.checkAny(value, type)) return [2 /*return*/, Promise.resolve()];
+            if (!value) return [2 /*return*/, Promise.resolve()];
+            if (type === 'MOBILE_AES') {
+              if (CheckUtil.checkAny(PasswordUtil_1.default.strDecrypt(value), 'MOBILE')) return [2 /*return*/, Promise.resolve()];
+              return [2 /*return*/, Promise.reject(new Error((options === null || options === void 0 ? void 0 : options.errMsg) || "\u683C\u5F0F\u9519\u8BEF\uFF0C\u8BF7\u8F93\u5165\u6B63\u786E\u7684".concat(msg, "\uFF01")))];
+            }
+            if (type === 'ID_CARD_AES') {
+              if (CheckUtil.checkAny(PasswordUtil_1.default.strDecrypt(value), 'ID_CARD')) return [2 /*return*/, Promise.resolve()];
+              return [2 /*return*/, Promise.reject(new Error((options === null || options === void 0 ? void 0 : options.errMsg) || "\u683C\u5F0F\u9519\u8BEF\uFF0C\u8BF7\u8F93\u5165\u6B63\u786E\u7684".concat(msg, "\uFF01")))];
+            }
+            if (CheckUtil.checkAny(value, type)) return [2 /*return*/, Promise.resolve()];
             if (type === 'LOGIN_NAME') {
               return [2 /*return*/, Promise.reject(new Error((options === null || options === void 0 ? void 0 : options.errMsg) || "".concat(msg, "\u53EA\u5305\u542B\u5B57\u6BCD\u3001\u6570\u5B57\u3001\u4E0B\u5212\u7EBF\u6216\u51CF\u53F7\uFF1B\u9996\u5B57\u6BCD\u5FC5\u987B\u4E3A\u5B57\u6BCD\uFF1B\u957F\u5EA6\u4E3A6-18\u4E2A\u5B57\u7B26\uFF1B\u4E0D\u80FD\u5305\u542B\u7279\u6B8A\u5B57\u7B26")))];
             }

package/lib/func/FunctionUtil.d.ts

@@ -34,7 +34,7 @@ declare namespace FunctionUtil {
      * query()
      * query() => 3
      */
-    function debounceFn<T extends (...args: any[]) => any>(fn: T, t?: number, immediate?: boolean): T;
+    function debounceFn<T extends Function>(fn: T, t?: number, immediate?: boolean): T;
     /**
      * 函数节流
      * @param fn 需要节流的函数
@@ -45,7 +45,7 @@ declare namespace FunctionUtil {
      * query()
      * query()
      */
-    function throttleFn<T extends (...args: any[]) => any>(fn: T, t?: number): T;
+    function throttleFn<T extends Function>(fn: T, t?: number): T;
     /**
      * 函数只能调用一次
      * @param { Function } fn  需要被处理的函数

package/lib/request/RequestUtil.d.ts

@@ -11,9 +11,9 @@ import nsPromiseFn from './nsPromiseFn';
 export type PromiseInput<T> = Array<(() => Promise<T>) | Promise<T>> | (() => Promise<T>) | Promise<T>;
 declare namespace RequestUtil {
     /** @name 浙里办请求工具设置默认请求头 */
-    const mgopSetDefaultHeader: typeof setDefaultHeader;
+    export const mgopSetDefaultHeader: typeof setDefaultHeader;
     /** @name 浙里办请求工具 */
-    const mgopRequest: typeof mgop;
+    export const mgopRequest: typeof mgop;
     /**
    * @name 简单发起请求
    * @example
@@ -30,7 +30,7 @@ declare namespace RequestUtil {
         dataType: 'json'
       }).then(response => {}).catch(error => {});
   */
-    const uniRquest: typeof uniRquestFn;
+    export const uniRquest: typeof uniRquestFn;
     /**
    * @name jsonp请求工具
      @example
@@ -41,7 +41,7 @@ declare namespace RequestUtil {
       //...
      });
    */
-    const jsonp: typeof jsonpFn;
+    export const jsonp: typeof jsonpFn;
     /**
    * @name jsonpRquest请求工具
      @example
@@ -49,14 +49,14 @@ declare namespace RequestUtil {
         url: 'https:/xxxx.com?key=1&output=jsonp'
       }).then(response => {}).catch(error => {});
    */
-    const jsonpRquest: typeof jsonpRquestFn;
+    export const jsonpRquest: typeof jsonpRquestFn;
     /**
      * 异步请求并发处理
      * @param requests 请求列表
      * @param options limit同时处理几个请求默认6个，onUploadProgress进度条
      * @returns
      */
-    function handleRequests<T = any>(requests: PromiseInput<T>, options?: {
+    export function handleRequests<T = any>(requests: PromiseInput<T>, options?: {
         limit?: number;
         onUploadProgress?: (opt: {
             total: number;
@@ -129,6 +129,18 @@ function exampleAsyncFunction() {
   console.log('Array Is Stopped:', arrayIsStopped); //Array Is Stopped: false
 })();
  */
-    const nsPromise: typeof nsPromiseFn;
+    export const nsPromise: typeof nsPromiseFn;
+    type RequestParam = {
+        /** 请求接口路径 */
+        url?: string;
+        /** POST请求参数 */
+        data?: any;
+        /** 前端传参方式（默认form）json => body; form=> query */
+        requestType?: any;
+        /** 前端接受类型（默认json） */
+        responseType?: any;
+    };
+    export function getAuthorization(opt: RequestParam): string;
+    export {};
 }
 export default RequestUtil;

package/lib/request/RequestUtil.js

@@ -164,6 +164,8 @@ var mgop_1 = __importStar(require("./mgop"));
 var uniRquest_1 = __importDefault(require("./uniRquest"));
 var jsonp_1 = __importStar(require("./jsonp"));
 var nsPromiseFn_1 = __importDefault(require("./nsPromiseFn"));
+var StringUtil_1 = __importDefault(require("src/string/StringUtil"));
+var PasswordUtil_1 = __importDefault(require("src/pwd/PasswordUtil"));
 var RequestUtil;
 (function (RequestUtil) {
   /** @name 浙里办请求工具设置默认请求头 */
@@ -341,5 +343,35 @@ var RequestUtil;
   })();
   */
   RequestUtil.nsPromise = nsPromiseFn_1.default;
+  function getAuthorization(opt) {
+    try {
+      var uuid = StringUtil_1.default.getUuiD(16);
+      var _a = opt.data,
+        data_1 = _a === void 0 ? {} : _a,
+        url = opt.url,
+        _b = opt.requestType,
+        requestType = _b === void 0 ? 'form' : _b,
+        _c = opt.responseType,
+        responseType = _c === void 0 ? 'json' : _c;
+      var ts = new Date().getTime();
+      var paramStr = JSON.stringify(data_1);
+      if (responseType === 'json') {
+        if (requestType === 'form') {
+          var _data_1 = {};
+          var sortedKeys = Object.keys(data_1).sort(); // 对键进行排序
+          sortedKeys.forEach(function (k) {
+            if (!['null', 'undefined'].includes(String(data_1[k]))) _data_1[k] = String(data_1[k]);
+          });
+          paramStr = JSON.stringify(_data_1);
+        }
+      }
+      var str = url + paramStr + ts + uuid;
+      return ts + PasswordUtil_1.default.str2MD5(str, uuid) + uuid;
+    } catch (error) {
+      console.error(error);
+      return '';
+    }
+  }
+  RequestUtil.getAuthorization = getAuthorization;
 })(RequestUtil || (RequestUtil = {}));
 exports.default = RequestUtil;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tools-min-ns",
   "description": "工具包适用于前端以及node",
-  "version": "1.18.0",
+  "version": "1.18.3",
   "main": "lib/index.js",
   "license": "MIT",
   "author": "nanshen",