From 62ca8a2dd504b4b8c0850a7aa64550c4650bc0d2 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Thu, 3 Jun 2021 18:47:36 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E4=BB=AA=E8=A1=A8?=
 =?UTF-8?q?=E6=9D=BF=E5=92=8C=E6=A8=A1=E6=9D=BF=E7=9A=84=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/base/mapper/ext/ExtPanelGroupMapper.xml  | 3 +++
 .../io/dataease/base/mapper/ext/ExtPanelTemplateMapper.xml    | 3 +++
 frontend/src/views/panel/list/PanelList.vue                   | 4 ++--
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelGroupMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelGroupMapper.xml
index 9d35845522..a345bfc4b0 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelGroupMapper.xml
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelGroupMapper.xml
@@ -64,6 +64,9 @@
         <if test="sort != null">
             order by ${sort}
         </if>
+        <if test="sort == null">
+            order by panel_group.create_time desc
+        </if>
     </select>
 
     <delete id="deleteCircle">
diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelTemplateMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelTemplateMapper.xml
index 9782de83bd..01a45726fd 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelTemplateMapper.xml
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelTemplateMapper.xml
@@ -83,6 +83,9 @@
         <if test="sort != null">
             order by ${sort}
         </if>
+        <if test="sort == null">
+            order by panel_template.create_time desc
+        </if>
     </select>
 
     <delete id="deleteCircle">
diff --git a/frontend/src/views/panel/list/PanelList.vue b/frontend/src/views/panel/list/PanelList.vue
index 52f38538e4..c0384adab8 100644
--- a/frontend/src/views/panel/list/PanelList.vue
+++ b/frontend/src/views/panel/list/PanelList.vue
@@ -323,12 +323,12 @@ export default {
         panelType: 'self',
         nodeType: null,
         children: [],
-        sort: 'node_type desc,name asc'
+        sort: 'create_time desc,node_type desc,name asc'
       },
       tableForm: {
         name: '',
         mode: '',
-        sort: 'node_type asc,create_time desc,name asc'
+        sort: 'create_time desc,node_type asc,create_time desc,name asc'
       },
       groupFormRules: {
         name: [