fix(front):

增租户菜单、租户角色 同时修改相应页面及BUG

@@ -6,6 +6,7 @@ export type AccountParams = BasicPageParams & {
 };
 
 export type RoleParams = {
+  roleType?:string;
   roleName?: string;
   status?: string;
 };

@@ -44,6 +44,8 @@ export const getMenuList = (params?: MenuParams) =>
 
 export const getRoleListByPage = (params?: RolePageParams) =>
   defHttp.get<RolePageListGetResultModel>({url: Api.RolePageList, params});
+export const getTenantRoleListByPage= (params?: RolePageParams) =>
+  defHttp.get<RolePageListGetResultModel>({url: Api.RolePageList, params});
 
 export const getAllRoleList = (params?: RoleParams) =>
   defHttp.post<RoleListGetResultModel>({url: Api.GetAllRoleList, params});

 export enum RoleEnum {
   ROLE_SYS_ADMIN = "ROLE_SYS_ADMIN",
   ROLE_TENANT_ADMIN = "ROLE_TENANT_ADMIN",
-  ROLE_NORMAL_USER = "ROLE_NORMAL_USER"
+  ROLE_NORMAL_USER = "ROLE_NORMAL_USER",
+  ROLE_PLATFORM_ADMIN="ROLE_PLATFORM_ADMIN"
 }

@@ -16,6 +16,7 @@
               label:'删除',
               icon: 'ant-design:delete-outlined',
               color: 'error',
+              ifShow:record.roleType!=RoleEnum.ROLE_SYS_ADMIN,
               popConfirm: {
                 title: '是否确认删除',
                 confirm: handleDelete.bind(null, record),
@@ -36,8 +37,8 @@
 
   import { useDrawer } from '/@/components/Drawer';
   import RoleDrawer from './RoleDrawer.vue';
-
   import { columns, searchFormSchema } from './role.data';
+  import {RoleEnum} from "/@/enums/roleEnum";
 
   export default defineComponent({
     name: 'RoleManagement',
@@ -101,6 +102,7 @@
         handleEdit,
         handleDelete,
         handleSuccess,
+        RoleEnum
       };
     },
   });

@@ -75,6 +75,7 @@ import {Tag} from 'ant-design-vue';
 import TenantAdminFormDrawer from "./TenantAdminFormDrawer.vue"
 import {MessageTypeEnum, SendResetPasswordEmailMsg} from "/@/api/tenant/tenantInfo";
 import {useMessage} from "/@/hooks/web/useMessage";
