feat: 新增tenantPackage 租户套餐功能

apps/web-antd/src/api/system/tenantPackage/index.ts

@@ -20,39 +20,30 @@ export namespace SystemTenantPackageApi {
 
 /** 租户套餐列表 */
 export function getTenantPackagePage(params: PageParam) {
-  return requestClient.get<PageResult<SystemTenantPackageApi.SystemTenantPackage>>('/system/tenant-package/page', {
+  return requestClient.get<PageResult<SystemTenantPackageApi.SystemTenantPackage>>('/system/tenant-package/page', { params });
-    params
-  });
 }
 
 /** 查询租户套餐详情 */
 export function getTenantPackage(id: number) {
-  return requestClient.get(`/system/TenantPackage/get?id=${id}`);
+  return requestClient.get(`/system/tenant-package/get?id=${id}`);
 }
 
 /** 新增租户套餐 */
 export function createTenantPackage(data: SystemTenantPackageApi.SystemTenantPackage) {
-  return requestClient.post('/system/TenantPackage/create', data);
+  return requestClient.post('/system/tenant-package/create', data);
 }
 
 /** 修改租户套餐 */
 export function updateTenantPackage(data: SystemTenantPackageApi.SystemTenantPackage) {
-  return requestClient.put('/system/TenantPackage/update', data);
+  return requestClient.put('/system/tenant-package/update', data);
 }
 
 /** 删除租户套餐 */
 export function deleteTenantPackage(id: number) {
-  return requestClient.delete(`/system/TenantPackage/delete?id=${id}`);
+  return requestClient.delete(`/system/tenant-package/delete?id=${id}`);
 }
 
 /** 获取租户套餐精简信息列表 */
 export function getTenantPackageList() {
   return requestClient.get<SystemTenantPackageApi.SystemTenantPackage[]>('/system/tenant-package/get-simple-list');
 }
-
-/** 导出租户套餐 */
-export function exportTenantPackage(params: any) {
-  return requestClient.download('/system/TenantPackage/export', {
-    params
-  });
-}

apps/web-antd/src/views/system/tenant/data.ts

@@ -3,9 +3,9 @@ import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { SystemTenantApi } from '#/api/system/tenant';
 
 import { z } from '#/adapter/form';
-import { DICT_TYPE, getDictOptions } from '#/utils/dict';
+import { getTenantPackageList } from '#/api/system/tenantPackage';
-import { getTenantPackageList } from '#/api/system/tenant-package';
 import { CommonStatusEnum } from '#/utils/constants';
+import { DICT_TYPE, getDictOptions } from '#/utils/dict';
 
 /** 新增/修改的表单 */
 export function useFormSchema(): VbenFormSchema[] {
@@ -151,16 +151,14 @@ export function useGridFormSchema(): VbenFormSchema[] {
       component: 'RangePicker',
       componentProps: {
         allowClear: true,
-      }
+      },
     },
   ];
 }
 
 /** 列表的字段 */
 const tenantPackageList = await getTenantPackageList();
