From 35c59e219e0b14f81f75eaff26b1034a99bb8fcb Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Tue, 16 Apr 2024 20:20:57 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=20GiTable=20?=
 =?UTF-8?q?=E5=88=97=E7=B1=BB=E5=9E=8B=E4=BD=BF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Logo.vue         | 12 ++++++------
 src/views/login/index.vue              |  8 ++++----
 src/views/monitor/log/LoginLog.vue     |  4 ++--
 src/views/monitor/log/OperationLog.vue |  4 ++--
 src/views/monitor/online/index.vue     |  5 +++--
 src/views/system/dept/index.vue        |  5 +++--
 src/views/system/dict/index.vue        |  4 ++--
 src/views/system/dict/item/index.vue   |  4 ++--
 src/views/system/menu/index.vue        |  5 +++--
 src/views/system/role/index.vue        |  4 ++--
 src/views/system/user/index.vue        |  5 +++--
 11 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/src/layout/components/Logo.vue b/src/layout/components/Logo.vue
index 5c94729..f77244c 100644
--- a/src/layout/components/Logo.vue
+++ b/src/layout/components/Logo.vue
@@ -1,19 +1,19 @@
 <template>
   <section class="system-logo" :class="{ collapsed: props.collapsed }" @click="toHome">
-    <img v-if="webLogo" class="logo" :src="webLogo"  alt="logo"/>
-    <img v-else class="logo" src="@/assets/images/logo.svg"  alt="logo"/>
+    <img v-if="webLogo" class="logo" :src="webLogo" alt="logo" />
+    <img v-else class="logo" src="@/assets/images/logo.svg" alt="logo" />
     <span class="system-name">{{ webTitle }}</span>
   </section>
 </template>
 
 <script setup lang="ts">
-import {useAppStore} from "@/stores";
+import { useAppStore } from '@/stores'
 
-const appStore= useAppStore();
+const appStore = useAppStore()
 appStore.initWebConfig()
 
