@antv/gpt-vis 0.5.5 → 0.5.7

package/dist/esm/Column/index.js

@@ -1,19 +1,53 @@
+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); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { Column as ADCColumn } from '@ant-design/plots';
 import { get } from 'lodash';
 import React from 'react';
 import { usePlotConfig } from "../ConfigProvider/hooks";
+import { THEME_MAP } from "../theme";
 var defaultConfig = function defaultConfig(props) {
   var data = props.data,
     _props$xField = props.xField,
     xField = _props$xField === void 0 ? 'category' : _props$xField,
     _props$yField = props.yField,
-    yField = _props$yField === void 0 ? 'value' : _props$yField;
+    yField = _props$yField === void 0 ? 'value' : _props$yField,
+    _props$style = props.style,
+    style = _props$style === void 0 ? {} : _props$style,
+    _props$theme = props.theme,
+    theme = _props$theme === void 0 ? {} : _props$theme;
+  var backgroundColor = style.backgroundColor,
+    palette = style.palette;
   var hasGroupField = get(data, '[0].group') !== undefined;
+  var hasPalette = !!(palette !== null && palette !== void 0 && palette[0]);
   var axisYTitle = get(props, 'axis.y.title');
-  return {
+  var paletteConfig = {
+    color: undefined
+  };
+  var radiusStyle = {
+    radiusTopLeft: 4,
+    radiusTopRight: 4
+  };
+  if ((theme === null || theme === void 0 ? void 0 : theme.type) === 'academy') {
+    radiusStyle = {
+      radiusTopLeft: 0,
+      radiusTopRight: 0
+    };
+  }
+  if (hasPalette) {
+    paletteConfig = {
+      color: {
+        range: palette
+      }
+    };
+  }
+  return _objectSpread(_objectSpread({
     xField: xField,
     yField: yField,
-    colorField: hasGroupField ? 'group' : undefined,
+    colorField: hasGroupField ? 'group' : xField,
     tooltip: function tooltip(d) {
       var tooltipName = axisYTitle || d[xField];
       return {
@@ -21,15 +55,39 @@ var defaultConfig = function defaultConfig(props) {
         value: d[yField]
       };
     },
-    style: {
-      // 圆角样式
-      radiusTopLeft: 10,
-      radiusTopRight: 10
+    style: _objectSpread(_objectSpread({}, radiusStyle), {}, {
+      columnWidthRatio: 0.8
+    }),
+    scale: _objectSpread({
+      y: {
+        nice: true
+      }
+    }, paletteConfig)
+  }, backgroundColor ? {
+    viewStyle: {
+      viewFill: backgroundColor
     }
-  };
+  } : {
+    viewStyle: undefined
+  }), {}, {
+    legend: hasGroupField ? {} : false,
+    group: hasGroupField
+  });
 };
 var Column = function Column(props) {
-  var config = usePlotConfig('Column', defaultConfig, props);
+  var _props$theme2;
+  var themeConfig = THEME_MAP[(_props$theme2 = props.theme) !== null && _props$theme2 !== void 0 ? _props$theme2 : 'default'];
+  var data = props.data,
+    _props$group = props.group,
+    group = _props$group === void 0 ? false : _props$group,
+    _props$stack = props.stack,
+    stack = _props$stack === void 0 ? false : _props$stack;
+  var hasGroupField = get(data, '[0].group') !== undefined;
+  var config = usePlotConfig('Column', defaultConfig, _objectSpread(_objectSpread({}, props), {}, {
+    theme: themeConfig,
+    group: hasGroupField && group,
+    stack: hasGroupField && stack
+  }));
   return /*#__PURE__*/React.createElement(ADCColumn, config);
 };
 export default Column;

package/dist/esm/ConfigProvider/hooks/useConfig.js

@@ -1,4 +1,7 @@
+var _excluded = ["style"];
 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); }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -31,7 +34,12 @@ export function usePlotConfig(name, defaultConfig, props) {
   var mergedProps = _objectSpread(_objectSpread({}, globalConfig), props);
   var transformedProps = transform2ADCProps(mergedProps);
   var _defaultConfig = typeof defaultConfig === 'function' ? defaultConfig(transformedProps) : defaultConfig;
-  var config = _objectSpread(_objectSpread({}, _defaultConfig), transformedProps);
+
+  // The style property has already been expanded in defaultConfig, so it needs to be stripped here.
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  var style = transformedProps.style,
+    restTransformedProps = _objectWithoutProperties(transformedProps, _excluded);
+  var config = _objectSpread(_objectSpread({}, _defaultConfig), restTransformedProps);
   return config;
 }
 function useMapGlobalConfig(name) {

package/dist/esm/DualAxes/index.d.ts

@@ -4,7 +4,7 @@ export type DualAxesProps = Partial<DualAxesConfig> & {
     categories: string[];
     axisXTitle?: string;
     series: DualAxesSeriesItem[];
-    legendTypeList: string[];
+    legendTypeList?: string[];
 };
 export type DualAxesSeriesItem = {
     type: string;

package/dist/esm/DualAxes/index.js

@@ -1,22 +1,38 @@
+var _excluded = ["categories", "series", "theme"];
 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 = ["categories", "series"];
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import { DualAxes as ADCDualAxes } from '@ant-design/plots';
 import React, { useMemo } from 'react';
 import { usePlotConfig } from "../ConfigProvider/hooks";
+import { THEME_MAP } from "../theme";
 import { transform } from "./util";
 var defaultConfig = function defaultConfig(props) {
   var _props$xField = props.xField,
     xField = _props$xField === void 0 ? 'category' : _props$xField,
     axisXTitle = props.axisXTitle,
-    legendTypeList = props.legendTypeList;
-  return {
+    legendTypeList = props.legendTypeList,
+    _props$style = props.style,
+    style = _props$style === void 0 ? {} : _props$style;
+  var palette = style.palette,
+    backgroundColor = style.backgroundColor;
+  var hasPalette = !!(palette !== null && palette !== void 0 && palette[0]);
+  var paletteConfig = {
+    color: undefined
+  };
+  if (hasPalette) {
+    paletteConfig = {
+      color: {
+        range: palette
+      }
+    };
+  }
+  return _objectSpread({
     xField: xField,
     axis: {
       x: {
@@ -26,25 +42,32 @@ var defaultConfig = function defaultConfig(props) {
     legend: {
       color: {
         itemMarker: function itemMarker(v, i) {
-          return legendTypeList[i];
+          return legendTypeList === null || legendTypeList === void 0 ? void 0 : legendTypeList[i];
         }
       }
     },
-    scale: {
-      color: {
-        palette: 'category10'
-      }
+    scale: _objectSpread({}, paletteConfig)
+  }, backgroundColor ? {
+    viewStyle: {
+      viewFill: backgroundColor
     }
-  };
+  } : {
+    viewStyle: undefined
+  });
 };
 var DualAxes = function DualAxes(props) {
   var categories = props.categories,
     series = props.series,
+    _props$theme = props.theme,
+    theme = _props$theme === void 0 ? 'default' : _props$theme,
     others = _objectWithoutProperties(props, _excluded);
+  var themeConfig = THEME_MAP[theme];
   var transformData = useMemo(function () {
     return transform(series, categories);
   }, [props]);
-  var config = usePlotConfig('DualAxes', defaultConfig, _objectSpread(_objectSpread({}, others), transformData));
+  var config = usePlotConfig('DualAxes', defaultConfig, _objectSpread(_objectSpread(_objectSpread({}, others), transformData), {}, {
+    theme: themeConfig
+  }));
   return /*#__PURE__*/React.createElement(ADCDualAxes, config);
 };
 export default DualAxes;

package/dist/esm/FishboneDiagram/index.d.ts

@@ -1,6 +1,7 @@
 import React from 'react';
 import type { TreeGraphProps } from '../types';
 export interface FishboneDiagramProps extends TreeGraphProps {
+    theme?: 'default' | 'academy';
 }
 declare const FishboneDiagram: React.FC<FishboneDiagramProps>;
 export default FishboneDiagram;

package/dist/esm/FishboneDiagram/index.js

@@ -1,17 +1,33 @@
 var _excluded = ["data"];
+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); }
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { Fishbone as ADCFishbone } from '@ant-design/graphs';
 import React, { useMemo } from 'react';
 import { useGraphConfig } from "../ConfigProvider/hooks";
+import { G6THEME_MAP } from "../theme";
 import { visTreeData2GraphData } from "../utils/graph";
-var defaultConfig = {
-  autoFit: 'view',
-  autoResize: true,
-  zoomRange: [0.1, 5],
-  zoom: 1,
-  behaviors: ['drag-canvas']
+var getDefaultConfig = function getDefaultConfig(props) {
+  var _props$theme = props.theme,
+    theme = _props$theme === void 0 ? 'default' : _props$theme;
+  return {
+    autoFit: 'view',
+    autoResize: true,
+    zoomRange: [0.1, 5],
+    zoom: 1,
+    behaviors: ['drag-canvas'],
+    transforms: function transforms(prev) {
+      return [_objectSpread(_objectSpread({}, prev.find(function (transform) {
+        return transform.key === 'assign-color-by-branch';
+      }) || {}), G6THEME_MAP[theme])];
+    }
+  };
 };
 var FishboneDiagram = function FishboneDiagram(props) {
   var propsData = props.data,
@@ -19,7 +35,7 @@ var FishboneDiagram = function FishboneDiagram(props) {
   var data = useMemo(function () {
     return visTreeData2GraphData(propsData);
   }, [propsData]);
-  var config = useGraphConfig('FishboneDiagram', defaultConfig, restProps);
+  var config = useGraphConfig('FishboneDiagram', getDefaultConfig(props), restProps);
   return /*#__PURE__*/React.createElement(ADCFishbone, _extends({
     data: data
   }, config));

package/dist/esm/Funnel/index.d.ts

@@ -0,0 +1,12 @@
+import React from 'react';
+import type { BasePlotProps, Style, Theme } from '../types';
+type FunnelDatum = {
+    category: string;
+    value: number;
+};
+export type FunnelProps = BasePlotProps<FunnelDatum> & Theme & Style & {
+    width?: number;
+    height?: number;
+};
+declare const Funnel: (props: FunnelProps) => React.JSX.Element;
+export default Funnel;

package/dist/esm/Funnel/index.js

@@ -0,0 +1,171 @@
+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); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import { Chart } from '@antv/g2';
+import React, { useEffect, useRef } from 'react';
+import { THEME_MAP } from "../theme";
+var defaultConfig = function defaultConfig(props) {
+  var data = props.data,
+    title = props.title,
+    _props$theme = props.theme,
+    theme = _props$theme === void 0 ? 'default' : _props$theme,
+    _props$style = props.style,
+    style = _props$style === void 0 ? {} : _props$style;
+  var backgroundColor = style.backgroundColor,
+    _style$palette = style.palette,
+    palette = _style$palette === void 0 ? [] : _style$palette;
+  var r = function r(start, end) {
+    return "".concat((end / start * 100).toFixed(2), " %");
+  };
+  return {
+    type: 'view',
+    data: data,
+    theme: THEME_MAP[theme],
+    title: title,
+    padding: 40,
+    insetRight: 28,
+    children: [_objectSpread({
+      type: 'interval',
+      data: data,
+      encode: {
+        x: 'category',
+        y: 'value',
+        color: 'category',
+        shape: 'funnel'
+      },
+      transform: [{
+        type: 'symmetryY'
+      }],
+      scale: _objectSpread({
+        x: {
+          padding: 0
+        }
+      }, palette !== null && palette !== void 0 && palette[0] ? {
+        color: {
+          range: palette
+        }
+      } : {}),
+      coordinate: {
+        transform: [{
+          type: 'transpose'
+        }]
+      },
+      legend: {
+        color: {
+          position: 'top',
+          layout: {
+            justifyContent: 'center'
+          }
+        }
+      },
+      labels: [{
+        text: function text(d) {
+          return "".concat(d.category, "\n").concat(d.value);
+        },
+        position: 'inside',
+        transform: [{
+          type: 'contrastReverse'
+        }]
+      }, {
+        text: function text(d, i) {
+          return i !== 0 ? '———' : '';
+        },
+        style: {
+          'font-size': '1px',
+          color: '#666',
+          'letter-spacing': '0px'
+        },
+        position: 'top-right',
+        fill: '#666',
+        dx: 35,
+        dy: -8
+      }, {
+        text: function text(d, i) {
+          return i !== 0 ? '转化率' : '';
+        },
+        position: 'top-right',
+        textAlign: 'left',
+        textBaseline: 'middle',
+        fill: '#666',
+        dx: 40
+      }, {
+        text: function text(d, i, data) {
+          return i !== 0 ? r(data[i - 1].value, data[i].value) : '';
+        },
+        position: 'top-right',
+        textAlign: 'left',
+        textBaseline: 'middle',
+        dx: 80
+      }]
+    }, backgroundColor ? {
+      viewStyle: {
+        viewFill: backgroundColor
+      }
+    } : {}), {
+      type: 'connector',
+      data: [{
+        startX: data[0].category,
+        startY: data[data.length - 1].category,
+        endX: 0,
+        endY: (data[0].value - data[data.length - 1].value) / 2
+      }],
+      encode: {
+        x: 'startX',
+        x1: 'startY',
+        y: 'endX',
+        y1: 'endY'
+      },
+      style: {
+        stroke: '#666',
+        markerEnd: false,
+        connectLength1: -12,
+        offset2: -20,
+        connectorStroke: '#0649f2',
+        lineDash: [12, 2]
+      },
+      labels: [{
+        text: '转化率',
+        position: 'left',
+        textAlign: 'start',
+        textBaseline: 'middle',
+        fill: '#666',
+        dx: 10
+      }, {
+        text: r(data[0].value, data[data.length - 1].value),
+        position: 'left',
+        textAlign: 'start',
+        dx: 50,
+        fill: '#000'
+      }]
+    }],
+    axis: false,
+    animate: false
+  };
+};
+var Funnel = function Funnel(props) {
+  var containerRef = useRef(null);
+  var chartRef = useRef(null);
+  useEffect(function () {
+    if (!containerRef.current) return;
+    var chart = new Chart({
+      container: containerRef.current,
+      autoFit: true,
+      padding: 'auto'
+    });
+    var config = defaultConfig(props);
+    chart.options(config);
+    chart.render();
+    chartRef.current = chart;
+    return function () {
+      chart.destroy();
+      chartRef.current = null;
+    };
+  }, [props]);
+  return /*#__PURE__*/React.createElement("div", {
+    ref: containerRef
+  });
+};
+export default Funnel;

package/dist/esm/Histogram/index.d.ts

@@ -1,6 +1,7 @@
-import type { HistogramConfig } from '@ant-design/plots';
 import React from 'react';
-import type { BasePlotProps } from '../types';
-export type HistogramProps = BasePlotProps<number> & Partial<HistogramConfig>;
+import type { BasePlotProps, Style, Theme } from '../types';
+export type HistogramProps = BasePlotProps<number> & Theme & Style & {
+    binNumber: number;
+};
 declare const Histogram: (props: HistogramProps) => React.JSX.Element;
 export default Histogram;

package/dist/esm/Histogram/index.js

@@ -1,6 +1,13 @@
+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); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { Histogram as ADCHistogram } from '@ant-design/plots';
 import React from 'react';
 import { usePlotConfig } from "../ConfigProvider/hooks";
+import { THEME_MAP } from "../theme";
 
 // binNumber和binWidth为互斥属性，选其一即可
 
@@ -9,17 +16,60 @@ var defaultConfig = function defaultConfig(props) {
     binField = _props$binField === void 0 ? function (d) {
       return d;
     } : _props$binField,
-    binNumber = props.binNumber;
-  return {
+    binNumber = props.binNumber,
+    _props$style = props.style,
+    style = _props$style === void 0 ? {} : _props$style;
+  var backgroundColor = style.backgroundColor,
+    palette = style.palette;
+  var hasPalette = !!(palette !== null && palette !== void 0 && palette[0]);
+  var paletteConfig = {
+    color: undefined
+  };
+  if (hasPalette) {
+    paletteConfig = {
+      color: {
+        range: palette
+      }
+    };
+  }
+  return _objectSpread({
     binField: binField,
     binNumber: binNumber,
     style: {
-      inset: 0.5
+      inset: 0.5,
+      minHeight: 1,
+      columnWidthRatio: 1
+    },
+    legend: false,
+    // @ts-ignore
+    encode: {
+      x: function x(d) {
+        return d;
+      },
+      y: 'count',
+      color: function color() {
+        return 'all';
+      }
+    },
+    scale: _objectSpread({
+      y: {
+        nice: true
+      }
+    }, paletteConfig)
+  }, backgroundColor ? {
+    viewStyle: {
+      viewFill: backgroundColor
     }
-  };
+  } : {
+    viewStyle: undefined
+  });
 };
 var Histogram = function Histogram(props) {
-  var config = usePlotConfig('Histogram', defaultConfig, props);
+  var _props$theme;
+  var themeConfig = THEME_MAP[(_props$theme = props.theme) !== null && _props$theme !== void 0 ? _props$theme : 'default'];
+  var config = usePlotConfig('Histogram', defaultConfig, _objectSpread(_objectSpread({}, props), {}, {
+    theme: themeConfig
+  }));
   return /*#__PURE__*/React.createElement(ADCHistogram, config);
 };
 export default Histogram;

package/dist/esm/IndentedTree/index.d.ts

@@ -1,6 +1,7 @@
 import React from 'react';
 import type { TreeGraphProps } from '../types';
 export interface IndentedTreeProps extends TreeGraphProps {
+    theme?: 'default' | 'academy';
 }
 declare const IndentedTree: React.FC<IndentedTreeProps>;
 export default IndentedTree;

package/dist/esm/IndentedTree/index.js

@@ -17,35 +17,42 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 import { IndentedTree as ADCIndentedTree } from '@ant-design/graphs';
 import React, { useMemo } from 'react';
 import { useGraphConfig } from "../ConfigProvider/hooks";
+import { G6THEME_MAP } from "../theme";
 import { visTreeData2GraphData } from "../utils/graph";
-var defaultConfig = {
-  type: 'linear',
-  autoFit: 'view',
-  autoResize: true,
-  zoomRange: [0.1, 5],
-  zoom: 1,
-  node: {
-    animation: {
-      update: false,
-      translate: false
-    }
-  },
-  edge: {
-    animation: {
-      update: false,
-      translate: false
-    }
-  },
-  transforms: function transforms(prev) {
-    return [].concat(_toConsumableArray(prev.filter(function (transform) {
-      return transform.type !== 'collapse-expand-react-node';
-    })), [_objectSpread(_objectSpread({}, prev.find(function (transform) {
-      return transform.type === 'collapse-expand-react-node';
-    })), {}, {
-      enable: true
-    })]);
-  },
-  behaviors: ['drag-canvas']
+var getDefaultConfig = function getDefaultConfig(props) {
+  var _props$theme = props.theme,
+    theme = _props$theme === void 0 ? 'default' : _props$theme;
+  return {
+    type: 'linear',
+    autoFit: 'view',
+    autoResize: true,
+    zoomRange: [0.1, 5],
+    zoom: 1,
+    node: {
+      animation: {
+        update: false,
+        translate: false
+      }
+    },
+    edge: {
+      animation: {
+        update: false,
+        translate: false
+      }
+    },
+    transforms: function transforms(prev) {
+      return [].concat(_toConsumableArray(prev.filter(function (transform) {
+        return transform.type !== 'collapse-expand-react-node';
+      })), [_objectSpread(_objectSpread({}, prev.find(function (transform) {
+        return transform.type === 'collapse-expand-react-node';
+      })), {}, {
+        enable: true
+      }), _objectSpread(_objectSpread({}, prev.find(function (transform) {
+        return transform.key === 'assign-color-by-branch';
+      }) || {}), G6THEME_MAP[theme])]);
+    },
+    behaviors: ['drag-canvas']
+  };
 };
 var IndentedTree = function IndentedTree(props) {
   var propsData = props.data,
@@ -53,7 +60,7 @@ var IndentedTree = function IndentedTree(props) {
   var data = useMemo(function () {
     return visTreeData2GraphData(propsData);
   }, [propsData]);
-  var config = useGraphConfig('IndentedTree', defaultConfig, restProps);
+  var config = useGraphConfig('IndentedTree', getDefaultConfig(props), restProps);
   return /*#__PURE__*/React.createElement(ADCIndentedTree, _extends({
     data: data
   }, config));