From 2e99c68ed071171dba9f048363fd873ed268d22e Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: 星期一, 10 四月 2023 17:09:43 +0800
Subject: [PATCH] !695 下拉图标选择组件优化：1.已选择图标高亮回显 2.滚动条采用el-scrollbar Merge pull request !695 from 绿色心情/icon-select
---
ruoyi-ui/src/plugins/tab.js | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/ruoyi-ui/src/plugins/tab.js b/ruoyi-ui/src/plugins/tab.js
index f2d7b22..60ceb5f 100644
--- a/ruoyi-ui/src/plugins/tab.js
+++ b/ruoyi-ui/src/plugins/tab.js
@@ -4,24 +4,23 @@
export default {
// 刷新当前tab页签
refreshPage(obj) {
- const { path, matched } = router.currentRoute;
+ const { path, query, matched } = router.currentRoute;
if (obj === undefined) {
matched.forEach((m) => {
if (m.components && m.components.default && m.components.default.name) {
if (!['Layout', 'ParentView'].includes(m.components.default.name)) {
- obj = { name: m.components.default.name, path: path };
+ obj = { name: m.components.default.name, path: path, query: query };
}
}
});
}
return store.dispatch('tagsView/delCachedView', obj).then(() => {
- const { path } = obj
+ const { path, query } = obj
router.replace({
- path: '/redirect' + path
+ path: '/redirect' + path,
+ query: query
})
})
-
-
},
// 关闭当前tab页签，打开新页签
closeOpenPage(obj) {
@@ -33,8 +32,12 @@
// 关闭指定tab页签
closePage(obj) {
if (obj === undefined) {
- return store.dispatch('tagsView/delView', router.currentRoute).then(({ lastPath }) => {
- return router.push(lastPath || '/');
+ return store.dispatch('tagsView/delView', router.currentRoute).then(({ visitedViews }) => {
+ const latestView = visitedViews.slice(-1)[0]
+ if (latestView) {
+ return router.push(latestView.fullPath)
+ }
+ return router.push('/');
});
}
return store.dispatch('tagsView/delView', obj);
@@ -56,10 +59,10 @@
return store.dispatch('tagsView/delOthersViews', obj || router.currentRoute);
},
// 添加tab页签
- addPage(title, url) {
+ openPage(title, url, params) {
var obj = { path: url, meta: { title: title } }
store.dispatch('tagsView/addView', obj);
- return router.push(url);
+ return router.push({ path: url, query: params });
},
// 修改tab页签
updatePage(obj) {
--
Gitblit v1.9.2