@hsu-react/ui 0.0.11 → 0.0.13

package/es/components/Chart/Bar/Bar3DOpt.d.ts

@@ -1,11 +1,22 @@
 import * as echarts from "echarts";
 import { ChartOptionType } from "..";
+export interface Bar3DSeriesOptions {
+    /** 同组 3D 柱系列总数（图例隐藏的不计入），用于整组相对类目刻度居中，默认 1 */
+    seriesCount?: number;
+    /** 当前系列在同组内的序号（图例隐藏的不占位），默认取 params.seriesIndex */
+    seriesOrder?: number;
+    /** 堆叠模式：同一类目上各系列纵向叠放（共用同一根柱） */
+    stack?: boolean;
+    /** 堆叠基底：每个数据点下方已累计的值，由调用方按可见系列累加 */
+    stackBase?: number[];
+}
 /**
  * 3D柱状图series生成
  * @param _colors 颜色
  * @param barGap 柱间距，必须大于等于柱宽
  * @param barWidth 柱宽
+ * @param options 分组居中 / 堆叠配置
  * @returns
  */
-declare const bar3DSeries: (_colors: echarts.Color, barGap?: number, barWidth?: number) => echarts.SeriesOption & ChartOptionType;
+declare const bar3DSeries: (_colors: echarts.Color, barGap?: number, barWidth?: number, options?: Bar3DSeriesOptions) => echarts.SeriesOption & ChartOptionType;
 export default bar3DSeries;

package/es/components/Chart/Bar/Bar3DOpt.js