-export function useGridColumns<T = SystemTenantApi.SystemTenant>(
+export function useGridColumns<T = SystemTenantApi.SystemTenant>(onActionClick: OnActionClickFn<T>): VxeTableGridOptions['columns'] {
-  onActionClick: OnActionClickFn<T>,
-): VxeTableGridOptions['columns'] {
   return [
     {
       field: 'id',
@@ -178,9 +176,8 @@ export function useGridColumns<T = SystemTenantApi.SystemTenant>(
       minWidth: 180,
       formatter: (row) => {
         const packageId = row.cellValue;
-        return packageId === 0 ? '系统租户' :
+        return packageId === 0 ? '系统租户' : tenantPackageList.find((tenantPackage) => tenantPackage.id === packageId)?.name || '-';
-          tenantPackageList.find((tenantPackage) => tenantPackage.id === packageId)?.name || '-';
+      },
-      }
     },
     {
       field: 'contactName',

apps/web-antd/src/views/system/tenantPackage/data.ts

@@ -0,0 +1,131 @@
+import type { VbenFormSchema } from '#/adapter/form';
+import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { SystemTenantPackageApi } from '#/api/system/tenantPackage';
+
+import { z } from '#/adapter/form';
+import { CommonStatusEnum } from '#/utils/constants';
+import { DICT_TYPE, getDictOptions } from '#/utils/dict';
+
+/** 新增/修改的表单 */
+export function useFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'name',
+      label: '套餐名称',
+      component: 'Input',
+      rules: 'required',
+    },
+    {
+      fieldName: 'menuIds',
+      label: '菜单权限',
+      component: 'Input',
+      formItemClass: 'items-start',
+    },
+    {
+      fieldName: 'status',
+      label: '状态',
+      component: 'RadioGroup',
+      componentProps: {
+        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
+        buttonStyle: 'solid',
+        optionType: 'button',
+      },
+      rules: z.number().default(CommonStatusEnum.ENABLE),
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'name',
+      label: '套餐名称',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+      },
+    },
+    {
+      fieldName: 'status',
+      label: '状态',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
+      },
+    },
+    {
+      fieldName: 'createTime',
+      label: '创建时间',
+      component: 'RangePicker',
+      componentProps: {
+        allowClear: true,
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns<T = SystemTenantPackageApi.SystemTenantPackage>(onActionClick: OnActionClickFn<T>): VxeTableGridOptions['columns'] {
+  return [
+    {
+      field: 'id',
+      title: '套餐编号',
+      minWidth: 100,
+    },
+    {
+      field: 'name',
+      title: '套餐名称',
+      minWidth: 180,
+    },
+    {
+      field: 'status',
+      title: '状态',
+      minWidth: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.COMMON_STATUS },
+      },
+    },
+    {
+      field: 'remark',
+      title: '备注',
+      minWidth: 200,
+    },
+    {
+      field: 'createTime',
+      title: '创建时间',
+      minWidth: 180,
+      formatter: 'formatDateTime',
+    },
+    {
+      field: 'operation',
+      title: '操作',
+      minWidth: 130,
+      align: 'center',
+      fixed: 'right',
+      cellRender: {
+        attrs: {
+          nameField: 'name',
+          nameTitle: '套餐',
+          onClick: onActionClick,
+        },
+        name: 'CellOperation',
+      },
+    },
+  ];
+}

apps/web-antd/src/views/system/tenantPackage/index.vue

@@ -0,0 +1,111 @@
+<script lang="ts" setup>
+import type { OnActionClickParams, VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { SystemTenantPackageApi } from '#/api/system/tenantPackage';
+
+import { Page, useVbenModal } from '@vben/common-ui';
+
+import { Button, message } from 'ant-design-vue';
+
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
+import { deleteTenantPackage, getTenantPackagePage } from '#/api/system/tenantPackage';
+import { $t } from '#/locales';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function onRefresh() {
+  gridApi.query();
+}
+
+/** 创建租户套餐 */
+function onCreate() {
+  formModalApi.setData(null).open();
+}
+
+/** 编辑租户套餐 */
+function onEdit(row: SystemTenantPackageApi.SystemTenantPackage) {
+  formModalApi.setData(row).open();
+}
+
+/** 删除租户套餐 */
+async function onDelete(row: SystemTenantPackageApi.SystemTenantPackage) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.name]),
+    duration: 0,
+    key: 'action_process_msg',
+  });
+  try {
+    await deleteTenantPackage(row.id as number);
+    message.success({
+      content: $t('ui.actionMessage.deleteSuccess', [row.name]),
+      key: 'action_process_msg',
+    });
+    onRefresh();
+  } catch {
+    hideLoading();
+  }
+}
+
+/** 表格操作按钮的回调函数 */
+function onActionClick({ code, row }: OnActionClickParams<SystemTenantPackageApi.SystemTenantPackage>) {
+  switch (code) {
+    case 'delete': {
+      onDelete(row);
+      break;
+    }
+    case 'edit': {
+      onEdit(row);
+      break;
+    }
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+    // TODO @芋艿：时间筛选，后续处理；
+  },
+  gridOptions: {
+    columns: useGridColumns(onActionClick),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getTenantPackagePage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+    },
+    toolbarConfig: {
+      refresh: { code: 'query' },
+      search: true,
+    },
+  } as VxeTableGridOptions<SystemTenantPackageApi.SystemTenantPackage>,
+});
+</script>
+<template>
+  <Page auto-content-height>
+    <FormModal @success="onRefresh" />
+    <Grid table-title="套餐列表">
+      <template #toolbar-tools>
+        <Button type="primary" @click="onCreate">
+          <Plus class="size-5" />
+          {{ $t('ui.actionTitle.create', ['套餐']) }}
+        </Button>
+      </template>
+    </Grid>
+  </Page>
+</template>

