dlt-for-react 2.0.11 → 2.0.12

package/README.md

@@ -8,7 +8,7 @@ npm publish
 
 ## 前端 dlt-for-react 依赖包版本更新记录
 
-##### 当前最新版本：2.0.11
+##### 当前最新版本：2.0.12
 
 ##### 安装依赖
 
@@ -16,6 +16,10 @@ npm publish
 
 ##### 版本修改记录
 
+#### V2.0.12—2024 年 4 月 22 日
+
+1. 新增 getRedirect、setRedirect 添加|获取重定向地址
+
 #### V2.0.11—2024 年 4 月 15 日
 
 1. 新增 store 缓存方式

package/lib/index.js

@@ -1011,6 +1011,18 @@ Object.defineProperty(exports, "getExpiresIn", {
     return _login.getExpiresIn;
   }
 });
+Object.defineProperty(exports, "getRedirect", {
+  enumerable: true,
+  get: function get() {
+    return _login.getRedirect;
+  }
+});
+Object.defineProperty(exports, "setRedirect", {
+  enumerable: true,
+  get: function get() {
+    return _login.setRedirect;
+  }
+});
 
 var _store = require("./utils/store.js");
 

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.getExpiresIn = exports.getDifferDate = exports.refreshToken = exports.userLogout = exports.userLogin = undefined;
+exports.getRedirect = exports.setRedirect = exports.tryAllConfigInfo = exports.tryLoginUserInfo = exports.getExpiresIn = exports.getDifferDate = exports.refreshToken = exports.userLogout = exports.userLogin = undefined;
 
 var _typeof2 = require("babel-runtime/helpers/typeof");
 
@@ -116,7 +116,7 @@ var userLogin = exports.userLogin = function userLogin(allMenu, params, func) {
               } else if (res.data.menus[0].children && res.data.menus[0].children.length > 0 && res.data.menus[0].children[0].children && res.data.menus[0].children[0].children.length > 0) {
                 nextUrl = res.data.menus[0].children[0].children[0].url;
               }
