ContiNew/continew-admin
1
1
Fork 0
mirror of https://github.com/continew-org/continew-admin.git synced 2025-09-14 03:01:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 修复代码生成前端模板部分错误

Browse Source
This commit is contained in:
zhangzhengmeng
2024-06-18 07:35:55 +00:00
committed by Charles7c
parent bdff57c920
commit b512ea99f3
3 changed files with 40 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
continew-admin-generator/src/main/resources/templates/frontend/AddModal.ftl
View File

@@ -15,7 +15,7 @@
<script setup lang="ts"> <script setup lang="ts">
import { Message } from '@arco-design/web-vue' import { Message } from '@arco-design/web-vue'
import { get${classNamePrefix}, add${classNamePrefix}, update${classNamePrefix} } from '@/apis' import { get${classNamePrefix}, add${classNamePrefix}, update${classNamePrefix} } from '@/apis/${apiModuleName}/${apiName}'
import { type Columns, GiForm, type Options } from '@/components/GiForm' import { type Columns, GiForm, type Options } from '@/components/GiForm'
import { useForm } from '@/hooks' import { useForm } from '@/hooks'
import { useDict } from '@/hooks/app' import { useDict } from '@/hooks/app'
@@ -32,7 +32,7 @@ const formRef = ref<InstanceType<typeof GiForm>>()
<#list fieldConfigs as fieldConfig> <#list fieldConfigs as fieldConfig>
<#if fieldConfig.showInForm> <#if fieldConfig.showInForm>
<#-- SELECT/RADIO/CHECK_BOX/TREE_SELECT控件从服务器端获取数据 --> <#-- SELECT/RADIO/CHECK_BOX/TREE_SELECT控件从服务器端获取数据 -->
<#if fieldConfig.formType = 'SELECT' || fieldConfig.formType = 'RADIO' <#if fieldConfig.formType = 'SELECT' || fieldConfig.formType = 'RADIO'
|| fieldConfig.formType = 'CHECK_BOX' || fieldConfig.formType = 'TREE_SELECT'> || fieldConfig.formType = 'CHECK_BOX' || fieldConfig.formType = 'TREE_SELECT'>
const { ${fieldConfig.columnName}_enum } = useDict('${fieldConfig.columnName}_enum') const { ${fieldConfig.columnName}_enum } = useDict('${fieldConfig.columnName}_enum')
</#if> </#if>
@@ -67,23 +67,17 @@ const columns: Columns = [
type: 'switch', type: 'switch',
<#elseif fieldConfig.formType = 'CHECK_BOX'> <#elseif fieldConfig.formType = 'CHECK_BOX'>
type: 'check-group', type: 'check-group',
props: { options: ${fieldConfig.columnName}_enum,
options: ${fieldConfig.columnName}_enum,
},
<#elseif fieldConfig.formType = 'TREE_SELECT'> <#elseif fieldConfig.formType = 'TREE_SELECT'>
type: 'tree-select', type: 'tree-select',
data: '${fieldConfig.columnName}_enum', data: '${fieldConfig.columnName}_enum',
<#elseif fieldConfig.formType = 'SELECT'> <#elseif fieldConfig.formType = 'SELECT'>
type: 'select', type: 'select',
props: { options: ${fieldConfig.columnName}_enum,
options: ${fieldConfig.columnName}_enum,
},
<#elseif fieldConfig.formType = 'RADIO'> <#elseif fieldConfig.formType = 'RADIO'>
type: 'radio-group', type: 'radio-group',
props: { options: ${fieldConfig.columnName}_enum,
options: ${fieldConfig.columnName}_enum, </#if>
},
</#if>
<#if fieldConfig.isRequired> <#if fieldConfig.isRequired>
rules: [{ required: true, message: '请输入${fieldConfig.comment}' }] rules: [{ required: true, message: '请输入${fieldConfig.comment}' }]
</#if> </#if>

2
continew-admin-generator/src/main/resources/templates/frontend/DetailDrawer.ftl
View File

@@ -15,7 +15,7 @@
<script lang="ts" setup> <script lang="ts" setup>
import { useWindowSize } from '@vueuse/core' import { useWindowSize } from '@vueuse/core'
import { type ${classNamePrefix}DetailResp, get${classNamePrefix} } from '@/apis' import { type ${classNamePrefix}DetailResp, get${classNamePrefix} } from '@/apis/${apiModuleName}/${apiName}'
const { width } = useWindowSize() const { width } = useWindowSize()

46
continew-admin-generator/src/main/resources/templates/frontend/index.ftl
View File

@@ -27,20 +27,40 @@
<#elseif fieldConfig.formType == "RADIO"><#-- 单选框 --> <#elseif fieldConfig.formType == "RADIO"><#-- 单选框 -->
<a-radio-group v-model="queryForm.${fieldConfig.fieldName}" :options="${fieldConfig.columnName}_enum" @change="search"/> <a-radio-group v-model="queryForm.${fieldConfig.fieldName}" :options="${fieldConfig.columnName}_enum" @change="search"/>
<#elseif fieldConfig.formType == "DATE"><#-- 日期框 --> <#elseif fieldConfig.formType == "DATE"><#-- 日期框 -->
<a-date-picker <#if fieldConfig.queryType == "BETWEEN">
v-model="queryForm.${fieldConfig.fieldName}" <a-range-picker
placeholder="请选择${fieldConfig.comment}" v-model="queryForm.${fieldConfig.fieldName}"
format="YYYY-MM-DD" :placeholder="['请选择开始${fieldConfig.comment}','请选择结束${fieldConfig.comment}']"
style="width: 100%" format="YYYY-MM-DD"
style="width: 100%"
/> />
<#elseif fieldConfig.formType == "DATE_TIME"><#-- 日期时间框 --> <#else>
<a-date-picker <a-date-picker
v-model="queryForm.${fieldConfig.fieldName}" v-model="queryForm.${fieldConfig.fieldName}"
placeholder="请选择${fieldConfig.comment}" placeholder="请选择${fieldConfig.comment}"
show-time format="YYYY-MM-DD"
format="YYYY-MM-DD HH:mm:ss" style="width: 100%"
style="width: 100%" />
/> </#if>
<#elseif fieldConfig.formType == "DATE_TIME"><#-- 日期时间框 -->
<#if fieldConfig.queryType == "BETWEEN">
<a-range-picker
v-model="queryForm.${fieldConfig.fieldName}"
:placeholder="['请选择开始${fieldConfig.comment}','请选择结束${fieldConfig.comment}']"
show-time
format="YYYY-MM-DD HH:mm:ss"
style="width: 100%"
/>
<#else>
<a-date-picker
v-model="queryForm.${fieldConfig.fieldName}"
placeholder="请选择${fieldConfig.comment}"
show-time
format="YYYY-MM-DD HH:mm:ss"
style="width: 100%"
/>
</#if>
<#else> <#else>
<a-input v-model="queryForm.${fieldConfig.fieldName}" placeholder="请输入${fieldConfig.comment}" allow-clear @change="search"> <a-input v-model="queryForm.${fieldConfig.fieldName}" placeholder="请输入${fieldConfig.comment}" allow-clear @change="search">
<template #prefix><icon-search /></template> <template #prefix><icon-search /></template>
@@ -89,7 +109,7 @@
<script setup lang="ts"> <script setup lang="ts">
import ${classNamePrefix}AddModal from './${classNamePrefix}AddModal.vue' import ${classNamePrefix}AddModal from './${classNamePrefix}AddModal.vue'
import ${classNamePrefix}DetailDrawer from './${classNamePrefix}DetailDrawer.vue' import ${classNamePrefix}DetailDrawer from './${classNamePrefix}DetailDrawer.vue'
import { type ${classNamePrefix}Resp, type ${classNamePrefix}Query, delete${classNamePrefix}, export${classNamePrefix}, list${classNamePrefix} } from '@/apis' import { type ${classNamePrefix}Resp, type ${classNamePrefix}Query, delete${classNamePrefix}, export${classNamePrefix}, list${classNamePrefix} } from '@/apis/${apiModuleName}/${apiName}'
import type { TableInstanceColumns } from '@/components/GiTable/type' import type { TableInstanceColumns } from '@/components/GiTable/type'
import { useDownload, useTable } from '@/hooks' import { useDownload, useTable } from '@/hooks'
import { isMobile } from '@/utils' import { isMobile } from '@/utils'