apps/web-antd/src/views/system/tenantPackage/modules/form.vue

@@ -0,0 +1,136 @@
+<script lang="ts" setup>
+import type { SystemDeptApi } from '#/api/system/dept';
+import type { SystemTenantPackageApi } from '#/api/system/tenantPackage';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal, VbenTree } from '@vben/common-ui';
+
+import { Checkbox, message } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import { getMenuList } from '#/api/system/menu';
+import { createTenantPackage, getTenantPackage, updateTenantPackage } from '#/api/system/tenantPackage';
+import { $t } from '#/locales';
+import { handleTree } from '#/utils/tree';
+
+import { useFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formData = ref<SystemTenantPackageApi.SystemTenantPackage>();
+const menuTree = ref<SystemDeptApi.SystemDept[]>([]); // 菜单树
+const menuLoading = ref(false); // 加载菜单列表
+const isAllSelected = ref(false); // 全选状态
+const isExpanded = ref(false); // 展开状态
+const expandedKeys = ref<number[]>([]); // 展开的节点
+
+const getTitle = computed(() => {
+  return formData.value ? $t('ui.actionTitle.edit', ['套餐']) : $t('ui.actionTitle.create', ['套餐']);
+});
+
+const [Form, formApi] = useVbenForm({
+  layout: 'horizontal',
+  schema: useFormSchema(),
+  showDefaultActions: false,
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data = (await formApi.getValues()) as SystemTenantPackageApi.SystemTenantPackage;
+    try {
+      await (formData.value ? updateTenantPackage(data) : createTenantPackage(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      message.success({
+        content: $t('ui.actionMessage.operationSuccess'),
+        key: 'action_process_msg',
+      });
+    } finally {
+      modalApi.lock(false);
+    }
+  },
+  async onOpenChange(isOpen) {
+    // 加载菜单列表
+    await loadMenuTree();
+    if (!isOpen) {
+      return;
+    }
+    const data = modalApi.getData<SystemTenantPackageApi.SystemTenantPackage>();
+    if (!data || !data.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getTenantPackage(data.id as number);
+      await formApi.setValues(data);
+    } finally {
+      modalApi.lock(false);
+    }
+  },
+});
+
+/** 加载菜单树 */
+async function loadMenuTree() {
+  menuLoading.value = true;
+  try {
+    const data = await getMenuList();
+    menuTree.value = handleTree(data);
+  } finally {
+    menuLoading.value = false;
+  }
+}
+
+/** 全选/全不选 */
+function toggleSelectAll() {
+  isAllSelected.value = !isAllSelected.value;
+  if (isAllSelected.value) {
+    const allIds = getAllNodeIds(menuTree.value);
+    formApi.setFieldValue('menuIds', allIds);
+  } else {
+    formApi.setFieldValue('menuIds', []);
+  }
+}
+
+/** 展开/折叠所有节点 */
+function toggleExpandAll() {
+  isExpanded.value = !isExpanded.value;
+  expandedKeys.value = isExpanded.value ? getAllNodeIds(menuTree.value) : [];
+}
+
+/** 递归获取所有节点 ID */
+function getAllNodeIds(nodes: any[], ids: number[] = []): number[] {
+  nodes.forEach((node: any) => {
+    ids.push(node.id);
+    if (node.children && node.children.length > 0) {
+      getAllNodeIds(node.children, ids);
+    }
+  });
+  return ids;
+}
+</script>
+
+<template>
+  <Modal :title="getTitle">
+    <Form class="mx-6">
+      <template #menuIds="slotProps">
+        <Spin :spinning="menuLoading" class="w-full">
+          <!-- TODO @芋艿：可优化，使用 antd 的 tree？原因是，更原生 -->
+          <VbenTree :tree-data="menuTree" multiple bordered :expanded="expandedKeys" v-bind="slotProps" value-field="id" label-field="name" />
+        </Spin>
+      </template>
+    </Form>
+    <template #prepend-footer>
+      <div class="flex flex-auto items-center">
+        <Checkbox :checked="isAllSelected" @change="toggleSelectAll"> 全选 </Checkbox>
+        <Checkbox :checked="isExpanded" @change="toggleExpandAll"> 全部展开 </Checkbox>
+      </div>
+    </template>
+  </Modal>
+</template>