@easyv/config 1.0.37 → 1.0.38

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.carouselDonut = exports.donut = exports.rosePie = void 0;
+exports["default"] = exports.carouselDonut2 = exports.carouselDonut = exports.donut = exports.rosePieDecorate = exports.rosePie = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
@@ -89,7 +89,8 @@ var basePie = function basePie() {
 var defaultCategoryText = {
   categoryText: {
     show: true,
-    font: (0, _.font)()
+    font: (0, _.font)(),
+    gap: 10
   }
 };
 
@@ -97,9 +98,11 @@ var categoryText = function categoryText(_ref2) {
   var _ref2$categoryText = _ref2.categoryText;
   _ref2$categoryText = _ref2$categoryText === void 0 ? defaultCategoryText : _ref2$categoryText;
   var _ref2$categoryText$sh = _ref2$categoryText.show,
-      show = _ref2$categoryText$sh === void 0 ? defaultCategoryText.show : _ref2$categoryText$sh,
+      show = _ref2$categoryText$sh === void 0 ? defaultCategoryText.categoryText.show : _ref2$categoryText$sh,
       _ref2$categoryText$fo = _ref2$categoryText.font,
-      font = _ref2$categoryText$fo === void 0 ? defaultCategoryText.font : _ref2$categoryText$fo;
+      font = _ref2$categoryText$fo === void 0 ? defaultCategoryText.categoryText.font : _ref2$categoryText$fo,
+      _ref2$categoryText$ga = _ref2$categoryText.gap,
+      gap = _ref2$categoryText$ga === void 0 ? defaultCategoryText.categoryText.gap : _ref2$categoryText$ga;
   return {
     name: 'categoryText',
     displayName: '类目文本',
@@ -108,13 +111,20 @@ var categoryText = function categoryText(_ref2) {
       displayName: '显示',
       value: show,
       type: 'boolean'
-    }, {
-      rule: [['show', '$eq', true]],
+    }, _objectSpread(_objectSpread({}, (0, _.showRule)()), {}, {
       name: 'textStyle',
       displayName: '文本样式',
       value: font,
       type: "textStyle"
-    }]
+    }), _objectSpread(_objectSpread({}, (0, _.showRule)()), {}, {
+      name: 'gap',
+      displayName: '间距',
+      value: gap,
+      type: 'number',
+      config: {
+        suffix: "px"
+      }
+    })]
   };
 };
 
@@ -263,6 +273,92 @@ var decorate2 = function decorate2(_ref4) {
   };
 };
 
