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

package/es/chart/index.js

@@ -55,7 +55,7 @@ var BizChart = /*#__PURE__*/React.forwardRef(function (props, ref) {
     var eOption = {};
     if (!data) return eOption;
     if (type === 'pie') {
-      var rData = formatPieData(data, showAll, showList);
+      var rData = formatPieData(data, showAll, showList, props.showOther);
       eOption = getPieOption(rData, legendPosition, legendOrient, props.showLabel, props.radius, props.center, tooltipFormatter);
     } else if (type === 'line' || type === 'bar') {
       var _rData = formatChartData(data, showAll, showList, reverseXAxis, colors);

package/es/chart/types.d.ts

@@ -43,6 +43,7 @@ export declare namespace ChartTypes {
         legendOrient?: 'horizontal' | 'vertical';
         showList?: Array<any>;
         showAll?: boolean;
+        showOther?: boolean;
         reverseXAxis?: boolean;
         seriesName?: string;
     }

package/es/chart/util/chartOptionConfig.js

@@ -247,7 +247,7 @@ export var getPieOption = function getPieOption() {
       var name = params.name,
         value = params.value,
         color = params.color;
-      return "<div class=\"biz-chart-tooltip-item\">\n                <div class=\"biz-chart-tooltip-content\">\n                    <span class=\"biz-tooltip-marker\" style=\"background:".concat(color, "\"></span>\n                    <div class=\"biz-tooltip-name\">").concat(name, "</div>\n                </div> \n                <span class=\"biz-chart-tooltip-value\">").concat(value, "</span>\n              </div>");
+      return "<div class=\"biz-chart-tooltip-item\">\n                <div class=\"biz-chart-tooltip-content\">\n                    <span class=\"biz-tooltip-marker\" style=\"background:".concat(color, "\"></span>\n                    <div class=\"biz-tooltip-name\">").concat(name, "</div>\n                </div> \n                <span class=\"biz-chart-tooltip-value\">").concat(value, "(").concat(params.percent, "%)</span>\n              </div>");
     };
   }
   return _objectSpread(_objectSpread({}, baseConfig), {}, {

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

@@ -1,5 +1,5 @@
 import { ChartTypes } from '../types';
-export declare const formatPieData: (data: ChartTypes.Value, showAll?: boolean, showList?: Array<any>) => {
+export declare const formatPieData: (data: ChartTypes.Value, showAll?: boolean, showList?: Array<any>, showOther?: boolean) => {
     name: string;
     value: number;
     itemStyle: {

package/es/chart/util/formatData.js

@@ -1,6 +1,6 @@
 import util from '../../utils/util';
 import { chartColors } from './color';
-export var formatPieData = function formatPieData(data, showAll, showList) {
+export var formatPieData = function formatPieData(data, showAll, showList, showOther) {
   var showMap = getShowMap(showList);
   var list = [];
   var other = {
@@ -20,12 +20,12 @@ export var formatPieData = function formatPieData(data, showAll, showList) {
     } else {
       if (showList && showMap[series.name] || !showList && list.length < 10) {
         list.push(series);
-      } else {
+      } else if (showOther) {
         other.value += item.values[0];
       }
     }
   });
-  if (!showAll && other.value > 0) list.push(other);
+  if (showOther && !showAll && other.value > 0) list.push(other);
   return list;
 };
 export var formatChartData = function formatChartData(data, showAll, showList, reverseXAxis, color) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.1.56-beta.0",
+  "version": "1.1.56-beta.1",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -60,5 +60,5 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "9a4895eecb6bae200c1c50288a5317b2a05d0ba2"
+  "gitHead": "2050aad6d38725d5a4f608ede8f00d6950b75c87"
 }