From 26e6d287f5f60b1026f1bb89e554de103a7ca1bf Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 12 Nov 2023 19:50:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=EF=BC=9A?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20one=20=E6=83=85=E5=86=B5=E4=B8=8B=E7=9A=84?=
 =?UTF-8?q?=E7=A4=BA=E4=BE=8B=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 72c5eaae31fd37dcfcd016224351237a9e2004d7)
---
 src/api/infra/demo01/index.ts                 |  43 +++
 src/api/infra/demo02/index.ts                 |  14 +
 src/components/UploadFile/src/UploadFile.vue  |   2 +-
 src/views/infra/demo01/Demo01StudentForm.vue  | 150 +++++++++++
 src/views/infra/demo01/index.vue              | 251 ++++++++++++++++++
 .../infra/demo02/DemoStudentAddressForm.vue   | 100 +++++--
 .../infra/demo02/DemoStudentContactForm.vue   | 158 ++++++-----
 src/views/infra/demo02/DemoStudentForm.vue    |  35 +--
 .../demo02/bak/DemoStudentAddressForm.vue     |  58 ++++
 9 files changed, 702 insertions(+), 109 deletions(-)
 create mode 100644 src/api/infra/demo01/index.ts
 create mode 100644 src/views/infra/demo01/Demo01StudentForm.vue
 create mode 100644 src/views/infra/demo01/index.vue
 create mode 100644 src/views/infra/demo02/bak/DemoStudentAddressForm.vue

