!785 代码生成：完善单元测试

Merge pull request !785 from puhui999/master

!785 代码生成：完善单元测试
Merge pull request !785 from puhui999/master
芋道源码 · Gitee
2 parents 5bf7cd39 a9b26569
Showing 223 changed files with 1048 additions and 1036 deletions
yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineAbstractTest.java
yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineVue2Test.java
yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineVue3Test.java
yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_tree/java/InfraCategoryMapper
yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_tree/java/InfraCategoryService
yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_tree/sql/sql
yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_tree/ts/index
yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_tree/vue/CategoryForm
yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_tree/vue/index
yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/sql/h2 → yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/sql/h2
yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/sql/sql → yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/sql/sql
yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/assert.json → yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/assert.json
yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/js/student → yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/js/index
yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/sql/h2 → yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/sql/h2
yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/sql/sql → yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/sql/sql
yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/vue/index → yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/vue/index
yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/assert.json → yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/assert.json
yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/js/category → yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/js/index
yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/sql/h2 → yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/sql/h2
yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/sql/sql → yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/sql/sql
@@ -31,6 +31,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
  */
 public abstract class CodegenEngineAbstractTest extends BaseMockitoUnitTest {
+    public String resourcesPath = "";  // 测试文件资源目录
+    public static final String OS_NAME = System.getProperty("os.name").toLowerCase().replace(" ", ""); // 操作系统名称
+
     @InjectMocks
     protected CodegenEngine codegenEngine;
@@ -41,6 +44,10 @@ public abstract class CodegenEngineAbstractTest extends BaseMockitoUnitTest {
     @BeforeEach
     public void setUp() {
         codegenEngine.initGlobalBindingMap();
+        // 获取测试文件 resources 路径
+        String absolutePath = FileUtil.getAbsolutePath("application-unit-test.yaml");
+        // 系统不一样生成的文件也有差异，那就各自生成各自的
+        resourcesPath = absolutePath.split("/target")[0] + "/src/test/resources/codegen/" + OS_NAME;
     }
     protected static CodegenTableDO getTable(String name) {
@@ -73,14 +80,14 @@ public abstract class CodegenEngineAbstractTest extends BaseMockitoUnitTest {
     @SuppressWarnings("rawtypes")
     protected static void assertResult(Map<String, String> result, String path) {
-        String assertContent = ResourceUtil.readUtf8Str(path + "/assert.json");
+        String assertContent = ResourceUtil.readUtf8Str("codegen/" + OS_NAME + path + "/assert.json");
         List<HashMap> asserts = JsonUtils.parseArray(assertContent, HashMap.class);
         assertEquals(asserts.size(), result.size());
         // 校验每个文件
         asserts.forEach(assertMap -> {
             String contentPath = (String) assertMap.get("contentPath");
             String filePath = (String) assertMap.get("filePath");
-            String content = ResourceUtil.readUtf8Str(path + "/" + contentPath);
+            String content = ResourceUtil.readUtf8Str("codegen/" + OS_NAME + path + "/" + contentPath);
             assertEquals(content, result.get(filePath), filePath + "：不匹配");
         });
     }
@@ -91,7 +98,7 @@ public abstract class CodegenEngineAbstractTest extends BaseMockitoUnitTest {
      * 【调试使用】将生成的代码，写入到文件
      *
      * @param result 生成的代码
-     * @param path 写入文件的路径
+     * @param path   写入文件的路径
      */
     protected void writeFile(Map<String, String> result, String path) {
         // 生成压缩包
@@ -106,7 +113,7 @@ public abstract class CodegenEngineAbstractTest extends BaseMockitoUnitTest {
     /**
      * 【调试使用】将生成的结果，写入到文件
      *
-     * @param result 生成的代码
+     * @param result   生成的代码
      * @param basePath 写入文件的路径（绝对路径）
      */
     protected void writeResult(Map<String, String> result, String basePath) {
@@ -121,7 +128,7 @@ public abstract class CodegenEngineAbstractTest extends BaseMockitoUnitTest {
             FileUtil.writeUtf8String(fileContent, basePath + "/" + contentPath);
         });
         // 写入 assert.json 文件
-        FileUtil.writeUtf8String(JsonUtils.toJsonPrettyString(asserts), basePath +"/assert.json");
+        FileUtil.writeUtf8String(JsonUtils.toJsonPrettyString(asserts), basePath + "/assert.json");
     }
 }
@@ -11,7 +11,6 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-// TODO @puhui999：单测需要 fix
 /**
  * {@link CodegenEngine} 的 Vue2 + Element UI 单元测试
  *
@@ -30,9 +29,10 @@ public class CodegenEngineVue2Test extends CodegenEngineAbstractTest {
         // 调用
         Map<String, String> result = codegenEngine.execute(table, columns, null, null);
+        // 生成测试文件
+        //writeResult(result, resourcesPath + "/vue2_one");
         // 断言
-        assertResult(result, "codegen/vue2_one");
-//        writeResult(result, "/root/ruoyi-vue-pro/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one");
+        assertResult(result, "/vue2_one");
     }
     @Test
@@ -45,25 +45,26 @@ public class CodegenEngineVue2Test extends CodegenEngineAbstractTest {
         // 调用
         Map<String, String> result = codegenEngine.execute(table, columns, null, null);
+        // 生成测试文件
+        //writeResult(result, resourcesPath + "/vue2_tree");
         // 断言
-        assertResult(result, "codegen/vue2_tree");
-//        writeResult(result, "/root/ruoyi-vue-pro/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree");
+        assertResult(result, "/vue2_tree");
 //        writeFile(result, "/Users/yunai/test/demo66.zip");
     }
     @Test
     public void testExecute_vue2_master_normal() {
-        testExecute_vue2_master(CodegenTemplateTypeEnum.MASTER_NORMAL, "codegen/vue2_master_normal");
+        testExecute_vue2_master(CodegenTemplateTypeEnum.MASTER_NORMAL, "/vue2_master_normal");
     }
     @Test
     public void testExecute_vue2_master_erp() {
-        testExecute_vue2_master(CodegenTemplateTypeEnum.MASTER_ERP, "codegen/vue2_master_erp");
+        testExecute_vue2_master(CodegenTemplateTypeEnum.MASTER_ERP, "/vue2_master_erp");
     }
     @Test
     public void testExecute_vue2_master_inner() {
-        testExecute_vue2_master(CodegenTemplateTypeEnum.MASTER_INNER, "codegen/vue2_master_inner");
+        testExecute_vue2_master(CodegenTemplateTypeEnum.MASTER_INNER, "/vue2_master_inner");
     }
     private void testExecute_vue2_master(CodegenTemplateTypeEnum templateType,
@@ -89,9 +90,10 @@ public class CodegenEngineVue2Test extends CodegenEngineAbstractTest {
         // 调用
         Map<String, String> result = codegenEngine.execute(table, columns,
                 Arrays.asList(contactTable, teacherTable), Arrays.asList(contactColumns, teacherColumns));
+        // 生成测试文件
+        //writeResult(result, resourcesPath + path);
         // 断言
         assertResult(result, path);
-//        writeResult(result, "/root/ruoyi-vue-pro/yudao-module-infra/yudao-module-infra-biz/src/test/resources/" + path);
 //        writeFile(result, "/Users/yunai/test/demo11.zip");
     }
@@ -27,9 +27,10 @@ public class CodegenEngineVue3Test extends CodegenEngineAbstractTest {
         // 调用
         Map<String, String> result = codegenEngine.execute(table, columns, null, null);
+        // 生成测试文件
+        //writeResult(result, resourcesPath + "/vue3_one");
         // 断言
-        assertResult(result, "codegen/vue3_one");
-//        writeResult(result, "/root/ruoyi-vue-pro/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_one");
+        assertResult(result, "/vue3_one");
     }
     @Test
@@ -42,25 +43,26 @@ public class CodegenEngineVue3Test extends CodegenEngineAbstractTest {
         // 调用
         Map<String, String> result = codegenEngine.execute(table, columns, null, null);
+        // 生成测试文件
+        //writeResult(result, resourcesPath + "/vue3_tree");
         // 断言
-        assertResult(result, "codegen/vue3_tree");
-//        writeResult(result, "/root/ruoyi-vue-pro/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_tree");
+        assertResult(result, "/vue3_tree");
 //        writeFile(result, "/Users/yunai/test/demo66.zip");
     }
     @Test
     public void testExecute_vue3_master_normal() {
-        testExecute_vue3_master(CodegenTemplateTypeEnum.MASTER_NORMAL, "codegen/vue3_master_normal");
+        testExecute_vue3_master(CodegenTemplateTypeEnum.MASTER_NORMAL, "/vue3_master_normal");
     }
     @Test
     public void testExecute_vue3_master_erp() {
-        testExecute_vue3_master(CodegenTemplateTypeEnum.MASTER_ERP, "codegen/vue3_master_erp");
+        testExecute_vue3_master(CodegenTemplateTypeEnum.MASTER_ERP, "/vue3_master_erp");
     }
     @Test
     public void testExecute_vue3_master_inner() {
-        testExecute_vue3_master(CodegenTemplateTypeEnum.MASTER_INNER, "codegen/vue3_master_inner");
+        testExecute_vue3_master(CodegenTemplateTypeEnum.MASTER_INNER, "/vue3_master_inner");
     }
     private void testExecute_vue3_master(CodegenTemplateTypeEnum templateType,
@@ -86,10 +88,11 @@ public class CodegenEngineVue3Test extends CodegenEngineAbstractTest {
         // 调用
         Map<String, String> result = codegenEngine.execute(table, columns,
                 Arrays.asList(contactTable, teacherTable), Arrays.asList(contactColumns, teacherColumns));
+        // 生成测试文件
+        //writeResult(result, resourcesPath + path);
         // 断言
         assertResult(result, path);
-//        writeResult(result, "/root/ruoyi-vue-pro/yudao-module-infra/yudao-module-infra-biz/src/test/resources/" + path);
-//        writeFile(result, "/Users/yunai/test/demo11.zip");
+        // writeFile(result, "/Users/yunai/test/demo11.zip");
     }
 }
-package cn.iocoder.yudao.module.infra.dal.mysql.demo;
-
-import java.util.*;
-
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraCategoryDO;
-import org.apache.ibatis.annotations.Mapper;
-import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*;
-
-/**
- * 分类 Mapper
- *
- * @author 芋道源码
- */
-@Mapper
-public interface InfraCategoryMapper extends BaseMapperX<InfraCategoryDO> {
-
-    default List<InfraCategoryDO> selectList(InfraCategoryListReqVO reqVO) {
-        return selectList(new LambdaQueryWrapperX<InfraCategoryDO>()
-                .likeIfPresent(InfraCategoryDO::getName, reqVO.getName())
-                .orderByDesc(InfraCategoryDO::getId));
-    }
-
-	default InfraCategoryDO selectByParentIdAndName(Long parentId, String name) {
-	    return selectOne(InfraCategoryDO::getParentId, parentId, InfraCategoryDO::getName, name);
-	}
-
-    default Long selectCountByParentId(Long parentId) {
-        return selectCount(InfraCategoryDO::getParentId, parentId);
-    }
-
-}
 \ No newline at end of file
-package cn.iocoder.yudao.module.infra.service.demo;
-
-import java.util.*;
-import javax.validation.*;
-import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*;
-import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraCategoryDO;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-
-/**
- * 分类 Service 接口
- *
- * @author 芋道源码
- */
-public interface InfraCategoryService {
-
-    /**
-     * 创建分类
-     *
-     * @param createReqVO 创建信息
-     * @return 编号
-     */
-    Long createCategory(@Valid InfraCategorySaveReqVO createReqVO);
-
-    /**
-     * 更新分类
-     *
-     * @param updateReqVO 更新信息
-     */
-    void updateCategory(@Valid InfraCategorySaveReqVO updateReqVO);
-
-    /**
-     * 删除分类
-     *
-     * @param id 编号
-     */
-    void deleteCategory(Long id);
-
-    /**
-     * 获得分类
-     *
-     * @param id 编号
-     * @return 分类
-     */
-    InfraCategoryDO getCategory(Long id);
-
-    /**
-     * 获得分类列表
-     *
-     * @param listReqVO 查询条件
-     * @return 分类列表
-     */
-    List<InfraCategoryDO> getCategoryList(InfraCategoryListReqVO listReqVO);
-
-}
 \ No newline at end of file
--- 菜单 SQL
-INSERT INTO system_menu(
-    name, permission, type, sort, parent_id,
-    path, icon, component, status, component_name
-)
-VALUES (
-    '分类管理', '', 2, 0, 888,
-    'category', '', 'infra/demo/index', 0, 'InfraCategory'
-);
-
--- 按钮父菜单ID
--- 暂时只支持 MySQL。如果你是 Oracle、PostgreSQL、SQLServer 的话，需要手动修改 @parentId 的部分的代码
-SELECT @parentId := LAST_INSERT_ID();
-
--- 按钮 SQL
-INSERT INTO system_menu(
-    name, permission, type, sort, parent_id,
-    path, icon, component, status
-)
-VALUES (
-    '分类查询', 'infra:category:query', 3, 1, @parentId,
-    '', '', '', 0
-);
-INSERT INTO system_menu(
-    name, permission, type, sort, parent_id,
-    path, icon, component, status
-)
-VALUES (
-    '分类创建', 'infra:category:create', 3, 2, @parentId,
-    '', '', '', 0
-);
-INSERT INTO system_menu(
-    name, permission, type, sort, parent_id,
-    path, icon, component, status
-)
-VALUES (
-    '分类更新', 'infra:category:update', 3, 3, @parentId,
-    '', '', '', 0
-);
-INSERT INTO system_menu(
-    name, permission, type, sort, parent_id,
-    path, icon, component, status
-)
-VALUES (
-    '分类删除', 'infra:category:delete', 3, 4, @parentId,
-    '', '', '', 0
-);
-INSERT INTO system_menu(
-    name, permission, type, sort, parent_id,
-    path, icon, component, status
-)
-VALUES (
-    '分类导出', 'infra:category:export', 3, 5, @parentId,
-    '', '', '', 0
-);
 \ No newline at end of file
-import request from '@/config/axios'
-
-export interface CategoryVO {
-  id: number
-  name: string
-  parentId: number
-}
-
-// 查询分类列表
-export const getCategoryList = async (params) => {
-  return await request.get({ url: `/infra/category/list`, params })
-}
-
-// 查询分类详情
-export const getCategory = async (id: number) => {
-  return await request.get({ url: `/infra/category/get?id=` + id })
-}
-
-// 新增分类
-export const createCategory = async (data: CategoryVO) => {
-  return await request.post({ url: `/infra/category/create`, data })
-}
-
-// 修改分类
-export const updateCategory = async (data: CategoryVO) => {
-  return await request.put({ url: `/infra/category/update`, data })
-}
-
-// 删除分类
-export const deleteCategory = async (id: number) => {
-  return await request.delete({ url: `/infra/category/delete?id=` + id })
-}
-
-// 导出分类 Excel
-export const exportCategory = async (params) => {
-  return await request.download({ url: `/infra/category/export-excel`, params })
-}
 \ No newline at end of file
-<template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible">
-    <el-form
-      ref="formRef"
-      :model="formData"
-      :rules="formRules"
-      label-width="100px"
-      v-loading="formLoading"
-    >
-      <el-form-item label="名字" prop="name">
-        <el-input v-model="formData.name" placeholder="请输入名字" />
-      </el-form-item>
-      <el-form-item label="父编号" prop="parentId">
-        <el-tree-select
-          v-model="formData.parentId"
-          :data="categoryTree"
-          :props="defaultProps"
-          check-strictly
-          default-expand-all
-          placeholder="请选择父编号"
-        />
-      </el-form-item>
-    </el-form>
-    <template #footer>
-      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
-      <el-button @click="dialogVisible = false">取 消</el-button>
-    </template>
-  </Dialog>
-</template>
-<script setup lang="ts">
-import * as CategoryApi from '@/api/infra/demo'
-import { defaultProps, handleTree } from '@/utils/tree'
-
-const { t } = useI18n() // 国际化
-const message = useMessage() // 消息弹窗
-
-const dialogVisible = ref(false) // 弹窗的是否展示
-const dialogTitle = ref('') // 弹窗的标题
-const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-const formType = ref('') // 表单的类型：create - 新增；update - 修改
-const formData = ref({
-  id: undefined,
-  name: undefined,
-  parentId: undefined
-})
-const formRules = reactive({
-  name: [{ required: true, message: '名字不能为空', trigger: 'blur' }],
-  parentId: [{ required: true, message: '父编号不能为空', trigger: 'blur' }]
-})
-const formRef = ref() // 表单 Ref
-const categoryTree = ref() // 树形结构
-
-/** 打开弹窗 */
-const open = async (type: string, id?: number) => {
-  dialogVisible.value = true
-  dialogTitle.value = t('action.' + type)
-  formType.value = type
-  resetForm()
-  // 修改时，设置数据
-  if (id) {
-    formLoading.value = true
-    try {
-      formData.value = await CategoryApi.getCategory(id)
-    } finally {
-      formLoading.value = false
-    }
-  }
-  await getCategoryTree()
-}
-defineExpose({ open }) // 提供 open 方法，用于打开弹窗
-
-/** 提交表单 */
-const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
-const submitForm = async () => {
-  // 校验表单
-  await formRef.value.validate()
-  // 提交请求
-  formLoading.value = true
-  try {
-    const data = formData.value as unknown as CategoryApi.CategoryVO
-    if (formType.value === 'create') {
-      await CategoryApi.createCategory(data)
-      message.success(t('common.createSuccess'))
-    } else {
-      await CategoryApi.updateCategory(data)
-      message.success(t('common.updateSuccess'))
-    }
-    dialogVisible.value = false
-    // 发送操作成功的事件
-    emit('success')
-  } finally {
-    formLoading.value = false
-  }
-}
-
-/** 重置表单 */
-const resetForm = () => {
-  formData.value = {
-    id: undefined,
-    name: undefined,
-    parentId: undefined
-  }
-  formRef.value?.resetFields()
-}
-
-/** 获得分类树 */
-const getCategoryTree = async () => {
-  categoryTree.value = []
-  const data = await CategoryApi.getCategoryList()
-  const root: Tree = { id: 0, name: '顶级分类', children: [] }
-  root.children = handleTree(data, 'id', 'parentId')
-  categoryTree.value.push(root)
-}
-</script>
 \ No newline at end of file
-<template>
-  <ContentWrap>
-    <!-- 搜索工作栏 -->
-    <el-form
-      class="-mb-15px"
-      :model="queryParams"
-      ref="queryFormRef"
-      :inline="true"
-      label-width="68px"
-    >
-      <el-form-item label="名字" prop="name">
-        <el-input
-          v-model="queryParams.name"
-          placeholder="请输入名字"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
-        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
-        <el-button
-          type="primary"
-          plain
-          @click="openForm('create')"
-          v-hasPermi="['infra:category:create']"
-        >
-          <Icon icon="ep:plus" class="mr-5px" /> 新增
-        </el-button>
-        <el-button
-          type="success"
-          plain
-          @click="handleExport"
-          :loading="exportLoading"
-          v-hasPermi="['infra:category:export']"
-        >
-          <Icon icon="ep:download" class="mr-5px" /> 导出
-        </el-button>
-        <el-button type="danger" plain @click="toggleExpandAll">
-          <Icon icon="ep:sort" class="mr-5px" /> 展开/折叠
-        </el-button>
-      </el-form-item>
-    </el-form>
-  </ContentWrap>
-
-  <!-- 列表 -->
-  <ContentWrap>
-    <el-table
-      v-loading="loading"
-      :data="list"
-      :stripe="true"
-      :show-overflow-tooltip="true"
-      row-key="id"
-      :default-expand-all="isExpandAll"
-      v-if="refreshTable"
-    >
-      <el-table-column label="编号" align="center" prop="id" />
-      <el-table-column label="名字" align="center" prop="name" />
-      <el-table-column label="父编号" align="center" prop="parentId" />
-      <el-table-column label="操作" align="center">
-        <template #default="scope">
-          <el-button
-            link
-            type="primary"
-            @click="openForm('update', scope.row.id)"
-            v-hasPermi="['infra:category:update']"
-          >
-            编辑
-          </el-button>
-          <el-button
-            link
-            type="danger"
-            @click="handleDelete(scope.row.id)"
-            v-hasPermi="['infra:category:delete']"
-          >
-            删除
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!-- 分页 -->
-    <Pagination
-      :total="total"
-      v-model:page="queryParams.pageNo"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
-  </ContentWrap>
-
-  <!-- 表单弹窗：添加/修改 -->
-  <CategoryForm ref="formRef" @success="getList" />
-</template>
-
-<script setup lang="ts">
-import { handleTree } from '@/utils/tree'
-import download from '@/utils/download'
-import * as CategoryApi from '@/api/infra/demo'
-import CategoryForm from './CategoryForm.vue'
-
-defineOptions({ name: 'InfraCategory' })
-
-const message = useMessage() // 消息弹窗
-const { t } = useI18n() // 国际化
-
-const loading = ref(true) // 列表的加载中
-const list = ref([]) // 列表的数据
-const queryParams = reactive({
-  name: undefined
-})
-const queryFormRef = ref() // 搜索的表单
-const exportLoading = ref(false) // 导出的加载中
-
-/** 查询列表 */
-const getList = async () => {
-  loading.value = true
-  try {
-    const data = await CategoryApi.getCategoryList(queryParams)
-    list.value = handleTree(data, 'id', 'parentId')
-  } finally {
-    loading.value = false
-  }
-}
-
-/** 搜索按钮操作 */
-const handleQuery = () => {
-  queryParams.pageNo = 1
-  getList()
-}
-
-/** 重置按钮操作 */
-const resetQuery = () => {
-  queryFormRef.value.resetFields()
-  handleQuery()
-}
-
-/** 添加/修改操作 */
-const formRef = ref()
-const openForm = (type: string, id?: number) => {
-  formRef.value.open(type, id)
-}
-
-/** 删除按钮操作 */
-const handleDelete = async (id: number) => {
-  try {
-    // 删除的二次确认
-    await message.delConfirm()
-    // 发起删除
-    await CategoryApi.deleteCategory(id)
-    message.success(t('common.delSuccess'))
-    // 刷新列表
-    await getList()
-  } catch {}
-}
-
-/** 导出按钮操作 */
-const handleExport = async () => {
-  try {
-    // 导出的二次确认
-    await message.exportConfirm()
-    // 发起导出
-    exportLoading.value = true
-    const data = await CategoryApi.exportCategory(queryParams)
-    download.excel(data, '分类.xls')
-  } catch {
-  } finally {
-    exportLoading.value = false
-  }
-}
-
-/** 展开/折叠操作 */
-const isExpandAll = ref(true) // 是否展开，默认全部展开
-const refreshTable = ref(true) // 重新渲染表格状态
-const toggleExpandAll = async () => {
-  refreshTable.value = false
-  isExpandAll.value = !isExpandAll.value
-  await nextTick()
-  refreshTable.value = true
-}
-
-/** 初始化 **/
-onMounted(() => {
-  getList()
-})
-</script>
 \ No newline at end of file
@@ -53,8 +53,8 @@
   "contentPath" : "vue/index",
   "filePath" : "yudao-ui-admin-vue2/src/views/infra/demo/index.vue"
 }, {
-  "contentPath" : "js/student",
-  "filePath" : "yudao-ui-admin-vue2/src/api/infra/student.js"
+  "contentPath": "js/index",
+  "filePath": "yudao-ui-admin-vue2/src/api/infra/demo/index.js"
 }, {
   "contentPath" : "vue/StudentForm",
   "filePath" : "yudao-ui-admin-vue2/src/views/infra/demo/StudentForm.vue"
@@ -53,8 +53,8 @@
   "contentPath" : "vue/index",
   "filePath" : "yudao-ui-admin-vue2/src/views/infra/demo/index.vue"
 }, {
-  "contentPath" : "js/student",
-  "filePath" : "yudao-ui-admin-vue2/src/api/infra/student.js"
+  "contentPath": "js/index",
+  "filePath": "yudao-ui-admin-vue2/src/api/infra/demo/index.js"
 }, {
   "contentPath" : "vue/StudentForm",
   "filePath" : "yudao-ui-admin-vue2/src/views/infra/demo/StudentForm.vue"
@@ -53,8 +53,8 @@
   "contentPath" : "vue/index",
   "filePath" : "yudao-ui-admin-vue2/src/views/infra/demo/index.vue"
 }, {
-  "contentPath" : "js/student",
-  "filePath" : "yudao-ui-admin-vue2/src/api/infra/student.js"
+  "contentPath": "js/index",
+  "filePath": "yudao-ui-admin-vue2/src/api/infra/demo/index.js"
 }, {
   "contentPath" : "vue/StudentForm",
   "filePath" : "yudao-ui-admin-vue2/src/views/infra/demo/StudentForm.vue"
@@ -41,8 +41,8 @@
   "contentPath" : "vue/index",
   "filePath" : "yudao-ui-admin-vue2/src/views/infra/demo/index.vue"
 }, {
-  "contentPath" : "js/student",
-  "filePath" : "yudao-ui-admin-vue2/src/api/infra/student.js"
+  "contentPath": "js/index",
+  "filePath": "yudao-ui-admin-vue2/src/api/infra/demo/index.js"
 }, {
   "contentPath" : "vue/StudentForm",
   "filePath" : "yudao-ui-admin-vue2/src/views/infra/demo/StudentForm.vue"
@@ -41,8 +41,8 @@
   "contentPath" : "vue/index",
   "filePath" : "yudao-ui-admin-vue2/src/views/infra/demo/index.vue"
 }, {
-  "contentPath" : "js/category",
-  "filePath" : "yudao-ui-admin-vue2/src/api/infra/category.js"
+  "contentPath": "js/index",
+  "filePath": "yudao-ui-admin-vue2/src/api/infra/demo/index.js"
 }, {
   "contentPath" : "vue/CategoryForm",
   "filePath" : "yudao-ui-admin-vue2/src/views/infra/demo/CategoryForm.vue"