Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3

package.json

@@ -36,7 +36,7 @@
     "@wangeditor/editor-for-vue": "^5.1.10",
     "@zxcvbn-ts/core": "^3.0.4",
     "animate.css": "^4.1.1",
-    "axios": "^1.6.8",
+    "axios": "1.9.0",
     "benz-amr-recorder": "^1.1.5",
     "bpmn-js-token-simulation": "^0.36.0",
     "camunda-bpmn-moddle": "^7.0.1",

src/api/infra/demo/demo01/index.ts

@@ -1,40 +1,50 @@
 import request from '@/config/axios'
+import type { Dayjs } from 'dayjs'
 
-export interface Demo01ContactVO {
+/** 示例联系人信息 */
-  id: number
+export interface Demo01Contact {
-  name: string
+  id: number // 编号
-  sex: number
+  name?: string // 名字
-  birthday: Date
+  sex?: number // 性别
-  description: string
+  birthday?: string | Dayjs // 出生年
-  avatar: string
+  description?: string // 简介
+  avatar: string // 头像
 }
 
-// 查询示例联系人分页
+// 示例联系人 API
-export const getDemo01ContactPage = async (params) => {
+export const Demo01ContactApi = {
+  // 查询示例联系人分页
+  getDemo01ContactPage: async (params: any) => {
     return await request.get({ url: `/infra/demo01-contact/page`, params })
-}
+  },
 
-// 查询示例联系人详情
+  // 查询示例联系人详情
-export const getDemo01Contact = async (id: number) => {
+  getDemo01Contact: async (id: number) => {
     return await request.get({ url: `/infra/demo01-contact/get?id=` + id })
-}
+  },
 
-// 新增示例联系人
+  // 新增示例联系人
-export const createDemo01Contact = async (data: Demo01ContactVO) => {
+  createDemo01Contact: async (data: Demo01Contact) => {
     return await request.post({ url: `/infra/demo01-contact/create`, data })
-}
+  },
 
-// 修改示例联系人
+  // 修改示例联系人
-export const updateDemo01Contact = async (data: Demo01ContactVO) => {
+  updateDemo01Contact: async (data: Demo01Contact) => {
     return await request.put({ url: `/infra/demo01-contact/update`, data })
-}
+  },
 
-// 删除示例联系人
+  // 删除示例联系人
-export const deleteDemo01Contact = async (id: number) => {
+  deleteDemo01Contact: async (id: number) => {
     return await request.delete({ url: `/infra/demo01-contact/delete?id=` + id })
-}
+  },
 
-// 导出示例联系人 Excel
+  /** 批量删除示例联系人 */
-export const exportDemo01Contact = async (params) => {
+  deleteDemo01ContactList: async (ids: number[]) => {
+    return await request.delete({ url: `/infra/demo01-contact/delete-list?ids=${ids.join(',')}` })
+  },
+
+  // 导出示例联系人 Excel
+  exportDemo01Contact: async (params) => {
     return await request.download({ url: `/infra/demo01-contact/export-excel`, params })
+  }
 }

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/api/infra/demo/demo03/inner/index.ts

@@ -1,57 +1,81 @@
 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; // 简介
+  demo03courses?: Demo03Course[]
+  demo03grade?: Demo03Grade
 }
 
-// 新增学生
+// 学生 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-inner/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-inner/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-inner/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-inner/update`, data })
-}
+  },
+
+  // 删除学生
+  deleteDemo03Student: async (id: number) => {
+    return await request.delete({ url: `/infra/demo03-student-inner/delete?id=` + id })
+  },
+
+  /** 批量删除学生 */
+  deleteDemo03StudentList: async (ids: number[]) => {
+    return await request.delete({ url: `/infra/demo03-student-inner/delete-list?ids=${ids.join(',')}` })
+  },
+
+  // 导出学生 Excel
+  exportDemo03Student: async (params) => {
+    return await request.download({ url: `/infra/demo03-student-inner/export-excel`, params })
+  },
 
 // ==================== 子表（学生课程） ====================
 
