From 94290d0d47c223a2287aaa623fdfded500a99aca Mon Sep 17 00:00:00 2001
From: shizhongming <zhongming4762@hotmail.com>
Date: Mon, 15 Apr 2024 20:47:17 +0800
Subject: [PATCH] =?UTF-8?q?perf(=E7=B3=BB=E7=BB=9F=E6=A8=A1=E5=9D=97-?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AD=97=E5=85=B8):=20=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8=E6=B7=BB=E5=8A=A0=E7=A7=9F=E6=88=B7=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../smart-system/views/dataDict/DataDictGroup.vue  | 14 ++++++++++----
 .../views/dataDict/DataDictListView.api.ts         |  2 +-
 .../views/dataDict/DataDictListView.config.ts      |  8 ++++++++
 .../smart-system/views/dataDict/lang/zh_CN.ts      |  1 +
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/modules/smart-system/views/dataDict/DataDictGroup.vue b/src/modules/smart-system/views/dataDict/DataDictGroup.vue
index 5e436fe57..980f54e9b 100644
--- a/src/modules/smart-system/views/dataDict/DataDictGroup.vue
+++ b/src/modules/smart-system/views/dataDict/DataDictGroup.vue
@@ -29,12 +29,17 @@
   };
 
   const [registerTable] = useSmartTable({
-    columns: getDataDictGroupColumns(t),
+    id: 'system-dataDict',
+    columns: getDataDictGroupColumns(),
     border: true,
     height: 'auto',
-    highlightHoverRow: true,
-    highlightCurrentRow: true,
     stripe: true,
+    customConfig: { storage: true },
+    showOverflow: 'tooltip',
+    rowConfig: {
+      isHover: true,
+      isCurrent: true,
+    },
     pagerConfig: true,
     useSearchForm: true,
     searchFormConfig: {
@@ -85,7 +90,8 @@
     toolbarConfig: {
       refresh: true,
       zoom: true,
-      custom: true,
+      sizeSetting: true,
+      column: { columnOrder: true },
       buttons: [{ code: 'ModalAdd' }, { code: 'ModalEdit' }, { code: 'delete' }],
     },
   });
diff --git a/src/modules/smart-system/views/dataDict/DataDictListView.api.ts b/src/modules/smart-system/views/dataDict/DataDictListView.api.ts
index eb540f236..ebb907668 100644
--- a/src/modules/smart-system/views/dataDict/DataDictListView.api.ts
+++ b/src/modules/smart-system/views/dataDict/DataDictListView.api.ts
@@ -1,7 +1,7 @@
 import { ApiServiceEnum, defHttp } from '@/utils/http/axios';
 
 enum Api {
-  listDict = 'sys/dict/list',
+  listDict = 'sys/dict/listFilterTenant',
   getByIdDict = 'sys/dict/getById',
   batchSaveUpdateDict = 'sys/dict/batchSaveUpdate',
   deleteDict = 'sys/dict/batchDeleteById',
diff --git a/src/modules/smart-system/views/dataDict/DataDictListView.config.ts b/src/modules/smart-system/views/dataDict/DataDictListView.config.ts
index 252678f0c..859748af2 100644
--- a/src/modules/smart-system/views/dataDict/DataDictListView.config.ts
+++ b/src/modules/smart-system/views/dataDict/DataDictListView.config.ts
@@ -29,6 +29,14 @@ export const getDataDictGroupColumns = (): SmartColumn[] => {
       //   filter: 'dictName-filter',
       // },
     },
+    {
+      title: '{system.views.dictGroup.title.tenant}',
+      field: 'tenantId',
+      width: 140,
+      formatter: ({ row }) => {
+        return row.tenant?.tenantShortName || row.tenant?.tenantName;
+      },
+    },
     {
       title: '{common.table.seq}',
       field: 'seq',
diff --git a/src/modules/smart-system/views/dataDict/lang/zh_CN.ts b/src/modules/smart-system/views/dataDict/lang/zh_CN.ts
index ada3e3fa5..3a637b5c4 100644
--- a/src/modules/smart-system/views/dataDict/lang/zh_CN.ts
+++ b/src/modules/smart-system/views/dataDict/lang/zh_CN.ts
@@ -6,6 +6,7 @@ export default {
       title: {
         dictCode: '字典编码',
         dictName: '字典名称',
+        tenant: '租户',
       },
       validate: {
         dictCode: '请输入字典编码',