From b6f228dfaf6347800030111c973a941c5402636a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=89=E6=9D=A5=E6=8A=80=E6=9C=AF?= <1490493387@qq.com>
Date: Wed, 15 Dec 2021 00:15:44 +0800
Subject: [PATCH] =?UTF-8?q?feat(Perm.vue):=20=E4=BE=A7=E8=BE=B9=E6=A0=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=BAsetup=E8=AF=AD=E6=B3=95=E7=B3=96?=
 =?UTF-8?q?=EF=BC=8C=E6=9D=83=E9=99=90=E4=BF=AE=E6=94=B9=E5=9B=9E=E6=98=BE?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E5=AE=8C=E6=88=90=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Sidebar/SidebarItem.vue | 256 +++++-------------
 src/views/system/menu/components/Perm.vue     |  22 +-
 2 files changed, 88 insertions(+), 190 deletions(-)

diff --git a/src/layout/components/Sidebar/SidebarItem.vue b/src/layout/components/Sidebar/SidebarItem.vue
index fa6a9bfa..d458a130 100644
--- a/src/layout/components/Sidebar/SidebarItem.vue
+++ b/src/layout/components/Sidebar/SidebarItem.vue
@@ -1,212 +1,102 @@
 <template>
-  <div
-      v-if="!item.meta || !item.meta.hidden"
-      :class="[isCollapse ? 'simple-mode' : 'full-mode',
-      {'first-level': !isFirstLevel}]"
-  >
+  <div v-if="!item.meta || !item.meta.hidden">
     <template
-        v-if="!alwaysShowParent && onlyOneChild && !onlyOneChild.children"
+        v-if="hasOneShowingChild(item.children, item) && (!onlyOneChild.children || onlyOneChild.noShowingChildren) &&(!item.meta|| !item.meta.alwaysShow)"
     >
-      <AppLink
-          v-if="onlyOneChild.meta"
-          :to="resolvePath(onlyOneChild.path)"
-      >
-        <el-menu-item
-            :index="resolvePath(onlyOneChild.path)"
-            :class="{'submenu-title-noDropdown':!isFirstLevel}"
-        >
-          <svg-icon v-if="onlyOneChild.meta&&onlyOneChild.meta.icon" :icon-class="onlyOneChild.meta.icon"></svg-icon>
-          <template v-if="onlyOneChild.meta && onlyOneChild.meta.title" #title>{{ onlyOneChild.meta.title }}</template>
+      <app-link v-if="onlyOneChild.meta" :to="resolvePath(onlyOneChild.path)">
+        <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}">
+          <svg-icon v-if="onlyOneChild.meta && onlyOneChild.meta.icon" :icon-class="onlyOneChild.meta.icon"></svg-icon>
+          <template #title>{{ onlyOneChild.meta.title }}</template>
         </el-menu-item>
-      </AppLink>
+      </app-link>
     </template>
-    <el-sub-menu
-        v-else
-        :index="resolvePath(item.path)"
-    >
+    <el-sub-menu v-else :index="resolvePath(item.path)">
       <!-- popper-append-to-body -->
       <template #title>
-        <svg-icon v-if="item.meta&&item.meta.icon" :icon-class="item.meta.icon"></svg-icon>
+        <svg-icon v-if="item.meta && item.meta.icon" :icon-class="item.meta.icon"></svg-icon>
         <span v-if="item.meta && item.meta.title">{{ item.meta.title }}</span>
       </template>
-      <template v-if="item.children">
-        <sidebar-item
-            v-for="child in item.children"
-            :key="child.path"
-            :item="child"
-            :is-collapse="isCollapse"
-            :is-first-level="false"
-            :base-path="resolvePath(child.path)"
-            class="nest-menu"
-        />
-      </template>
+
+      <sidebar-item
+          v-for="child in item.children"
+          :key="child.path"
+          :item="child"
+          :is-nest="true"
+          :base-path="resolvePath(child.path)"
+          class="nest-menu"
+      />
     </el-sub-menu>
   </div>
 </template>
 
 
