@easyv/config - npm Package Compare versions

Comparing version 1.0.43 to 1.0.44

lib/index.js

@@ -148,6 +148,6 @@ "use strict";
 });
-Object.defineProperty(exports, "legendOfPieNoIcon", {
+Object.defineProperty(exports, "legendOfDoublePie", {
   enumerable: true,
   get: function get() {
-    return _legend.legendOfPieNoIcon;
+    return _legend.legendOfDoublePie;
   }
@@ -257,2 +257,8 @@ });
 });
+Object.defineProperty(exports, "pieCurrent", {
+  enumerable: true,
+  get: function get() {
+    return _pie.current;
+  }
+});
 Object.defineProperty(exports, "brush", {
@@ -259,0 +265,0 @@ enumerable: true,

lib/legend.js

@@ -8,4 +8,6 @@ "use strict";
 });
-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"));
@@ -651,5 +653,11 @@
 exports.legendOfPie = legendOfPie;
-var defaultLegendOfPieNoIcon = {
+var defaultLegendOfDoublePie = {
   show: true,
-  order: '',
+  key: "legend",
+  displayName: "图例",
+  iconSize: {
+    width: 10,
+    height: 10
+  },
+  iconGap: 5,
   name: {
@@ -695,90 +703,111 @@ show: true,
 
-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,
+      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$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 ? defaultLegendOfPieNoIcon.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]],
@@ -917,11 +946,5 @@ name: 'name',
         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;
+      })
     }],
@@ -934,2 +957,2 @@ config: {
 
-exports.legendOfPieNoIcon = legendOfPieNoIcon;
+exports.legendOfDoublePie = legendOfDoublePie;

lib/pie.js

@@ -8,3 +8,3 @@ "use strict";
 });
-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;
 
@@ -528,2 +528,3 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
       nameFont = _ref9$current$name$fo === void 0 ? defaultCurrent.current.name.font : _ref9$current$name$fo,
+      nameTranslate = _ref9$current$name.translate,
       _ref9$current$percent = _ref9$current.percent;
@@ -585,3 +586,5 @@ _ref9$current$percent = _ref9$current$percent === void 0 ? defaultCurrent.current.percent : _ref9$current$percent;
         type: 'textStyle'
