From d4956c94e0c041dc76d81d7590f27135d59258e6 Mon Sep 17 00:00:00 2001
From: tk <fiyne1a@dingtalk.com>
Date: Wed, 26 Mar 2025 15:39:05 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=F0=9F=94=A8=20=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[skip ci]
---
 Directory.Build.props                             |  2 +-
 README.md                                         |  6 +++---
 scripts/rename.csx                                |  2 +-
 .../NetAdmin.Infrastructure.csproj                |  8 ++++----
 .../admin/src/components/naArea/index.vue         |  1 -
 .../admin/src/components/naColAvatar/index.vue    | 15 +++++++++++----
 .../admin/src/components/naUserSelect/index.vue   |  1 -
 .../admin/src/components/scTableSelect/index.vue  |  2 +-
 src/frontend/admin/src/style/fix.scss             |  1 -
 9 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index daa6b1e1..435da0f8 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -18,7 +18,7 @@
         <LangVersion>preview</LangVersion>
         <MinVerDefaultPreReleaseIdentifiers>beta</MinVerDefaultPreReleaseIdentifiers>
         <MinVerTagPrefix>v</MinVerTagPrefix>
-        <NoWarn>CA1707;IDE0005;IDE0008;IDE0010;IDE0028;IDE0055;IDE0072;IDE0160;IDE0300;IDE0305;RCS1141;RCS1142;RCS1181;S101;S1121;S1135;S125;S2094;S3604;S4663;S6561;SA1010;SYSLIB1045</NoWarn>
+        <NoWarn>CA1707;IDE0005;IDE0008;IDE0010;IDE0028;IDE0055;IDE0160;IDE0300;IDE0305;RCS1141;RCS1142;RCS1181;S101;S1121;S1135;S125;S2094;S3604;S4663;S6561;SYSLIB1045;SA1010</NoWarn>
         <Product>NetAdmin</Product>
         <RepositoryType>git</RepositoryType>
         <RepositoryUrl>https://github.com/nsnail/NetAdmin.git</RepositoryUrl>
diff --git a/README.md b/README.md
index fde328e4..ed0919ae 100644
--- a/README.md
+++ b/README.md
@@ -29,8 +29,8 @@ dotnet --list-sdks
 git clone --depth 1 https://github.com/nsnail/NetAdmin.git && cd ./NetAdmin
 
 # 3. 确认本机 redis 处于运行状态
-redis-server # 启动服务器
-redis-cli    # 连接测试
+redis-server      # 启动服务器
+redis-cli ping    # 连接测试
 # 下载 redis for windows：https://github.com/redis-windows/redis-windows/releases
 # 下载 redis for linux/mac：https://redis.io/download
 
@@ -41,7 +41,7 @@ dotnet run --project ./src/backend/YourSolution.AdmServer.Host/YourSolution.AdmS
 
 # 5. 检查 nodejs 版本 >=20
 node -v
-# 下载 nodejs：https://nodejs.org/en/download
+# 下载 nodejs：https://nodejs.org/zh-cn/download
 
 # 6. 安装 npm 依赖包
 cd ./src/frontend/admin && npm install
diff --git a/scripts/rename.csx b/scripts/rename.csx
index a2b68e38..3cf57cd2 100644
--- a/scripts/rename.csx
+++ b/scripts/rename.csx
@@ -1,4 +1,4 @@
-#r "nuget: NSExt, 2.3.4"
+#r "nuget: NSExt, 2.3.5"
 using NSExt.Extensions;
 
 Console.WriteLine("请输入原始名称（NetAdmin）：");
diff --git a/src/backend/NetAdmin/NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj b/src/backend/NetAdmin/NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj
index b417037a..1fce6e80 100644
--- a/src/backend/NetAdmin/NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj
+++ b/src/backend/NetAdmin/NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj
@@ -3,12 +3,12 @@
     <Import Project="$(SolutionDir)/build/copy.pkg.xml.comment.files.targets"/>
     <Import Project="$(SolutionDir)/build/prebuild.targets"/>
     <ItemGroup>
-        <PackageReference Include="NetAdmin.FreeSql.DbContext" Version="1.1.2" Label="refs"/>
-        <PackageReference Include="NetAdmin.FreeSql.Provider.Sqlite" Version="1.1.2" Label="refs"/>
-        <PackageReference Include="Gurion" Version="1.2.12" Label="refs"/>
+        <PackageReference Include="NetAdmin.FreeSql.DbContext" Version="1.1.3" Label="refs"/>
+        <PackageReference Include="NetAdmin.FreeSql.Provider.Sqlite" Version="1.1.3" Label="refs"/>
+        <PackageReference Include="Gurion" Version="1.2.13" Label="refs"/>
         <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.2"/>
         <PackageReference Include="Minio" Version="6.0.4"/>
