From 044b4b669aa2b77b3f5ac27095202e57045fd10d Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Fri, 10 May 2024 22:34:34 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E6=A0=B9=E6=8D=AE=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E6=9C=80=E6=96=B0=20ESLint=20=E9=85=8D=E7=BD=AE=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/frontend/AddModal.ftl | 12 +++---
 .../templates/frontend/DetailDrawer.ftl       |  2 +-
 .../resources/templates/frontend/index.ftl    | 43 ++++++++++---------
 3 files changed, 29 insertions(+), 28 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 493b6a63..c8d03210 100644
--- a/continew-admin-generator/src/main/resources/templates/frontend/AddModal.ftl
+++ b/continew-admin-generator/src/main/resources/templates/frontend/AddModal.ftl
@@ -14,11 +14,15 @@
 </template>
 
 <script setup lang="ts">
-import { get${classNamePrefix}, add${classNamePrefix}, update${classNamePrefix} } from '@/apis'
 import { Message } from '@arco-design/web-vue'
-import { GiForm, type Columns } from '@/components/GiForm'
+import { get${classNamePrefix}, add${classNamePrefix}, update${classNamePrefix} } from '@/apis'
+import { type Columns, GiForm } from '@/components/GiForm'
 import { useForm } from '@/hooks'
 
+const emit = defineEmits<{
+  (e: 'save-success'): void
+}>()
+
 const dataId = ref('')
 const isUpdate = computed(() => !!dataId.value)
 const title = computed(() => (isUpdate.value ? '修改${businessName}' : '新增${businessName}'))
@@ -95,9 +99,5 @@ const save = async () => {
   }
 }
 
-const emit = defineEmits<{
-  (e: 'save-success'): void
-}>()
-
 defineExpose({ onAdd, onUpdate })
 </script>
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 bf5eabc3..14cd9ef6 100644
--- a/continew-admin-generator/src/main/resources/templates/frontend/DetailDrawer.ftl
+++ b/continew-admin-generator/src/main/resources/templates/frontend/DetailDrawer.ftl
@@ -14,8 +14,8 @@
 </template>
 
 <script lang="ts" setup>
-import { get${classNamePrefix}, type ${classNamePrefix}DetailResp } from '@/apis'
 import { useWindowSize } from '@vueuse/core'
+import { type ${classNamePrefix}DetailResp, get${classNamePrefix} } from '@/apis'
 
 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 2d826980..1cc1399c 100644
--- a/continew-admin-generator/src/main/resources/templates/frontend/index.ftl
+++ b/continew-admin-generator/src/main/resources/templates/frontend/index.ftl
@@ -9,7 +9,8 @@
         :loading="loading"
         :scroll="{ x: '100%', y: '100%', minWidth: 1000 }"
         :pagination="pagination"
-        :disabledColumnKeys="['name']"
+        :disabled-tools="['size']"
+        :disabled-column-keys="['name']"
         @refresh="search"
       >
         <template #custom-left>
@@ -60,34 +61,16 @@
 </template>
 
 <script setup lang="ts">
-import { list${classNamePrefix}, delete${classNamePrefix}, export${classNamePrefix}, type ${classNamePrefix}Resp, type ${classNamePrefix}Query } from '@/apis'
 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 { TableInstanceColumns } from '@/components/GiTable/type'
-import { useTable, useDownload } from '@/hooks'
+import { useDownload, useTable } from '@/hooks'
 import { isMobile } from '@/utils'
 import has from '@/utils/has'
 
 defineOptions({ name: '${classNamePrefix}' })
 
-const columns: TableInstanceColumns[] = [
-<#if fieldConfigs??>
-  <#list fieldConfigs as fieldConfig>
-  <#if fieldConfig.showInList>
-  { title: '${fieldConfig.comment}', dataIndex: '${fieldConfig.fieldName}', slotName: ${fieldConfig.fieldName} },
-  </#if>
-  </#list>
-</#if>
-  {
-    title: '操作',
-    slotName: 'action',
-    width: 130,
-    align: 'center',
-    fixed: !isMobile() ? 'right' : undefined,
-    show: has.hasPermOr(['${apiModuleName}:${apiName}:update', '${apiModuleName}:${apiName}:delete'])
-  }
-]
-
 const queryForm = reactive<${classNamePrefix}Query>({
 <#list fieldConfigs as fieldConfig>
 <#if fieldConfig.showInQuery>
@@ -115,6 +98,24 @@ const reset = () => {
   search()
 }
 
+const columns: TableInstanceColumns[] = [
+<#if fieldConfigs??>
+  <#list fieldConfigs as fieldConfig>
+  <#if fieldConfig.showInList>
+  { title: '${fieldConfig.comment}', dataIndex: '${fieldConfig.fieldName}', slotName: ${fieldConfig.fieldName} },
+  </#if>
+  </#list>
+</#if>
+  {
+    title: '操作',
+    slotName: 'action',
+    width: 130,
+    align: 'center',
+    fixed: !isMobile() ? 'right' : undefined,
+    show: has.hasPermOr(['${apiModuleName}:${apiName}:update', '${apiModuleName}:${apiName}:delete'])
+  }
+]
+
 // 删除
 const onDelete = (item: ${classNamePrefix}Resp) => {
   return handleDelete(() => delete${classNamePrefix}(item.id), {