@easyv/config 1.2.20 → 1.2.22

package/lib/tooltip.js

@@ -85,11 +85,12 @@ var defaultTooltip = {
     }
   },
   indicator: {
+    zIndex: "bottom",
     width: 12,
     color: 'RGBA(255,255,255,0.3)'
   }
 };
-var _default = exports["default"] = function _default() {
+var _default = function _default() {
   var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : defaultTooltip,
     _ref$auto = _ref.auto,
     auto = _ref$auto === void 0 ? defaultTooltip.auto : _ref$auto,
@@ -97,102 +98,104 @@ var _default = exports["default"] = function _default() {
     manual = _ref$manual === void 0 ? defaultTooltip.manual : _ref$manual,
     _ref$interval = _ref.interval,
     interval = _ref$interval === void 0 ? defaultTooltip.interval : _ref$interval,
-    _ref$tip = _ref.tip,
-    _ref$tip2 = _ref$tip === void 0 ? defaultTooltip.tip : _ref$tip,
-    _ref$tip2$translate = _ref$tip2.translate,
-    _ref$tip2$translate2 = _ref$tip2$translate === void 0 ? defaultTooltip.tip.translate : _ref$tip2$translate,
-    _ref$tip2$translate2$ = _ref$tip2$translate2.x,
-    tipTranslateX = _ref$tip2$translate2$ === void 0 ? defaultTooltip.tip.translate.x : _ref$tip2$translate2$,
-    _ref$tip2$translate2$2 = _ref$tip2$translate2.y,
-    tipTranslateY = _ref$tip2$translate2$2 === void 0 ? defaultTooltip.tip.translate.y : _ref$tip2$translate2$2,
-    _ref$tip2$bgType = _ref$tip2.bgType,
-    bgType = _ref$tip2$bgType === void 0 ? defaultTooltip.tip.bgType : _ref$tip2$bgType,
-    _ref$tip2$bgColor = _ref$tip2.bgColor,
-    bgColor = _ref$tip2$bgColor === void 0 ? defaultTooltip.tip.bgColor : _ref$tip2$bgColor,
-    _ref$tip2$image = _ref$tip2.image,
-    image = _ref$tip2$image === void 0 ? defaultTooltip.tip.image : _ref$tip2$image,
-    _ref$tip2$size = _ref$tip2.size,
-    _ref$tip2$size2 = _ref$tip2$size === void 0 ? defaultTooltip.tip.size : _ref$tip2$size,
-    _ref$tip2$size2$width = _ref$tip2$size2.width,
-    tipWidth = _ref$tip2$size2$width === void 0 ? defaultTooltip.tip.size.width : _ref$tip2$size2$width,
-    _ref$tip2$size2$heigh = _ref$tip2$size2.height,
-    tipHeight = _ref$tip2$size2$heigh === void 0 ? defaultTooltip.tip.size.height : _ref$tip2$size2$heigh,
-    _ref$tip2$margin = _ref$tip2.margin,
-    _ref$tip2$margin2 = _ref$tip2$margin === void 0 ? defaultTooltip.tip.margin : _ref$tip2$margin,
-    _ref$tip2$margin2$mar = _ref$tip2$margin2.marginTop,
-    marginTop = _ref$tip2$margin2$mar === void 0 ? defaultTooltip.tip.margin.marginTop : _ref$tip2$margin2$mar,
-    _ref$tip2$margin2$mar2 = _ref$tip2$margin2.marginBottom,
-    marginBottom = _ref$tip2$margin2$mar2 === void 0 ? defaultTooltip.tip.margin.marginBottom : _ref$tip2$margin2$mar2,
-    _ref$tip2$margin2$mar3 = _ref$tip2$margin2.marginLeft,
-    marginLeft = _ref$tip2$margin2$mar3 === void 0 ? defaultTooltip.tip.margin.marginLeft : _ref$tip2$margin2$mar3,
-    _ref$tip2$margin2$mar4 = _ref$tip2$margin2.marginRight,
-    marginRight = _ref$tip2$margin2$mar4 === void 0 ? defaultTooltip.tip.margin.marginRight : _ref$tip2$margin2$mar4,
-    _ref$tip2$data = _ref$tip2.data,
-    _ref$tip2$data2 = _ref$tip2$data === void 0 ? defaultTooltip.tip.data : _ref$tip2$data,
-    _ref$tip2$data2$xAxis = _ref$tip2$data2.xAxis,
-    _ref$tip2$data2$xAxis2 = _ref$tip2$data2$xAxis === void 0 ? defaultTooltip.tip.data.xAxis : _ref$tip2$data2$xAxis,
-    _ref$tip2$data2$xAxis3 = _ref$tip2$data2$xAxis2.background,
-    xAxisBg = _ref$tip2$data2$xAxis3 === void 0 ? defaultTooltip.tip.data.xAxis.background : _ref$tip2$data2$xAxis3,
-    _ref$tip2$data2$xAxis4 = _ref$tip2$data2$xAxis2.gap,
-    xAxisGap = _ref$tip2$data2$xAxis4 === void 0 ? defaultTooltip.tip.data.xAxis.gap : _ref$tip2$data2$xAxis4,
-    _ref$tip2$data2$xAxis5 = _ref$tip2$data2$xAxis2.font,
-    _ref$tip2$data2$xAxis6 = _ref$tip2$data2$xAxis5 === void 0 ? defaultTooltip.tip.data.xAxis.font : _ref$tip2$data2$xAxis5,
-    xAxisFontFamily = _ref$tip2$data2$xAxis6.fontFamily,
-    xAxisFontSize = _ref$tip2$data2$xAxis6.fontSize,
-    xAxisColor = _ref$tip2$data2$xAxis6.color,
-    xAxisBold = _ref$tip2$data2$xAxis6.bold,
-    xAxisItalic = _ref$tip2$data2$xAxis6.italic,
-    xAxisLetterSpacing = _ref$tip2$data2$xAxis6.letterSpacing,
-    _ref$tip2$data2$xAxis7 = _ref$tip2$data2$xAxis2.align,
-    align = _ref$tip2$data2$xAxis7 === void 0 ? defaultTooltip.tip.data.xAxis.align : _ref$tip2$data2$xAxis7,
-    _ref$tip2$data2$xAxis8 = _ref$tip2$data2$xAxis2.translate,
-    _ref$tip2$data2$xAxis9 = _ref$tip2$data2$xAxis8 === void 0 ? defaultTooltip.tip.data.xAxis.translate : _ref$tip2$data2$xAxis8,
-    x = _ref$tip2$data2$xAxis9.x,
-    y = _ref$tip2$data2$xAxis9.y,
-    _ref$tip2$data2$data = _ref$tip2$data2.data,
-    _ref$tip2$data2$data2 = _ref$tip2$data2$data === void 0 ? defaultTooltip.tip.data.data : _ref$tip2$data2$data,
-    _ref$tip2$data2$data3 = _ref$tip2$data2$data2.lineHeight,
-    lineHeight = _ref$tip2$data2$data3 === void 0 ? defaultTooltip.tip.data.lineHeight : _ref$tip2$data2$data3,
-    _ref$tip2$data2$data4 = _ref$tip2$data2$data2.gap,
-    dataGap = _ref$tip2$data2$data4 === void 0 ? defaultTooltip.tip.data.gap : _ref$tip2$data2$data4,
-    _ref$tip2$data2$data5 = _ref$tip2$data2$data2.iconSize,
-    iconSize = _ref$tip2$data2$data5 === void 0 ? defaultTooltip.tip.data.iconSize : _ref$tip2$data2$data5,
-    _ref$tip2$data2$data6 = _ref$tip2$data2$data2.num,
-    num = _ref$tip2$data2$data6 === void 0 ? defaultTooltip.tip.data.num : _ref$tip2$data2$data6,
-    _ref$tip2$data2$data7 = _ref$tip2$data2$data2.background,
-    dataBg = _ref$tip2$data2$data7 === void 0 ? defaultTooltip.tip.data.background : _ref$tip2$data2$data7,
-    _ref$tip2$data2$data8 = _ref$tip2$data2$data2.name,
-    _ref$tip2$data2$data9 = _ref$tip2$data2$data8 === void 0 ? defaultTooltip.tip.data.data.name : _ref$tip2$data2$data8,
-    nameFontFamily = _ref$tip2$data2$data9.fontFamily,
-    nameFontSize = _ref$tip2$data2$data9.fontSize,
-    nameColor = _ref$tip2$data2$data9.color,
-    nameBold = _ref$tip2$data2$data9.bold,
-    nameItalic = _ref$tip2$data2$data9.italic,
-    nameLetterSpacing = _ref$tip2$data2$data9.letterSpacing,
-    _ref$tip2$data2$data10 = _ref$tip2$data2$data2.value,
-    _ref$tip2$data2$data11 = _ref$tip2$data2$data10 === void 0 ? defaultTooltip.tip.data.data.value : _ref$tip2$data2$data10,
-    valueFontFamily = _ref$tip2$data2$data11.fontFamily,
-    valueFontSize = _ref$tip2$data2$data11.fontSize,
-    valueFontColor = _ref$tip2$data2$data11.color,
-    valueFontBold = _ref$tip2$data2$data11.bold,
-    valueFontItalic = _ref$tip2$data2$data11.italic,
-    valueFontLetterSpacing = _ref$tip2$data2$data11.letterSpacing,
-    _ref$tip2$data2$data12 = _ref$tip2$data2$data2.suffix,
-    _ref$tip2$data2$data13 = _ref$tip2$data2$data12 === void 0 ? defaultTooltip.tip.data.data.suffix : _ref$tip2$data2$data12,
-    _ref$tip2$data2$data14 = _ref$tip2$data2$data13.font,
-    _ref$tip2$data2$data15 = _ref$tip2$data2$data14 === void 0 ? defaultTooltip.tip.data.data.suffix.font : _ref$tip2$data2$data14,
-    suffixFontFamily = _ref$tip2$data2$data15.fontFamily,
-    suffixFontSize = _ref$tip2$data2$data15.fontSize,
-    suffixColor = _ref$tip2$data2$data15.color,
-    suffixBold = _ref$tip2$data2$data15.bold,
-    suffixItalic = _ref$tip2$data2$data15.italic,
-    suffixLetterSpacing = _ref$tip2$data2$data15.letterSpacing,
-    _ref$indicator = _ref.indicator,
-    _ref$indicator2 = _ref$indicator === void 0 ? defaultTooltip.indicator : _ref$indicator,
-    _ref$indicator2$width = _ref$indicator2.width,
-    width = _ref$indicator2$width === void 0 ? defaultTooltip.indicator.width : _ref$indicator2$width,
-    _ref$indicator2$color = _ref$indicator2.color,
-    color = _ref$indicator2$color === void 0 ? defaultTooltip.indicator.color : _ref$indicator2$color;
+    _ref$tip = _ref.tip;
+  _ref$tip = _ref$tip === void 0 ? defaultTooltip.tip : _ref$tip;
+  var _ref$tip$translate = _ref$tip.translate;
+  _ref$tip$translate = _ref$tip$translate === void 0 ? defaultTooltip.tip.translate : _ref$tip$translate;
+  var _ref$tip$translate$x = _ref$tip$translate.x,
+    tipTranslateX = _ref$tip$translate$x === void 0 ? defaultTooltip.tip.translate.x : _ref$tip$translate$x,
+    _ref$tip$translate$y = _ref$tip$translate.y,
+    tipTranslateY = _ref$tip$translate$y === void 0 ? defaultTooltip.tip.translate.y : _ref$tip$translate$y,
+    _ref$tip$bgType = _ref$tip.bgType,
+    bgType = _ref$tip$bgType === void 0 ? defaultTooltip.tip.bgType : _ref$tip$bgType,
+    _ref$tip$bgColor = _ref$tip.bgColor,
+    bgColor = _ref$tip$bgColor === void 0 ? defaultTooltip.tip.bgColor : _ref$tip$bgColor,
+    _ref$tip$image = _ref$tip.image,
+    image = _ref$tip$image === void 0 ? defaultTooltip.tip.image : _ref$tip$image,
+    _ref$tip$size = _ref$tip.size;
+  _ref$tip$size = _ref$tip$size === void 0 ? defaultTooltip.tip.size : _ref$tip$size;
+  var _ref$tip$size$width = _ref$tip$size.width,
+    tipWidth = _ref$tip$size$width === void 0 ? defaultTooltip.tip.size.width : _ref$tip$size$width,
+    _ref$tip$size$height = _ref$tip$size.height,
+    tipHeight = _ref$tip$size$height === void 0 ? defaultTooltip.tip.size.height : _ref$tip$size$height,
+    _ref$tip$margin = _ref$tip.margin;
+  _ref$tip$margin = _ref$tip$margin === void 0 ? defaultTooltip.tip.margin : _ref$tip$margin;
+  var _ref$tip$margin$margi = _ref$tip$margin.marginTop,
+    marginTop = _ref$tip$margin$margi === void 0 ? defaultTooltip.tip.margin.marginTop : _ref$tip$margin$margi,
+    _ref$tip$margin$margi2 = _ref$tip$margin.marginBottom,
+    marginBottom = _ref$tip$margin$margi2 === void 0 ? defaultTooltip.tip.margin.marginBottom : _ref$tip$margin$margi2,
+    _ref$tip$margin$margi3 = _ref$tip$margin.marginLeft,
+    marginLeft = _ref$tip$margin$margi3 === void 0 ? defaultTooltip.tip.margin.marginLeft : _ref$tip$margin$margi3,
+    _ref$tip$margin$margi4 = _ref$tip$margin.marginRight,
+    marginRight = _ref$tip$margin$margi4 === void 0 ? defaultTooltip.tip.margin.marginRight : _ref$tip$margin$margi4,
+    _ref$tip$data = _ref$tip.data;
+  _ref$tip$data = _ref$tip$data === void 0 ? defaultTooltip.tip.data : _ref$tip$data;
+  var _ref$tip$data$xAxis = _ref$tip$data.xAxis;
+  _ref$tip$data$xAxis = _ref$tip$data$xAxis === void 0 ? defaultTooltip.tip.data.xAxis : _ref$tip$data$xAxis;
+  var _ref$tip$data$xAxis$b = _ref$tip$data$xAxis.background,
+    xAxisBg = _ref$tip$data$xAxis$b === void 0 ? defaultTooltip.tip.data.xAxis.background : _ref$tip$data$xAxis$b,
+    _ref$tip$data$xAxis$g = _ref$tip$data$xAxis.gap,
+    xAxisGap = _ref$tip$data$xAxis$g === void 0 ? defaultTooltip.tip.data.xAxis.gap : _ref$tip$data$xAxis$g,
+    _ref$tip$data$xAxis$f = _ref$tip$data$xAxis.font;
+  _ref$tip$data$xAxis$f = _ref$tip$data$xAxis$f === void 0 ? defaultTooltip.tip.data.xAxis.font : _ref$tip$data$xAxis$f;
+  var xAxisFontFamily = _ref$tip$data$xAxis$f.fontFamily,
+    xAxisFontSize = _ref$tip$data$xAxis$f.fontSize,
+    xAxisColor = _ref$tip$data$xAxis$f.color,
+    xAxisBold = _ref$tip$data$xAxis$f.bold,
+    xAxisItalic = _ref$tip$data$xAxis$f.italic,
+    xAxisLetterSpacing = _ref$tip$data$xAxis$f.letterSpacing,
+    _ref$tip$data$xAxis$a = _ref$tip$data$xAxis.align,
+    align = _ref$tip$data$xAxis$a === void 0 ? defaultTooltip.tip.data.xAxis.align : _ref$tip$data$xAxis$a,
+    _ref$tip$data$xAxis$t = _ref$tip$data$xAxis.translate;
+  _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$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$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$ga = _ref$tip$data$data.gap,
+    dataGap = _ref$tip$data$data$ga === void 0 ? defaultTooltip.tip.data.gap : _ref$tip$data$data$ga,
+    _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$nu = _ref$tip$data$data.num,
+    num = _ref$tip$data$data$nu === void 0 ? defaultTooltip.tip.data.num : _ref$tip$data$data$nu,
+    _ref$tip$data$data$ba = _ref$tip$data$data.background,
+    dataBg = _ref$tip$data$data$ba === void 0 ? defaultTooltip.tip.data.background : _ref$tip$data$data$ba,
+    _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,
+    nameColor = _ref$tip$data$data$na.color,
+    nameBold = _ref$tip$data$data$na.bold,
+    nameItalic = _ref$tip$data$data$na.italic,
+    nameLetterSpacing = _ref$tip$data$data$na.letterSpacing,
+    _ref$tip$data$data$va = _ref$tip$data$data.value;
+  _ref$tip$data$data$va = _ref$tip$data$data$va === void 0 ? defaultTooltip.tip.data.data.value : _ref$tip$data$data$va;
+  var valueFontFamily = _ref$tip$data$data$va.fontFamily,
+    valueFontSize = _ref$tip$data$data$va.fontSize,
+    valueFontColor = _ref$tip$data$data$va.color,
+    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$zIndex = _ref$indicator.zIndex,
+    zIndex = _ref$indicator$zIndex === void 0 ? defaultTooltip.indicator.zIndex : _ref$indicator$zIndex,
+    _ref$indicator$width = _ref$indicator.width,
+    width = _ref$indicator$width === void 0 ? defaultTooltip.indicator.width : _ref$indicator$width,
+    _ref$indicator$color = _ref$indicator.color,
+    color = _ref$indicator$color === void 0 ? defaultTooltip.indicator.color : _ref$indicator$color;
   return {
     name: 'tooltip',
     displayName: '提示框',
@@ -464,6 +467,20 @@ var _default = exports["default"] = function _default() {
       name: 'indicator',
       displayName: '指示器',
       value: [{
+        name: 'zIndex',
+        displayName: '层级',
+        value: zIndex,
+        type: 'radio',
+        config: {
+          options: [{
+            name: "顶层",
+            value: "top"
+          }, {
+            name: "底层",
+            value: "bottom"
+          }]
+        }
+      }, {
         name: 'width',
         displayName: '粗细',
         value: width,
@@ -479,4 +496,5 @@ var _default = exports["default"] = function _default() {
       }]
     }]
   };
-};
+};
+exports["default"] = _default;

package/lib/translate.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.translate3d = exports["default"] = void 0;
-var _default = exports["default"] = function _default() {
+var _default = function _default() {
   var x = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
   var y = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
   return {
@@ -32,7 +32,8 @@ var _default = exports["default"] = function _default() {
     type: 'group'
   };
 };
-var translate3d = exports.translate3d = function translate3d() {
+exports["default"] = _default;
+var translate3d = function translate3d() {
   var x = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
   var y = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
   var z = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
@@ -69,4 +70,5 @@ var translate3d = exports.translate3d = function translate3d() {
     }],
     type: 'group'
   };
-};
+};
+exports.translate3d = translate3d;

package/lib/unit.js

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-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) { (0, _defineProperty2["default"])(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 ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var _require = require('.'),
   translate = _require.translate;
 var defaultUnit = {
@@ -26,32 +26,32 @@ var defaultUnit = {
     y: 0
   }
 };
-var _default = exports["default"] = function _default() {
+var _default = function _default() {
   var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : defaultUnit,
     _ref$show = _ref.show,
     show = _ref$show === void 0 ? defaultUnit.show : _ref$show,
     _ref$text = _ref.text,
     text = _ref$text === void 0 ? defaultUnit.text : _ref$text,
-    _ref$font = _ref.font,
-    _ref$font2 = _ref$font === void 0 ? defaultUnit.font : _ref$font,
-    _ref$font2$fontFamily = _ref$font2.fontFamily,
-    fontFamily = _ref$font2$fontFamily === void 0 ? defaultUnit.font.fontFamily : _ref$font2$fontFamily,
-    _ref$font2$fontSize = _ref$font2.fontSize,
-    fontSize = _ref$font2$fontSize === void 0 ? defaultUnit.font.fontSize : _ref$font2$fontSize,
-    _ref$font2$color = _ref$font2.color,
-    color = _ref$font2$color === void 0 ? defaultUnit.font.color : _ref$font2$color,
-    _ref$font2$bold = _ref$font2.bold,
-    bold = _ref$font2$bold === void 0 ? defaultUnit.font.bold : _ref$font2$bold,
-    _ref$font2$italic = _ref$font2.italic,
-    italic = _ref$font2$italic === void 0 ? defaultUnit.font.italic : _ref$font2$italic,
-    _ref$font2$letterSpac = _ref$font2.letterSpacing,
-    letterSpacing = _ref$font2$letterSpac === void 0 ? defaultUnit.font.letterSpacing : _ref$font2$letterSpac,
-    _ref$translate = _ref.translate,
-    _ref$translate2 = _ref$translate === void 0 ? defaultUnit.translate : _ref$translate,
-    _ref$translate2$x = _ref$translate2.x,
-    x = _ref$translate2$x === void 0 ? defaultUnit.translate.x : _ref$translate2$x,
-    _ref$translate2$y = _ref$translate2.y,
-    y = _ref$translate2$y === void 0 ? defaultUnit.translate.y : _ref$translate2$y;
+    _ref$font = _ref.font;
+  _ref$font = _ref$font === void 0 ? defaultUnit.font : _ref$font;
+  var _ref$font$fontFamily = _ref$font.fontFamily,
+    fontFamily = _ref$font$fontFamily === void 0 ? defaultUnit.font.fontFamily : _ref$font$fontFamily,
+    _ref$font$fontSize = _ref$font.fontSize,
+    fontSize = _ref$font$fontSize === void 0 ? defaultUnit.font.fontSize : _ref$font$fontSize,
+    _ref$font$color = _ref$font.color,
+    color = _ref$font$color === void 0 ? defaultUnit.font.color : _ref$font$color,
+    _ref$font$bold = _ref$font.bold,
+    bold = _ref$font$bold === void 0 ? defaultUnit.font.bold : _ref$font$bold,
+    _ref$font$italic = _ref$font.italic,
+    italic = _ref$font$italic === void 0 ? defaultUnit.font.italic : _ref$font$italic,
+    _ref$font$letterSpaci = _ref$font.letterSpacing,
+    letterSpacing = _ref$font$letterSpaci === void 0 ? defaultUnit.font.letterSpacing : _ref$font$letterSpaci,
+    _ref$translate = _ref.translate;
+  _ref$translate = _ref$translate === void 0 ? defaultUnit.translate : _ref$translate;
+  var _ref$translate$x = _ref$translate.x,
+    x = _ref$translate$x === void 0 ? defaultUnit.translate.x : _ref$translate$x,
+    _ref$translate$y = _ref$translate.y,
+    y = _ref$translate$y === void 0 ? defaultUnit.translate.y : _ref$translate$y;
   return {
     name: 'unit',
     displayName: '轴单位',
@@ -84,4 +84,5 @@ var _default = exports["default"] = function _default() {
       rule: [['show', '$eq', true]]
     }, translate(x, y))]
   };
-};
+};
+exports["default"] = _default;

