@easyv/config 1.0.43 → 1.0.47

package/.babelrc

@@ -1,9 +1,9 @@
-{
-  "presets": ["@babel/preset-env", "@babel/preset-react"],
-  "plugins": [
-    "@babel/plugin-proposal-export-default-from",
-    "@babel/plugin-transform-runtime",
-    "@babel/plugin-proposal-class-properties",
-    "babel-plugin-transform-import-styles"
-  ]
-}
+{
+  "presets": ["@babel/preset-env", "@babel/preset-react"],
+  "plugins": [
+    "@babel/plugin-proposal-export-default-from",
+    "@babel/plugin-transform-runtime",
+    "@babel/plugin-proposal-class-properties",
+    "babel-plugin-transform-import-styles"
+  ]
+}

package/index.js

@@ -1,3 +1,3 @@
-const config = require('./lib');
-
-module.exports = config;
+const config = require('./lib');
+
+module.exports = config;

package/lib/index.js

@@ -145,10 +145,10 @@ Object.defineProperty(exports, "legendOfRose", {
     return _legend.legendOfRose;
   }
 });
-Object.defineProperty(exports, "legendOfPieNoIcon", {
+Object.defineProperty(exports, "legendOfDoublePie", {
   enumerable: true,
   get: function get() {
-    return _legend.legendOfPieNoIcon;
+    return _legend.legendOfDoublePie;
   }
 });
 Object.defineProperty(exports, "tooltip", {
@@ -253,6 +253,12 @@ Object.defineProperty(exports, "carouselDonut2", {
     return _pie.carouselDonut2;
   }
 });
+Object.defineProperty(exports, "pieCurrent", {
+  enumerable: true,
+  get: function get() {
+    return _pie.current;
+  }
+});
 Object.defineProperty(exports, "brush", {
   enumerable: true,
   get: function get() {

package/lib/interaction.js

@@ -9,8 +9,8 @@ exports["default"] = void 0;
 
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
-/**
- * TODO:有个触发回调的类型
+/**
+ * TODO:有个触发回调的类型
  */
 var defaultAction = 'click';
 var defaultCallback = {

package/lib/legend.js

@@ -5,7 +5,9 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.legendOfPieNoIcon = exports.legendOfPie = exports.legendOfRose = exports["default"] = void 0;
+exports.legendOfDoublePie = exports.legendOfPie = exports.legendOfRose = exports["default"] = void 0;
+
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
@@ -647,9 +649,15 @@ var legendOfPie = function legendOfPie() {
 };
 
 exports.legendOfPie = legendOfPie;
-var defaultLegendOfPieNoIcon = {
+var defaultLegendOfDoublePie = {
   show: true,
-  order: '',
+  key: "legend",
+  displayName: "图例",
+  iconSize: {
+    width: 10,
+    height: 10
+  },
+  iconGap: 5,
   name: {
     show: true,
     font: defaultFont
@@ -690,94 +698,115 @@ var defaultLegendOfPieNoIcon = {
   }
 };
 
-var legendOfPieNoIcon = function legendOfPieNoIcon() {
-  var _ref4 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : defaultLegendOfPieNoIcon,
+var legendOfDoublePie = function legendOfDoublePie() {
+  var _ref4 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : defaultLegendOfDoublePie,
       _ref4$show = _ref4.show,
-      show = _ref4$show === void 0 ? defaultLegendOfPieNoIcon.show : _ref4$show,
-      _ref4$order = _ref4.order,
-      order = _ref4$order === void 0 ? defaultLegendOfPieNoIcon.order : _ref4$order,
-      _ref4$name = _ref4.name;
+      show = _ref4$show === void 0 ? defaultLegendOfDoublePie.show : _ref4$show,
+      _ref4$key = _ref4.key,
+      key = _ref4$key === void 0 ? defaultLegendOfDoublePie.key : _ref4$key,
+      _ref4$displayName = _ref4.displayName,
+      displayName = _ref4$displayName === void 0 ? defaultLegendOfDoublePie.displayName : _ref4$displayName,
+      _ref4$iconSize = _ref4.iconSize;
 
-  _ref4$name = _ref4$name === void 0 ? defaultLegendOfPieNoIcon.name : _ref4$name;
+  _ref4$iconSize = _ref4$iconSize === void 0 ? defaultLegendOfDoublePie.iconSize : _ref4$iconSize;
+  var _ref4$iconSize$width = _ref4$iconSize.width,
+      width = _ref4$iconSize$width === void 0 ? defaultLegendOfDoublePie.iconSize.width : _ref4$iconSize$width,
+      _ref4$iconSize$height = _ref4$iconSize.height,
+      height = _ref4$iconSize$height === void 0 ? defaultLegendOfDoublePie.iconSize.height : _ref4$iconSize$height,
+      _ref4$iconGap = _ref4.iconGap,
+      iconGap = _ref4$iconGap === void 0 ? defaultLegendOfDoublePie.iconGap : _ref4$iconGap,
+      _ref4$name = _ref4.name;
+  _ref4$name = _ref4$name === void 0 ? defaultLegendOfDoublePie.name : _ref4$name;
   var _ref4$name$show = _ref4$name.show,
-      showName = _ref4$name$show === void 0 ? defaultLegendOfPieNoIcon.name.show : _ref4$name$show,
+      showName = _ref4$name$show === void 0 ? defaultLegendOfDoublePie.name.show : _ref4$name$show,
       _ref4$name$font = _ref4$name.font,
-      nameFont = _ref4$name$font === void 0 ? defaultLegendOfPieNoIcon.name.font : _ref4$name$font,
+      nameFont = _ref4$name$font === void 0 ? defaultLegendOfDoublePie.name.font : _ref4$name$font,
       _ref4$percent = _ref4.percent;
-  _ref4$percent = _ref4$percent === void 0 ? defaultLegendOfPieNoIcon.percent : _ref4$percent;
+  _ref4$percent = _ref4$percent === void 0 ? defaultLegendOfDoublePie.percent : _ref4$percent;
   var _ref4$percent$show = _ref4$percent.show,
-      showPercent = _ref4$percent$show === void 0 ? defaultLegendOfPieNoIcon.percent.show : _ref4$percent$show,
+      showPercent = _ref4$percent$show === void 0 ? defaultLegendOfDoublePie.percent.show : _ref4$percent$show,
       _ref4$percent$precisi = _ref4$percent.precision,
-      precision = _ref4$percent$precisi === void 0 ? defaultLegendOfPieNoIcon.percent.precision : _ref4$percent$precisi,
+      precision = _ref4$percent$precisi === void 0 ? defaultLegendOfDoublePie.percent.precision : _ref4$percent$precisi,
       _ref4$percent$sameCol = _ref4$percent.sameColor,
-      percentSameColor = _ref4$percent$sameCol === void 0 ? defaultLegendOfPieNoIcon.percent.sameColor : _ref4$percent$sameCol,
+      percentSameColor = _ref4$percent$sameCol === void 0 ? defaultLegendOfDoublePie.percent.sameColor : _ref4$percent$sameCol,
       _ref4$percent$gap = _ref4$percent.gap,
-      percentGap = _ref4$percent$gap === void 0 ? defaultLegendOfPieNoIcon.percent.gap : _ref4$percent$gap,
+      percentGap = _ref4$percent$gap === void 0 ? defaultLegendOfDoublePie.percent.gap : _ref4$percent$gap,
       _ref4$percent$font = _ref4$percent.font,
-      percentFont = _ref4$percent$font === void 0 ? defaultLegendOfPieNoIcon.percent.font : _ref4$percent$font,
+      percentFont = _ref4$percent$font === void 0 ? defaultLegendOfDoublePie.percent.font : _ref4$percent$font,
       _ref4$value = _ref4.value;
-  _ref4$value = _ref4$value === void 0 ? defaultLegendOfPieNoIcon.value : _ref4$value;
+  _ref4$value = _ref4$value === void 0 ? defaultLegendOfDoublePie.value : _ref4$value;
   var _ref4$value$show = _ref4$value.show,
-      showValue = _ref4$value$show === void 0 ? defaultLegendOfPieNoIcon.value.show : _ref4$value$show,
+      showValue = _ref4$value$show === void 0 ? defaultLegendOfDoublePie.value.show : _ref4$value$show,
       _ref4$value$sameColor = _ref4$value.sameColor,
-      valueSameColor = _ref4$value$sameColor === void 0 ? defaultLegendOfPieNoIcon.value.sameColor : _ref4$value$sameColor,
+      valueSameColor = _ref4$value$sameColor === void 0 ? defaultLegendOfDoublePie.value.sameColor : _ref4$value$sameColor,
       _ref4$value$gap = _ref4$value.gap,
-      valueGap = _ref4$value$gap === void 0 ? defaultLegendOfPieNoIcon.value.gap : _ref4$value$gap,
+      valueGap = _ref4$value$gap === void 0 ? defaultLegendOfDoublePie.value.gap : _ref4$value$gap,
       _ref4$value$font = _ref4$value.font,
-      valueFont = _ref4$value$font === void 0 ? defaultLegendOfPieNoIcon.value.font : _ref4$value$font,
+      valueFont = _ref4$value$font === void 0 ? defaultLegendOfDoublePie.value.font : _ref4$value$font,
       _ref4$value$suffix = _ref4$value.suffix;
-  _ref4$value$suffix = _ref4$value$suffix === void 0 ? defaultLegendOfPieNoIcon.value.suffix : _ref4$value$suffix;
+  _ref4$value$suffix = _ref4$value$suffix === void 0 ? defaultLegendOfDoublePie.value.suffix : _ref4$value$suffix;
   var _ref4$value$suffix$sh = _ref4$value$suffix.show,
-      showSuffix = _ref4$value$suffix$sh === void 0 ? defaultLegendOfPieNoIcon.value.suffix.show : _ref4$value$suffix$sh,
+      showSuffix = _ref4$value$suffix$sh === void 0 ? defaultLegendOfDoublePie.value.suffix.show : _ref4$value$suffix$sh,
       _ref4$value$suffix$te = _ref4$value$suffix.text,
-      text = _ref4$value$suffix$te === void 0 ? defaultLegendOfPieNoIcon.value.suffix.text : _ref4$value$suffix$te,
+      text = _ref4$value$suffix$te === void 0 ? defaultLegendOfDoublePie.value.suffix.text : _ref4$value$suffix$te,
       _ref4$value$suffix$fo = _ref4$value$suffix.fontSize,
-      fontSize = _ref4$value$suffix$fo === void 0 ? defaultLegendOfPieNoIcon.value.suffix.fontSize : _ref4$value$suffix$fo,
+      fontSize = _ref4$value$suffix$fo === void 0 ? defaultLegendOfDoublePie.value.suffix.fontSize : _ref4$value$suffix$fo,
       _ref4$value$suffix$tr = _ref4$value$suffix.translate;
-  _ref4$value$suffix$tr = _ref4$value$suffix$tr === void 0 ? defaultLegendOfPieNoIcon.value.suffix.translate : _ref4$value$suffix$tr;
+  _ref4$value$suffix$tr = _ref4$value$suffix$tr === void 0 ? defaultLegendOfDoublePie.value.suffix.translate : _ref4$value$suffix$tr;
   var _ref4$value$suffix$tr2 = _ref4$value$suffix$tr.x,
-      suffixTranslateX = _ref4$value$suffix$tr2 === void 0 ? defaultLegendOfPieNoIcon.value.suffix.translate.x : _ref4$value$suffix$tr2,
+      suffixTranslateX = _ref4$value$suffix$tr2 === void 0 ? defaultLegendOfDoublePie.value.suffix.translate.x : _ref4$value$suffix$tr2,
       _ref4$value$suffix$tr3 = _ref4$value$suffix$tr.y,
-      suffixTranslateY = _ref4$value$suffix$tr3 === void 0 ? defaultLegendOfPieNoIcon.value.suffix.translate.y : _ref4$value$suffix$tr3,
+      suffixTranslateY = _ref4$value$suffix$tr3 === void 0 ? defaultLegendOfDoublePie.value.suffix.translate.y : _ref4$value$suffix$tr3,
       _ref4$layout = _ref4.layout;
-  _ref4$layout = _ref4$layout === void 0 ? defaultLegendOfPieNoIcon.layout : _ref4$layout;
+  _ref4$layout = _ref4$layout === void 0 ? defaultLegendOfDoublePie.layout : _ref4$layout;
   var _ref4$layout$gridTemp = _ref4$layout.gridTemplateColumns,
-      gridTemplateColumns = _ref4$layout$gridTemp === void 0 ? defaultLegendOfPieNoIcon.layout.gridTemplateColumns : _ref4$layout$gridTemp,
+      gridTemplateColumns = _ref4$layout$gridTemp === void 0 ? defaultLegendOfDoublePie.layout.gridTemplateColumns : _ref4$layout$gridTemp,
       _ref4$layout$gridGap = _ref4$layout.gridGap;
-  _ref4$layout$gridGap = _ref4$layout$gridGap === void 0 ? defaultLegendOfPieNoIcon.layout.gridGap : _ref4$layout$gridGap;
+  _ref4$layout$gridGap = _ref4$layout$gridGap === void 0 ? defaultLegendOfDoublePie.layout.gridGap : _ref4$layout$gridGap;
   var _ref4$layout$gridGap$ = _ref4$layout$gridGap.gridRowGap,
-      gridRowGap = _ref4$layout$gridGap$ === void 0 ? defaultLegendOfPieNoIcon.layout.gridGap.gridRowGap : _ref4$layout$gridGap$,
+      gridRowGap = _ref4$layout$gridGap$ === void 0 ? defaultLegendOfDoublePie.layout.gridGap.gridRowGap : _ref4$layout$gridGap$,
       _ref4$layout$gridGap$2 = _ref4$layout$gridGap.gridColumnGap,
-      gridColumnGap = _ref4$layout$gridGap$2 === void 0 ? defaultLegendOfPieNoIcon.layout.gridGap.gridColumnGap : _ref4$layout$gridGap$2,
+      gridColumnGap = _ref4$layout$gridGap$2 === void 0 ? defaultLegendOfDoublePie.layout.gridGap.gridColumnGap : _ref4$layout$gridGap$2,
       _ref4$layout$alignmen = _ref4$layout.alignment,
-      alignment = _ref4$layout$alignmen === void 0 ? defaultLegendOfPieNoIcon.layout.alignment : _ref4$layout$alignmen,
+      alignment = _ref4$layout$alignmen === void 0 ? defaultLegendOfDoublePie.layout.alignment : _ref4$layout$alignmen,
       _ref4$layout$translat = _ref4$layout.translate;
-  _ref4$layout$translat = _ref4$layout$translat === void 0 ? defaultLegendOfPieNoIcon.layout.translate : _ref4$layout$translat;
+  _ref4$layout$translat = _ref4$layout$translat === void 0 ? defaultLegendOfDoublePie.layout.translate : _ref4$layout$translat;
   var _ref4$layout$translat2 = _ref4$layout$translat.x,
-      x = _ref4$layout$translat2 === void 0 ? defaultLegendOfPieNoIcon.layout.translate.x : _ref4$layout$translat2,
+      x = _ref4$layout$translat2 === void 0 ? defaultLegendOfDoublePie.layout.translate.x : _ref4$layout$translat2,
       _ref4$layout$translat3 = _ref4$layout$translat.y,
-      y = _ref4$layout$translat3 === void 0 ? defaultLegendOfPieNoIcon.layout.translate.y : _ref4$layout$translat3;
+      y = _ref4$layout$translat3 === void 0 ? defaultLegendOfDoublePie.layout.translate.y : _ref4$layout$translat3,
+      _ref4$layout$extraInp = _ref4$layout.extraInput,
+      extraInput = _ref4$layout$extraInp === void 0 ? [] : _ref4$layout$extraInp;
   return {
-    name: 'legend',
-    displayName: '图例',
-    value: [showConfig(show), {
-      name: 'order',
-      displayName: '顺序',
-      value: order,
-      type: 'select',
+    name: key,
+    displayName: displayName,
+    value: [showConfig(show), _objectSpread(_objectSpread({}, showRule()), {}, {
+      name: 'iconSize',
+      displayName: '图标尺寸',
+      value: [{
+        name: 'width',
+        displayName: '宽度',
+        value: width,
+        config: {
+          span: 12
+        }
+      }, {
+        name: 'height',
+        displayName: '高度',
+        value: height,
+        config: {
+          span: 12
+        }
+      }],
+      type: 'group'
+    }), _objectSpread(_objectSpread({}, showRule()), {}, {
+      name: 'iconGap',
+      displayName: '间距',
+      value: iconGap,
       config: {
-        options: [{
-          name: '数据返回顺序',
-          value: ''
-        }, {
-          name: '从大到小',
-          value: 'desc'
-        }, {
-          name: '从小到大',
-          value: 'asc'
-        }]
+        suffix: 'px'
       }
-    }, {
+    }), {
       rule: [['show', '$eq', true]],
       name: 'name',
       displayName: '类目',
@@ -911,15 +940,9 @@ var legendOfPieNoIcon = function legendOfPieNoIcon() {
           }
         }],
         type: 'group'
-      }, {
-        type: 'grid',
-        name: 'alignment',
-        displayName: '位置',
-        value: alignment,
-        config: {
-          options: ['left top', 'center top', 'right top', 'center left', '', 'center right', 'left bottom', 'center bottom', 'right bottom']
-        }
-      }, translateConfig(x, y)]
+      }].concat((0, _toConsumableArray2["default"])(extraInput)).filter(function (item) {
+        return !!item;
+      })
     }],
     config: {
       defaultOpen: true
@@ -927,4 +950,4 @@ var legendOfPieNoIcon = function legendOfPieNoIcon() {
   };
 };
 
-exports.legendOfPieNoIcon = legendOfPieNoIcon;
+exports.legendOfDoublePie = legendOfDoublePie;

package/lib/pie.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = exports.carouselDonut2 = exports.nestRosePie = exports.carouselDonut = exports.donut = exports.rosePieDecorate = exports.rosePie = void 0;
+exports["default"] = exports.carouselDonut2 = exports.nestRosePie = exports.carouselDonut = exports.donut = exports.rosePieDecorate = exports.rosePie = exports.current = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
@@ -524,6 +524,8 @@ var current = function current() {
       showName = _ref9$current$name$sh === void 0 ? defaultCurrent.current.name.show : _ref9$current$name$sh,
       _ref9$current$name$fo = _ref9$current$name.font,
       nameFont = _ref9$current$name$fo === void 0 ? defaultCurrent.current.name.font : _ref9$current$name$fo,
+      nameTranslate = _ref9$current$name.translate,
+      textBreak = _ref9$current$name.textBreak,
       _ref9$current$percent = _ref9$current.percent;
   _ref9$current$percent = _ref9$current$percent === void 0 ? defaultCurrent.current.percent : _ref9$current$percent;
   var _ref9$current$percent2 = _ref9$current$percent.show,
@@ -580,7 +582,12 @@ var current = function current() {
         displayName: '文本样式',
         value: nameFont,
         type: 'textStyle'
-      }]
+      }, nameTranslate != undefined && _objectSpread(_objectSpread({}, (0, _.showRule)()), (0, _.translate)(nameTranslate.x, nameTranslate.y)), textBreak != undefined && _objectSpread(_objectSpread({}, (0, _.showRule)()), (0, _.sc)("textBreak", "首行字数", "number", textBreak, {
+        min: 0,
+        suffix: "个"
+      }))].filter(function (item) {
+        return !!item;
+      })
     }, {
       rule: [['show', '$eq', true]],
       name: 'percent',
@@ -650,6 +657,7 @@ var current = function current() {
   };
 };
 
+exports.current = current;
 var defaultBaseOuter = {
   chart: {
     innerRadius: 0,

package/lib/series.js

@@ -259,7 +259,12 @@ var defaultIcon = {
     radius: 6
   },
   color: '#1283E3',
-  radius: 4
+  radius: 4,
+  image: 'components/static-image/superChart/fang.png',
+  size: {
+    width: 10,
+    height: 10
+  }
 };
 
 var commonLine = function commonLine() {
@@ -399,7 +404,15 @@ var icon = function icon() {
       _ref4$color = _ref4.color,
       color = _ref4$color === void 0 ? defaultIcon.color : _ref4$color,
       _ref4$radius = _ref4.radius,
-      radius = _ref4$radius === void 0 ? defaultIcon.radius : _ref4$radius;
+      radius = _ref4$radius === void 0 ? defaultIcon.radius : _ref4$radius,
+      _ref4$image = _ref4.image,
+      image = _ref4$image === void 0 ? defaultIcon.image : _ref4$image,
+      _ref4$size = _ref4.size;
+  _ref4$size = _ref4$size === void 0 ? defaultIcon.size : _ref4$size;
+  var _ref4$size$width = _ref4$size.width,
+      imageWidth = _ref4$size$width === void 0 ? defaultIcon.size.width : _ref4$size$width,
+      _ref4$size$height = _ref4$size.height,
+      imageHeight = _ref4$size$height === void 0 ? defaultIcon.size.height : _ref4$size$height;
   return {
     name: 'icon',
     displayName: '数据标记',
@@ -421,8 +434,39 @@ var icon = function icon() {
         }, {
           name: '双圆',
           value: 'double'
+        }, {
+          name: '自定义',
+          value: 'custom'
         }]
       }
+    }, {
+      rule: [['show', '$eq', true], ['mode', '$eq', 'custom']],
+      name: 'image',
+      displayName: '图片',
+      value: image,
+      type: 'uploadImage'
+    }, {
+      rule: [['show', '$eq', true], ['mode', '$eq', 'custom']],
+      name: 'size',
+      displayName: '尺寸',
+      value: [{
+        name: 'width',
+        displayName: '宽度',
+        value: imageWidth,
+        config: {
+          span: 12,
+          suffix: 'W'
+        }
+      }, {
+        name: 'height',
+        displayName: '高度',
+        value: imageHeight,
+        config: {
+          span: 12,
+          suffix: 'H'
+        }
+      }],
+      type: 'group'
     }, {
       rule: [['show', '$eq', true], ['mode', '$eq', 'double']],
       name: 'inner',

package/lib/tooltip.js

@@ -43,8 +43,9 @@ var defaultTooltip = {
           y: 0
         }
       },
-      lineHeight: 18,
       data: {
+        lineHeight: 18,
+        iconSize: 10,
         name: {
           fontFamily: 'Mircosoft Yahei',
           fontSize: 12,
@@ -60,6 +61,20 @@ var defaultTooltip = {
           bold: false,
           italic: false,
           letterSpacing: 0
+        },
+        suffix: {
+          font: {
+            fontFamily: 'Mircosoft Yahei',
+            fontSize: 12,
+            color: '#D4EFFC',
+            bold: false,
+            italic: false,
+            letterSpacing: 0
+          },
+          translate: {
+            x: 0,
+            y: 0
+          }
         }
       }
     }
@@ -123,11 +138,13 @@ var _default = function _default() {
   _ref$tip$data$xAxis$t = _ref$tip$data$xAxis$t === void 0 ? defaultTooltip.tip.data.xAxis.translate : _ref$tip$data$xAxis$t;
   var x = _ref$tip$data$xAxis$t.x,
       y = _ref$tip$data$xAxis$t.y,
-      _ref$tip$data$lineHei = _ref$tip$data.lineHeight,
-      lineHeight = _ref$tip$data$lineHei === void 0 ? defaultTooltip.tip.data.lineHeight : _ref$tip$data$lineHei,
       _ref$tip$data$data = _ref$tip$data.data;
   _ref$tip$data$data = _ref$tip$data$data === void 0 ? defaultTooltip.tip.data.data : _ref$tip$data$data;
-  var _ref$tip$data$data$na = _ref$tip$data$data.name;
+  var _ref$tip$data$data$li = _ref$tip$data$data.lineHeight,
+      lineHeight = _ref$tip$data$data$li === void 0 ? defaultTooltip.tip.data.lineHeight : _ref$tip$data$data$li,
+      _ref$tip$data$data$ic = _ref$tip$data$data.iconSize,
+      iconSize = _ref$tip$data$data$ic === void 0 ? defaultTooltip.tip.data.iconSize : _ref$tip$data$data$ic,
+      _ref$tip$data$data$na = _ref$tip$data$data.name;
   _ref$tip$data$data$na = _ref$tip$data$data$na === void 0 ? defaultTooltip.tip.data.data.name : _ref$tip$data$data$na;
   var nameFontFamily = _ref$tip$data$data$na.fontFamily,
       nameFontSize = _ref$tip$data$data$na.fontSize,
@@ -143,6 +160,16 @@ var _default = function _default() {
       valueFontBold = _ref$tip$data$data$va.bold,
       valueFontItalic = _ref$tip$data$data$va.italic,
       valueFontLetterSpacing = _ref$tip$data$data$va.letterSpacing,
+      _ref$tip$data$data$su = _ref$tip$data$data.suffix;
+  _ref$tip$data$data$su = _ref$tip$data$data$su === void 0 ? defaultTooltip.tip.data.data.suffix : _ref$tip$data$data$su;
+  var _ref$tip$data$data$su2 = _ref$tip$data$data$su.font;
+  _ref$tip$data$data$su2 = _ref$tip$data$data$su2 === void 0 ? defaultTooltip.tip.data.data.suffix.font : _ref$tip$data$data$su2;
+  var suffixFontFamily = _ref$tip$data$data$su2.fontFamily,
+      suffixFontSize = _ref$tip$data$data$su2.fontSize,
+      suffixColor = _ref$tip$data$data$su2.color,
+      suffixBold = _ref$tip$data$data$su2.bold,
+      suffixItalic = _ref$tip$data$data$su2.italic,
+      suffixLetterSpacing = _ref$tip$data$data$su2.letterSpacing,
       _ref$indicator = _ref.indicator;
   _ref$indicator = _ref$indicator === void 0 ? defaultTooltip.indicator : _ref$indicator;
   var _ref$indicator$width = _ref$indicator.width,
@@ -210,7 +237,7 @@ var _default = function _default() {
         displayName: '框内数据',
         value: [{
           name: 'xAxis',
-          displayName: 'X轴标签',
+          displayName: '类目标签',
           value: [{
             name: 'font',
             displayName: '文本样式',
@@ -246,14 +273,19 @@ var _default = function _default() {
             }
           }, (0, _.translate)(x, y)]
         }, {
-          displayName: '行高',
-          type: 'number',
-          value: lineHeight,
-          name: 'lineHeight'
-        }, {
-          displayName: '数据样式',
+          displayName: '数据',
           name: 'data',
           value: [{
+            displayName: '行间距',
+            type: 'number',
+            value: lineHeight,
+            name: 'lineHeight'
+          }, {
+            displayName: '图标尺寸',
+            type: 'number',
+            value: iconSize,
+            name: 'iconSize'
+          }, {
             name: 'name',
             displayName: '系列名称',
             value: {
@@ -277,6 +309,87 @@ var _default = function _default() {
               letterSpacing: valueFontLetterSpacing
             },
             type: 'textStyle'
+          }, {
+            name: 'suffix',
+            displayName: '后缀',
+            value: [{
+              name: 'show',
+              displayName: '显示',
+              value: false,
+              type: 'boolean'
+            }, {
+              name: 'content',
+              displayName: '内容',
+              value: [{
+                name: "suffixText1",
+                displayName: "后缀",
+                type: "object",
+                value: [{
+                  name: "suffix",
+                  displayName: "后缀",
+                  type: "group",
+                  value: [{
+                    name: "name",
+                    displayName: "系列名",
+                    value: "系列一",
+                    type: "input",
+                    config: {
+                      span: 12
+                    }
+                  }, {
+                    name: "suffix",
+                    displayName: "后缀",
+                    value: "%",
+                    type: "input",
+                    config: {
+                      span: 12
+                    }
+                  }]
+                }]
+              }],
+              config: {
+                template: [{
+                  name: "suffixText",
+                  displayName: "后缀",
+                  type: "object",
+                  value: [{
+                    name: "suffix",
+                    displayName: "后缀",
+                    type: "group",
+                    value: [{
+                      name: "name",
+                      displayName: "系列名",
+                      value: "",
+                      type: "input",
+                      config: {
+                        span: 12
+                      }
+                    }, {
+                      name: "suffix",
+                      displayName: "后缀",
+                      value: "",
+                      type: "input",
+                      config: {
+                        span: 12
+                      }
+                    }]
+                  }]
+                }]
+              },
+              type: 'array'
+            }, {
+              name: 'font',
+              displayName: '文本样式',
+              value: {
+                fontFamily: suffixFontFamily,
+                fontSize: suffixFontSize,
+                color: suffixColor,
+                bold: suffixBold,
+                italic: suffixItalic,
+                letterSpacing: suffixLetterSpacing
+              },
+              type: 'textStyle'
+            }, (0, _.translate)(x, y)]
           }]
         }]
       }]

package/package.json

@@ -1,23 +1,23 @@
-{
-  "name": "@easyv/config",
-  "version": "1.0.43",
-  "description": "",
-  "main": "index.js",
-  "scripts": {
-    "make": "babel src -d lib"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "devDependencies": {
-    "@babel/cli": "^7.6.0",
-    "@babel/core": "^7.11.5",
-    "@babel/plugin-proposal-class-properties": "^7.10.4",
-    "@babel/plugin-proposal-export-default-from": "^7.10.4",
-    "@babel/plugin-transform-runtime": "^7.11.5",
-    "@babel/preset-env": "^7.11.5",
-    "@babel/preset-react": "^7.10.4",
-    "babel-plugin-transform-import-styles": "0.0.11",
-    "babel-preset-env": "^1.7.0"
-  }
-}
+{
+  "name": "@easyv/config",
+  "version": "1.0.47",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "make": "babel src -d lib"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "devDependencies": {
+    "@babel/cli": "^7.6.0",
+    "@babel/core": "^7.11.5",
+    "@babel/plugin-proposal-class-properties": "^7.10.4",
+    "@babel/plugin-proposal-export-default-from": "^7.10.4",
+    "@babel/plugin-transform-runtime": "^7.11.5",
+    "@babel/preset-env": "^7.11.5",
+    "@babel/preset-react": "^7.10.4",
+    "babel-plugin-transform-import-styles": "0.0.11",
+    "babel-preset-env": "^1.7.0"
+  }
+}