-              var routerAfterLogin = getRouterAfterLogin();
+              var routerAfterLogin = getRedirect();
               if (routerAfterLogin) {
                 //如果系统设置了登录后的首页 跳转到该路由
                 nextUrl = routerAfterLogin;
@@ -142,7 +142,7 @@ var userLogin = exports.userLogin = function userLogin(allMenu, params, func) {
             } else if (res.data.menus[0].children && res.data.menus[0].children.length > 0 && res.data.menus[0].children[0].children && res.data.menus[0].children[0].children.length > 0) {
               nextUrl = res.data.menus[0].children[0].children[0].url;
             }
-            var routerAfterLogin = getRouterAfterLogin();
+            var routerAfterLogin = getRedirect();
             if (routerAfterLogin) {
               //如果系统设置了登录后的首页 跳转到该路由
               nextUrl = routerAfterLogin;
@@ -189,7 +189,7 @@ var userLogin = exports.userLogin = function userLogin(allMenu, params, func) {
 };
 
 var userLogout = exports.userLogout = function userLogout() {
-  saveRouterAfterLogin("add");
+  setRedirect("add");
   fetch("logout", {
     method: "GET",
     credentials: "include",
@@ -546,7 +546,7 @@ var sso = function sso(func, allMenu, notConf) {
                     } else if (res.data.menus[0].children && res.data.menus[0].children[0].children && res.data.menus[0].children[0].children.length > 0) {
                       nextUrl = res.data.menus[0].children[0].children[0].url;
                     }
-                    var routerAfterLogin = getRouterAfterLogin();
+                    var routerAfterLogin = getRedirect();
                     if (routerAfterLogin) {
                       //如果系统设置了登录后的首页 跳转到该路由
                       nextUrl = routerAfterLogin;
@@ -632,30 +632,38 @@ var filterAuthMenus = function filterAuthMenus(menus, auths) {
   return fitlerMenus;
 };
 
-// 保存登录后要跳转的页面(userid+页面地址，未登录前只取页面地址)
-var saveRouterAfterLogin = exports.saveRouterAfterLogin = function saveRouterAfterLogin(action, value) {
+/*******
+ * @description: 缓存重定向地址：userid+页面地址，未登录前只取页面地址
+ * @author: 琴时
+ * @param {*} action add:添加、remove:移除
+ * @param {*} value
+ * @return {*}
+ */
+var setRedirect = exports.setRedirect = function setRedirect() {
+  var action = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "add";
+  var value = arguments[1];
+
   var userId = (0, _index.getLoginUser)().userId;
   var projectName = window.location.host + window.location.pathname; // 区分同源项目
-  projectName = userId ? escape(userId + "-" + projectName) : escape(projectName); // 区分同项目不同用户
-  var oldData = sessionStorage.getItem("routerAfterLogin") ? JSON.parse(sessionStorage.getItem("routerAfterLogin")) : {};
+  projectName = userId ? encodeURIComponent(userId + "-" + projectName) : encodeURIComponent(projectName); // 区分同项目不同用户
+  var oldData = session.get("routerAfterLogin", {});
   var currentUrl = value || location.hash.split("#")[1];
   var routerAfterLogin = (0, _extends4.default)({}, oldData);
   if (action === "add") {
-    routerAfterLogin = (0, _extends4.default)({}, routerAfterLogin, (0, _defineProperty3.default)({}, projectName, escape(currentUrl)));
+    routerAfterLogin = (0, _extends4.default)({}, routerAfterLogin, (0, _defineProperty3.default)({}, projectName, encodeURIComponent(currentUrl)));
   } else if (action === "remove") {
     delete routerAfterLogin[projectName];
   }
-  sessionStorage.setItem("routerAfterLogin", (0, _stringify2.default)(routerAfterLogin));
+  session.set("routerAfterLogin", routerAfterLogin);
 };
-// 获取登录后要跳转的页面
-var getRouterAfterLogin = exports.getRouterAfterLogin = function getRouterAfterLogin(field) {
+// 获取重定向缓存地址
+var getRedirect = exports.getRedirect = function getRedirect(key) {
   var userId = (0, _index.getLoginUser)().userId;
   var projectName = window.location.host + window.location.pathname;
-  var name = userId ? escape(userId + "-" + projectName) : escape(projectName);
-  var routerAfterLogin = sessionStorage.getItem("routerAfterLogin") ? JSON.parse(sessionStorage.getItem("routerAfterLogin")) : {};
-  var url = field ? routerAfterLogin[field] : routerAfterLogin[name] || routerAfterLogin[escape(projectName)];
-  url = url ? unescape(url) : url;
-  return url;
+  var name = userId ? encodeURIComponent(userId + "-" + projectName) : encodeURIComponent(projectName);
+  var routerAfterLogin = session.get("routerAfterLogin", {});
+  var url = key ? routerAfterLogin[key] : routerAfterLogin[name] || routerAfterLogin[encodeURIComponent(projectName)];
+  return url ? decodeURIComponent(url) : url;
 };
 
 var deepCopy = function deepCopy(obj) {

package/lib/routes/AuthorizedRoute.js

@@ -201,7 +201,7 @@ var AuthorizedRoute = function (_React$Component) {
             } else if (menus[0].children && menus[0].children.length > 0 && menu[0] && menus[0].children[0].children && menus[0].children[0].children.length > 0) {
               nextUrl = menus[0].children[0].children[0].url;
             }
-            var routerAfterLogin = (0, _login.getRouterAfterLogin)();
+            var routerAfterLogin = (0, _login.getRedirect)();
             if (routerAfterLogin) {
               //如果系统设置了登录后的首页 跳转到该路由
               nextUrl = routerAfterLogin;

package/package.json

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