From b512ea99f39aaac04bd4db4a9d73e29ddb340d9e Mon Sep 17 00:00:00 2001
From: zhangzhengmeng <17612150425@163.com>
Date: Tue, 18 Jun 2024 07:35:55 +0000
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E5=89=8D=E7=AB=AF=E6=A8=A1=E6=9D=BF=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/frontend/AddModal.ftl | 18 +++-----
 .../templates/frontend/DetailDrawer.ftl       |  2 +-
 .../resources/templates/frontend/index.ftl    | 46 +++++++++++++------
 3 files changed, 40 insertions(+), 26 deletions(-)

diff --git a/continew-admin-generator/src/main/resources/templates/frontend/AddModal.ftl b/continew-admin-generator/src/main/resources/templates/frontend/AddModal.ftl
index 2e65989f..86cbeb82 100644
--- a/continew-admin-generator/src/main/resources/templates/frontend/AddModal.ftl
+++ b/continew-admin-generator/src/main/resources/templates/frontend/AddModal.ftl
@@ -15,7 +15,7 @@
 
 <script setup lang="ts">
 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 { useForm } from '@/hooks'
 import { useDict } from '@/hooks/app'
@@ -32,7 +32,7 @@ const formRef = ref<InstanceType<typeof GiForm>>()
 <#list fieldConfigs as fieldConfig>
 <#if fieldConfig.showInForm>
 <#-- 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'>
 const { ${fieldConfig.columnName}_enum } = useDict('${fieldConfig.columnName}_enum')
 </#if>
@@ -67,23 +67,17 @@ const columns: Columns = [
     type: 'switch',
     <#elseif fieldConfig.formType = 'CHECK_BOX'>
     type: 'check-group',
-    props: {
-    	options: ${fieldConfig.columnName}_enum,
-    },        
+    options: ${fieldConfig.columnName}_enum,
    	<#elseif fieldConfig.formType = 'TREE_SELECT'>
     type: 'tree-select',
     data: '${fieldConfig.columnName}_enum',
     <#elseif fieldConfig.formType = 'SELECT'>
     type: 'select', 
-    props: {
-    	options: ${fieldConfig.columnName}_enum,
-    },
+    options: ${fieldConfig.columnName}_enum,
     <#elseif fieldConfig.formType = 'RADIO'>
     type: 'radio-group',   
-    props: {
-    	options: ${fieldConfig.columnName}_enum,
-    },
-    </#if>   
+    options: ${fieldConfig.columnName}_enum,
+    </#if>
     <#if fieldConfig.isRequired>
     rules: [{ required: true, message: '请输入${fieldConfig.comment}' }]
     </#if>
diff --git a/continew-admin-generator/src/main/resources/templates/frontend/DetailDrawer.ftl b/continew-admin-generator/src/main/resources/templates/frontend/DetailDrawer.ftl
index 14cd9ef6..e568350f 100644
--- a/continew-admin-generator/src/main/resources/templates/frontend/DetailDrawer.ftl
+++ b/continew-admin-generator/src/main/resources/templates/frontend/DetailDrawer.ftl
@@ -15,7 +15,7 @@
 
 <script lang="ts" setup>
 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()
 
diff --git a/continew-admin-generator/src/main/resources/templates/frontend/index.ftl b/continew-admin-generator/src/main/resources/templates/frontend/index.ftl
index 15cdfc55..e7b9c180 100644
--- a/continew-admin-generator/src/main/resources/templates/frontend/index.ftl
+++ b/continew-admin-generator/src/main/resources/templates/frontend/index.ftl
@@ -27,20 +27,40 @@
 	        <#elseif fieldConfig.formType == "RADIO"><#-- 单选框 -->
 			<a-radio-group v-model="queryForm.${fieldConfig.fieldName}" :options="${fieldConfig.columnName}_enum" @change="search"/>	        
 	        <#elseif fieldConfig.formType == "DATE"><#-- 日期框 -->
-            <a-date-picker
-              v-model="queryForm.${fieldConfig.fieldName}"
-              placeholder="请选择${fieldConfig.comment}"
-              format="YYYY-MM-DD"
-              style="width: 100%"
+            <#if fieldConfig.queryType == "BETWEEN">
+            <a-range-picker
+                    v-model="queryForm.${fieldConfig.fieldName}"
+                    :placeholder="['请选择开始${fieldConfig.comment}','请选择结束${fieldConfig.comment}']"
+                    format="YYYY-MM-DD"
+                    style="width: 100%"
             />
-	        <#elseif fieldConfig.formType == "DATE_TIME"><#-- 日期时间框 -->
+            <#else>
             <a-date-picker
-              v-model="queryForm.${fieldConfig.fieldName}"
-              placeholder="请选择${fieldConfig.comment}"
-              show-time
-              format="YYYY-MM-DD HH:mm:ss"
-              style="width: 100%"
-            />	        
+                    v-model="queryForm.${fieldConfig.fieldName}"
+                    placeholder="请选择${fieldConfig.comment}"
+                    format="YYYY-MM-DD"
+                    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>
 	        <a-input v-model="queryForm.${fieldConfig.fieldName}" placeholder="请输入${fieldConfig.comment}" allow-clear @change="search">
 	          <template #prefix><icon-search /></template>
@@ -89,7 +109,7 @@
 <script setup lang="ts">
 import ${classNamePrefix}AddModal from './${classNamePrefix}AddModal.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 { useDownload, useTable } from '@/hooks'
 import { isMobile } from '@/utils'