ztxkutils 2.2.5 → 2.2.9

package/dist/index.js

@@ -1,9 +1,9 @@
 export { c as authority } from './authority-17b7fde2.js';
 export { d as dataModel } from './dataModel-1fbaff40.js';
-export { t as tools } from './tools-e7505c92.js';
-export { v as validate } from './validate-01242f5f.js';
+export { t as tools } from './tools-2876d65c.js';
+export { v as validate } from './validate-ebe369e9.js';
 export { r as request } from './request-74ca7860.js';
-export { r as reqUrl } from './reqUrl-68c864fb.js';
+export { r as reqUrl } from './reqUrl-b19a6e87.js';
 import './tslib.es6-b9033aad.js';
 import 'dayjs';
 import 'number-precision';

package/dist/{reqUrl-68c864fb.js → reqUrl-b19a6e87.js}

@@ -9,6 +9,7 @@ function getReqUrl(processObj) {
     var ZT_API_TEST = processObj.REACT_APP_ZT_API_TEST || 'http://192.168.0.135:8000'; // 测试环境
     var ZT_API_STAGE = processObj.REACT_APP_ZT_API_STAGE || 'http://192.168.0.134:8000'; // 阶段性环境
     var ZT_API_PRODUCT = processObj.REACT_APP_ZT_API_PRODUCT || 'http://dz.zmd.com.cn'; // 生产环境
+    var ZT_API_PUBLIC_PRODUCT = processObj.REACT_ZT_API_PUBLIC_PRODUCT || 'http://dz.zmd.com.cn:8000'; // 生产环境外网api地址
     // 文件服务器
     var ZT_FILE_PREVIEW_DEV = processObj.REACT_APP_ZT_FILE_PREVIEW_DEV || 'http://192.168.0.83:88'; // 开发环境
     var ZT_FILE_PREVIEW_TEST = processObj.REACT_APP_ZT_FILE_PREVIEW_TEST || 'http://192.168.0.135:8012'; // 测试环境
@@ -16,28 +17,33 @@ function getReqUrl(processObj) {
     var ZT_FILE_PREVIEW_PRODUCT = processObj.REACT_ZT_FILE_PREVIEW_PRODUCT || 'http://dzfile.zmd.com.cn:8012'; // 生产环境
     // 实际api请求地址
     var ZT_API_BASEURL = ZT_API_DEV;
+    var ZT_API_PUBLICURL = ZT_API_PUBLIC_PRODUCT;
     var ZT_FILE_BASEURL = ZT_FILE_PREVIEW_DEV;
     if (ENV) {
         switch (ENV.toLowerCase()) {
             case 'zt-dev':
                 ZT_API_BASEURL = ZT_API_DEV;
+                ZT_API_PUBLICURL = ZT_API_DEV;
                 ZT_FILE_BASEURL = ZT_FILE_PREVIEW_DEV;
                 break;
             case 'zt-test':
                 ZT_API_BASEURL = ZT_API_TEST;
+                ZT_API_PUBLICURL = ZT_API_TEST;
                 ZT_FILE_BASEURL = ZT_FILE_PREVIEW_TEST;
                 break;
             case 'zt-stage':
                 ZT_API_BASEURL = ZT_API_STAGE;
+                ZT_API_PUBLICURL = ZT_API_STAGE;
                 ZT_FILE_BASEURL = ZT_FILE_PREVIEW_STAGE;
                 break;
             case 'zt-product':
                 ZT_API_BASEURL = ZT_API_PRODUCT;
+                ZT_API_PUBLICURL = ZT_API_PUBLICURL;
                 ZT_FILE_BASEURL = ZT_FILE_PREVIEW_PRODUCT;
                 break;
         }
     }
-    return { ZT_API_BASEURL: ZT_API_BASEURL, ZT_FILE_BASEURL: ZT_FILE_BASEURL };
+    return { ZT_API_BASEURL: ZT_API_BASEURL, ZT_FILE_BASEURL: ZT_FILE_BASEURL, ZT_API_PUBLICURL: ZT_API_PUBLICURL };
 }
 
 var reqUrl = /*#__PURE__*/Object.freeze({

package/dist/reqUrl.d.ts

@@ -4,4 +4,5 @@
 export declare function getReqUrl(processObj: any): {
     ZT_API_BASEURL: any;
     ZT_FILE_BASEURL: any;
+    ZT_API_PUBLICURL: any;
 };

package/dist/reqUrl.js

@@ -1 +1 @@
-export { g as getReqUrl } from './reqUrl-68c864fb.js';
+export { g as getReqUrl } from './reqUrl-b19a6e87.js';

package/dist/{tools-e7505c92.js → tools-2876d65c.js}

@@ -14,6 +14,8 @@ function timeTransfrom(timeParams) {
         var toKeyItem = toKey[i];
         var formatItem = Array.isArray(format)
             ? format[i]
+                ? format[i]
+                : 'YYYY-MM-DD'
             : format
                 ? format
                 : 'YYYY-MM-DD';

package/dist/tools.js

@@ -1,4 +1,4 @@
 import './tslib.es6-b9033aad.js';
 import 'dayjs';
 export { minus, plus, times } from 'number-precision';
-export { c as clearAssignStr, d as divide, e as exactRound, i as isEqualByKey, l as loadFileRename, a as timeTransfrom, b as toThousand, f as transformFileSize } from './tools-e7505c92.js';
+export { c as clearAssignStr, d as divide, e as exactRound, i as isEqualByKey, l as loadFileRename, a as timeTransfrom, b as toThousand, f as transformFileSize } from './tools-2876d65c.js';

package/dist/{validate-01242f5f.js → validate-ebe369e9.js}

@@ -32,6 +32,10 @@ var validate = {
      * @description 密码验证
      */
     passwordValidate: /^(?![0-9]+$)(?![a-z]+$)(?![A-Z]+$)(?!([^(0-9a-zA-Z)])+$)^.{8,16}$/,
+    /**
+     * @description 空格验证
+     */
+    spaceValidate: /^[^\s]*$/g,
 };
 var commonMessage = {
     smallLenMessage: function (type) {
@@ -50,6 +54,7 @@ var commonMessage = {
     idCardMessage: '请输入正确的身份证',
     emailMessage: '请输入正确的邮箱',
     passwordMessage: '密码由8-16位的字母+数字，字母+特殊字符，数字+特殊字符组成',
+    spaceMessage: '请勿输入空格',
 };
 
 var validate$1 = /*#__PURE__*/Object.freeze({

package/dist/validate.d.ts

@@ -31,6 +31,10 @@ declare const validate: {
      * @description 密码验证
      */
     passwordValidate: RegExp;
+    /**
+     * @description 空格验证
+     */
+    spaceValidate: RegExp;
 };
 declare const commonMessage: {
     smallLenMessage(type?: string): string;
@@ -40,5 +44,6 @@ declare const commonMessage: {
     idCardMessage: string;
     emailMessage: string;
     passwordMessage: string;
+    spaceMessage: string;
 };
 export { validate, commonMessage };

package/dist/validate.js

@@ -1 +1 @@
-export { c as commonMessage, a as validate } from './validate-01242f5f.js';
+export { c as commonMessage, a as validate } from './validate-ebe369e9.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ztxkutils",
-  "version": "2.2.5",
+  "version": "2.2.9",
   "description": "",
   "main": "./dist/index.js",
   "module": "./dist/index.js",

package/dist/tools-48c24adb.js

@@ -1,200 +0,0 @@
-import { _ as __assign, a as __spreadArray } from './tslib.es6-b9033aad.js';
-import dayjs from 'dayjs';
-import { divide as divide$1, round, plus, minus, times } from 'number-precision';
-
-/**
- * @description 时间格式转换
- */
-function timeTransfrom(timeParams) {
-    var _a, _b, _c, _d, _e;
-    var params = timeParams.params, fromKey = timeParams.fromKey, toKey = timeParams.toKey, _f = timeParams.type, type = _f === void 0 ? 'string' : _f;
-    var copyParams = __assign({}, params);
-    for (var i = 0; i < fromKey.length; i++) {
-        var fromKeyItem = fromKey[i];
-        var toKeyItem = toKey[i];
-        // 从一个键转换成两个键
-        if (typeof fromKeyItem === 'string' && typeof toKeyItem === 'object') {
-            if (type === 'string' && copyParams[fromKeyItem]) {
-                var _g = copyParams[fromKeyItem], startMoment = _g[0], endMoment = _g[1];
-                var start = void 0, end = void 0;
-                if (dayjs.isDayjs(startMoment)) {
-                    start = startMoment.format('YYYY-MM-DD');
-                }
-                if (dayjs.isDayjs(endMoment)) {
-                    end = endMoment.format('YYYY-MM-DD');
-                }
-                delete copyParams[fromKeyItem];
-                copyParams = __assign(__assign({}, copyParams), (_a = {}, _a[toKeyItem[0]] = start, _a[toKeyItem[1]] = end, _a));
-            }
-            else {
-                copyParams = __assign(__assign({}, copyParams), (_b = {}, _b[toKeyItem[0]] = undefined, _b[toKeyItem[1]] = undefined, _b));
-            }
-        }
-        // 从一个键转换成一个键
-        if (typeof fromKeyItem === 'string' && typeof toKeyItem === 'string') {
-            if (type === 'string') {
-                var _dayjsObj = copyParams[fromKeyItem];
-                var start = void 0;
-                if (dayjs.isDayjs(_dayjsObj)) {
-                    start = _dayjsObj.format('YYYY-MM-DD');
-                }
-                delete copyParams[fromKeyItem];
-                copyParams = __assign(__assign({}, copyParams), (_c = {}, _c[toKeyItem] = start, _c));
-            }
-            if (type === 'object') {
-                var start = copyParams[fromKeyItem]
-                    ? dayjs(copyParams[fromKeyItem])
-                    : undefined;
-                delete copyParams[fromKeyItem];
-                copyParams = __assign(__assign({}, copyParams), (_d = {}, _d[toKeyItem] = start, _d));
-            }
-        }
-        // 从两个键转换成一个键
-        if (typeof fromKeyItem === 'object' && typeof toKeyItem === 'string') {
-            if (type === 'object') {
-                var startMoment = fromKeyItem[0], endMoment = fromKeyItem[1];
-                var intime = copyParams[toKeyItem] || [null, null];
-                if (copyParams[startMoment]) {
-                    intime[0] = dayjs(copyParams[startMoment]);
-                    delete copyParams[startMoment];
-                }
-                if (copyParams[endMoment]) {
-                    intime[1] = dayjs(copyParams[endMoment]);
-                    delete copyParams[endMoment];
-                }
-                if (intime[0] == null || intime[1] == null) {
-                    intime = null;
-                }
-                copyParams = __assign(__assign({}, copyParams), (_e = {}, _e[toKeyItem] = intime, _e));
-            }
-        }
-    }
-    return copyParams;
-}
-function divide(num1, num2) {
-    var others = [];
-    for (var _i = 2; _i < arguments.length; _i++) {
-        others[_i - 2] = arguments[_i];
-    }
-    try {
-        return divide$1.apply(void 0, __spreadArray([num1, num2], others));
-    }
-    catch (err) {
-        console.log(err);
-        return 0;
-    }
-}
-/**
- * @description 精确四舍五入后保留几位小数
- */
-function exactRound(num, ratio) {
-    var typeNum = typeof num;
-    if (typeNum !== 'number' && typeNum !== 'string') {
-        return num;
-    }
-    try {
-        return round(num, ratio).toFixed(ratio);
-    }
-    catch (err) {
-        console.error(err);
-        return num;
-    }
-}
-/**
- * @description 添加千分符符号
- */
-function toThousand(num) {
-    var typeNum = typeof num;
-    if (typeNum !== 'number' && typeNum !== 'string') {
-        return num;
-    }
-    var str = (num + '').replace(/(\d{1,3})(?=(\d{3})+(?:$|\.))/g, '$1,');
-    return str;
-}
-/**
- * @description 去除指定字符串
- */
-function clearAssignStr(str, originalStr) {
-    if (!originalStr) {
-        return originalStr;
-    }
-    if (originalStr.startsWith(str)) {
-        return originalStr.replace(str, '');
-    }
-    return originalStr;
-}
-/**
- * @description 下载重命名
- */
-function loadFileRename(fileUrl, fileName) {
-    var xhr = new XMLHttpRequest();
-    xhr.open('GET', fileUrl, true);
-    xhr.responseType = 'blob';
-    xhr.onload = function () {
-        if (xhr.status === 200) {
-            var link = document.createElement('a');
-            var body = document.querySelector('body');
-            link.href = window.URL.createObjectURL(xhr.response);
-            link.download = fileName;
-            // fix Firefox
-            link.style.display = 'none';
-            body.appendChild(link);
-            link.click();
-            body.removeChild(link);
-            window.URL.revokeObjectURL(link.href);
-        }
-    };
-    xhr.send();
-}
-/**
- * @description 文件大小提示转换
- */
-function transformFileSize(value) {
-    if (value < 1024) {
-        return round(value, 2).toFixed(2) + 'B';
-    }
-    else if (value < 1024 * 1024) {
-        return round(divide(value, 1024), 2).toFixed(2) + 'KB';
-    }
-    return round(divide(value, 1024, 1024), 2).toFixed(2) + 'MB';
-}
-/**
- * @description 更具key判断前后值是否一致
- */
-function isEqualByKey(keys, record, preRecord) {
-    var isEqual = false; // 是否相等
-    if (!record || !preRecord) {
-        isEqual = true;
-        return isEqual;
-    }
-    // 如果数据源相同的话，那么判断是初次更改，应该更新
-    if (record === preRecord) {
-        isEqual = true;
-        return isEqual;
-    }
-    for (var i = 0; i < keys.length; i++) {
-        var key = keys[i];
-        if (record[key] !== preRecord[key]) {
-            isEqual = true;
-            break;
-        }
-    }
-    return isEqual;
-}
-
-var tools = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  timeTransfrom: timeTransfrom,
-  plus: plus,
-  minus: minus,
-  times: times,
-  divide: divide,
-  exactRound: exactRound,
-  toThousand: toThousand,
-  clearAssignStr: clearAssignStr,
-  loadFileRename: loadFileRename,
-  transformFileSize: transformFileSize,
-  isEqualByKey: isEqualByKey
-});
-
-export { timeTransfrom as a, toThousand as b, clearAssignStr as c, divide as d, exactRound as e, transformFileSize as f, isEqualByKey as i, loadFileRename as l, tools as t };

package/dist/tools-49b33116.js

@@ -1,195 +0,0 @@
-import { _ as __assign, a as __spreadArray } from './tslib.es6-b9033aad.js';
-import dayjs from 'dayjs';
-import { divide as divide$1, round, plus, minus, times } from 'number-precision';
-
-/**
- * @description 时间格式转换
- */
-function timeTransfrom(timeParams) {
-    var _a, _b, _c, _d, _e;
-    var params = timeParams.params, fromKey = timeParams.fromKey, toKey = timeParams.toKey, _f = timeParams.type, type = _f === void 0 ? 'string' : _f;
-    var copyParams = __assign({}, params);
-    for (var i = 0; i < fromKey.length; i++) {
-        var fromKeyItem = fromKey[i];
-        var toKeyItem = toKey[i];
-        // 从一个键转换成两个键
-        if (typeof fromKeyItem === 'string' && typeof toKeyItem === 'object') {
-            if (type === 'string' && copyParams[fromKeyItem]) {
-                var _g = copyParams[fromKeyItem], startMoment = _g[0], endMoment = _g[1];
-                var start = void 0, end = void 0;
-                if (dayjs.isDayjs(startMoment)) {
-                    start = startMoment.format('YYYY-MM-DD');
-                }
-                if (dayjs.isDayjs(endMoment)) {
-                    end = endMoment.format('YYYY-MM-DD');
-                }
-                delete copyParams[fromKeyItem];
-                copyParams = __assign(__assign({}, copyParams), (_a = {}, _a[toKeyItem[0]] = start, _a[toKeyItem[1]] = end, _a));
-            }
-            else {
-                copyParams = __assign(__assign({}, copyParams), (_b = {}, _b[toKeyItem[0]] = undefined, _b[toKeyItem[1]] = undefined, _b));
-            }
-        }
-        // 从一个键转换成一个键
-        if (typeof fromKeyItem === 'string' && typeof toKeyItem === 'string') {
-            if (type === 'string') {
-                var _dayjsObj = copyParams[fromKeyItem];
-                var start = void 0;
-                if (dayjs.isDayjs(_dayjsObj)) {
-                    start = _dayjsObj.format('YYYY-MM-DD');
-                }
-                delete copyParams[fromKeyItem];
-                copyParams = __assign(__assign({}, copyParams), (_c = {}, _c[toKeyItem] = start, _c));
-            }
-            if (type === 'object') {
-                var start = copyParams[fromKeyItem]
-                    ? dayjs(copyParams[fromKeyItem])
-                    : undefined;
-                delete copyParams[fromKeyItem];
-                copyParams = __assign(__assign({}, copyParams), (_d = {}, _d[toKeyItem] = start, _d));
-            }
-        }
-        // 从两个键转换成一个键
-        if (typeof fromKeyItem === 'object' && typeof toKeyItem === 'string') {
-            if (type === 'object') {
-                var startMoment = fromKeyItem[0], endMoment = fromKeyItem[1];
-                var intime = copyParams[toKeyItem] || [null, null];
-                if (copyParams[startMoment]) {
-                    intime[0] = dayjs(copyParams[startMoment]);
-                    delete copyParams[startMoment];
-                }
-                if (copyParams[endMoment]) {
-                    intime[1] = dayjs(copyParams[endMoment]);
-                    delete copyParams[endMoment];
-                }
-                copyParams = __assign(__assign({}, copyParams), (_e = {}, _e[toKeyItem] = intime, _e));
-            }
-        }
-    }
-    return copyParams;
-}
-function divide(num1, num2) {
-    var others = [];
-    for (var _i = 2; _i < arguments.length; _i++) {
-        others[_i - 2] = arguments[_i];
-    }
-    try {
-        return divide$1.apply(void 0, __spreadArray([num1, num2], others));
-    }
-    catch (err) {
-        console.log(err);
-        return 0;
-    }
-}
-/**
- * @description 精确四舍五入后保留几位小数
- */
-function exactRound(num, ratio) {
-    var typeNum = typeof num;
-    if (typeNum !== 'number' && typeNum !== 'string') {
-        return num;
-    }
-    try {
-        return round(num, ratio).toFixed(ratio);
-    }
-    catch (err) {
-        console.error(err);
-        return num;
-    }
-}
-/**
- * @description 添加千分符符号
- */
-function toThousand(num) {
-    var typeNum = typeof num;
-    if (typeNum !== 'number' && typeNum !== 'string') {
-        return num;
-    }
-    var str = (num + '').replace(/(\d{1,3})(?=(\d{3})+(?:$|\.))/g, '$1,');
-    return str;
-}
-/**
- * @description 去除指定字符串
- */
-function clearAssignStr(str, originalStr) {
-    if (!originalStr) {
-        return originalStr;
-    }
-    if (originalStr.startsWith(str)) {
-        return originalStr.replace(str, '');
-    }
-    return originalStr;
-}
-/**
- * @description 下载重命名
- */
-function loadFileRename(fileUrl, fileName) {
-    var xhr = new XMLHttpRequest();
-    xhr.open('GET', fileUrl, true);
-    xhr.responseType = 'blob';
-    xhr.onload = function () {
-        if (xhr.status === 200) {
-            var link = document.createElement('a');
-            var body = document.querySelector('body');
-            link.href = window.URL.createObjectURL(xhr.response);
-            link.download = fileName;
-            // fix Firefox
-            link.style.display = 'none';
-            body.appendChild(link);
-            link.click();
-            body.removeChild(link);
-            window.URL.revokeObjectURL(link.href);
-        }
-    };
-    xhr.send();
-}
-/**
- * @description 文件大小提示转换
- */
-function transformFileSize(value) {
-    if (value < 1024) {
-        return round(value, 2).toFixed(2) + 'B';
-    }
-    else if (value < 1024 * 1024) {
-        return round(divide(value, 1024), 2).toFixed(2) + 'KB';
-    }
-    return round(divide(value, 1024, 1024), 2).toFixed(2) + 'MB';
-}
-/**
- * @description 更具key判断前后值是否一致
- */
-function isEqualByKey(keys, record, preRecord) {
-    var isEqual = false; // 是否相等
-    if (!record || !preRecord) {
-        isEqual = true;
-        return isEqual;
-    }
-    if (record === preRecord) {
-        return isEqual;
-    }
-    for (var i = 0; i < keys.length; i++) {
-        var key = keys[i];
-        if (record[key] !== preRecord[key]) {
-            isEqual = true;
-            break;
-        }
-    }
-    return isEqual;
-}
-
-var tools = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  timeTransfrom: timeTransfrom,
-  plus: plus,
-  minus: minus,
-  times: times,
-  divide: divide,
-  exactRound: exactRound,
-  toThousand: toThousand,
-  clearAssignStr: clearAssignStr,
-  loadFileRename: loadFileRename,
-  transformFileSize: transformFileSize,
-  isEqualByKey: isEqualByKey
-});
-
-export { timeTransfrom as a, toThousand as b, clearAssignStr as c, divide as d, exactRound as e, transformFileSize as f, isEqualByKey as i, loadFileRename as l, tools as t };