feat: 角色管理

apps/web-antd/src/views/system/role/menu-select.vue

@@ -3,46 +3,85 @@ import type { CheckboxChangeEvent } from 'ant-design-vue/es/checkbox/interface';
 import type { DataNode } from 'ant-design-vue/es/tree';
 import type { CheckInfo } from 'ant-design-vue/es/vc-tree/props';
 
-import type { Menu } from '#/api/system/menu/model';
+import { computed, type PropType, ref, watch } from 'vue';
 
-import { computed, onMounted, type PropType, ref } from 'vue';
-
-import { filter, listToTree } from '@vben/utils';
+import { findGroupParentIds, treeToList } from '@vben/utils';
 
 import { Checkbox, Tree } from 'ant-design-vue';
 
-import { menuList } from '#/api/system/menu';
-
-import { excludeIds } from '../tenantPackage/data';
-
 defineOptions({ inheritAttrs: false });
 
+const props = defineProps({
+  checkStrictly: {
+    default: true,
+    type: Boolean,
+  },
+  menuTree: {
+    default: () => [],
+    type: Array as PropType<DataNode[]>,
+  },
+});
+const emit = defineEmits<{ checkStrictlyChange: [boolean] }>();
+
 const expandStatus = ref(false);
 const selectAllStatus = ref(false);
-const association = ref(true);
 
