From c73260a2070478615c298e29e845f9b985bc690a Mon Sep 17 00:00:00 2001
From: dzq <dzq@ys.com>
Date: Mon, 26 May 2025 16:28:33 +0800
Subject: [PATCH] =?UTF-8?q?refactor(role):=20=E9=87=8D=E6=9E=84=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=E7=AE=A1=E7=90=86=E7=95=8C=E9=9D=A2=E4=B8=BA=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E9=A1=B5=E5=BD=A2=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将角色列表从表格改为左侧标签页导航
- 新增角色表单整合到主页面中，移除独立弹窗
- 增加菜单权限分类展示功能
- 优化页面布局和样式
---
 src/views/system/role/index.vue           | 379 +++++++++++++---------
 src/views/system/role/role-form-modal.vue |   8 +-
 src/views/system/role/utils/hook.tsx      |  10 +-
 3 files changed, 231 insertions(+), 166 deletions(-)

diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 14a662b..c811182 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref } from "vue";
+import { computed, ComputedRef, reactive, ref, watch } from "vue";
 import { useRole } from "./utils/hook";
 import { PureTableBar } from "@/components/RePureTableBar";
 import { useRenderIcon } from "@/components/ReIcon/src/hooks";
@@ -9,9 +9,9 @@ import EditPen from "@iconify-icons/ep/edit-pen";
 import Search from "@iconify-icons/ep/search";
 import Refresh from "@iconify-icons/ep/refresh";
 import AddFill from "@iconify-icons/ri/add-circle-line";
