From af79a9a4dfdc6363a7da77057f00e0f24fa046d3 Mon Sep 17 00:00:00 2001
From: lyt-Top <1105290566@qq.com>
Date: Mon, 15 Mar 2021 20:41:59 +0800
Subject: [PATCH] =?UTF-8?q?'admin-21.03.15:=E6=B7=BB=E5=8A=A0=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E8=AF=A6=E6=83=85=E6=BC=94=E7=A4=BA=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E3=80=81=E4=BC=98=E5=8C=96tagsView=E4=BA=8B=E4=BB=B6=E5=86=92?=
 =?UTF-8?q?=E6=B3=A1=E9=97=AE=E9=A2=98'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.ts                           | 15 +++++++++
 .../layout/navBars/tagsView/tagsView.vue      |  6 ++--
 src/views/pages/filtering/details.vue         | 33 +++++++++++++++++++
 src/views/pages/filtering/index.vue           |  7 +++-
 src/views/pages/listAdapt/index.vue           | 10 ++++++
 5 files changed, 67 insertions(+), 4 deletions(-)
 create mode 100644 src/views/pages/filtering/details.vue

diff --git a/src/router/index.ts b/src/router/index.ts
index c2bb731..1a402e6 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -485,6 +485,21 @@ export const dynamicRoutes = [
 							icon: 'el-icon-sell',
 						},
 					},
+					{
+						path: '/pages/filteringDetails',
+						name: 'filteringDetails',
+						component: () => import('/@/views/pages/filtering/details.vue'),
+						meta: {
+							title: '过滤筛选组件详情',
+							isLink: '',
+							isHide: true,
+							isKeepAlive: false,
+							isAffix: false,
+							isIframe: false,
+							auth: ['admin', 'test'],
+							icon: 'el-icon-s-order',
+						},
+					},
 					{
 						path: '/pages/iocnfont',
 						name: 'iocnfont',
diff --git a/src/views/layout/navBars/tagsView/tagsView.vue b/src/views/layout/navBars/tagsView/tagsView.vue
index a7d18a8..89c4e1a 100644
--- a/src/views/layout/navBars/tagsView/tagsView.vue
+++ b/src/views/layout/navBars/tagsView/tagsView.vue
@@ -20,17 +20,17 @@
 					<i class="layout-navbars-tagsview-ul-li-iconfont" :class="v.meta.icon" v-if="!isActive(v.path) && getThemeConfig.isTagsviewIcon"></i>
 					<span>{{ v.meta.title }}</span>
 					<template v-if="isActive(v.path)">
-						<i class="el-icon-refresh-right ml5" @click="refreshCurrentTagsView(v.path)"></i>
+						<i class="el-icon-refresh-right ml5" @click.stop="refreshCurrentTagsView(v.path)"></i>
 						<i
 							class="el-icon-close layout-navbars-tagsview-ul-li-icon layout-icon-active"
 							v-if="!v.meta.isAffix"
-							@click="closeCurrentTagsView(v.path)"
+							@click.stop="closeCurrentTagsView(v.path)"
 						></i>
 					</template>
 					<i
 						class="el-icon-close layout-navbars-tagsview-ul-li-icon layout-icon-three"
 						v-if="!v.meta.isAffix"
-						@click="closeCurrentTagsView(v.path)"
+						@click.stop="closeCurrentTagsView(v.path)"
 					></i>
 				</li>
 			</ul>
diff --git a/src/views/pages/filtering/details.vue b/src/views/pages/filtering/details.vue
new file mode 100644
index 0000000..0afb4cc
--- /dev/null
+++ b/src/views/pages/filtering/details.vue
@@ -0,0 +1,33 @@
+<template>
+	<div :style="{ height: `calc(100vh - ${initTagViewHeight}` }">
+		<div class="layout-view-bg-white">
+			<div class="w100 h100 flex">
+				<div class="flex-margin color-primary">filtering-details 测试界面</div>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script lang="ts">
+import { toRefs, reactive, computed } from 'vue';
+import { useStore } from '/@/store/index.ts';
+export default {
+	name: 'filteringDetails',
+	setup() {
+		const store = useStore();
+		const state = reactive({
+			tagViewHeight: '',
+		});
+		// 设置主内容的高度
+		const initTagViewHeight = computed(() => {
+			let { isTagsview } = store.state.themeConfig.themeConfig;
+			if (isTagsview) return `114px`;
+			else return `80px`;
+		});
+		return {
+			initTagViewHeight,
+			...toRefs(state),
+		};
+	},
+};
+</script>
diff --git a/src/views/pages/filtering/index.vue b/src/views/pages/filtering/index.vue
index 37b5972..3272d2e 100644
--- a/src/views/pages/filtering/index.vue
+++ b/src/views/pages/filtering/index.vue
@@ -86,11 +86,13 @@
 
 <script lang="ts">
 import { ref, toRefs, reactive, onMounted, nextTick } from 'vue';
+import { useRouter } from 'vue-router';
 import { filtering, filterList } from './mock.ts';
 export default {
 	name: 'filtering',
 	setup() {
 		const dlRefs = ref([]);
+		const router = useRouter();
 		const state = reactive({
 			filtering,
 			tableData: {
@@ -141,7 +143,10 @@ export default {
 		};
 		// 当前列表项点击
 		const onTableItemClick = (v: object) => {
-			console.log(v);
+			router.push({
+				path: '/pages/filteringDetails',
+				query: { id: v.id },
+			});
 		};
 		// 分页点击
 		const onHandleSizeChange = (val: number) => {
diff --git a/src/views/pages/listAdapt/index.vue b/src/views/pages/listAdapt/index.vue
index 60c78fa..b4673b4 100644
--- a/src/views/pages/listAdapt/index.vue
+++ b/src/views/pages/listAdapt/index.vue
@@ -53,10 +53,12 @@
 
 <script lang="ts">
 import { toRefs, reactive } from 'vue';
+import { useRouter } from 'vue-router';
 import { filterList } from './mock.ts';
 export default {
 	name: 'listAdapt',
 	setup() {
+		const router = useRouter();
 		const state = reactive({
 			tableData: {
 				data: filterList,
@@ -68,6 +70,13 @@ export default {
 				},
 			},
 		});
+		// 当前列表项点击
+		const onTableItemClick = (v: object) => {
+			router.push({
+				path: '/pages/filteringDetails',
+				query: { id: v.id },
+			});
+		};
 		// 分页点击
 		const onHandleSizeChange = (val: number) => {
 			state.tableData.param.pageSize = val;
@@ -77,6 +86,7 @@ export default {
 			state.tableData.param.pageNum = val;
 		};
 		return {
+			onTableItemClick,
 			onHandleSizeChange,
 			onHandleCurrentChange,
 			...toRefs(state),