From a2025956878d4e8fb935659f4db0adee02cd8071 Mon Sep 17 00:00:00 2001
From: tk <fiyne1a@dingtalk.com>
Date: Wed, 25 Jun 2025 10:05:46 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E2=9C=A8=20=E8=A1=A8=E6=A0=BC=E5=8F=B3?=
 =?UTF-8?q?=E9=94=AE=E8=8F=9C=E5=8D=95=E5=A2=9E=E5=8A=A0=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../NetAdmin.Infrastructure.csproj            |  2 +-
 .../admin/src/components/scTable/index.vue    | 35 +++++++++++++------
 src/frontend/admin/src/locales/lang/en.js     |  2 ++
 src/frontend/admin/src/locales/lang/zh-cn.js  |  2 ++
 4 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/src/backend/NetAdmin/NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj b/src/backend/NetAdmin/NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj
index 2b0f2f55..8445307e 100644
--- a/src/backend/NetAdmin/NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj
+++ b/src/backend/NetAdmin/NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj
@@ -7,7 +7,7 @@
         <PackageReference Include="NetAdmin.FreeSql.Provider.Sqlite" Version="1.1.6" Label="refs"/>
         <PackageReference Include="Gurion" Version="1.2.15" Label="refs"/>
         <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.6"/>
-        <PackageReference Include="Minio" Version="6.0.4"/>
+        <PackageReference Include="Minio" Version="6.0.5"/>
         <PackageReference Include="NSExt" Version="2.3.6"/>
         <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.6"/>
     </ItemGroup>
diff --git a/src/frontend/admin/src/components/scTable/index.vue b/src/frontend/admin/src/components/scTable/index.vue
index 93ba68ae..ffcae46f 100644
--- a/src/frontend/admin/src/components/scTable/index.vue
+++ b/src/frontend/admin/src/components/scTable/index.vue
@@ -177,6 +177,13 @@
             <scContextmenuItem
                 :command="`${menu}^|^NotAny^|^${tool.getNestedProperty(current.row, menu) ?? ''}`"
                 :title="$t('非其一')"></scContextmenuItem>
+            <scContextmenuItem
+                :command="`${menu}^|^order-ascending^|^${tool.getNestedProperty(current.row, menu) ?? ''}`"
+                :title="$t('顺序排序')"
+                divided></scContextmenuItem>
+            <scContextmenuItem
+                :command="`${menu}^|^order-descending^|^${tool.getNestedProperty(current.row, menu) ?? ''}`"
+                :title="$t('倒序排序')"></scContextmenuItem>
         </scContextmenuItem>
         <scContextmenuItem :title="$t('复制')" command="copy" divided icon="el-icon-copy-document" suffix="C"></scContextmenuItem>
         <scContextmenuItem
@@ -409,18 +416,24 @@ export default {
                 return
             }
             const kv = command.split('^|^')
-            this.$refs.fieldFilterDialog.open({ field: kv[0], operator: kv[1], value: kv[2] }, (data) => {
-                const value = data.value?.split('\n') ?? ['']
-                this.vue.query.dynamicFilter.filters.push({
-                    field: data.field,
-                    operator: data.operator,
-                    value: value.length === 1 ? value[0] : value,
-                })
-                if (this.onCommand) {
-                    this.onCommand(this.vue.query.dynamicFilter.filters)
-                }
+            if (kv[1].indexOf('order-') === 0) {
+                this.vue.query.prop = kv[0]
+                this.vue.query.order = kv[1].substring(6)
                 this.upData()
-            })
+            } else {
+                this.$refs.fieldFilterDialog.open({ field: kv[0], operator: kv[1], value: kv[2] }, (data) => {
+                    const value = data.value?.split('\n') ?? ['']
+                    this.vue.query.dynamicFilter.filters.push({
+                        field: data.field,
+                        operator: data.operator,
+                        value: value.length === 1 ? value[0] : value,
+                    })
+                    if (this.onCommand) {
+                        this.onCommand(this.vue.query.dynamicFilter.filters)
+                    }
+                    this.upData()
+                })
+            }
         },
         contextMenuVisibleChange(visible) {
             if (!visible) {
diff --git a/src/frontend/admin/src/locales/lang/en.js b/src/frontend/admin/src/locales/lang/en.js
index 79394a4c..d854164e 100644
--- a/src/frontend/admin/src/locales/lang/en.js
+++ b/src/frontend/admin/src/locales/lang/en.js
@@ -624,4 +624,6 @@ export default {
     链接: 'Link',
     框架: 'IFrame',
     按钮: 'Button',
+    倒序排序:'Sort-Descending',
+    顺序排序:'Sort-Ascending',
 }
\ No newline at end of file
diff --git a/src/frontend/admin/src/locales/lang/zh-cn.js b/src/frontend/admin/src/locales/lang/zh-cn.js
index e45247a8..eafef7f2 100644
--- a/src/frontend/admin/src/locales/lang/zh-cn.js
+++ b/src/frontend/admin/src/locales/lang/zh-cn.js
@@ -622,4 +622,6 @@ export default {
     链接: '链接',
     框架: '框架',
     按钮: '按钮',
+    倒序排序:'倒序排序',
+    顺序排序:'顺序排序',
 }
\ No newline at end of file