-// 获得学生课程列表
+  // 获得学生课程列表
-export const getDemo03CourseListByStudentId = async (studentId) => {
+  getDemo03CourseListByStudentId: async (studentId) => {
-  return await request.get({
+    return await request.get({ url: `/infra/demo03-student-inner/demo03-course/list-by-student-id?studentId=` + studentId })
-    url: `/infra/demo03-student/demo03-course/list-by-student-id?studentId=` + studentId
+  },
-  })
-}
 
 // ==================== 子表（学生班级） ====================
 
-// 获得学生班级
+  // 获得学生班级
-export const getDemo03GradeByStudentId = async (studentId) => {
+  getDemo03GradeByStudentId: async (studentId) => {
-  return await request.get({
+    return await request.get({ url: `/infra/demo03-student-inner/demo03-grade/get-by-student-id?studentId=` + studentId })
-    url: `/infra/demo03-student/demo03-grade/get-by-student-id?studentId=` + studentId
+  },
-  })
 }

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

@@ -1,57 +1,81 @@
 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; // 简介
+  demo03courses?: Demo03Course[]
+  demo03grade?: Demo03Grade
 }
 
-// 新增学生
+// 学生 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-normal/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-normal/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-normal/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-normal/update`, data })
-}
+  },
+
+  // 删除学生
+  deleteDemo03Student: async (id: number) => {
+    return await request.delete({ url: `/infra/demo03-student-normal/delete?id=` + id })
+  },
+
+  /** 批量删除学生 */
+  deleteDemo03StudentList: async (ids: number[]) => {
+    return await request.delete({ url: `/infra/demo03-student-normal/delete-list?ids=${ids.join(',')}` })
+  },
+
+  // 导出学生 Excel
+  exportDemo03Student: async (params) => {
+    return await request.download({ url: `/infra/demo03-student-normal/export-excel`, params })
+  },
 
 // ==================== 子表（学生课程） ====================
 
-// 获得学生课程列表
+  // 获得学生课程列表
-export const getDemo03CourseListByStudentId = async (studentId) => {
+  getDemo03CourseListByStudentId: async (studentId) => {
-  return await request.get({
+    return await request.get({ url: `/infra/demo03-student-normal/demo03-course/list-by-student-id?studentId=` + studentId })
-    url: `/infra/demo03-student/demo03-course/list-by-student-id?studentId=` + studentId
+  },
-  })
-}
 
 // ==================== 子表（学生班级） ====================
 
-// 获得学生班级
+  // 获得学生班级
-export const getDemo03GradeByStudentId = async (studentId) => {
+  getDemo03GradeByStudentId: async (studentId) => {
-  return await request.get({
+    return await request.get({ url: `/infra/demo03-student-normal/demo03-grade/get-by-student-id?studentId=` + studentId })
-    url: `/infra/demo03-student/demo03-grade/get-by-student-id?studentId=` + studentId
+  },
-  })
 }

src/views/infra/demo/demo01/Demo01ContactForm.vue

@@ -15,7 +15,7 @@
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_USER_SEX)"
             :key="dict.value"
-            :value="dict.value"
+            :label="dict.value"
           >
             {{ dict.label }}
           </el-radio>
@@ -44,7 +44,10 @@
 </template>
 <script setup lang="ts">
 import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
