dlt-for-react 1.0.9 → 1.0.11

package/lib/utils/NHCore.js

@@ -208,7 +208,7 @@ var getOffset = exports.getOffset = function getOffset(ele) {
 
 var validateCode = exports.validateCode = function () {
   var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(rule, value, callback) {
-    var specialCharPattern, res, data, text, reg;
+    var specialCharPattern, baseUrl, res, data, text, reg;
     return _regenerator2.default.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
@@ -218,14 +218,17 @@ var validateCode = exports.validateCode = function () {
             // 第一次为调用接口，之后有缓存则使用缓存
 
             if (specialCharPattern.apiUsed) {
-              _context.next = 7;
+              _context.next = 8;
               break;
             }
 
-            _context.next = 5;
-            return NHFetch('api/zhxg-xtgl/openapi/getCsszByCsbz', 'GET', { csbz: 'XTGL_TSZF' });
+            baseUrl = window.xtglUrl || 'api/hq-xtgl';
+            _context.next = 6;
+            return NHFetch(baseUrl + '/openapi/getCsszByCsbz', 'GET', {
+              csbz: 'XTGL_TSZF'
+            });
 
-          case 5:
+          case 6:
             res = _context.sent;
 
             if (res && res.data) {
@@ -233,10 +236,14 @@ var validateCode = exports.validateCode = function () {
 
               specialCharPattern.pattern = data.pattern;
               specialCharPattern.open = data.open;
-              sessionStorage.setItem('specialCharPattern', (0, _stringify2.default)({ pattern: data.pattern, open: data.open, apiUsed: true }));
+              sessionStorage.setItem('specialCharPattern', (0, _stringify2.default)({
+                pattern: data.pattern,
+                open: data.open,
+                apiUsed: true
+              }));
             }
 
-          case 7:
+          case 8:
 
             // // 不开启,直接通过
             // if(!specialCharPattern.open ) {
@@ -252,22 +259,22 @@ var validateCode = exports.validateCode = function () {
             } else {
               callback();
             }
-            _context.next = 16;
+            _context.next = 17;
             break;
 
-          case 12:
-            _context.prev = 12;
+          case 13:
+            _context.prev = 13;
             _context.t0 = _context['catch'](0);
 
             console.log('配置的正则表达式有误，请联系管理员！');
             callback();
 
-          case 16:
+          case 17:
           case 'end':
             return _context.stop();
         }
       }
-    }, _callee, undefined, [[0, 12]]);
+    }, _callee, undefined, [[0, 13]]);
   }));
 
   return function validateCode(_x3, _x4, _x5) {

package/lib/utils/NHFetch.js

@@ -154,7 +154,7 @@ var refreshToken = exports.refreshToken = function refreshToken(_refreshToken, c
     headers: {
       'Content-Type': 'application/x-www-form-urlencoded',
       'X-Requested-With': 'XMLHttpRequest',
-      appId: 'ly-zhxg'
+      appId: 'ly-hq'
     }
   }).then(function (response) {
     return response.json();
@@ -273,10 +273,10 @@ var NHFetch = function NHFetch(pUrl, pMethod, params, errorFunc) {
   }
   opts.method = method;
   //  credentials: 'include',
-  opts.headers = { 'Content-Type': tmpHeader };
+  opts.headers = { 'Content-Type': tmpHeader
 
-  //设置网关加密串
-  var timestemp = new Date().valueOf();
+    //设置网关加密串
+  };var timestemp = new Date().valueOf();
   var csrfToken = (0, _MD.hex_md5)('timestamp=' + timestemp + ',key=' + 'lianyi2019' //这个就是与网关约定的秘钥
   );
   if (url.indexOf('?') > -1 && url.indexOf('=') > -1 && url.indexOf('?') < url.indexOf('=')) {

package/lib/utils/index.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.randomNumEnum = exports.getStyle = exports.getValueFromArray = exports.getLabelValueTree = exports.createUuid = exports.createScript = exports.getBase64 = exports.compatibleAnimationFrame = exports.cutArray = exports.arrayMove = exports.arrayMoveMutate = exports.checkPassword = exports.matchParamsPath = exports.urlToList = exports.getHashParam = exports.isUrl = exports.getRouterAuthority = exports.transformDate = exports.getStrLength = exports.DateUtil = exports._utf8_encode = exports.encode = exports.decode = exports.getSize = exports.getOffset = undefined;
+exports.isWeiXn = exports.isIOS = exports.isAndroid = exports.isMobile = exports.randomNumEnum = exports.getStyle = exports.getValueFromArray = exports.getLabelValueTree = exports.createUuid = exports.createScript = exports.getBase64 = exports.compatibleAnimationFrame = exports.cutArray = exports.arrayMove = exports.arrayMoveMutate = exports.checkPassword = exports.matchParamsPath = exports.urlToList = exports.getHashParam = exports.isUrl = exports.getRouterAuthority = exports.transformDate = exports.getStrLength = exports.DateUtil = exports._utf8_encode = exports.encode = exports.decode = exports.getSize = exports.getOffset = undefined;
 
 var _stringify = require('babel-runtime/core-js/json/stringify');
 
@@ -212,14 +212,13 @@ var DateUtil = exports.DateUtil = {
     var second = now.getSeconds() >= 10 ? now.getSeconds() : '0' + now.getSeconds();
     return year + '-' + month + '-' + date + ' ' + hour + ':' + minute + ':' + second;
   }
-};
 
-/**
- * GBK字符集实际长度计算
- * @param {*} str
- * @returns
- */
-var getStrLength = exports.getStrLength = function getStrLength(str) {
+  /**
+   * GBK字符集实际长度计算
+   * @param {*} str
+   * @returns
+   */
+};var getStrLength = exports.getStrLength = function getStrLength(str) {
   var realLength = 0;
   var len = str.length;
   var charCode = -1;
@@ -804,4 +803,37 @@ var randomNumEnum = exports.randomNumEnum = function randomNumEnum(array, num) {
     shuffled[i] = temp;
   }
   return shuffled.slice(min);
+};
+
+/*******
+ * @description: 检测移动端-PC端
+ * @author: 琴时
+ * @param {*} [无]
+ * @return {*} [移动端:true - PC端:false]
+ */
+var ua = navigator.userAgent; // 获取设备信息
+var isMobile = exports.isMobile = function isMobile() {
+  return Boolean(ua.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i));
+};
+
+/*******
+ * @description: android终端-ios终端
+ * @author: 琴时
+ * @return {Boolean}
+ */
+var isAndroid = exports.isAndroid = function isAndroid() {
+  return ua.indexOf('Android') > -1 || ua.indexOf('Adr') > -1;
+};
+
+var isIOS = exports.isIOS = function isIOS() {
+  return Boolean(ua.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/));
+};
+
+/*******
+ * @description: 是否微信环境
+ * @author: 琴时
+ * @return {Boolean}
+ */
+var isWeiXn = exports.isWeiXn = function isWeiXn() {
+  return ua.toLowerCase().includes('micromessenger');
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dlt-for-react",
-  "version": "1.0.9",
+  "version": "1.0.11",
   "description": "dlt for react",
   "main": "lib/index.js",
   "scripts": {