ztxkutils 20.0.2 → 20.0.4

package/dist/dataModel.js

@@ -1,2 +1,2 @@
 import './i18next.js';
-export { a as createErrorModel, c as createSuccessModel } from './dataModel-b3629ef3.js';
+export { a as createErrorModel, c as createSuccessModel } from './dataModel-f1ef06bc.js';

package/dist/i18next.js

@@ -2377,13 +2377,25 @@ instance.hasLoadedNamespace;
 instance.loadNamespaces;
 instance.loadLanguages;
 
-var originalT = (function () {
+var originalT = instance.t;
+var getSourceKey = function (key, params) {
+    if (params) {
+        var keys = Object.keys(params);
+        if (keys.length) {
+            return keys.reduce(function (pre, cur) {
+                return pre.replace("{{" + cur + "}}", params[cur]);
+            }, key);
+        }
+    }
+    return key;
+};
+var t = (function () {
     var args = [];
     for (var _i = 0; _i < arguments.length; _i++) {
         args[_i] = arguments[_i];
     }
-    return originalT.apply(void 0, args) || args[0];
+    return originalT.apply(void 0, args) || getSourceKey(args === null || args === void 0 ? void 0 : args[0], args === null || args === void 0 ? void 0 : args[1]);
 });
-instance.t = originalT;
+instance.t = t;
 
 export default instance;

package/dist/index.js

@@ -1,8 +1,8 @@
 export { d as authority } from './authority-7a91cb9f.js';
-export { d as dataModel } from './dataModel-b3629ef3.js';
+export { d as dataModel } from './dataModel-f1ef06bc.js';
 export { t as tools } from './tools-390e3466.js';
-export { v as validate } from './validate-21b58a69.js';
-export { r as request } from './request-d1972b41.js';
+export { v as validate } from './validate-ab47ebe9.js';
+export { r as request } from './request-d59904b9.js';
 export { r as reqUrl } from './reqUrl-ea7ef876.js';
 import './i18next.js';
 import './tslib.es6-35653116.js';

package/dist/{request-f600ad7a.js → request-d59904b9.js}

@@ -2498,7 +2498,7 @@ function loginRequest(params, InnerAuthorization) {
         baseURL: '',
         headers: {
             'Content-Type': 'application/x-www-form-urlencoded',
-            'Tenant-Id': '000000',
+            'Tenant-Id': localStorage.getItem('system-tenantId') || '000000',
             Authorization: InnerAuthorization ? InnerAuthorization : Authorization,
             'User-Type': 'web',
         },
@@ -2797,7 +2797,7 @@ function request(myOptions, jumpCallback, otherOptions) {
         // baseURL: ZT_API_BASEURL,
         headers: {
             'Zmdms-Auth': "bearer " + token,
-            'Tenant-Id': '000000',
+            // 'Tenant-Id': '000000',
             Authorization: InnerAuthorization ? InnerAuthorization : Authorization,
             // 设置语言包请求头
             'Zmdms-Lang': window.localStorage.getItem('languageType') || 'zh_CN',

package/dist/request.js

@@ -2,7 +2,7 @@ import './tslib.es6-35653116.js';
 import './i18next.js';
 import 'axios';
 import 'ztxkui';
-export { N as NEW_AUTHORIZATION, O as OLD_AUTHORIZATION, d as clearAutonomousCatch, b as clearCatch, c as clearNoCompleteRequest, a as default } from './request-d1972b41.js';
+export { N as NEW_AUTHORIZATION, O as OLD_AUTHORIZATION, d as clearAutonomousCatch, b as clearCatch, c as clearNoCompleteRequest, a as default } from './request-d59904b9.js';
 import './authority-7a91cb9f.js';
 import './crypto-c481f616.js';
 import 'crypto';

package/dist/validate.js

@@ -1,2 +1,2 @@
 import './i18next.js';
-export { c as commonMessage, b as validate, a as validatePassword } from './validate-21b58a69.js';
+export { c as commonMessage, b as validate, a as validatePassword } from './validate-ab47ebe9.js';

package/package.json

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

package/dist/dataModel-1fbaff40.js

@@ -1,24 +0,0 @@
-/**
- * @description 数据模型创建
- */
-function createSuccessModel(data, message) {
-    return {
-        data: data,
-        message: message || '数据请求成功',
-        success: true,
-    };
-}
-function createErrorModel(message) {
-    return {
-        message: message || '数据请求失败',
-        success: false,
-    };
-}
-
-var dataModel = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  createSuccessModel: createSuccessModel,
-  createErrorModel: createErrorModel
-});
-
-export { createErrorModel as a, createSuccessModel as c, dataModel as d };

package/dist/dataModel-914b6226.js

@@ -1,26 +0,0 @@
-import instance from './i18next.js';
-
-/**
- * @description 数据模型创建
- */
-function createSuccessModel(data, message) {
-    return {
-        data: data,
-        message: message || instance.t('数据请求成功'),
-        success: true,
-    };
-}
-function createErrorModel(message) {
-    return {
-        message: message || instance.t('数据请求失败'),
-        success: false,
-    };
-}
-
-var dataModel = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  createSuccessModel: createSuccessModel,
-  createErrorModel: createErrorModel
-});
-
-export { createErrorModel as a, createSuccessModel as c, dataModel as d };

package/dist/dataModel-b3629ef3.js

@@ -1,26 +0,0 @@
-import instance from './i18next.js';
-
-/**
- * @description 数据模型创建
- */
-function createSuccessModel(data, message) {
-    return {
-        data: data,
-        message: message || instance.t('数据请求成功'),
-        success: true,
-    };
-}
-function createErrorModel(message) {
-    return {
-        message: message || instance.t('数据请求失败'),
-        success: false,
-    };
-}
-
-var dataModel = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  createSuccessModel: createSuccessModel,
-  createErrorModel: createErrorModel
-});
-
-export { createErrorModel as a, createSuccessModel as c, dataModel as d };