+var defaultOuterDecorate = {
+  color: "#CF00FF",
+  width: 10,
+  tick: {
+    show: true,
+    count: 12,
+    color: "#CF00FF",
+    width: 3,
+    length: 8
+  }
+};
+
+var outerDecorate = function outerDecorate() {
+  var _ref5 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : defaultOuterDecorate,
+      _ref5$color = _ref5.color,
+      color = _ref5$color === void 0 ? defaultOuterDecorate.color : _ref5$color,
+      _ref5$width = _ref5.width,
+      width = _ref5$width === void 0 ? defaultOuterDecorate.width : _ref5$width,
+      _ref5$tick = _ref5.tick;
+
+  _ref5$tick = _ref5$tick === void 0 ? defaultOuterDecorate.tick : _ref5$tick;
+  var _ref5$tick$show = _ref5$tick.show,
+      show = _ref5$tick$show === void 0 ? defaultOuterDecorate.tick.show : _ref5$tick$show,
+      _ref5$tick$count = _ref5$tick.count,
+      count = _ref5$tick$count === void 0 ? defaultOuterDecorate.tick.count : _ref5$tick$count,
+      _ref5$tick$color = _ref5$tick.color,
+      tickColor = _ref5$tick$color === void 0 ? defaultOuterDecorate.tick.color : _ref5$tick$color,
+      _ref5$tick$width = _ref5$tick.width,
+      tickWidth = _ref5$tick$width === void 0 ? defaultOuterDecorate.tick.width : _ref5$tick$width,
+      _ref5$tick$length = _ref5$tick.length,
+      length = _ref5$tick$length === void 0 ? defaultOuterDecorate.tick.length : _ref5$tick$length;
+  return {
+    name: 'outerDecorate',
+    displayName: '外环装饰',
+    value: [{
+      name: 'color',
+      displayName: '颜色',
+      value: color,
+      type: 'color'
+    }, {
+      name: "width",
+      displayName: "粗细",
+      value: width,
+      type: "number",
+      config: {
+        min: 0,
+        max: 100,
+        suffix: "px"
+      }
+    }, {
+      name: 'tick',
+      displayName: '刻度',
+      value: [(0, _.show)(show), _objectSpread(_objectSpread({}, (0, _.showRule)()), {}, {
+        name: "count",
+        displayName: "个数",
+        value: count,
+        type: "number",
+        config: {
+          min: 0
+        }
+      }), _objectSpread(_objectSpread({}, (0, _.showRule)()), {}, {
+        name: "color",
+        displayName: "颜色",
+        value: tickColor,
+        type: "color"
+      }), _objectSpread(_objectSpread({}, (0, _.showRule)()), {}, {
+        name: "width",
+        displayName: "粗细",
+        value: tickWidth,
+        type: "number",
+        config: {
+          suffix: "px"
+        }
+      }), _objectSpread(_objectSpread({}, (0, _.showRule)()), {}, {
+        name: "length",
+        displayName: "长度",
+        value: length,
+        type: "number",
+        config: {
+          suffix: "px"
+        }
+      })]
+    }]
+  };
+};
+
 var defaultCurrent = {
   current: {
     show: true,
@@ -301,54 +397,54 @@ var defaultCurrent = {
 };
 
 var current = function current() {
-  var _ref5 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : defaultCurrent,
-      _ref5$current = _ref5.current;
-
-  _ref5$current = _ref5$current === void 0 ? defaultCurrent.current : _ref5$current;
-  var _ref5$current$show = _ref5$current.show,
-      show = _ref5$current$show === void 0 ? defaultCurrent.current.show : _ref5$current$show,
-      _ref5$current$gap = _ref5$current.gap,
-      gap = _ref5$current$gap === void 0 ? defaultCurrent.current.gap : _ref5$current$gap,
-      _ref5$current$name = _ref5$current.name;
-  _ref5$current$name = _ref5$current$name === void 0 ? defaultCurrent.current.name : _ref5$current$name;
-  var _ref5$current$name$sh = _ref5$current$name.show,
-      showName = _ref5$current$name$sh === void 0 ? defaultCurrent.current.name.show : _ref5$current$name$sh,
-      _ref5$current$name$fo = _ref5$current$name.font,
-      nameFont = _ref5$current$name$fo === void 0 ? defaultCurrent.current.name.font : _ref5$current$name$fo,
-      _ref5$current$percent = _ref5$current.percent;
-  _ref5$current$percent = _ref5$current$percent === void 0 ? defaultCurrent.current.percent : _ref5$current$percent;
-  var _ref5$current$percent2 = _ref5$current$percent.show,
-      showPercent = _ref5$current$percent2 === void 0 ? defaultCurrent.current.percent.show : _ref5$current$percent2,
-      _ref5$current$percent3 = _ref5$current$percent.precision,
-      precision = _ref5$current$percent3 === void 0 ? defaultCurrent.current.percent.precision : _ref5$current$percent3,
-      _ref5$current$percent4 = _ref5$current$percent.font,
-      percentFont = _ref5$current$percent4 === void 0 ? defaultCurrent.current.percent.font : _ref5$current$percent4,
-      _ref5$current$percent5 = _ref5$current$percent.translate;
-  _ref5$current$percent5 = _ref5$current$percent5 === void 0 ? defaultCurrent.current.percent.translate : _ref5$current$percent5;
-  var percentTranslateX = _ref5$current$percent5.x,
-      percentTranslateY = _ref5$current$percent5.y,
-      _ref5$current$value = _ref5$current.value;
-  _ref5$current$value = _ref5$current$value === void 0 ? defaultCurrent.current.value : _ref5$current$value;
-  var _ref5$current$value$s = _ref5$current$value.show,
-      showValue = _ref5$current$value$s === void 0 ? defaultCurrent.current.value.show : _ref5$current$value$s,
-      _ref5$current$value$f = _ref5$current$value.font,
-      valueFont = _ref5$current$value$f === void 0 ? defaultCurrent.current.value.font : _ref5$current$value$f,
-      _ref5$current$value$t = _ref5$current$value.translate;
-  _ref5$current$value$t = _ref5$current$value$t === void 0 ? defaultCurrent.current.value.translate : _ref5$current$value$t;
-  var valueTranslateX = _ref5$current$value$t.x,
-      valueTranslateY = _ref5$current$value$t.y,
-      _ref5$current$value$s2 = _ref5$current$value.suffix;
-  _ref5$current$value$s2 = _ref5$current$value$s2 === void 0 ? defaultCurrent.current.value.suffix : _ref5$current$value$s2;
-  var _ref5$current$value$s3 = _ref5$current$value$s2.show,
-      showSuffix = _ref5$current$value$s3 === void 0 ? defaultCurrent.current.value.suffix.show : _ref5$current$value$s3,
-      _ref5$current$value$s4 = _ref5$current$value$s2.text,
-      text = _ref5$current$value$s4 === void 0 ? defaultCurrent.current.value.suffix.text : _ref5$current$value$s4,
-      _ref5$current$value$s5 = _ref5$current$value$s2.fontSize,
-      fontSize = _ref5$current$value$s5 === void 0 ? defaultCurrent.current.value.suffix.fontSize : _ref5$current$value$s5,
-      _ref5$current$value$s6 = _ref5$current$value$s2.translate;
-  _ref5$current$value$s6 = _ref5$current$value$s6 === void 0 ? defaultCurrent.current.value.suffix.translate : _ref5$current$value$s6;
-  var suffixTranslateX = _ref5$current$value$s6.x,
-      suffixTranslateY = _ref5$current$value$s6.y;
+  var _ref6 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : defaultCurrent,
+      _ref6$current = _ref6.current;
+
+  _ref6$current = _ref6$current === void 0 ? defaultCurrent.current : _ref6$current;
+  var _ref6$current$show = _ref6$current.show,
+      show = _ref6$current$show === void 0 ? defaultCurrent.current.show : _ref6$current$show,
+      _ref6$current$gap = _ref6$current.gap,
+      gap = _ref6$current$gap === void 0 ? defaultCurrent.current.gap : _ref6$current$gap,
+      _ref6$current$name = _ref6$current.name;
+  _ref6$current$name = _ref6$current$name === void 0 ? defaultCurrent.current.name : _ref6$current$name;
+  var _ref6$current$name$sh = _ref6$current$name.show,
+      showName = _ref6$current$name$sh === void 0 ? defaultCurrent.current.name.show : _ref6$current$name$sh,
+      _ref6$current$name$fo = _ref6$current$name.font,
+      nameFont = _ref6$current$name$fo === void 0 ? defaultCurrent.current.name.font : _ref6$current$name$fo,
+      _ref6$current$percent = _ref6$current.percent;
+  _ref6$current$percent = _ref6$current$percent === void 0 ? defaultCurrent.current.percent : _ref6$current$percent;
+  var _ref6$current$percent2 = _ref6$current$percent.show,
+      showPercent = _ref6$current$percent2 === void 0 ? defaultCurrent.current.percent.show : _ref6$current$percent2,
+      _ref6$current$percent3 = _ref6$current$percent.precision,
+      precision = _ref6$current$percent3 === void 0 ? defaultCurrent.current.percent.precision : _ref6$current$percent3,
+      _ref6$current$percent4 = _ref6$current$percent.font,
+      percentFont = _ref6$current$percent4 === void 0 ? defaultCurrent.current.percent.font : _ref6$current$percent4,
+      _ref6$current$percent5 = _ref6$current$percent.translate;
+  _ref6$current$percent5 = _ref6$current$percent5 === void 0 ? defaultCurrent.current.percent.translate : _ref6$current$percent5;
+  var percentTranslateX = _ref6$current$percent5.x,
+      percentTranslateY = _ref6$current$percent5.y,
+      _ref6$current$value = _ref6$current.value;
+  _ref6$current$value = _ref6$current$value === void 0 ? defaultCurrent.current.value : _ref6$current$value;
+  var _ref6$current$value$s = _ref6$current$value.show,
+      showValue = _ref6$current$value$s === void 0 ? defaultCurrent.current.value.show : _ref6$current$value$s,
+      _ref6$current$value$f = _ref6$current$value.font,
+      valueFont = _ref6$current$value$f === void 0 ? defaultCurrent.current.value.font : _ref6$current$value$f,
+      _ref6$current$value$t = _ref6$current$value.translate;
+  _ref6$current$value$t = _ref6$current$value$t === void 0 ? defaultCurrent.current.value.translate : _ref6$current$value$t;
+  var valueTranslateX = _ref6$current$value$t.x,
+      valueTranslateY = _ref6$current$value$t.y,
+      _ref6$current$value$s2 = _ref6$current$value.suffix;
+  _ref6$current$value$s2 = _ref6$current$value$s2 === void 0 ? defaultCurrent.current.value.suffix : _ref6$current$value$s2;
+  var _ref6$current$value$s3 = _ref6$current$value$s2.show,
+      showSuffix = _ref6$current$value$s3 === void 0 ? defaultCurrent.current.value.suffix.show : _ref6$current$value$s3,
+      _ref6$current$value$s4 = _ref6$current$value$s2.text,
+      text = _ref6$current$value$s4 === void 0 ? defaultCurrent.current.value.suffix.text : _ref6$current$value$s4,
+      _ref6$current$value$s5 = _ref6$current$value$s2.fontSize,
+      fontSize = _ref6$current$value$s5 === void 0 ? defaultCurrent.current.value.suffix.fontSize : _ref6$current$value$s5,
+      _ref6$current$value$s6 = _ref6$current$value$s2.translate;
+  _ref6$current$value$s6 = _ref6$current$value$s6 === void 0 ? defaultCurrent.current.value.suffix.translate : _ref6$current$value$s6;
+  var suffixTranslateX = _ref6$current$value$s6.x,
+      suffixTranslateY = _ref6$current$value$s6.y;
   return {
     name: 'current',
     displayName: '当前值',
@@ -453,15 +549,29 @@ var rosePie = function rosePie() {
 
 exports.rosePie = rosePie;
 
+var rosePieDecorate = function rosePieDecorate() {
+  var _basePie = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : defaultBasePie;
+
+  var _outerDecorate = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : defaultOuterDecorate;
+
+  return {
+    name: ' fan',
+    displayName: '环图属性',
+    value: [basePie(_basePie), outerDecorate(_outerDecorate)]
+  };
+};
+
+exports.rosePieDecorate = rosePieDecorate;
+
 var donut = function donut() {
-  var _ref6 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {
+  var _ref7 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {
     basePie: defaultBasePie,
     decorate: defaultDecorate
   },
-      _ref6$basePie = _ref6.basePie,
-      _basePie = _ref6$basePie === void 0 ? defaultBasePie : _ref6$basePie,
-      _ref6$decorate = _ref6.decorate,
-      _decorate = _ref6$decorate === void 0 ? defaultDecorate : _ref6$decorate;
+      _ref7$basePie = _ref7.basePie,
+      _basePie = _ref7$basePie === void 0 ? defaultBasePie : _ref7$basePie,
+      _ref7$decorate = _ref7.decorate,
+      _decorate = _ref7$decorate === void 0 ? defaultDecorate : _ref7$decorate;
 
   return {
     name: 'fan',
@@ -473,14 +583,14 @@ var donut = function donut() {
 exports.donut = donut;
 
 var carouselDonut = function carouselDonut() {
-  var _ref7 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {
+  var _ref8 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {
     basePie: defaultBasePie,
     current: defaultCurrent
   },
-      _ref7$basePie = _ref7.basePie,
-      _basePie = _ref7$basePie === void 0 ? defaultBasePie : _ref7$basePie,
-      _ref7$current = _ref7.current,
-      _current = _ref7$current === void 0 ? defaultCurrent : _ref7$current;
+      _ref8$basePie = _ref8.basePie,
+      _basePie = _ref8$basePie === void 0 ? defaultBasePie : _ref8$basePie,
+      _ref8$current = _ref8.current,
+      _current = _ref8$current === void 0 ? defaultCurrent : _ref8$current;
 
   return {
     name: 'fan',
@@ -492,20 +602,20 @@ var carouselDonut = function carouselDonut() {
 exports.carouselDonut = carouselDonut;
 
 var carouselDonut2 = function carouselDonut2() {
-  var _ref8 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {
+  var _ref9 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {
     basePie: defaultBasePie,
     categoryText: defaultCategoryText,
     decorate2: defaultDecorate2,
     current: defaultCurrent
   },
-      _ref8$basePie = _ref8.basePie,
-      _basePie = _ref8$basePie === void 0 ? defaultBasePie : _ref8$basePie,
-      _ref8$categoryText = _ref8.categoryText,
-      _categoryText = _ref8$categoryText === void 0 ? defaultCategoryText : _ref8$categoryText,
-      _ref8$decorate = _ref8.decorate2,
-      _decorate2 = _ref8$decorate === void 0 ? defaultDecorate2 : _ref8$decorate,
-      _ref8$current = _ref8.current,
-      _current = _ref8$current === void 0 ? defaultCurrent : _ref8$current;
+      _ref9$basePie = _ref9.basePie,
+      _basePie = _ref9$basePie === void 0 ? defaultBasePie : _ref9$basePie,
+      _ref9$categoryText = _ref9.categoryText,
+      _categoryText = _ref9$categoryText === void 0 ? defaultCategoryText : _ref9$categoryText,
+      _ref9$decorate = _ref9.decorate2,
+      _decorate2 = _ref9$decorate === void 0 ? defaultDecorate2 : _ref9$decorate,
+      _ref9$current = _ref9.current,
+      _current = _ref9$current === void 0 ? defaultCurrent : _ref9$current;
 
   return {
     name: 'fan',
@@ -537,34 +647,34 @@ var defaultPie = {
 };
 
 var _default = function _default() {
-  var _ref9 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : defaultPie,
-      _ref9$fan = _ref9.fan;
-
-  _ref9$fan = _ref9$fan === void 0 ? defaultPie.fan : _ref9$fan;
-  var _ref9$fan$chart = _ref9$fan.chart;
-  _ref9$fan$chart = _ref9$fan$chart === void 0 ? defaultPie.fan.chart : _ref9$fan$chart;
-  var _ref9$fan$chart$outer = _ref9$fan$chart.outerRadius,
-      outerRadius = _ref9$fan$chart$outer === void 0 ? defaultPie.fan.chart.outerRadius : _ref9$fan$chart$outer,
-      _ref9$fan$chart$rose = _ref9$fan$chart.rose,
-      rose = _ref9$fan$chart$rose === void 0 ? defaultPie.fan.chart.rose : _ref9$fan$chart$rose,
-      _ref9$fan$chart$baseR = _ref9$fan$chart.baseRadius,
-      baseRadius = _ref9$fan$chart$baseR === void 0 ? defaultPie.fan.chart.baseRadius : _ref9$fan$chart$baseR,
-      _ref9$fan$angle = _ref9$fan.angle;
-  _ref9$fan$angle = _ref9$fan$angle === void 0 ? defaultPie.fan.angle : _ref9$fan$angle;
-  var _ref9$fan$angle$start = _ref9$fan$angle.startAngle,
-      startAngle = _ref9$fan$angle$start === void 0 ? defaultPie.fan.angle.startAngle : _ref9$fan$angle$start,
-      _ref9$fan$angle$endAn = _ref9$fan$angle.endAngle,
-      endAngle = _ref9$fan$angle$endAn === void 0 ? defaultPie.fan.angle.endAngle : _ref9$fan$angle$endAn,
-      _ref9$fan$angle$antiC = _ref9$fan$angle.antiClockwise,
-      antiClockwise = _ref9$fan$angle$antiC === void 0 ? defaultPie.fan.angle.antiClockwise : _ref9$fan$angle$antiC,
-      _ref9$fan$stroke = _ref9$fan.stroke;
-  _ref9$fan$stroke = _ref9$fan$stroke === void 0 ? defaultPie.fan.stroke : _ref9$fan$stroke;
-  var _ref9$fan$stroke$show = _ref9$fan$stroke.show,
-      show = _ref9$fan$stroke$show === void 0 ? defaultPie.fan.stroke.show : _ref9$fan$stroke$show,
-      _ref9$fan$stroke$stro = _ref9$fan$stroke.strokeWidth,
-      strokeWidth = _ref9$fan$stroke$stro === void 0 ? defaultPie.fan.stroke.strokeWidth : _ref9$fan$stroke$stro,
-      _ref9$fan$stroke$colo = _ref9$fan$stroke.color,
-      color = _ref9$fan$stroke$colo === void 0 ? defaultPie.fan.stroke.color : _ref9$fan$stroke$colo;
+  var _ref10 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : defaultPie,
+      _ref10$fan = _ref10.fan;
+
+  _ref10$fan = _ref10$fan === void 0 ? defaultPie.fan : _ref10$fan;
+  var _ref10$fan$chart = _ref10$fan.chart;
+  _ref10$fan$chart = _ref10$fan$chart === void 0 ? defaultPie.fan.chart : _ref10$fan$chart;
+  var _ref10$fan$chart$oute = _ref10$fan$chart.outerRadius,
+      outerRadius = _ref10$fan$chart$oute === void 0 ? defaultPie.fan.chart.outerRadius : _ref10$fan$chart$oute,
+      _ref10$fan$chart$rose = _ref10$fan$chart.rose,
+      rose = _ref10$fan$chart$rose === void 0 ? defaultPie.fan.chart.rose : _ref10$fan$chart$rose,
+      _ref10$fan$chart$base = _ref10$fan$chart.baseRadius,
+      baseRadius = _ref10$fan$chart$base === void 0 ? defaultPie.fan.chart.baseRadius : _ref10$fan$chart$base,
+      _ref10$fan$angle = _ref10$fan.angle;
+  _ref10$fan$angle = _ref10$fan$angle === void 0 ? defaultPie.fan.angle : _ref10$fan$angle;
+  var _ref10$fan$angle$star = _ref10$fan$angle.startAngle,
+      startAngle = _ref10$fan$angle$star === void 0 ? defaultPie.fan.angle.startAngle : _ref10$fan$angle$star,
+      _ref10$fan$angle$endA = _ref10$fan$angle.endAngle,
+      endAngle = _ref10$fan$angle$endA === void 0 ? defaultPie.fan.angle.endAngle : _ref10$fan$angle$endA,
+      _ref10$fan$angle$anti = _ref10$fan$angle.antiClockwise,
+      antiClockwise = _ref10$fan$angle$anti === void 0 ? defaultPie.fan.angle.antiClockwise : _ref10$fan$angle$anti,
+      _ref10$fan$stroke = _ref10$fan.stroke;
+  _ref10$fan$stroke = _ref10$fan$stroke === void 0 ? defaultPie.fan.stroke : _ref10$fan$stroke;
+  var _ref10$fan$stroke$sho = _ref10$fan$stroke.show,
+      show = _ref10$fan$stroke$sho === void 0 ? defaultPie.fan.stroke.show : _ref10$fan$stroke$sho,
+      _ref10$fan$stroke$str = _ref10$fan$stroke.strokeWidth,
+      strokeWidth = _ref10$fan$stroke$str === void 0 ? defaultPie.fan.stroke.strokeWidth : _ref10$fan$stroke$str,
+      _ref10$fan$stroke$col = _ref10$fan$stroke.color,
+      color = _ref10$fan$stroke$col === void 0 ? defaultPie.fan.stroke.color : _ref10$fan$stroke$col;
   return {
     name: 'fan',
     displayName: '饼图属性',

package/lib/show.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = void 0;
+exports.showRule = exports["default"] = void 0;
 
 var _default = function _default() {
   var show = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
@@ -14,4 +14,15 @@ var _default = function _default() {
   };
 };
 
-exports["default"] = _default;
+exports["default"] = _default;
+
+var showRule = function showRule() {
+  var name = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "show";
+  var type = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "$eq";
+  var value = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+  return {
+    rule: [[name, type, value]]
+  };
+};
+
+exports.showRule = showRule;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@easyv/config",
-  "version": "1.0.37",
+  "version": "1.0.38",
   "description": "",
   "main": "index.js",
   "scripts": {

package/src/animation.js

@@ -1,4 +1,4 @@
-import { show as showConfig } from './';
+import { mutiColor } from './';
 const animation = {
   show: false,
   duration: 3,
@@ -126,33 +126,23 @@ const defaultAnimationOfCarousel= {
   show: true,
   current: { 
     width: 0.1, 
-    color: {
-      type: 'linear',
-      pure: '#fff',
-      linear: {
-        stops: [
-          { offset: 0, color: '#fff' },
-          { offset: 50, color: '#ff0' },
-          { offset: 100, color: '#f0f' }
-        ],
-        angle: 30,
-        opacity: 1
-      }
-    }
+    color: mutiColor(),
+    gap: 15
   },
   interval: 3,
   rotate: 30,
-  interactive: '',
+  interactive: true,
 };
 export const animationOfCarousel= ({
   show = defaultAnimationOfCarousel.show,
   current: {
     width = defaultAnimationOfCarousel.current.width,
     color = defaultAnimationOfCarousel.current.color,
+    gap = defaultAnimationOfCarousel.current.gap
   } = defaultAnimationOfCarousel.current,
   interval = defaultAnimationOfCarousel.interval,
   rotate = defaultAnimationOfCarousel.rotate,
-  interactive = defaultAnimationOfCarousel.interactive,
+  interactive = defaultAnimationOfCarousel.interactive
 } = defaultAnimationOfCarousel) => ({
   name: 'animation',
   displayName: '轮播动画',
@@ -180,6 +170,15 @@ export const animationOfCarousel= ({
           value: color,
           type: 'multicolor',
         },
+        {
+          name: 'gap',
+          displayName: '类目文本间距',
+          value: gap,
+          type: 'number',
+          config:{
+            suffix:"px"
+          }
+        }
       ],
       config: {
         defaultOpen: true,
@@ -208,19 +207,10 @@ export const animationOfCarousel= ({
       },
     },
     {
-      tip: '选择点击或悬浮，鼠标点击/悬浮各数据块时停止轮播仅显示当前数据信息',
-      rule: [['on', '$eq', true]],
       name: 'interactive',
-      displayName: '交互方式',
+      displayName: '点击交互',
       value: interactive,
-      type: 'radio',
-      config: {
-        options: [
-          { name: '无', value: '' },
-          { name: '点击', value: 'click' },
-          { name: '悬停', value: 'hover' },
-        ],
-      },
-    },
+      type:"boolean"
+    }
   ],
 });

package/src/axes.js

@@ -29,12 +29,12 @@ const defaultCategoryAxis = {
 };
 
 export const categoryAxis = ({
-  on = true,
+  on = defaultCategoryAxis.on,
   label = defaultCategoryAxis.label,
   axisLine: axisLine_ = defaultCategoryAxis.axisLine,
   tickLine: tickLine_ = defaultCategoryAxis.tickLine,
   gridLine: gridLine_ = defaultCategoryAxis.gridLine,
-}) => [
+} = defaultCategoryAxis) => [
   {
     name: 'on',
     displayName: '启用',
@@ -95,7 +95,7 @@ const defaultValueAxis = {
 };
 
 export const valueAxis = ({
-  on,
+  on = defaultValueAxis.on,
   label = defaultValueAxis.label,
   unit: unit_ = defaultValueAxis.unit,
   axisLine: axisLine_ = defaultValueAxis.axisLine,

package/src/index.js

@@ -1,4 +1,4 @@
-import show from './show';
+import show, {showRule} from './show';
 import font from './font';
 import translate from './translate';
 import gridLine from './gridLine';
@@ -7,6 +7,7 @@ import axisLine from './axisLine';
 import extent from './extent';
 import unit from './unit';
 import margin from './margin';
+import mutiColor from './mutiColor';
 import animation, { animationOfPie, animationOfCarousel } from './animation';
 import dimension from './dimension';
 import label, { labelOfPie, axisLabel } from './label';
@@ -15,18 +16,20 @@ import tooltip from './tooltip';
 import axes, { valueAxis, categoryAxis } from './axes';
 import mapping from './mapping';
 import { bandSeries, lineSeries, areaSeries, pieSeries } from './series';
-import pie, { rosePie, donut, carouselDonut, carouselDonut2 } from './pie';
+import pie, { rosePie, rosePieDecorate, donut, carouselDonut, carouselDonut2 } from './pie';
 import brush from './brush';
 import interaction from './interaction';
 
 export {
   show,
+  showRule,
   font,
   tooltip,
   translate,
   extent,
   unit,
   margin,
+  mutiColor,
   animation,
   animationOfPie,
   animationOfCarousel,
@@ -52,6 +55,7 @@ export {
   axisLabel,
   pie,
   rosePie,
+  rosePieDecorate,
   donut,
   carouselDonut,
   carouselDonut2

package/src/label.js

@@ -98,7 +98,7 @@ export const labelOfPie = ({
   show = defaultLabelOfPie.show,
   distance = defaultLabelOfPie.distance,
   lineLength = defaultLabelOfPie.lineLength,
-  lineColor = "",   //这个是可选项，如果不在main.js里赋值，就不会出现
+  lineColor,   //这个是可选项，如果不在main.js里赋值，就不会出现
   mode = defaultLabelOfPie.mode,
   translate: { x, y } = defaultLabelOfPie.show,
   name: {
@@ -155,8 +155,7 @@ export const labelOfPie = ({
         step: 1,
       },
     },
-    {
-      rule:[['show', '$eq', lineColor?true:"123456789"]],
+    lineColor !==undefined && {
       name:"lineColor",
       displayName:"线颜色",
       value:lineColor,
@@ -288,7 +287,7 @@ export const labelOfPie = ({
         },
       ],
     },
-  ],
+  ].filter((item) => !!item),
 });
 
 const defaultAxisLabel = {