@zgfe/business-lib 1.1.72-beta.0 → 1.1.72-beta.1

package/es/chart/types.d.ts

@@ -23,6 +23,9 @@ export declare namespace ChartTypes {
         xAxis: Array<string>;
         x_axis?: Array<string>;
         series: Array<ChartItmProps>;
+        resultFormatMap?: {
+            [key: string]: string;
+        };
     }
     interface Props {
         type?: 'bar' | 'pie' | 'line' | 'map';

package/es/chart/util/chartOptionConfig.js

@@ -170,7 +170,9 @@ export var getChartOption = function getChartOption(chartType, data) {
   }
   tooltip.axisPointer = tooltip.axisPointer || {};
   tooltip.axisPointer.type = chartType === 'bar' ? 'shadow' : 'line';
-  tooltip.formatter = tooltipFormatter ? tooltipFormatter : tooltipFormatterDefault;
+  tooltip.formatter = function (params) {
+    return tooltipFormatter ? tooltipFormatter(params) : tooltipFormatterDefault(params, data.resultFormatMap);
+  };
   if (legendPosition === 'top') {
     grid.top = series.length > 1 || series.length > 0 && series[0].name ? 45 : 10;
   } else if (legendPosition === 'bottom') {

package/es/chart/util/formatData.d.ts

@@ -9,4 +9,7 @@ export declare const formatPieData: (data: ChartTypes.Value, showAll?: boolean,
 export declare const formatChartData: (data: ChartTypes.Value, showAll?: boolean, showList?: Array<any>, reverseXAxis?: boolean, color?: string[]) => {
     xAxis: string[];
     series: any;
+    resultFormatMap: {
+        [key: string]: string;
+    };
 };

package/es/chart/util/formatData.js

@@ -33,9 +33,13 @@ export var formatChartData = function formatChartData(data, showAll, showList, r
   var xAxisData = data.xAxis || data.x_axis;
   var xAxis = reverseXAxis && data.series.length ? [] : xAxisData;
   var sData = [];
+  var resultFormatMap = {};
   var colorData = color || chartColors;
   data.series.forEach(function (seriesItem) {
     var name = seriesItem.names.join(',');
+    if (seriesItem.resultFormat && !resultFormatMap[name]) {
+      resultFormatMap[name] = seriesItem.resultFormat;
+    }
     if (showAll || showList && showMap[name] || !showList && sData.length < 10) {
       if (reverseXAxis) {
         xAxis.push(name);
@@ -59,7 +63,8 @@ export var formatChartData = function formatChartData(data, showAll, showList, r
   });
   return {
     xAxis: xAxis,
-    series: sData
+    series: sData,
+    resultFormatMap: resultFormatMap
   };
 };
 var getShowMap = function getShowMap(showList) {

package/es/chart/util/formatOption.d.ts

@@ -1,4 +1,6 @@
-declare const tooltipFormatterDefault: (params: any) => string;
+declare const tooltipFormatterDefault: (params: any, resultFormatMap?: {
+    [key: string]: string;
+} | undefined) => string;
 declare const yAxisFormatterDefault: (value: number) => string;
 declare const xAxisFormatterDefault: (value: string) => string;
 declare const mapTooltipFormatter: (params: any) => string | undefined;

package/es/chart/util/formatOption.js

@@ -1,6 +1,6 @@
 import util from '../../utils/util';
 var maxLength = 20;
-var tooltipFormatterDefault = function tooltipFormatterDefault(params) {
+var tooltipFormatterDefault = function tooltipFormatterDefault(params, resultFormatMap) {
   var xDate = params[0].name;
   var xLabel = xDate;
   var lengthReg = new RegExp('\\S{1,' + maxLength + '}', 'g');
@@ -18,6 +18,8 @@ var tooltipFormatterDefault = function tooltipFormatterDefault(params) {
     var lineLabel = item.value;
     if (item.seriesName.indexOf('CTR') > -1) {
       lineLabel += '%';
+    } else if (resultFormatMap && resultFormatMap[item.seriesName] && /percent/.test(resultFormatMap[item.seriesName])) {
+      lineLabel = util.toThousands(lineLabel) + '%';
     } else {
       lineLabel = util.toThousands(lineLabel);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.1.72-beta.0",
+  "version": "1.1.72-beta.1",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -58,5 +58,5 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "7fe3a264456eb515e4cfa777b160d09df8eb41fe"
+  "gitHead": "15e0d81feda4142c22299096a50cbaa49a882fd6"
 }