dlt-for-react 2.0.3 → 2.0.5

package/README.md

@@ -8,7 +8,7 @@ npm publish
 
 ## 前端 dlt-for-react 依赖包版本更新记录
 
-##### 当前最新版本：2.0.3
+##### 当前最新版本：2.0.5
 
 ##### 安装依赖
 
@@ -16,11 +16,18 @@ npm publish
 
 ##### 版本修改记录
 
+#### V2.0.5—2024 年 3 月 27 日
+
+1. 优化 NHFetch 逻辑解决超时异常处理问题
+2. 新增 getExpiresIn：计算登录后操作时间是否过期
+3. 优化 getDifferDate：获取两个日期的相差秒数
+
 #### V2.0.3—2024 年 3 月 15 日
 
 1. 解决部分组件幻影依赖不存在的问题
 2. 解决全局样式影响项目地样式问题
 3. 解决部分样式被调用时不生效的问题
+4. 解决 HqSelect 引入方式不正确的问题
 
 #### V1.1.16~V2.0.1—2024 年 3 月 14 日
 

package/lib/components/HqInputPicker/setting-multiSelect.js

@@ -94,6 +94,8 @@ var _inputConst = require("./input-const");
 
 var _HqSelect = require("../HqSelect");
 
+var _HqSelect2 = _interopRequireDefault(_HqSelect);
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 var RadioGroup = _radio2.default.Group;
@@ -433,7 +435,7 @@ var SettingMultiSelect = function (_React$Component) {
           _react2.default.createElement(
             _col2.default,
             { span: 18 },
-            showSelectFlag && _react2.default.createElement(_HqSelect.HqSelect, {
+            showSelectFlag && _react2.default.createElement(_HqSelect2.default, {
               style: { marginLeft: 6, width: "200px" },
               onChange: this.selectChange,
               value: baseUrl,

package/lib/components/HqInputPicker/setting-nhcascader.js

@@ -94,6 +94,8 @@ var _inputConst = require("./input-const");
 
 var _HqSelect = require("../HqSelect");
 
+var _HqSelect2 = _interopRequireDefault(_HqSelect);
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 var RadioGroup = _radio2.default.Group;
@@ -459,7 +461,7 @@ var SettingNHCascader = function (_React$Component) {
           _react2.default.createElement(
             _col2.default,
             { span: 18 },
-            showSelectFlag && _react2.default.createElement(_HqSelect.HqSelect, {
+            showSelectFlag && _react2.default.createElement(_HqSelect2.default, {
               style: { marginLeft: 6, width: "200px" },
               onChange: this.selectChange,
               value: baseUrl,

package/lib/components/HqInputPicker/setting-select.js

@@ -94,6 +94,8 @@ var _inputConst = require("./input-const");
 
 var _HqSelect = require("../HqSelect");
 
+var _HqSelect2 = _interopRequireDefault(_HqSelect);
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 var RadioGroup = _radio2.default.Group;
@@ -434,7 +436,7 @@ var SettingSelect = function (_React$Component) {
           _react2.default.createElement(
             _col2.default,
             { span: 18 },
-            showSelectFlag && _react2.default.createElement(_HqSelect.HqSelect, {
+            showSelectFlag && _react2.default.createElement(_HqSelect2.default, {
               style: { marginLeft: 6, width: "200px" },
               dropdownMatchSelectWidth: false,
               onChange: this.selectChange,

package/lib/components/HqInputPicker/setting-stu-selector.js

@@ -94,6 +94,8 @@ var _inputConst = require("./input-const");
 
 var _HqSelect = require("../HqSelect");
 
+var _HqSelect2 = _interopRequireDefault(_HqSelect);
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 var RadioGroup = _radio2.default.Group;
@@ -434,7 +436,7 @@ var SettingStuSelector = function (_React$Component) {
           _react2.default.createElement(
             _col2.default,
             { span: 18 },
-            showSelectFlag && _react2.default.createElement(_HqSelect.HqSelect, {
+            showSelectFlag && _react2.default.createElement(_HqSelect2.default, {
               style: { marginLeft: 6, width: "200px" },
               dropdownMatchSelectWidth: false,
               onChange: this.selectChange,

package/lib/components/HqInputPicker/setting-tea-selector.js

@@ -94,6 +94,8 @@ var _inputConst = require("./input-const");
 
 var _HqSelect = require("../HqSelect");
 
+var _HqSelect2 = _interopRequireDefault(_HqSelect);
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 var RadioGroup = _radio2.default.Group;
@@ -434,7 +436,7 @@ var SettingTeaSelector = function (_React$Component) {
           _react2.default.createElement(
             _col2.default,
             { span: 18 },
-            showSelectFlag && _react2.default.createElement(_HqSelect.HqSelect, {
+            showSelectFlag && _react2.default.createElement(_HqSelect2.default, {
               style: { marginLeft: 6, width: "200px" },
               dropdownMatchSelectWidth: false,
               onChange: this.selectChange,

package/lib/components/KyEditableTable/component.js

@@ -59,6 +59,8 @@ var _react2 = _interopRequireDefault(_react);
 
 var _HqSelect = require("../HqSelect");
 
+var _HqSelect2 = _interopRequireDefault(_HqSelect);
+
 var _debounce = require("lodash/debounce");
 
 var _debounce2 = _interopRequireDefault(_debounce);
@@ -186,7 +188,7 @@ var SwitchComponents = exports.SwitchComponents = function SwitchComponents(type
       // </Select>
       ;
     case "nh-select":
-      return _react2.default.createElement(_HqSelect.HqSelect, (0, _extends3.default)({
+      return _react2.default.createElement(_HqSelect2.default, (0, _extends3.default)({
         style: { width: "100%" }
       }, config, {
         onChange: function onChange(value) {

package/lib/index.js

@@ -969,12 +969,30 @@ Object.defineProperty(exports, "userLogout", {
     return _login.userLogout;
   }
 });
+Object.defineProperty(exports, "refreshToken", {
+  enumerable: true,
+  get: function get() {
+    return _login.refreshToken;
+  }
+});
 Object.defineProperty(exports, "tryLoginUserInfo", {
   enumerable: true,
   get: function get() {
     return _login.tryLoginUserInfo;
   }
 });
+Object.defineProperty(exports, "getDifferDate", {
+  enumerable: true,
+  get: function get() {
+    return _login.getDifferDate;
+  }
+});
+Object.defineProperty(exports, "getExpiresIn", {
+  enumerable: true,
+  get: function get() {
+    return _login.getExpiresIn;
+  }
+});
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 

package/lib/layouts/Login/login.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getRouterAfterLogin = exports.saveRouterAfterLogin = exports.tryAllConfigInfo = exports.tryLoginUserInfo = exports.getDifferDate = exports.refreshToken = exports.userLogout = exports.userLogin = undefined;
+exports.getRouterAfterLogin = exports.saveRouterAfterLogin = exports.tryAllConfigInfo = exports.tryLoginUserInfo = exports.getExpiresIn = exports.getDifferDate = exports.refreshToken = exports.userLogout = exports.userLogin = undefined;
 
 var _typeof2 = require("babel-runtime/helpers/typeof");
 
@@ -260,15 +260,32 @@ var refreshToken = exports.refreshToken = function refreshToken(_refreshToken, c
 
 //获取两个日期的相差秒数
 var getDifferDate = exports.getDifferDate = function getDifferDate(firstDate, secondDate) {
-  //1) 将两个日期字符串转化为日期对象
-  var startDate = new Date(firstDate);
-  var endDate = new Date(secondDate);
+  //1) 将两个日期转化为时间戳
+  var startDate = (0, _moment2.default)(firstDate).valueOf();
+  var endDate = (0, _moment2.default)(secondDate).valueOf();
   //2) 计算两个日期相差的毫秒数
-  var msecNum = endDate.getTime() - startDate.getTime();
-  //3) 计算两个日期相差的天数
+  var msecNum = endDate - startDate;
+  //3) 计算两个日期相差的秒数
   return Math.floor(msecNum / parseFloat(1000));
 };
 
+/*******
+ * @description: 计算登录后操作时间是否过期
+ * @author: 琴时
+ * @param {*} expiresIn [过期时间:秒数]
+ * @return {*} [过期：true,正常：false]
+ */
+var getExpiresIn = exports.getExpiresIn = function getExpiresIn() {
+  var expiresIn = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 1800;
+
+  //用户最后一次操作时间
+  var userLastOperationTime = sessionStorage.getItem("user_last_operation_time");
+  if (!userLastOperationTime) return true;
+  var nowDate = new Date();
+  var differDate = getDifferDate(userLastOperationTime, nowDate);
+  return differDate > expiresIn;
+};
+
 /**
  * 获取已经登录的用户信息
  * @param func

package/lib/utils/NHFetch.js

@@ -189,6 +189,7 @@ var userLogout = exports.userLogout = function userLogout() {
       sessionStorage.removeItem("userLogin");
       sessionStorage.removeItem("access_token");
       sessionStorage.removeItem("refresh_token");
+      sessionStorage.removeItem("xtParams");
       sessionStorage.removeItem("user_last_operation_time");
       if (window.casStatus && window.casLogoutUrl && window.casLogoutUrl != "") {
         window.location = window.casLogoutUrl;
@@ -210,12 +211,12 @@ var userLogout = exports.userLogout = function userLogout() {
 
 //获取两个日期的相差秒数
 var getDifferDate = exports.getDifferDate = function getDifferDate(firstDate, secondDate) {
-  //1) 将两个日期字符串转化为日期对象
-  var startDate = new Date(firstDate);
-  var endDate = new Date(secondDate);
+  //1) 将两个日期转化为时间戳
+  var startDate = (0, _moment2.default)(firstDate).valueOf();
+  var endDate = (0, _moment2.default)(secondDate).valueOf();
   //2) 计算两个日期相差的毫秒数
-  var msecNum = endDate.getTime() - startDate.getTime();
-  //3) 计算两个日期相差的天数
+  var msecNum = endDate - startDate;
+  //3) 计算两个日期相差的秒数
   return Math.floor(msecNum / parseFloat(1000));
 };
 
@@ -281,7 +282,7 @@ var NHFetch = function NHFetch(pUrl, pMethod, params, errorFunc) {
     }
   }
   opts.method = method;
-  //  credentials: 'include',
+  opts.credentials = "include";
   opts.headers = { "Content-Type": tmpHeader };
   if (params && params.constructor === FormData) {
     // 解决头像上传问题
@@ -307,88 +308,86 @@ var NHFetch = function NHFetch(pUrl, pMethod, params, errorFunc) {
     opts.headers.loginUserId = (0, _NHCore.getLoginUser)().userId;
   }
 
-  opts.credentials = "include";
   return fetch(url, opts).then(function (response) {
-    if (response.status === 200) {
-      if (pMethod === "nbpost" || pMethod === "NBPOST") {
-        return response.blob();
-      } else {
-        if (window.gateway_version === "2") {
-          //新网关
+    try {
+      if (response.status === 200) {
+        if (pMethod === "nbpost" || pMethod === "NBPOST") {
+          return response.blob();
+        } else {
           sessionStorage.removeItem("user_last_operation_time");
           //记录用户最后一次操作时间
           var userLastOperationTime = (0, _moment2.default)().format("YYYY-MM-DD HH:mm:ss");
           sessionStorage.setItem("user_last_operation_time", userLastOperationTime);
+          return response.json();
         }
-        return response.json();
-      }
-    } else if (response.status === 302) {
-      if (window.gateway_version === "2") {
-        //新网关
-        var userLogin = sessionStorage.getItem("userLogin") ? JSON.parse(sessionStorage.getItem("userLogin")) : {};
-        var _token = sessionStorage.getItem("refresh_token");
-        var _userLastOperationTime = sessionStorage.getItem("user_last_operation_time");
-        var expiresIn = userLogin.expiresIn || 1800;
-        var userLastOperationTimeStr = _userLastOperationTime.replace("/-/g", "/");
-        //用户最后一次操作时间
-        var userLastOperationTimeDate = new Date(userLastOperationTimeStr);
-        //当前时间
-        var nowDate = new Date();
-        //在token超时阈值范围内用户没有任何操作，则直接退出登录，重新登录
-        var differDate = getDifferDate(userLastOperationTimeDate, nowDate);
-        if (differDate >= expiresIn) {
-          userLogout();
+      } else if (response.status === 302) {
+        if (window.gateway_version === "2") {
+          //新网关
+          var userLogin = sessionStorage.getItem("userLogin") ? JSON.parse(sessionStorage.getItem("userLogin")) : {};
+          var _token = sessionStorage.getItem("refresh_token");
+          var _userLastOperationTime = sessionStorage.getItem("user_last_operation_time");
+          var expiresIn = userLogin.expiresIn || 1800;
+          var userLastOperationTimeStr = _userLastOperationTime.replace("/-/g", "/");
+          //用户最后一次操作时间
+          var userLastOperationTimeDate = new Date(userLastOperationTimeStr);
+          //当前时间
+          var nowDate = new Date();
+          //在token超时阈值范围内用户没有任何操作，则直接退出登录，重新登录
+          var differDate = getDifferDate(userLastOperationTimeDate, nowDate);
+          if (differDate >= expiresIn) {
+            userLogout();
+          } else {
+            //在token超时阈值范围内用户有操作，则重新生成accessToken
+            refreshToken(_token, function (newAccessToken) {
+              sessionStorage.removeItem("access_token");
+              sessionStorage.setItem("access_token", newAccessToken);
+              var userLastOperationTime = (0, _moment2.default)().format("YYYY-MM-DD HH:mm:ss");
+              sessionStorage.setItem("user_last_operation_time", userLastOperationTime);
+            });
+          }
         } else {
-          //在token超时阈值范围内用户有操作，则重新生成accessToken
-          refreshToken(_token, function (newAccessToken) {
-            sessionStorage.removeItem("access_token");
-            sessionStorage.setItem("access_token", newAccessToken);
-            var userLastOperationTime = (0, _moment2.default)().format("YYYY-MM-DD HH:mm:ss");
-            sessionStorage.setItem("user_last_operation_time", userLastOperationTime);
-          });
+          _message3.default.error("未登录或登录已过期,请刷新页面重新登录！");
+          sessionStorage.removeItem("userLogin");
+          sessionStorage.removeItem("access_token");
         }
+      } else if (response.status === 401) {
+        _message3.default.warning("您正在尝试访问未授权的功能!");
+      } else if (response.status === 504) {
+        // 网关请求超时
+        return;
       } else {
-        _message3.default.error("未登录或登录已过期,请刷新页面重新登录！");
-        sessionStorage.removeItem("userLogin");
-        sessionStorage.removeItem("access_token");
-      }
-    } else if (response.status === 401) {
-      _message3.default.warning("您正在尝试访问未授权的功能!");
-    } else {
-      //如果存在错误的回调方法，则调用回调方法，否则提示网络请求异常
-      if (errorFunc) {
-        errorFunc();
+        //如果存在错误的回调方法，则调用回调方法，否则提示网络请求异常
+        errorFunc && errorFunc();
       }
-    }
-    try {
       return response.json();
-    } catch (e) {
-      console.log(e);
-      return undefined;
+    } catch (error) {
+      console.log("请求异常1:", error.message);
+      return;
     }
   }).then(function (res) {
-    if (res === undefined) {
+    var _ref = res || {},
+        _ref$meta = _ref.meta,
+        meta = _ref$meta === undefined ? {} : _ref$meta;
+
+    if (res === undefined || res.status === 404) {
       _message3.default.error("系统出现异常，请联系管理员！");
-      return undefined;
-    } else if (res.meta && res.meta.statusCode === 401 || res.code === 302) {
+      return;
+    } else if (meta.statusCode === 401 || res.code === 302) {
       //判断是否没有权限
       _message3.default.warning("您正在尝试访问未授权的功能!");
-      return undefined;
-    } else if (res.meta && res.meta.statusCode === 500) {
+      return;
+    } else if (meta.statusCode === 500) {
       var msg = res.meta.message;
       if (null !== msg) {
         if (msg.startsWith("businessLogicError[")) {
           //自定义的提示（错误）
           _message3.default.error(msg.substring(19, msg.length - 1));
-          // Modal.error({ title: '错误提示', content: res.message.substring(19,res.message.length-1),});
         } else if (msg.startsWith("businessLogicWarm[")) {
           //自定义的提示（警告）
           _message3.default.warning(msg.substring(18, msg.length - 1));
-          // Modal.warning({ title: '警告提示', content: res.message.substring(18,res.message.length-1),});
         } else if (msg.startsWith("businessLogicInfo[")) {
           //自定义的提示（消息）
           _message3.default.info(msg.substring(18, msg.length - 1));
-          // Modal.info({ title: '消息提示', content: res.message.substring(18,res.message.length-1),});
         } else if (msg.startsWith("onlyDataError[")) {
           //数据唯一性异常
           onlyDataErrorTip(res.meta);
@@ -404,9 +403,14 @@ var NHFetch = function NHFetch(pUrl, pMethod, params, errorFunc) {
       } else {
         _message3.default.error("系统出现异常，请联系管理员！");
       }
-      // Modal.error({ title: '错误提示', content:'系统出现异常，请联系管理员！'});
       return undefined;
-    } else if (res && res.code && res.code !== 200) {
+    } else if (meta.statusCode === 200 || meta.statusCode === 302) {
+      //返回的是正确的结果【四部返回格式】
+      return res;
+    } else if (res.code && res.code === 200) {
+      //返回的是正确的结果【公司通用返回格式】
+      return res;
+    } else if (res.code && res.code !== 200) {
       //判断出现的问题
       var _msg = res.message;
       if (!_msg) {
@@ -414,15 +418,12 @@ var NHFetch = function NHFetch(pUrl, pMethod, params, errorFunc) {
       } else if (_msg.startsWith("businessLogicError[")) {
         //自定义的提示（错误）
         _message3.default.error(_msg.substring(19, _msg.length - 1));
-        // Modal.error({ title: '错误提示', content: msg.substring(19,msg.length-1),});
       } else if (_msg.startsWith("businessLogicWarm[")) {
         //自定义的提示（警告）
         _message3.default.warning(_msg.substring(18, _msg.length - 1));
-        // Modal.warning({ title: '警告提示', content: msg.substring(18,msg.length-1),});
       } else if (_msg.startsWith("businessLogicInfo[")) {
         //自定义的提示（消息）
         _message3.default.info(_msg.substring(18, _msg.length - 1));
-        // Modal.info({ title: '消息提示', content: msg.substring(18,msg.length-1),});
       } else if (_msg.startsWith("onlyDataError[")) {
         //数据唯一性异常
         onlyDataErrorTip(res);
@@ -436,28 +437,16 @@ var NHFetch = function NHFetch(pUrl, pMethod, params, errorFunc) {
         _message3.default.warn("\u53C2\u6570\u6709\u8BEF\uFF1A" + res.message);
       } else {
         _message3.default.error("系统出现异常，请联系管理员！");
-        // Modal.error({ title: '错误提示', content:'系统出现异常，请联系管理员！'});
       }
       return undefined;
-    } else if (res.status && res.status === 404) {
-      _message3.default.error("系统出现异常，请联系管理员！");
-      // Modal.error({ title: '错误提示', content:'系统出现异常，请联系管理员！'});
-      return undefined;
-    } else if (res && res.code && res.code === 200) {
-      //返回的是正确的结果,公司通用放回格式
-      return res;
-    } else if (res && res.meta && (res.meta.statusCode === 200 || res.meta.statusCode === 302)) {
-      //返回的是正确的结果，四部返回格式
-      return res;
     } else {
       //剩下的情况都是有错误
       _message3.default.error("系统出现异常，请联系管理员！");
-      // Modal.error({ title: '错误提示', content:'系统出现异常，请联系管理员！'});
     }
     //在此处统一对后台抛出来的异常进行处理
-    return undefined;
+    return;
   }).catch(function (error) {
-    console.log("请求异常:", error.message);
+    console.log("请求异常2:", error.message);
     _message3.default.error("系统出现异常，请联系管理员！");
     return;
   });

package/package.json

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