-const associationText = computed(() => {
-  return association.value ? '父子节点关联' : '父子节点独立';
+/**
+ * 后台的这个字段跟antd/ele是反的
+ * 组件库这个字段代表不关联
+ * 后台这个代表关联
+ */
+const innerCheckedStrictly = computed(() => {
+  return !props.checkStrictly;
 });
 
-const menuTree = ref<DataNode[]>([]);
-// checkable 状态下节点选择完全受控（父子节点选中状态不再关联）
-const menuCheckStrictly = ref<boolean>(false);
-// const checkedKeys = ref<string[]>([]);
+function handleCheckStrictlyChange(e: CheckboxChangeEvent) {
+  emit('checkStrictlyChange', e.target.checked);
+}
+
+const associationText = computed(() => {
+  return props.checkStrictly ? '父子节点关联' : '父子节点独立';
+});
+
+/**
+ * 这个只用于界面显示
+ * 关联情况下 只会有最末尾的节点被选中
+ */
 const checkedKeys = defineModel('value', {
   default: () => [],
   type: Array as PropType<(number | string)[]>,
 });
 // 所有节点的ID
-const responseAllKeys = ref<any[]>([]);
+const allKeys = computed(() => {
+  return treeToList(props.menuTree).map((item: any) => item.id);
+});
 
 /** 已经选择的所有节点  包括子/父节点 */
-// const checkedMenuKeys = ref<(number | string)[]>([]);
+const checkedMenuKeys = ref<(number | string)[]>([]);
+
+/**
+ * 取第一次的menuTree id 设置到checkedMenuKeys
+ * 主要为了解决没有任何修改 直接点击保存的情况
+ */
+const stop = watch(
+  () => props.menuTree,
+  () => {
+    /** 节点关联情况下是不带父节点的 */
+    if (props.checkStrictly) {
+      /** 找到父节点 添加上 */
+      const parentIds = findGroupParentIds(
+        props.menuTree,
+        checkedKeys.value as any,
+      );
+      checkedMenuKeys.value = [...parentIds, ...checkedKeys.value];
+    } else {
+      /** 节点独立 这里是全部的节点 */
+      checkedMenuKeys.value = checkedKeys.value;
+    }
+    stop();
+  },
+);
 
-const checkedMenuKeys = defineModel('none', {
-  default: () => [],
-  type: Array as PropType<(number | string)[]>,
-});
 /**
  *
  * @param checkedKeys 已经选中的子节点的ID
@@ -61,43 +100,22 @@ function handleChecked(checkedKeys: CheckedState, info: CheckInfo) {
   }
 }
 
-/**
- * 不显示租户相关菜单  分配了也没法使用
- * @param menuTree menus
- */
-function transformMenu(menuTree: Menu[]) {
-  return filter(
-    menuTree,
-    (item) => {
-      if (excludeIds.includes(item.menuId)) {
-        return false;
-      }
-      return true;
-    },
-    { id: 'menuId', pid: 'parentId', children: 'children' },
-  );
-}
-
 function handleExpandChange(e: CheckboxChangeEvent) {
   // 这个用于展示
-  checkedKeys.value = e.target.checked ? responseAllKeys.value : [];
+  checkedKeys.value = e.target.checked ? allKeys.value : [];
   // 这个用于提交
-  checkedMenuKeys.value = e.target.checked ? responseAllKeys.value : [];
+  checkedMenuKeys.value = e.target.checked ? allKeys.value : [];
 }
 
-onMounted(async () => {
-  const resp = await menuList();
-  // 去除租户相关菜单(分配了也无权限)
-  const afterTransform = transformMenu(resp);
-  responseAllKeys.value = afterTransform.map((item) => item.menuId);
-  console.log(responseAllKeys.value);
-  const tree = listToTree(afterTransform, { id: 'menuId' });
-  menuTree.value = tree;
+const expandedKeys = ref<string[]>([]);
+function handleExpandOrCollapseAll(e: CheckboxChangeEvent) {
+  const expand = e.target.checked;
+  expandedKeys.value = expand ? allKeys.value : [];
+}
+
+defineExpose({
+  getCheckedKeys: () => checkedMenuKeys.value,
 });
-
-function test() {
-  console.log(checkedMenuKeys.value);
-}
 </script>
 
 <template>
@@ -105,7 +123,7 @@ function test() {
     <div class="flex items-center gap-2 border-b-[1px] pb-2">
       <span>节点状态: </span>
       <span
-        :class="[association ? 'text-primary' : 'text-red-500']"
+        :class="[props.checkStrictly ? 'text-primary' : 'text-red-500']"
         class="font-semibold"
       >
         {{ associationText }}
@@ -114,24 +132,31 @@ function test() {
     <div
       class="flex flex-wrap items-center justify-between border-b-[1px] py-2"
     >
-      <Checkbox v-model:checked="expandStatus">展开/折叠全部</Checkbox>
+      <Checkbox
+        v-model:checked="expandStatus"
+        @change="handleExpandOrCollapseAll"
+      >
+        展开/折叠全部
+      </Checkbox>
       <Checkbox v-model:checked="selectAllStatus" @change="handleExpandChange">
         全选/取消全选
       </Checkbox>
-      <Checkbox v-model:checked="association">父子节点关联</Checkbox>
+      <Checkbox :checked="checkStrictly" @change="handleCheckStrictlyChange">
+        父子节点关联
+      </Checkbox>
     </div>
     <div class="py-2">
       <Tree
         v-if="menuTree.length > 0"
-        v-model:check-strictly="menuCheckStrictly"
+        v-model:check-strictly="innerCheckedStrictly"
         v-model:checked-keys="checkedKeys"
+        v-model:expanded-keys="expandedKeys"
         :checkable="true"
-        :field-names="{ title: 'menuName', key: 'menuId' }"
+        :field-names="{ title: 'label', key: 'id' }"
         :selectable="false"
         :tree-data="menuTree"
         @check="handleChecked"
       />
     </div>
-    <a-button @click="test"> 测试 </a-button>
   </div>
 </template>

apps/web-antd/src/views/system/role/role-drawer.vue

@@ -4,8 +4,10 @@ import { computed, ref } from 'vue';
 import { useVbenDrawer } from '@vben/common-ui';
 import { $t } from '@vben/locales';
 
+import { cloneDeep } from 'lodash-es';
+
 import { useVbenForm } from '#/adapter';
-import { roleMenuTreeSelect } from '#/api/system/menu';
+import { menuTreeSelect, roleMenuTreeSelect } from '#/api/system/menu';
 import { roleAdd, roleInfo, roleUpdate } from '#/api/system/role';
 
 import { drawerSchema } from './data';
@@ -31,10 +33,19 @@ const [BasicForm, formApi] = useVbenForm({
   wrapperClass: 'grid-cols-2',
 });
 
-async function setupMenuTree(id: number | string) {
-  const resp = await roleMenuTreeSelect(id);
-  console.log(resp);
-  formApi.setFieldValue('menuIds', resp.checkedKeys);
+const menuTree = ref<any[]>([]);
+async function setupMenuTree(id?: number | string) {
+  if (id) {
+    const resp = await roleMenuTreeSelect(id);
+    formApi.setFieldValue('menuIds', resp.checkedKeys);
+    // 设置菜单信息
+    menuTree.value = resp.menus;
+  } else {
+    const resp = await menuTreeSelect();
+    formApi.setFieldValue('menuIds', []);
+    // 设置菜单信息
+    menuTree.value = resp;
+  }
 }
 
 const [BasicDrawer, drawerApi] = useVbenDrawer({
@@ -47,18 +58,25 @@ const [BasicDrawer, drawerApi] = useVbenDrawer({
     drawerApi.drawerLoading(true);
     const { id } = drawerApi.getData() as { id?: number | string };
     isUpdate.value = !!id;
+
     if (isUpdate.value && id) {
       const record = await roleInfo(id);
       for (const key in record) {
         await formApi.setFieldValue(key, record[key as keyof typeof record]);
       }
-      // 设置选中的菜单
-      await setupMenuTree(id);
     }
+    // init菜单 注意顺序要放在赋值record之后 内部watch会依赖record
+    await setupMenuTree(id);
+
     drawerApi.drawerLoading(false);
   },
 });
 
+/**
+ * 这里拿到的是一个数组ref
+ */
+const menuSelectRef = ref();
+
 async function handleConfirm() {
   try {
     drawerApi.drawerLoading(true);
@@ -66,7 +84,11 @@ async function handleConfirm() {
     if (!valid) {
       return;
     }
-    const data = await formApi.getValues();
+    // 这个用于提交
+    const menuIds = menuSelectRef.value?.[0]?.getCheckedKeys() ?? [];
+    // formApi.getValues拿到的是一个readonly对象，不能直接修改，需要cloneDeep
+    const data = cloneDeep(await formApi.getValues());
+    data.menuIds = menuIds;
     await (isUpdate.value ? roleUpdate(data) : roleAdd(data));
     emit('reload');
     await handleCancel();
@@ -82,9 +104,12 @@ async function handleCancel() {
   await formApi.resetForm();
 }
 
-async function test() {
-  const data = await formApi.getValues();
-  console.log(data);
+/**
+ * 通过回调更新 无法通过v-model
+ * @param value 菜单选择是否严格模式
+ */
+function handleMenuCheckStrictlyChange(value: boolean) {
+  formApi.setFieldValue('menuCheckStrictly', value);
 }
 </script>
 
@@ -92,19 +117,15 @@ async function test() {
   <BasicDrawer :close-on-click-modal="false" :title="title" class="w-[600px]">
     <BasicForm>
       <template #menuIds="slotProps">
-        <MenuSelect v-bind="slotProps" />
+        <!-- check-strictly为readonly 不能通过v-model绑定 -->
+        <MenuSelect
+          ref="menuSelectRef"
+          v-bind="slotProps"
+          :check-strictly="formApi.form.values.menuCheckStrictly"
+          :menu-tree="menuTree"
+          @check-strictly-change="handleMenuCheckStrictlyChange"
+        />
       </template>
     </BasicForm>
-    <a-button @click="test">测试</a-button>
   </BasicDrawer>
 </template>
-
-<style lang="scss" scoped>
-/**
-自定义组件校验失败样式
-*/
-:deep(.form-valid-error .ant-input[name='clientSecret']) {
-  border-color: hsl(var(--destructive));
-  box-shadow: 0 0 0 2px rgb(255 38 5 / 6%);
-}
-</style>