perf: 优化代码生成 erp 主子表示例

src/api/infra/demo/demo03/erp/index.ts

@@ -1,91 +1,127 @@
 import request from '@/config/axios'
+import type { Dayjs } from 'dayjs';
 
-export interface Demo03StudentVO {
+/** 学生课程信息 */
-  id: number
+export interface Demo03Course {
-  name: string
+  id: number; // 编号
-  sex: number
+  studentId?: number; // 学生编号
-  birthday: Date
+  name?: string; // 名字
-  description: string
+  score?: number; // 分数
 }
 
-// 查询学生分页
+/** 学生班级信息 */
-export const getDemo03StudentPage = async (params) => {
+export interface Demo03Grade {
-  return await request.get({ url: `/infra/demo03-student/page`, params })
+  id: number; // 编号
+  studentId?: number; // 学生编号
+  name?: string; // 名字
+  teacher?: string; // 班主任
 }
 
-// 查询学生详情
+/** 学生信息 */
-export const getDemo03Student = async (id: number) => {
+export interface Demo03Student {
-  return await request.get({ url: `/infra/demo03-student/get?id=` + id })
+  id: number; // 编号
+  name?: string; // 名字
+  sex?: number; // 性别
+  birthday?: string | Dayjs; // 出生日期
+  description?: string; // 简介
 }
 
-// 新增学生
+// 学生 API
-export const createDemo03Student = async (data: Demo03StudentVO) => {
+export const Demo03StudentApi = {
-  return await request.post({ url: `/infra/demo03-student/create`, data })
+  // 查询学生分页
-}
+  getDemo03StudentPage: async (params: any) => {
+    return await request.get({ url: `/infra/demo03-student-erp/page`, params })
+  },
 
-// 修改学生
+  // 查询学生详情
-export const updateDemo03Student = async (data: Demo03StudentVO) => {
+  getDemo03Student: async (id: number) => {
-  return await request.put({ url: `/infra/demo03-student/update`, data })
+    return await request.get({ url: `/infra/demo03-student-erp/get?id=` + id })
-}
+  },
 
-// 删除学生
+  // 新增学生
-export const deleteDemo03Student = async (id: number) => {
+  createDemo03Student: async (data: Demo03Student) => {
-  return await request.delete({ url: `/infra/demo03-student/delete?id=` + id })
+    return await request.post({ url: `/infra/demo03-student-erp/create`, data })
-}
+  },
 
-// 导出学生 Excel
+  // 修改学生
-export const exportDemo03Student = async (params) => {
+  updateDemo03Student: async (data: Demo03Student) => {
-  return await request.download({ url: `/infra/demo03-student/export-excel`, params })
+    return await request.put({ url: `/infra/demo03-student-erp/update`, data })
-}
+  },
+
+  // 删除学生
+  deleteDemo03Student: async (id: number) => {
+    return await request.delete({ url: `/infra/demo03-student-erp/delete?id=` + id })
+  },
+
+  /** 批量删除学生 */
+  deleteDemo03StudentList: async (ids: number[]) => {
+    return await request.delete({ url: `/infra/demo03-student-erp/delete-list?ids=${ids.join(',')}` })
+  },
+
+  // 导出学生 Excel
+  exportDemo03Student: async (params) => {
+    return await request.download({ url: `/infra/demo03-student-erp/export-excel`, params })
+  },
 
 // ==================== 子表（学生课程） ====================
 
-// 获得学生课程分页
+  // 获得学生课程分页
-export const getDemo03CoursePage = async (params) => {
+  getDemo03CoursePage: async (params) => {
-  return await request.get({ url: `/infra/demo03-student/demo03-course/page`, params })
+    return await request.get({ url: `/infra/demo03-student-erp/demo03-course/page`, params })
-}
+  },
-// 新增学生课程
+  // 新增学生课程
-export const createDemo03Course = async (data) => {
+  createDemo03Course: async (data: Demo03Course) => {
-  return await request.post({ url: `/infra/demo03-student/demo03-course/create`, data })
+    return await request.post({ url: `/infra/demo03-student-erp/demo03-course/create`, data })
-}
+  },
 
-// 修改学生课程
+  // 修改学生课程
-export const updateDemo03Course = async (data) => {
+  updateDemo03Course: async (data: Demo03Course) => {
-  return await request.put({ url: `/infra/demo03-student/demo03-course/update`, data })
+    return await request.put({ url: `/infra/demo03-student-erp/demo03-course/update`, data })
-}
+  },
 
-// 删除学生课程
+  // 删除学生课程
-export const deleteDemo03Course = async (id: number) => {
+  deleteDemo03Course: async (id: number) => {
-  return await request.delete({ url: `/infra/demo03-student/demo03-course/delete?id=` + id })
+    return await request.delete({ url: `/infra/demo03-student-erp/demo03-course/delete?id=` + id })
-}
+  },
 
-// 获得学生课程
+  /** 批量删除学生课程 */
-export const getDemo03Course = async (id: number) => {
+  deleteDemo03CourseList: async (ids: number[]) => {
-  return await request.get({ url: `/infra/demo03-student/demo03-course/get?id=` + id })
+    return await request.delete({ url: `/infra/demo03-student-erp/demo03-course/delete-list?ids=${ids.join(',')}` })
-}
+  },
+
+  // 获得学生课程
+  getDemo03Course: async (id: number) => {
+    return await request.get({ url: `/infra/demo03-student-erp/demo03-course/get?id=` + id })
+  },
 
 // ==================== 子表（学生班级） ====================
 
-// 获得学生班级分页
+  // 获得学生班级分页
-export const getDemo03GradePage = async (params) => {
+  getDemo03GradePage: async (params) => {
-  return await request.get({ url: `/infra/demo03-student/demo03-grade/page`, params })
+    return await request.get({ url: `/infra/demo03-student-erp/demo03-grade/page`, params })
-}
+  },
-// 新增学生班级
+  // 新增学生班级
-export const createDemo03Grade = async (data) => {
+  createDemo03Grade: async (data: Demo03Grade) => {
-  return await request.post({ url: `/infra/demo03-student/demo03-grade/create`, data })
+    return await request.post({ url: `/infra/demo03-student-erp/demo03-grade/create`, data })
-}
+  },
 
-// 修改学生班级
+  // 修改学生班级
-export const updateDemo03Grade = async (data) => {
+  updateDemo03Grade: async (data: Demo03Grade) => {
-  return await request.put({ url: `/infra/demo03-student/demo03-grade/update`, data })
+    return await request.put({ url: `/infra/demo03-student-erp/demo03-grade/update`, data })
-}
+  },
 
-// 删除学生班级
+  // 删除学生班级
-export const deleteDemo03Grade = async (id: number) => {
+  deleteDemo03Grade: async (id: number) => {
-  return await request.delete({ url: `/infra/demo03-student/demo03-grade/delete?id=` + id })
+    return await request.delete({ url: `/infra/demo03-student-erp/demo03-grade/delete?id=` + id })
-}
+  },
 
-// 获得学生班级
+  /** 批量删除学生班级 */
-export const getDemo03Grade = async (id: number) => {
+  deleteDemo03GradeList: async (ids: number[]) => {
-  return await request.get({ url: `/infra/demo03-student/demo03-grade/get?id=` + id })
+    return await request.delete({ url: `/infra/demo03-student-erp/demo03-grade/delete-list?ids=${ids.join(',')}` })
+  },
+
+  // 获得学生班级
+  getDemo03Grade: async (id: number) => {
+    return await request.get({ url: `/infra/demo03-student-erp/demo03-grade/get?id=` + id })
+  },
 }

src/views/infra/demo/demo03/erp/Demo03StudentForm.vue

@@ -41,7 +41,10 @@
 </template>
 <script setup lang="ts">
 import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
-import * as Demo03StudentApi from '@/api/infra/demo/demo03/erp'
+import { Demo03StudentApi, Demo03Student } from '@/api/infra/demo/demo03/erp'
+
+/** 学生 表单 */
+defineOptions({ name: 'Demo03StudentForm' })
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -55,13 +58,13 @@ const formData = ref({
   name: undefined,
   sex: undefined,
   birthday: undefined,
-  description: undefined
+  description: undefined,
 })
 const formRules = reactive({
   name: [{ required: true, message: '名字不能为空', trigger: 'blur' }],
   sex: [{ required: true, message: '性别不能为空', trigger: 'blur' }],
   birthday: [{ required: true, message: '出生日期不能为空', trigger: 'blur' }],
-  description: [{ required: true, message: '简介不能为空', trigger: 'blur' }]
+  description: [{ required: true, message: '简介不能为空', trigger: 'blur' }],
 })
 const formRef = ref() // 表单 Ref
 
@@ -91,7 +94,7 @@ const submitForm = async () => {
   // 提交请求
   formLoading.value = true
   try {
-    const data = formData.value as unknown as Demo03StudentApi.Demo03StudentVO
+    const data = formData.value as unknown as Demo03Student
     if (formType.value === 'create') {
       await Demo03StudentApi.createDemo03Student(data)
       message.success(t('common.createSuccess'))
@@ -114,7 +117,7 @@ const resetForm = () => {
     name: undefined,
     sex: undefined,
     birthday: undefined,
-    description: undefined
+    description: undefined,
   }
   formRef.value?.resetFields()
 }

src/views/infra/demo/demo03/erp/components/Demo03CourseForm.vue

@@ -7,7 +7,7 @@
       label-width="100px"
       v-loading="formLoading"
     >
-      <el-form-item label="名字" prop="name">
+       <el-form-item label="名字" prop="name">
         <el-input v-model="formData.name" placeholder="请输入名字" />
       </el-form-item>
       <el-form-item label="分数" prop="score">
@@ -21,7 +21,7 @@
   </Dialog>
 </template>
 <script setup lang="ts">
-import * as Demo03StudentApi from '@/api/infra/demo/demo03/erp'
+import { Demo03StudentApi, Demo03Course } from '@/api/infra/demo/demo03/erp'
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -34,22 +34,22 @@ const formData = ref({
   id: undefined,
   studentId: undefined,
   name: undefined,
-  score: undefined
+  score: undefined,
 })
 const formRules = reactive({
   studentId: [{ required: true, message: '学生编号不能为空', trigger: 'blur' }],
   name: [{ required: true, message: '名字不能为空', trigger: 'blur' }],
-  score: [{ required: true, message: '分数不能为空', trigger: 'blur' }]
+  score: [{ required: true, message: '分数不能为空', trigger: 'blur' }],
 })
 const formRef = ref() // 表单 Ref
 
 /** 打开弹窗 */
-const open = async (type: string, id?: number, studentId: number) => {
+const open = async (type: string, id?: number, studentId?: number) => {
   dialogVisible.value = true
   dialogTitle.value = t('action.' + type)
   formType.value = type
   resetForm()
-  formData.value.studentId = studentId
+  formData.value.studentId = studentId  as any
   // 修改时，设置数据
   if (id) {
     formLoading.value = true
@@ -70,7 +70,7 @@ const submitForm = async () => {
   // 提交请求
   formLoading.value = true
   try {
-    const data = formData.value
+    const data = formData.value as unknown as  Demo03Course
     if (formType.value === 'create') {
       await Demo03StudentApi.createDemo03Course(data)
       message.success(t('common.createSuccess'))
@@ -92,7 +92,7 @@ const resetForm = () => {
     id: undefined,
     studentId: undefined,
     name: undefined,
-    score: undefined
+    score: undefined,
   }
   formRef.value?.resetFields()
 }

src/views/infra/demo/demo03/erp/components/Demo03CourseList.vue

@@ -9,7 +9,24 @@
     >
       <Icon icon="ep:plus" class="mr-5px" /> 新增
     </el-button>
-    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-button
+          type="danger"
+          plain
+          :disabled="isEmpty(checkedIds)"
+          @click="handleDeleteBatch"
+          v-hasPermi="['infra:demo03-student:delete']"
+      >
+        <Icon icon="ep:delete" class="mr-5px" /> 批量删除
+      </el-button>
+    <el-table
+        row-key="id"
+        v-loading="loading"
+        :data="list"
+        :stripe="true"
+        :show-overflow-tooltip="true"
+        @selection-change="handleRowCheckboxChange"
+    >
+          <el-table-column type="selection" width="55" />
       <el-table-column label="编号" align="center" prop="id" />
        <el-table-column label="名字" align="center" prop="name" />
       <el-table-column label="分数" align="center" prop="score" />
@@ -52,17 +69,17 @@
     <!-- 表单弹窗：添加/修改 -->
     <Demo03CourseForm ref="formRef" @success="getList" />
 </template>
-
 <script setup lang="ts">
 import { dateFormatter } from '@/utils/formatTime'
-import * as Demo03StudentApi from '@/api/infra/demo/demo03/erp'
+import { isEmpty } from '@/utils/is'
+import { Demo03StudentApi } from '@/api/infra/demo/demo03/erp'
 import Demo03CourseForm from './Demo03CourseForm.vue'
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 
 const props = defineProps<{
-  studentId: undefined // 学生编号（主表的关联字段）
+  studentId?: number // 学生编号（主表的关联字段）
 }>()
 const loading = ref(false) // 列表的加载中
 const list = ref([]) // 列表的数据
@@ -70,17 +87,20 @@ const total = ref(0) // 列表的总页数
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
-  studentId: undefined
+  studentId: undefined as unknown
 })
 
 /** 监听主表的关联字段的变化，加载对应的子表数据 */
 watch(
   () => props.studentId,
-  (val) => {
+  (val: number) => {
+    if (!val) {
+      return
+    }
     queryParams.studentId = val
     handleQuery()
   },
-  { immediate: false }
+    { immediate: true, deep: true }
 )
 
 /** 查询列表 */
@@ -123,4 +143,20 @@ const handleDelete = async (id: number) => {
     await getList()
   } catch {}
 }
+
+/** 批量删除学生课程 */
+const handleDeleteBatch = async () => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    await Demo03StudentApi.deleteDemo03CourseList(checkedIds.value);
+    message.success(t('common.delSuccess'))
+    await getList();
+  } catch {}
+}
+
+const checkedIds = ref<number[]>([])
+const handleRowCheckboxChange = (records: Demo03Course[]) => {
+  checkedIds.value = records.map((item) => item.id);
+}
 </script>

src/views/infra/demo/demo03/erp/components/Demo03GradeForm.vue

@@ -7,7 +7,7 @@
       label-width="100px"
       v-loading="formLoading"
     >
-      <el-form-item label="名字" prop="name">
+       <el-form-item label="名字" prop="name">
         <el-input v-model="formData.name" placeholder="请输入名字" />
       </el-form-item>
       <el-form-item label="班主任" prop="teacher">
@@ -21,7 +21,7 @@
   </Dialog>
 </template>
 <script setup lang="ts">
-import * as Demo03StudentApi from '@/api/infra/demo/demo03/erp'
+import { Demo03StudentApi, Demo03Grade } from '@/api/infra/demo/demo03/erp'
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -34,22 +34,22 @@ const formData = ref({
   id: undefined,
   studentId: undefined,
   name: undefined,
-  teacher: undefined
+  teacher: undefined,
 })
 const formRules = reactive({
   studentId: [{ required: true, message: '学生编号不能为空', trigger: 'blur' }],
   name: [{ required: true, message: '名字不能为空', trigger: 'blur' }],
-  teacher: [{ required: true, message: '班主任不能为空', trigger: 'blur' }]
+  teacher: [{ required: true, message: '班主任不能为空', trigger: 'blur' }],
 })
 const formRef = ref() // 表单 Ref
 
 /** 打开弹窗 */
-const open = async (type: string, id?: number, studentId: number) => {
+const open = async (type: string, id?: number, studentId?: number) => {
   dialogVisible.value = true
   dialogTitle.value = t('action.' + type)
   formType.value = type
   resetForm()
-  formData.value.studentId = studentId
+  formData.value.studentId = studentId  as any
   // 修改时，设置数据
   if (id) {
     formLoading.value = true
@@ -70,7 +70,7 @@ const submitForm = async () => {
   // 提交请求
   formLoading.value = true
   try {
-    const data = formData.value
+    const data = formData.value as unknown as  Demo03Grade
     if (formType.value === 'create') {
       await Demo03StudentApi.createDemo03Grade(data)
       message.success(t('common.createSuccess'))
@@ -92,7 +92,7 @@ const resetForm = () => {
     id: undefined,
     studentId: undefined,
     name: undefined,
-    teacher: undefined
+    teacher: undefined,
   }
   formRef.value?.resetFields()
 }

src/views/infra/demo/demo03/erp/components/Demo03GradeList.vue

@@ -9,7 +9,24 @@
     >
       <Icon icon="ep:plus" class="mr-5px" /> 新增
     </el-button>
-    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-button
+          type="danger"
+          plain
+          :disabled="isEmpty(checkedIds)"
+          @click="handleDeleteBatch"
+          v-hasPermi="['infra:demo03-student:delete']"
+      >
+        <Icon icon="ep:delete" class="mr-5px" /> 批量删除
+      </el-button>
+    <el-table
+        row-key="id"
+        v-loading="loading"
+        :data="list"
+        :stripe="true"
+        :show-overflow-tooltip="true"
+        @selection-change="handleRowCheckboxChange"
+    >
+          <el-table-column type="selection" width="55" />
       <el-table-column label="编号" align="center" prop="id" />
        <el-table-column label="名字" align="center" prop="name" />
       <el-table-column label="班主任" align="center" prop="teacher" />
@@ -52,17 +69,17 @@
     <!-- 表单弹窗：添加/修改 -->
     <Demo03GradeForm ref="formRef" @success="getList" />
 </template>
-
 <script setup lang="ts">
 import { dateFormatter } from '@/utils/formatTime'
-import * as Demo03StudentApi from '@/api/infra/demo/demo03/erp'
+import { isEmpty } from '@/utils/is'
+import { Demo03StudentApi } from '@/api/infra/demo/demo03/erp'
 import Demo03GradeForm from './Demo03GradeForm.vue'
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 
 const props = defineProps<{
-  studentId: undefined // 学生编号（主表的关联字段）
+  studentId?: number // 学生编号（主表的关联字段）
 }>()
 const loading = ref(false) // 列表的加载中
 const list = ref([]) // 列表的数据
@@ -70,17 +87,20 @@ const total = ref(0) // 列表的总页数
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
-  studentId: undefined
+  studentId: undefined as unknown
 })
 
 /** 监听主表的关联字段的变化，加载对应的子表数据 */
 watch(
   () => props.studentId,
-  (val) => {
+  (val: number) => {
+    if (!val) {
+      return
+    }
     queryParams.studentId = val
     handleQuery()
   },
-  { immediate: false }
+    { immediate: true, deep: true }
 )
 
 /** 查询列表 */
@@ -123,4 +143,20 @@ const handleDelete = async (id: number) => {
     await getList()
   } catch {}
 }
+
+/** 批量删除学生班级 */
+const handleDeleteBatch = async () => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    await Demo03StudentApi.deleteDemo03GradeList(checkedIds.value);
+    message.success(t('common.delSuccess'))
+    await getList();
+  } catch {}
+}
+
+const checkedIds = ref<number[]>([])
+const handleRowCheckboxChange = (records: Demo03Grade[]) => {
+  checkedIds.value = records.map((item) => item.id);
+}
 </script>

src/views/infra/demo/demo03/erp/index.vue

@@ -1,6 +1,4 @@
 <template>
-  <doc-alert title="代码生成（主子表）" url="https://doc.iocoder.cn/new-feature/master-sub/" />
-
   <ContentWrap>
     <!-- 搜索工作栏 -->
     <el-form
@@ -20,7 +18,12 @@
         />
       </el-form-item>
       <el-form-item label="性别" prop="sex">
-        <el-select v-model="queryParams.sex" placeholder="请选择性别" clearable class="!w-240px">
+        <el-select
+          v-model="queryParams.sex"
+          placeholder="请选择性别"
+          clearable
+          class="!w-240px"
+        >
           <el-option
             v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_USER_SEX)"
             :key="dict.value"
@@ -37,7 +40,7 @@
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
+          class="!w-220px"
         />
       </el-form-item>
       <el-form-item>
@@ -60,6 +63,15 @@
         >
           <Icon icon="ep:download" class="mr-5px" /> 导出
         </el-button>
+        <el-button
+            type="danger"
+            plain
+            :disabled="isEmpty(checkedIds)"
+            @click="handleDeleteBatch"
+            v-hasPermi="['infra:demo03-student:delete']"
+        >
+          <Icon icon="ep:delete" class="mr-5px" /> 批量删除
+        </el-button>
       </el-form-item>
     </el-form>
   </ContentWrap>
@@ -67,13 +79,16 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-table
+      row-key="id"
       v-loading="loading"
       :data="list"
       :stripe="true"
       :show-overflow-tooltip="true"
       highlight-current-row
       @current-change="handleCurrentChange"
+      @selection-change="handleRowCheckboxChange"
     >
+    <el-table-column type="selection" width="55" />
       <el-table-column label="编号" align="center" prop="id" />
       <el-table-column label="名字" align="center" prop="name" />
       <el-table-column label="性别" align="center" prop="sex">
@@ -96,7 +111,7 @@
         :formatter="dateFormatter"
         width="180px"
       />
-      <el-table-column label="操作" align="center">
+      <el-table-column label="操作" align="center" min-width="120px">
         <template #default="scope">
           <el-button
             link
@@ -143,28 +158,30 @@
 
 <script setup lang="ts">
 import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
+import { isEmpty } from '@/utils/is'
 import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
-import * as Demo03StudentApi from '@/api/infra/demo/demo03/erp'
+import { Demo03StudentApi, Demo03Student } from '@/api/infra/demo/demo03/erp'
 import Demo03StudentForm from './Demo03StudentForm.vue'
 import Demo03CourseList from './components/Demo03CourseList.vue'
 import Demo03GradeList from './components/Demo03GradeList.vue'
 
+/** 学生 列表 */
 defineOptions({ name: 'Demo03Student' })
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
 const loading = ref(true) // 列表的加载中
-const list = ref([]) // 列表的数据
+const list = ref<Demo03Student[]>([]) // 列表的数据
 const total = ref(0) // 列表的总页数
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
-  name: null,
+  name: undefined,
-  sex: null,
+  sex: undefined,
-  description: null,
+  description: undefined,
-  createTime: []
+  createTime: [],
 })
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
@@ -212,6 +229,22 @@ const handleDelete = async (id: number) => {
   } catch {}
 }
 
+/** 批量删除学生 */
+const handleDeleteBatch = async () => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    await Demo03StudentApi.deleteDemo03StudentList(checkedIds.value);
+    message.success(t('common.delSuccess'))
+    await getList();
+  } catch {}
+}
+
+const checkedIds = ref<number[]>([])
+const handleRowCheckboxChange = (records: Demo03Student[]) => {
+  checkedIds.value = records.map((item) => item.id);
+}
+
 /** 导出按钮操作 */
 const handleExport = async () => {
   try {