fix: 租户页面及套餐调整;加入套餐权限分配功能

src/api/sys/sysTenantPackageApi.ts

@@ -7,6 +7,8 @@ enum Api {
   sysTenantPackageAdd = '/sys/tenantPackage/add',
   sysTenantPackageEdit = '/sys/tenantPackage/edit',
   sysTenantPackageRemove = '/sys/tenantPackage/removeByIds',
+  sysPackageAssign = '/sys/tenantPackage/assign',
+  sysPackageQueryMenuTree = '/sys/tenantPackage/menu/list',
 }
 
 /**
@@ -98,3 +100,18 @@ export const sysTenantPackageEdit = (params?: object) => {
 export const sysTenantPackageRemove = (params: Array<string | number>) => {
   return defHttp.post({ url: Api.sysTenantPackageRemove, params: params });
 };
+/**
+ * @description: 分配租户套餐,权限 - sys:tenantPackage:assign
+ * @method: POST
+ */
+export const sysPackageAssign = (params?: object) => {
+  return defHttp.post({ url: Api.sysPackageAssign, params: params });
+};
+
+/**
+ * @description: 查询角色信息列表,权限 - sys:role:query
+ * @method: POST
+ */
+export const sysPackageQueryMenuTree = id => {
+  return defHttp.get({ url: Api.sysPackageQueryMenuTree + '/' + id });
+};

src/views/sys/sysTenant/package/FormModalAssignMenu.vue

@@ -0,0 +1,104 @@
+<template>
+  <BasicModal
+    v-bind="$attrs"
+    destroyOnClose
+    @register="registerModal"
+    title="分配菜单"
+    @ok="handleSubmit"
+  >
+    <BasicTree
+      :checkedKeys="checkedKeys"
+      :treeData="treeData"
+      checkable
+      @check="handleCheck"
+      :defaultExpandAll="true"
+      :multiple="true"
+      :fieldNames="{ key: 'id', title: 'name' }"
+    />
+  </BasicModal>
+</template>
+<script lang="ts" setup>
+  import { onMounted, ref } from 'vue';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { BasicTree } from '/@/components/Tree';
+  import { sysPackageAssign, sysPackageQueryMenuTree } from '/@/api/sys/sysTenantPackageApi';
+
+  import { sysMenuQueryTree } from '/@/api/sys/sysMenuApi';
+
+  const emit = defineEmits(['success', 'register']);
+
+  const treeData = ref([]) as any;
+  const packageId = ref();
+  const checkedKeys = ref([]);
+  const halfCheckedKeys = ref([]);
+  const parentIds = ref([]) as any;
+  onMounted(() => {
+    getTreeData();
+  });
+
+  const { createMessage, createConfirm } = useMessage();
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(async data => {
+    setModalProps({ confirmLoading: false });
+    packageId.value = data.record.id;
+    // 获取已选中列表
+    const roleMenuList = (await sysPackageQueryMenuTree(packageId.value)) || [];
+    debugger;
+    // 找出菜单的所有父节点ID
+    treeData.value.map(item => {
+      if (item.children.length) {
+        item.children.map(ele => {
+          if (ele.children.length) {
+            parentIds.value.push(ele.id);
+          }
+        });
+      }
+      parentIds.value.push(item.id);
+    });
+    // 因为antd树插件勾选父节点会导致所有子节点选中,所以过滤所有父节点
+    halfCheckedKeys.value = Array.from(parentIds.value);
+    checkedKeys.value = roleMenuList
+      .filter(
+        item =>
+          (!parentIds.value.includes(item.id) && item.parentId != '0') || item.menuType == 'menu',
+      )
+      .map(item => item.id);
+  });
+
+  // 树节点选中事件
+  function handleCheck(keys, e) {
+    halfCheckedKeys.value = e.halfCheckedKeys;
+    checkedKeys.value = keys;
+  }
+
+  // 提交按钮事件
+  async function handleSubmit() {
+    setModalProps({ confirmLoading: true });
+    try {
+      createConfirm({
+        iconType: 'warning',
+        title: '提示',
+        content: '确认分配权限?',
+        onOk: async () => {
+          await sysPackageAssign({
+            menuIds: checkedKeys.value.concat(halfCheckedKeys.value),
+            packageId: packageId.value,
+          });
+          createMessage.success('分配成功！');
+          emit('success', packageId.value);
+          closeModal();
+        },
+      });
+    } catch (error) {
+      // console.log('error', error);
+      createMessage.error((error as unknown as Error).message);
+    } finally {
+      setModalProps({ confirmLoading: false });
+    }
+  }
+
+  // 查询树数据
+  async function getTreeData() {
+    treeData.value = await sysMenuQueryTree({});
+  }
+</script>

