@easyv/config 1.2.20 → 1.2.21

package/lib/legend.js

@@ -120,16 +120,16 @@ var _default = exports["default"] = function _default() {
   return {
     name: 'legend',
     displayName: '图例',
-    value: [showConfig(show), overflow != undefined && (0, _index.sc)("maxWidth", "宽度", "number", maxWidth, {
-      suffix: "px"
-    }, showRule())].concat((0, _toConsumableArray2["default"])(overflow != undefined ? (0, _index.textOverflow)(overflow) : []), [{
+    value: [showConfig(show), {
       rule: [['show', '$eq', true]],
       name: 'font',
       displayName: '文本样式',
       value: font,
       type: 'textStyle',
       markColorType: 'textColor'
-    }, {
+    }, (0, _index.sc)("maxWidth", "宽度", "number", maxWidth, {
+      suffix: "px"
+    }, showRule())].concat((0, _toConsumableArray2["default"])((0, _index.textOverflow)(overflow)), [{
       name: 'iconSize',
       displayName: '图标尺寸',
       value: [{

package/lib/series.js

@@ -33,7 +33,18 @@ var defaultBandSeries = {
       opacity: 1
     }
   },
-  borderColor: "#20ADFF",
+  borderColor: (0, _.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,
@@ -152,24 +163,6 @@ var bandSeries = exports.bandSeries = function bandSeries() {
       type: 'multicolor',
       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',
@@ -215,23 +208,6 @@ var bandSeries = exports.bandSeries = function bandSeries() {
       type: 'multicolor',
       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: '纹理类型',
@@ -268,6 +244,40 @@ var bandSeries = exports.bandSeries = function bandSeries() {
       config: {
         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/lib/tooltip.js

@@ -85,6 +85,7 @@ var defaultTooltip = {
     }
   },
   indicator: {
+    zIndex: "bottom",
     width: 12,
     color: 'RGBA(255,255,255,0.3)'
   }
@@ -189,6 +190,8 @@ var _default = exports["default"] = function _default() {
     suffixLetterSpacing = _ref$tip2$data2$data15.letterSpacing,
     _ref$indicator = _ref.indicator,
     _ref$indicator2 = _ref$indicator === void 0 ? defaultTooltip.indicator : _ref$indicator,
+    _ref$indicator2$zInde = _ref$indicator2.zIndex,
+    zIndex = _ref$indicator2$zInde === void 0 ? defaultTooltip.indicator.zIndex : _ref$indicator2$zInde,
     _ref$indicator2$width = _ref$indicator2.width,
     width = _ref$indicator2$width === void 0 ? defaultTooltip.indicator.width : _ref$indicator2$width,
     _ref$indicator2$color = _ref$indicator2.color,
@@ -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,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@easyv/config",
-  "version": "1.2.20",
+  "version": "1.2.21",
   "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: '图标尺寸',

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: '粗细',