-<script lang="ts">
+<script setup lang="ts">
 import path from 'path-browserify'
-import {defineComponent, PropType, computed} from "vue";
-import {RouteRecordRaw} from 'vue-router'
+import {defineProps, PropType, computed, ref} from "vue";
 import {isExternal} from '@utils/validate'
 import AppLink from './Link.vue'
 import SvgIcon from '@/components/SvgIcon/index.vue';
+import {RouteRecordRaw} from "vue-router";
 
-
-export default defineComponent({
-  props: {
-    item: {
-      type: Object as PropType<RouteRecordRaw>,
-      required: true
-    },
-    isCollapse: {
-      type: Boolean,
-      required: false
-    },
-    isFirstLevel: {
-      type: Boolean,
-      required: false
-    },
-    basePath: {
-      type: String,
-      required: true
-    }
+const props = defineProps({
+  item: {
+    type: Object as PropType<RouteRecordRaw>,
+    required: true
   },
-  components: {
-    AppLink,
-    SvgIcon
+  isNest: {
+    type: Boolean,
+    required: false
   },
-  setup(props) {
-    const alwaysShowParent = computed(() => {
-      if (props.item.meta && props.item.meta.alwaysShow) {
-        return true
-      } else {
-        return false
-      }
-    })
-
-    const showingChildrenNum = computed(() => {
-      if (props.item.children) {
-        const showingChildren = props.item.children.filter((item) => {
-          if (item.meta && item.meta.hidden) {
-            return false
-          } else {
-            return true
-          }
-        })
-        return showingChildren.length
-      }
-      return 0
-    })
-
-    const onlyOneChild = computed(() => {
-      if (showingChildrenNum.value > 1) {
-        return null
-      }
-      if (props.item.children) {
-        for (const child of props.item.children) {
-          if (!child.meta || !child.meta.hidden) {
-            return child
-          }
-        }
-      }
-      // If there is no children, return itself with path removed,
-      // because this.basePath already contains item's path information
-      return {...props.item, path: ''}
-    })
-
-    const resolvePath = (routePath: string) => {
-      if (isExternal(routePath)) {
-        return routePath
-      }
-      if (isExternal(props.basePath)) {
-        return props.basePath
-      }
-      return path.resolve(props.basePath, routePath)
-    }
-
-    return {
-      alwaysShowParent,
-      showingChildrenNum,
-      onlyOneChild,
-      resolvePath
-    }
+  basePath: {
+    type: String,
+    required: true
   }
 })
 
+const onlyOneChild = ref({});
+
+function hasOneShowingChild(children = [] as any, parent: RouteRecordRaw) {
+  if (!children) {
+    children = [];
+  }
+  const showingChildren = children.filter((item: any) => {
+    if (item.mata && item.mata.hidden) {
+      return false
+    } else {
+      // Temp set(will be used if only has one showing child)
+      onlyOneChild.value = item
+      return true
+    }
+  })
+
+  // When there is only one child router, the child router is displayed by default
+  if (showingChildren.length === 1) {
+    return true
+  }
+
+  // Show parent if there are no child router to display
+  if (showingChildren.length === 0) {
+    onlyOneChild.value = {...parent, path: '', noShowingChildren: true}
+    return true
+  }
+
+  return false
+};
+
+
+function resolvePath(routePath: string) {
+  if (isExternal(routePath)) {
+    return routePath
+  }
+  if (isExternal(props.basePath)) {
+    return props.basePath
+  }
+  return path.resolve(props.basePath, routePath)
+}
+
+
 </script>
 
 <style lang="scss" scoped>
-.el-sub-menu.is-active > .el-sub-menu__title {
-  color: #f4f4f5 !important;
-}
 
-.full-mode {
-  .nest-menu .el-sub-menu > .el-sub-menu__title,
-  .el-sub-menu .el-menu-item {
-    min-width: 210px !important;
-    #background-color: #1f2d3d !important;
-
-    &:hover {
-      background-color: #001528 !important;
-    }
-  }
-
-  .el-menu-item {
-    & > span {
-      display: inline-block;
-      padding-left: 5px;
-    }
-  }
-
-  .el-sub-menu {
-    overflow: hidden;
-
-    & > .el-sub-menu__title {
-      .el-sub-menu__icon-arrow {
-        display: none;
-      }
-
-      & > span {
-        padding-left: 5px;
-
-      }
-    }
-  }
-}
-
-.simple-mode {
-  &.first-level {
-    .submenu-title-noDropdown {
-      padding: 0 !important;
-      position: relative;
-
-      & > span {
-        display: none;
-      }
-
-      & > svg {
-        margin-left: 20px;
-      }
-    }
-
-    .el-sub-menu {
-      overflow: hidden;
-
-
-      & > .el-sub-menu__title {
-        padding: 0px !important;
-
-        .el-sub-menu__icon-arrow {
-          display: none;
-        }
-
-        & > span {
-          visibility: hidden;
-        }
-      }
-    }
-  }
-}
 </style>
\ No newline at end of file
diff --git a/src/views/system/menu/components/Perm.vue b/src/views/system/menu/components/Perm.vue
index eb10bdb8..b4ccd6d7 100644
--- a/src/views/system/menu/components/Perm.vue
+++ b/src/views/system/menu/components/Perm.vue
@@ -19,7 +19,7 @@
             @keyup.enter.native="handleQuery"/>
       </el-form-item>
       <el-form-item>
-        <el-button  :icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button :icon="Search" @click="handleQuery">搜索</el-button>
         <el-button :icon="Refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
@@ -114,7 +114,7 @@
               </el-select>
             </template>
           </el-input>
-          <el-link  v-show="state.urlPerm.requestMethod">
+          <el-link v-show="state.urlPerm.requestMethod">
             {{ state.urlPerm.requestMethod }}:/{{ state.urlPerm.serviceName }}{{ state.urlPerm.requestPath }}
           </el-link>
         </el-form-item>
@@ -126,7 +126,7 @@
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button type="primary"  @click="submitForm">确 定</el-button>
+          <el-button type="primary" @click="submitForm">确 定</el-button>
           <el-button @click="cancel">取 消</el-button>
         </div>
       </template>
@@ -137,7 +137,7 @@
 <script setup lang="ts">
 import {listPermsWithPage, getPermDetail, addPerm, updatePerm, deletePerms} from "@/api/system/perm"
 import {Search, Plus, Edit, Refresh, Delete} from '@element-plus/icons'
-import {onMounted,watch, reactive, ref, unref, getCurrentInstance} from 'vue'
+import {onMounted, watch, reactive, ref, unref, getCurrentInstance} from 'vue'
 import {ElForm, ElMessage, ElMessageBox} from "element-plus"
 
 const {proxy}: any = getCurrentInstance();
@@ -183,7 +183,8 @@ const state = reactive({
     id: undefined,
     name: undefined,
     urlPerm: undefined,
-    btnPerm: undefined
+    btnPerm: undefined,
+    menuId: undefined
   },
   rules: {
     name: [
@@ -240,7 +241,6 @@ function handleSelectionChange(selection: any) {
 }
 
 
-
 /**
  * 字典数据准备
  */
@@ -272,7 +272,15 @@ function handleUpdate(row: any) {
   }
   const id = row.id || state.ids
   getPermDetail(id).then(response => {
-    state.formData = response.data
+    const {data} = response
+    state.formData = data
+    if (data && data.urlPerm) {
+      // GET:/youlai-admin/api/v1/users
+      const urlPermArr = data.urlPerm.split(':')
+      state.urlPerm.requestMethod = urlPermArr[0]
+      state.urlPerm.serviceName = urlPermArr[1].substring(1, urlPermArr[1].substring(1).indexOf('/') + 1)
+      state.urlPerm.requestPath = urlPermArr[1].substring(urlPermArr[1].substring(1).indexOf('/') + 1)
+    }
   })
 }