koishi-plugin-chat-analyse 1.4.9 → 1.4.10

package/lib/index.d.ts

@@ -25,13 +25,9 @@ export interface Config {
     color: string;
     shape: string;
     ellipticity: number;
-    rotateRatio: number;
     minRotation: number;
     maxRotation: number;
     rotationSteps: number;
-    minFontSize: number;
-    maxFontSize: number;
-    gridSize: number;
     fontFamily: string;
     maskImage: string;
 }

package/lib/index.js

@@ -1509,7 +1509,7 @@ var Renderer = class {
     .container {
       display: inline-block; background: var(--card-bg); border-radius: 12px;
       padding: 0; overflow: hidden; box-shadow: 0 4px 6px rgba(0,0,0,.05);
-      width: 600px;
+      min-width: 480px; max-width: 640px;
     }
     .header {
       padding: 12px 16px;
@@ -1520,7 +1520,7 @@ var Renderer = class {
     }
     .title-text {
       font-size: 16px; font-weight: 600; color: var(--header-color);
-      margin: 0; text-align: center;
+      margin: 0 8px; text-align: center;
     }
     .stat-chip, .time-label {
       display: inline-flex; align-items: baseline; padding: 4px 8px;
@@ -1562,7 +1562,7 @@ var Renderer = class {
   async htmlToImage(fullHtmlContent) {
     const page = await this.ctx.puppeteer.page();
     try {
-      await page.setViewport({ width: 1080, height: 720, deviceScaleFactor: 1 });
+      await page.setViewport({ width: 800, height: 600, deviceScaleFactor: 1 });
       await page.setContent(fullHtmlContent, { waitUntil: "networkidle0" });
       const { width, height } = await page.evaluate(() => ({
         width: document.body.scrollWidth,
@@ -1693,56 +1693,60 @@ var Renderer = class {
     const yTickValue = Math.ceil(maxVal / yTickCount);
     const yAxisMax = yTickValue * yTickCount;
     const getX = /* @__PURE__ */ __name((index) => {
-      if (labels.length <= 1) return 300;
-      return 20 + index / (labels.length - 1) * 560;
+      if (labels.length <= 1) return 320;
+      return 40 + index / (labels.length - 1) * 540;
     }, "getX");
     const getY = /* @__PURE__ */ __name((value) => 250 - value / yAxisMax * 240, "getY");
     let svgElements = "";
     for (let i = 0; i <= yTickCount; i++) {
       const y = getY(i * yTickValue);
       const value = i * yTickValue;
-      svgElements += `<line x1="${20}" y1="${y}" x2="580" y2="${y}" stroke="var(--border-color)" stroke-width="1"/>`;
-      svgElements += `<text x="${20 - 8}" y="${y + 4}" font-size="10" fill="var(--sub-text-color)" text-anchor="end">${value}</text>`;
+      svgElements += `<line x1="40" y1="${y}" x2="580" y2="${y}" stroke="var(--border-color)" stroke-width="1"/>`;
+      svgElements += `<text x="32" y="${y + 4}" font-size="10" fill="var(--sub-text-color)" text-anchor="end">${value}</text>`;
     }
     labels.forEach((label, index) => {
-      if (index % Math.ceil(labels.length / 12) === 0) {
+      if (labels.length > 1 && index % Math.ceil(labels.length / 12) === 0) {
         const x = getX(index);
         svgElements += `<text x="${x}" y="270" font-size="10" fill="var(--sub-text-color)" text-anchor="middle">${label}</text>`;
       }
     });
     series.forEach((s, seriesIndex) => {
-      const color = seriesColors[seriesIndex];
+      const color = seriesColors[seriesIndex % seriesColors.length];
       const points = s.data.map((value, index) => `${getX(index)},${getY(value)}`).join(" ");
       svgElements += `<polyline points="${points}" fill="none" stroke="${color}" stroke-width="2"/>`;
     });
+    let legendHeight = 0;
     if (series.length > 1) {
-      const LEGEND_START_Y = 295;
+      const legendRows = Math.ceil(series.length / 3);
+      legendHeight = 15 + legendRows * 20;
+      const LEGEND_START_Y = 285;
       const columnWidth = 560 / 3;
       series.forEach((s, seriesIndex) => {
         const rowIndex = Math.floor(seriesIndex / 3);
         const colIndex = seriesIndex % 3;
-        const legendX = 20 + colIndex * columnWidth;
+        const legendX = 40 + colIndex * columnWidth;
         const legendY = LEGEND_START_Y + rowIndex * 20;
-        const color = seriesColors[seriesIndex];
+        const color = seriesColors[seriesIndex % seriesColors.length];
         svgElements += `<rect x="${legendX}" y="${legendY - 8}" width="12" height="8" fill="${color}" rx="2"/>`;
         svgElements += `<text x="${legendX + 18}" y="${legendY}" font-size="12" fill="var(--text-color)">${s.name}</text>`;
       });
     }
+    const svgHeight = 280 + legendHeight;
     const totalMessages = series.reduce((sum, s) => sum + s.data.reduce((a, b) => a + b, 0), 0);
     const cardHtml = `
-      <div class="container">
+      <div class="container" style="width: 600px;">
         <div class="header">
           <div class="stat-chip">总计: <span>${totalMessages.toLocaleString()}</span></div>
           <h1 class="title-text">${title}</h1>
           <div class="time-label">${time.toLocaleString("zh-CN", { hour12: false })}</div>
         </div>
         <div class="chart-wrapper">
-          <svg width="600" height="320" xmlns="http://www.w3.org/2000/svg">
+          <svg width="600" height="${svgHeight}" xmlns="http://www.w3.org/2000/svg">
             ${svgElements}
           </svg>
         </div>
       </div>`;
-    const chartStyles = ` .chart-wrapper { padding: 10px; } `;
+    const chartStyles = ` .chart-wrapper { padding: 10px; box-sizing: border-box; } `;
     const fullHtml = this.generateFullHtml(cardHtml, chartStyles);
     const imageBuffer = await this.htmlToImage(fullHtml);
     if (imageBuffer) yield imageBuffer;
@@ -1762,14 +1766,17 @@ var Renderer = class {
     const weights = words.map((w) => w[1]);
     const maxWeight = Math.max(...weights, 1);
     const minWeight = Math.min(...weights);
+    const wordCount = words.length;
+    const maxFontSize = Math.max(20, Math.round(400 / Math.log1p(wordCount)));
+    const minFontSize = Math.max(4, Math.round(maxFontSize / 12));
     const cardHtml = `
-      <div class="container">
+      <div class="container" style="width: 600px;">
         <div class="header">
           <div class="stat-chip">词数: <span>${words.length}</span></div>
           <h1 class="title-text">${title}</h1>
           <div class="time-label">${time.toLocaleString("zh-CN", { hour12: false })}</div>
         </div>
-        <div style="width: 600px; height: 600px; margin: auto;">
+        <div style="width: 600px; height: 600px; margin: auto; padding: 10px 0;">
           <canvas id="wordcloud-container" width="600" height="600"></canvas>
         </div>
         <script>${wordCloudScript}</script>
@@ -1779,22 +1786,22 @@ var Renderer = class {
             list: ${wordsJson},
             fontFamily: ${JSON.stringify(config.fontFamily)},
             weightFactor: (size) => {
-              if (${maxWeight} === ${minWeight}) return (${config.minFontSize} + ${config.maxFontSize}) / 2;
+              if (${maxWeight} === ${minWeight}) return (${minFontSize} + ${maxFontSize}) / 2;
               const normalizedWeight = (size - ${minWeight}) / (${maxWeight} - ${minWeight});
-              return ${config.minFontSize} + normalizedWeight * (${config.maxFontSize} - ${config.minFontSize});
+              return ${minFontSize} + normalizedWeight * (${maxFontSize} - ${minFontSize});
             },
             color: ${JSON.stringify(config.color)},
             shape: ${JSON.stringify(config.shape)},
-            gridSize: ${config.gridSize},
             ellipticity: ${config.ellipticity},
-            rotateRatio: ${config.rotateRatio},
             minRotation: ${config.minRotation},
             maxRotation: ${config.maxRotation},
             rotationSteps: ${config.rotationSteps},
             backgroundColor: 'transparent',
             clearCanvas: true,
             shrinkToFit: true,
+            rotateRatio: 1,
             shuffle: true,
+            gridSize: 1,
           };
 
           const maskImageUrl = ${JSON.stringify(config.maskImage)};
@@ -2521,16 +2528,12 @@ var Config3 = import_koishi7.Schema.intersect([
   }).description("高级分析配置"),
   import_koishi7.Schema.object({
     ellipticity: import_koishi7.Schema.number().min(0).max(1).default(1).description("长宽比"),
-    rotateRatio: import_koishi7.Schema.number().min(0).max(1).default(0.5).description("旋转比"),
     rotationSteps: import_koishi7.Schema.number().min(0).default(3).description("旋转步数"),
-    minRotation: import_koishi7.Schema.number().default(0).description("最小旋转角"),
+    minRotation: import_koishi7.Schema.number().default(-Math.PI / 2).description("最小旋转角"),
     maxRotation: import_koishi7.Schema.number().default(Math.PI / 2).description("最大旋转角"),
-    minFontSize: import_koishi7.Schema.number().min(1).default(4).description("最小字号"),
-    maxFontSize: import_koishi7.Schema.number().min(1).default(64).description("最大字号"),
-    gridSize: import_koishi7.Schema.number().min(0).default(1).description("词语间距"),
     color: import_koishi7.Schema.string().default("random-light").description("词云颜色"),
     shape: import_koishi7.Schema.string().default("square").description("词云形状"),
-    fontFamily: import_koishi7.Schema.string().default('"Noto Sans CJK SC", "Arial", sans-serif').description("词云字体"),
+    fontFamily: import_koishi7.Schema.string().default('"Noto Sans CJK SC", Arial, sans-serif').description("词云字体"),
     maskImage: import_koishi7.Schema.string().role("link").description("蒙版图片")
   }).description("词云生成配置")
 ]);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-chat-analyse",
   "description": "强大而全面的聊天数据分析插件。支持多维度统计（命令、发言、消息类型、活跃度），可生成发言排行、词云图，并提供完善的数据管理。",
-  "version": "1.4.9",
+  "version": "1.4.10",
   "contributors": [
     "Yis_Rime <yis_rime@outlook.com>"
   ],

package/readme.md

@@ -166,10 +166,8 @@
 | `fontFamily` | **词云字体**：用于渲染词云的字体列表。 | `"Noto Sans CJK SC", "Arial", sans-serif` |
 | `minFontSize` | **最小字号**：权重最小的单词所使用的字号(px)。 | `4` |
 | `maxFontSize` | **最大字号**：权重最大的单词所使用的字号(px)。 | `64` |
-| `gridSize` | **词语间距**：用于分隔单词的网格大小(px)。值越大，单词间距越大。 | `1` |
 | `ellipticity` | **长宽比**：形状的扁平程度(0-1)，仅对非方形形状有效。 | `1` |
-| `rotateRatio` | **旋转比**：随机旋转的单词所占的比例(0-1)。 | `0.5` |
-| `minRotation` | **最小旋转角**：单词随机旋转的最小角度(弧度)。 | `0` |
+| `minRotation` | **最小旋转角**：单词随机旋转的最小角度(弧度)。 | `-1.570796` (-π/2) |
 | `maxRotation` | **最大旋转角**：单词随机旋转的最大角度(弧度)。 | `1.570796` (π/2) |
 | `rotationSteps`| **旋转步数**：旋转角度的选择方式。0表示随机，2表示只在最小/最大角度中二选一。 | `3` |