befly-admin-ui 1.47.0 → 1.49.0

package/components/pageTableDetail.vue

@@ -33,7 +33,7 @@
         </div>
 
         <div v-if="$Prop.isPagination" class="main-page">
-            <TPagination :current-page="$Data.pager.currentPage" :page-size="$Data.pager.limit" :total="$Data.pager.total" align="right" :layout="$Prop.paginationLayout" @current-change="$Method.onPageChange" @page-size-change="$Method.onPageSizeChange" />
+            <TPagination :current="$Data.pager.current" :page-size="$Const.pageLimit" :total="$Data.pager.total" :showPageSize="false" align="right" layout="total, prev, pager, next" @current-change="$Method.onPageChange" />
         </div>
 
         <slot name="dialogs" :reload="$Method.reload" :current-row="$Data.currentRow"></slot>
@@ -66,18 +66,10 @@ const $Prop = defineProps({
         type: Boolean,
         default: true
     },
-    pageSize: {
-        type: Number,
-        default: 30
-    },
     endpoints: {
         type: Object,
         default: undefined
     },
-    paginationLayout: {
-        type: String,
-        default: "total, prev, pager, next, jumper"
-    },
     autoLoad: {
         type: Boolean,
         default: true
@@ -96,6 +88,7 @@ const $From = {
 };
 
 const $Const = {
+    pageLimit: 30,
     reservedSlotNames: ["toolLeft", "toolRight", "detail", "dialogs", "operation", "default"]
 };
 
@@ -103,8 +96,7 @@ const $Data = reactive({
     rows: [],
     loading: false,
     pager: {
-        currentPage: 1,
-        limit: $Prop.pageSize,
+        current: 1,
         total: 0
     },
     currentRow: null,
@@ -237,13 +229,13 @@ const $Method = {
             const limitKey = listEndpoint.limitKey || "limit";
 
             const data = {};
-            data[pageKey] = $Data.pager.currentPage;
-            data[limitKey] = $Data.pager.limit;
+            data[pageKey] = $Data.pager.current;
+            data[limitKey] = $Const.pageLimit;
 
             if (listEndpoint.buildData) {
                 const extra = listEndpoint.buildData({
-                    currentPage: $Data.pager.currentPage,
-                    limit: $Data.pager.limit
+                    currentPage: $Data.pager.current,
+                    limit: $Const.pageLimit
                 });
                 if (extra && typeof extra === "object") {
                     for (const key of Object.keys(extra)) {
@@ -263,9 +255,9 @@ const $Method = {
 
             const allowPageFallback = options?.allowPageFallback !== false;
             if (allowPageFallback && lists.length === 0 && total > 0) {
-                const lastPage = $Method.getLastPage(total, $Data.pager.limit);
-                if ($Data.pager.currentPage > lastPage) {
-                    $Data.pager.currentPage = lastPage;
+                const lastPage = $Method.getLastPage(total, $Const.pageLimit);
+                if ($Data.pager.current > lastPage) {
+                    $Data.pager.current = lastPage;
                     await $Method.loadList({
                         keepSelection: false,
                         allowPageFallback: false
@@ -292,22 +284,17 @@ const $Method = {
     },
     reload: async function (options) {
         if (options?.resetPage) {
-            $Data.pager.currentPage = 1;
+            $Data.pager.current = 1;
         }
         await $Method.loadList({
             keepSelection: options?.keepSelection,
             allowPageFallback: true
         });
     },
-    onPageChange: function (info) {
-        $Data.pager.currentPage = info.currentPage;
+    onPageChange: function (current) {
+        $Data.pager.current = current;
         $Method.reload({ keepSelection: true });
     },
-    onPageSizeChange: function (info) {
-        $Data.pager.limit = info.pageSize;
-        $Data.pager.currentPage = 1;
-        $Method.reload({ keepSelection: false });
-    },
     onActiveChange: function (value, context) {
         if (value.length === 0) {
             if ($Data.activeRowKeys.length > 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "befly-admin-ui",
-    "version": "1.47.0",
+    "version": "1.49.0",
     "gitHead": "071d17be177355cdd61f30659c6e4c5873f87d39",
     "private": false,
     "description": "Befly - 管理后台功能组件",
@@ -50,7 +50,7 @@
     "dependencies": {},
     "peerDependencies": {
         "tdesign-icons-vue-next": ">=0.4.0",
-        "tdesign-vue-next": ">=1.0.0",
+        "tdesign-vue-next": ">=1.20.2",
         "vue": ">=3.0.0",
         "vue-router": ">=5.0.0"
     }

package/views/index/components/systemOverview.vue

@@ -43,20 +43,9 @@
                 <t-col :span="2" class="dashboard-card-col">
                     <div class="dashboard-card">
                         <div class="dashboard-card-content">
-                            <div class="dashboard-card-label">今日访客</div>
+                            <div class="dashboard-card-label">今日在线</div>
                             <div class="dashboard-card-value-row">
-                                <div class="dashboard-card-main dashboard-card-main--metric dashboard-card-main--success">{{ $Computed.visitTodayCount }}</div>
-                            </div>
-                        </div>
-                    </div>
-                </t-col>
-
-                <t-col :span="2" class="dashboard-card-col">
-                    <div class="dashboard-card">
-                        <div class="dashboard-card-content">
-                            <div class="dashboard-card-label">当前在线</div>
-                            <div class="dashboard-card-value-row">
-                                <div class="dashboard-card-main dashboard-card-main--metric dashboard-card-main--primary">{{ $Computed.onlineCount }}</div>
+                                <div class="dashboard-card-main dashboard-card-main--metric dashboard-card-main--success">{{ $Computed.dailyTodayCount }}</div>
                             </div>
                         </div>
                     </div>
@@ -88,14 +77,11 @@ const $Data = reactive({
         apiCount: 0,
         roleCount: 0
     },
-    infoStats: {
+    dailyStats: {
         today: {
             count: 0
         }
     },
-    onlineStats: {
-        onlineCount: 0
-    },
     errorStats: {
         today: {
             count: 0
@@ -106,11 +92,10 @@ const $Data = reactive({
 const $Method = {
     fetchData: async function () {
         try {
-            const [overviewRes, infoStatsRes, onlineStatsRes, errorStatsRes] = await Promise.all([$Http("/core/dashboard/systemOverview", {}, [""]), $Http("/core/tongJi/infoStats", {}, [""]), $Http("/core/tongJi/onlineStats", {}, [""]), $Http("/core/tongJi/errorStats", {}, [""])]);
+            const [overviewRes, dailyStatsRes, errorStatsRes] = await Promise.all([$Http("/core/dashboard/systemOverview", {}, [""]), $Http("/core/tongJi/dailyStats", {}, [""]), $Http("/core/tongJi/errorStats", {}, [""])]);
 
             Object.assign($Data.permissionStats, overviewRes.data);
-            $Data.infoStats.today.count = Number(infoStatsRes.data?.today?.count || 0);
-            $Data.onlineStats.onlineCount = Number(onlineStatsRes.data?.onlineCount || 0);
+            $Data.dailyStats.today.count = Number(dailyStatsRes.data?.today?.count || 0);
             $Data.errorStats.today.count = Number(errorStatsRes.data?.today?.count || 0);
         } catch (_error) {
             // 静默失败：不阻断页面展示
@@ -119,11 +104,8 @@ const $Method = {
 };
 
 const $Computed = reactive({
-    visitTodayCount: computed(() => {
-        return $Data.infoStats.today.count;
-    }),
-    onlineCount: computed(() => {
-        return $Data.onlineStats.onlineCount;
+    dailyTodayCount: computed(() => {
+        return $Data.dailyStats.today.count;
     }),
     errorTodayCount: computed(() => {
         return $Data.errorStats.today.count;

package/views/log/error/index.vue

@@ -99,17 +99,19 @@ import { reactive } from "vue";
 
 const $Data = reactive({
     columns: withDefaultColumns([
-        { colKey: "productName", title: "产品名称" },
+        { colKey: "productName", title: "产品名称", width:120 },
         { colKey: "productCode", title: "产品代号", width: 150 },
-        { colKey: "productVersion", title: "产品版本", width: 130 },
+        
+        { colKey: "errorType", title: "错误类型", width: 120 },  
+        { colKey: "message", title: "错误信息", ellipsis: true },
+        { colKey: "productVersion", title: "产品版本", width: 130 }, 
         { colKey: "pageName", title: "页面名称" },
         { colKey: "pagePath", title: "页面路径", width: 220, ellipsis: true },
-        { colKey: "errorType", title: "错误类型", width: 120 },
-        { colKey: "deviceType", title: "设备类型", width: 110 },
-        { colKey: "browserName", title: "浏览器", width: 140 },
-        { colKey: "osName", title: "操作系统", width: 140 },
-        { colKey: "hitCount", title: "次数", width: 100 },
-        { colKey: "message", title: "错误信息", ellipsis: true },
+        
+        { colKey: "deviceType", title: "设备类型", width: 100 }, 
+        { colKey: "browserName", title: "浏览器", width: 100 }, 
+        { colKey: "osName", title: "操作系统", width: 100 },
+        { colKey: "hitCount", title: "次数", width: 100 }, 
         { colKey: "source", title: "来源", width: 100 },
         { colKey: "reportTime", title: "上报时间", width: 170 },
         { colKey: "firstReportTime", title: "首次上报", width: 170, detail: true },
@@ -122,7 +124,7 @@ const $Data = reactive({
         { colKey: "engineName", title: "渲染引擎", detail: true },
         { colKey: "cpuArchitecture", title: "CPU架构", detail: true },
         { colKey: "userAgent", title: "UA字符串", detail: true },
-        { colKey: "detail", title: "错误详情", detail: true }
+        { colKey: "detail", title: "错误详情", detail: true } 
     ]),
     endpoints: {
         list: {

package/views/projectStats/index.vue

@@ -14,43 +14,43 @@
                         <t-row :gutter="[16, 16]">
                             <t-col :xs="12" :sm="6" :md="4" :lg="2" class="metric-col">
                                 <div class="metric-card">
-                                    <span class="metric-label">在线人数</span>
-                                    <strong class="metric-value-online">{{ item.onlineCount }}</strong>
+                                    <span class="metric-label">今日在线</span>
+                                    <strong class="metric-value-daily">{{ item.today }}</strong>
                                 </div>
                             </t-col>
 
                             <t-col :xs="12" :sm="6" :md="4" :lg="2" class="metric-col">
                                 <div class="metric-card">
-                                    <span class="metric-label">今日访客</span>
-                                    <strong class="metric-value-visitor">{{ item.today }}</strong>
+                                    <span class="metric-label">昨日在线</span>
+                                    <strong class="metric-value-daily">{{ item.yesterday }}</strong>
                                 </div>
                             </t-col>
 
                             <t-col :xs="12" :sm="6" :md="4" :lg="2" class="metric-col">
                                 <div class="metric-card">
-                                    <span class="metric-label">昨日访客</span>
-                                    <strong class="metric-value-visitor">{{ item.yesterday }}</strong>
+                                    <span class="metric-label">前天在线</span>
+                                    <strong class="metric-value-daily">{{ item.dayBeforeYesterday }}</strong>
                                 </div>
                             </t-col>
 
                             <t-col :xs="12" :sm="6" :md="4" :lg="2" class="metric-col">
                                 <div class="metric-card">
-                                    <span class="metric-label">前天访客</span>
-                                    <strong class="metric-value-visitor">{{ item.dayBeforeYesterday }}</strong>
+                                    <span class="metric-label">近7天在线</span>
+                                    <strong class="metric-value-daily">{{ item.recent7 }}</strong>
                                 </div>
                             </t-col>
 
                             <t-col :xs="12" :sm="6" :md="4" :lg="2" class="metric-col">
                                 <div class="metric-card">
-                                    <span class="metric-label">近30天访客</span>
-                                    <strong class="metric-value-visitor">{{ item.recent30 }}</strong>
+                                    <span class="metric-label">近30天在线</span>
+                                    <strong class="metric-value-daily">{{ item.recent30 }}</strong>
                                 </div>
                             </t-col>
 
                             <t-col :xs="12" :sm="6" :md="4" :lg="2" class="metric-col">
                                 <div class="metric-card">
-                                    <span class="metric-label">本月访客</span>
-                                    <strong class="metric-value-visitor">{{ item.month }}</strong>
+                                    <span class="metric-label">本月在线</span>
+                                    <strong class="metric-value-daily">{{ item.month }}</strong>
                                 </div>
                             </t-col>
                         </t-row>
@@ -75,18 +75,17 @@ const $Data = reactive({
 });
 
 const $Method = {
-    buildProjectRow: function (visitItem, onlineItem) {
+    buildProjectRow: function (item) {
         return {
-            key: String(visitItem?.key || onlineItem?.key || visitItem?.productCode || onlineItem?.productCode || ""),
-            productName: String(visitItem?.productName || onlineItem?.productName || "-"),
-            productCode: String(visitItem?.productCode || onlineItem?.productCode || ""),
-
-            onlineCount: Number(onlineItem?.onlineCount || 0),
-            today: Number(visitItem?.today || 0),
-            yesterday: Number(visitItem?.yesterday || 0),
-            dayBeforeYesterday: Number(visitItem?.dayBeforeYesterday || 0),
-            recent30: Number(visitItem?.recent30 || 0),
-            month: Number(visitItem?.month || 0)
+            key: String(item?.key || item?.productCode || ""),
+            productName: String(item?.productName || "-"),
+            productCode: String(item?.productCode || ""),
+            today: Number(item?.today || 0),
+            yesterday: Number(item?.yesterday || 0),
+            dayBeforeYesterday: Number(item?.dayBeforeYesterday || 0),
+            recent7: Number(item?.recent7 || 0),
+            recent30: Number(item?.recent30 || 0),
+            month: Number(item?.month || 0)
         };
     },
     formatProductTitle: function (row) {
@@ -99,33 +98,11 @@ const $Method = {
 
         return productName || productCode || "-";
     },
-    mapProjectRows: function (infoStatsData, onlineStatsData) {
-        const onlineMap = new Map();
-
-        for (const item of onlineStatsData?.products || []) {
-            onlineMap.set(String(item?.productCode || item?.key || ""), item);
-        }
-
-        const rows = [];
-
-        for (const item of infoStatsData?.products || []) {
-            const productCode = String(item?.productCode || item?.key || "");
-            rows.push($Method.buildProjectRow(item, onlineMap.get(productCode)));
-            onlineMap.delete(productCode);
-        }
-
-        for (const item of onlineMap.values()) {
-            rows.push($Method.buildProjectRow(null, item));
-        }
-
-        return rows.filter((item) => {
-            return Boolean(item.key);
-        });
-    },
     fetchData: async function () {
         try {
-            const [infoStatsRes, onlineStatsRes] = await Promise.all([$Http("/core/tongJi/infoStats", {}, [""]), $Http("/core/tongJi/onlineStats", {}, [""])]);
-            $Data.productState.options = $Method.mapProjectRows(infoStatsRes.data, onlineStatsRes.data);
+            const dailyStatsRes = await $Http("/core/tongJi/dailyStats", {}, [""]);
+
+            $Data.productState.options = (dailyStatsRes.data?.products || []).map((item) => $Method.buildProjectRow(item)).filter((item) => Boolean(item.key));
         } catch (_error) {
             // 静默失败：不阻断页面展示
         }
@@ -183,10 +160,12 @@ $Method.fetchData();
     @include dashboardCard.dashboardCardLabel();
 }
 
-.metric-value-online {
-    @include dashboardCard.dashboardCardNumericValue(var(--error-color));
+.metric-value-daily {
+    @include dashboardCard.dashboardCardNumericValue(var(--success-color));
 
-    color: var(--error-color);
+    color: var(--success-color);
+    text-align: left;
+    white-space: nowrap;
 }
 
 .metric-card {
@@ -201,12 +180,4 @@ $Method.fetchData();
     justify-content: flex-start;
     padding: 12px;
 }
-
-.metric-value-visitor {
-    @include dashboardCard.dashboardCardNumericValue(var(--success-color));
-
-    color: var(--success-color);
-    text-align: left;
-    white-space: nowrap;
-}
 </style>