-const webTitle = computed(() => appStore.getTitle());
-const webLogo = computed(() => appStore.getLogo());
+const webTitle = computed(() => appStore.getTitle())
+const webLogo = computed(() => appStore.getLogo())
 
 interface Props {
   collapsed?: boolean
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 09ee569..0bf8de9 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -19,8 +19,8 @@
             @submit="handleLogin"
           >
             <h3 class="login-right__title">
-              <img v-if="webLogo" class="logo" :src="webLogo"  alt="logo" height="33"/>
-              <img v-else class="logo" src="@/assets/images/logo.svg"  alt="logo"/>
+              <img v-if="webLogo" class="logo" :src="webLogo" alt="logo" height="33" />
+              <img v-else class="logo" src="@/assets/images/logo.svg" alt="logo" />
               <span>{{ appStore.getTitle() }}</span>
             </h3>
             <a-form-item field="username">
@@ -78,8 +78,8 @@ import { encryptByRsa } from '@/utils/encrypt'
 const appStore = useAppStore()
 appStore.initWebConfig()
 
-const webTitle = computed(() => appStore.getTitle());
-const webLogo = computed(() => appStore.getLogo());
+computed(() => appStore.getTitle())
+const webLogo = computed(() => appStore.getLogo())
 
 defineOptions({ name: 'Login' })
 
diff --git a/src/views/monitor/log/LoginLog.vue b/src/views/monitor/log/LoginLog.vue
index e96877b..018e8f3 100644
--- a/src/views/monitor/log/LoginLog.vue
+++ b/src/views/monitor/log/LoginLog.vue
@@ -46,13 +46,13 @@
 
 <script setup lang="ts">
 import { exportLoginLog, listLog } from '@/apis'
-import type { TableInstance } from '@arco-design/web-vue'
+import type { TableInstanceColumns } from '@/components/GiTable/type'
 import DateRangePicker from '@/components/DateRangePicker/index.vue'
 import { useTable, useDownload } from '@/hooks'
 
 defineOptions({ name: 'LoginLog' })
 
-const columns: TableInstance['columns'] = [
+const columns: TableInstanceColumns[] = [
   {
     title: '序号',
     width: 66,
diff --git a/src/views/monitor/log/OperationLog.vue b/src/views/monitor/log/OperationLog.vue
index 8e12de0..6302251 100644
--- a/src/views/monitor/log/OperationLog.vue
+++ b/src/views/monitor/log/OperationLog.vue
@@ -57,14 +57,14 @@
 
 <script setup lang="ts">
 import { listLog, exportOperationLog, type LogResp } from '@/apis'
-import type { TableInstance } from '@arco-design/web-vue'
+import type { TableInstanceColumns } from '@/components/GiTable/type'
 import DateRangePicker from '@/components/DateRangePicker/index.vue'
 import OperationLogDetailDrawer from './OperationLogDetailDrawer.vue'
 import { useTable, useDownload } from '@/hooks'
 
 defineOptions({ name: 'OperationLog' })
 
-const columns: TableInstance['columns'] = [
+const columns: TableInstanceColumns[] = [
   {
     title: '序号',
     width: 66,
diff --git a/src/views/monitor/online/index.vue b/src/views/monitor/online/index.vue
index 03d629b..55b393e 100644
--- a/src/views/monitor/online/index.vue
+++ b/src/views/monitor/online/index.vue
@@ -44,7 +44,8 @@
 
 <script setup lang="ts">
 import { listOnlineUser, kickout } from '@/apis'
-import { Message, type TableInstance } from '@arco-design/web-vue'
+import { Message } from '@arco-design/web-vue'
+import type { TableInstanceColumns } from '@/components/GiTable/type'
 import DateRangePicker from '@/components/DateRangePicker/index.vue'
 import { useUserStore } from '@/stores'
 import { useTable } from '@/hooks'
@@ -52,7 +53,7 @@ import { isMobile } from '@/utils'
 
 defineOptions({ name: 'OnlineUser' })
 
-const columns: TableInstance['columns'] = [
+const columns: TableInstanceColumns[] = [
   {
     title: '序号',
     width: 66,
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 6927177..679c60d 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -82,8 +82,9 @@
 
 <script setup lang="ts">
 import { listDept, deleteDept, exportDept, type DeptResp, type DeptQuery } from '@/apis'
-import { Message, type TableInstance } from '@arco-design/web-vue'
+import { Message } from '@arco-design/web-vue'
 import type GiTable from '@/components/GiTable/index.vue'
+import type { TableInstanceColumns } from '@/components/GiTable/type'
 import AddDeptModal from './AddDeptModal.vue'
 import { DisEnableStatusList } from '@/constant/common'
 import { useDownload } from '@/hooks'
@@ -91,7 +92,7 @@ import { isMobile } from '@/utils'
 
 defineOptions({ name: 'Dept' })
 
-const columns: TableInstance['columns'] = [
+const columns: TableInstanceColumns[] = [
   { title: '名称', dataIndex: 'name', width: 170, ellipsis: true, tooltip: true },
   { title: '状态', slotName: 'status', align: 'center' },
   { title: '排序', dataIndex: 'sort', align: 'center', show: false },
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index 5dfa195..ad422a5 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -55,15 +55,15 @@
 
 <script setup lang="ts">
 import { listDict, deleteDict, type DictResp } from '@/apis'
-import type { TableInstance } from '@arco-design/web-vue'
 import AddDictModal from './AddDictModal.vue'
 import DictItemModal from '@/views/system/dict/item/index.vue'
+import type { TableInstanceColumns } from '@/components/GiTable/type'
 import { useTable } from '@/hooks'
 import { isMobile } from '@/utils'
 
 defineOptions({ name: 'Dict' })
 
-const columns: TableInstance['columns'] = [
+const columns: TableInstanceColumns[] = [
   {
     title: '序号',
     width: 66,
diff --git a/src/views/system/dict/item/index.vue b/src/views/system/dict/item/index.vue
index 5957ed0..ef8c590 100644
--- a/src/views/system/dict/item/index.vue
+++ b/src/views/system/dict/item/index.vue
@@ -63,12 +63,12 @@
 
 <script lang="ts" setup>
 import { listDictItem, deleteDictItem, type DictItemResp } from '@/apis'
-import type { TableInstance } from '@arco-design/web-vue'
 import AddDictItemModal from './AddDictItemModal.vue'
+import type { TableInstanceColumns } from '@/components/GiTable/type'
 import { useTable } from '@/hooks'
 import { isMobile } from '@/utils'
 
-const columns: TableInstance['columns'] = [
+const columns: TableInstanceColumns[] = [
   {
     title: '序号',
     width: 66,
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index b729015..d13bd74 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -94,15 +94,16 @@
 
 <script setup lang="ts">
 import { listMenu, deleteMenu, type MenuResp, type MenuQuery } from '@/apis'
-import { Message, type TableInstance } from '@arco-design/web-vue'
+import { Message } from '@arco-design/web-vue'
 import type GiTable from '@/components/GiTable/index.vue'
+import type { TableInstanceColumns } from '@/components/GiTable/type'
 import AddMenuModal from './AddMenuModal.vue'
 import { DisEnableStatusList } from '@/constant/common'
 import { isMobile } from '@/utils'
 
 defineOptions({ name: 'Menu' })
 
-const columns: TableInstance['columns'] = [
+const columns: TableInstanceColumns[] = [
   { title: '菜单标题', dataIndex: 'title', slotName: 'title', width: 170, fixed: !isMobile() ? 'left' : undefined },
   { title: '类型', slotName: 'type', align: 'center' },
   { title: '状态', slotName: 'status', align: 'center' },
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index f83a96a..17d66be 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -70,9 +70,9 @@
 
 <script setup lang="ts">
 import { listRole, deleteRole, type RoleResp } from '@/apis'
-import type { TableInstance } from '@arco-design/web-vue'
 import AddRoleModal from './AddRoleModal.vue'
 import RoleDetailDrawer from './RoleDetailDrawer.vue'
+import type { TableInstanceColumns } from '@/components/GiTable/type'
 import { useTable } from '@/hooks'
 import { useDict } from '@/hooks/app'
 import { isMobile } from '@/utils'
@@ -82,7 +82,7 @@ defineOptions({ name: 'Role' })
 
 const { data_scope_enum } = useDict('data_scope_enum')
 
-const columns: TableInstance['columns'] = [
+const columns: TableInstanceColumns[] = [
   {
     title: '序号',
     width: 66,
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 59af295..37e80dc 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -102,10 +102,11 @@
 
 <script setup lang="ts">
 import { listUser, deleteUser, exportUser, type UserResp } from '@/apis'
-import type { TableInstance, TreeInstance } from '@arco-design/web-vue'
 import UserAddModal from './UserAddModal.vue'
 import UserDetailDrawer from './UserDetailDrawer.vue'
 import UserResetPwdModal from './UserResetPwdModal.vue'
+import type { TreeInstance } from '@arco-design/web-vue'
+import type { TableInstanceColumns } from '@/components/GiTable/type'
 import { useTable, useDownload } from '@/hooks'
 import { useDept } from '@/hooks/app'
 import { isMobile } from '@/utils'
@@ -114,7 +115,7 @@ import { DisEnableStatusList } from '@/constant/common'
 
 defineOptions({ name: 'User' })
 
-const columns: TableInstance['columns'] = [
+const columns: TableInstanceColumns[] = [
   {
     title: '序号',
     width: 66,