From aba93453508204cbee523b5a0e44ac263fce40c0 Mon Sep 17 00:00:00 2001
From: bai <1643359946@qq.com>
Date: Thu, 30 Mar 2023 21:43:16 +0800
Subject: [PATCH] =?UTF-8?q?2023=E5=B9=B43=E6=9C=8830=E6=97=A5=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/form/native/vue3NativeSearch.ftl   |  2 +-
 .../vue3Native/${entityName}List.vuei         | 19 ++++++++++---------
 .../components/${entityName}Form.vuei         |  2 +-
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeSearch.ftl b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeSearch.ftl
index b4157894..f1364593 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeSearch.ftl
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeSearch.ftl
@@ -1,7 +1,7 @@
 <#if po.isQuery=='Y'>
 <#assign query_flag=true>
 	<#if query_field_no==2>
-          <template v-if="toggleSearchStatus">
+          <!--<template v-if="toggleSearchStatus">-->
 	</#if>
 	<#assign query_field_dictCode="">
 	<#if po.dictTable?default("")?trim?length gt 1>
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei
index 126cc2a5..33cb5207 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei
@@ -61,7 +61,7 @@
   <#include "/common/form/native/vue3NativeSearch.ftl">
 </#list>
 <#if query_field_no gt 2>
-          </template>
+          <!--</template>-->
 </#if>
 <#if query_flag>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -69,10 +69,10 @@
               <a-col :lg="6">
                 <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
                 <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
-                <a @click="toggleSearchStatus = !toggleSearchStatus" style="margin-left: 8px">
+                <!--<a @click="toggleSearchStatus = !toggleSearchStatus" style="margin-left: 8px">
                   {{ toggleSearchStatus ? '收起' : '展开' }}
                   <Icon :icon="toggleSearchStatus ? 'ant-design:up-outlined' : 'ant-design:down-outlined'" />
-                </a>
+                </a>-->
               </a-col>
             </span>
           </a-col>
@@ -111,9 +111,9 @@
         <div v-html="text"></div>
       </template>
       <!--省市区字段回显插槽-->
-      <template #pcaSlot="{text}">
+      <!--<template #pcaSlot="{text}">
         {{ getAreaTextByCode(text) }}
-      </template>
+      </template>-->
       <template #fileSlot="{text}">
         <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
         <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
@@ -161,6 +161,7 @@
         fixed: 'right',
       },
       beforeFetch: (params) => {
+        params.column = '',params.order = '';//新生成的默认不带排序
         return Object.assign(params, queryParam.value);
       },
     },
@@ -168,10 +169,10 @@
       name: "${tableVo.ftlDescription}",
       url: getExportUrl,
     },
-	  importConfig: {
-	    url: getImportUrl,
-	    success: handleSuccess
-	  },
+	importConfig: {
+	  url: getImportUrl,
+	  success: handleSuccess
+	},
   });
   const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
   const labelCol = reactive({
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei
index eaf31a40..ffe576d2 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei
@@ -77,7 +77,7 @@
   <#elseif po.fieldDbType=='Blob'>
     ${po.fieldName}String: '',
   <#else>
-    ${po.fieldName}: '',   
+    ${po.fieldName}: '',
   </#if>
  </#if>
 </#list>