package/package.json

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

package/src/legend.js

@@ -101,8 +101,6 @@ export default ({
   displayName: '图例',
   value: [
     showConfig(show),
-    overflow!=undefined && sc("maxWidth","宽度","number",maxWidth,{suffix:"px"},showRule()),
-    ...(overflow!=undefined?textOverflow(overflow):[]),
     {
       rule: [['show', '$eq', true]],
       name: 'font',
@@ -111,6 +109,8 @@ export default ({
       type: 'textStyle',
       markColorType: 'textColor',
     },
+    sc("maxWidth","宽度","number",maxWidth,{suffix:"px"},showRule()),
+    ...textOverflow(overflow),
     {
       name: 'iconSize',
       displayName: '图标尺寸',
@@ -635,6 +635,79 @@ export const legendOfPie = ({
       displayName: '真实值',
       value: [
         showConfig(showValue),
+        {
+          ...showRule(undefined, undefined, false),
+          name: "splitConfig",
+          displayName: "分割",
+          value: [
+            {
+              name: "show",
+              displayName: "开启",
+              type: "boolean",
+              value: true
+            }, 
+            {
+              rule: [["show", "$eq", true]],
+              type: "number",
+              name: "splitCount",
+              displayName: "分割位数",
+              value: 3,
+            }, 
+            {
+              rule: [["show", "$eq", true]],
+              type: "radio",
+              name: "style",
+              displayName: "样式",
+              value: "default",
+              config: {
+                options: [{ name: "默认", value: "default" }, { name: "自定义", value: "custom" }],
+                mode: "normal",
+              },
+            }, 
+            {
+              rule: [["style", "$eq", "custom"]],
+              type: "input",
+              name: "separator",
+              displayName: "分隔符",
+              value: ",",
+            }, 
+            {
+              rule: [["show", "$eq", true], ["style", "$eq", "custom"]],
+              type: "font",
+              name: "fontFamily",
+              displayName: "分隔符字体",
+              value: "Microsoft Yahei"
+            },
+            {
+              rule: [["show", "$eq", true]],
+              type: "group",
+              name: "margin",
+              displayName: "间距",
+              value: [
+                {
+                  name: "left",
+                  displayName: "左",
+                  value: 0,
+                  type: "number",
+                  config: {
+                    span: 12,
+                    suffix: 'px'
+                  }
+                },
+                {
+                  name: "right",
+                  displayName: "右",
+                  value: 0,
+                  type: "number",
+                  config: {
+                    span: 12,
+                    suffix: 'px'
+                  }
+                }
+              ]
+            }
+          ]
+        },
         {
           ...showRule(),
           name: 'suffix',

package/src/series.js

@@ -19,7 +19,15 @@ const defaultBandSeries = {
       opacity: 1,
     },
   },
-  borderColor:"#20ADFF",
+  borderColor:multiColor({
+    type:"pure",
+    linear:{
+      stops:[
+        { color:"rgba(218,237,255,1)", offset:0 },
+        { color:"rgba(24,144,255,0.24)", offset:100 }
+      ]
+    }
+  }),
   borderWidth:0,
   highlight: {
     show: false,
@@ -120,26 +128,6 @@ export const bandSeries = (
         value: fill,
         markColorType: 'seriesGradient'
       },
-      fillType !== undefined && {
-        rule: [['fillType', '$eq', 'color']],
-        name: 'border',
-        displayName: '描边',
-        value:[
-          {
-            name:"borderWidth",
-            displayName:"线宽",
-            type:"number",
-            value:borderWidth,
-            config:{ min:0 }
-          },
-          {
-            name:"borderColor",
-            displayName:"描边颜色",
-            type:"color",
-            value:borderColor
-          }
-        ]
-      },
       fillType !== undefined && {
         rule: [['fillType', '$eq', 'pattern']],
         name: 'url',
@@ -182,25 +170,6 @@ export const bandSeries = (
         value: fill,
         markColorType: 'seriesGradient',
       },
-      patternType !== undefined && {
-        name: 'border',
-        displayName: '描边',
-        value:[
-          {
-            name:"borderWidth",
-            displayName:"线宽",
-            type:"number",
-            value:borderWidth,
-            config:{ min:0 }
-          },
-          {
-            name:"borderColor",
-            displayName:"描边颜色",
-            type:"color",
-            value:borderColor
-          }
-        ]
-      },
       patternType !== undefined && {
         name: 'patternType',
         displayName: '纹理类型',
@@ -238,6 +207,44 @@ export const bandSeries = (
           suffix: 'px',
         },
       },
+      fillType !== undefined && {
+        name: 'border',
+        displayName: '描边',
+        value:[
+          {
+            name:"borderWidth",
+            displayName:"线宽",
+            type:"number",
+            value:borderWidth,
+            config:{ min:0 }
+          },
+          {
+            name:"borderColor",
+            displayName:"描边颜色",
+            type:"multicolor",
+            value:borderColor
+          }
+        ]
+      },
+      (patternType !== undefined || fillType === undefined) && {
+        name: 'border',
+        displayName: '描边',
+        value:[
+          {
+            name:"borderWidth",
+            displayName:"线宽",
+            type:"number",
+            value:borderWidth,
+            config:{ min:0 }
+          },
+          {
+            name:"borderColor",
+            displayName:"描边颜色",
+            type:"multicolor",
+            value:borderColor
+          }
+        ]
+      },
       {
         name: 'highlight',
         displayName: '极值高亮',

package/src/tooltip.js

@@ -66,7 +66,7 @@ const defaultTooltip = {
       },
     },
   },
-  indicator: { width: 12, color: 'RGBA(255,255,255,0.3)' },
+  indicator: { zIndex:"bottom", width: 12, color: 'RGBA(255,255,255,0.3)' },
 };
 export default ({
   auto = defaultTooltip.auto,
@@ -143,6 +143,7 @@ export default ({
     } = defaultTooltip.tip.data,
   } = defaultTooltip.tip,
   indicator: {
+    zIndex = defaultTooltip.indicator.zIndex,
     width = defaultTooltip.indicator.width,
     color = defaultTooltip.indicator.color,
   } = defaultTooltip.indicator,
@@ -467,6 +468,18 @@ export default ({
       name: 'indicator',
       displayName: '指示器',
       value: [
+        {
+          name: 'zIndex',
+          displayName: '层级',
+          value: zIndex,
+          type: 'radio',
+          config: {
+            options:[
+              { name:"顶层", value:"top" },
+              { name:"底层", value:"bottom" }
+            ],
+          },
+        },
         {
           name: 'width',
           displayName: '粗细',