@ant-design/agentic-ui 2.30.2 → 2.30.3

package/dist/Plugins/chart/HistogramChart/style.js

@@ -0,0 +1,118 @@
+function _define_property(obj, key, value) {
+    if (key in obj) {
+        Object.defineProperty(obj, key, {
+            value: value,
+            enumerable: true,
+            configurable: true,
+            writable: true
+        });
+    } else {
+        obj[key] = value;
+    }
+    return obj;
+}
+function _object_spread(target) {
+    for(var i = 1; i < arguments.length; i++){
+        var source = arguments[i] != null ? arguments[i] : {};
+        var ownKeys = Object.keys(source);
+        if (typeof Object.getOwnPropertySymbols === "function") {
+            ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(source, sym).enumerable;
+            }));
+        }
+        ownKeys.forEach(function(key) {
+            _define_property(target, key, source[key]);
+        });
+    }
+    return target;
+}
+function ownKeys(object, enumerableOnly) {
+    var keys = Object.keys(object);
+    if (Object.getOwnPropertySymbols) {
+        var symbols = Object.getOwnPropertySymbols(object);
+        if (enumerableOnly) {
+            symbols = symbols.filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+            });
+        }
+        keys.push.apply(keys, symbols);
+    }
+    return keys;
+}
+function _object_spread_props(target, source) {
+    source = source != null ? source : {};
+    if (Object.getOwnPropertyDescriptors) {
+        Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
+    } else {
+        ownKeys(Object(source)).forEach(function(key) {
+            Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+        });
+    }
+    return target;
+}
+import { useEditorStyleRegister } from "../../../Hooks/useStyle";
+var genStyle = function genStyle(token) {
+    return _define_property({}, token.componentCls, {
+        // 统计数据容器样式
+        '&-statistic-container': {
+            display: 'flex',
+            gap: '16px',
+            marginBottom: '16px',
+            flexWrap: 'wrap',
+            alignItems: 'flex-start'
+        },
+        // 直方图容器样式
+        '.chart-wrapper': {
+            width: '100%',
+            height: 'calc(100% - 120px)',
+            minHeight: 300,
+            display: 'flex',
+            alignItems: 'center',
+            justifyContent: 'center',
+            overflow: 'hidden'
+        },
+        // 确保图表不会超出容器边界
+        canvas: {
+            maxWidth: '100% !important',
+            maxHeight: '100% !important'
+        },
+        // 移动端响应式样式
+        '@media (max-width: 768px)': {
+            '.chart-wrapper': {
+                height: 'calc(100% - 100px)',
+                minHeight: 250
+            },
+            '.chart-title': {
+                fontSize: 14,
+                marginBottom: 8,
+                textAlign: 'center'
+            },
+            '.chart-filter': {
+                flexWrap: 'wrap',
+                gap: 8,
+                marginBottom: 12,
+                '.filter-button': {
+                    fontSize: 12,
+                    padding: '6px 12px'
+                }
+            }
+        },
+        // 超小屏幕优化 (375px以下)
+        '@media (max-width: 375px)': {
+            padding: 8,
+            '.chart-wrapper': {
+                minHeight: 220
+            }
+        }
+    });
+};
+export function useStyle(prefixCls) {
+    return useEditorStyleRegister('HistogramChart', function(token) {
+        var histogramToken = _object_spread_props(_object_spread({}, token), {
+            componentCls: ".".concat(prefixCls)
+        });
+        return [
+            genStyle(histogramToken)
+        ];
+    });
+}

package/dist/Plugins/chart/LineChart/index.js

