From a19fd7dd455847d74483c9aec3a828bdb1065129 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E4=BA=91=E9=B9=8F?= <ypgaop@isoftstone.com>
Date: Mon, 21 Oct 2024 16:55:27 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=A8=A1=E5=9E=8B=EF=BC=9A=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/backend/auth/model/index.vue    | 35 +++++++++++++------
 .../src/views/backend/auth/model/type.ts      |  6 ++--
 2 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/ui/dasadmin/src/views/backend/auth/model/index.vue b/ui/dasadmin/src/views/backend/auth/model/index.vue
index 756c05ef..4aa99dfc 100644
--- a/ui/dasadmin/src/views/backend/auth/model/index.vue
+++ b/ui/dasadmin/src/views/backend/auth/model/index.vue
@@ -528,6 +528,10 @@ const changeTabs = (name: any) => {
         getServiceList()
     }
 }
+const sortData = reactive<{ orderColumn: string | undefined; orderType: 'desc' | 'asc' | undefined }>({
+    orderColumn: undefined,
+    orderType: undefined,
+})
 const sortChange = ({
     prop,
     order,
@@ -535,11 +539,26 @@ const sortChange = ({
     prop: keyof typeof ModelAttributeFieldsEnums | keyof typeof ModelServiceFieldsEnums
     order: 'ascending' | 'descending' | null
 }) => {
+    const propEnums = {
+        attributeCode: 'attribute_code',
+        attributeName: 'attribute_name',
+        attributeTypeName: 'attribute_type',
+        porder: 'porder',
+        serviceCode: 'service_code',
+        serviceName: 'service_name',
+        serviceTypeName: 'service_type',
+    }
+
     const orderType = order === 'ascending' ? 'asc' : order === 'descending' ? 'desc' : undefined
+
+    const filed = propEnums[prop as keyof typeof propEnums]
+    sortData.orderColumn = orderType ? filed : undefined
+    sortData.orderType = orderType
+
     if (ModelTabs.value === 'attribute') {
-        getAttributeList({ orderFiled: order ? (prop as keyof typeof ModelAttributeFieldsEnums) : undefined, order: orderType })
+        getAttributeList()
     } else if (ModelTabs.value === 'service') {
-        getServiceList({ orderFiled: order ? (prop as keyof typeof ModelServiceFieldsEnums) : undefined, order: orderType })
+        getServiceList()
     }
 }
 
@@ -579,8 +598,8 @@ const getAttributeList = ({
         iotModelId: curContextMenuTreeData.value!.id!,
         pageNum: currentPage.value,
         pageSize: currentPageSize.value,
-        orderColumn: orderFiled,
-        orderType: order,
+        orderColumn: sortData.orderColumn,
+        orderType: sortData.orderType,
     }
     if (type === 'Name') {
         requestData.attributeName = value
@@ -623,20 +642,16 @@ const getAttributeList = ({
 const getServiceList = ({
     type,
     value,
-    order,
-    orderFiled,
 }: {
     type?: radioGroupType
     value?: string
-    order?: 'asc' | 'desc'
-    orderFiled?: keyof typeof ModelServiceFieldsEnums
 } = {}) => {
     const requestData: GetModelServiceType = {
         iotModelId: curContextMenuTreeData.value!.id!,
         pageNum: currentPage.value,
         pageSize: currentPageSize.value,
-        orderColumn: orderFiled,
-        orderType: order,
+        orderColumn: sortData.orderColumn,
+        orderType: sortData.orderType,
     }
     if (type === 'Name') {
         requestData.serviceName = value
diff --git a/ui/dasadmin/src/views/backend/auth/model/type.ts b/ui/dasadmin/src/views/backend/auth/model/type.ts
index 131dfa48..fb32c728 100644
--- a/ui/dasadmin/src/views/backend/auth/model/type.ts
+++ b/ui/dasadmin/src/views/backend/auth/model/type.ts
@@ -94,8 +94,8 @@ export type GetModelAttributeType = {
     attributeName?: string
     pageSize: number
     pageNum: number
-    orderColumn: keyof typeof ModelAttributeFieldsEnums | undefined
-    orderType: 'desc' | 'asc' | undefined
+    orderColumn?: string
+    orderType?: 'desc' | 'asc'
 }
 
 export type attributeTypeDataType = "float" | "double" | "tinyint" | "smallint" | "int" | "bigint"
@@ -130,7 +130,7 @@ export type GetModelServiceType = {
     serviceName?: string
     pageSize: number
     pageNum: number
-    orderColumn?: keyof typeof ModelServiceFieldsEnums
+    orderColumn?: string
     orderType?: 'desc' | 'asc'
 }