From 6b6325003924b1605b610f759b2131c15013ffa0 Mon Sep 17 00:00:00 2001
From: nsnail <taokeu@gmail.com>
Date: Mon, 29 Jul 2024 18:19:58 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20ip=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=20(#166)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: tk <fiyne1a@dingtalk.com>
---
 src/frontend/admin/src/views/sys/log/login/index.vue     | 8 +++++---
 src/frontend/admin/src/views/sys/log/operation/index.vue | 8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/frontend/admin/src/views/sys/log/login/index.vue b/src/frontend/admin/src/views/sys/log/login/index.vue
index 39fc0328..2b841307 100644
--- a/src/frontend/admin/src/views/sys/log/login/index.vue
+++ b/src/frontend/admin/src/views/sys/log/login/index.vue
@@ -64,8 +64,10 @@
                 <el-table-column :label="$t('登录名')" prop="loginUserName" sortable="custom" width="150" />
                 <el-table-column :label="$t('客户端IP')" prop="createdClientIp" show-overflow-tooltip sortable="custom" width="200">
                     <template #default="{ row }">
-                        <p>{{ row.createdClientIp }}</p>
-                        <p>{{ this.ips.filter((x) => x.ip === row.createdClientIp)[0]?.region ?? '...' }}</p>
+                        <template v-if="ips && ips.length > 0 && row.createdClientIp">
+                            <p>{{ row.createdClientIp }}</p>
+                            <p>{{ this.ips.filter((x) => x.ip === row.createdClientIp)[0]?.region ?? '...' }}</p>
+                        </template>
                     </template>
                 </el-table-column>
                 <el-table-column :label="$t('操作系统')" align="center" prop="os" width="150" />
@@ -117,7 +119,7 @@ export default {
     methods: {
         async dataChange(data) {
             this.apis = []
-            const ips = data.data.rows?.map((x) => x.createdClientIp)
+            const ips = data.data.rows?.map((x) => x.createdClientIp) ?? []
             const res = await Promise.all([
                 ips && ips.length > 0 ? http.get(`http://ip.line92.xyz/?ip=${ips.join('&ip=')}`) : new Promise((x) => x({ data: [] })),
             ])
diff --git a/src/frontend/admin/src/views/sys/log/operation/index.vue b/src/frontend/admin/src/views/sys/log/operation/index.vue
index ecaa546c..69ff9ae6 100644
--- a/src/frontend/admin/src/views/sys/log/operation/index.vue
+++ b/src/frontend/admin/src/views/sys/log/operation/index.vue
@@ -134,8 +134,10 @@
                 </el-table-column>
                 <el-table-column :label="$t('客户端IP')" prop="createdClientIp" show-overflow-tooltip sortable="custom" width="200">
                     <template #default="{ row }">
-                        <p>{{ row.createdClientIp }}</p>
-                        <p>{{ this.ips.filter((x) => x.ip === row.createdClientIp)[0]?.region ?? '...' }}</p>
+                        <template v-if="ips && ips.length > 0 && row.createdClientIp">
+                            <p>{{ row.createdClientIp }}</p>
+                            <p>{{ ips.filter((x) => x.ip === row.createdClientIp)[0]?.region ?? '...' }}</p>
+                        </template>
                     </template>
                 </el-table-column>
                 <na-col-operation
@@ -215,7 +217,7 @@ export default {
             this.apis = []
             const ownerIds = data.data.rows?.filter((x) => x.ownerId).map((x) => x.ownerId)
             const apiCrcs = data.data.rows?.map((x) => x.apiPathCrc32)
-            const ips = data.data.rows?.map((x) => x.createdClientIp)
+            const ips = data.data.rows?.map((x) => x.createdClientIp) ?? []
             const res = await Promise.all([
                 ownerIds && ownerIds.length > 0
                     ? this.$API.sys_user.query.post({