src/views/sys/sysTenant/package/index.vue

@@ -25,10 +25,18 @@
               {
                 auth: 'sys:tenantPackage:edit',
                 icon: 'icon-edit|iconfont',
+                ifShow: record.type != 'sys',
                 tooltip: '编辑',
                 label: '编辑',
                 onClick: handleEdit.bind(null, record),
               },
+              {
+                icon: 'icon-setting|iconfont',
+                tooltip: '分配菜单',
+                label: '分配菜单',
+                onClick: handleAssignMenu.bind(null, record),
+                ifShow: record.type != 'sys',
+              },
               {
                 auth: 'sys:tenantPackage:remove',
                 ifShow: record.type != 'sys',
@@ -68,6 +76,7 @@
     </BasicTable>
     <FormDrawer @register="registerDrawer" @success="handleSuccess" />
     <ViewDrawer @register="registerDrawerView" @success="handleSuccess" />
+    <FormModalAssignMenu @register="registerModalAssignMenu" />
   </div>
 </template>
 <script lang="ts" setup>
@@ -83,6 +92,7 @@
   import ViewDrawer from './viewDrawer.vue';
   import { columns, searchFormSchema } from './data';
 
+  import FormModalAssignMenu from './FormModalAssignMenu.vue';
   import {
     sysTenantPackageQueryPage,
     sysTenantPackageRemove,
@@ -91,6 +101,7 @@
   import { formatDictColor, formatDictValue } from '/@/utils';
   import { useDrawer } from '/@/components/Drawer';
 
+  import { useModal } from '/@/components/Modal';
   const typeOptions = ref();
   const disableOptions = ref();
   onBeforeMount(async () => {
@@ -103,7 +114,13 @@
   const [registerDrawer, { openDrawer }] = useDrawer();
   const [registerDrawerView, { openDrawer: openDrawerView }] = useDrawer();
 
+  const [registerModalAssignMenu, { openModal: openModalAssignMenu }] = useModal();
+
   const tableSort = ref([
+    {
+      field: 'type',
+      direction: 'DESC',
+    },
     {
       field: 'create_time',
       direction: 'DESC',
@@ -132,7 +149,7 @@
     useSearchForm: true,
     bordered: true,
     actionColumn: {
-      width: 200,
+      width: 300,
       title: '操作',
       dataIndex: 'action',
     },
@@ -181,6 +198,13 @@
       });
     }
   }
+  // 分配菜单按钮事件
+  function handleAssignMenu(record: Recordable) {
+    console.log(record);
+    openModalAssignMenu(true, {
+      record,
+    });
+  }
   // 表格点击字段排序
   function handleSortFn(sortInfo) {
     if (sortInfo?.order && sortInfo?.columnKey) {

src/views/sys/sysTenant/page/data.ts

@@ -167,6 +167,7 @@ export const dataFormSchema: FormSchema[] = [
         dictCode: 'sys_disable_type',
       },
     },
+    defaultValue: '0',
   },
   {
     label: '备注',

src/views/sys/sysTenant/page/index.vue

@@ -25,6 +25,7 @@
               {
                 auth: 'sys:tenant:edit',
                 icon: 'icon-edit|iconfont',
+                ifShow: record.type != 'sys',
                 tooltip: '编辑',
                 label: '编辑',
                 onClick: handleEdit.bind(null, record),
@@ -101,6 +102,10 @@
   const [registerDrawerView, { openDrawer: openDrawerView }] = useDrawer();
 
   const tableSort = ref([
+    {
+      field: 'type',
+      direction: 'DESC',
+    },
     {
       field: 'create_time',
       direction: 'DESC',