package/dist/reqUrl-22b880a4.js

@@ -1,82 +0,0 @@
-/**
- * @file 项目基本配置，包括各个环境的请求地址
- */
-// 环境变量
-function getReqUrl(processObj) {
-    var ENV = processObj.REACT_APP_ENV;
-    // api服务器各个环境地址
-    var ZT_API_DEV = processObj.REACT_APP_ZT_API_DEV || window.location.origin; // 开发环境
-    var ZT_API_TEST = processObj.REACT_APP_ZT_API_TEST || window.location.origin; // 测试环境 https://192.168.0.135:8000
-    var ZT_API_STAGE = processObj.REACT_APP_ZT_API_STAGE || window.location.origin; // 阶段性环境 http://192.168.0.134:8000
-    var ZT_API_SIM = processObj.REACT_APP_ZT_API_SIM || window.location.origin; // 阶段性环境 http://192.168.0.134:8000
-    var ZT_API_PRODUCT = processObj.REACT_APP_ZT_API_PRODUCT || window.location.origin; // 生产环境 http://dz.zmd.com.cn
-    var ZT_API_PUBLIC_PRODUCT = processObj.REACT_APP_ZT_API_PUBLIC_PRODUCT ||
-        'https://nportal.zmd.com.cn:18998'; // 生产环境外网api地址 https://m-portal.zmd.com.cn:18998 http://dz.zmd.com.cn:48000
-    // 文件服务器
-    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://172.55.5.101:33013'; // 测试环境 https://192.168.0.135:18012
-    var ZT_FILE_PREVIEW_STAGE = processObj.REACT_APP_ZT_FILE_PREVIEW_STAGE ||
-        'https://dzfile-prod.zmd.com.cn/'; // 阶段性环境 http://192.168.0.134:8012
-    var ZT_FILE_PREVIEW_SIM = processObj.REACT_APP_ZT_FILE_PREVIEW_SIM ||
-        'https://dzfile-data.zmd.com.cn/'; // 阶段性环境 http://192.168.0.134:8012
-    var ZT_FILE_PREVIEW_PRODUCT = processObj.REACT_APP_ZT_FILE_PREVIEW_PRODUCT ||
-        'https://dzfile.zmd.com.cn:8012'; // 生产环境
-    // 字体文件附件id
-    var ZT_FONTFAMILY_DEV = '1551733945007517697';
-    var ZT_FONTFAMILY_TEST = '1551836774183047169';
-    var ZT_FONTFAMILY_STAGE = '1551837561144905730';
-    var ZT_FONTFAMILY_SIM = '1562010976138207234';
-    var ZT_FONTFAMILY_PRODUCT = '1552851055372992513';
-    // 实际api请求地址
-    var ZT_API_BASEURL = ZT_API_DEV;
-    var ZT_API_PUBLICURL = ZT_API_PUBLIC_PRODUCT;
-    var ZT_FILE_BASEURL = ZT_FILE_PREVIEW_DEV;
-    var ZT_FONTFAMILY_BASEURL = ZT_FONTFAMILY_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;
-                ZT_FONTFAMILY_BASEURL = ZT_FONTFAMILY_DEV;
-                break;
-            case 'zt-test':
-                ZT_API_BASEURL = ZT_API_TEST;
-                ZT_API_PUBLICURL = ZT_API_TEST;
-                ZT_FILE_BASEURL = ZT_FILE_PREVIEW_TEST;
-                ZT_FONTFAMILY_BASEURL = ZT_FONTFAMILY_TEST;
-                break;
-            case 'zt-stage':
-                ZT_API_BASEURL = ZT_API_STAGE;
-                ZT_API_PUBLICURL = ZT_API_STAGE;
-                ZT_FILE_BASEURL = ZT_FILE_PREVIEW_STAGE;
-                ZT_FONTFAMILY_BASEURL = ZT_FONTFAMILY_STAGE;
-                break;
-            case 'zt-sim':
-                ZT_API_BASEURL = ZT_API_SIM;
-                ZT_API_PUBLICURL = ZT_API_SIM;
-                ZT_FILE_BASEURL = ZT_FILE_PREVIEW_SIM;
-                ZT_FONTFAMILY_BASEURL = ZT_FONTFAMILY_SIM;
-                break;
-            case 'zt-product':
-                ZT_API_BASEURL = ZT_API_PRODUCT;
-                ZT_API_PUBLICURL = ZT_API_PUBLIC_PRODUCT;
-                ZT_FILE_BASEURL = ZT_FILE_PREVIEW_PRODUCT;
-                ZT_FONTFAMILY_BASEURL = ZT_FONTFAMILY_PRODUCT;
-                break;
-        }
-    }
-    return {
-        ZT_API_BASEURL: ZT_API_BASEURL,
-        ZT_FILE_BASEURL: ZT_FILE_BASEURL,
-        ZT_API_PUBLICURL: ZT_API_PUBLICURL,
-        ZT_FONTFAMILY_BASEURL: ZT_FONTFAMILY_BASEURL,
-    };
-}
-
-var reqUrl = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  getReqUrl: getReqUrl
-});
-
-export { getReqUrl as g, reqUrl as r };