-import * as Demo01ContactApi from '@/api/infra/demo/demo01'
+import { Demo01ContactApi, Demo01Contact } from '@/api/infra/demo/demo01'
+
+/** 示例联系人 表单 */
+defineOptions({ name: 'Demo01ContactForm' })
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -59,13 +62,13 @@ const formData = ref({
   sex: undefined,
   birthday: undefined,
   description: undefined,
-  avatar: undefined
+  avatar: 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
 
@@ -95,7 +98,7 @@ const submitForm = async () => {
   // 提交请求
   formLoading.value = true
   try {
-    const data = formData.value as unknown as Demo01ContactApi.Demo01ContactVO
+    const data = formData.value as unknown as Demo01Contact
     if (formType.value === 'create') {
       await Demo01ContactApi.createDemo01Contact(data)
       message.success(t('common.createSuccess'))
@@ -119,7 +122,7 @@ const resetForm = () => {
     sex: undefined,
     birthday: undefined,
     description: undefined,
-    avatar: undefined
+    avatar: undefined,
   }
   formRef.value?.resetFields()
 }

src/views/infra/demo/demo01/index.vue

@@ -1,6 +1,4 @@
 <template>
-  <doc-alert title="代码生成（单表）" url="https://doc.iocoder.cn/new-feature/" />
-
   <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,13 +63,30 @@
         >
           <Icon icon="ep:download" class="mr-5px" /> 导出
         </el-button>
+        <el-button
+          type="danger"
+          plain
+          :disabled="isEmpty(checkedIds)"
+          @click="handleDeleteBatch"
+          v-hasPermi="['infra:demo01-contact:delete']"
+        >
+          <Icon icon="ep:delete" 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">
+    <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="sex">
@@ -90,7 +110,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
@@ -126,25 +146,27 @@
 
 <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 Demo01ContactApi from '@/api/infra/demo/demo01'
+import { Demo01ContactApi, Demo01Contact } from '@/api/infra/demo/demo01'
 import Demo01ContactForm from './Demo01ContactForm.vue'
 
+/** 示例联系人 列表 */
 defineOptions({ name: 'Demo01Contact' })
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
 const loading = ref(true) // 列表的加载中
-const list = ref([]) // 列表的数据
+const list = ref<Demo01Contact[]>([]) // 列表的数据
 const total = ref(0) // 列表的总页数
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
-  name: null,
+  name: undefined,
-  sex: null,
+  sex: undefined,
-  createTime: []
+  createTime: [],
 })
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
@@ -192,6 +214,22 @@ const handleDelete = async (id: number) => {
   } catch {}
 }
 
+/** 批量删除示例联系人 */
+const handleDeleteBatch = async () => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    await Demo01ContactApi.deleteDemo01ContactList(checkedIds.value);
+    message.success(t('common.delSuccess'))
+    await getList();
+  } catch {}
+}
+
+const checkedIds = ref<number[]>([])
+const handleRowCheckboxChange = (records: Demo01Contact[]) => {
+  checkedIds.value = records.map((item) => item.id);
+}
+
 /** 导出按钮操作 */
 const handleExport = async () => {
   try {

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

@@ -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

@@ -2,40 +2,56 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-button
-      v-hasPermi="['infra:demo03-student:create']"
-      plain
       type="primary"
+      plain
       @click="openForm('create')"
+      v-hasPermi="['infra:demo03-student:create']"
     >
-      <Icon class="mr-5px" icon="ep:plus" />
+      <Icon icon="ep:plus" class="mr-5px" /> 新增
-      新增
     </el-button>
-    <el-table v-loading="loading" :data="list" :show-overflow-tooltip="true" :stripe="true">
+      <el-button
-      <el-table-column align="center" label="编号" prop="id" />
+          type="danger"
-      <el-table-column align="center" label="名字" prop="name" />
+          plain
-      <el-table-column align="center" label="分数" prop="score" />
+          :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" />
       <el-table-column
-        :formatter="dateFormatter"
-        align="center"
         label="创建时间"
+        align="center"
         prop="createTime"
+        :formatter="dateFormatter"
         width="180px"
       />
-      <el-table-column align="center" label="操作">
+      <el-table-column label="操作" align="center">
         <template #default="scope">
           <el-button
-            v-hasPermi="['infra:demo03-student:update']"
             link
             type="primary"
             @click="openForm('update', scope.row.id)"
+            v-hasPermi="['infra:demo03-student:update']"
           >
             编辑
           </el-button>
           <el-button
-            v-hasPermi="['infra:demo03-student:delete']"
             link
             type="danger"
             @click="handleDelete(scope.row.id)"
+            v-hasPermi="['infra:demo03-student:delete']"
           >
             删除
           </el-button>
@@ -44,19 +60,19 @@
     </el-table>
     <!-- 分页 -->
     <Pagination
-      v-model:limit="queryParams.pageSize"
-      v-model:page="queryParams.pageNo"
       :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
       @pagination="getList"
     />
   </ContentWrap>
     <!-- 表单弹窗：添加/修改 -->
     <Demo03CourseForm ref="formRef" @success="getList" />
 </template>
-
+<script setup lang="ts">
-<script lang="ts" setup>
 import { dateFormatter } from '@/utils/formatTime'
-import * as Demo03StudentApi from '@/api/infra/demo/demo03/erp'
+import { isEmpty } from '@/utils/is'
+import {Demo03Course, Demo03StudentApi} from '@/api/infra/demo/demo03/erp'
 import Demo03CourseForm from './Demo03CourseForm.vue'
 
 const { t } = useI18n() // 国际化
@@ -127,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

@@ -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

@@ -2,40 +2,56 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-button
-      v-hasPermi="['infra:demo03-student:create']"
-      plain
       type="primary"
+      plain
       @click="openForm('create')"
+      v-hasPermi="['infra:demo03-student:create']"
     >
-      <Icon class="mr-5px" icon="ep:plus" />
+      <Icon icon="ep:plus" class="mr-5px" /> 新增
-      新增
     </el-button>
-    <el-table v-loading="loading" :data="list" :show-overflow-tooltip="true" :stripe="true">
+      <el-button
-      <el-table-column align="center" label="编号" prop="id" />
+          type="danger"
-      <el-table-column align="center" label="名字" prop="name" />
+          plain
-      <el-table-column align="center" label="班主任" prop="teacher" />
+          :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" />
       <el-table-column
-        :formatter="dateFormatter"
-        align="center"
         label="创建时间"
+        align="center"
         prop="createTime"
+        :formatter="dateFormatter"
         width="180px"
       />
-      <el-table-column align="center" label="操作">
+      <el-table-column label="操作" align="center">
         <template #default="scope">
           <el-button
-            v-hasPermi="['infra:demo03-student:update']"
             link
             type="primary"
             @click="openForm('update', scope.row.id)"
+            v-hasPermi="['infra:demo03-student:update']"
           >
             编辑
           </el-button>
           <el-button
-            v-hasPermi="['infra:demo03-student:delete']"
             link
             type="danger"
             @click="handleDelete(scope.row.id)"
+            v-hasPermi="['infra:demo03-student:delete']"
           >
             删除
           </el-button>
@@ -44,19 +60,19 @@
     </el-table>
     <!-- 分页 -->
     <Pagination
-      v-model:limit="queryParams.pageSize"
-      v-model:page="queryParams.pageNo"
       :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
       @pagination="getList"
     />
   </ContentWrap>
     <!-- 表单弹窗：添加/修改 -->
     <Demo03GradeForm ref="formRef" @success="getList" />
 </template>
-
+<script setup lang="ts">
-<script lang="ts" setup>
 import { dateFormatter } from '@/utils/formatTime'
-import * as Demo03StudentApi from '@/api/infra/demo/demo03/erp'
+import { isEmpty } from '@/utils/is'
+import {Demo03Grade, Demo03StudentApi} from '@/api/infra/demo/demo03/erp'
 import Demo03GradeForm from './Demo03GradeForm.vue'
 
 const { t } = useI18n() // 国际化
@@ -127,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,26 +1,29 @@
 <template>
-  <doc-alert title="代码生成（主子表）" url="https://doc.iocoder.cn/new-feature/master-sub/" />
-
   <ContentWrap>
     <!-- 搜索工作栏 -->
     <el-form
+      class="-mb-15px"
+      :model="queryParams"
       ref="queryFormRef"
       :inline="true"
-      :model="queryParams"
-      class="-mb-15px"
       label-width="68px"
     >
       <el-form-item label="名字" prop="name">
         <el-input
           v-model="queryParams.name"
-          class="!w-240px"
-          clearable
           placeholder="请输入名字"
+          clearable
           @keyup.enter="handleQuery"
+          class="!w-240px"
         />
       </el-form-item>
       <el-form-item label="性别" prop="sex">
-        <el-select v-model="queryParams.sex" class="!w-240px" clearable placeholder="请选择性别">
+        <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"
@@ -32,41 +35,42 @@
       <el-form-item label="创建时间" prop="createTime">
         <el-date-picker
           v-model="queryParams.createTime"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
-          end-placeholder="结束日期"
-          start-placeholder="开始日期"
-          type="daterange"
           value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-220px"
         />
       </el-form-item>
       <el-form-item>
-        <el-button @click="handleQuery">
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
-          <Icon class="mr-5px" icon="ep:search" />
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
-          搜索
-        </el-button>
-        <el-button @click="resetQuery">
-          <Icon class="mr-5px" icon="ep:refresh" />
-          重置
-        </el-button>
         <el-button
-          v-hasPermi="['infra:demo03-student:create']"
-          plain
           type="primary"
+          plain
           @click="openForm('create')"
+          v-hasPermi="['infra:demo03-student:create']"
         >
-          <Icon class="mr-5px" icon="ep:plus" />
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
-          新增
         </el-button>
         <el-button
-          v-hasPermi="['infra:demo03-student:export']"
-          :loading="exportLoading"
-          plain
           type="success"
+          plain
           @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['infra:demo03-student:export']"
         >
-          <Icon class="mr-5px" icon="ep:download" />
+          <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>
@@ -75,50 +79,53 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-table
+      row-key="id"
       v-loading="loading"
       :data="list"
-      :show-overflow-tooltip="true"
       :stripe="true"
+      :show-overflow-tooltip="true"
       highlight-current-row
       @current-change="handleCurrentChange"
+      @selection-change="handleRowCheckboxChange"
     >
-      <el-table-column align="center" label="编号" prop="id" />
+    <el-table-column type="selection" width="55" />
-      <el-table-column align="center" label="名字" prop="name" />
+      <el-table-column label="编号" align="center" prop="id" />
-      <el-table-column align="center" label="性别" prop="sex">
+      <el-table-column label="名字" align="center" prop="name" />
+      <el-table-column label="性别" align="center" prop="sex">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.SYSTEM_USER_SEX" :value="scope.row.sex" />
         </template>
       </el-table-column>
       <el-table-column
-        :formatter="dateFormatter"
-        align="center"
         label="出生日期"
-        prop="birthday"
-        width="180px"
-      />
-      <el-table-column align="center" label="简介" prop="description" />
-      <el-table-column
-        :formatter="dateFormatter"
         align="center"
-        label="创建时间"
+        prop="birthday"
-        prop="createTime"
+        :formatter="dateFormatter"
         width="180px"
       />
-      <el-table-column align="center" label="操作">
+      <el-table-column label="简介" align="center" prop="description" />
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="操作" align="center" min-width="120px">
         <template #default="scope">
           <el-button
-            v-hasPermi="['infra:demo03-student:update']"
             link
             type="primary"
             @click="openForm('update', scope.row.id)"
+            v-hasPermi="['infra:demo03-student:update']"
           >
             编辑
           </el-button>
           <el-button
-            v-hasPermi="['infra:demo03-student:delete']"
             link
             type="danger"
             @click="handleDelete(scope.row.id)"
+            v-hasPermi="['infra:demo03-student:delete']"
           >
             删除
           </el-button>
@@ -127,9 +134,9 @@
     </el-table>
     <!-- 分页 -->
     <Pagination
-      v-model:limit="queryParams.pageSize"
-      v-model:page="queryParams.pageNo"
       :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
       @pagination="getList"
     />
   </ContentWrap>
@@ -140,39 +147,41 @@
   <ContentWrap>
     <el-tabs model-value="demo03Course">
       <el-tab-pane label="学生课程" name="demo03Course">
-        <Demo03CourseList :student-id="currentRow?.id" />
+        <Demo03CourseList :student-id="currentRow.id" />
       </el-tab-pane>
       <el-tab-pane label="学生班级" name="demo03Grade">
-        <Demo03GradeList :student-id="currentRow?.id" />
+        <Demo03GradeList :student-id="currentRow.id" />
       </el-tab-pane>
     </el-tabs>
   </ContentWrap>
 </template>
 
-<script lang="ts" setup>
+<script setup lang="ts">
-import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+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) // 导出的加载中
@@ -220,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 {

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

@@ -49,11 +49,14 @@
   </Dialog>
 </template>
 <script setup lang="ts">
-import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
-import * as Demo03StudentApi from '@/api/infra/demo/demo03/inner'
+import { Demo03Student, Demo03StudentApi } from '@/api/infra/demo/demo03/inner'
 import Demo03CourseForm from './components/Demo03CourseForm.vue'
 import Demo03GradeForm from './components/Demo03GradeForm.vue'
 
+/** 学生 表单 */
+defineOptions({ name: 'Demo03StudentForm' })
+
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 
@@ -120,7 +123,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
     // 拼接子表的数据
     data.demo03Courses = demo03CourseFormRef.value.getData()
     data.demo03Grade = demo03GradeFormRef.value.getData()

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

@@ -35,13 +35,13 @@
   </el-row>
 </template>
 <script setup lang="ts">
-import * as Demo03StudentApi from '@/api/infra/demo/demo03/inner'
+import { Demo03StudentApi } from '@/api/infra/demo/demo03/inner'
 
 const props = defineProps<{
-  studentId: undefined // 学生编号（主表的关联字段）
+  studentId: number // 学生编号（主表的关联字段）
 }>()
 const formLoading = ref(false) // 表单的加载中
-const formData = ref([])
+const formData = ref<any[]>([])
 const formRules = reactive({
   studentId: [{ required: true, message: '学生编号不能为空', trigger: 'blur' }],
   name: [{ required: true, message: '名字不能为空', trigger: 'blur' }],
@@ -77,7 +77,7 @@ const handleAdd = () => {
     name: undefined,
     score: undefined
   }
-  row.studentId = props.studentId
+  row.studentId = props.studentId as any
   formData.value.push(row)
 }
 

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

@@ -1,7 +1,13 @@
 <template>
   <!-- 列表 -->
   <ContentWrap>
-    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+    <el-table
+      row-key="id"
+      v-loading="loading"
+      :data="list"
+      :stripe="true"
+      :show-overflow-tooltip="true"
+    >
       <el-table-column label="编号" align="center" prop="id" />
       <el-table-column label="名字" align="center" prop="name" />
       <el-table-column label="分数" align="center" prop="score" />
@@ -17,13 +23,10 @@
 </template>
 <script setup lang="ts">
 import { dateFormatter } from '@/utils/formatTime'
-import * as Demo03StudentApi from '@/api/infra/demo/demo03/inner'
+import { Demo03StudentApi } from '@/api/infra/demo/demo03/inner'
-
-const { t } = useI18n() // 国际化
-const message = useMessage() // 消息弹窗
 
 const props = defineProps<{
-  studentId: undefined // 学生编号（主表的关联字段）
+  studentId?: number // 学生编号（主表的关联字段）
 }>()
 const loading = ref(false) // 列表的加载中
 const list = ref([]) // 列表的数据
@@ -38,12 +41,6 @@ const getList = async () => {
   }
 }
 
-/** 搜索按钮操作 */
-const handleQuery = () => {
-  queryParams.pageNo = 1
-  getList()
-}
-
 /** 初始化 **/
 onMounted(() => {
   getList()

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

@@ -15,13 +15,13 @@
   </el-form>
 </template>
 <script setup lang="ts">
-import * as Demo03StudentApi from '@/api/infra/demo/demo03/inner'
+import { Demo03StudentApi } from '@/api/infra/demo/demo03/inner'
 
 const props = defineProps<{
-  studentId: undefined // 学生编号（主表的关联字段）
+  studentId: number // 学生编号（主表的关联字段）
 }>()
 const formLoading = ref(false) // 表单的加载中
-const formData = ref([])
+const formData = ref<any>({})
 const formRules = reactive({
   studentId: [{ required: true, message: '学生编号不能为空', trigger: 'blur' }],
   name: [{ required: true, message: '名字不能为空', trigger: 'blur' }],

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

@@ -1,7 +1,13 @@
 <template>
   <!-- 列表 -->
   <ContentWrap>
-    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+    <el-table
+      row-key="id"
+      v-loading="loading"
+      :data="list"
+      :stripe="true"
+      :show-overflow-tooltip="true"
+    >
       <el-table-column label="编号" align="center" prop="id" />
       <el-table-column label="名字" align="center" prop="name" />
       <el-table-column label="班主任" align="center" prop="teacher" />
@@ -17,13 +23,10 @@
 </template>
 <script setup lang="ts">
 import { dateFormatter } from '@/utils/formatTime'
-import * as Demo03StudentApi from '@/api/infra/demo/demo03/inner'
+import { Demo03StudentApi } from '@/api/infra/demo/demo03/inner'
-
-const { t } = useI18n() // 国际化
-const message = useMessage() // 消息弹窗
 
 const props = defineProps<{
-  studentId: undefined // 学生编号（主表的关联字段）
+  studentId?: number // 学生编号（主表的关联字段）
 }>()
 const loading = ref(false) // 列表的加载中
 const list = ref([]) // 列表的数据
@@ -42,12 +45,6 @@ const getList = async () => {
   }
 }
 
-/** 搜索按钮操作 */
-const handleQuery = () => {
-  queryParams.pageNo = 1
-  getList()
-}
-
 /** 初始化 **/
 onMounted(() => {
   getList()

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

@@ -1,6 +1,4 @@
 <template>
-  <doc-alert title="代码生成（主子表）" url="https://doc.iocoder.cn/new-feature/master-sub/" />
-
   <ContentWrap>
     <!-- 搜索工作栏 -->
     <el-form
@@ -37,7 +35,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,13 +58,30 @@
         >
           <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>
 
   <!-- 列表 -->
   <ContentWrap>
-    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+    <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 type="expand">
         <template #default="scope">
@@ -102,7 +117,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
@@ -137,28 +152,30 @@
 </template>
 
 <script setup lang="ts">
-import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
+import { DICT_TYPE, getIntDictOptions } 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/inner'
+import { Demo03Student, Demo03StudentApi } from '@/api/infra/demo/demo03/inner'
 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: []
 })
 const queryFormRef = ref() // 搜索的表单
@@ -207,6 +224,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 {

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

@@ -50,10 +50,13 @@
 </template>
 <script setup lang="ts">
 import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
-import * as Demo03StudentApi from '@/api/infra/demo/demo03/normal'
+import { Demo03StudentApi, Demo03Student } from '@/api/infra/demo/demo03/normal'
 import Demo03CourseForm from './components/Demo03CourseForm.vue'
 import Demo03GradeForm from './components/Demo03GradeForm.vue'
 
+/** 学生 表单 */
+defineOptions({ name: 'Demo03StudentForm' })
+
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 
@@ -66,13 +69,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
 
@@ -120,7 +123,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
     // 拼接子表的数据
     data.demo03Courses = demo03CourseFormRef.value.getData()
     data.demo03Grade = demo03GradeFormRef.value.getData()
@@ -146,7 +149,7 @@ const resetForm = () => {
     name: undefined,
     sex: undefined,
     birthday: undefined,
-    description: undefined
+    description: undefined,
   }
   formRef.value?.resetFields()
 }

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

@@ -35,17 +35,17 @@
   </el-row>
 </template>
 <script setup lang="ts">
-import * as Demo03StudentApi from '@/api/infra/demo/demo03/normal'
+import { Demo03StudentApi } from '@/api/infra/demo/demo03/normal'
 
 const props = defineProps<{
-  studentId: undefined // 学生编号（主表的关联字段）
+  studentId: number // 学生编号（主表的关联字段）
 }>()
 const formLoading = ref(false) // 表单的加载中
-const formData = ref([])
+const formData = ref<any[]>([])
 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
 
@@ -75,9 +75,9 @@ const handleAdd = () => {
     id: undefined,
     studentId: undefined,
     name: undefined,
-    score: undefined
+    score: undefined,
   }
-  row.studentId = props.studentId
+  row.studentId = props.studentId as any
   formData.value.push(row)
 }
 

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

@@ -15,17 +15,17 @@
   </el-form>
 </template>
 <script setup lang="ts">
-import * as Demo03StudentApi from '@/api/infra/demo/demo03/normal'
+import { Demo03StudentApi } from '@/api/infra/demo/demo03/normal'
 
 const props = defineProps<{
-  studentId: undefined // 学生编号（主表的关联字段）
+  studentId: number // 学生编号（主表的关联字段）
 }>()
 const formLoading = ref(false) // 表单的加载中
-const formData = ref([])
+const formData = ref({})
 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
 

src/views/infra/demo/demo03/normal/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,13 +63,30 @@
         >
           <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>
 
   <!-- 列表 -->
   <ContentWrap>
-    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+    <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="sex">
@@ -89,7 +109,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
@@ -125,26 +145,28 @@
 
 <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/normal'
+import { Demo03StudentApi, Demo03Student } from '@/api/infra/demo/demo03/normal'
 import Demo03StudentForm from './Demo03StudentForm.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) // 导出的加载中
@@ -192,6 +214,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 {