+import {RoleEnum} from "/@/enums/roleEnum";
 export default defineComponent({
   name: 'TenantAdminDrawer',
   components: {
@@ -155,7 +156,8 @@ export default defineComponent({
       bordered: true,
       showIndexColumn: false,
       searchInfo: {
-        tenantCode: tenantCode
+        tenantCode: tenantCode,
+        roleType: RoleEnum.ROLE_TENANT_ADMIN
       },
       actionColumn: {
         width: 100,

@@ -48,11 +48,13 @@ export default defineComponent({
       {
         field: 'phoneNumber',
         label: '电话号码:',
+        required: true,
         component: 'Input',
       },
       {
         field: 'email',
         label: '邮件:',
+        required: true,
         component: 'Input',
       },
       {
@@ -79,7 +81,6 @@ export default defineComponent({
       await resetFields();
       isUpdate.value = !!data?.isUpdate;
       tenantCode.value = data?.tenantCode;
-      console.log(data, "from TenantAdminFormDrawer ")
       await updateSchema({field: 'title', componentProps: {disabled: false}});
       if (unref(isUpdate)) {
         await setFieldsValue({
@@ -102,7 +103,6 @@ export default defineComponent({
           tenantExpireTime: (typeof values.tenantExpireTime != 'undefined' && values.tenantExpireTime != null) ? values.tenantExpireTime.format('YYYY-MM-DD HH:mm:ss') : null,
           tenantCode: tenantCode.value
         }
-        console.log(requestParams, "requestParams");
         setDrawerProps({confirmLoading: true});
         saveTenantAdmin(requestParams as any as UserDTO).then(() => {
           closeDrawer();//关闭侧框

@@ -99,8 +99,6 @@ export default defineComponent({
       await updateSchema({field: 'title', componentProps: {disabled: false}});
       //如果是编辑操作，设置页面数据
       if (unref(isUpdate)) {
-        console.log(data.record, "编辑时获得的值");
-
         //为表单赋值
         setFieldsValue({
           ...data.record,
@@ -118,16 +116,15 @@ export default defineComponent({
       try {
         const values = await validate();
         setDrawerProps({confirmLoading: true});
-        console.log(tenantLogo, "tenantLogo");
         const req = {
           id: values.id,
           icon: tenantLogo.value,
           name: values.name,
           enabled: values.enabled,
           description: values.description,
+          roleIds:values.roleIds,
           tenantExpireTime: (typeof values.tenantExpireTime != 'undefined' && values.tenantExpireTime != null) ? values.tenantExpireTime.format('YYYY-MM-DD HH:mm:ss') : null
         };
-        console.log(req, "real req");
         updateOrCreateTenant(req).then(() => {
           closeDrawer();//关闭侧框
           emit('success');

 import { BasicColumn } from "/@/components/Table/src/types/table";
 import {FormSchema} from "/@/components/Form";
+import {getAllRoleList} from "/@/api/system/system";
+import {RoleEnum} from "/@/enums/roleEnum";
 
 export function getBasicColumns(): BasicColumn[] {
     return [
@@ -31,12 +33,17 @@ export function getBasicColumns(): BasicColumn[] {
         dataIndex: 'tenantExpireTime',
         width: 150,
       },
+      {
+        title: '创建时间',
+        dataIndex: 'createTime',
+        width: 150,
+      },
     ]
     }
 export const tenantFormSchema: FormSchema[] = [
   {
     field: 'id',
-    label: '租户图标: ',
+    label: 'id',
     slot: 'iconSelect',
     component: 'Input',
     show:false
@@ -54,6 +61,21 @@ export const tenantFormSchema: FormSchema[] = [
     component: 'Input',
   },
   {
+    field: 'roleIds',
+    label: '租户角色:',
+    component: 'ApiSelect',
+    required: true,
+    componentProps: {
+      mode: 'multiple',
+      api:getAllRoleList,
+      params:{
+        roleType:RoleEnum.ROLE_TENANT_ADMIN
+      },
+      labelField:'name',
+      valueField:'id',
+    },
+  },
+  {
     field: 'enabled',
     label: '状态',
     component: 'RadioButtonGroup',

+<template>
+  <BasicDrawer
+    v-bind="$attrs"
+    @register="registerDrawer"
+    showFooter
+    :title="getTitle"
+    width="500px"
+    @ok="handleSubmit"
+  >
+    <BasicForm @register="registerForm">
+      <template #menu="{ model, field }">
+        <BasicTree
+          v-model:value="model[field]"
+          :treeData="treeData"
+          :replaceFields="{ title: 'menuName' }"
+          :checked-keys="roleMenus"
+          checkable
+          toolbar
+          title="菜单分配"
+        />
+      </template>
+    </BasicForm>
+  </BasicDrawer>
+</template>
+<script lang="ts">
+import {defineComponent, ref, computed, unref} from 'vue';
+import {BasicForm, useForm} from '/@/components/Form/index';
+import {formSchema} from './role.data';
+import {BasicDrawer, useDrawerInner} from '/@/components/Drawer';
+import {BasicTree, TreeItem} from '/@/components/Tree';
+
+const {t} = useI18n(); //加载国际化
+
+// import { getMenuList } from '/@/api/demo/system';
+
+// 加载菜单数据
+import {getMenuList, getMenusIdsByRoleId} from '/@/api/sys/menu';
+import {useI18n} from "/@/hooks/web/useI18n";
+import {RouteItem} from "/@/api/sys/model/menuModel";
+import {saveOrUpdateRoleInfoWithMenu} from "/@/api/system/system";
+import {RoleEnum} from "/@/enums/roleEnum";
+export default defineComponent({
+  name: 'RoleDrawer',
+  components: {BasicDrawer, BasicForm, BasicTree},
+  emits: ['success', 'register'],
+  setup(_, {emit}) {
+    const isUpdate = ref(true);
+    const treeData = ref<TreeItem[]>([]);
+    const roleMenus = ref<string[]>([]);
+    const roleId = ref("");
+
+    const [registerForm, {resetFields, setFieldsValue, validate}] = useForm({
+      labelWidth: 90,
+      schemas: formSchema,
+      showActionButtonGroup: false,
+    });
+
+    function processChildren(items: RouteItem[]) {
+      items.map((item) => {
+        item.menuName = t(item.meta.title);
+        item.icon = item.meta.icon;
+        item.key=item.id;
+        if (item.children) {
+          processChildren(item.children);
+        }
+      });
+    }
+
+    const [registerDrawer, {setDrawerProps, closeDrawer}] = useDrawerInner(async (data) => {
+      resetFields();
+      roleId.value = "";
+      setDrawerProps({confirmLoading: false});
+      // 需要在setFieldsValue之前先填充treeData，否则Tree组件可能会报key not exist警告
+      if (unref(treeData).length === 0) {
+        const menuListModel = await getMenuList();
+        processChildren(menuListModel);
+        let treeValues = new Array<TreeItem>();
+        menuListModel.map((item) => {
+          const data = {
+            menuName: t(item.meta.title),
+            icon: item.meta.icon,
+            key: item.id,
+            children: item.children as any as TreeItem[],
+          }
+          treeValues.push(data);
+        })
+        treeData.value = treeValues;
+      }
+      if (data.record) {
+        roleMenus.value = await getMenusIdsByRoleId(data.record.id);
+        roleId.value = data.record.id;
+      }
+      isUpdate.value = !!data?.isUpdate;
+      if (unref(isUpdate)) {
+        setFieldsValue({
+          ...data.record,
+        });
+      }
+    });
+
+    const getTitle = computed(() => (!unref(isUpdate) ? '新增角色' : '编辑角色'));
+
+    async function handleSubmit() {
+      try {
+        const values = await validate();
+        setDrawerProps({confirmLoading: true});
+        const req = {
+          id: roleId.value,
+          name: values.name,
+          remark: values.remark,
+          status: values.status,
+          roleType: RoleEnum.ROLE_TENANT_ADMIN,
+          menu: [...values.menu]
+        }
+        console.log(req,"请求参数")
+        saveOrUpdateRoleInfoWithMenu(req).then(()=>{
+          closeDrawer();
+          emit('success');
+        })
+      } finally {
+        setDrawerProps({confirmLoading: false});
+      }
+    }
+
+    return {
+      registerDrawer,
+      registerForm,
+      getTitle,
+      handleSubmit,
+      treeData,
+      roleMenus,
+    };
+  },
+});
+</script>

+<template>
+  <div>
+    <BasicTable @register="registerTable">
+      <template #toolbar>
+        <a-button type="primary" @click="handleCreate"> 新增角色 </a-button>
+      </template>
+      <template #action="{ record }">
+        <TableAction
+          :actions="[
+            {
+              label:'编辑',
+              icon: 'clarity:note-edit-line',
+              onClick: handleEdit.bind(null, record),
+            },
+            {
+              label:'删除',
+              icon: 'ant-design:delete-outlined',
+              color: 'error',
+              popConfirm: {
+                title: '是否确认删除',
+                confirm: handleDelete.bind(null, record),
+              },
+            },
+          ]"
+        />
+      </template>
+    </BasicTable>
+    <RoleDrawer @register="registerDrawer" @success="handleSuccess" />
+  </div>
+</template>
+<script lang="ts">
+  import { defineComponent } from 'vue';
+
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import {delRole, getRoleListByPage} from '/@/api/system/system';
+
+  import { useDrawer } from '/@/components/Drawer';
+  import RoleDrawer from './RoleDrawer.vue';
+  import { columns, searchFormSchema } from './role.data';
+  import {RoleEnum} from "/@/enums/roleEnum";
+
+  export default defineComponent({
+    name: 'TenantRoleManagement',
+    components: { BasicTable, RoleDrawer, TableAction },
+    setup() {
+      const [registerDrawer, { openDrawer }] = useDrawer();
+      const [registerTable, { reload }] = useTable({
+        title: '租户角色列表',
+        api: getRoleListByPage,
+        columns,
+        tableSetting:{
+          redo:true,
+          size:false,
+          setting:false
+        },
+        formConfig: {
+          labelWidth: 120,
+          schemas: searchFormSchema,
+        },
+        useSearchForm: true,
+        showTableSetting: true,
+        bordered: true,
+        showIndexColumn: false,
+        actionColumn: {
+          width: 80,
+          title: '操作',
+          dataIndex: 'action',
+          slots: { customRender: 'action' },
+          fixed: undefined,
+        },
+      });
+
+      function handleCreate() {
+        openDrawer(true, {
+          isUpdate: false,
+        });
+      }
+
+      function handleEdit(record: Recordable) {
+        openDrawer(true, {
+          record,
+          isUpdate: true,
+        });
+      }
+
+      async function handleDelete(record: Recordable) {
+        const roleIds = [record.id]
+        delRole(roleIds).then(()=>{
+          reload();
+        })
+
+      }
+      function handleSuccess() {
+        reload();
+      }
+
+      return {
+        registerTable,
+        registerDrawer,
+        handleCreate,
+        handleEdit,
+        handleDelete,
+        handleSuccess,
+        RoleEnum
+      };
+    },
+  });
+</script>

+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import {h} from 'vue';
+import {Switch} from 'ant-design-vue';
+import {setRoleStatus} from '/@/api/system/system';
+import {useMessage} from '/@/hooks/web/useMessage';
+import {RoleEnum} from "/@/enums/roleEnum";
+export const columns: BasicColumn[] = [
+  {
+    title: '角色名称',
+    dataIndex: 'name',
+    width: 180,
+  },
+  {
+    title: '角色Code',
+    dataIndex: 'code',
+    width: 180,
+  },
+  {
+    title: '状态',
+    dataIndex: 'status',
+    width: 120,
+    customRender: ({record}) => {
+      if (!Reflect.has(record, 'pendingStatus')) {
+        record.pendingStatus = false;
+      }
+      return h(Switch, {
+        checked: record.status === 1,
+        checkedChildren: '已启用',
+        unCheckedChildren: '已禁用',
+        loading: record.pendingStatus,
+        onChange(checked: boolean) {
+          record.pendingStatus = true;
+          const newStatus = checked ? 1 : 0;
+          const {createMessage} = useMessage();
+          setRoleStatus(record.id, newStatus)
+            .then(() => {
+              record.status = newStatus;
+              createMessage.success(`已成功修改角色状态`);
+            })
+            .catch(() => {
+              createMessage.error('修改角色状态失败');
+            })
+            .finally(() => {
+              record.pendingStatus = false;
+            });
+        },
+      });
+    },
+  },
+
+  {
+    title: '备注',
+    dataIndex: 'remark',
+    width:240,
+  },
+  {
+    title: '创建时间',
+    dataIndex: 'createTime',
+    width: 180,
+  },
+];
+
+export const searchFormSchema: FormSchema[] = [
+  {
+    field: 'roleName',
+    label: '角色名称',
+    component: 'Input',
+    colProps: {span: 8},
+  },
+  {
+    field: 'roleType',
+    label: '',
+    component: 'Input',
+    colProps: {span: 8},
+    defaultValue:RoleEnum.ROLE_TENANT_ADMIN,
+    ifShow:false
+  },
+  {
+    field: 'status',
+    label: '状态',
+    component: 'Select',
+    componentProps: {
+      options: [
+        {label: '启用', value: 1},
+        {label: '停用', value: 0},
+      ],
+    },
+    colProps: {span: 8},
+  },
+];
+
+export const formSchema: FormSchema[] = [
+  {
+    field: 'name',
+    label: '角色名称',
+    required: true,
+    component: 'Input',
+  },
+  {
+    field: 'status',
+    label: '状态',
+    component: 'RadioButtonGroup',
+    defaultValue: 0,
+    componentProps: {
+      options: [
+        {label: '启用', value: 1},
+        {label: '停用', value: 0},
+      ],
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    component: 'InputTextArea',
+  },
+  {
+    label: ' ',
+    field: 'menu',
+    slot: 'menu',
+    component: 'Input',
+  },
+];