From 0afc6242a2f5c7697b0ee54fcf926fd6a2f9610e Mon Sep 17 00:00:00 2001
From: ssongliu <73214554+ssongliu@users.noreply.github.com>
Date: Tue, 4 Jun 2024 22:03:06 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=20FTP=20=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=88=86=E9=A1=B5=E6=A0=B7=E5=BC=8F=20(#5283)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/app/service/ftp.go                      | 4 ++++
 frontend/src/components/complex-table/index.vue | 3 ++-
 frontend/src/views/toolbox/ftp/index.vue        | 2 +-
 frontend/src/views/toolbox/ftp/log/index.vue    | 8 ++++----
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/backend/app/service/ftp.go b/backend/app/service/ftp.go
index 6a02dc504..bd9048afd 100644
--- a/backend/app/service/ftp.go
+++ b/backend/app/service/ftp.go
@@ -2,6 +2,7 @@ package service
 
 import (
 	"os"
+	"sort"
 
 	"github.com/1Panel-dev/1Panel/backend/app/dto"
 	"github.com/1Panel-dev/1Panel/backend/app/model"
@@ -48,6 +49,9 @@ func (f *FtpService) LoadLog(req dto.FtpLogSearch) (int64, interface{}, error) {
 	if err != nil {
 		return 0, nil, err
 	}
+	sort.Slice(logItem, func(i, j int) bool {
+		return logItem[i].Time > logItem[j].Time
+	})
 	var logs []toolbox.FtpLog
 	total, start, end := len(logItem), (req.Page-1)*req.PageSize, req.Page*req.PageSize
 	if start > total {
diff --git a/frontend/src/components/complex-table/index.vue b/frontend/src/components/complex-table/index.vue
index 9222c6b37..4df1a7374 100644
--- a/frontend/src/components/complex-table/index.vue
+++ b/frontend/src/components/complex-table/index.vue
@@ -18,10 +18,11 @@
 
         <div class="complex-table__pagination" v-if="props.paginationConfig">
             <slot name="pagination">
-                <fu-table-pagination
+                <el-pagination
                     v-model:current-page="paginationConfig.currentPage"
                     v-model:page-size="paginationConfig.pageSize"
                     :total="paginationConfig.total"
+                    :page-sizes="[5, 10, 20, 50, 100]"
                     @size-change="sizeChange"
                     @current-change="currentChange"
                     :small="mobile"
diff --git a/frontend/src/views/toolbox/ftp/index.vue b/frontend/src/views/toolbox/ftp/index.vue
index 0b6acb7ad..62363016c 100644
--- a/frontend/src/views/toolbox/ftp/index.vue
+++ b/frontend/src/views/toolbox/ftp/index.vue
@@ -184,7 +184,7 @@ const data = ref();
 const paginationConfig = reactive({
     cacheSizeKey: 'ftp-page-size',
     currentPage: 1,
-    pageSize: 10,
+    pageSize: Number(localStorage.getItem('ftp-page-size')) || 10,
     total: 0,
     orderBy: 'created_at',
     order: 'null',
diff --git a/frontend/src/views/toolbox/ftp/log/index.vue b/frontend/src/views/toolbox/ftp/log/index.vue
index 7ec4ca9cd..3870ec30e 100644
--- a/frontend/src/views/toolbox/ftp/log/index.vue
+++ b/frontend/src/views/toolbox/ftp/log/index.vue
@@ -17,13 +17,13 @@
 
         <ComplexTable class="mt-2" :pagination-config="paginationConfig" :data="data" @search="search">
             <el-table-column label="ip" prop="ip" show-overflow-tooltip />
-            <el-table-column :label="$t('commons.table.status')" show-overflow-tooltip prop="status">
+            <el-table-column :label="$t('commons.table.status')" min-width="50" show-overflow-tooltip prop="status">
                 <template #default="{ row }">
                     <el-tag v-if="row.status === '200'">{{ $t('commons.status.success') }}</el-tag>
                     <el-tag v-else type="danger">{{ $t('commons.status.failed') }}</el-tag>
                 </template>
             </el-table-column>
-            <el-table-column :label="$t('commons.table.operate')" show-overflow-tooltip>
+            <el-table-column :label="$t('commons.table.operate')" min-width="40" show-overflow-tooltip>
                 <template #default="{ row }">
                     {{ loadOperation(row.operation) }}
                 </template>
@@ -33,12 +33,12 @@
                     {{ loadFileName(row.operation) }}
                 </template>
             </el-table-column>
-            <el-table-column :label="$t('file.size')" show-overflow-tooltip prop="size">
+            <el-table-column :label="$t('file.size')" show-overflow-tooltip prop="size" min-width="60">
                 <template #default="{ row }">
                     {{ computeSizeFromByte(Number(row.size)) }}
                 </template>
             </el-table-column>
-            <el-table-column :label="$t('commons.table.date')" prop="time" show-overflow-tooltip />
+            <el-table-column :label="$t('commons.table.date')" prop="time" show-overflow-tooltip min-width="100" />
         </ComplexTable>
         <template #footer>
             <span class="dialog-footer">