@@ -83,22 +83,37 @@ var CubeTop = echarts.graphic.extendShape({
 echarts.graphic.registerShape("CubeFront", CubeFront);
 echarts.graphic.registerShape("CubeRight", CubeRight);
 echarts.graphic.registerShape("CubeTop", CubeTop);
-
 /**
  * 3D柱状图series生成
  * @param _colors 颜色
  * @param barGap 柱间距，必须大于等于柱宽
  * @param barWidth 柱宽
+ * @param options 分组居中 / 堆叠配置
  * @returns
  */
 var bar3DSeries = function bar3DSeries(_colors) {
   var barGap = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 25;
   var barWidth = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 20;
+  var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
+  var _options$seriesCount = options.seriesCount,
+    seriesCount = _options$seriesCount === void 0 ? 1 : _options$seriesCount,
+    seriesOrder = options.seriesOrder,
+    _options$stack = options.stack,
+    stack = _options$stack === void 0 ? false : _options$stack,
+    stackBase = options.stackBase;
+  // 单根柱的视觉足迹为 [x - barWidth, x + depthOffset]（depthOffset 为 3D 深度）
+  var depthOffset = barWidth * 8 / 20;
+  // 整组（堆叠时只有一根柱）相对类目刻度的居中补偿
+  var groupSpan = stack ? 0 : Math.max(0, seriesCount - 1) * barGap;
+  var centerOffset = (barWidth - depthOffset - groupSpan) / 2;
   var series = {
     type: "custom",
     renderItem: function renderItem(params, api) {
+      var _stackBase$dataIndex;
       var _params$seriesIndex = params.seriesIndex,
-        seriesIndex = _params$seriesIndex === void 0 ? 0 : _params$seriesIndex;
+        seriesIndex = _params$seriesIndex === void 0 ? 0 : _params$seriesIndex,
+        _params$dataIndex = params.dataIndex,
+        dataIndex = _params$dataIndex === void 0 ? 0 : _params$dataIndex;
       var cubeLeftStyle = _colors !== null && _colors !== void 0 ? _colors : new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
         offset: 0,
         color: colors[0]
@@ -123,14 +138,19 @@ var bar3DSeries = function bar3DSeries(_colors) {
       var _ref = [api.value(0), api.value(1)],
         value0 = _ref[0],
         value1 = _ref[1];
-      var location = api.coord([value0, value1]);
-      var xAxisTranslation = seriesIndex * barGap;
       if (value1 === 0) {
         return {
           type: "group",
           children: []
         };
       }
+
+      // 堆叠时从基底（下方各系列累计值）画到基底+自身值；非堆叠从 0 画起
+      var stackBottom = stack ? (_stackBase$dataIndex = stackBase === null || stackBase === void 0 ? void 0 : stackBase[dataIndex]) !== null && _stackBase$dataIndex !== void 0 ? _stackBase$dataIndex : 0 : 0;
+      var location = api.coord([value0, stackBottom + Number(value1)]);
+      var bottomPoint = api.coord([value0, stackBottom]);
+      var order = seriesOrder !== null && seriesOrder !== void 0 ? seriesOrder : seriesIndex;
+      var xAxisTranslation = (stack ? 0 : order * barGap) + centerOffset;
       return {
         type: "group",
         children: [{
@@ -141,7 +161,7 @@ var bar3DSeries = function bar3DSeries(_colors) {
             yValue: value1,
             x: location[0],
             y: location[1],
-            xAxisPoint: api.coord([value0, 0]),
+            xAxisPoint: bottomPoint,
             xAxisTranslation: xAxisTranslation,
             barWidth: barWidth
           },
@@ -156,7 +176,7 @@ var bar3DSeries = function bar3DSeries(_colors) {
             yValue: value1,
             x: location[0],
             y: location[1],
-            xAxisPoint: api.coord([value0, 0]),
+            xAxisPoint: bottomPoint,
             xAxisTranslation: xAxisTranslation,
             barWidth: barWidth
           },
@@ -171,7 +191,7 @@ var bar3DSeries = function bar3DSeries(_colors) {
             yValue: value1,
             x: location[0],
             y: location[1],
-            xAxisPoint: api.coord([value0, 0]),
+            xAxisPoint: bottomPoint,
             xAxisTranslation: xAxisTranslation,
             barWidth: barWidth
           },

package/es/components/Chart/chartUtils/chartTooltipFormatter.js

@@ -24,8 +24,16 @@ var chartTooltipFormatter = function chartTooltipFormatter(props) {
     var item = params[0];
     return "\n      <div style=\"margin: 0;line-height:1;\">\n        <div style=\"margin: 0;line-height:1;\">\n          ".concat(hideMarker ? "" : "".concat(item === null || item === void 0 ? void 0 : item.marker), "\n          <span style=\"font-size:").concat(textStyle === null || textStyle === void 0 ? void 0 : textStyle.fontSize, "px;color:").concat(textStyle === null || textStyle === void 0 ? void 0 : textStyle.color, ";font-weight:").concat(textStyle === null || textStyle === void 0 ? void 0 : textStyle.fontWeight, ";margin-left:2px\">").concat(item === null || item === void 0 ? void 0 : item.name, "</span>\n          <span style=\"float:right;margin-left:20px;font-size:").concat(textStyle === null || textStyle === void 0 ? void 0 : textStyle.fontSize, "px;color:").concat(textStyle === null || textStyle === void 0 ? void 0 : textStyle.color, ";font-weight:").concat(textStyle === null || textStyle === void 0 ? void 0 : textStyle.fontWeight, "\">").concat(item === null || item === void 0 ? void 0 : item.value).concat(unit ? " ".concat(unit) : "", "</span>\n          <div style=\"clear:both\"></div>\n        </div>\n        <div style=\"clear:both\"></div>\n      </div>\n    ");
   }
+
+  // value 可能是数值、拼了单位的字符串("123次")或带千分位("1,234"），排序前统一还原成数值
+  var toSortValue = function toSortValue(v) {
+    if (typeof v === "number") return v;
+    if (Array.isArray(v)) return toSortValue(v[v.length - 1]);
+    var n = parseFloat(String(v !== null && v !== void 0 ? v : "").replace(/,/g, ""));
+    return Number.isNaN(n) ? 0 : n;
+  };
   var sortedParams = sortDescending ? _toConsumableArray(params).sort(function (a, b) {
-    return (Number(b.value) || 0) - (Number(a.value) || 0);
+    return toSortValue(b.value) - toSortValue(a.value);
   }) : params;
   var items = sortedParams === null || sortedParams === void 0 ? void 0 : sortedParams.map(function (item, idx) {
     var _item$value;

package/es/components/Panel/ListPanel/ListModalPanel/index.d.ts

@@ -13,6 +13,8 @@ interface TableTools {
     columnMgt?: IColumnMgt;
 }
 export interface ListModalPanelTabelProps extends Omit<TableProps, "title"> {
+    /** 透传给内部 Table 的 key，用于在异构列集切换时强制重挂载表格 */
+    key?: React.Key;
     title?: string;
     buttonGroup?: ButtonProps[];
     tabBarProps?: TabBarProps;

package/es/components/Panel/ListPanel/ListModalPanel/index.js

@@ -1,6 +1,6 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 var _excluded = ["modalClassName", "className", "searchProps", "searchMode", "tableProps", "hasPermi", "extraContent"],
-  _excluded2 = ["title", "buttonGroup", "className", "columns", "tabBarProps", "tableTools", "tableContainerClassName", "tips", "otherTool"];
+  _excluded2 = ["title", "buttonGroup", "className", "columns", "tabBarProps", "tableTools", "tableContainerClassName", "tips", "otherTool", "key"];
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
@@ -54,6 +54,7 @@ var ListModalPanel = function ListModalPanel(props) {
     tableContainerClassName = tableProps.tableContainerClassName,
     tips = tableProps.tips,
     otherTool = tableProps.otherTool,
+    tableInstanceKey = tableProps.key,
     tableConfig = _objectWithoutProperties(tableProps, _excluded2);
   var columnMgt = tableTools.columnMgt;
   var _usePermissions = usePermissions(hasPermi),
@@ -70,6 +71,12 @@ var ListModalPanel = function ListModalPanel(props) {
     _useState6 = _slicedToArray(_useState5, 2),
     isFullscreen = _useState6[0],
     setIsFullscreen = _useState6[1];
+  // 弹窗打开动画是否已完成：Search 的列数/展开等 DOM 测量要等弹窗完全展开
+  // 才能取到准确尺寸（zoom 动画只变 transform，不触发 ResizeObserver）
+  var _useState7 = useState(false),
+    _useState8 = _slicedToArray(_useState7, 2),
+    modalReady = _useState8[0],
+    setModalReady = _useState8[1];
   useEffect(function () {
     if (modalConfig.open) {
       setIsFullscreen(false);
@@ -133,6 +140,11 @@ var ListModalPanel = function ListModalPanel(props) {
   }
   return /*#__PURE__*/_jsxs(_Fragment, {
     children: [/*#__PURE__*/_jsx(Modal, _objectSpread(_objectSpread(_objectSpread({}, modalConfig), {}, {
+      afterOpenChange: function afterOpenChange(open) {
+        var _modalConfig$afterOpe;
+        setModalReady(open);
+        (_modalConfig$afterOpe = modalConfig.afterOpenChange) === null || _modalConfig$afterOpe === void 0 || _modalConfig$afterOpe.call(modalConfig, open);
+      },
       width: isFullscreen ? "100vw" : (_modalConfig$width = modalConfig.width) !== null && _modalConfig$width !== void 0 ? _modalConfig$width : 1400
     }, isFullscreen ? {
       full: true
@@ -150,7 +162,9 @@ var ListModalPanel = function ListModalPanel(props) {
       }].concat(_toConsumableArray((_modalConfig$titleBut = modalConfig.titleButtonGroup) !== null && _modalConfig$titleBut !== void 0 ? _modalConfig$titleBut : [])),
       children: /*#__PURE__*/_jsxs("div", {
         className: classNames(styles.ListModalPanel, className),
-        children: [extraContent, SearchComponent, /*#__PURE__*/_jsxs("div", {
+        children: [extraContent, /*#__PURE__*/React.cloneElement(SearchComponent, {
+          key: modalReady ? "modal-ready" : "modal-pending"
+        }), /*#__PURE__*/_jsxs("div", {
           className: classNames(styles.tableContainer, tableContainerClassName),
           children: [/*#__PURE__*/_jsx(ToolBar, {
             columns: columns,
@@ -170,7 +184,7 @@ var ListModalPanel = function ListModalPanel(props) {
             fillPanel: true
           }, tableConfig), {}, {
             columns: _columns
-          })))]
+          })), tableInstanceKey)]
         })]
       })
     })), /*#__PURE__*/_jsx(ColumnMgt, _objectSpread({

package/es/styles/antd-overload.scss

@@ -130,4 +130,7 @@
       }
     }
   }
-}
+}
+.ant-modal-mask {
+  pointer-events: auto !important;
+}

package/lib/components/Chart/Bar/Bar3DOpt.d.ts

@@ -1,11 +1,22 @@
 import * as echarts from "echarts";
 import { ChartOptionType } from "..";
+export interface Bar3DSeriesOptions {
+    /** 同组 3D 柱系列总数（图例隐藏的不计入），用于整组相对类目刻度居中，默认 1 */
+    seriesCount?: number;
+    /** 当前系列在同组内的序号（图例隐藏的不占位），默认取 params.seriesIndex */
+    seriesOrder?: number;
+    /** 堆叠模式：同一类目上各系列纵向叠放（共用同一根柱） */
+    stack?: boolean;
+    /** 堆叠基底：每个数据点下方已累计的值，由调用方按可见系列累加 */
+    stackBase?: number[];
+}
 /**
  * 3D柱状图series生成
  * @param _colors 颜色
  * @param barGap 柱间距，必须大于等于柱宽
  * @param barWidth 柱宽
+ * @param options 分组居中 / 堆叠配置
  * @returns
  */
-declare const bar3DSeries: (_colors: echarts.Color, barGap?: number, barWidth?: number) => echarts.SeriesOption & ChartOptionType;
+declare const bar3DSeries: (_colors: echarts.Color, barGap?: number, barWidth?: number, options?: Bar3DSeriesOptions) => echarts.SeriesOption & ChartOptionType;
 export default bar3DSeries;

package/lib/components/Chart/Bar/Bar3DOpt.js

@@ -91,20 +91,32 @@ const CubeTop = echarts.graphic.extendShape({
 echarts.graphic.registerShape("CubeFront", CubeFront);
 echarts.graphic.registerShape("CubeRight", CubeRight);
 echarts.graphic.registerShape("CubeTop", CubeTop);
-
 /**
  * 3D柱状图series生成
  * @param _colors 颜色
  * @param barGap 柱间距，必须大于等于柱宽
  * @param barWidth 柱宽
+ * @param options 分组居中 / 堆叠配置
  * @returns
  */
-const bar3DSeries = (_colors, barGap = 25, barWidth = 20) => {
+const bar3DSeries = (_colors, barGap = 25, barWidth = 20, options = {}) => {
+  const {
+    seriesCount = 1,
+    seriesOrder,
+    stack = false,
+    stackBase
+  } = options;
+  // 单根柱的视觉足迹为 [x - barWidth, x + depthOffset]（depthOffset 为 3D 深度）
+  const depthOffset = barWidth * 8 / 20;
+  // 整组（堆叠时只有一根柱）相对类目刻度的居中补偿
+  const groupSpan = stack ? 0 : Math.max(0, seriesCount - 1) * barGap;
+  const centerOffset = (barWidth - depthOffset - groupSpan) / 2;
   const series = {
     type: "custom",
     renderItem: (params, api) => {
       const {
-        seriesIndex = 0
+        seriesIndex = 0,
+        dataIndex = 0
       } = params;
       const cubeLeftStyle = _colors ?? new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
         offset: 0,
@@ -128,14 +140,19 @@ const bar3DSeries = (_colors, barGap = 25, barWidth = 20) => {
         color: colors[0]
       }]);
       const [value0, value1] = [api.value(0), api.value(1)];
-      const location = api.coord([value0, value1]);
-      const xAxisTranslation = seriesIndex * barGap;
       if (value1 === 0) {
         return {
           type: "group",
           children: []
         };
       }
+
+      // 堆叠时从基底（下方各系列累计值）画到基底+自身值；非堆叠从 0 画起
+      const stackBottom = stack ? stackBase?.[dataIndex] ?? 0 : 0;
+      const location = api.coord([value0, stackBottom + Number(value1)]);
+      const bottomPoint = api.coord([value0, stackBottom]);
+      const order = seriesOrder ?? seriesIndex;
+      const xAxisTranslation = (stack ? 0 : order * barGap) + centerOffset;
       return {
         type: "group",
         children: [{
@@ -146,7 +163,7 @@ const bar3DSeries = (_colors, barGap = 25, barWidth = 20) => {
             yValue: value1,
             x: location[0],
             y: location[1],
-            xAxisPoint: api.coord([value0, 0]),
+            xAxisPoint: bottomPoint,
             xAxisTranslation,
             barWidth
           },
@@ -161,7 +178,7 @@ const bar3DSeries = (_colors, barGap = 25, barWidth = 20) => {
             yValue: value1,
             x: location[0],
             y: location[1],
-            xAxisPoint: api.coord([value0, 0]),
+            xAxisPoint: bottomPoint,
             xAxisTranslation,
             barWidth
           },
@@ -176,7 +193,7 @@ const bar3DSeries = (_colors, barGap = 25, barWidth = 20) => {
             yValue: value1,
             x: location[0],
             y: location[1],
-            xAxisPoint: api.coord([value0, 0]),
+            xAxisPoint: bottomPoint,
             xAxisTranslation,
             barWidth
           },

package/lib/components/Chart/chartUtils/chartTooltipFormatter.js

@@ -44,7 +44,15 @@ const chartTooltipFormatter = props => {
       </div>
     `;
   }
-  const sortedParams = sortDescending ? [...params].sort((a, b) => (Number(b.value) || 0) - (Number(a.value) || 0)) : params;
+
+  // value 可能是数值、拼了单位的字符串("123次")或带千分位("1,234"），排序前统一还原成数值
+  const toSortValue = v => {
+    if (typeof v === "number") return v;
+    if (Array.isArray(v)) return toSortValue(v[v.length - 1]);
+    const n = parseFloat(String(v ?? "").replace(/,/g, ""));
+    return Number.isNaN(n) ? 0 : n;
+  };
+  const sortedParams = sortDescending ? [...params].sort((a, b) => toSortValue(b.value) - toSortValue(a.value)) : params;
   const items = sortedParams?.map((item, idx) => {
     const value = item.value ?? "";
     return `

package/lib/components/Panel/ListPanel/ListModalPanel/index.d.ts

@@ -13,6 +13,8 @@ interface TableTools {
     columnMgt?: IColumnMgt;
 }
 export interface ListModalPanelTabelProps extends Omit<TableProps, "title"> {
+    /** 透传给内部 Table 的 key，用于在异构列集切换时强制重挂载表格 */
+    key?: React.Key;
     title?: string;
     buttonGroup?: ButtonProps[];
     tabBarProps?: TabBarProps;

package/lib/components/Panel/ListPanel/ListModalPanel/index.js

@@ -40,6 +40,9 @@ const ListModalPanel = props => {
     tableContainerClassName,
     tips,
     otherTool,
+    // 异构列集切换时用于强制重挂载表格的 key；显式提取，避免随 ...tableConfig
+    // 展开进 JSX 触发 React "key prop being spread" 警告
+    key: tableInstanceKey,
     ...tableConfig
   } = tableProps;
   const {
@@ -51,6 +54,9 @@ const ListModalPanel = props => {
   const [_columns, setColumns] = (0, _react.useState)(columns);
   const [showColumnMgt, setShowColumnMgt] = (0, _react.useState)(false);
   const [isFullscreen, setIsFullscreen] = (0, _react.useState)(false);
+  // 弹窗打开动画是否已完成：Search 的列数/展开等 DOM 测量要等弹窗完全展开
+  // 才能取到准确尺寸（zoom 动画只变 transform，不触发 ResizeObserver）
+  const [modalReady, setModalReady] = (0, _react.useState)(false);
   (0, _react.useEffect)(() => {
     if (modalConfig.open) {
       setIsFullscreen(false);
@@ -117,6 +123,10 @@ const ListModalPanel = props => {
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Modal.default, {
       ...modalConfig,
+      afterOpenChange: open => {
+        setModalReady(open);
+        modalConfig.afterOpenChange?.(open);
+      },
       width: isFullscreen ? "100vw" : modalConfig.width ?? 1400,
       ...(isFullscreen ? {
         full: true
@@ -132,7 +142,9 @@ const ListModalPanel = props => {
       }, ...(modalConfig.titleButtonGroup ?? [])],
       children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
         className: (0, _classnames.default)(_indexModule.default.ListModalPanel, className),
-        children: [extraContent, SearchComponent, /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+        children: [extraContent, /*#__PURE__*/_react.default.cloneElement(SearchComponent, {
+          key: modalReady ? "modal-ready" : "modal-pending"
+        }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
           className: (0, _classnames.default)(_indexModule.default.tableContainer, tableContainerClassName),
           children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_ToolBar.default, {
             columns: columns,
@@ -151,7 +163,7 @@ const ListModalPanel = props => {
             fillPanel: true,
             ...tableConfig,
             columns: _columns
-          })]
+          }, tableInstanceKey)]
         })]
       })
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_ColumnMgt.default, {

package/lib/styles/antd-overload.scss

@@ -130,4 +130,7 @@
       }
     }
   }
-}
+}
+.ant-modal-mask {
+  pointer-events: auto !important;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hsu-react/ui",
-  "version": "0.0.11",
+  "version": "0.0.13",
   "description": "一套基于 React + Ant Design 的中后台业务组件库",
   "license": "MIT",
   "type": "module",

package/src/components/Chart/Bar/Bar3DOpt.tsx

@@ -102,25 +102,45 @@ echarts.graphic.registerShape("CubeFront", CubeFront);
 echarts.graphic.registerShape("CubeRight", CubeRight);
 echarts.graphic.registerShape("CubeTop", CubeTop);
 
+export interface Bar3DSeriesOptions {
+  /** 同组 3D 柱系列总数（图例隐藏的不计入），用于整组相对类目刻度居中，默认 1 */
+  seriesCount?: number;
+  /** 当前系列在同组内的序号（图例隐藏的不占位），默认取 params.seriesIndex */
+  seriesOrder?: number;
+  /** 堆叠模式：同一类目上各系列纵向叠放（共用同一根柱） */
+  stack?: boolean;
+  /** 堆叠基底：每个数据点下方已累计的值，由调用方按可见系列累加 */
+  stackBase?: number[];
+}
+
 /**
  * 3D柱状图series生成
  * @param _colors 颜色
  * @param barGap 柱间距，必须大于等于柱宽
  * @param barWidth 柱宽
+ * @param options 分组居中 / 堆叠配置
  * @returns
  */
 const bar3DSeries = (
   _colors: echarts.Color,
   barGap: number = 25,
   barWidth: number = 20,
+  options: Bar3DSeriesOptions = {},
 ): echarts.SeriesOption & ChartOptionType => {
+  const { seriesCount = 1, seriesOrder, stack = false, stackBase } = options;
+  // 单根柱的视觉足迹为 [x - barWidth, x + depthOffset]（depthOffset 为 3D 深度）
+  const depthOffset = (barWidth * 8) / 20;
+  // 整组（堆叠时只有一根柱）相对类目刻度的居中补偿
+  const groupSpan = stack ? 0 : Math.max(0, seriesCount - 1) * barGap;
+  const centerOffset = (barWidth - depthOffset - groupSpan) / 2;
+
   const series = {
     type: "custom",
     renderItem: (
       params: echarts.CustomSeriesRenderItemParams,
       api: echarts.CustomSeriesRenderItemAPI,
     ) => {
-      const { seriesIndex = 0 } = params;
+      const { seriesIndex = 0, dataIndex = 0 } = params;
 
       const cubeLeftStyle =
         _colors ??
@@ -161,14 +181,18 @@ const bar3DSeries = (
 
       const [value0, value1] = [api.value!(0), api.value!(1)];
 
-      const location = api.coord!([value0, value1]);
-
-      const xAxisTranslation = seriesIndex * barGap;
-
       if (value1 === 0) {
         return { type: "group", children: [] };
       }
 
+      // 堆叠时从基底（下方各系列累计值）画到基底+自身值；非堆叠从 0 画起
+      const stackBottom = stack ? (stackBase?.[dataIndex] ?? 0) : 0;
+      const location = api.coord!([value0, stackBottom + Number(value1)]);
+      const bottomPoint = api.coord!([value0, stackBottom]);
+
+      const order = seriesOrder ?? seriesIndex;
+      const xAxisTranslation = (stack ? 0 : order * barGap) + centerOffset;
+
       return {
         type: "group",
         children: [
@@ -180,7 +204,7 @@ const bar3DSeries = (
               yValue: value1,
               x: location[0],
               y: location[1],
-              xAxisPoint: api.coord!([value0, 0]),
+              xAxisPoint: bottomPoint,
               xAxisTranslation,
               barWidth,
             },
@@ -196,7 +220,7 @@ const bar3DSeries = (
               yValue: value1,
               x: location[0],
               y: location[1],
-              xAxisPoint: api.coord!([value0, 0]),
+              xAxisPoint: bottomPoint,
               xAxisTranslation,
               barWidth,
             },
@@ -212,7 +236,7 @@ const bar3DSeries = (
               yValue: value1,
               x: location[0],
               y: location[1],
-              xAxisPoint: api.coord!([value0, 0]),
+              xAxisPoint: bottomPoint,
               xAxisTranslation,
               barWidth,
             },

package/src/components/Chart/chartUtils/chartTooltipFormatter.ts

@@ -80,10 +80,16 @@ const chartTooltipFormatter = (props: ChartTooltipFormatterProps) => {
     `;
   }
 
+  // value 可能是数值、拼了单位的字符串("123次")或带千分位("1,234"），排序前统一还原成数值
+  const toSortValue = (v: unknown): number => {
+    if (typeof v === "number") return v;
+    if (Array.isArray(v)) return toSortValue(v[v.length - 1]);
+    const n = parseFloat(String(v ?? "").replace(/,/g, ""));
+    return Number.isNaN(n) ? 0 : n;
+  };
+
   const sortedParams = sortDescending
-    ? [...params].sort(
-        (a, b) => (Number(b.value) || 0) - (Number(a.value) || 0),
-      )
+    ? [...params].sort((a, b) => toSortValue(b.value) - toSortValue(a.value))
     : params;
 
   const items = sortedParams

package/src/components/Panel/ListPanel/ListModalPanel/index.tsx

@@ -30,6 +30,8 @@ interface TableTools {
 }
 
 export interface ListModalPanelTabelProps extends Omit<TableProps, "title"> {
+  /** 透传给内部 Table 的 key，用于在异构列集切换时强制重挂载表格 */
+  key?: React.Key;
   title?: string;
   buttonGroup?: ButtonProps[];
   tabBarProps?: TabBarProps;
@@ -97,6 +99,9 @@ const ListModalPanel: React.FC<ListModalPanelProps<SearchModeKeys>> = (
     tableContainerClassName,
     tips,
     otherTool,
+    // 异构列集切换时用于强制重挂载表格的 key；显式提取，避免随 ...tableConfig
+    // 展开进 JSX 触发 React "key prop being spread" 警告
+    key: tableInstanceKey,
     ...tableConfig
   } = tableProps;
   const { columnMgt } = tableTools;
@@ -104,6 +109,9 @@ const ListModalPanel: React.FC<ListModalPanelProps<SearchModeKeys>> = (
   const [_columns, setColumns] = useState<ColumnsType | undefined>(columns);
   const [showColumnMgt, setShowColumnMgt] = useState<boolean>(false);
   const [isFullscreen, setIsFullscreen] = useState<boolean>(false);
+  // 弹窗打开动画是否已完成：Search 的列数/展开等 DOM 测量要等弹窗完全展开
+  // 才能取到准确尺寸（zoom 动画只变 transform，不触发 ResizeObserver）
+  const [modalReady, setModalReady] = useState<boolean>(false);
 
   useEffect(() => {
     if (modalConfig.open) {
@@ -193,6 +201,10 @@ const ListModalPanel: React.FC<ListModalPanelProps<SearchModeKeys>> = (
     <>
       <Modal
         {...modalConfig}
+        afterOpenChange={(open) => {
+          setModalReady(open);
+          modalConfig.afterOpenChange?.(open);
+        }}
         width={isFullscreen ? "100vw" : (modalConfig.width ?? 1400)}
         {...(isFullscreen ? { full: true } : {})}
         className={classNames(styles.modal, modalClassName, {
@@ -214,7 +226,10 @@ const ListModalPanel: React.FC<ListModalPanelProps<SearchModeKeys>> = (
       >
         <div className={classNames(styles.ListModalPanel, className)}>
           {extraContent}
-          {SearchComponent}
+          {/* 动画完成后重挂载 Search，使其在弹窗完全展开后重新初测 DOM 尺寸 */}
+          {React.cloneElement(SearchComponent, {
+            key: modalReady ? "modal-ready" : "modal-pending",
+          })}
           <div
             className={classNames(
               styles.tableContainer,
@@ -232,6 +247,7 @@ const ListModalPanel: React.FC<ListModalPanelProps<SearchModeKeys>> = (
               otherTool={otherTool}
             />
             <Table
+              key={tableInstanceKey}
               className={`${styles.table} ${tableClassName ?? ""}`}
               {...{
                 scroll: true,

package/src/styles/antd-overload.scss

@@ -130,4 +130,7 @@
       }
     }
   }
-}
+}
+.ant-modal-mask {
+  pointer-events: auto !important;
+}