@opentiny/vue-renderless 3.6.0 → 3.6.1-alpha.2

package/chart-bar/index.js

@@ -1,242 +1,113 @@
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
-import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-import { getFormated, getStackMap, get, set, cloneDeep } from '@opentiny/vue-renderless/chart-core/deps/utils';
-import { itemPoint, itemLabel, itemContent } from '@opentiny/vue-renderless/chart-core/deps/constants';
-import { isNull } from '@opentiny/vue-renderless/common/type';
-var VALUE_AXIS_OPACITY = 0.5;
-var getValueAxisData = function getValueAxisData(dims) {
-  var max = Math.max.apply(Math, _toConsumableArray(dims));
-  var min = Math.min.apply(Math, _toConsumableArray(dims));
-  var _ref = {},
-    _ref$result = _ref.result,
-    result = _ref$result === void 0 ? [] : _ref$result,
-    _ref$i = _ref.i,
-    i = _ref$i === void 0 ? min : _ref$i;
+import {
+  __spreadProps,
+  __spreadValues
+} from "../chunk-PKUHTIDK.js";
+import { getFormated, getStackMap, get, set, cloneDeep } from "@opentiny/vue-renderless/chart-core/deps/utils";
+import { itemPoint, itemLabel, itemContent } from "@opentiny/vue-renderless/chart-core/deps/constants";
+import { isNull } from "@opentiny/vue-renderless/common/type";
+const VALUE_AXIS_OPACITY = 0.5;
+const getValueAxisData = (dims) => {
+  const max = Math.max(...dims);
+  const min = Math.min(...dims);
+  let { result = [], i = min } = {};
   for (; i <= max; i++) {
     result.push(i);
   }
   return result;
 };
-var getBarDimAxis = function getBarDimAxis(args) {
-  var innerRows = args.innerRows,
-    dimAxisName = args.dimAxisName,
-    dimension = args.dimension,
-    axisVisible = args.axisVisible,
-    dimAxisType = args.dimAxisType,
-    dims = args.dims;
-  return dimension.map(function (item) {
-    return {
-      type: 'category',
-      name: dimAxisName,
-      nameLocation: 'middle',
-      nameGap: 22,
-      data: dimAxisType === 'value' ? getValueAxisData(dims) : innerRows.map(function (row) {
-        return row[item];
-      }),
-      axisLabel: {
-        formatter: function formatter(value) {
-          return String(value);
-        }
-      },
-      show: axisVisible,
-      axisTick: {
-        show: true,
-        alignWithLabel: true,
-        lineStyle: {
-          color: '#191919',
-          opacity: 0.1,
-          width: 2
-        }
-      },
-      axisLine: {
-        show: true,
-        lineStyle: {
-          color: '#191919',
-          opacity: 0.1,
-          width: 2
-        }
-      },
-      axisPointer: {
-        type: 'shadow',
-        z: 1,
-        shadowStyle: {
-          color: '#f5f5f5'
-        }
+const getBarDimAxis = (args) => {
+  const { innerRows, dimAxisName, dimension, axisVisible, dimAxisType, dims } = args;
+  return dimension.map((item) => ({
+    type: "category",
+    name: dimAxisName,
+    nameLocation: "middle",
+    nameGap: 22,
+    data: dimAxisType === "value" ? getValueAxisData(dims) : innerRows.map((row) => row[item]),
+    axisLabel: {
+      formatter(value) {
+        return String(value);
       }
-    };
-  });
-};
-var factoryFmt = function factoryFmt(_ref2) {
-  var meaAxisType = _ref2.meaAxisType,
-    i = _ref2.i,
-    digit = _ref2.digit;
-  return function (val) {
-    return getFormated(val, meaAxisType[i], digit);
-  };
-};
-var getBarMeaAxis = function getBarMeaAxis(args) {
-  var axisVisible = args.axisVisible,
-    digit = args.digit,
-    max = args.max,
-    meaAxisName = args.meaAxisName,
-    meaAxisType = args.meaAxisType,
-    min = args.min,
-    scale = args.scale;
-  var meaAxisBase = {
-    type: 'value',
-    axisTick: {
-      show: false
     },
-    show: axisVisible
-  };
-  var _ref3 = {},
-    _ref3$meaAxis = _ref3.meaAxis,
-    meaAxis = _ref3$meaAxis === void 0 ? [] : _ref3$meaAxis,
-    _ref3$i = _ref3.i,
-    i = _ref3$i === void 0 ? 0 : _ref3$i,
-    formatter = _ref3.formatter;
+    show: axisVisible,
+    axisTick: { show: true, alignWithLabel: true, lineStyle: { color: "#191919", opacity: 0.1, width: 2 } },
+    axisLine: { show: true, lineStyle: { color: "#191919", opacity: 0.1, width: 2 } },
+    axisPointer: { type: "shadow", z: 1, shadowStyle: { color: "#f5f5f5" } }
+  }));
+};
+const factoryFmt = ({ meaAxisType, i, digit }) => (val) => getFormated(val, meaAxisType[i], digit);
+const getBarMeaAxis = (args) => {
+  const { axisVisible, digit, max, meaAxisName, meaAxisType, min, scale } = args;
+  const meaAxisBase = { type: "value", axisTick: { show: false }, show: axisVisible };
+  let { meaAxis = [], i = 0, formatter } = {};
   for (; i < 2; i++) {
     if (meaAxisType[i]) {
-      formatter = factoryFmt({
-        meaAxisType: meaAxisType,
-        i: i,
-        digit: digit
-      });
-      meaAxis[i] = _objectSpread(_objectSpread({}, meaAxisBase), {}, {
-        axisLabel: {
-          formatter: formatter
-        }
-      });
+      formatter = factoryFmt({ meaAxisType, i, digit });
+      meaAxis[i] = __spreadProps(__spreadValues({}, meaAxisBase), { axisLabel: { formatter } });
     } else {
-      meaAxis[i] = _objectSpread({}, meaAxisBase);
+      meaAxis[i] = __spreadValues({}, meaAxisBase);
     }
     Object.assign(meaAxis[i], {
       max: max[i] || null,
       min: min[i] || null,
-      name: meaAxisName[i] || '',
+      name: meaAxisName[i] || "",
       scale: scale[i] || false
     });
   }
   return meaAxis;
 };
-var getBarTooltip = function getBarTooltip(args) {
-  var axisSite = args.axisSite,
-    digit = args.digit,
-    isHistogram = args.isHistogram,
-    labelMap = args.labelMap,
-    meaAxisType = args.meaAxisType;
-  var secondAxis = (!isHistogram ? axisSite.top : axisSite.right) || [];
+const getBarTooltip = (args) => {
+  const { axisSite, digit, isHistogram, labelMap, meaAxisType } = args;
+  let secondAxis = (!isHistogram ? axisSite.top : axisSite.right) || [];
   if (labelMap) {
-    secondAxis = secondAxis.map(function (item) {
-      return typeof labelMap[item] === 'undefined' ? item : labelMap[item];
-    });
+    secondAxis = secondAxis.map((item) => typeof labelMap[item] === "undefined" ? item : labelMap[item]);
   }
-  var formatter = function formatter(items) {
-    var _ref4 = {},
-      _ref4$tplt = _ref4.tplt,
-      tplt = _ref4$tplt === void 0 ? [] : _ref4$tplt,
-      seriesName = _ref4.seriesName,
-      type = _ref4.type;
-    tplt.push("".concat(items[0].name, "<br>"));
-    items.forEach(function (item) {
+  let formatter = function(items) {
+    let { tplt = [], seriesName, type } = {};
+    tplt.push(`${items[0].name}<br>`);
+    items.forEach((item) => {
       seriesName = item.seriesName;
       type = ~secondAxis.indexOf(seriesName) ? meaAxisType[1] : meaAxisType[0];
       tplt.push(itemPoint(item.color));
       tplt.push(itemLabel(seriesName));
       tplt.push(itemContent(getFormated(item.value, type, digit)));
-      tplt.push('<br>');
+      tplt.push("<br>");
     });
-    return tplt.join('');
-  };
-  return {
-    trigger: 'axis',
-    formatter: formatter
+    return tplt.join("");
   };
+  return { trigger: "axis", formatter };
 };
-var getValueData = function getValueData(seriesTemp, dims) {
-  var max = Math.max.apply(Math, _toConsumableArray(dims));
-  var min = Math.min.apply(Math, _toConsumableArray(dims));
-  var _ref5 = {},
-    _ref5$result = _ref5.result,
-    result = _ref5$result === void 0 ? [] : _ref5$result,
-    _ref5$i = _ref5.i,
-    i = _ref5$i === void 0 ? min : _ref5$i,
-    index = _ref5.index;
+const getValueData = (seriesTemp, dims) => {
+  const max = Math.max(...dims);
+  const min = Math.min(...dims);
+  let { result = [], i = min, index } = {};
   for (; i <= max; i++) {
     index = dims.indexOf(i);
     result.push(~index ? seriesTemp[index] : null);
   }
   return result;
 };
-var getBarSeries = function getBarSeries(args) {
-  var axisSite = args.axisSite,
-    barGap = args.barGap,
-    dimAxisType = args.dimAxisType,
-    dims = args.dims,
-    innerRows = args.innerRows,
-    isHistogram = args.isHistogram,
-    itemStyle = args.itemStyle;
-  var label = args.label,
-    labelMap = args.labelMap,
-    metrics = args.metrics,
-    opacity = args.opacity,
-    _args$showLine = args.showLine,
-    showLine = _args$showLine === void 0 ? [] : _args$showLine,
-    stack = args.stack;
-  var _ref6 = {},
-    secondAxis = _ref6.secondAxis,
-    secondDimAxisIndex = _ref6.secondDimAxisIndex,
-    _ref6$series = _ref6.series,
-    series = _ref6$series === void 0 ? [] : _ref6$series,
-    _ref6$seriesTemp = _ref6.seriesTemp,
-    seriesTemp = _ref6$seriesTemp === void 0 ? {} : _ref6$seriesTemp,
-    stackMap = _ref6.stackMap,
-    _ref6$stackNum = _ref6.stackNum,
-    stackNum = _ref6$stackNum === void 0 ? 0 : _ref6$stackNum;
+const getBarSeries = (args) => {
+  const { axisSite, barGap, dimAxisType, dims, innerRows, isHistogram, itemStyle } = args;
+  const { label, labelMap, metrics, opacity, showLine = [], stack } = args;
+  let { secondAxis, secondDimAxisIndex, series = [], seriesTemp = {}, stackMap, stackNum = 0 } = {};
   secondAxis = (isHistogram ? axisSite.right : axisSite.top) || [];
-  secondDimAxisIndex = isHistogram ? 'yAxisIndex' : 'xAxisIndex';
+  secondDimAxisIndex = isHistogram ? "yAxisIndex" : "xAxisIndex";
   stackMap = stack && getStackMap(stack);
-  metrics.forEach(function (item) {
-    return seriesTemp[item] = [];
-  });
-  innerRows.forEach(function (row) {
-    return metrics.forEach(function (item) {
-      return seriesTemp[item].push(row[item]);
-    });
-  });
-  series = Object.keys(seriesTemp).map(function (item) {
-    var name = !isNull(labelMap[item]) ? labelMap[item] : item;
-    var type = ~showLine.indexOf(item) ? 'line' : 'bar';
-    var data = dimAxisType === 'value' ? getValueData(seriesTemp[item], dims) : seriesTemp[item];
-    var axisIndex = ~secondAxis.indexOf(item) ? '1' : '0';
-    var seriesItem = _defineProperty({
-      name: name,
-      type: type,
-      data: data
-    }, secondDimAxisIndex, axisIndex);
-    if (seriesItem.type === 'line') {
-      var emphasis = {
-        itemStyle: {
-          borderColor: '#fff',
-          borderWidth: 2
-        }
-      };
-      var defaultSeriesItem = {
-        symbol: 'circle',
-        symbolSize: 8,
-        showSymbol: false,
-        emphasis: emphasis
-      };
+  metrics.forEach((item) => seriesTemp[item] = []);
+  innerRows.forEach((row) => metrics.forEach((item) => seriesTemp[item].push(row[item])));
+  series = Object.keys(seriesTemp).map((item) => {
+    let name = !isNull(labelMap[item]) ? labelMap[item] : item;
+    let type = ~showLine.indexOf(item) ? "line" : "bar";
+    let data = dimAxisType === "value" ? getValueData(seriesTemp[item], dims) : seriesTemp[item];
+    let axisIndex = ~secondAxis.indexOf(item) ? "1" : "0";
+    let seriesItem = { name, type, data, [secondDimAxisIndex]: axisIndex };
+    if (seriesItem.type === "line") {
+      const emphasis = { itemStyle: { borderColor: "#fff", borderWidth: 2 } };
+      const defaultSeriesItem = { symbol: "circle", symbolSize: 8, showSymbol: false, emphasis };
       seriesItem = Object.assign(defaultSeriesItem, seriesItem);
     }
-    var defaultItemStyle = {
-      borderRadius: isHistogram ? [4, 4, 0, 0] : [0, 4, 4, 0]
-    };
-    var defaultLabel = {
-      position: 'top'
-    };
+    const defaultItemStyle = { borderRadius: isHistogram ? [4, 4, 0, 0] : [0, 4, 4, 0] };
+    const defaultLabel = { position: "top" };
     stack && stackMap[item] && (seriesItem.stack = stackMap[item]);
     if (Object.keys(stack).length) {
       if (stackNum === Object.keys(stackMap).length - 1 || isNull(seriesItem.stack)) {
@@ -245,91 +116,41 @@ var getBarSeries = function getBarSeries(args) {
       if (!isNull(seriesItem.stack)) {
         stackNum++;
       }
-      seriesItem.itemStyle = _objectSpread({
-        borderWidth: 2,
-        borderColor: 'transparent'
-      }, seriesItem.itemStyle);
+      seriesItem.itemStyle = __spreadValues({ borderWidth: 2, borderColor: "transparent" }, seriesItem.itemStyle);
     } else {
       seriesItem.itemStyle = Object.assign(defaultItemStyle, seriesItem.itemStyle);
     }
     seriesItem.label = Object.assign(defaultLabel, label);
     itemStyle && (seriesItem.itemStyle = itemStyle);
-    var itemOpacity = opacity || get(seriesItem, 'itemStyle.opacity');
-    dimAxisType === 'value' && Object.assign(seriesItem, {
-      barGap: barGap,
-      barCategoryGap: '1%'
-    });
-    dimAxisType === 'value' && isNull(itemOpacity) && (itemOpacity = VALUE_AXIS_OPACITY);
-    !isNull(itemOpacity) && set(seriesItem, 'itemStyle.opacity', itemOpacity);
+    let itemOpacity = opacity || get(seriesItem, "itemStyle.opacity");
+    dimAxisType === "value" && Object.assign(seriesItem, { barGap, barCategoryGap: "1%" });
+    dimAxisType === "value" && isNull(itemOpacity) && (itemOpacity = VALUE_AXIS_OPACITY);
+    !isNull(itemOpacity) && set(seriesItem, "itemStyle.opacity", itemOpacity);
     return seriesItem;
   });
   return series.length ? series : false;
 };
-var getLegend = function getLegend(args) {
-  var metrics = args.metrics,
-    labelMap = args.labelMap,
-    legendName = args.legendName;
+const getLegend = (args) => {
+  const { metrics, labelMap, legendName } = args;
   if (!legendName && !labelMap) {
-    return {
-      data: metrics
-    };
+    return { data: metrics };
   }
-  var data = labelMap ? metrics.map(function (item) {
-    return isNull(labelMap[item]) ? item : labelMap[item];
-  }) : metrics;
+  const data = labelMap ? metrics.map((item) => isNull(labelMap[item]) ? item : labelMap[item]) : metrics;
   return {
-    data: data,
-    formatter: function formatter(name) {
+    data,
+    formatter(name) {
       return !isNull(legendName[name]) ? legendName[name] : name;
     }
   };
 };
-var getDims = function getDims(rows, dimension) {
-  return rows.map(function (row) {
-    return row[dimension[0]];
-  });
-};
-export var bar = function bar(columns, rows, settings, extra) {
-  var innerRows = cloneDeep(rows);
-  var _settings$axisSite = settings.axisSite,
-    axisSite = _settings$axisSite === void 0 ? {} : _settings$axisSite,
-    _settings$dimension = settings.dimension,
-    dimension = _settings$dimension === void 0 ? [columns[0]] : _settings$dimension,
-    _settings$axisVisible = settings.axisVisible,
-    axisVisible = _settings$axisVisible === void 0 ? true : _settings$axisVisible,
-    _settings$stack = settings.stack,
-    stack = _settings$stack === void 0 ? {} : _settings$stack;
-  var _settings$digit = settings.digit,
-    digit = _settings$digit === void 0 ? 2 : _settings$digit,
-    _settings$dataOrder = settings.dataOrder,
-    dataOrder = _settings$dataOrder === void 0 ? false : _settings$dataOrder,
-    _settings$scale = settings.scale,
-    scale = _settings$scale === void 0 ? [false, false] : _settings$scale,
-    _settings$min = settings.min,
-    min = _settings$min === void 0 ? [null, null] : _settings$min,
-    _settings$max = settings.max,
-    max = _settings$max === void 0 ? [null, null] : _settings$max;
-  var _settings$legendName = settings.legendName,
-    legendName = _settings$legendName === void 0 ? {} : _settings$legendName,
-    _settings$labelMap = settings.labelMap,
-    labelMap = _settings$labelMap === void 0 ? {} : _settings$labelMap,
-    label = settings.label,
-    itemStyle = settings.itemStyle,
-    showLine = settings.showLine,
-    _settings$barGap = settings.barGap,
-    barGap = _settings$barGap === void 0 ? '-100%' : _settings$barGap,
-    opacity = settings.opacity;
-  var tooltipVisible = extra.tooltipVisible,
-    legendVisible = extra.legendVisible;
-  var _ref7 = {},
-    _ref7$metrics = _ref7.metrics,
-    metrics = _ref7$metrics === void 0 ? columns.slice() : _ref7$metrics,
-    meaAxisType = _ref7.meaAxisType,
-    dimAxisType = _ref7.dimAxisType,
-    meaAxisName = _ref7.meaAxisName,
-    dimAxisName = _ref7.dimAxisName,
-    _ref7$isHistogram = _ref7.isHistogram,
-    isHistogram = _ref7$isHistogram === void 0 ? false : _ref7$isHistogram;
+const getDims = (rows, dimension) => rows.map((row) => row[dimension[0]]);
+const bar = (columns, rows, settings, extra) => {
+  const innerRows = cloneDeep(rows);
+  const { axisSite = {}, dimension = [columns[0]], axisVisible = true, stack = {} } = settings;
+  const { digit = 2, dataOrder = false, scale = [false, false], min = [null, null], max = [null, null] } = settings;
+  const { legendName = {}, labelMap = {}, label, itemStyle, showLine, barGap = "-100%", opacity } = settings;
+  const { tooltipVisible, legendVisible } = extra;
+  let { metrics = columns.slice(), meaAxisType, dimAxisType, meaAxisName, dimAxisName, isHistogram = false } = {};
   if (axisSite.bottom && axisSite.top) {
     metrics = axisSite.top.concat(axisSite.bottom);
   } else if (!axisSite.right && axisSite.bottom) {
@@ -339,127 +160,39 @@ export var bar = function bar(columns, rows, settings, extra) {
   } else {
     metrics.splice(columns.indexOf(dimension[0]), 1);
   }
-  dimAxisType = settings.yAxisType || 'category';
-  meaAxisType = settings.xAxisType || ['normal', 'normal'];
-  dimAxisName = settings.yAxisName || '';
+  dimAxisType = settings.yAxisType || "category";
+  meaAxisType = settings.xAxisType || ["normal", "normal"];
+  dimAxisName = settings.yAxisName || "";
   meaAxisName = settings.xAxisName || [];
   if (dataOrder) {
-    var _label = dataOrder.label,
-      order = dataOrder.order;
-    if (_label && order) {
-      innerRows.sort(function (a, b) {
-        return order === 'desc' ? a[_label] - b[_label] : b[_label] - a[_label];
-      });
+    let { label: label2, order } = dataOrder;
+    if (label2 && order) {
+      innerRows.sort((a, b) => order === "desc" ? a[label2] - b[label2] : b[label2] - a[label2]);
     }
   }
-  var dims = getDims(innerRows, dimension);
-  var legend = legendVisible && getLegend({
-    metrics: metrics,
-    labelMap: labelMap,
-    legendName: legendName
-  });
-  var yAxis = getBarDimAxis({
-    innerRows: innerRows,
-    dimAxisName: dimAxisName,
-    dimension: dimension,
-    axisVisible: axisVisible,
-    dimAxisType: dimAxisType,
-    dims: dims
-  });
-  var xAxis = getBarMeaAxis({
-    axisVisible: axisVisible,
-    meaAxisType: meaAxisType,
-    meaAxisName: meaAxisName,
-    scale: scale,
-    digit: digit,
-    max: max,
-    min: min
-  });
-  var args = {
-    axisSite: axisSite,
-    isHistogram: isHistogram,
-    metrics: metrics,
-    stack: stack,
-    itemStyle: itemStyle,
-    label: label,
-    labelMap: labelMap,
-    showLine: showLine
-  };
-  Object.assign(args, {
-    dimAxisType: dimAxisType,
-    dims: dims,
-    barGap: barGap,
-    dimension: dimension,
-    innerRows: innerRows,
-    opacity: opacity
-  });
-  var tooltip = tooltipVisible && getBarTooltip({
-    axisSite: axisSite,
-    isHistogram: isHistogram,
-    meaAxisType: meaAxisType,
-    digit: digit,
-    labelMap: labelMap
-  });
-  var options = {
-    legend: legend,
-    yAxis: yAxis,
-    series: getBarSeries(args),
-    xAxis: xAxis,
-    tooltip: tooltip
-  };
+  let dims = getDims(innerRows, dimension);
+  let legend = legendVisible && getLegend({ metrics, labelMap, legendName });
+  let yAxis = getBarDimAxis({ innerRows, dimAxisName, dimension, axisVisible, dimAxisType, dims });
+  let xAxis = getBarMeaAxis({ axisVisible, meaAxisType, meaAxisName, scale, digit, max, min });
+  let args = { axisSite, isHistogram, metrics, stack, itemStyle, label, labelMap, showLine };
+  Object.assign(args, { dimAxisType, dims, barGap, dimension, innerRows, opacity });
+  let tooltip = tooltipVisible && getBarTooltip({ axisSite, isHistogram, meaAxisType, digit, labelMap });
+  let options = { legend, yAxis, series: getBarSeries(args), xAxis, tooltip };
   return options;
 };
-export var histogram = function histogram(columns, rows, settings, extra) {
-  var innerRows = cloneDeep(rows);
-  var _settings$axisSite2 = settings.axisSite,
-    axisSite = _settings$axisSite2 === void 0 ? {} : _settings$axisSite2,
-    _settings$dimension2 = settings.dimension,
-    dimension = _settings$dimension2 === void 0 ? [columns[0]] : _settings$dimension2,
-    _settings$stack2 = settings.stack,
-    stack = _settings$stack2 === void 0 ? {} : _settings$stack2,
-    _settings$axisVisible2 = settings.axisVisible,
-    axisVisible = _settings$axisVisible2 === void 0 ? true : _settings$axisVisible2;
-  var _settings$digit2 = settings.digit,
-    digit = _settings$digit2 === void 0 ? 2 : _settings$digit2,
-    _settings$dataOrder2 = settings.dataOrder,
-    dataOrder = _settings$dataOrder2 === void 0 ? false : _settings$dataOrder2,
-    _settings$scale2 = settings.scale,
-    scale = _settings$scale2 === void 0 ? [false, false] : _settings$scale2,
-    _settings$min2 = settings.min,
-    min = _settings$min2 === void 0 ? [null, null] : _settings$min2,
-    _settings$max2 = settings.max,
-    max = _settings$max2 === void 0 ? [null, null] : _settings$max2;
-  var _settings$labelMap2 = settings.labelMap,
-    labelMap = _settings$labelMap2 === void 0 ? {} : _settings$labelMap2,
-    _settings$legendName2 = settings.legendName,
-    legendName = _settings$legendName2 === void 0 ? {} : _settings$legendName2,
-    label = settings.label,
-    itemStyle = settings.itemStyle,
-    showLine = settings.showLine,
-    _settings$barGap2 = settings.barGap,
-    barGap = _settings$barGap2 === void 0 ? '-100%' : _settings$barGap2,
-    opacity = settings.opacity;
-  var tooltipVisible = extra.tooltipVisible,
-    legendVisible = extra.legendVisible;
+const histogram = (columns, rows, settings, extra) => {
+  const innerRows = cloneDeep(rows);
+  const { axisSite = {}, dimension = [columns[0]], stack = {}, axisVisible = true } = settings;
+  const { digit = 2, dataOrder = false, scale = [false, false], min = [null, null], max = [null, null] } = settings;
+  const { labelMap = {}, legendName = {}, label, itemStyle, showLine, barGap = "-100%", opacity } = settings;
+  const { tooltipVisible, legendVisible } = extra;
   if (dataOrder) {
-    var _label2 = dataOrder.label,
-      order = dataOrder.order;
-    if (_label2 && order) {
-      innerRows.sort(function (a, b) {
-        return order === 'desc' ? a[_label2] - b[_label2] : b[_label2] - a[_label2];
-      });
+    let { label: label2, order } = dataOrder;
+    if (label2 && order) {
+      innerRows.sort((a, b) => order === "desc" ? a[label2] - b[label2] : b[label2] - a[label2]);
     }
   }
-  var _ref8 = {},
-    metrics = _ref8.metrics,
-    meaAxisType = _ref8.meaAxisType,
-    dimAxisType = _ref8.dimAxisType,
-    meaAxisName = _ref8.meaAxisName,
-    dimAxisName = _ref8.dimAxisName,
-    _ref8$isHistogram = _ref8.isHistogram,
-    isHistogram = _ref8$isHistogram === void 0 ? true : _ref8$isHistogram,
-    dims = _ref8.dims,
-    legend = _ref8.legend;
+  let { metrics, meaAxisType, dimAxisType, meaAxisName, dimAxisName, isHistogram = true, dims, legend } = {};
   metrics = columns.slice();
   if (axisSite.right && axisSite.left) {
     metrics = axisSite.left.concat(axisSite.right);
@@ -470,64 +203,21 @@ export var histogram = function histogram(columns, rows, settings, extra) {
   } else {
     metrics.splice(columns.indexOf(dimension[0]), 1);
   }
-  dimAxisType = settings.xAxisType || 'category';
-  meaAxisType = settings.yAxisType || ['normal', 'normal'];
-  dimAxisName = settings.xAxisName || '';
+  dimAxisType = settings.xAxisType || "category";
+  meaAxisType = settings.yAxisType || ["normal", "normal"];
+  dimAxisName = settings.xAxisName || "";
   meaAxisName = settings.yAxisName || [];
   dims = getDims(innerRows, dimension);
-  legend = legendVisible && getLegend({
-    metrics: metrics,
-    labelMap: labelMap,
-    legendName: legendName
-  });
-  var xAxis = getBarDimAxis({
-    innerRows: innerRows,
-    dimAxisName: dimAxisName,
-    dimension: dimension,
-    axisVisible: axisVisible,
-    dimAxisType: dimAxisType,
-    dims: dims
-  });
-  var yAxis = getBarMeaAxis({
-    meaAxisName: meaAxisName,
-    meaAxisType: meaAxisType,
-    axisVisible: axisVisible,
-    digit: digit,
-    scale: scale,
-    min: min,
-    max: max
-  });
-  var args = {
-    innerRows: innerRows,
-    metrics: metrics,
-    stack: stack,
-    axisSite: axisSite,
-    isHistogram: isHistogram,
-    labelMap: labelMap,
-    itemStyle: itemStyle,
-    label: label
-  };
-  Object.assign(args, {
-    showLine: showLine,
-    dimAxisType: dimAxisType,
-    dimension: dimension,
-    barGap: barGap,
-    opacity: opacity,
-    dims: dims
-  });
-  var tooltip = tooltipVisible && getBarTooltip({
-    axisSite: axisSite,
-    isHistogram: isHistogram,
-    meaAxisType: meaAxisType,
-    digit: digit,
-    labelMap: labelMap
-  });
-  var options = {
-    legend: legend,
-    yAxis: yAxis,
-    series: getBarSeries(args),
-    xAxis: xAxis,
-    tooltip: tooltip
-  };
+  legend = legendVisible && getLegend({ metrics, labelMap, legendName });
+  let xAxis = getBarDimAxis({ innerRows, dimAxisName, dimension, axisVisible, dimAxisType, dims });
+  let yAxis = getBarMeaAxis({ meaAxisName, meaAxisType, axisVisible, digit, scale, min, max });
+  let args = { innerRows, metrics, stack, axisSite, isHistogram, labelMap, itemStyle, label };
+  Object.assign(args, { showLine, dimAxisType, dimension, barGap, opacity, dims });
+  let tooltip = tooltipVisible && getBarTooltip({ axisSite, isHistogram, meaAxisType, digit, labelMap });
+  let options = { legend, yAxis, series: getBarSeries(args), xAxis, tooltip };
   return options;
-};
+};
+export {
+  bar,
+  histogram
+};