代码生成：增加 one 情况下的示例代码

(cherry picked from commit 72c5eaae31)
2023-11-12 19:50:38 +08:00
parent d176271313
commit 26e6d287f5
9 changed files with 702 additions and 109 deletions
--- 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
 }
--- 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
 }
--- 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
  }
  // 提交请求
--- a/src/views/infra/demo02/bak/DemoStudentAddressForm.vue
+++ 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>