diff --git a/src/api/infra/demo12/index.ts b/src/api/infra/demo12/index.ts
new file mode 100644
index 00000000..33c3fb4f
--- /dev/null
+++ b/src/api/infra/demo12/index.ts
@@ -0,0 +1,57 @@
+import request from '@/config/axios'
+
+export interface Demo12StudentVO {
+ id: number
+ name: string
+ description: string
+ birthday: Date
+ sex: number
+ enabled: boolean
+ avatar: string
+ video: string
+ memo: string
+}
+
+// 查询学生列表
+export const getDemo12StudentPage = async (params) => {
+ return await request.get({ url: `/infra/demo12-student/page`, params })
+}
+
+// 查询学生详情
+export const getDemo12Student = async (id: number) => {
+ return await request.get({ url: `/infra/demo12-student/get?id=` + id })
+}
+
+// 新增学生
+export const createDemo12Student = async (data: Demo12StudentVO) => {
+ return await request.post({ url: `/infra/demo12-student/create`, data })
+}
+
+// 修改学生
+export const updateDemo12Student = async (data: Demo12StudentVO) => {
+ return await request.put({ url: `/infra/demo12-student/update`, data })
+}
+
+// 删除学生
+export const deleteDemo12Student = async (id: number) => {
+ return await request.delete({ url: `/infra/demo12-student/delete?id=` + id })
+}
+
+// 导出学生 Excel
+export const exportDemo12Student = async (params) => {
+ return await request.download({ url: `/infra/demo12-student/export-excel`, params })
+}
+
+// ==================== 子表（学生联系人） ====================
+
+// 获得学生联系人列表
+export const getDemo12StudentContactListByStudentId = async (studentId) => {
+ return await request.get({ url: `/infra/demo12-student/demo12-student/list-by-student-id?studentId=` + studentId })
+}
+
+// ==================== 子表（学生班主任） ====================
+
+// 获得学生班主任
+export const getDemo12StudentTeacherByStudentId = async (studentId) => {
+ return await request.get({ url: `/infra/demo12-student/demo12-student/get-by-student-id?studentId=` + studentId })
+}
\ No newline at end of file
diff --git a/src/views/infra/demo11/components/Demo11StudentContactForm.vue b/src/views/infra/demo11/components/Demo11StudentContactForm.vue
index 1ab017e8..ba900017 100644
--- a/src/views/infra/demo11/components/Demo11StudentContactForm.vue
+++ b/src/views/infra/demo11/components/Demo11StudentContactForm.vue
@@ -85,6 +85,11 @@
</el-form-item>
</template>
</el-table-column>
+ <el-table-column align="center" fixed="right" label="操作" width="60">
+ <template #default="{ $index }">
+ <el-button @click="handleDelete($index)" link>—</el-button>
+ </template>
+ </el-table-column>
</el-table>
</el-form>
<el-row justify="center" class="mt-3">
diff --git a/src/views/infra/demo12/Demo12StudentForm.vue b/src/views/infra/demo12/Demo12StudentForm.vue
new file mode 100644
index 00000000..d3cb482d
--- /dev/null
+++ b/src/views/infra/demo12/Demo12StudentForm.vue
@@ -0,0 +1,183 @@
+<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="description">
+ <el-input v-model="formData.description" type="textarea" placeholder="请输入简介" />
+ </el-form-item>
+ <el-form-item label="出生日期" prop="birthday">
+ <el-date-picker
+ v-model="formData.birthday"
+ type="date"
+ value-format="x"
+ placeholder="选择出生日期"
+ />
+ </el-form-item>
+ <el-form-item label="性别" prop="sex">
+ <el-select v-model="formData.sex" placeholder="请选择性别">
+ <el-option
+ v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_USER_SEX)"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="是否有效" prop="enabled">
+ <el-radio-group v-model="formData.enabled">
+ <el-radio
+ v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
+ :key="dict.value"
+ :label="dict.value"
+ >
+ {{ dict.label }}
+ </el-radio>
+ </el-radio-group>
+ </el-form-item>
+ <el-form-item label="头像">
+ <UploadImg v-model="formData.avatar" />
+ </el-form-item>
+ <el-form-item label="附件" prop="video">
+ <UploadFile v-model="formData.video" />
+ </el-form-item>
+ <el-form-item label="备注" prop="memo">
+ <Editor v-model="formData.memo" height="150px" />
+ </el-form-item>
+ </el-form>
+ <!-- 子表的表单 -->
+ <el-tabs v-model="subTabsName">
+ <el-tab-pane label="学生联系人" name="demo12StudentContact">
+ <Demo12StudentContactForm ref="demo12StudentContactFormRef" :student-id="formData.id" />
+ </el-tab-pane>
+ <el-tab-pane label="学生班主任" name="demo12StudentTeacher">
+ <Demo12StudentTeacherForm ref="demo12StudentTeacherFormRef" :student-id="formData.id" />
+ </el-tab-pane>
+ </el-tabs>
+ <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 { getIntDictOptions, getBoolDictOptions, DICT_TYPE } from '@/utils/dict'
+import * as Demo12StudentApi from '@/api/infra/demo12'
+import Demo12StudentContactForm from './components/Demo12StudentContactForm.vue'
+import Demo12StudentTeacherForm from './components/Demo12StudentTeacherForm.vue'
+
+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,
+ description: undefined,
+ birthday: undefined,
+ sex: undefined,
+ enabled: undefined,
+ avatar: undefined,
+ video: undefined,
+ memo: undefined
+})
+const formRules = reactive({
+ name: [{ required: true, message: '名字不能为空', trigger: 'blur' }],
+ description: [{ required: true, message: '简介不能为空', trigger: 'blur' }],
+ birthday: [{ required: true, message: '出生日期不能为空', trigger: 'blur' }],
+ sex: [{ required: true, message: '性别不能为空', trigger: 'change' }],
+ enabled: [{ required: true, message: '是否有效不能为空', trigger: 'blur' }],
+ avatar: [{ required: true, message: '头像不能为空', trigger: 'blur' }],
+ memo: [{ required: true, message: '备注不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+
+/** 子表的表单 */
+const subTabsName = ref('demo12StudentContact')
+const demo12StudentContactFormRef = ref()
+const demo12StudentTeacherFormRef = 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 Demo12StudentApi.getDemo12Student(id)
+ } finally {
+ formLoading.value = false
+ }
+ }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+ // 校验表单
+ await formRef.value.validate()
+ // 校验子表单
+ try {
+ await demo12StudentContactFormRef.value.validate()
+ } catch (e) {
+ subTabsName.value = 'demo12StudentContact'
+ return
+ }
+ try {
+ await demo12StudentTeacherFormRef.value.validate()
+ } catch (e) {
+ subTabsName.value = 'demo12StudentTeacher'
+ return
+ }
+ // 提交请求
+ formLoading.value = true
+ try {
+ const data = formData.value as unknown as Demo12StudentApi.Demo12StudentVO
+ // 拼接子表的数据
+ data.demo12StudentContacts = demo12StudentContactFormRef.value.getData()
+ data.demo12StudentTeacher = demo12StudentTeacherFormRef.value.getData()
+ if (formType.value === 'create') {
+ await Demo12StudentApi.createDemo12Student(data)
+ message.success(t('common.createSuccess'))
+ } else {
+ await Demo12StudentApi.updateDemo12Student(data)
+ message.success(t('common.updateSuccess'))
+ }
+ dialogVisible.value = false
+ // 发送操作成功的事件
+ emit('success')
+ } finally {
+ formLoading.value = false
+ }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+ formData.value = {
+ id: undefined,
+ name: undefined,
+ description: undefined,
+ birthday: undefined,
+ sex: undefined,
+ enabled: undefined,
+ avatar: undefined,
+ video: undefined,
+ memo: undefined
+ }
+ formRef.value?.resetFields()
+}
+</script>
\ No newline at end of file
diff --git a/src/views/infra/demo12/components/Demo12StudentContactForm.vue b/src/views/infra/demo12/components/Demo12StudentContactForm.vue
new file mode 100644
index 00000000..d71f6146
--- /dev/null
+++ b/src/views/infra/demo12/components/Demo12StudentContactForm.vue
@@ -0,0 +1,5 @@
+<template>
+ <div>123</div>
+</template>
+<script setup lang="ts">
+</script>
\ No newline at end of file
diff --git a/src/views/infra/demo12/components/Demo12StudentContactList.vue b/src/views/infra/demo12/components/Demo12StudentContactList.vue
new file mode 100644
index 00000000..65ed9df1
--- /dev/null
+++ b/src/views/infra/demo12/components/Demo12StudentContactList.vue
@@ -0,0 +1,63 @@
+<template>
+ <!-- 列表 -->
+ <ContentWrap>
+ <el-table 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="studentId" />
+ <el-table-column label="名字" align="center" prop="name" />
+ <el-table-column label="简介" align="center" prop="description" />
+ <el-table-column
+ label="出生日期"
+ align="center"
+ prop="birthday"
+ :formatter="dateFormatter"
+ width="180px"
+ />
+ <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 label="是否有效" align="center" prop="enabled">
+ <template #default="scope">
+ <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.enabled" />
+ </template>
+ </el-table-column>
+ <el-table-column label="头像" align="center" prop="avatar" />
+ <el-table-column label="附件" align="center" prop="video" />
+ <el-table-column label="备注" align="center" prop="memo" />
+ <el-table-column
+ label="创建时间"
+ align="center"
+ prop="createTime"
+ :formatter="dateFormatter"
+ width="180px"
+ />
+ </el-table>
+ </ContentWrap>
+</template>
+
+<script setup lang="ts">
+import { DICT_TYPE } from '@/utils/dict'
+import * as Demo12StudentApi from '@/api/infra/demo12'
+const props = defineProps<{
+ studentId: undefined // 学生编号（主表的关联字段）
+}>()
+const loading = ref(true) // 列表的加载中
+const list = ref([]) // 列表的数据
+
+/** 查询列表 */
+const getList = async () => {
+ loading.value = true
+ try {
+ list.value = await Demo12StudentApi.getDemo12StudentContactListByStudentId(studentId.props)
+ } finally {
+ loading.value = false
+ }
+}
+
+/** 初始化 **/
+onMounted(() => {
+ getList()
+})
+</script>
\ No newline at end of file
diff --git a/src/views/infra/demo12/components/Demo12StudentTeacherForm.vue b/src/views/infra/demo12/components/Demo12StudentTeacherForm.vue
new file mode 100644
index 00000000..d71f6146
--- /dev/null
+++ b/src/views/infra/demo12/components/Demo12StudentTeacherForm.vue
@@ -0,0 +1,5 @@
+<template>
+ <div>123</div>
+</template>
+<script setup lang="ts">
+</script>
\ No newline at end of file
diff --git a/src/views/infra/demo12/components/Demo12StudentTeacherList.vue b/src/views/infra/demo12/components/Demo12StudentTeacherList.vue
new file mode 100644
index 00000000..55f6845b
--- /dev/null
+++ b/src/views/infra/demo12/components/Demo12StudentTeacherList.vue
@@ -0,0 +1,67 @@
+<template>
+ <!-- 列表 -->
+ <ContentWrap>
+ <el-table 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="studentId" />
+ <el-table-column label="名字" align="center" prop="name" />
+ <el-table-column label="简介" align="center" prop="description" />
+ <el-table-column
+ label="出生日期"
+ align="center"
+ prop="birthday"
+ :formatter="dateFormatter"
+ width="180px"
+ />
+ <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 label="是否有效" align="center" prop="enabled">
+ <template #default="scope">
+ <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.enabled" />
+ </template>
+ </el-table-column>
+ <el-table-column label="头像" align="center" prop="avatar" />
+ <el-table-column label="附件" align="center" prop="video" />
+ <el-table-column label="备注" align="center" prop="memo" />
+ <el-table-column
+ label="创建时间"
+ align="center"
+ prop="createTime"
+ :formatter="dateFormatter"
+ width="180px"
+ />
+ </el-table>
+ </ContentWrap>
+</template>
+
+<script setup lang="ts">
+import { DICT_TYPE } from '@/utils/dict'
+import * as Demo12StudentApi from '@/api/infra/demo12'
+const props = defineProps<{
+ studentId: undefined // 学生编号（主表的关联字段）
+}>()
+const loading = ref(true) // 列表的加载中
+const list = ref([]) // 列表的数据
+
+/** 查询列表 */
+const getList = async () => {
+ loading.value = true
+ try {
+ const data = await Demo12StudentApi.getDemo12StudentTeacherByStudentId(studentId.props)
+ if (!data) {
+ return
+ }
+ list.value.push(data)
+ } finally {
+ loading.value = false
+ }
+}
+
+/** 初始化 **/
+onMounted(() => {
+ getList()
+})
+</script>
\ No newline at end of file
diff --git a/src/views/infra/demo12/index.vue b/src/views/infra/demo12/index.vue
new file mode 100644
index 00000000..c5a82a4c
--- /dev/null
+++ b/src/views/infra/demo12/index.vue
@@ -0,0 +1,252 @@
+<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 label="出生日期" prop="birthday">
+ <el-date-picker
+ v-model="queryParams.birthday"
+ value-format="YYYY-MM-DD"
+ type="date"
+ placeholder="选择出生日期"
+ clearable
+ class="!w-240px"
+ />
+ </el-form-item>
+ <el-form-item label="性别" prop="sex">
+ <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"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="是否有效" prop="enabled">
+ <el-select
+ v-model="queryParams.enabled"
+ placeholder="请选择是否有效"
+ clearable
+ class="!w-240px"
+ >
+ <el-option
+ v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="创建时间" prop="createTime">
+ <el-date-picker
+ v-model="queryParams.createTime"
+ 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-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:demo12-student:create']"
+ >
+ <Icon icon="ep:plus" class="mr-5px" /> 新增
+ </el-button>
+ <el-button
+ type="success"
+ plain
+ @click="handleExport"
+ :loading="exportLoading"
+ v-hasPermi="['infra:demo12-student:export']"
+ >
+ <Icon icon="ep:download" 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-column label="编号" align="center" prop="id" />
+ <el-table-column label="名字" align="center" prop="name" />
+ <el-table-column label="简介" align="center" prop="description" />
+ <el-table-column
+ label="出生日期"
+ align="center"
+ prop="birthday"
+ :formatter="dateFormatter"
+ width="180px"
+ />
+ <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 label="是否有效" align="center" prop="enabled">
+ <template #default="scope">
+ <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.enabled" />
+ </template>
+ </el-table-column>
+ <el-table-column label="头像" align="center" prop="avatar" />
+ <el-table-column label="附件" align="center" prop="video" />
+ <el-table-column label="备注" align="center" prop="memo" />
+ <el-table-column
+ label="创建时间"
+ align="center"
+ prop="createTime"
+ :formatter="dateFormatter"
+ width="180px"
+ />
+ <el-table-column label="操作" align="center">
+ <template #default="scope">
+ <el-button
+ link
+ type="primary"
+ @click="openForm('update', scope.row.id)"
+ v-hasPermi="['infra:demo12-student:update']"
+ >
+ 编辑
+ </el-button>
+ <el-button
+ link
+ type="danger"
+ @click="handleDelete(scope.row.id)"
+ v-hasPermi="['infra:demo12-student: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>
+
+ <!-- 表单弹窗：添加/修改 -->
+ <Demo12StudentForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { getIntDictOptions, getBoolDictOptions, DICT_TYPE } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import * as Demo12StudentApi from '@/api/infra/demo12'
+import Demo12StudentForm from './Demo12StudentForm.vue'
+
+defineOptions({ name: 'InfraDemo12Student' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数据
+const queryParams = reactive({
+ pageNo: 1,
+ pageSize: 10,
+ name: null,
+ birthday: null,
+ birthday: [],
+ sex: null,
+ enabled: null,
+ createTime: []
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+ loading.value = true
+ try {
+ const data = await Demo12StudentApi.getDemo12StudentPage(queryParams)
+ list.value = data.list
+ total.value = data.total
+ } 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 Demo12StudentApi.deleteDemo12Student(id)
+ message.success(t('common.delSuccess'))
+ // 刷新列表
+ await getList()
+ } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+ try {
+ // 导出的二次确认
+ await message.exportConfirm()
+ // 发起导出
+ exportLoading.value = true
+ const data = await Demo12StudentApi.exportDemo12Student(queryParams)
+ download.excel(data, '学生.xls')
+ } catch {
+ } finally {
+ exportLoading.value = false
+ }
+}
+
+/** 初始化 **/
+onMounted(() => {
+ getList()
+})
+</script>
\ No newline at end of file