diff --git a/src/api/infra/demo01/index.ts b/src/api/infra/demo01/index.ts
new file mode 100644
index 00000000..0154bc29
--- /dev/null
+++ b/src/api/infra/demo01/index.ts
@@ -0,0 +1,43 @@
+import request from '@/config/axios'
+
+export interface Demo01StudentVO {
+  id: number
+  name: string
+  description: string
+  birthday: Date
+  sex: number
+  enabled: boolean
+  avatar: string
+  video: string
+  memo: string
+}
+
+// 查询学生列表
+export const getDemo01StudentPage = async (params) => {
+  return await request.get({ url: `/infra/demo01-student/page`, params })
+}
+
+// 查询学生详情
+export const getDemo01Student = async (id: number) => {
+  return await request.get({ url: `/infra/demo01-student/get?id=` + id })
+}
+
+// 新增学生
+export const createDemo01Student = async (data: Demo01StudentVO) => {
+  return await request.post({ url: `/infra/demo01-student/create`, data })
+}
+
+// 修改学生
+export const updateDemo01Student = async (data: Demo01StudentVO) => {
+  return await request.put({ url: `/infra/demo01-student/update`, data })
+}
+
+// 删除学生
+export const deleteDemo01Student = async (id: number) => {
+  return await request.delete({ url: `/infra/demo01-student/delete?id=` + id })
+}
+
+// 导出学生 Excel
+export const exportDemo01Student = async (params) => {
+  return await request.download({ url: `/infra/demo01-student/export-excel`, params })
+}
\ No newline at end of file
diff --git a/src/api/infra/demo02/index.ts b/src/api/infra/demo02/index.ts
index b575dba4..500adde5 100644
--- a/src/api/infra/demo02/index.ts
+++ b/src/api/infra/demo02/index.ts
@@ -33,3 +33,17 @@ export const deleteDemoStudent = async (id: number) => {
 export const exportDemoStudent = async (params) => {
   return await request.download({ url: `/infra/demo-student/export-excel`, params })
 }
+
+// 获得学生联系人列表
+export const getDemoStudentContactListByStudentId = async (studentId) => {
+  return await request.get({
+    url: `/infra/demo-student/demo-student/list-by-student-id?studentId=` + studentId
+  })
+}
+
+// 获得学生地址
+export const getDemoStudentAddressByStudentId = async (studentId) => {
+  return await request.get({
+    url: `/infra/demo-student/demo-student/get-by-student-id?studentId=` + studentId
+  })
+}
diff --git a/src/components/UploadFile/src/UploadFile.vue b/src/components/UploadFile/src/UploadFile.vue
index bba466a7..c1f3e4e2 100644
--- a/src/components/UploadFile/src/UploadFile.vue
+++ b/src/components/UploadFile/src/UploadFile.vue
@@ -144,7 +144,7 @@ watch(
     } else if (isArray(props.modelValue)) {
       // 情况2：字符串
       files.concat(props.modelValue)
-    } else if (props.modelValue === undefined) {
+    } else if (props.modelValue == null) {
       // 情况3：undefined 不处理
     } else {
       throw new Error('不支持的 modelValue 类型')
diff --git a/src/views/infra/demo01/Demo01StudentForm.vue b/src/views/infra/demo01/Demo01StudentForm.vue
new file mode 100644
index 00000000..dfc9823d
--- /dev/null
+++ b/src/views/infra/demo01/Demo01StudentForm.vue
@@ -0,0 +1,150 @@
+<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>
+    <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, getStrDictOptions, getBoolDictOptions, DICT_TYPE } from '@/utils/dict'
+import * as Demo01StudentApi from '@/api/infra/demo01'
+
+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' }],
+  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 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 Demo01StudentApi.getDemo01Student(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as Demo01StudentApi.Demo01StudentVO
+    if (formType.value === 'create') {
+      await Demo01StudentApi.createDemo01Student(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await Demo01StudentApi.updateDemo01Student(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>
diff --git a/src/views/infra/demo01/index.vue b/src/views/infra/demo01/index.vue
new file mode 100644
index 00000000..fb35b561
--- /dev/null
+++ b/src/views/infra/demo01/index.vue
@@ -0,0 +1,251 @@
+<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:demo01-student:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['infra:demo01-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="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:demo01-student:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['infra:demo01-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>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <Demo01StudentForm 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 Demo01StudentApi from '@/api/infra/demo01'
+import Demo01StudentForm from './Demo01StudentForm.vue'
+
+defineOptions({ name: 'InfraDemo01Student' })
+
+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 Demo01StudentApi.getDemo01StudentPage(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 Demo01StudentApi.deleteDemo01Student(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await Demo01StudentApi.exportDemo01Student(queryParams)
+    download.excel(data, '学生.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
\ No newline at end of file
diff --git a/src/views/infra/demo02/DemoStudentAddressForm.vue b/src/views/infra/demo02/DemoStudentAddressForm.vue
index af4cd8f1..6d031406 100644
--- a/src/views/infra/demo02/DemoStudentAddressForm.vue
+++ b/src/views/infra/demo02/DemoStudentAddressForm.vue
@@ -6,39 +6,107 @@
     label-width="100px"
     v-loading="formLoading"
   >
-    <el-form-item label="子字段 1" prop="field1">
-      <el-input v-model="formData.field1" placeholder="请输入字段 1" />
+    <el-form-item label="名字" prop="name">
+      <el-input v-model="formData.name" placeholder="请输入名字" />
     </el-form-item>
-    <el-form-item label="子字段 2" prop="field2">
-      <el-input v-model="formData.field2" placeholder="请输入字段 2" />
+    <el-form-item label="个人简介">
+      <Editor v-model="formData.description" height="150px" />
     </el-form-item>
-    <el-form-item label="子字段 3" prop="field3">
-      <el-input v-model="formData.field3" placeholder="请输入字段 3" />
+    <el-form-item label="性别 1" prop="sex1">
+      <el-select v-model="formData.sex1" placeholder="请选择性别 1">
+        <el-option
+          v-for="dict in getStrDictOptions(DICT_TYPE.SYSTEM_SEX1)"
+          :key="dict.value"
+          :label="dict.label"
+          :value="dict.value"
+        />
+      </el-select>
+    </el-form-item>
+    <el-form-item label="性别 2" prop="sex2">
+      <el-checkbox-group v-model="formData.sex2">
+        <el-checkbox
+          v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_SEX2)"
+          :key="dict.value"
+          :label="dict.value"
+        >
+          {{ dict.label }}
+        </el-checkbox>
+      </el-checkbox-group>
+    </el-form-item>
+    <el-form-item label="性别 3" prop="sex3">
+      <el-radio-group v-model="formData.sex3">
+        <el-radio
+          v-for="dict in getBoolDictOptions(DICT_TYPE.SYSTEM_SEX3)"
+          :key="dict.value"
+          :label="dict.value"
+        >
+          {{ dict.label }}
+        </el-radio>
+      </el-radio-group>
+    </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="memo">
+      <el-input v-model="formData.memo" type="textarea" placeholder="请输入备注" />
     </el-form-item>
   </el-form>
 </template>
 <script setup lang="ts">
+import { getIntDictOptions, getStrDictOptions, getBoolDictOptions, DICT_TYPE } from '@/utils/dict'
+import * as DemoStudentApi from '@/api/infra/demo02'
+
 const props = defineProps<{
-  studentId: undefined // 学生编号
+  studentId: undefined // 学生编号（主表的关联字段）
 }>()
 const formLoading = ref(false) // 表单的加载中
-const formData = ref({})
+const formData = ref([])
 const formRules = reactive({
-  field1: [required]
+  studentId: [{ required: true, message: '学生编号不能为空', trigger: 'blur' }],
+  name: [{ required: true, message: '名字不能为空', trigger: 'blur' }],
+  avatar: [{ required: true, message: '头像不能为空', trigger: 'blur' }],
+  video: [{ required: true, message: '视频不能为空', trigger: 'blur' }],
+  description: [{ required: true, message: '个人简介不能为空', trigger: 'blur' }],
+  sex1: [{ required: true, message: '性别 1不能为空', trigger: 'change' }],
+  sex2: [{ required: true, message: '性别 2不能为空', trigger: 'blur' }],
+  sex3: [{ required: true, message: '性别 3不能为空', trigger: 'blur' }],
+  birthday: [{ required: true, message: '出生日期不能为空', trigger: 'blur' }],
+  memo: [{ required: true, message: '备注不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
 
 /** 监听主表的关联字段的变化，加载对应的子表数据 */
 watch(
   () => props.studentId,
-  (val) => {
-    if (val) {
+  async (val) => {
+    // 情况一：val 为空，说明是新增，则置空
+    if (!val) {
       formData.value = {
-        field2: '番茄',
-        field3: '西瓜'
+        id: undefined,
+        studentId: undefined,
+        name: undefined,
+        avatar: undefined,
+        video: undefined,
+        description: undefined,
+        sex1: undefined,
+        sex2: [],
+        sex3: undefined,
+        birthday: undefined,
+        memo: undefined
       }
-    } else {
-      formData.value = {}
+      return
+    }
+    // 情况二：val 非空，说明是修改，则加载数据
+    try {
+      formLoading.value = true
+      formData.value = await DemoStudentApi.getDemoStudentAddressByStudentId(val)
+    } finally {
+      formLoading.value = false
     }
   },
   { immediate: true }
@@ -49,7 +117,7 @@ const validate = () => {
   return formRef.value.validate()
 }
 
-/** 表单值 **/
+/** 表单值 */
 const getData = () => {
   return formData.value
 }
diff --git a/src/views/infra/demo02/DemoStudentContactForm.vue b/src/views/infra/demo02/DemoStudentContactForm.vue
index 694aadac..5f173f14 100644
--- a/src/views/infra/demo02/DemoStudentContactForm.vue
+++ b/src/views/infra/demo02/DemoStudentContactForm.vue
@@ -3,84 +3,93 @@
     ref="formRef"
     :model="formData"
     :rules="formRules"
-    label-width="0px"
     v-loading="formLoading"
+    label-width="0px"
     :inline-message="true"
   >
     <el-table :data="formData" class="-mt-10px">
       <el-table-column label="序号" type="index" width="100" />
-      <el-table-column label="名字" prop="name" width="50">
-        <template #default="row">
-          <el-form-item class="mb-0px!">
+      <el-table-column label="名字" width="150">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.name`" :rules="formRules.name" class="mb-0px!">
             <el-input v-model="row.name" placeholder="请输入名字" />
           </el-form-item>
         </template>
       </el-table-column>
-      <el-table-column label="手机号码" width="150">
+      <el-table-column label="个人简介" width="400">
         <template #default="{ row, $index }">
-          <el-form-item :prop="`${$index}.mobile`" :rules="formRules.mobile" class="mb-0px!">
-            <el-input type="number" placeholder="输入手机号码" v-model="row.mobile" />
+          <el-form-item
+            :prop="`${$index}.description`"
+            :rules="formRules.description"
+            class="mb-0px!"
+          >
+            <Editor v-model="row.description" height="150px" />
           </el-form-item>
         </template>
       </el-table-column>
-      <el-table-column label="类型" width="150">
+      <el-table-column label="性别 1" width="150">
         <template #default="{ row, $index }">
-          <el-form-item :prop="`${$index}.javaType`" :rules="formRules.javaType" class="mb-0px!">
-            <el-select v-model="row.javaType">
-              <el-option label="Long" value="Long" />
-              <el-option label="String" value="String" />
-              <el-option label="Integer" value="Integer" />
-              <el-option label="Double" value="Double" />
-              <el-option label="BigDecimal" value="BigDecimal" />
-              <el-option label="LocalDateTime" value="LocalDateTime" />
-              <el-option label="Boolean" value="Boolean" />
+          <el-form-item :prop="`${$index}.sex1`" :rules="formRules.sex1" class="mb-0px!">
+            <el-select v-model="row.sex1" placeholder="请选择性别 1">
+              <el-option
+                v-for="dict in getStrDictOptions(DICT_TYPE.SYSTEM_SEX1)"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
             </el-select>
           </el-form-item>
         </template>
       </el-table-column>
-      <el-table-column label="多选" width="150">
+      <el-table-column label="性别 2" width="150">
         <template #default="{ row, $index }">
-          <el-form-item :prop="`${$index}.sex`" :rules="formRules.sex" class="mb-0px!">
-            <el-checkbox-group v-model="row.sex">
-              <el-checkbox key="Long" label="Long">Long</el-checkbox>
-              <el-checkbox key="String" label="String">String</el-checkbox>
+          <el-form-item :prop="`${$index}.sex2`" :rules="formRules.sex2" class="mb-0px!">
+            <el-checkbox-group v-model="row.sex2">
+              <el-checkbox
+                v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_SEX2)"
+                :key="dict.value"
+                :label="dict.value"
+              >
+                {{ dict.label }}
+              </el-checkbox>
             </el-checkbox-group>
           </el-form-item>
         </template>
       </el-table-column>
-      <el-table-column label="图片上传" width="200">
+      <el-table-column label="性别 3" width="150">
         <template #default="{ row, $index }">
-          <el-form-item :prop="`${$index}.pic`" :rules="formRules.pic" class="mb-0px!">
-            <UploadImg v-model="row.pic" />
+          <el-form-item :prop="`${$index}.sex3`" :rules="formRules.sex3" class="mb-0px!">
+            <el-radio-group v-model="row.sex3">
+              <el-radio
+                v-for="dict in getBoolDictOptions(DICT_TYPE.SYSTEM_SEX3)"
+                :key="dict.value"
+                :label="dict.value"
+              >
+                {{ dict.label }}
+              </el-radio>
+            </el-radio-group>
           </el-form-item>
         </template>
       </el-table-column>
-      <el-table-column label="文件上传" width="200">
+      <el-table-column label="出生日期" width="150">
         <template #default="{ row, $index }">
-          <el-form-item :prop="`${$index}.file`" :rules="formRules.file" class="mb-0px!">
-            <UploadFile v-model="row.file" />
+          <el-form-item :prop="`${$index}.birthday`" :rules="formRules.birthday" class="mb-0px!">
+            <el-date-picker
+              v-model="row.birthday"
+              type="date"
+              value-format="x"
+              placeholder="选择出生日期"
+            />
           </el-form-item>
         </template>
       </el-table-column>
-      <el-table-column label="大输入框" width="200">
+      <el-table-column label="备注" width="200">
         <template #default="{ row, $index }">
-          <el-form-item :prop="`${$index}.content`" :rules="formRules.content" class="mb-0px!">
-            <el-input v-model="row.content" type="textarea" placeholder="请输入 content" />
+          <el-form-item :prop="`${$index}.memo`" :rules="formRules.memo" class="mb-0px!">
+            <el-input v-model="row.memo" type="textarea" placeholder="请输入备注" />
           </el-form-item>
         </template>
       </el-table-column>
-      <el-table-column label="HTML" width="1024">
-        <template #default="{ row, $index }">
-          <el-form-item :prop="`${$index}.html`" :rules="formRules.html" class="mb-0px!">
-            <Editor v-model="row.html" height="150px" />
-          </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">
@@ -88,36 +97,43 @@
   </el-row>
 </template>
 <script setup lang="ts">
+import { getIntDictOptions, getStrDictOptions, getBoolDictOptions, DICT_TYPE } from '@/utils/dict'
+import * as DemoStudentApi from '@/api/infra/demo02'
+
 const props = defineProps<{
-  studentId: undefined // 学生编号
+  studentId: undefined // 学生编号（主表的关联字段）
 }>()
 const formLoading = ref(false) // 表单的加载中
 const formData = ref([])
 const formRules = reactive({
-  mobile: [required],
-  javaType: [required],
-  sex: [required],
-  pic: [required]
+  studentId: [{ required: true, message: '学生编号不能为空', trigger: 'blur' }],
+  name: [{ required: true, message: '名字不能为空', trigger: 'blur' }],
+  avatar: [{ required: true, message: '头像不能为空', trigger: 'blur' }],
+  video: [{ required: true, message: '视频不能为空', trigger: 'blur' }],
+  description: [{ required: true, message: '个人简介不能为空', trigger: 'blur' }],
+  sex1: [{ required: true, message: '性别 1不能为空', trigger: 'change' }],
+  sex2: [{ required: true, message: '性别 2不能为空', trigger: 'blur' }],
+  sex3: [{ required: true, message: '性别 3不能为空', trigger: 'blur' }],
+  birthday: [{ required: true, message: '出生日期不能为空', trigger: 'blur' }],
+  memo: [{ required: true, message: '备注不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
 
 /** 监听主表的关联字段的变化，加载对应的子表数据 */
 watch(
   () => props.studentId,
-  (val) => {
-    if (val) {
-      formData.value = [
-        {
-          name: '芋艿',
-          mobile: '15601691300',
-          javaType: undefined,
-          sex: [],
-          pic: undefined,
-          file: undefined
-        }
-      ]
-    } else {
+  async (val) => {
+    // 情况一：val 为空，说明是新增，则置空
+    if (!val) {
       formData.value = []
+      return
+    }
+    // 情况二：val 非空，说明是修改，则加载数据
+    try {
+      formLoading.value = true
+      formData.value = await DemoStudentApi.getDemoStudentContactListByStudentId(val)
+    } finally {
+      formLoading.value = false
     }
   },
   { immediate: true }
@@ -125,9 +141,21 @@ watch(
 
 /** 新增按钮操作 */
 const handleAdd = () => {
-  formData.value.push({
-    name: '土豆'
-  })
+  const row = {
+    id: undefined,
+    studentId: undefined,
+    name: undefined,
+    avatar: undefined,
+    video: undefined,
+    description: undefined,
+    sex1: undefined,
+    sex2: [],
+    sex3: undefined,
+    birthday: undefined,
+    memo: undefined
+  }
+  row.studentId = props.studentId
+  formData.value.push(row)
 }
 
 /** 删除按钮操作 */
@@ -140,7 +168,7 @@ const validate = () => {
   return formRef.value.validate()
 }
 
-/** 表单值 **/
+/** 表单值 */
 const getData = () => {
   return formData.value
 }
diff --git a/src/views/infra/demo02/DemoStudentForm.vue b/src/views/infra/demo02/DemoStudentForm.vue
index fe0788c4..e9454c0f 100644
--- a/src/views/infra/demo02/DemoStudentForm.vue
+++ b/src/views/infra/demo02/DemoStudentForm.vue
@@ -6,23 +6,13 @@
       :rules="formRules"
       label-width="100px"
       v-loading="formLoading"
-    >
-      <el-form-item label="字段 1" prop="field1">
-        <el-input v-model="formData.field1" placeholder="请输入字段 1" />
-      </el-form-item>
-      <el-form-item label="字段 2" prop="field2">
-        <el-input v-model="formData.field2" placeholder="请输入字段 2" />
-      </el-form-item>
-      <el-form-item label="字段 3" prop="field3">
-        <el-input v-model="formData.field3" placeholder="请输入字段 3" />
-      </el-form-item>
-    </el-form>
+    />
     <!-- 子表的表单 -->
     <el-tabs v-model="subTabsName">
-      <el-tab-pane label="联系人信息" name="DemoStudentContact">
+      <el-tab-pane label="学生联系人" name="demoStudentContact">
         <DemoStudentContactForm ref="demoStudentContactFormRef" :student-id="formData.id" />
       </el-tab-pane>
-      <el-tab-pane label="地址信息" name="DemoStudentAddress">
+      <el-tab-pane label="学生地址" name="demoStudentAddress">
         <DemoStudentAddressForm ref="demoStudentAddressFormRef" :student-id="formData.id" />
       </el-tab-pane>
     </el-tabs>
@@ -47,15 +37,13 @@ const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const formData = ref({
   id: undefined
 })
-const formRules = reactive({
-  field2: [required]
-})
+const formRules = reactive({})
 const formRef = ref() // 表单 Ref
 
 /** 子表的表单 */
+const subTabsName = ref('demoStudentContact')
 const demoStudentContactFormRef = ref()
 const demoStudentAddressFormRef = ref()
-const subTabsName = ref('DemoStudentContact')
 
 /** 打开弹窗 */
 const open = async (type: string, id?: number) => {
@@ -65,16 +53,9 @@ const open = async (type: string, id?: number) => {
   resetForm()
   // 修改时，设置数据
   if (id) {
-    // debugger
     formLoading.value = true
     try {
-      // formData.value = await DemoStudentApi.getDemoStudent(id)
-      formData.value = {
-        id: id,
-        field1: '1',
-        field2: '22',
-        field3: '333'
-      }
+      formData.value = await DemoStudentApi.getDemoStudent(id)
     } finally {
       formLoading.value = false
     }
@@ -91,13 +72,13 @@ const submitForm = async () => {
   try {
     await demoStudentContactFormRef.value.validate()
   } catch (e) {
-    subTabsName.value = 'DemoStudentContact'
+    subTabsName.value = 'demoStudentContact'
     return
   }
   try {
     await demoStudentAddressFormRef.value.validate()
   } catch (e) {
-    subTabsName.value = 'DemoStudentAddress'
+    subTabsName.value = 'demoStudentAddress'
     return
   }
   // 提交请求
diff --git a/src/views/infra/demo02/bak/DemoStudentAddressForm.vue b/src/views/infra/demo02/bak/DemoStudentAddressForm.vue
new file mode 100644
index 00000000..af4cd8f1
--- /dev/null
+++ b/src/views/infra/demo02/bak/DemoStudentAddressForm.vue
@@ -0,0 +1,58 @@
+<template>
+  <el-form
+    ref="formRef"
+    :model="formData"
+    :rules="formRules"
+    label-width="100px"
+    v-loading="formLoading"
+  >
+    <el-form-item label="子字段 1" prop="field1">
+      <el-input v-model="formData.field1" placeholder="请输入字段 1" />
+    </el-form-item>
+    <el-form-item label="子字段 2" prop="field2">
+      <el-input v-model="formData.field2" placeholder="请输入字段 2" />
+    </el-form-item>
+    <el-form-item label="子字段 3" prop="field3">
+      <el-input v-model="formData.field3" placeholder="请输入字段 3" />
+    </el-form-item>
+  </el-form>
+</template>
+<script setup lang="ts">
+const props = defineProps<{
+  studentId: undefined // 学生编号
+}>()
+const formLoading = ref(false) // 表单的加载中
+const formData = ref({})
+const formRules = reactive({
+  field1: [required]
+})
+const formRef = ref() // 表单 Ref
+
+/** 监听主表的关联字段的变化，加载对应的子表数据 */
+watch(
+  () => props.studentId,
+  (val) => {
+    if (val) {
+      formData.value = {
+        field2: '番茄',
+        field3: '西瓜'
+      }
+    } else {
+      formData.value = {}
+    }
+  },
+  { immediate: true }
+)
+
+/** 表单校验 */
+const validate = () => {
+  return formRef.value.validate()
+}
+
+/** 表单值 **/
+const getData = () => {
+  return formData.value
+}
+
+defineExpose({ validate, getData })
+</script>