@@ -216,8 +216,8 @@ var LineChart = function LineChart(_0) {
                 borderColor: resolvedColor,
                 backgroundColor: hexToRgba(resolvedColor, 0.2),
                 pointBackgroundColor: resolvedColor,
-                pointBorderColor: '#fff',
-                pointBorderWidth: 1,
+                pointBorderColor: isLight ? '#fff' : resolvedColor,
+                pointBorderWidth: isLight ? 1 : 0,
                 borderWidth: 3,
                 tension: 0,
                 fill: false
@@ -231,7 +231,8 @@ var LineChart = function LineChart(_0) {
         filteredData,
         types,
         xValues,
-        color
+        color,
+        isLight
     ]);
     var options = {
         responsive: true,

package/dist/Plugins/chart/RadarChart/index.d.ts

@@ -33,6 +33,8 @@ interface RadarChartProps extends ChartContainerProps {
     classNames?: ChartClassNames;
     /** 数据时间 */
     dataTime?: string;
+    /** 图表主题 */
+    theme?: 'dark' | 'light';
     /** 自定义主色（可选），支持 string 或 string[]；数组按序对应各数据序列 */
     color?: string | string[];
     /** 头部工具条额外按钮 */

package/dist/Plugins/chart/RadarChart/index.js

@@ -144,11 +144,12 @@ import { Radar } from "react-chartjs-2";
 import ChartStatistic from "../ChartStatistic";
 import { ChartContainer, ChartFilter, ChartToolBar, downloadChart } from "../components";
 import { defaultColorList } from "../const";
+import { useChartTheme } from "../hooks";
 import { hexToRgba, resolveCssVariable } from "../utils";
 import { useStyle } from "./style";
 var radarChartComponentsRegistered = false;
 var RadarChart = function RadarChart(_0) {
-    var data = _0.data, title = _0.title, _0_width = _0.width, width = _0_width === void 0 ? 600 : _0_width, _0_height = _0.height, height = _0_height === void 0 ? 400 : _0_height, className = _0.className, classNamesProp = _0.classNames, toolbarExtra = _0.toolbarExtra, _0_renderFilterInToolbar = _0.renderFilterInToolbar, renderFilterInToolbar = _0_renderFilterInToolbar === void 0 ? false : _0_renderFilterInToolbar, dataTime = _0.dataTime, color = _0.color, statisticConfig = _0.statistic, _0_textMaxWidth = _0.textMaxWidth, textMaxWidth = _0_textMaxWidth === void 0 ? 80 : _0_textMaxWidth, _0_loading = _0.loading, loading = _0_loading === void 0 ? false : _0_loading, props = _object_without_properties(_0, [
+    var data = _0.data, title = _0.title, _0_width = _0.width, width = _0_width === void 0 ? 600 : _0_width, _0_height = _0.height, height = _0_height === void 0 ? 400 : _0_height, className = _0.className, classNamesProp = _0.classNames, toolbarExtra = _0.toolbarExtra, _0_renderFilterInToolbar = _0.renderFilterInToolbar, renderFilterInToolbar = _0_renderFilterInToolbar === void 0 ? false : _0_renderFilterInToolbar, dataTime = _0.dataTime, _0_theme = _0.theme, theme = _0_theme === void 0 ? 'light' : _0_theme, color = _0.color, statisticConfig = _0.statistic, _0_textMaxWidth = _0.textMaxWidth, textMaxWidth = _0_textMaxWidth === void 0 ? 80 : _0_textMaxWidth, _0_loading = _0.loading, loading = _0_loading === void 0 ? false : _0_loading, props = _object_without_properties(_0, [
         "data",
         "title",
         "width",
@@ -158,6 +159,7 @@ var RadarChart = function RadarChart(_0) {
         "toolbarExtra",
         "renderFilterInToolbar",
         "dataTime",
+        "theme",
         "color",
         "statistic",
         "textMaxWidth",
@@ -177,6 +179,8 @@ var RadarChart = function RadarChart(_0) {
     var getPrefixCls = useContext(ConfigProvider.ConfigContext).getPrefixCls;
     var prefixCls = getPrefixCls('radar-chart');
     var _useStyle = useStyle(prefixCls), wrapSSR = _useStyle.wrapSSR, hashId = _useStyle.hashId;
+    // 主题颜色 - 必须在所有条件返回之前调用
+    var _useChartTheme = useChartTheme(theme), axisTextColor = _useChartTheme.axisTextColor, gridColor = _useChartTheme.gridColor, isLight = _useChartTheme.isLight;
     // 处理 ChartStatistic 组件配置
     var statistics = useMemo(function() {
         if (!statisticConfig) return null;
@@ -269,7 +273,7 @@ var RadarChart = function RadarChart(_0) {
         var _props_styles;
         return wrapSSR(/*#__PURE__*/ React.createElement(ChartContainer, {
             baseClassName: classNames("".concat(prefixCls, "-container")),
-            theme: 'light',
+            theme: theme,
             className: classNames(classNamesObj === null || classNamesObj === void 0 ? void 0 : classNamesObj.root, hashId, className),
             isMobile: isMobile,
             variant: props.variant,
@@ -279,6 +283,7 @@ var RadarChart = function RadarChart(_0) {
             }, props.style, (_props_styles = props.styles) === null || _props_styles === void 0 ? void 0 : _props_styles.root)
         }, /*#__PURE__*/ React.createElement(ChartToolBar, {
             title: title || '雷达图',
+            theme: theme,
             onDownload: function onDownload() {},
             extra: toolbarExtra,
             dataTime: dataTime,
@@ -338,19 +343,14 @@ var RadarChart = function RadarChart(_0) {
             backgroundColor: hexToRgba(resolvedColor, 0.125),
             borderWidth: isMobile ? 1.5 : 2,
             pointBackgroundColor: resolvedColor,
-            pointBorderColor: '#fff',
-            pointBorderWidth: isMobile ? 1 : 2,
+            // 与折线图一致：浅色 1px 白边；暗色去掉白边，避免图例色块出现亮框
+            pointBorderColor: isLight ? '#fff' : resolvedColor,
+            pointBorderWidth: isLight ? 1 : 0,
             pointRadius: isMobile ? 3 : 4,
             pointHoverRadius: isMobile ? 5 : 6,
             fill: true
         };
     });
-    // 构建当前配置（用于主题等设置）
-    var currentConfig = {
-        theme: 'light',
-        showLegend: true,
-        legendPosition: 'right'
-    };
     // 筛选器的枚举，添加安全检查
     var filterEnum = categories.length > 0 ? categories.filter(function(category) {
         return Boolean(category);
@@ -382,8 +382,8 @@ var RadarChart = function RadarChart(_0) {
                 backgroundColor: "".concat(defaultColorList[0] || '#1677ff', "20"),
                 borderWidth: isMobile ? 1.5 : 2,
                 pointBackgroundColor: defaultColorList[0] || '#1677ff',
-                pointBorderColor: '#fff',
-                pointBorderWidth: isMobile ? 1 : 2,
+                pointBorderColor: isLight ? '#fff' : defaultColorList[0] || '#1677ff',
+                pointBorderWidth: isLight ? 1 : 0,
                 pointRadius: isMobile ? 3 : 4,
                 pointHoverRadius: isMobile ? 5 : 6,
                 fill: true
@@ -396,10 +396,10 @@ var RadarChart = function RadarChart(_0) {
         maintainAspectRatio: false,
         plugins: {
             legend: {
-                display: currentConfig.showLegend !== false,
-                position: isMobile ? 'bottom' : currentConfig.legendPosition || 'right',
+                display: true,
+                position: isMobile ? 'bottom' : 'right',
                 labels: {
-                    color: currentConfig.theme === 'light' ? '#767E8B' : '#fff',
+                    color: axisTextColor,
                     font: {
                         size: isMobile ? 10 : 12,
                         weight: 'normal'
@@ -488,10 +488,10 @@ var RadarChart = function RadarChart(_0) {
                     // 获取数据集颜色作为图标颜色
                     var iconColor = (dataPoint === null || dataPoint === void 0 ? void 0 : (_dataPoint_dataset1 = dataPoint.dataset) === null || _dataPoint_dataset1 === void 0 ? void 0 : (_dataPoint_dataset_borderColor = _dataPoint_dataset1.borderColor) === null || _dataPoint_dataset_borderColor === void 0 ? void 0 : _dataPoint_dataset_borderColor.toString()) || '#388BFF';
                     // 创建 HTML 内容
-                    var isDark = currentConfig.theme !== 'light';
+                    var isDark = !isLight;
                     var bgColor = isDark ? 'rgba(0, 0, 0, 0.8)' : 'rgba(255, 255, 255, 0.95)';
                     var labelColor = isDark ? '#fff' : '#767E8B'; // 左边图标信息颜色
-                    tooltipEl1.innerHTML = '\n             <div style="\n               background-color: '.concat(bgColor, ";\n               border: 1px solid ").concat(isDark ? 'rgba(255, 255, 255, 0.2)' : 'rgba(0, 16, 32, 0.0627)', ";\n               border-radius: ").concat(isMobile ? '6px' : '8px', ";\n               padding: ").concat(isMobile ? '8px 12px' : '12px 16px', ";\n               font-family: 'PingFang SC', sans-serif;\n               box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);\n               backdrop-filter: blur(10px);\n               display: flex;\n               flex-direction: column;\n               gap: 8px;\n               min-width: 120px;\n             \">\n               <div style=\"\n                 font-family: 'PingFang SC', sans-serif;\n                 font-size: 12px;\n                 font-weight: normal;\n                 line-height: 20px;\n                 text-align: center;\n                 letter-spacing: 0em;\n                 font-variation-settings: 'opsz' auto;\n                 color: #767E8B;\n                 display: flex;\n                 align-items: center;\n                 justify-content: space-between;\n               \">").concat(dimensionTitle, '</div>\n               <div style="\n                 display: flex;\n                 align-items: center;\n                 justify-content: space-between;\n                 gap: 20px;\n               ">\n                 <div style="\n                   display: flex;\n                   align-items: center;\n                   gap: 8px;\n                 ">\n                   <div style="\n                     width: 12px;\n                     height: 12px;\n                     background-color: ').concat(iconColor, ';\n                     border-radius: 2px;\n                     flex-shrink: 0;\n                   "></div>\n                   <span style="\n                     color: ').concat(labelColor, ";\n                     font-size: ").concat(isMobile ? '11px' : '12px', ";\n                     font-weight: 500;\n                     font-family: 'PingFang SC', sans-serif;\n                     white-space: nowrap;\n                   \">").concat(label, "</span>\n                 </div>\n                 <span style=\"\n                   font-family: Rubik, sans-serif;\n                   font-size: 13px;\n                   font-weight: 500;\n                   line-height: 13px;\n                   text-align: center;\n                   letter-spacing: 0.04em;\n                   font-variation-settings: 'opsz' auto;\n                   font-feature-settings: 'kern' on;\n                   color: #343A45;\n                   white-space: nowrap;\n                 \">").concat(value, "</span>\n               </div>\n             </div>\n           ");
+                    tooltipEl1.innerHTML = '\n             <div style="\n               background-color: '.concat(bgColor, ";\n               border: 1px solid ").concat(isDark ? 'rgba(255, 255, 255, 0.2)' : 'rgba(0, 16, 32, 0.0627)', ";\n               border-radius: ").concat(isMobile ? '6px' : '8px', ";\n               padding: ").concat(isMobile ? '8px 12px' : '12px 16px', ";\n               font-family: 'PingFang SC', sans-serif;\n               box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);\n               backdrop-filter: blur(10px);\n               display: flex;\n               flex-direction: column;\n               gap: 8px;\n               min-width: 120px;\n             \">\n               <div style=\"\n                 font-family: 'PingFang SC', sans-serif;\n                 font-size: 12px;\n                 font-weight: normal;\n                 line-height: 20px;\n                 text-align: center;\n                 letter-spacing: 0em;\n                 font-variation-settings: 'opsz' auto;\n                 color: #767E8B;\n                 display: flex;\n                 align-items: center;\n                 justify-content: space-between;\n               \">").concat(dimensionTitle, '</div>\n               <div style="\n                 display: flex;\n                 align-items: center;\n                 justify-content: space-between;\n                 gap: 20px;\n               ">\n                 <div style="\n                   display: flex;\n                   align-items: center;\n                   gap: 8px;\n                 ">\n                   <div style="\n                     width: 12px;\n                     height: 12px;\n                     background-color: ').concat(iconColor, ';\n                     border-radius: 2px;\n                     flex-shrink: 0;\n                   "></div>\n                   <span style="\n                     color: ').concat(labelColor, ";\n                     font-size: ").concat(isMobile ? '11px' : '12px', ";\n                     font-weight: 500;\n                     font-family: 'PingFang SC', sans-serif;\n                     white-space: nowrap;\n                   \">").concat(label, "</span>\n                 </div>\n                 <span style=\"\n                   font-family: Rubik, sans-serif;\n                   font-size: 13px;\n                   font-weight: 500;\n                   line-height: 13px;\n                   text-align: center;\n                   letter-spacing: 0.04em;\n                   font-variation-settings: 'opsz' auto;\n                   font-feature-settings: 'kern' on;\n                   color: ").concat(isDark ? '#F9FAFB' : '#343A45', ';\n                   white-space: nowrap;\n                 ">').concat(value, "</span>\n               </div>\n             </div>\n           ");
                     // 定位 tooltip
                     var position = chart.canvas.getBoundingClientRect();
                     tooltipEl1.style.opacity = '1';
@@ -508,7 +508,7 @@ var RadarChart = function RadarChart(_0) {
                 min: 0,
                 ticks: {
                     stepSize: isMobile ? 25 : 20,
-                    color: currentConfig.theme === 'light' ? 'rgba(0, 25, 61, 0.3255)' : '#fff',
+                    color: axisTextColor,
                     font: {
                         size: isMobile ? 8 : 10
                     },
@@ -519,15 +519,15 @@ var RadarChart = function RadarChart(_0) {
                     }
                 },
                 grid: {
-                    color: currentConfig.theme === 'light' ? 'rgba(0, 0, 0, 0.1)' : 'rgba(255, 255, 255, 0.2)',
+                    color: gridColor,
                     lineWidth: 1
                 },
                 angleLines: {
-                    color: currentConfig.theme === 'light' ? 'rgba(0, 0, 0, 0.1)' : 'rgba(255, 255, 255, 0.2)',
+                    color: gridColor,
                     lineWidth: 1
                 },
                 pointLabels: {
-                    color: currentConfig.theme === 'light' ? 'rgba(0, 25, 61, 0.3255)' : '#fff',
+                    color: axisTextColor,
                     font: {
                         size: isMobile ? 10 : 12,
                         weight: 500
@@ -559,7 +559,7 @@ var RadarChart = function RadarChart(_0) {
         var _props_styles1;
         return wrapSSR(/*#__PURE__*/ React.createElement(ChartContainer, {
             baseClassName: classNames("".concat(prefixCls, "-container")),
-            theme: currentConfig.theme,
+            theme: theme,
             className: classNames(classNamesObj === null || classNamesObj === void 0 ? void 0 : classNamesObj.root, hashId, className),
             isMobile: isMobile,
             variant: props.variant,
@@ -569,6 +569,7 @@ var RadarChart = function RadarChart(_0) {
             }, props.style, (_props_styles1 = props.styles) === null || _props_styles1 === void 0 ? void 0 : _props_styles1.root)
         }, /*#__PURE__*/ React.createElement(ChartToolBar, {
             title: title || '雷达图',
+            theme: theme,
             onDownload: handleDownload,
             extra: toolbarExtra,
             dataTime: dataTime,
@@ -582,7 +583,7 @@ var RadarChart = function RadarChart(_0) {
                 selectedCustomSelection: selectedFilterLabel,
                 onSelectionChange: setSelectedFilterLabel
             }), {
-                theme: currentConfig.theme,
+                theme: theme,
                 variant: "compact"
             })) : undefined
         }), !renderFilterInToolbar && filterEnum.length > 0 && /*#__PURE__*/ React.createElement(ChartFilter, _object_spread_props(_object_spread({
@@ -594,14 +595,14 @@ var RadarChart = function RadarChart(_0) {
             selectedCustomSelection: selectedFilterLabel,
             onSelectionChange: setSelectedFilterLabel
         }), {
-            theme: currentConfig.theme
+            theme: theme
         })), statistics && /*#__PURE__*/ React.createElement("div", {
             className: classNames("".concat(prefixCls, "-statistic-container"), hashId)
         }, statistics.map(function(config, index) {
             return /*#__PURE__*/ React.createElement(ChartStatistic, _object_spread_props(_object_spread({
                 key: index
             }, config), {
-                theme: currentConfig.theme
+                theme: theme
             }));
         })), /*#__PURE__*/ React.createElement("div", {
             className: classNames("".concat(prefixCls, "-chart-wrapper"), hashId)
@@ -615,7 +616,7 @@ var RadarChart = function RadarChart(_0) {
         console.error('RadarChart 渲染错误:', error);
         return wrapSSR(/*#__PURE__*/ React.createElement(ChartContainer, {
             baseClassName: classNames("".concat(prefixCls, "-container")),
-            theme: 'light',
+            theme: theme,
             className: classNames(classNamesObj === null || classNamesObj === void 0 ? void 0 : classNamesObj.root, hashId, className),
             isMobile: isMobile,
             variant: props.variant,
@@ -625,6 +626,7 @@ var RadarChart = function RadarChart(_0) {
             }, props.style, (_props_styles2 = props.styles) === null || _props_styles2 === void 0 ? void 0 : _props_styles2.root)
         }, /*#__PURE__*/ React.createElement(ChartToolBar, {
             title: title || '雷达图',
+            theme: theme,
             onDownload: function onDownload() {},
             extra: toolbarExtra,
             dataTime: dataTime,

package/dist/Plugins/chart/ScatterChart/index.d.ts

@@ -24,6 +24,8 @@ export interface ScatterChartProps extends ChartContainerProps {
     classNames?: ChartClassNames;
     /** 数据时间 */
     dataTime?: string;
+    /** 图表主题 */
+    theme?: 'dark' | 'light';
     /** 自定义主色（可选），支持 string 或 string[]；数组按序对应各数据序列 */
     color?: string | string[];
     /** 头部工具条额外按钮 */

package/dist/Plugins/chart/ScatterChart/index.js

@@ -144,11 +144,12 @@ import { Scatter } from "react-chartjs-2";
 import ChartStatistic from "../ChartStatistic";
 import { ChartContainer, ChartFilter, ChartToolBar, downloadChart } from "../components";
 import { defaultColorList } from "../const";
+import { useChartTheme } from "../hooks";
 import { hexToRgba, resolveCssVariable } from "../utils";
 import { useStyle } from "./style";
 var scatterChartComponentsRegistered = false;
 var ScatterChart = function ScatterChart(_0) {
-    var data = _0.data, _0_width = _0.width, width = _0_width === void 0 ? 600 : _0_width, _0_height = _0.height, height = _0_height === void 0 ? 400 : _0_height, className = _0.className, classNamesProp = _0.classNames, title = _0.title, toolbarExtra = _0.toolbarExtra, _0_renderFilterInToolbar = _0.renderFilterInToolbar, renderFilterInToolbar = _0_renderFilterInToolbar === void 0 ? false : _0_renderFilterInToolbar, dataTime = _0.dataTime, _0_xUnit = _0.xUnit, xUnit = _0_xUnit === void 0 ? '月' : _0_xUnit, yUnit = _0.yUnit, xAxisLabel = _0.xAxisLabel, yAxisLabel = _0.yAxisLabel, _0_xPosition = _0.xPosition, xPosition = _0_xPosition === void 0 ? 'bottom' : _0_xPosition, _0_yPosition = _0.yPosition, yPosition = _0_yPosition === void 0 ? 'left' : _0_yPosition, _0_hiddenX = _0.hiddenX, hiddenX = _0_hiddenX === void 0 ? false : _0_hiddenX, _0_hiddenY = _0.hiddenY, hiddenY = _0_hiddenY === void 0 ? false : _0_hiddenY, _0_showGrid = _0.showGrid, showGrid = _0_showGrid === void 0 ? true : _0_showGrid, color = _0.color, statisticConfig = _0.statistic, _0_textMaxWidth = _0.textMaxWidth, textMaxWidth = _0_textMaxWidth === void 0 ? 80 : _0_textMaxWidth, _0_loading = _0.loading, loading = _0_loading === void 0 ? false : _0_loading, props = _object_without_properties(_0, [
+    var data = _0.data, _0_width = _0.width, width = _0_width === void 0 ? 600 : _0_width, _0_height = _0.height, height = _0_height === void 0 ? 400 : _0_height, className = _0.className, classNamesProp = _0.classNames, title = _0.title, toolbarExtra = _0.toolbarExtra, _0_renderFilterInToolbar = _0.renderFilterInToolbar, renderFilterInToolbar = _0_renderFilterInToolbar === void 0 ? false : _0_renderFilterInToolbar, dataTime = _0.dataTime, _0_xUnit = _0.xUnit, xUnit = _0_xUnit === void 0 ? '月' : _0_xUnit, yUnit = _0.yUnit, xAxisLabel = _0.xAxisLabel, yAxisLabel = _0.yAxisLabel, _0_xPosition = _0.xPosition, xPosition = _0_xPosition === void 0 ? 'bottom' : _0_xPosition, _0_yPosition = _0.yPosition, yPosition = _0_yPosition === void 0 ? 'left' : _0_yPosition, _0_hiddenX = _0.hiddenX, hiddenX = _0_hiddenX === void 0 ? false : _0_hiddenX, _0_hiddenY = _0.hiddenY, hiddenY = _0_hiddenY === void 0 ? false : _0_hiddenY, _0_showGrid = _0.showGrid, showGrid = _0_showGrid === void 0 ? true : _0_showGrid, _0_theme = _0.theme, theme = _0_theme === void 0 ? 'light' : _0_theme, color = _0.color, statisticConfig = _0.statistic, _0_textMaxWidth = _0.textMaxWidth, textMaxWidth = _0_textMaxWidth === void 0 ? 80 : _0_textMaxWidth, _0_loading = _0.loading, loading = _0_loading === void 0 ? false : _0_loading, props = _object_without_properties(_0, [
         "data",
         "width",
         "height",
@@ -167,6 +168,7 @@ var ScatterChart = function ScatterChart(_0) {
         "hiddenX",
         "hiddenY",
         "showGrid",
+        "theme",
         "color",
         "statistic",
         "textMaxWidth",
@@ -186,6 +188,8 @@ var ScatterChart = function ScatterChart(_0) {
     var getPrefixCls = useContext(ConfigProvider.ConfigContext).getPrefixCls;
     var prefixCls = getPrefixCls('scatter-chart');
     var _useStyle = useStyle(prefixCls), wrapSSR = _useStyle.wrapSSR, hashId = _useStyle.hashId;
+    // 主题颜色 - 必须在所有条件返回之前调用
+    var _useChartTheme = useChartTheme(theme), axisTextColor = _useChartTheme.axisTextColor, gridColor = _useChartTheme.gridColor, isLight = _useChartTheme.isLight;
     // 处理 ChartStatistic 组件配置
     var statistics = useMemo(function() {
         if (!statisticConfig) return null;
@@ -273,7 +277,7 @@ var ScatterChart = function ScatterChart(_0) {
         var _props_styles;
         return wrapSSR(/*#__PURE__*/ React.createElement(ChartContainer, {
             baseClassName: classNames("".concat(prefixCls, "-container")),
-            theme: 'light',
+            theme: theme,
             className: classNames(classNamesObj === null || classNamesObj === void 0 ? void 0 : classNamesObj.root, hashId, className),
             isMobile: isMobile,
             variant: props.variant,
@@ -283,6 +287,7 @@ var ScatterChart = function ScatterChart(_0) {
             }, props.style, (_props_styles = props.styles) === null || _props_styles === void 0 ? void 0 : _props_styles.root)
         }, /*#__PURE__*/ React.createElement(ChartToolBar, {
             title: title || '散点图',
+            theme: theme,
             onDownload: function onDownload() {},
             extra: toolbarExtra,
             dataTime: dataTime,
@@ -358,12 +363,6 @@ var ScatterChart = function ScatterChart(_0) {
             pointHoverRadius: isMobile ? 6 : 8
         };
     });
-    // 构建当前配置（应用默认值）
-    var currentConfig = {
-        theme: 'light',
-        showLegend: true,
-        legendPosition: 'bottom'
-    };
     // 筛选器的枚举，添加安全检查
     var filterEnum = categories.length > 0 ? categories.filter(function(category) {
         return Boolean(category);
@@ -404,11 +403,11 @@ var ScatterChart = function ScatterChart(_0) {
         maintainAspectRatio: false,
         plugins: {
             legend: {
-                display: currentConfig.showLegend !== false,
-                position: isMobile ? 'bottom' : currentConfig.legendPosition || 'bottom',
+                display: true,
+                position: isMobile ? 'bottom' : 'bottom',
                 align: 'start',
                 labels: {
-                    color: currentConfig.theme === 'light' ? '#767E8B' : '#fff',
+                    color: axisTextColor,
                     font: {
                         size: isMobile ? 10 : 12,
                         weight: 'normal'
@@ -418,18 +417,32 @@ var ScatterChart = function ScatterChart(_0) {
                     pointStyle: 'rectRounded',
                     generateLabels: function generateLabels(chart) {
                         var original = ChartJS.defaults.plugins.legend.labels.generateLabels(chart);
+                        // 与折线图图例一致：实心色块 + 浅色 1px 白边；散点数据点仍为半透明，仅图例拉齐
+                        var withLineLikeSwatch = function withLineLikeSwatch(label) {
+                            var _label_datasetIndex;
+                            var _chart_data_datasets, _chart_data;
+                            var idx = (_label_datasetIndex = label.datasetIndex) !== null && _label_datasetIndex !== void 0 ? _label_datasetIndex : 0;
+                            var ds = (_chart_data = chart.data) === null || _chart_data === void 0 ? void 0 : (_chart_data_datasets = _chart_data.datasets) === null || _chart_data_datasets === void 0 ? void 0 : _chart_data_datasets[idx];
+                            var seriesColor = typeof (ds === null || ds === void 0 ? void 0 : ds.borderColor) === 'string' && ds.borderColor ? ds.borderColor : defaultColorList[0] || '#1677ff';
+                            return _object_spread_props(_object_spread({}, label), {
+                                fillStyle: seriesColor,
+                                strokeStyle: isLight ? '#fff' : seriesColor,
+                                lineWidth: isLight ? 1 : 0
+                            });
+                        };
                         // 创建一个临时 canvas 来测量文字宽度
                         var canvas = document.createElement('canvas');
                         var ctx = canvas.getContext('2d');
-                        if (!ctx) return original;
+                        if (!ctx) return original.map(withLineLikeSwatch);
                         // 设置字体样式与图例相同
                         var fontSize = isMobile ? 10 : 12;
                         ctx.font = "".concat(fontSize, "px 'PingFang SC', sans-serif");
                         return original.map(function(label) {
-                            var originalText = label.text;
+                            var labelAligned = withLineLikeSwatch(label);
+                            var originalText = labelAligned.text;
                             var textWidth = ctx.measureText(originalText).width;
                             if (textWidth <= textMaxWidth) {
-                                return label;
+                                return labelAligned;
                             }
                             // 文字超过最大宽度，需要截断
                             var ellipsis = '...';
@@ -442,7 +455,7 @@ var ScatterChart = function ScatterChart(_0) {
                                 truncatedText = truncatedText.slice(0, -1);
                                 truncatedWidth = ctx.measureText(truncatedText).width;
                             }
-                            return _object_spread_props(_object_spread({}, label), {
+                            return _object_spread_props(_object_spread({}, labelAligned), {
                                 text: truncatedText + ellipsis
                             });
                         });
@@ -506,10 +519,10 @@ var ScatterChart = function ScatterChart(_0) {
                     // 获取数据集颜色作为图标颜色
                     var iconColor = (dataPoint === null || dataPoint === void 0 ? void 0 : (_dataPoint_dataset1 = dataPoint.dataset) === null || _dataPoint_dataset1 === void 0 ? void 0 : (_dataPoint_dataset_borderColor = _dataPoint_dataset1.borderColor) === null || _dataPoint_dataset_borderColor === void 0 ? void 0 : _dataPoint_dataset_borderColor.toString()) || '#917EF7';
                     // 创建 HTML 内容
-                    var isDark = currentConfig.theme !== 'light';
+                    var isDark = !isLight;
                     var bgColor = isDark ? 'rgba(0, 0, 0, 0.8)' : 'rgba(255, 255, 255, 0.95)';
                     var labelColor = isDark ? '#fff' : '#767E8B'; // 左边图标信息颜色
-                    tooltipEl1.innerHTML = '\n            <div style="\n              background-color: '.concat(bgColor, ";\n              border: 1px solid ").concat(isDark ? 'rgba(255, 255, 255, 0.2)' : 'rgba(0, 16, 32, 0.0627)', ";\n              border-radius: ").concat(isMobile ? '6px' : '8px', ";\n              padding: ").concat(isMobile ? '8px 12px' : '12px 16px', ";\n              font-family: 'PingFang SC', sans-serif;\n              box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);\n              backdrop-filter: blur(10px);\n              display: flex;\n              flex-direction: column;\n              gap: 8px;\n              min-width: 120px;\n            \">\n              <div style=\"\n                font-family: 'PingFang SC', sans-serif;\n                font-size: 12px;\n                font-weight: normal;\n                line-height: 20px;\n                text-align: center;\n                letter-spacing: 0em;\n                font-variation-settings: 'opsz' auto;\n                color: #767E8B;\n                display: flex;\n                align-items: center;\n                justify-content: space-between;\n              \">").concat(dimensionTitle, '</div>\n              <div style="\n                display: flex;\n                align-items: center;\n                justify-content: space-between;\n                gap: 20px;\n              ">\n                <div style="\n                  display: flex;\n                  align-items: center;\n                  gap: 8px;\n                ">\n                  <div style="\n                    width: 12px;\n                    height: 12px;\n                    background-color: ').concat(iconColor, ';\n                    border-radius: 2px;\n                    flex-shrink: 0;\n                  "></div>\n                  <span style="\n                    color: ').concat(labelColor, ";\n                    font-size: ").concat(isMobile ? '11px' : '12px', ";\n                    font-weight: 500;\n                    font-family: 'PingFang SC', sans-serif;\n                    white-space: nowrap;\n                  \">").concat(label, "</span>\n                </div>\n                <span style=\"\n                  font-family: Rubik, sans-serif;\n                  font-size: 13px;\n                  font-weight: 500;\n                  line-height: 13px;\n                  text-align: center;\n                  letter-spacing: 0.04em;\n                  font-variation-settings: 'opsz' auto;\n                  font-feature-settings: 'kern' on;\n                  color: #343A45;\n                  white-space: nowrap;\n                \">").concat(coordinates, "</span>\n              </div>\n            </div>\n          ");
+                    tooltipEl1.innerHTML = '\n            <div style="\n              background-color: '.concat(bgColor, ";\n              border: 1px solid ").concat(isDark ? 'rgba(255, 255, 255, 0.2)' : 'rgba(0, 16, 32, 0.0627)', ";\n              border-radius: ").concat(isMobile ? '6px' : '8px', ";\n              padding: ").concat(isMobile ? '8px 12px' : '12px 16px', ";\n              font-family: 'PingFang SC', sans-serif;\n              box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);\n              backdrop-filter: blur(10px);\n              display: flex;\n              flex-direction: column;\n              gap: 8px;\n              min-width: 120px;\n            \">\n              <div style=\"\n                font-family: 'PingFang SC', sans-serif;\n                font-size: 12px;\n                font-weight: normal;\n                line-height: 20px;\n                text-align: center;\n                letter-spacing: 0em;\n                font-variation-settings: 'opsz' auto;\n                color: #767E8B;\n                display: flex;\n                align-items: center;\n                justify-content: space-between;\n              \">").concat(dimensionTitle, '</div>\n              <div style="\n                display: flex;\n                align-items: center;\n                justify-content: space-between;\n                gap: 20px;\n              ">\n                <div style="\n                  display: flex;\n                  align-items: center;\n                  gap: 8px;\n                ">\n                  <div style="\n                    width: 12px;\n                    height: 12px;\n                    background-color: ').concat(iconColor, ';\n                    border-radius: 2px;\n                    flex-shrink: 0;\n                  "></div>\n                  <span style="\n                    color: ').concat(labelColor, ";\n                    font-size: ").concat(isMobile ? '11px' : '12px', ";\n                    font-weight: 500;\n                    font-family: 'PingFang SC', sans-serif;\n                    white-space: nowrap;\n                  \">").concat(label, "</span>\n                </div>\n                <span style=\"\n                  font-family: Rubik, sans-serif;\n                  font-size: 13px;\n                  font-weight: 500;\n                  line-height: 13px;\n                  text-align: center;\n                  letter-spacing: 0.04em;\n                  font-variation-settings: 'opsz' auto;\n                  font-feature-settings: 'kern' on;\n                  color: ").concat(isDark ? '#F9FAFB' : '#343A45', ';\n                  white-space: nowrap;\n                ">').concat(coordinates, "</span>\n              </div>\n            </div>\n          ");
                     // 定位 tooltip
                     var position = chart.canvas.getBoundingClientRect();
                     tooltipEl1.style.opacity = '1';
@@ -527,7 +540,7 @@ var ScatterChart = function ScatterChart(_0) {
                 title: {
                     display: !!xAxisLabel,
                     text: xAxisLabel || '',
-                    color: currentConfig.theme === 'light' ? 'rgba(0, 25, 61, 0.3255)' : '#fff',
+                    color: axisTextColor,
                     font: {
                         size: isMobile ? 10 : 12,
                         weight: 500
@@ -537,7 +550,7 @@ var ScatterChart = function ScatterChart(_0) {
                 max: 12,
                 ticks: {
                     stepSize: 1,
-                    color: currentConfig.theme === 'light' ? 'rgba(0, 25, 61, 0.3255)' : '#fff',
+                    color: axisTextColor,
                     font: {
                         size: isMobile ? 8 : 10
                     },
@@ -547,7 +560,7 @@ var ScatterChart = function ScatterChart(_0) {
                 },
                 grid: {
                     display: showGrid,
-                    color: 'rgba(0, 16, 32, 0.0627)',
+                    color: gridColor,
                     lineWidth: 1
                 }
             },
@@ -558,7 +571,7 @@ var ScatterChart = function ScatterChart(_0) {
                 title: {
                     display: !!yAxisLabel,
                     text: yAxisLabel || '',
-                    color: currentConfig.theme === 'light' ? 'rgba(0, 25, 61, 0.3255)' : '#fff',
+                    color: axisTextColor,
                     font: {
                         family: 'PingFang SC',
                         size: isMobile ? 10 : 12,
@@ -570,7 +583,7 @@ var ScatterChart = function ScatterChart(_0) {
                 max: 100,
                 ticks: {
                     stepSize: 10,
-                    color: currentConfig.theme === 'light' ? 'rgba(0, 25, 61, 0.3255)' : '#fff',
+                    color: axisTextColor,
                     font: {
                         family: 'PingFang SC',
                         size: isMobile ? 8 : 12,
@@ -582,7 +595,7 @@ var ScatterChart = function ScatterChart(_0) {
                 },
                 grid: {
                     display: showGrid,
-                    color: 'rgba(0, 16, 32, 0.0627)',
+                    color: gridColor,
                     lineWidth: 1
                 }
             }
@@ -610,7 +623,7 @@ var ScatterChart = function ScatterChart(_0) {
         var _props_styles1, _props_styles2, _props_styles3;
         return wrapSSR(/*#__PURE__*/ React.createElement(ChartContainer, {
             baseClassName: classNames("".concat(prefixCls, "-container")),
-            theme: currentConfig.theme,
+            theme: theme,
             className: classNames(classNamesObj === null || classNamesObj === void 0 ? void 0 : classNamesObj.root, hashId, className),
             isMobile: isMobile,
             variant: props.variant,
@@ -620,6 +633,7 @@ var ScatterChart = function ScatterChart(_0) {
             }, props.style, (_props_styles1 = props.styles) === null || _props_styles1 === void 0 ? void 0 : _props_styles1.root)
         }, /*#__PURE__*/ React.createElement(ChartToolBar, {
             title: title || '散点图',
+            theme: theme,
             onDownload: handleDownload,
             extra: toolbarExtra,
             dataTime: dataTime,
@@ -633,7 +647,7 @@ var ScatterChart = function ScatterChart(_0) {
                 selectedCustomSelection: selectedFilterLabel,
                 onSelectionChange: setSelectedFilterLabel
             }), {
-                theme: currentConfig.theme,
+                theme: theme,
                 variant: "compact"
             })) : undefined
         }), !renderFilterInToolbar && filterEnum.length > 0 && /*#__PURE__*/ React.createElement(ChartFilter, _object_spread_props(_object_spread({
@@ -645,7 +659,7 @@ var ScatterChart = function ScatterChart(_0) {
             selectedCustomSelection: selectedFilterLabel,
             onSelectionChange: setSelectedFilterLabel
         }), {
-            theme: currentConfig.theme
+            theme: theme
         })), statistics && /*#__PURE__*/ React.createElement("div", {
             className: classNames(classNamesObj === null || classNamesObj === void 0 ? void 0 : classNamesObj.statisticContainer, "".concat(prefixCls, "-statistic-container")),
             style: (_props_styles2 = props.styles) === null || _props_styles2 === void 0 ? void 0 : _props_styles2.statisticContainer
@@ -653,7 +667,7 @@ var ScatterChart = function ScatterChart(_0) {
             return /*#__PURE__*/ React.createElement(ChartStatistic, _object_spread_props(_object_spread({
                 key: index
             }, config), {
-                theme: currentConfig.theme
+                theme: theme
             }));
         })), /*#__PURE__*/ React.createElement("div", {
             className: classNames(classNamesObj === null || classNamesObj === void 0 ? void 0 : classNamesObj.wrapper, "".concat(prefixCls, "-chart-wrapper")),
@@ -670,7 +684,7 @@ var ScatterChart = function ScatterChart(_0) {
         console.error('ScatterChart 渲染错误:', error);
         return wrapSSR(/*#__PURE__*/ React.createElement(ChartContainer, {
             baseClassName: classNames("".concat(prefixCls, "-container")),
-            theme: 'light',
+            theme: theme,
             isMobile: isMobile,
             className: classNames(hashId, className),
             variant: props.variant,
@@ -680,6 +694,7 @@ var ScatterChart = function ScatterChart(_0) {
             }, props.style, (_props_styles4 = props.styles) === null || _props_styles4 === void 0 ? void 0 : _props_styles4.root)
         }, /*#__PURE__*/ React.createElement(ChartToolBar, {
             title: title || '散点图',
+            theme: theme,
             onDownload: function onDownload() {},
             extra: toolbarExtra,
             dataTime: dataTime,

package/dist/Plugins/chart/components/ChartContainer/ChartContainer.d.ts

@@ -97,6 +97,7 @@ export interface ChartContainerRef {
  * - 统一的样式管理
  * - 内置错误边界保护，防止图表错误影响整个应用
  * - 错误边界默认启用，可通过配置禁用或自定义
+ * - `theme="dark"` 时在本容器内嵌套 Ant Design 暗色算法，工具栏/筛选等 antd 控件与画布暗色一致（嵌套容器不重复包裹）
  */
 declare const ChartContainer: React.FC<ChartContainerProps & {
     baseClassName: string;