-import { getRoleInfoApi, RoleDTO } from "@/api/system/role";
-import RoleFormModal from "@/views/system/role/role-form-modal.vue";
-import { ElMessage } from "element-plus";
+import { addRoleApi, AddRoleCommand, getRoleInfoApi, RoleDTO, updateRoleApi, UpdateRoleCommand } from "@/api/system/role";
+import { ElMessage, FormRules } from "element-plus";
+import { MenuDTO } from "@/api/system/menu";
 
 defineOptions({
   name: "SystemRole"
@@ -23,6 +23,7 @@ const {
   loading,
   columns,
   dataList,
+  activeTab,
   pagination,
   onSearch,
   resetForm,
@@ -32,10 +33,59 @@ const {
 } = useRole();
 
 const opType = ref<"add" | "update">("add");
-const modalVisible = ref(false);
 const opRow = ref<RoleDTO>();
-async function openDialog(type: "add" | "update", row?: RoleDTO) {
-  debugger;
+
+const formData = reactive<AddRoleCommand | UpdateRoleCommand>({
+  roleId: 0,
+  dataScope: "",
+  menuIds: [],
+  remark: "",
+  roleKey: "",
+  roleName: "",
+  roleSort: 1,
+  status: "1"
+});
+const resetFromData = () => {
+  Object.assign(formData, {
+    roleId: 0,
+    dataScope: "",
+    menuIds: [],
+    remark: "",
+    roleKey: "",
+    roleName: "",
+    roleSort: 1,
+    status: "1"
+  });
+}
+const rules: FormRules = {
+  roleName: [
+    {
+      required: true,
+      message: "角色名称不能为空"
+    }
+  ],
+  roleKey: [
+    {
+      required: true,
+      message: "权限标识不能为空"
+    }
+  ],
+  roleSort: [
+    {
+      required: true,
+      message: "角色序号不能为空"
+    }
+  ]
+};
+
+watch(activeTab, async (val) => {
+  console.log("activeTab", val); // 输出当前选中的标签的 key 或其他标识符
+  opRow.value = dataList.value.find(item => item.roleKey == val);
+  await getRoleInfo("update", opRow.value);
+  Object.assign(formData, opRow.value);
+  formData.menuIds = opRow.value.selectedMenuList;
+});
+async function getRoleInfo(type: "add" | "update", row?: RoleDTO) {
   try {
     await getMenuTree();
     if (row) {
@@ -49,170 +99,150 @@ async function openDialog(type: "add" | "update", row?: RoleDTO) {
   }
   opType.value = type;
   opRow.value = row;
-  modalVisible.value = true;
 }
+const processedMenuOptions = ref<{ categoryName: string; items: MenuDTO[] }[]>([]);
+
+watch(menuTree, (val) => {
+  const categories = [];
+
+  const collectLeaves = (menu: MenuDTO) => {
+    if (!menu.children) return [];
+    return menu.children.filter(child => child.children?.length ? false : true);
+  };
+
+  const collectMenus = (menuOption: MenuDTO) => {
+    const leaves = collectLeaves(menuOption);
+    leaves.unshift(menuOption);
+    if (leaves.length) {
+      categories.push({
+        categoryName: menuOption.menuName,
+        items: leaves
+      });
+    }
+    if (menuOption.children?.length) {
+      const lastMenu = menuOption.children.filter(child => child.children?.length);
+      lastMenu.forEach(child => {
+        collectMenus(child);
+      });
+    }
+  };
+  val.forEach(menuOption => {
+    collectMenus(menuOption);
+  })
+
+  console.log("categories", categories); // 输出处理后的菜单选项结构，方便调试和查看结构
+  processedMenuOptions.value = categories;
+});
+
+async function handleConfirm() {
+  try {
+    await formRef.value?.validate();
+    loading.value = true;
+    if (opType.value === 'add') {
+      await addRoleApi(formData as AddRoleCommand);
+    } else {
+      await updateRoleApi(formData as UpdateRoleCommand);
+    }
+    ElMessage.info("提交成功");
+    onSearch().then(() => {
+      activeTab.value = dataList.value[0].roleKey;
+    });
+  } catch (e) {
+    console.error(e);
+    ElMessage.error((e as Error)?.message || "提交失败");
+  } finally {
+    loading.value = false;
+  }
+}
+const addRole = async () => {
+  await getRoleInfo("add");
+  activeTab.value = '';
+  resetFromData();
+}
+
+getMenuTree();
+onSearch().then(() => {
+  activeTab.value = dataList.value[0].roleKey;
+});
 </script>
 <template>
   <div class="main">
-    <el-form
-      ref="formRef"
-      :inline="true"
-      :model="form"
-      class="search-form bg-bg_color w-[99/100] pl-8 pt-[12px]"
-    >
-      <el-form-item label="角色名称：" prop="name">
-        <el-input
-          v-model="form.roleName"
-          placeholder="请输入角色名称"
-          clearable
-          class="!w-[200px]"
-        />
+
+    <div class="tab-header">
+      <el-button :icon="useRenderIcon(AddFill)" @click="addRole" style="margin-bottom: 16px">
+        新建角色
+      </el-button>
+      <ul class="role-list">
+        <li v-for="role in dataList" :key="role.roleKey" :class="{ 'active': activeTab === role.roleKey }"
+          @click="activeTab = role.roleKey">
+          {{ role.roleName }}
+        </li>
+      </ul>
+    </div>
+    <el-form :model="formData" label-width="120px" :rules="rules" ref="formRef">
+      <el-form-item prop="roleName" label="角色名称" required inline-message>
+        <el-input v-model="formData.roleName" class="form-input" />
       </el-form-item>
-      <el-form-item label="角色标识：" prop="code">
-        <el-input
-          v-model="form.roleKey"
-          placeholder="请输入角色标识"
-          clearable
-          class="!w-[180px]"
-        />
+      <el-form-item prop="roleKey" label="权限字符" required>
+        <el-input v-model="formData.roleKey" class="form-input" />
       </el-form-item>
-      <el-form-item label="状态：" prop="status">
-        <el-select
-          v-model="form.status"
-          placeholder="请选择状态"
-          clearable
-          class="!w-[180px]"
-        >
-          <el-option label="已启用" value="1" />
-          <el-option label="已停用" value="0" />
-        </el-select>
+      <!-- <el-form-item prop="roleSort" label="角色顺序" required>
+        <el-input-number :min="1" v-model="formData.roleSort" />
+      </el-form-item> -->
+      <!-- <el-form-item prop="status" label="角色状态">
+        <el-radio-group v-model="formData.status">
+          <el-radio v-for="item in Object.keys(statusList)" :key="item" :label="statusList[item].value">{{
+            statusList[item].label }}</el-radio>
+        </el-radio-group>
+      </el-form-item> -->
+      <el-form-item label="菜单权限" prop="menuIds" class="form-input">
+        <el-checkbox-group v-model="formData.menuIds" class="checkbox-group">
+          <template v-for="menu in processedMenuOptions" :key="menu.categoryName">
+            <span class="menu-category">{{ menu.categoryName }}：</span>
+            <el-checkbox v-for="item in menu.items" :key="item.id" :label="item.id" class="menu-checkbox">
+              {{ item.menuName }}
+            </el-checkbox>
+            <el-divider class="divider" />
+          </template>
+        </el-checkbox-group>
       </el-form-item>
-      <el-form-item>
-        <el-button
-          type="primary"
-          :icon="useRenderIcon(Search)"
-          :loading="loading"
-          @click="onSearch"
-        >
-          搜索
-        </el-button>
-        <el-button :icon="useRenderIcon(Refresh)" @click="resetForm(formRef)">
-          重置
-        </el-button>
+      <!-- <el-form-item prop="remark" label="备注" style="margin-bottom: 0">
+        <el-input type="textarea" class="form-input" v-model="formData.remark" />
+      </el-form-item> -->
+      <el-form-item class="form-actions">
+        <el-button type="primary" @click="handleConfirm">确认</el-button>
       </el-form-item>
     </el-form>
-
-    <PureTableBar
-      title="角色列表"
-      :columns="columns"
-      @refresh="onSearch"
-    >
-      <template #buttons>
-        <el-button
-          type="primary"
-          :icon="useRenderIcon(AddFill)"
-          @click="openDialog('add')"
-        >
-          新增角色
-        </el-button>
-      </template>
-      <template v-slot="{ size, dynamicColumns }">
-        <pure-table
-          border
-          align-whole="center"
-          showOverflowTooltip
-          table-layout="auto"
-          :loading="loading"
-          :size="size"
-          adaptive
-          :data="dataList"
-          :columns="dynamicColumns"
-          :pagination="pagination"
-          :paginationSmall="size === 'small' ? true : false"
-          :header-cell-style="{
-            background: 'var(--el-table-row-hover-bg-color)',
-            color: 'var(--el-text-color-primary)'
-          }"
-        >
-          <template #operation="{ row }">
-            <el-button
-              class="reset-margin"
-              link
-              type="primary"
-              :size="size"
-              :icon="useRenderIcon(EditPen)"
-              @click="openDialog('update', row)"
-            >
-              修改
-            </el-button>
-            <el-popconfirm
-              :title="`是否确认删除角色名称为${row.roleName}的这条数据`"
-              @confirm="handleDelete(row)"
-            >
-              <template #reference>
-                <el-button
-                  class="reset-margin"
-                  link
-                  type="primary"
-                  :size="size"
-                  :icon="useRenderIcon(Delete)"
-                >
-                  删除
-                </el-button>
-              </template>
-            </el-popconfirm>
-            <!-- <el-dropdown>
-              <el-button
-                class="ml-3 mt-[2px]"
-                link
-                type="primary"
-                :size="size"
-                :icon="useRenderIcon(More)"
-              />
-              <template #dropdown>
-                <el-dropdown-menu>
-                  <el-dropdown-item>
-                    <el-button
-                      :class="buttonClass"
-                      link
-                      type="primary"
-                      :size="size"
-                      :icon="useRenderIcon(Menu)"
-                      @click="handleMenu"
-                    >
-                      菜单权限
-                    </el-button>
-                  </el-dropdown-item>
-                  <el-dropdown-item>
-                    <el-button
-                      :class="buttonClass"
-                      link
-                      type="primary"
-                      :size="size"
-                      :icon="useRenderIcon(Database)"
-                      @click="handleDatabase"
-                    >
-                      数据权限
-                    </el-button>
-                  </el-dropdown-item>
-                </el-dropdown-menu>
-              </template>
-            </el-dropdown> -->
-          </template>
-        </pure-table>
-      </template>
-    </PureTableBar>
-
-    <role-form-modal
-      v-model="modalVisible"
-      :type="opType"
-      :row="opRow"
-      :menu-options="menuTree"
-    />
   </div>
 </template>
 
 <style scoped lang="scss">
+.role-list {
+  list-style: none;
+  padding: 0;
+  margin: 0;
+
+  li {
+    width: 200px;
+    padding: 6px 12px;
+    cursor: pointer;
+    transition: all 0.3s;
+    border-left: 3px solid transparent;
+    font-weight: 700;
+    font-size: 16px;
+
+    &:hover {
+      background-color: var(--el-color-primary-light-9);
+    }
+
+    &.active {
+      background-color: var(--el-color-primary-light-8);
+      /* border-left-color: var(--el-color-primary); */
+      color: var(--el-color-primary);
+    }
+  }
+}
+
 :deep(.el-dropdown-menu__item i) {
   margin: 0;
 }
@@ -222,4 +252,37 @@ async function openDialog(type: "add" | "update", row?: RoleDTO) {
     margin-bottom: 12px;
   }
 }
+
+.main {
+  display: flex;
+  gap: 5px;
+}
+
+.tab-header {
+  height: 86vh;
+  padding: 20px 12px 12px 12px;
+  background-color: #FFFFFF;
+  flex: 0 0 0px;
+}
+
+.el-form {
+  height: 86vh;
+  padding-top: 20px;
+  background-color: #FFFFFF;
+  flex: 1;
+}
+
+.form-input {
+  width: 40%;
+}
+
+.divider {
+  margin: 6px 0;
+
+}
+
+.form-actions {
+  margin-top: 20px;
+  text-align: right;
+}
 </style>
diff --git a/src/views/system/role/role-form-modal.vue b/src/views/system/role/role-form-modal.vue
index f2fb717..238e0b1 100644
--- a/src/views/system/role/role-form-modal.vue
+++ b/src/views/system/role/role-form-modal.vue
@@ -135,8 +135,8 @@ const processedMenuOptions = computed(() => {
 </script>
 
 <template>
-  <v-dialog show-full-screen fixed-body-height use-body-scrolling :title="type === 'add' ? '新增角色' : '更新角色'"
-    v-model="visible" :loading="loading" @confirm="handleConfirm" @cancel="visible = false" @opened="handleOpened">
+  <v-dialog fullScreen show-full-screen use-body-scrolling :title="type === 'add' ? '新增角色' : '更新角色'" v-model="visible"
+    @cancel="visible = false" @opened="handleOpened" class="">
     <el-form :model="formData" label-width="120px" :rules="rules" ref="formRef">
       <el-form-item prop="roleName" label="角色名称" required inline-message>
         <el-input v-model="formData.roleName" />
@@ -144,9 +144,9 @@ const processedMenuOptions = computed(() => {
       <el-form-item prop="roleKey" label="权限字符" required>
         <el-input v-model="formData.roleKey" />
       </el-form-item>
-      <el-form-item prop="roleSort" label="角色顺序" required>
+      <!-- <el-form-item prop="roleSort" label="角色顺序" required>
         <el-input-number :min="1" v-model="formData.roleSort" />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item prop="status" label="角色状态">
         <el-radio-group v-model="formData.status">
           <el-radio v-for="item in Object.keys(statusList)" :key="item" :label="statusList[item].value">{{
diff --git a/src/views/system/role/utils/hook.tsx b/src/views/system/role/utils/hook.tsx
index 8614623..fad3bd6 100644
--- a/src/views/system/role/utils/hook.tsx
+++ b/src/views/system/role/utils/hook.tsx
@@ -10,7 +10,7 @@ import { getMenuListApi, MenuDTO } from "@/api/system/menu";
 import { ElMessage, ElMessageBox } from "element-plus";
 import { usePublicHooks } from "../../hooks";
 import { type PaginationProps } from "@pureadmin/table";
-import { onMounted, reactive, ref, toRaw } from "vue";
+import { onMounted, reactive, ref, toRaw, watch } from "vue";
 import { toTree } from "@/utils/tree";
 
 export function useRole() {
@@ -19,13 +19,14 @@ export function useRole() {
     roleName: "",
     status: undefined
   });
-  const dataList = ref([]);
+  const dataList = ref<RoleDTO[]>([]);
   const loading = ref(true);
   const switchLoadMap = ref({});
   const { switchStyle } = usePublicHooks();
+  const activeTab = ref('');
   const pagination = reactive<PaginationProps>({
     total: 0,
-    pageSize: 10,
+    pageSize: 100,
     currentPage: 1,
     background: true
   });
@@ -189,7 +190,8 @@ export function useRole() {
     form,
     loading,
     columns,
-    dataList,
+    dataList, 
+    activeTab,
     pagination,
     onSearch,
     resetForm,