From 5d6aa9a09da1784741f704fbff9e758534275e0b 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: Fri, 24 Dec 2021 00:21:13 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E8=A7=92=E8=89=B2=E5=9B=9E=E6=98=BE?=
 =?UTF-8?q?=E5=92=8C=E8=A7=92=E8=89=B2=E4=BF=AE=E6=94=B9=EF=BC=8C=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5navbar=E4=B8=8Bdropdown=E6=A0=B7=E5=BC=8F=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Navbar.vue          |  8 +---
 src/views/system/dict/index.vue           |  2 +-
 src/views/system/menu/components/Perm.vue |  6 +--
 src/views/system/role/components/Role.vue | 52 ++++++++++++-----------
 4 files changed, 32 insertions(+), 36 deletions(-)

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 9dd74d58..d047b191 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -38,7 +38,7 @@
               <el-dropdown-item>项目文档</el-dropdown-item>
             </a>
             <el-dropdown-item divided @click.native="logout">
-              <span style="display:block;">退出</span>
+              退出
             </el-dropdown-item>
           </el-dropdown-menu>
         </template>
@@ -96,12 +96,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-
-.el-dropdown-menu__item{
-  display: block!important;
-  line-height: 30px;
-}
-
 .navbar {
   height: 50px;
   overflow: hidden;
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index e61173c9..40f4458b 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -16,7 +16,7 @@
         <el-card class="box-card">
           <template #header>
             <svg-icon color="#333" icon-class="dict"/>
-            <span style="margin:0 5px;">字典数据项列表</span>
+            <span style="margin:0 5px;">字典数据项</span>
             <el-tag type="primary" v-if=" state.dictCode" size="small">{{ state.dictName }}</el-tag>
             <el-tag type="warning" v-else size="small">未选择字典</el-tag>
           </template>
diff --git a/src/views/system/menu/components/Perm.vue b/src/views/system/menu/components/Perm.vue
index 7b99f6ff..73c6babb 100644
--- a/src/views/system/menu/components/Perm.vue
+++ b/src/views/system/menu/components/Perm.vue
@@ -290,13 +290,14 @@ function submitForm() {
   const form = unref(dataForm)
   form.validate((valid: any) => {
     if (valid) {
-      // 接口权限和按钮权限必选其一
+      // 接口权限和按钮权限必填其一
       console.log(state.urlPerm.requestPath, state.formData.btnPerm)
       if (!(state.urlPerm.requestPath || state.formData.btnPerm)) {
         ElMessage.warning('请至少填写一种权限')
         return false
       }
 
+      // 如果填写了URL权限，完整性校验
       if (!state.urlPerm.requestPath) {
         if (!state.urlPerm.requestMethod) {
           ElMessage.warning('URL权限的请求方式不能为空')
@@ -306,11 +307,10 @@ function submitForm() {
           ElMessage.warning('URL权限的所属服务不能为空')
           return false
         }
+        state.formData.urlPerm = state.urlPerm.requestMethod + ':/' + state.urlPerm.serviceName + state.urlPerm.requestPath;
       }
-      state.formData.urlPerm = state.urlPerm.requestMethod + ':/' + state.urlPerm.serviceName + state.urlPerm.requestPath;
 
       state.formData.menuId = props.menuId
-
       if (state.formData.id) {
         updatePerm(state.formData.id, state.formData).then(response => {
           ElMessage.success('修改成功')
diff --git a/src/views/system/role/components/Role.vue b/src/views/system/role/components/Role.vue
index e16d36bb..538e9a0c 100644
--- a/src/views/system/role/components/Role.vue
+++ b/src/views/system/role/components/Role.vue
@@ -3,18 +3,18 @@
     <!-- 搜索表单 -->
     <el-form
         ref="queryForm"
-        :model="state.queryParams"
+        :model="queryParams"
         size="mini"
         :inline="true"
     >
       <el-form-item>
         <el-button type="success" :icon="Plus" @click="handleAdd">新增</el-button>
-        <el-button type="danger" :icon='Delete' :disabled="state.multiple" @click="handleDelete">删除</el-button>
+        <el-button type="danger" :icon='Delete' :disabled="multiple" @click="handleDelete">删除</el-button>
       </el-form-item>
 
       <el-form-item prop="name">
         <el-input
-            v-model="state.queryParams.name"
+            v-model="queryParams.name"
             placeholder="角色名称"
             clearable
             @keyup.enter.native="handleQuery"
@@ -30,8 +30,8 @@
     <!-- 数据表格 -->
     <el-table
         ref="roleTable"
-        v-loading="state.loading"
-        :data="state.pageList"
+        v-loading="loading"
+        :data="pageList"
         @selection-change="handleSelectionChange"
         @row-click="handleRowClick"
         border
@@ -65,39 +65,39 @@
 
     <!-- 分页工具条 -->
     <pagination
-        v-show="state.total>0"
-        :total="state.total"
-        v-model:page="state.queryParams.pageNum"
-        v-model:limit="state.queryParams.pageSize"
+        v-show="total>0"
+        :total="total"
+        v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize"
         @pagination="handleQuery"
     />
 
     <!-- 表单弹窗 -->
     <el-dialog
-        :title="state.dialog.title"
-        v-model="state.dialog.visible"
+        :title="dialog.title"
+        v-model="dialog.visible"
         width="450px"
     >
       <el-form
           ref="dataForm"
-          :model="state.formData"
-          :rules="state.rules"
+          :model="formData"
+          :rules="rules"
           label-width="100px"
       >
         <el-form-item label="角色名称" prop="name">
-          <el-input v-model="state.formData.name" placeholder="请输入角色名称"/>
+          <el-input v-model="formData.name" placeholder="请输入角色名称"/>
         </el-form-item>
 
         <el-form-item label="角色编码" prop="code">
-          <el-input v-model="state.formData.code" placeholder="请输入角色编码"/>
+          <el-input v-model="formData.code" placeholder="请输入角色编码"/>
         </el-form-item>
 
         <el-form-item label="排序" prop="sort">
-          <el-input-number v-model="state.formData.sort" controls-position="right" :min="0" style="width: 100px"/>
+          <el-input-number v-model="formData.sort" controls-position="right" :min="0" style="width: 100px"/>
         </el-form-item>
 
         <el-form-item label="状态">
-          <el-radio-group v-model="state.formData.status">
+          <el-radio-group v-model="formData.status">
             <el-radio :label="1">正常</el-radio>
             <el-radio :label="0">停用</el-radio>
           </el-radio-group>
@@ -117,14 +117,14 @@
 
 <script setup lang="ts">
 import {listRolesWithPage, updateRole, getRoleDetail, addRole, deleteRoles} from '@/api/system/role'
-import {defineEmits, defineProps, onMounted, reactive, ref, unref} from "vue"
+import {defineEmits, defineProps, onMounted, reactive, ref, toRefs, unref} from "vue"
 import {add, del, detail, update} from "@api/system/client";
 import {ElForm, ElMessage, ElMessageBox} from "element-plus";
 import {Search, Plus, Edit, Refresh, Delete} from '@element-plus/icons'
 
 const emit = defineEmits(['roleClick'])
 
-const dataForm = ref()  // 属性名必须和元素的ref属性值一致
+const dataForm = ref(ElForm)  // 属性名必须和元素的ref属性值一致
 
 const state = reactive({
   loading: true,
@@ -147,9 +147,9 @@ const state = reactive({
   },
   formData: {
     id: undefined,
-    parentId: 0,
     name: undefined,
-    sort: 1,
+    code: undefined,
+    sort: 100,
     status: 1
   },
   rules: {
@@ -162,6 +162,8 @@ const state = reactive({
   }
 })
 
+const {loading,single, multiple, queryParams, pageList, total, dialog, formData, rules} = toRefs(state)
+
 function handleQuery() {
   emit('roleClick', {})
   state.loading = true
@@ -196,7 +198,7 @@ function handleAdd() {
   resetForm()
   state.dialog = {
     title: '添加角色',
-    visible: true,
+    visible: true
   }
 }
 
@@ -207,7 +209,7 @@ function handleUpdate(row: any) {
     visible: true,
   }
   const roleId = row.id || state.ids
-  getRoleDetail(roleId).then(response => {
+  getRoleDetail(roleId).then((response) => {
     state.formData = response.data
   })
 }
@@ -236,9 +238,9 @@ function submitForm() {
 function resetForm() {
   state.formData = {
     id: undefined,
-    parentId: 0,
     name: undefined,
-    sort: 1,
+    code: undefined,
+    sort: 100,
     status: 1
   }
 }