From 4ac793f155ddf760e53d6511a35cc869c443c730 Mon Sep 17 00:00:00 2001
From: Megghy <megghy@qq.com>
Date: Fri, 2 May 2025 06:37:18 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=BB=84=E4=BB=B6=E5=92=8C=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在多个组件中引入 NTime 和 NTooltip 以优化时间显示
- 修改 ActionHistoryViewer.vue 和 CheckInSettings.vue 中的时间渲染逻辑
- 在 CheckInRankingView.vue 中实现时间的相对显示和格式化
- 修复商品页加载问题
---
 .../autoaction/ActionHistoryViewer.vue           | 12 ++++++++----
 .../autoaction/settings/CheckInSettings.vue      | 16 +++++++++++++---
 src/components.d.ts                              |  1 +
 src/views/manage/point/PointManage.vue           |  4 ++--
 src/views/view/CheckInRankingView.vue            | 15 ++++++++++++++-
 5 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/src/client/components/autoaction/ActionHistoryViewer.vue b/src/client/components/autoaction/ActionHistoryViewer.vue
index 485d676..da2c120 100644
--- a/src/client/components/autoaction/ActionHistoryViewer.vue
+++ b/src/client/components/autoaction/ActionHistoryViewer.vue
@@ -36,11 +36,15 @@ const columns = [
     width: 180,
     sorter: (a: HistoryItem, b: HistoryItem) => a.timestamp - b.timestamp,
     render: (row: HistoryItem) => {
-      return h(NTime, {
-        time: new Date(row.timestamp),
-        format: 'yyyy-MM-dd HH:mm:ss'
+      return h(NTooltip, {
+      }, {
+        trigger: () => h(NTime, {
+          time: row.timestamp,
+          type: 'relative'
+        }),
+        default: () => new Date(row.timestamp).toLocaleString()
       });
-    }
+    },
   },
   {
     title: '操作名称',
diff --git a/src/client/components/autoaction/settings/CheckInSettings.vue b/src/client/components/autoaction/settings/CheckInSettings.vue
index 64e5383..81215f7 100644
--- a/src/client/components/autoaction/settings/CheckInSettings.vue
+++ b/src/client/components/autoaction/settings/CheckInSettings.vue
@@ -43,7 +43,10 @@
             </NFormItem>
 
             <template v-if="serverSetting.enableCheckIn">
-              <NFormItem label="签到命令">
+              <NFormItem
+                label="签到命令"
+                required
+              >
                 <NInputGroup>
                   <NInput
                     :value="serverSetting.checkInKeyword"
@@ -386,7 +389,7 @@ import { CHECKIN_API_URL } from '@/data/constants';
 import { GuidUtils } from '@/Utils';
 import { Info24Filled } from '@vicons/fluent';
 import type { DataTableColumns } from 'naive-ui';
-import { NAlert, NButton, NCard, NDataTable, NDivider, NEmpty, NForm, NFormItem, NIcon, NInput, NInputGroup, NInputNumber, NPopconfirm, NSelect, NSpace, NSpin, NSwitch, NTabPane, NTabs, NText } from 'naive-ui';
+import { NAlert, NButton, NCard, NDataTable, NDivider, NEmpty, NForm, NFormItem, NIcon, NInput, NInputGroup, NInputNumber, NPopconfirm, NSelect, NSpace, NSpin, NSwitch, NTabPane, NTabs, NText, NTime, NTooltip } from 'naive-ui';
 import { computed, h, onMounted, ref, watch } from 'vue';
 import AutoActionEditor from '../AutoActionEditor.vue';
 import TemplateHelper from '../TemplateHelper.vue';
@@ -574,7 +577,14 @@ const rankingColumns: DataTableColumns<CheckInRankingInfo> = [
     title: '最近签到时间',
     key: 'lastCheckInTime',
     render(row: CheckInRankingInfo) {
-      return h('span', {}, new Date(row.lastCheckInTime).toLocaleString());
+      return h(NTooltip, {
+      }, {
+        trigger: () => h(NTime, {
+          time: row.lastCheckInTime,
+          type: 'relative'
+        }),
+        default: () => new Date(row.lastCheckInTime).toLocaleString()
+      });
     },
     sorter: 'default'
   },
diff --git a/src/components.d.ts b/src/components.d.ts
index 62cbed1..d86be7e 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -36,6 +36,7 @@ declare module 'vue' {
     NSpace: typeof import('naive-ui')['NSpace']
     NTag: typeof import('naive-ui')['NTag']
     NText: typeof import('naive-ui')['NText']
+    NTime: typeof import('naive-ui')['NTime']
     PointGoodsItem: typeof import('./components/manage/PointGoodsItem.vue')['default']
     PointHistoryCard: typeof import('./components/manage/PointHistoryCard.vue')['default']
     PointOrderCard: typeof import('./components/manage/PointOrderCard.vue')['default']
diff --git a/src/views/manage/point/PointManage.vue b/src/views/manage/point/PointManage.vue
index 0147fc1..664f9f3 100644
--- a/src/views/manage/point/PointManage.vue
+++ b/src/views/manage/point/PointManage.vue
@@ -52,7 +52,7 @@ import PointUserManage from './PointUserManage.vue'
 const message = useMessage()
 const accountInfo = useAccount()
 const dialog = useDialog()
-const useBiliAuth = useBiliAuth()
+const biliAuth = useBiliAuth()
 const formRef = ref()
 const isUpdating = ref(false)
 const isAllowedPrivacyPolicy = ref(false)
@@ -70,7 +70,7 @@ const hash = computed({
 })
 
 // 商品数据及模型
-const goods = ref<ResponsePointGoodModel[]>(await useBiliAuth.GetGoods(accountInfo.value?.id, message))
+const goods = ref<ResponsePointGoodModel[]>(await biliAuth.GetGoods(accountInfo.value?.id, message))
 const defaultGoodsModel = {
   goods: {
     type: GoodsTypes.Virtual,
diff --git a/src/views/view/CheckInRankingView.vue b/src/views/view/CheckInRankingView.vue
index a57d70e..6324b14 100644
--- a/src/views/view/CheckInRankingView.vue
+++ b/src/views/view/CheckInRankingView.vue
@@ -131,7 +131,19 @@
 
                 <!-- 签到时间列 -->
                 <div class="col-time">
-                  {{ formatDate(item.lastCheckInTime) }}
+                  <NTooltip>
+                    <template #trigger>
+                      <NTime
+                        :time="item.lastCheckInTime"
+                        type="relative"
+                      />
+                    </template>
+                    <template #default>
+                      <NTime
+                        :time="item.lastCheckInTime"
+                      />
+                    </template>
+                  </NTooltip>
                 </div>
               </div>
             </div>
@@ -180,6 +192,7 @@ import {
   NSelect,
   NSpace,
   NSpin,
+  NTooltip,
 } from 'naive-ui';
 import { computed, onMounted, ref } from 'vue';