feat: 🚀 钉钉跳转
This commit is contained in:
@@ -1,6 +1,16 @@
|
|||||||
export const usePathUrl = () => {
|
export const usePathUrl = (redirect_path?: any) => {
|
||||||
const PATH_URL = `${import.meta.env.VITE_APP_SSO_LOGINURL}?client_id=${
|
let PATH_URL: any = "";
|
||||||
|
if (redirect_path) {
|
||||||
|
PATH_URL = `${import.meta.env.VITE_APP_SSO_LOGINURL}?client_id=${
|
||||||
|
import.meta.env.VITE_APP_SSO_APPID
|
||||||
|
}&redirect_uri=${encodeURIComponent(
|
||||||
|
import.meta.env.VITE_REDIRECT_URL + "?redirect_path=" + redirect_path
|
||||||
|
)}&response_type=code`;
|
||||||
|
return PATH_URL;
|
||||||
|
} else {
|
||||||
|
PATH_URL = `${import.meta.env.VITE_APP_SSO_LOGINURL}?client_id=${
|
||||||
import.meta.env.VITE_APP_SSO_APPID
|
import.meta.env.VITE_APP_SSO_APPID
|
||||||
}&redirect_uri=${encodeURIComponent(import.meta.env.VITE_REDIRECT_URL)}&response_type=code`;
|
}&redirect_uri=${encodeURIComponent(import.meta.env.VITE_REDIRECT_URL)}&response_type=code`;
|
||||||
return PATH_URL;
|
return PATH_URL;
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -107,13 +107,12 @@ const tabClick = (tabItem: TabsPaneContext) => {
|
|||||||
|
|
||||||
// Remove Tab
|
// Remove Tab
|
||||||
const tabRemove = (fullPath: TabPaneName) => {
|
const tabRemove = (fullPath: TabPaneName) => {
|
||||||
if (fullPath === "/index") {
|
const name = tabStore.tabsMenuList.filter(item => item.path == fullPath)[0].name || "";
|
||||||
|
|
||||||
|
if (fullPath === "/index" || name === "home") {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// const name = tabStore.tabsMenuList.filter(item => item.path == fullPath)[0].name || "";
|
|
||||||
// keepAliveStore.removeKeepAliveName(name);
|
|
||||||
// tabStore.removeTabs(fullPath as string, fullPath == route.fullPath);
|
|
||||||
const name = tabStore.tabsMenuList.filter(item => item.path == fullPath)[0].name || "";
|
|
||||||
tabStore.removeTabs(fullPath as string, fullPath == route.fullPath);
|
tabStore.removeTabs(fullPath as string, fullPath == route.fullPath);
|
||||||
let isKeepAlive = tabStore.tabsMenuList.some((item: any) => {
|
let isKeepAlive = tabStore.tabsMenuList.some((item: any) => {
|
||||||
return item.name === name;
|
return item.name === name;
|
||||||
|
|||||||
@@ -29,6 +29,22 @@ const router = createRouter({
|
|||||||
scrollBehavior: () => ({ left: 0, top: 0 })
|
scrollBehavior: () => ({ left: 0, top: 0 })
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// 1. 定义获取URL参数的函数
|
||||||
|
function getUrlParam(paramName: any) {
|
||||||
|
// 获取当前页面URL的查询参数部分(如 "?redirect_path=xxx&t=xxx")
|
||||||
|
const searchStr = window.location.search.slice(1);
|
||||||
|
// 将参数按 "&" 分割成数组(如 ["redirect_path=xxx", "t=xxx"])
|
||||||
|
const paramArr = searchStr.split("&");
|
||||||
|
// 遍历数组匹配目标参数
|
||||||
|
for (let item of paramArr) {
|
||||||
|
const [key, value] = item.split("=");
|
||||||
|
if (key === paramName) {
|
||||||
|
return decodeURIComponent(value); // 解码特殊字符,确保内容准确
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return null; // 未找到参数时返回null
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @description 路由拦截 beforeEach
|
* @description 路由拦截 beforeEach
|
||||||
* */
|
* */
|
||||||
@@ -38,6 +54,7 @@ router.beforeEach(async (to, from, next) => {
|
|||||||
|
|
||||||
// 1.NProgress 开始
|
// 1.NProgress 开始
|
||||||
NProgress.start();
|
NProgress.start();
|
||||||
|
let redirect_path = getUrlParam("redirect_path");
|
||||||
|
|
||||||
// 2.动态设置标题
|
// 2.动态设置标题
|
||||||
const title = import.meta.env.VITE_GLOB_APP_TITLE;
|
const title = import.meta.env.VITE_GLOB_APP_TITLE;
|
||||||
@@ -51,6 +68,17 @@ router.beforeEach(async (to, from, next) => {
|
|||||||
|
|
||||||
// 4.判断访问页面是否在路由白名单地址(静态路由)中,如果存在直接放行
|
// 4.判断访问页面是否在路由白名单地址(静态路由)中,如果存在直接放行
|
||||||
if (ROUTER_WHITE_LIST.includes(to.path)) return next();
|
if (ROUTER_WHITE_LIST.includes(to.path)) return next();
|
||||||
|
// 4.判断访问页面是否在路由白名单地址(静态路由)中,如果存在直接放行
|
||||||
|
if (ROUTER_WHITE_LIST.includes(to.path)) return next();
|
||||||
|
|
||||||
|
// 如果没有token但是有订阅路由就将订阅路由当参数携带
|
||||||
|
if (!userStore.newUserToken && redirect_path) {
|
||||||
|
return next({
|
||||||
|
path: LOGIN_URL,
|
||||||
|
replace: true,
|
||||||
|
query: { redirect_path: redirect_path } // 通过query传递参数
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
// 5.判断是否有 Token,没有重定向到 login 页面
|
// 5.判断是否有 Token,没有重定向到 login 页面
|
||||||
if (!userStore.newUserToken) return next({ path: LOGIN_URL, replace: true });
|
if (!userStore.newUserToken) return next({ path: LOGIN_URL, replace: true });
|
||||||
|
|||||||
@@ -6,16 +6,46 @@ import piniaPersistConfig from "@/config/piniaPersist";
|
|||||||
export const useTabsStore = defineStore({
|
export const useTabsStore = defineStore({
|
||||||
id: "wms-tabs",
|
id: "wms-tabs",
|
||||||
state: (): TabsState => ({
|
state: (): TabsState => ({
|
||||||
tabsMenuList: []
|
tabsMenuList: [
|
||||||
|
{
|
||||||
|
icon: "", // 首页的icon,按实际路由meta.icon填写(如"Home")
|
||||||
|
title: "首页", // 固定首页标题
|
||||||
|
path: "/index", // 首页的基础路径(无参数版本,避免初始参数冗余)
|
||||||
|
name: "home", // 必须与首页路由的name一致(如路由定义中name: "home")
|
||||||
|
close: true // 首页是否可关闭,按业务需求设置(通常true,若禁止关闭设为false)
|
||||||
|
}
|
||||||
|
]
|
||||||
}),
|
}),
|
||||||
actions: {
|
actions: {
|
||||||
// Add Tabs
|
// Add Tabs:按 name 去重,首页始终在最前
|
||||||
async addTabs(tabItem: any) {
|
async addTabs(tabItem: any) {
|
||||||
if (this.tabsMenuList.every(item => item.path !== tabItem.path)) {
|
// 1. 校验参数:确保 tabItem 有 name(避免异常数据)
|
||||||
this.tabsMenuList.push(tabItem);
|
if (!tabItem.name) return;
|
||||||
|
|
||||||
|
// 2. 去重逻辑:按 name 判断是否已存在
|
||||||
|
const isExist = this.tabsMenuList.some(item => item.name === tabItem.name);
|
||||||
|
|
||||||
|
if (!isExist) {
|
||||||
|
// 3. 首页(name: "home")添加到数组开头,其他标签添加到末尾
|
||||||
|
if (tabItem.name === "home") {
|
||||||
|
// 先移除旧的首页(防止极端情况残留),再添加新首页到最前
|
||||||
|
this.tabsMenuList = this.tabsMenuList.filter(item => item.name !== "home");
|
||||||
|
this.tabsMenuList.unshift(tabItem); // 首页放第一位
|
||||||
|
} else {
|
||||||
|
this.tabsMenuList.push(tabItem); // 非首页放末尾
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// 4. 可选优化:若标签已存在,同步更新其 path(如首页参数变化时)
|
||||||
|
this.tabsMenuList = this.tabsMenuList.map(item => {
|
||||||
|
if (item.name === tabItem.name) {
|
||||||
|
return { ...item, path: tabItem.path }; // 仅更新 path,保留其他属性
|
||||||
|
}
|
||||||
|
return item;
|
||||||
|
});
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
// Remove Tabs
|
|
||||||
|
// Remove Tabs(原有逻辑不变,无需修改)
|
||||||
async removeTabs(tabPath: string, isCurrent: boolean = true) {
|
async removeTabs(tabPath: string, isCurrent: boolean = true) {
|
||||||
const tabsMenuList = this.tabsMenuList;
|
const tabsMenuList = this.tabsMenuList;
|
||||||
if (isCurrent) {
|
if (isCurrent) {
|
||||||
@@ -28,17 +58,36 @@ export const useTabsStore = defineStore({
|
|||||||
}
|
}
|
||||||
this.tabsMenuList = tabsMenuList.filter(item => item.path !== tabPath);
|
this.tabsMenuList = tabsMenuList.filter(item => item.path !== tabPath);
|
||||||
},
|
},
|
||||||
// Close MultipleTab
|
|
||||||
|
// Close MultipleTab(原有逻辑不变)
|
||||||
async closeMultipleTab(tabsMenuValue?: string) {
|
async closeMultipleTab(tabsMenuValue?: string) {
|
||||||
this.tabsMenuList = this.tabsMenuList.filter(item => {
|
this.tabsMenuList = this.tabsMenuList.filter(item => {
|
||||||
return item.path === tabsMenuValue || !item.close;
|
return item.path === tabsMenuValue || !item.close;
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
// Set Tabs
|
|
||||||
|
// Set Tabs(原有逻辑不变)
|
||||||
async setTabs(tabsMenuList: any[]) {
|
async setTabs(tabsMenuList: any[]) {
|
||||||
this.tabsMenuList = tabsMenuList;
|
// 补充:设置 tabs 时也需去重,避免批量设置时带入重复首页
|
||||||
|
const uniqueTabs = [];
|
||||||
|
const nameSet = new Set();
|
||||||
|
// 先处理首页,确保在最前
|
||||||
|
const homeTab = tabsMenuList.find(item => item.name === "home");
|
||||||
|
if (homeTab) {
|
||||||
|
uniqueTabs.push(homeTab);
|
||||||
|
nameSet.add("home");
|
||||||
|
}
|
||||||
|
// 再处理其他标签,去重
|
||||||
|
tabsMenuList.forEach(tab => {
|
||||||
|
if (!nameSet.has(tab.name)) {
|
||||||
|
nameSet.add(tab.name);
|
||||||
|
uniqueTabs.push(tab);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
this.tabsMenuList = uniqueTabs;
|
||||||
},
|
},
|
||||||
// Set Tabs Title
|
|
||||||
|
// Set Tabs Title(原有逻辑不变)
|
||||||
async setTabsTitle(title: string) {
|
async setTabsTitle(title: string) {
|
||||||
const nowFullPath = location.hash.substring(1);
|
const nowFullPath = location.hash.substring(1);
|
||||||
this.tabsMenuList.forEach(item => {
|
this.tabsMenuList.forEach(item => {
|
||||||
|
|||||||
@@ -7,10 +7,13 @@
|
|||||||
<script setup lang="ts" name="home">
|
<script setup lang="ts" name="home">
|
||||||
//登录请求接口
|
//登录请求接口
|
||||||
import { getOrgsApi, getWarehousesListApi } from "@/api/modules/global";
|
import { getOrgsApi, getWarehousesListApi } from "@/api/modules/global";
|
||||||
|
import { useRoute, useRouter } from "vue-router";
|
||||||
//用户信息存储
|
//用户信息存储
|
||||||
import { useUserStore } from "@/stores/modules/user";
|
import { useUserStore } from "@/stores/modules/user";
|
||||||
const userStore = useUserStore();
|
const userStore = useUserStore();
|
||||||
|
//路由;
|
||||||
|
const $route = useRoute();
|
||||||
|
const $router = useRouter();
|
||||||
//获取组织
|
//获取组织
|
||||||
const getOrgs = async () => {
|
const getOrgs = async () => {
|
||||||
const result = await getOrgsApi();
|
const result = await getOrgsApi();
|
||||||
@@ -48,6 +51,16 @@ const getWarehousesList = async () => {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
getWarehousesList();
|
getWarehousesList();
|
||||||
|
|
||||||
|
const init = () => {
|
||||||
|
let redirect_path: any = $route.query.redirect_path;
|
||||||
|
if (redirect_path) {
|
||||||
|
setTimeout(() => {
|
||||||
|
$router.push({ path: redirect_path });
|
||||||
|
}, 500);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
init();
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style scoped lang="scss">
|
<style scoped lang="scss">
|
||||||
|
|||||||
@@ -23,13 +23,18 @@ const loginHttp = async (code: any) => {
|
|||||||
const result: Record<string, any> = await loginApi(code);
|
const result: Record<string, any> = await loginApi(code);
|
||||||
if (result.code === 0) {
|
if (result.code === 0) {
|
||||||
userStore.setToken(result?.data?.access_token);
|
userStore.setToken(result?.data?.access_token);
|
||||||
console.log(result?.data?.access_token, "=data.access_token=");
|
|
||||||
// 设置用户信息
|
// 设置用户信息
|
||||||
userStore.setUserInfo(result?.data?.user_data);
|
userStore.setUserInfo(result?.data?.user_data);
|
||||||
//设置好了token和用户信息跳转到首页
|
let redirect_path: any = $route.query.redirect_path;
|
||||||
|
if (redirect_path) {
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
$router.push({ path: "/" });
|
$router.replace({ path: redirect_path });
|
||||||
}, 500);
|
}, 500);
|
||||||
|
} else {
|
||||||
|
setTimeout(() => {
|
||||||
|
$router.replace({ path: "/" });
|
||||||
|
}, 500);
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
location.href = usePathUrl();
|
location.href = usePathUrl();
|
||||||
}
|
}
|
||||||
@@ -37,14 +42,20 @@ const loginHttp = async (code: any) => {
|
|||||||
|
|
||||||
// 登录前的判断
|
// 登录前的判断
|
||||||
const login = () => {
|
const login = () => {
|
||||||
const { code } = $route.query;
|
const { code, redirect_path } = $route.query;
|
||||||
// 没有code直接跳转到登录页
|
// 没有code直接跳转到登录页
|
||||||
|
if (!code && redirect_path) {
|
||||||
|
location.href = usePathUrl(redirect_path);
|
||||||
|
return;
|
||||||
|
}
|
||||||
if (!code) {
|
if (!code) {
|
||||||
location.href = usePathUrl();
|
location.href = usePathUrl();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// 有code就登录请求
|
// 有code就登录请求
|
||||||
|
if (code) {
|
||||||
loginHttp(code);
|
loginHttp(code);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
login();
|
login();
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
Reference in New Issue
Block a user