-        <PackageReference Include="NSExt" Version="2.3.4"/>
+        <PackageReference Include="NSExt" Version="2.3.5"/>
         <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.5"/>
     </ItemGroup>
     <ItemGroup>
diff --git a/src/frontend/admin/src/components/naArea/index.vue b/src/frontend/admin/src/components/naArea/index.vue
index 9defa951..294800af 100644
--- a/src/frontend/admin/src/components/naArea/index.vue
+++ b/src/frontend/admin/src/components/naArea/index.vue
@@ -4,7 +4,6 @@
         :params="form"
         :props="{ label: 'key', value: 'value' }"
         :query-api="$API.sys_dic.pagedQueryContent"
-        :table-width="60"
         clearable
         ref="area">
         <template #header>
diff --git a/src/frontend/admin/src/components/naColAvatar/index.vue b/src/frontend/admin/src/components/naColAvatar/index.vue
index 9ae6beb6..f85f891f 100644
--- a/src/frontend/admin/src/components/naColAvatar/index.vue
+++ b/src/frontend/admin/src/components/naColAvatar/index.vue
@@ -2,8 +2,9 @@
     <el-table-column :label="label" :prop="prop" sortable="custom">
         <template #default="{ row }">
             <div class="avatar">
-                <el-avatar :src="getAvatar(row, prop)" size="small"></el-avatar>
-                <span>{{ tool.getNestedProperty(row, prop) }}</span>
+                <el-avatar :src="getAvatar(row, prop, avatar)" size="small"></el-avatar>
+                <el-link v-if="this.click" @click="this.click(row)"> {{ tool.getNestedProperty(row, prop) }}</el-link>
+                <span v-else> {{ tool.getNestedProperty(row, prop) }}</span>
             </div>
         </template>
     </el-table-column>
@@ -22,6 +23,8 @@ export default {
     props: {
         label: { type: String },
         prop: { type: String },
+        avatar: { type: String },
+        click: { type: Function },
     },
     data() {
         return {}
@@ -36,8 +39,12 @@ export default {
     },
     methods: {
         //获取头像
-        getAvatar(row, prop) {
-            return row.avatar ? row.avatar : this.$CONFIG.DEFAULT_AVATAR(tool.getNestedProperty(row, prop))
+        getAvatar(row, prop, avatar) {
+            return avatar
+                ? tool.getNestedProperty(row, avatar)
+                : row.avatar
+                  ? row.avatar
+                  : this.$CONFIG.DEFAULT_AVATAR(tool.getNestedProperty(row, prop))
         },
     },
 }
diff --git a/src/frontend/admin/src/components/naUserSelect/index.vue b/src/frontend/admin/src/components/naUserSelect/index.vue
index 6379e83c..8c6459d2 100644
--- a/src/frontend/admin/src/components/naUserSelect/index.vue
+++ b/src/frontend/admin/src/components/naUserSelect/index.vue
@@ -4,7 +4,6 @@
         :params="form"
         :props="{ label: 'userName', value: 'id' }"
         :query-api="$API.sys_user.pagedQuery"
-        :table-width="60"
         clearable
         ref="user">
         <template #header>
diff --git a/src/frontend/admin/src/components/scTableSelect/index.vue b/src/frontend/admin/src/components/scTableSelect/index.vue
index 230af12c..f33a4c5a 100644
--- a/src/frontend/admin/src/components/scTableSelect/index.vue
+++ b/src/frontend/admin/src/components/scTableSelect/index.vue
@@ -15,7 +15,7 @@
         @visible-change="visibleChange"
         ref="select">
         <template #empty>
-            <div v-loading="loading" :style="{ width: tableWidth + 'rem' }" class="scTable-select__table">
+            <div v-loading="loading" class="scTable-select__table">
                 <div class="scTable-select__header">
                     <slot :form="formData" :submit="formSubmit" name="header"></slot>
                 </div>
diff --git a/src/frontend/admin/src/style/fix.scss b/src/frontend/admin/src/style/fix.scss
index c4cc1a74..413829dd 100644
--- a/src/frontend/admin/src/style/fix.scss
+++ b/src/frontend/admin/src/style/fix.scss
@@ -326,7 +326,6 @@
 }
 
 .el-popper {
-    max-width: 90%;
     box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
 }