From 905f5a053eef8a277804c457d08b01bebd5c8da0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8C=BF=E5=B0=8F=E5=A4=A9?= <1638245306@qq.com>
Date: Fri, 10 Feb 2023 10:09:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8F=98=E5=8C=96:=201.?=
 =?UTF-8?q?=E5=8A=A0=E5=85=A5=E5=90=8E=E7=AB=AF=E6=8E=92=E5=BA=8F=E7=A4=BA?=
 =?UTF-8?q?=E4=BE=8B;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/dvadmin/system/views/login_log.py |  1 +
 web/package.json                          |  6 +++---
 web/src/install.js                        | 10 +++++++++-
 web/src/views/system/log/loginLog/crud.js | 10 +++++-----
 web/src/views/system/user/crud.js         |  5 +++--
 5 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/backend/dvadmin/system/views/login_log.py b/backend/dvadmin/system/views/login_log.py
index 4dc3617..5853ecb 100644
--- a/backend/dvadmin/system/views/login_log.py
+++ b/backend/dvadmin/system/views/login_log.py
@@ -34,3 +34,4 @@ class LoginLogViewSet(CustomModelViewSet):
     queryset = LoginLog.objects.all()
     serializer_class = LoginLogSerializer
     extra_filter_backends = []
+    ordering_fields = ['create_datetime']
diff --git a/web/package.json b/web/package.json
index 336ae62..b835106 100644
--- a/web/package.json
+++ b/web/package.json
@@ -20,9 +20,9 @@
     "china-division": "^2.4.0",
     "core-js": "^3.4.3",
     "cropperjs": "^1.5.6",
-    "d2-crud-plus": "^2.13.1",
-    "d2-crud-x": "^2.13.1",
-    "d2p-extends": "^2.13.1",
+    "d2-crud-plus": "^2.17.9",
+    "d2-crud-x": "^2.17.9",
+    "d2p-extends": "^2.17.9",
     "dayjs": "^1.8.17",
     "echarts": "^5.1.2",
     "el-phone-number-input": "^1.1.5",
diff --git a/web/src/install.js b/web/src/install.js
index b20fa54..3bfc11e 100644
--- a/web/src/install.js
+++ b/web/src/install.js
@@ -62,7 +62,15 @@ Vue.use(d2CrudPlus, {
         page: { // page接口返回的数据结构配置，
           request: {
             current: 'page',
-            size: 'limit'
+            size: 'limit',
+            orderAsc (query, value) {
+              const field = query.orderProp
+              if (value) {
+                query.ordering = field
+              } else {
+                query.ordering = `-${field}`
+              }
+            }
           },
           response: {
             current: 'page', // 当前页码 ret.data.current
diff --git a/web/src/views/system/log/loginLog/crud.js b/web/src/views/system/log/loginLog/crud.js
index 08a33a4..94dd3ab 100644
--- a/web/src/views/system/log/loginLog/crud.js
+++ b/web/src/views/system/log/loginLog/crud.js
@@ -4,12 +4,11 @@ export const crudOptions = (vm) => {
       compact: true
     },
     options: {
-      tableType: 'vxe-table',
-      rowKey: true, // 必须设置，true or false
+      // tableType: 'vxe-table',
+      // rowKey: true, // 必须设置，true or false
       rowId: 'id',
       height: '100%', // 表格高度100%, 使用toolbar必须设置
-      highlightCurrentRow: false
-
+      highlightCurrentRow: false,
     },
     rowHandle: {
       fixed: 'right',
@@ -284,7 +283,8 @@ export const crudOptions = (vm) => {
         title: '登录时间',
         key: 'create_datetime',
         width: 160,
-        type: 'datetime'
+        type: 'datetime',
+        sortable: true
       }
     ]
   }
diff --git a/web/src/views/system/user/crud.js b/web/src/views/system/user/crud.js
index 88a2f9c..fa29cfb 100644
--- a/web/src/views/system/user/crud.js
+++ b/web/src/views/system/user/crud.js
@@ -9,8 +9,8 @@ export const crudOptions = (vm) => {
     },
     options: {
       height: '100%',
-      tableType: 'vxe-table',
-      rowKey: true,
+     // tableType: 'vxe-table',
+      //rowKey: true,
       rowId: 'id'
     },
     selectionRow: {
@@ -149,6 +149,7 @@ export const crudOptions = (vm) => {
       {
         title: '姓名',
         key: 'name',
+        sortable: 'custom',
         minWidth: 90,
         search: {
           disabled: false