huangge1199/vue-pro
1
0
Fork 0
mirror of https://gitee.com/huangge1199_admin/vue-pro.git synced 2024-11-23 07:41:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge pull request !286 from 绝影jy/fixed
This commit is contained in:
芋道源码 2022-11-01 01:19:24 +00:00 committed by Gitee
commit 9745682598
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
6 changed files with 227 additions and 221 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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

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

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