From 9c896885a045021484b01471d4c8d765650c1b15 Mon Sep 17 00:00:00 2001 From: Shigma <1700011071@pku.edu.cn> Date: Fri, 11 Feb 2022 04:07:01 +0800 Subject: [PATCH] fix(status): do not show charts with no data, fix #498 --- .../frontend/status/client/charts/guild.ts | 8 +++--- .../frontend/status/client/charts/utils.ts | 6 ++--- plugins/frontend/status/client/index.vue | 4 --- plugins/frontend/status/src/stats.ts | 26 +++++++++---------- 4 files changed, 19 insertions(+), 25 deletions(-) diff --git a/plugins/frontend/status/client/charts/guild.ts b/plugins/frontend/status/client/charts/guild.ts index d11af3fd2d..a331275d57 100644 --- a/plugins/frontend/status/client/charts/guild.ts +++ b/plugins/frontend/status/client/charts/guild.ts @@ -1,4 +1,4 @@ -import type { GroupData } from '@koishijs/plugin-status/src' +import type { GuildData } from '@koishijs/plugin-status/src' import { Context } from '~/client' import { createChart, Tooltip } from './utils' @@ -9,10 +9,10 @@ export default (ctx: Context) => { title: '各群发言数量', fields: ['stats'], options({ stats }) { - if (!stats.groups.length) return + if (!stats.guilds.length) return return { - tooltip: Tooltip.item(({ data }) => { + tooltip: Tooltip.item(({ data }) => { const output = [data.name] output.push(`平台：${data.platform}`) if (data.memberCount) output.push(`人数：${data.memberCount}`) @@ -23,7 +23,7 @@ export default (ctx: Context) => { }), series: [{ type: 'pie', - data: stats.groups.sort((a, b) => b.value - a.value), + data: stats.guilds.sort((a, b) => b.value - a.value), radius: ['35%', '65%'], minShowLabelAngle: 3, }], diff --git a/plugins/frontend/status/client/charts/utils.ts b/plugins/frontend/status/client/charts/utils.ts index 65b0e1841d..e92bffecf0 100644 --- a/plugins/frontend/status/client/charts/utils.ts +++ b/plugins/frontend/status/client/charts/utils.ts @@ -14,10 +14,8 @@ export interface ChartOptions { export function createChart({ title, fields, options }: ChartOptions) { return Card.create(() => { const option = options(store) - return h(resolveComponent('k-card'), { class: 'frameless', title }, () => { - if (!option) return '暂无数据。' - return h(VChart, { option, autoresize: true }) - }) + if (!option) return + return h(resolveComponent('k-card'), { class: 'frameless', title }, h(VChart, { option, autoresize: true })) }, fields) } diff --git a/plugins/frontend/status/client/index.vue b/plugins/frontend/status/client/index.vue index 1a219c2ff5..0113a173d3 100644 --- a/plugins/frontend/status/client/index.vue +++ b/plugins/frontend/status/client/index.vue @@ -21,13 +21,11 @@ .profile-grid { grid-template-columns: repeat(3, 1fr); - grid-template-rows: auto; grid-gap: 2rem; } .chart-grid { grid-template-columns: repeat(2, 1fr); - grid-template-rows: repeat(2, auto); grid-gap: 2rem; .echarts { @@ -37,7 +35,6 @@ @media (min-width: 1400px) { grid-template-columns: repeat(2, 1fr); - grid-template-rows: repeat(2, auto); @media (min-width: 1600px) { .echarts { @@ -58,7 +55,6 @@ @media (max-width: 1440px) { grid-template-columns: 1fr; - grid-template-rows: repeat(4, auto); @media (min-width: 1200px) { .echarts { diff --git a/plugins/frontend/status/src/stats.ts b/plugins/frontend/status/src/stats.ts index 098b564cb8..cd26033659 100644 --- a/plugins/frontend/status/src/stats.ts +++ b/plugins/frontend/status/src/stats.ts @@ -32,7 +32,7 @@ export function average(stats: {}[]) { return result } -export interface GroupData { +export interface GuildData { name: string platform: string assignee: string @@ -133,7 +133,7 @@ class StatisticsProvider extends DataService { }) this.extend(this.extendBasic) - this.extend(this.extendGroup) + this.extend(this.extendGuilds) } private clear() { @@ -235,23 +235,23 @@ class StatisticsProvider extends DataService { }) } - private extendGroup: StatisticsProvider.Extension = async (payload, data) => { + private extendGuilds: StatisticsProvider.Extension = async (payload, data) => { const groupSet = new Set() - payload.groups = [] - const groupMap = Object.fromEntries(data.groups.map(g => [g.id, g])) + payload.guilds = [] + const groupMap = Object.fromEntries(data.guilds.map(g => [g.id, g])) const messageMap = average(data.daily.map(data => data.group)) const updateList: Pick[] = [] async function getGroupInfo(bot: Bot) { const { platform } = bot - const groups = await bot.getGuildList() - for (const { guildId, guildName: name } of groups) { + const guilds = await bot.getGuildList() + for (const { guildId, guildName: name } of guilds) { const id = `${platform}:${guildId}` if (!messageMap[id] || !groupMap[id] || groupSet.has(id)) continue groupSet.add(id) const { name: oldName, assignee } = groupMap[id] if (name !== oldName) updateList.push({ platform, id: guildId, name }) - payload.groups.push({ + payload.guilds.push({ name, platform, assignee, @@ -267,7 +267,7 @@ class StatisticsProvider extends DataService { if (!groupSet.has(key) && groupMap[key]) { const { name, assignee } = groupMap[key] const [platform] = key.split(':') as [never] - payload.groups.push({ + payload.guilds.push({ platform, name: name || key, value: messageMap[key], @@ -282,13 +282,13 @@ class StatisticsProvider extends DataService { async download() { const time = { $lt: new Date() }, sort = { time: 'desc' as const } - const [daily, hourly, longterm, groups] = await Promise.all([ + const [daily, hourly, longterm, guilds] = await Promise.all([ this.ctx.database.get('stats_daily', { time }, { sort, limit: RECENT_LENGTH }), this.ctx.database.get('stats_hourly', { time }, { sort, limit: 24 * RECENT_LENGTH }), this.ctx.database.get('stats_longterm', { time }, { sort }), this.ctx.database.get('channel', {}, ['platform', 'id', 'name', 'assignee']), ]) - const data = { daily, hourly, longterm, groups } + const data = { daily, hourly, longterm, guilds } const payload = {} as StatisticsProvider.Payload await Promise.all(this.callbacks.map(cb => cb(payload, data))) return payload @@ -323,7 +323,7 @@ namespace StatisticsProvider { export interface Data { extension?: StatisticsProvider.Payload - groups: Pick[] + guilds: Pick[] daily: Record>[] hourly: ({ time: Date } & Record)[] longterm: ({ time: Date } & Record)[] @@ -333,7 +333,7 @@ namespace StatisticsProvider { history: Dict commands: Dict hours: Dict[] - groups: GroupData[] + guilds: GuildData[] botSend: Dict botReceive: Dict }