From 27ad3c1c7a671949327c8af490855c51e314e54a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B4=BE=E8=82=83?= <15833576927@163.com>
Date: Wed, 15 May 2024 10:19:12 +0800
Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E5=87=BB=E8=8F=9C=E5=8D=95=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E8=B7=AF=E7=94=B1=E4=B8=AD=E7=9A=84=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?(=E9=9A=90=E8=97=8F)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Hamburger/index.vue | 48 +++++++++++++++++++++++++-----
 src/utils/ruoyi.js                 |  1 -
 2 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/src/components/Hamburger/index.vue b/src/components/Hamburger/index.vue
index 2e822fd..4f6fcf8 100644
--- a/src/components/Hamburger/index.vue
+++ b/src/components/Hamburger/index.vue
@@ -1,16 +1,16 @@
 <template>
   <div style="padding: 0 15px;">
     <i-menu-unfold-one @contextmenu.prevent.stop="toggleClick" @click="showDrawer = !showDrawer" class="hamburger"
-                       :class="{'is-active':isActive}" theme="outline" size="22" fill="#FFFFFF"/>
+                       :class="{'is-active':isActive}" theme="outline" size="22" :fill="fill"/>
     <div>
-      <el-drawer v-model="showDrawer" direction="ltr" append-to-body style="top: 50px" :z-index="165"
+      <el-drawer v-model="showDrawer" direction="ltr" append-to-body style="top: 50px;height: calc(100% - 50px)" :z-index="165"
                  :with-header="false">
         <div>
           <div class="classify"  style="margin-top: 0;">
             <i-system theme="outline" size="24" fill="#333"/>
             <el-link style="color: #000000 !important;font-size: 16px" @click="openRouter('/index')">概览</el-link>
           </div>
-          <div v-for="item in menuList" :key="item.label">
+          <div v-if="true" v-for="item in menuList" :key="item.label">
             <div class="classify">
               <i-system theme="outline" size="24" fill="#333"/>
               {{ item.label }}
@@ -25,6 +25,23 @@
               </el-row>
             </div>
           </div>
+          <div v-else v-for="item in sidebarRouters" :key="item.path">
+	          <div  v-if="!item.hidden && item.redirect !== '/index'">
+		          <div class="classify">
+			          <i-system theme="outline" size="24" fill="#333"/>
+			          {{ item.meta?.title }}
+		          </div>
+		          <div class="children">
+			          <el-row v-if="item.children" :gutter="20">
+				          <el-col v-for="child in item.children" :key="child.path" :span="8">
+					          <div class="children-item">
+						          <el-link @click="openRouter(`${item.path}/${child.path}`)">{{ child.meta?.title }}</el-link>
+					          </div>
+				          </el-col>
+			          </el-row>
+		          </div>
+	          </div>
+          </div>
         </div>
 
       </el-drawer>
@@ -33,15 +50,24 @@
 </template>
 
 <script setup>
+import usePermissionStore from "@/store/modules/permission.js";
+import {isExternal} from "@/utils/validate.js";
+
 defineProps({
   isActive: {
     type: Boolean,
     default: false
-  }
+  },
+	fill:{
+		type: String,
+		default: '#FFF'
+	}
 })
-
 const emit = defineEmits(['toggleClick'])
 const showDrawer = ref(false)
+const permissionStore = usePermissionStore()
+
+const sidebarRouters =  computed(() => permissionStore.sidebarRouters);
 const menuList = ref([
   {
     label: '基础数据管理', children: [
@@ -74,9 +100,15 @@ const menuList = ref([
 ])
 const router = useRouter();
 const openRouter = (href) => {
-  if (href){
-    router.push(href)
-    showDrawer.value = false
+	console.log(href);
+	if (href){
+	  if (isExternal(href)) {
+		  window.open(href)
+	  }else {
+		  router.push(href)
+		  showDrawer.value = false
+	  }
+   
   }
 }
 const toggleClick = () => {
diff --git a/src/utils/ruoyi.js b/src/utils/ruoyi.js
index 7b47037..baab86f 100644
--- a/src/utils/ruoyi.js
+++ b/src/utils/ruoyi.js
@@ -268,7 +268,6 @@ export function resBgColor(rgbArr) {
  * @param colorValue
  */
 export function findTextColor(colorValue) {
-  console.log(colorValue);
   // #123456或者rgb(12,34,56)转为rgb数组[12,34,56]
   const reg = /^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/;
   var that = colorValue;