From 482fb1a0d105d2eea90da4470c5d89fb2b570c2c Mon Sep 17 00:00:00 2001 From: Bunny <1319900154@qq.com> Date: Sat, 26 Oct 2024 15:11:36 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=F0=9F=9A=80=20=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E4=B8=BA=E8=8F=9C=E5=8D=95=E5=88=86=E9=85=8D=E8=A7=92=E8=89=B2?= =?UTF-8?q?,=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E8=A7=92=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/html/button.html | 740 ------------------ src/api/v1/menu.ts | 5 + src/store/system/menu.ts | 17 +- .../system/menu/assign-router-to-role.vue | 4 +- src/views/system/menu/index.vue | 42 +- src/views/system/menu/utils/columns.tsx | 30 +- src/views/system/menu/utils/hooks.tsx | 95 ++- 7 files changed, 151 insertions(+), 782 deletions(-) delete mode 100644 public/html/button.html diff --git a/public/html/button.html b/public/html/button.html deleted file mode 100644 index a4505ce..0000000 --- a/public/html/button.html +++ /dev/null @@ -1,740 +0,0 @@ - - - - - - - -
-
JAVA攻城狮
-
Golang工程师!
-
js攻城狮
-
-
- Ruby攻城狮 -
- -
- VB攻城狮 -
-
-
python攻城狮
-
python攻城狮
-
python攻城狮
-
python攻城狮
-
python攻城狮
- -
php攻城狮
-
php攻城狮
-
php攻城狮
-
php攻城狮
-
php攻城狮
- -
kotlin攻城狮
-
kotlin攻城狮
-
kotlin攻城狮
-
kotlin攻城狮
-
kotlin攻城狮
-
C语言攻城狮
-
- - - diff --git a/src/api/v1/menu.ts b/src/api/v1/menu.ts index fd5a4f8..f6e2f5d 100644 --- a/src/api/v1/menu.ts +++ b/src/api/v1/menu.ts @@ -23,6 +23,11 @@ export const fetchAssignRolesToRouter = (data: any) => { return http.request>('post', `routerRole/assignRolesToRouter`, { data }); }; +/** 菜单管理-清除选中菜单所有角色 */ +export const fetchClearAllRolesSelect = (data: any) => { + return http.request>('delete', `routerRole/clearAllRolesSelect`, { data }); +}; + /** 菜单管理-更新菜单 */ export const fetchUpdateMenu = (data?: any) => { return http.request>('put', `router/updateMenu`, { data }); diff --git a/src/store/system/menu.ts b/src/store/system/menu.ts index f9d6045..c76ab9b 100644 --- a/src/store/system/menu.ts +++ b/src/store/system/menu.ts @@ -1,7 +1,16 @@ import { defineStore } from 'pinia'; import { storeMessage } from '@/utils/message'; import { handleTree } from '@/utils/tree'; -import { fetchAddMenu, fetchAssignRolesToRouter, fetchDeletedMenuByIds, fetchGetMenusList, fetchGetRoleListByRouterId, fetchUpdateMenu, fetchUpdateMenuByIdWithRank } from '@/api/v1/menu'; +import { + fetchAddMenu, + fetchAssignRolesToRouter, + fetchClearAllRolesSelect, + fetchDeletedMenuByIds, + fetchGetMenusList, + fetchGetRoleListByRouterId, + fetchUpdateMenu, + fetchUpdateMenuByIdWithRank, +} from '@/api/v1/menu'; import { isAllEmpty } from '@pureadmin/utils'; import { $t } from '@/plugins/i18n'; @@ -66,5 +75,11 @@ export const userMenuStore = defineStore('menuStore', { const result = await fetchAssignRolesToRouter(data); return storeMessage(result); }, + + /** 清除选中菜单所有角色 */ + async clearAllRolesSelect(data: any) { + const result = await fetchClearAllRolesSelect(data); + return storeMessage(result); + }, }, }); diff --git a/src/views/system/menu/assign-router-to-role.vue b/src/views/system/menu/assign-router-to-role.vue index 5dfa0d9..2710caf 100644 --- a/src/views/system/menu/assign-router-to-role.vue +++ b/src/views/system/menu/assign-router-to-role.vue @@ -22,7 +22,9 @@ const getRoleListByRouterId = async () => { // 根据用户id查询角色信息 const routerId = props.routerId; - assignRoles.value = await menuStore.getRoleListByRouterId({ routerId }); + if (routerId) { + assignRoles.value = await menuStore.getRoleListByRouterId({ routerId }); + } }; onMounted(() => { diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue index 4c91233..6526c82 100644 --- a/src/views/system/menu/index.vue +++ b/src/views/system/menu/index.vue @@ -6,7 +6,20 @@ import Delete from '@iconify-icons/ep/delete'; import EditPen from '@iconify-icons/ep/edit-pen'; import Refresh from '@iconify-icons/ep/refresh'; import AddFill from '@iconify-icons/ri/add-circle-line'; -import { assignRolesToRouter, handleDelete, onAdd, onChangeMenuRank, onchangeVisible, onSearch, onUpdate, switchLoadMap } from '@/views/system/menu/utils/hooks'; +import { + assignBatchRolesToRouter, + assignRolesToRouter, + clearAllRolesSelect, + onAdd, + onChangeMenuRank, + onchangeVisible, + onDelete, + onSearch, + onUpdate, + selectIds, + switchLoadMap, + tableRef, +} from '@/views/system/menu/utils/hooks'; import PureTable from '@pureadmin/table'; import { columns } from '@/views/system/menu/utils/columns'; import { userMenuStore } from '@/store/system/menu'; @@ -19,7 +32,6 @@ import { FormInstance } from 'element-plus'; import { usePublicHooks } from '@/views/hooks'; const formRef = ref(); -const tableRef = ref(); const routerStore = userMenuStore(); // 用户是否停用样式 const { switchStyle } = usePublicHooks(); @@ -34,6 +46,14 @@ const resetForm = async (formEl: FormInstance | undefined) => { await onSearch(); }; +/** + * * 选择多行 + * @param rows + */ +const onSelectionChange = (rows: Array) => { + selectIds.value = rows.map((row: any) => row.id); +}; + onMounted(() => { onSearch(); }); @@ -50,10 +70,18 @@ onMounted(() => { {{ $t('buttons.reset') }} - + +