From 60a8a42aadd6c9ffec05e3945d428d811d4dae7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=99=8C?= <xiaomo.drip@gmail.com>
Date: Thu, 17 Aug 2023 14:56:29 +0800
Subject: [PATCH] no message

---
 src/components/xFilterBar/index.vue | 18 ++++++++++++++----
 src/layout/components/topbar.vue    |  7 +++++++
 src/layout/components/userbar.vue   |  5 +++++
 src/layout/index.vue                |  9 +++++++--
 src/style/app.scss                  |  3 +++
 src/views/system/table/index.vue    | 12 ++++++++++--
 6 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/src/components/xFilterBar/index.vue b/src/components/xFilterBar/index.vue
index 9184505..a22c498 100644
--- a/src/components/xFilterBar/index.vue
+++ b/src/components/xFilterBar/index.vue
@@ -257,9 +257,8 @@
 	}
 </script>
 
-<style>
+<style scoped>
 	.tabs-label {padding:0 20px;}
-
 	.dialogClass .el-dialog__body {
 	  	margin: 10px 20px;
 	   	padding: 0;
@@ -284,11 +283,22 @@
 	.root:deep(.el-tabs__content) {flex: 1;background: #f6f8f9;}
 	.root:deep(.el-tabs__content) .el-tab-pane{overflow: auto;height:100%;}
 
-
-
 	.dark .root:deep(.el-tabs__content) {background: var(--el-bg-color-overlay);}
 	.dark .x-filter-main {background: var(--el-bg-color);border-color:var(--el-border-color-light);}
 	.dark .x-filter-main table td .del {background: none;}
 	.dark .x-filter-main table td .del:hover {background: #F56C6C;}
 	.dark .nodata {border-color:var(--el-border-color-light);}
+
+
+	@media (max-width: 992px){
+
+		.el-header .right-panel > * + * {
+		    margin: 10px 10px 0 0px;
+		}
+
+		.el-form--inline .el-form-item{
+			margin-top: 10px;
+    		display: revert;
+		}
+	}
 </style>
diff --git a/src/layout/components/topbar.vue b/src/layout/components/topbar.vue
index 698deba..4e74003 100644
--- a/src/layout/components/topbar.vue
+++ b/src/layout/components/topbar.vue
@@ -48,4 +48,11 @@
 	.breadcrumb-enter-active,.breadcrumb-leave-active {transition: all 0.3s;}
 	.breadcrumb-enter-from,.breadcrumb-leave-active {opacity: 0;transform: translateX(20px);}
 	.breadcrumb-leave-active {position: absolute;}
+
+
+	@media (max-width: 860px){
+		.el-breadcrumb span:not(:last-child) {
+		  display: none;
+		}
+	}
 </style>
diff --git a/src/layout/components/userbar.vue b/src/layout/components/userbar.vue
index 4995106..e48d235 100644
--- a/src/layout/components/userbar.vue
+++ b/src/layout/components/userbar.vue
@@ -1,5 +1,10 @@
 <template>
 	<div class="user-bar">
+
+		<div v-if="$store.state.global.layout!='menu'" class="panel-item hidden-sm-and-down" @click='$store.commit("TOGGLE_layoutTags")'>
+			<el-icon v-if="$store.state.global.layoutTags"><el-icon-open /></el-icon>
+			<el-icon v-else><el-icon-TurnOff /></el-icon>
+		</div>
 		<div class="panel-item hidden-sm-and-down" @click="search">
 			<el-icon><el-icon-search /></el-icon>
 		</div>
diff --git a/src/layout/index.vue b/src/layout/index.vue
index e97e0ac..b65349c 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -79,7 +79,7 @@
 			<Side-m v-if="ismobile"></Side-m>
 			<div class="aminui-body el-container">
 				<Topbar v-if="!ismobile"></Topbar>
-				<Tags ref="tags" v-if="!ismobile && layoutTags"></Tags>
+				<!-- <Tags ref="tags" v-if="!ismobile && layoutTags"></Tags> -->
 				<div class="adminui-main" id="adminui-main">
 					<router-view v-show="$route.meta.type!='iframe'" v-slot="{ Component }">
 					    <keep-alive :include="this.$store.state.keepAlive.keepLiveRoute">
@@ -165,9 +165,9 @@
 			<Side-m v-if="ismobile"></Side-m>
 			<div class="aminui-body el-container">
 				<Topbar>
-					<Tags ref="tags" v-if="!ismobile && layoutTags"></Tags>
 					<userbar></userbar>
 				</Topbar>
+				<Tags ref="tags" v-if="!ismobile && layoutTags"></Tags>
 				<div class="adminui-main" id="adminui-main">
 					<router-view v-show="$route.meta.type!='iframe'" v-slot="{ Component }">
 					    <keep-alive :include="this.$store.state.keepAlive.keepLiveRoute">
@@ -252,6 +252,11 @@
 			},
 			layout: {
 				handler(val){
+					if (val=='header' || val=='dock') {
+						this.$store.state.global.layoutTags = true;
+					}else{
+						this.$store.state.global.layoutTags = false;
+					}
 					document.body.setAttribute('data-layout', val)
 				},
 				immediate: true,
diff --git a/src/style/app.scss b/src/style/app.scss
index e2b13f7..98d4cd1 100644
--- a/src/style/app.scss
+++ b/src/style/app.scss
@@ -66,6 +66,9 @@ a,button,input,textarea{-webkit-tap-highlight-color:rgba(0,0,0,0);box-sizing: bo
 .el-menu .menu-tag {position: absolute;height: 18px;line-height: 18px;background: var(--el-color-danger);font-size: 12px;color: #fff;right: 20px;border-radius:18px;padding:0 6px;}
 .el-menu .el-sub-menu__title .menu-tag {right: 40px;}
 .el-menu--horizontal > li .menu-tag {display: none;}
+.el-menu--horizontal > .el-menu-item.is-active {
+	background: none;
+}
 
 /* 右侧内容 */
 .aminui-body {flex: 1;display: flex;flex-flow: column;}
diff --git a/src/views/system/table/index.vue b/src/views/system/table/index.vue
index 23a32cd..ea79e7a 100644
--- a/src/views/system/table/index.vue
+++ b/src/views/system/table/index.vue
@@ -20,7 +20,7 @@
 					<el-button v-if="operation.batchdeletion" type="danger" @click="batchdeletion" plain icon="el-icon-delete"></el-button>
 				</div>
 				<div class="right-panel" v-if="filter.length>0 || stat.length>0">
-					<el-button v-for="(s,index) in stat" :key="index" @click="openStat(s)" v-bind="s">{{ s.label }}</el-button>
+					<el-button v-for="(s,index) in stat" :key="index" class="hidden-sm-and-down" @click="openStat(s)" v-bind="s">{{ s.label }}</el-button>
 					<xFilterBar v-if="filter.length>0" v-model="search" :filterName="$route.meta.tablename" :options="filter" @filterChange="filterChange">
 					</xFilterBar>
 				</div>
@@ -261,5 +261,13 @@
 		}
 	}
 </script>
-<style>
+<style scoped>
+	@media (max-width: 992px){
+
+		.adminui-main > .el-container > .el-container > .el-header .right-panel{
+		    display: block;
+		    margin-top:0px;
+		}
+
+	}
 </style>