-      }]
+      }, _objectSpread(_objectSpread({}, (0, _.showRule)()), nameTranslate != undefined && (0, _.translate)(nameTranslate.x, nameTranslate.y))].filter(function (item) {
+        return !!item;
+      })
     }, {
@@ -656,2 +659,3 @@ rule: [['show', '$eq', true]],
 
+exports.current = current;
 var defaultBaseOuter = {
@@ -658,0 +662,0 @@ chart: {

package.json

 {
   "name": "@easyv/config",
-  "version": "1.0.43",
+  "version": "1.0.44",
   "description": "",
@@ -5,0 +5,0 @@ "main": "index.js",

src/index.js

@@ -14,3 +14,3 @@ import show, {showRule} from './show';
 import label, { labelOfPie, labelOfRose, axisLabel, valueAsixLabel } from './label';
-import legend, { legendOfPie, legendOfRose, legendOfPieNoIcon } from './legend';
+import legend, { legendOfPie, legendOfRose, legendOfDoublePie } from './legend';
 import tooltip from './tooltip';
@@ -20,3 +20,3 @@ import axes, { valueAxis, categoryAxis } from './axes';
 import { bandSeries, lineSeries, areaSeries, pieSeries, purePieSeries } from './series';
-import pie, { rosePie, rosePieDecorate, donut, carouselDonut, nestRosePie, carouselDonut2 } from './pie';
+import pie, { rosePie, rosePieDecorate, donut, carouselDonut, nestRosePie, carouselDonut2, current as pieCurrent } from './pie';
 import brush from './brush';
@@ -58,3 +58,3 @@ import interaction from './interaction';
   legendOfRose,
-  legendOfPieNoIcon,
+  legendOfDoublePie,
   label,
@@ -72,4 +72,5 @@ labelOfPie,
   carouselDonut2,
+  pieCurrent,
   sc,
   shadow
 };

src/legend.js

@@ -675,5 +675,11 @@ const { translate: translateConfig, font, show: showConfig, showRule } = require('.');
 
-const defaultLegendOfPieNoIcon={
+const defaultLegendOfDoublePie={
   show: true,
-  order: '',
+  key:"legend",
+  displayName:"图例",
+  iconSize: {
+    width: 10,
+    height: 10,
+  },
+  iconGap: 5,
   name: { show: true, font: defaultFont },
@@ -706,59 +712,86 @@ percent: {
 };
-export const legendOfPieNoIcon = ({
-  show = defaultLegendOfPieNoIcon.show,
-  order = defaultLegendOfPieNoIcon.order,
+export const legendOfDoublePie = ({
+  show = defaultLegendOfDoublePie.show,
+  key = defaultLegendOfDoublePie.key,
+  displayName = defaultLegendOfDoublePie.displayName,
+  iconSize: {
+    width = defaultLegendOfDoublePie.iconSize.width,
+    height = defaultLegendOfDoublePie.iconSize.height,
+  } = defaultLegendOfDoublePie.iconSize,
+  iconGap = defaultLegendOfDoublePie.iconGap,
   name: {
-    show: showName = defaultLegendOfPieNoIcon.name.show,
-    font: nameFont = defaultLegendOfPieNoIcon.name.font,
-  } = defaultLegendOfPieNoIcon.name,
+    show: showName = defaultLegendOfDoublePie.name.show,
+    font: nameFont = defaultLegendOfDoublePie.name.font,
+  } = defaultLegendOfDoublePie.name,
   percent: {
-    show: showPercent = defaultLegendOfPieNoIcon.percent.show,
-    precision = defaultLegendOfPieNoIcon.percent.precision,
-    sameColor: percentSameColor = defaultLegendOfPieNoIcon.percent.sameColor,
-    gap: percentGap = defaultLegendOfPieNoIcon.percent.gap,
-    font: percentFont = defaultLegendOfPieNoIcon.percent.font,
-  } = defaultLegendOfPieNoIcon.percent,
+    show: showPercent = defaultLegendOfDoublePie.percent.show,
+    precision = defaultLegendOfDoublePie.percent.precision,
+    sameColor: percentSameColor = defaultLegendOfDoublePie.percent.sameColor,
+    gap: percentGap = defaultLegendOfDoublePie.percent.gap,
+    font: percentFont = defaultLegendOfDoublePie.percent.font,
+  } = defaultLegendOfDoublePie.percent,
   value: {
-    show: showValue = defaultLegendOfPieNoIcon.value.show,
-    sameColor: valueSameColor = defaultLegendOfPieNoIcon.value.sameColor,
-    gap: valueGap = defaultLegendOfPieNoIcon.value.gap,
-    font: valueFont = defaultLegendOfPieNoIcon.value.font,
+    show: showValue = defaultLegendOfDoublePie.value.show,
+    sameColor: valueSameColor = defaultLegendOfDoublePie.value.sameColor,
+    gap: valueGap = defaultLegendOfDoublePie.value.gap,
+    font: valueFont = defaultLegendOfDoublePie.value.font,
     suffix: {
-      show: showSuffix = defaultLegendOfPieNoIcon.value.suffix.show,
-      text = defaultLegendOfPieNoIcon.value.suffix.text,
-      fontSize = defaultLegendOfPieNoIcon.value.suffix.fontSize,
+      show: showSuffix = defaultLegendOfDoublePie.value.suffix.show,
+      text = defaultLegendOfDoublePie.value.suffix.text,
+      fontSize = defaultLegendOfDoublePie.value.suffix.fontSize,
       translate: {
-        x: suffixTranslateX = defaultLegendOfPieNoIcon.value.suffix.translate.x,
-        y: suffixTranslateY = defaultLegendOfPieNoIcon.value.suffix.translate.y,
-      } = defaultLegendOfPieNoIcon.value.suffix.translate,
-    } = defaultLegendOfPieNoIcon.value.suffix,
-  } = defaultLegendOfPieNoIcon.value,
+        x: suffixTranslateX = defaultLegendOfDoublePie.value.suffix.translate.x,
+        y: suffixTranslateY = defaultLegendOfDoublePie.value.suffix.translate.y,
+      } = defaultLegendOfDoublePie.value.suffix.translate,
+    } = defaultLegendOfDoublePie.value.suffix,
+  } = defaultLegendOfDoublePie.value,
   layout: {
-    gridTemplateColumns = defaultLegendOfPieNoIcon.layout.gridTemplateColumns,
+    gridTemplateColumns = defaultLegendOfDoublePie.layout.gridTemplateColumns,
     gridGap: {
-      gridRowGap = defaultLegendOfPieNoIcon.layout.gridGap.gridRowGap,
-      gridColumnGap = defaultLegendOfPieNoIcon.layout.gridGap.gridColumnGap,
-    } = defaultLegendOfPieNoIcon.layout.gridGap,
-    alignment = defaultLegendOfPieNoIcon.layout.alignment,
+      gridRowGap = defaultLegendOfDoublePie.layout.gridGap.gridRowGap,
+      gridColumnGap = defaultLegendOfDoublePie.layout.gridGap.gridColumnGap,
+    } = defaultLegendOfDoublePie.layout.gridGap,
+    alignment = defaultLegendOfDoublePie.layout.alignment,
     translate: {
-      x = defaultLegendOfPieNoIcon.layout.translate.x,
-      y = defaultLegendOfPieNoIcon.layout.translate.y,
-    } = defaultLegendOfPieNoIcon.layout.translate,
-  } = defaultLegendOfPieNoIcon.layout,
-} = defaultLegendOfPieNoIcon) => ({
-  name: 'legend',
-  displayName: '图例',
+      x = defaultLegendOfDoublePie.layout.translate.x,
+      y = defaultLegendOfDoublePie.layout.translate.y,
+    } = defaultLegendOfDoublePie.layout.translate,
+    extraInput = []
+  } = defaultLegendOfDoublePie.layout,
+} = defaultLegendOfDoublePie) => ({
+  name: key,
+  displayName: displayName,
   value: [
     showConfig(show),
     {
-      name: 'order',
-      displayName: '顺序',
-      value: order,
-      type: 'select',
+      ...showRule(),
+      name: 'iconSize',
+      displayName: '图标尺寸',
+      value: [
+        {
+          name: 'width',
+          displayName: '宽度',
+          value: width,
+          config: {
+            span: 12,
+          },
+        },
+        {
+          name: 'height',
+          displayName: '高度',
+          value: height,
+          config: {
+            span: 12,
+          },
+        },
+      ],
+      type: 'group',
+    },
+    {
+      ...showRule(),
+      name: 'iconGap',
+      displayName: '间距',
+      value: iconGap,
       config: {
-        options: [
-          { name: '数据返回顺序', value: '' },
-          { name: '从大到小', value: 'desc' },
-          { name: '从小到大', value: 'asc' },
-        ],
+        suffix: 'px',
       },
@@ -930,23 +963,4 @@ },
         },
-        {
-          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),
-      ],
+        ...extraInput
+      ].filter(item=>!!item),
     },
@@ -953,0 +967,0 @@ ],

src/pie.js

@@ -473,3 +473,3 @@ import { font, show as showConfig, showRule, translate as translateConfig, axisLine } from './';
 };
-const current = ({
+export const current = ({
   current: {
@@ -481,2 +481,3 @@ show = defaultCurrent.current.show,
       font: nameFont = defaultCurrent.current.name.font,
+      translate: nameTranslate
     } = defaultCurrent.current.name,
@@ -532,3 +533,7 @@ percent: {
         },
-      ],
+        {
+          ...showRule(),
+          ...nameTranslate!=undefined && translateConfig(nameTranslate.x,nameTranslate.y)
+        }
+      ].filter(item=>!!item),
     },
@@ -535,0 +540,0 @@ {

No alert changes

Improved metrics

Total package byte prevSize

287245

increased by0.71%

Lines of code

9884

increased by0.53%

No dependency changes