!286 修复代码生成选择父菜单无效，修复生成的前端代码缺少字段以及格式错误

Merge pull request !286 from 绝影jy/fixed

yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/api/api.ts.vm

@@ -1,5 +1,5 @@
 import { useAxios } from '@/hooks/web/useAxios'
-import { ${simpleClassName}VO,${simpleClassName}PageReqVO,${simpleClassName}ExcelReqVO } from './types'
+import { ${simpleClassName}VO, ${simpleClassName}PageReqVO, ${simpleClassName}ExcelReqVO } from './types'
 
 const request = useAxios()
 

yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/api/types.ts.vm

@@ -3,6 +3,8 @@ export type ${simpleClassName}VO = {
 #if ($column.createOperation || $column.updateOperation)
 #if(${column.javaType.toLowerCase()} == "long" || ${column.javaType.toLowerCase()} == "integer")
   ${column.javaField}: number
+#elseif(${column.javaType.toLowerCase()} == "date")
+  ${column.javaField}: string
 #else
   ${column.javaField}: ${column.javaType.toLowerCase()}
 #end
@@ -15,6 +17,8 @@ export type ${simpleClassName}PageReqVO = {
 #if (${column.listOperation})##查询操作
 #if(${column.javaType.toLowerCase()} == "long" || ${column.javaType.toLowerCase()} == "integer")
   ${column.javaField}: number
+#elseif(${column.javaType.toLowerCase()} == "date")
+  ${column.javaField}: string
 #else
   ${column.javaField}: ${column.javaType.toLowerCase()}
 #end
@@ -27,6 +31,8 @@ export type ${simpleClassName}ExcelReqVO = {
 #if (${column.listOperation})##查询操作
 #if(${column.javaType.toLowerCase()} == "long" || ${column.javaType.toLowerCase()} == "integer")
   ${column.javaField}: number
+#elseif(${column.javaType.toLowerCase()} == "date")
+  ${column.javaField}: string
 #else
   ${column.javaField}: ${column.javaType.toLowerCase()}
 #end

yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/data.ts.vm

@@ -8,7 +8,7 @@ export const rules = reactive({
 #foreach ($column in $columns)
 #if (($column.createOperation || $column.updateOperation) && !$column.nullable && !${column.primaryKey})## 创建或者更新操作 && 要求非空 && 非主键
 #set($comment=$column.columnComment)
-    $column.javaField: [{ required: true, message: "${comment}不能为空", trigger: #if($column.htmlType == "select")"change"#else"blur"#end }],
+  $column.javaField: [{ required: true, message: '${comment}不能为空', trigger: #if($column.htmlType == "select")'change'#else'blur'#end }],
 #end
 #end
 })
@@ -34,7 +34,7 @@ const crudSchemas = reactive<CrudSchema[]>([
     #else
     #if (!$column.createOperation && !$column.updateOperation)
     form: {
-         false
+      show: false
     },
     #elseif(!("" != $column.dictType))
     form: {

yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm

@@ -1,55 +1,55 @@
 <script setup lang="ts">
-  import { ref, unref } from 'vue'
-  import dayjs from 'dayjs'
-  import { ElMessage } from 'element-plus'
-  import { DICT_TYPE } from '@/utils/dict'
-  import { useTable } from '@/hooks/web/useTable'
-  import { useI18n } from '@/hooks/web/useI18n'
-  import { FormExpose } from '@/components/Form'
-  import type { ${simpleClassName}VO } from '@/api/${table.moduleName}/${simpleClassName}/types'
-  import { rules, allSchemas } from './${simpleClassName}.data'
-  import * as ${simpleClassName}Api from '@/api/${table.moduleName}/${simpleClassName}'
-  const { t } = useI18n() // 国际化
+import { ref, unref } from 'vue'
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import { DICT_TYPE } from '@/utils/dict'
+import { useTable } from '@/hooks/web/useTable'
+import { useI18n } from '@/hooks/web/useI18n'
+import { FormExpose } from '@/components/Form'
+import type { ${simpleClassName}VO } from '@/api/${table.moduleName}/${simpleClassName}/types'
+import { rules, allSchemas } from './${simpleClassName}.data'
+import * as ${simpleClassName}Api from '@/api/${table.moduleName}/${simpleClassName}'
+const { t } = useI18n() // 国际化
 
-  // ========== 列表相关 ==========
-  const { register, tableObject, methods } = useTable<${simpleClassName}VO>({
+// ========== 列表相关 ==========
+const { register, tableObject, methods } = useTable<${simpleClassName}VO>({
   getListApi: ${simpleClassName}Api.get${simpleClassName}PageApi,
   delListApi: ${simpleClassName}Api.delete${simpleClassName}Api,
   exportListApi: ${simpleClassName}Api.export${simpleClassName}Api
-  })
-  const { getList, setSearchParams, delList, exportList } = methods
+})
+const { getList, setSearchParams, delList, exportList } = methods
 
-  // ========== CRUD 相关 ==========
-  const actionLoading = ref(false) // 遮罩层
-  const actionType = ref('') // 操作按钮的类型
-  const dialogVisible = ref(false) // 是否显示弹出层
-  const dialogTitle = ref('edit') // 弹出层标题
-  const formRef = ref<FormExpose>() // 表单 Ref
+// ========== CRUD 相关 ==========
+const actionLoading = ref(false) // 遮罩层
+const actionType = ref('') // 操作按钮的类型
+const dialogVisible = ref(false) // 是否显示弹出层
+const dialogTitle = ref('edit') // 弹出层标题
+const formRef = ref<FormExpose>() // 表单 Ref
 
-  // 设置标题
-  const setDialogTile = (type: string) => {
+// 设置标题
+const setDialogTile = (type: string) => {
   dialogTitle.value = t('action.' + type)
   actionType.value = type
   dialogVisible.value = true
-  }
+}
 
-  // 新增操作
-  const handleCreate = () => {
+// 新增操作
+const handleCreate = () => {
   setDialogTile('create')
   // 重置表单
   unref(formRef)?.getElFormRef()?.resetFields()
-  }
+}
 
-  // 修改操作
-  const handleUpdate = async (row: ${simpleClassName}VO) => {
+// 修改操作
+const handleUpdate = async (row: ${simpleClassName}VO) => {
   setDialogTile('update')
   // 设置数据
   const res = await ${simpleClassName}Api.get${simpleClassName}Api(row.id)
   unref(formRef)?.setValues(res)
-  }
+}
 
-  // 提交按钮
-  const submitForm = async () => {
+// 提交按钮
+const submitForm = async () => {
   const elForm = unref(formRef)?.getElFormRef()
   if (!elForm) return
   elForm.validate(async (valid) => {
@@ -73,20 +73,20 @@
       }
     }
   })
-  }
+}
 
-  // ========== 详情相关 ==========
-  const detailRef = ref() // 详情 Ref
+// ========== 详情相关 ==========
+const detailRef = ref() // 详情 Ref
 
-  // 详情操作
-  const handleDetail = async (row: ${simpleClassName}VO) => {
+// 详情操作
+const handleDetail = async (row: ${simpleClassName}VO) => {
   // 设置数据
   detailRef.value = row
   setDialogTile('detail')
-  }
+}
 
-  // ========== 初始化 ==========
-  getList()
+// ========== 初始化 ==========
+getList()
 </script>
 
 <template>

yudao-ui-admin-vue3/src/views/infra/codegen/EditTable.vue

@@ -38,15 +38,15 @@ const submitForm = async () => {
   if (basicForm && genForm) {
     const basicInfoData = (await basicInfo?.getFormData()) as CodegenTableVO
     const genInfoData = (await genInfo?.getFormData()) as CodegenTableVO
-    const genTable: CodegenUpdateReqVO = {
-      table: Object.assign({}, basicInfoData, genInfoData),
-      columns: cloumCurrentRow.value
-    }
     if (parentMenuId.value) {
       genInfoData.parentMenuId = parentMenuId.value
     } else {
       genInfoData.parentMenuId = 0
     }
+    const genTable: CodegenUpdateReqVO = {
+      table: Object.assign({}, basicInfoData, genInfoData),
+      columns: cloumCurrentRow.value
+    }
     await updateCodegenTableApi(genTable)
     ElMessage.success(t('common.updateSuccess'))
     push('/infra/codegen')

yudao-ui-admin-vue3/src/views/infra/codegen/components/GenInfoForm.vue

@@ -150,7 +150,7 @@ defineExpose({
         :props="menuProps"
         :data="menuOptions"
         check-strictly
-        @node-click="handleNodeClick"
+        @change="handleNodeClick"
       />
     </template>
   </Form>