@publishfx/publish-chart 2.1.22 → 2.1.23

package/dist/adapters/DataAdapter.js

@@ -122,14 +122,7 @@ class DataAdapter {
             dv.transform({
                 type: 'map',
                 callback: (row)=>{
-                    row[config.y] = '' !== row[config.y] ? +row[config.y] : '-';
-                    return row;
-                }
-            });
-            tdv.transform({
-                type: 'map',
-                callback: (row)=>{
-                    row[config.y] = '' !== row[config.y] ? +row[config.y] : '-';
+                    row[config.y] = '' !== row[config.y] ? +row[config.y] : null;
                     return row;
                 }
             });
@@ -145,6 +138,20 @@ class DataAdapter {
                     return row.isCombine;
                 }
             });
+            tdv.transform({
+                type: 'map',
+                callback: (row)=>{
+                    row[config.y] = '' !== row[config.y] ? +row[config.y] : null;
+                    return row;
+                }
+            });
+            combinedv.transform({
+                type: 'map',
+                callback: (row)=>{
+                    row[config.y] = '' !== row[config.y] ? +row[config.y] : null;
+                    return row;
+                }
+            });
             if (config.isDescend) tdv.transform({
                 type: 'sort',
                 callback (a, b) {

package/dist/components/g2/base/G2CombineChart.js

@@ -123,13 +123,9 @@ const G2CombineChart = ({ height = 300, data, x = "", y = "", z = "", indicatorM
         safeIndicatorMap,
         y
     ]);
-    const formatLineAxis = useCallback((val)=>{
-        const indicatorId = indicators?.length > 2 ? "" : safeZ;
-        return getAxisFormat(val, safeIndicatorMap, indicatorId);
-    }, [
+    const formatLineAxis = useCallback((val)=>getAxisFormat(val, safeIndicatorMap, safeZ), [
         safeIndicatorMap,
-        safeZ,
-        indicators
+        safeZ
     ]);
     useEffect(()=>{
         if (!transformedData.length) {
@@ -182,7 +178,7 @@ const G2CombineChart = ({ height = 300, data, x = "", y = "", z = "", indicatorM
                         groupName: key,
                         isCombine: false,
                         groupType: groupType,
-                        groupValue: "",
+                        groupValue: null,
                         total: 0,
                         percent: ""
                     });

package/dist/components/g2/base/G2LineChart.js

@@ -203,7 +203,6 @@ const G2LineChart = ({ height = 300, data, x = "", y = "", z = "", indicatorMap,
         };
     }, [
         filteredData,
-        height,
         x,
         y,
         safeLegend,

package/dist/components/g2/base/g2Helpers.js

@@ -155,11 +155,13 @@ function applyAuxiliaryLineY(view, lines, options = {}) {
         ]).encode('y', auxLine.value).style('stroke', stroke).style('strokeOpacity', strokeOpacity).style('lineWidth', 1).style('shadowColor', 'transparent').animate(false).scale('y', {
             key: auxLine?.axis === 'right' ? 'line' : 'main'
         }).axis('x', false).label({
+            opacity: 1,
             dx: 0,
             dy: 0,
             text: splitTextToMultiline(auxLine.name, labelMaxLength, '<br />'),
             position: auxLine?.axis === 'right' ? 'bottom-right' : 'bottom-left',
-            render: (text)=>`<div style="background-color: transparent; padding: 5px; border-radius: 5px;font-size: 14px;position: absolute;left: ${auxLine?.axis === 'right' ? '-105px' : '0px'}; top: -24px; width: 100px;color: ${stroke}; font-family: 'PingFang SC', 'Microsoft YaHei', sans-serif;">${text}</div>`
+            render: (text)=>`<div style="background-color: transparent; padding: 5px; border-radius: 5px;font-size: 12px;position: absolute;left: ${auxLine?.axis === 'right' ? '-105px' : '0px'}; top: ${auxLine?.name?.length > 5 ? '-38px' : '-24px'} ; width: 100px; line-height: 14px; color: ${stroke}; text-shadow: 0 0 10px red;
+          font-family: 'PingFang SC', 'Microsoft YaHei', sans-serif;">${text}</div>`
         });
     });
 }

package/dist/components/g2/base/g2bar.js

@@ -114,18 +114,11 @@ function renderG2BarChart(container, options) {
                 }) : null
         ].filter(Boolean)
     });
-    const tooltipBounding = {
-        x: 0,
-        y: 0,
-        width: container.clientWidth || container.offsetWidth,
-        height: container.clientHeight || container.offsetHeight
-    };
     if (tooltipRender) view.interaction('tooltip', {
         shared: true,
         crosshairsY: true,
         wait: 100,
         marker: false,
-        bounding: tooltipBounding,
         render: (_event, payload)=>{
             const { title, items } = payload;
             const lastIsChange = items.filter((item)=>item.isChange);
@@ -137,9 +130,6 @@ function renderG2BarChart(container, options) {
             return tooltipRender(title, safeItems ?? []) ?? null;
         }
     });
-    else view.interaction('tooltip', {
-        bounding: tooltipBounding
-    });
     applyAuxiliaryLineY(view, auxiliaryLineData, {
         labelMaxLength: 5
     });

package/dist/components/g2/base/g2combine.js

@@ -104,7 +104,7 @@ function renderG2CombineChart(container, options) {
                 const groupType = String(datum.groupType ?? '');
                 const index = legendItems.findIndex((item)=>item.id === `${groupType}_${datum.isCombine}`);
                 return {
-                    value: datum[Y_AXIS_FIELD],
+                    value: datum[BAR_Y_FIELD],
                     name: datum['groupType'],
                     indicatorId,
                     channel: Y_AXIS_FIELD,
@@ -253,49 +253,40 @@ function renderG2CombineChart(container, options) {
                 } : false
         ].filter(Boolean)
     });
-    if (tooltipRender) {
-        const tooltipBounding = {
-            x: 0,
-            y: 0,
-            width: container.clientWidth || container.offsetWidth,
-            height: container.clientHeight || container.offsetHeight
-        };
-        view.interaction('tooltip', {
-            shared: true,
-            crosshairsY: true,
-            marker: false,
-            bounding: tooltipBounding,
-            render: (_event, payload)=>{
-                const { title, items } = payload;
-                let safeTitle = title.replace(/,.*$/, '');
-                const baseItems = items.filter((item)=>item.hasOwnProperty('isCombine') && !item.isCombine);
-                const safeItems = fillMissingIndicator(baseItems, safeTitle, isCompare, isGroup);
-                const combineItems = items.filter((item)=>item.hasOwnProperty('isCombine') && item.isCombine);
-                const safeCombineItems = fillMissingIndicator(combineItems, safeTitle, isCompare, isGroup);
-                const indicatorOrder = new Map(indicators.map((id, i)=>[
-                        id,
-                        i
-                    ]));
-                const sortedCombineItems = [
-                    ...safeCombineItems
-                ].sort((a, b)=>{
-                    const orderA = indicatorOrder.get(a.indicatorId) ?? 1 / 0;
-                    const orderB = indicatorOrder.get(b.indicatorId) ?? 1 / 0;
-                    if (orderA !== orderB) return orderA - orderB;
-                    const typeRank = (item)=>{
-                        if (item.isChange) return 2;
-                        if ('compareline' === item.tipType) return 1;
-                        return 0;
-                    };
-                    return typeRank(a) - typeRank(b);
-                });
-                return tooltipRender(safeTitle, [
-                    ...safeItems,
-                    ...sortedCombineItems
-                ]) ?? null;
-            }
-        });
-    }
+    if (tooltipRender) view.interaction('tooltip', {
+        shared: true,
+        crosshairsY: true,
+        marker: false,
+        render: (_event, payload)=>{
+            const { title, items } = payload;
+            let safeTitle = title.replace(/,.*$/, '');
+            const baseItems = items.filter((item)=>item.hasOwnProperty('isCombine') && !item.isCombine);
+            const safeItems = fillMissingIndicator(baseItems, safeTitle, isCompare, isGroup);
+            const combineItems = items.filter((item)=>item.hasOwnProperty('isCombine') && item.isCombine);
+            const safeCombineItems = fillMissingIndicator(combineItems, safeTitle, isCompare, isGroup);
+            const indicatorOrder = new Map(indicators.map((id, i)=>[
+                    id,
+                    i
+                ]));
+            const sortedCombineItems = [
+                ...safeCombineItems
+            ].sort((a, b)=>{
+                const orderA = indicatorOrder.get(a.indicatorId) ?? 1 / 0;
+                const orderB = indicatorOrder.get(b.indicatorId) ?? 1 / 0;
+                if (orderA !== orderB) return orderA - orderB;
+                const typeRank = (item)=>{
+                    if (item.isChange) return 2;
+                    if ('compareline' === item.tipType) return 1;
+                    return 0;
+                };
+                return typeRank(a) - typeRank(b);
+            });
+            return tooltipRender(safeTitle, [
+                ...safeItems,
+                ...sortedCombineItems
+            ]) ?? null;
+        }
+    });
     view.legend(false);
     view.interaction('poptip', {
         offsetY: -20,

package/dist/components/g2/base/g2line.js

@@ -79,16 +79,9 @@ function renderG2LineChart(container, options) {
                 })
         ]
     });
-    const tooltipBounding = {
-        x: 0,
-        y: 0,
-        width: container.clientWidth || container.offsetWidth,
-        height: container.clientHeight || container.offsetHeight
-    };
     if (tooltipRender) view.interaction('tooltip', {
         shared: true,
         marker: false,
-        bounding: tooltipBounding,
         render: (_event, payload)=>{
             const { title, items } = payload;
             if (indicators.length) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@publishfx/publish-chart",
-  "version": "2.1.22",
+  "version": "2.1.23",
   "description": "A React chart component library for the Publish platform, including BarChart, LineChart, BarLineChart and other visualization components",
   "type": "module",
   "keywords": [