@easyv/config 1.2.19 → 1.2.21

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.19",
+  "version": "1.2.21",
   "description": "",
   "main": "index.js",
   "scripts": {

package/src/highlight.js

@@ -0,0 +1,494 @@
+import { multiColor, sc, showRule, font, show, translate } from ".";
+
+const defaultConfig={
+    show:true,
+    defaultSelected:"",
+    showType:"bar",
+    // openStack:true,
+    barStyle:{
+        style:"square",
+        // paddingInner:1,
+        // seriesIntervalWidth:1,
+        fillType:"color",
+        fill:multiColor({
+            type:"pure",
+            pure:"#EDC20A"
+        }),
+        border:{
+            borderWidth:0,
+            borderColor:"#20ADFF"
+        },
+        url:"components/static-image/superChart/pattern.png",
+        size:{
+            width:10,
+            height:10
+        },
+        opacity:0.65
+    },
+    icon:{
+        show:true,
+        mode:"single",
+        image:"components/static-image/superChart/fang.png",
+        size:{
+            width:12,
+            height:12
+        },
+        inner:{
+            color:"#83C4FF",
+            radius:3
+        },
+        outer:{
+            color:"rgba(24,144,255,0.4)",
+            radius:6
+        },
+        color:"#00FFFF",
+        radius:4
+    },
+    headDecorate:{
+        show:true,
+        type:"image",
+        url:"",
+        video:"",
+        size:{
+            width:20,
+            height:20
+        },
+        translate:{x:0,y:0}
+    },
+    numlabel:{
+        show:true,
+        textStyle:font(),
+        position:"outerStart",
+        reverse:true,
+        translate:{x:0,y:0},
+        suffix:{
+            content:"",
+            font:font(),
+            translate:{x:0,y:0}
+        }
+    }
+}
+export default (isSuper=false,{
+    show:showConfig = defaultConfig.show,
+    defaultSelected = defaultConfig.defaultSelected,
+    showType = defaultConfig.showType,
+    // openStack = defaultConfig.openStack,
+    barStyle:{
+        style = defaultConfig.barStyle.type,
+        // paddingInner = defaultConfig.barStyle.paddingInner,
+        // seriesIntervalWidth = defaultConfig.barStyle.seriesIntervalWidth,
+        fillType = defaultConfig.barStyle.fillType,
+        fill = defaultConfig.barStyle.fill,
+        border:{
+            borderWidth = defaultConfig.barStyle.border.borderWidth,
+            borderColor = defaultConfig.barStyle.border.borderColor
+        } = defaultConfig.barStyle.border,
+        url = defaultConfig.barStyle.url,
+        size:{
+            width = defaultConfig.barStyle.size.width,
+            height = defaultConfig.barStyle.size.height
+        } = defaultConfig.barStyle.size,
+        opacity = defaultConfig.barStyle.opacity
+    } = defaultConfig.barStyle,
+    icon:{
+        show:showIcon = defaultConfig.icon.show,
+        mode = defaultConfig.icon.mode,
+        image = defaultConfig.icon.image,
+        size:{
+            width:iconWidth = defaultConfig.icon.size.width,
+            height:iconHeight = defaultConfig.icon.size.height
+        } = defaultConfig.icon.size,
+        inner:{
+            color:innerColor = defaultConfig.icon.inner.color,
+            radius:innerRadius = defaultConfig.icon.inner.radius
+        } = defaultConfig.icon.inner,
+        outer:{
+            color:outerColor = defaultConfig.icon.outer.color,
+            radius:outerRadius = defaultConfig.icon.outer.radius
+        } = defaultConfig.icon.outer,
+        color = defaultConfig.icon.color,
+        radius = defaultConfig.icon.radius
+    } = defaultConfig.icon,
+    headDecorate:{
+        show:showHead = defaultConfig.headDecorate.show,
+        type:headType = defaultConfig.headDecorate.type,
+        url:headUrl = defaultConfig.headDecorate.url,
+        video = defaultConfig.headDecorate.video,
+        size:{
+            width:headWidth = defaultConfig.headDecorate.size.width,
+            height:headHeight = defaultConfig.headDecorate.size.height
+        } = defaultConfig.headDecorate.size,
+        translate:{
+            x = defaultConfig.headDecorate.translate.x,
+            y = defaultConfig.headDecorate.translate.y
+        } = defaultConfig.headDecorate.translate
+    } = defaultConfig.headDecorate,
+    numlabel:{
+        show:showLabel = defaultConfig.numlabel.show,
+        textStyle = defaultConfig.numlabel.textStyle,
+        position = defaultConfig.numlabel.position,
+        reverse = defaultConfig.numlabel.reverse,
+        translate:{
+            x:labelX = defaultConfig.numlabel.translate.x,
+            y:labelY = defaultConfig.numlabel.translate.y
+        } = defaultConfig.numlabel.translate,
+        suffix:{
+            content = defaultConfig.numlabel.suffix.content,
+            font:suffixFont = defaultConfig.numlabel.suffix.font,
+            translate:{
+                x:suffixX = defaultConfig.numlabel.suffix.translate.x,
+                y:suffixY = defaultConfig.numlabel.suffix.translate.x
+            } = defaultConfig.numlabel.suffix.translate
+        } = defaultConfig.numlabel.suffix
+    } = defaultConfig.numlabel
+} = defaultConfig)=>{
+    return sc("selectStyle","点击选中样式","",[
+        show(showConfig),
+        sc("defaultSelected","默认选中","input",defaultSelected,{other:{tip:"输入X轴的标签，则选中那一列"}},showRule()),
+        sc("showType","类型","radio",showType,{mode:"button",options:[
+            {name:"柱状",value:"bar"},
+            {name:"折线",value:"line"},
+            {name:"面积",value:"area"}
+        ]},isSuper?showRule():showRule("hidden","$eq",true)),
+        // sc("openStack","开启堆叠","boolean",openStack,{},{rule:[["show","$eq",true],["showType","$eq","bar"]]}),
+        sc("barStyle","柱状样式","",[
+            {
+              name: 'style',
+              displayName: '类型',
+              value: style,
+              type: 'select',
+              config: {
+                options: [
+                  { name: '方形', value: 'square' },
+                  { name: '子弹头', value: 'round' },
+                ],
+              },
+            },
+            // {
+            //   name: 'paddingInner',
+            //   displayName: '柱间间距',
+            //   value: paddingInner,
+            //   type: 'number',
+            //   config: {
+            //     step: 0.01,
+            //   },
+            // },
+            // {
+            //   name: 'seriesIntervalWidth',
+            //   displayName: '系列间距',
+            //   value: seriesIntervalWidth,
+            //   type: 'number',
+            //   config: {
+            //     step: 0.01,
+            //   },
+            // },
+            {
+              name: 'fillType',
+              displayName: '填充样式',
+              value: fillType,
+              type: 'radio',
+              config: {
+                options: [
+                  { name: '颜色', value: 'color' },
+                  { name: '纹理', value: 'pattern' },
+                ],
+              },
+            },
+            {
+              rule: [['fillType', '$eq', 'color']],
+              name: 'fill',
+              displayName: '柱子颜色',
+              type: 'multicolor',
+              value: fill,
+              markColorType: 'seriesGradient',
+            },
+            {
+              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
+                }
+              ]
+            },
+            {
+              rule: [['fillType', '$eq', 'pattern']],
+              name: 'url',
+              displayName: '纹理图片',
+              type: 'uploadImage',
+              value: url,
+            },
+            {
+              rule: [['fillType', '$eq', 'pattern']],
+              name: 'size',
+              displayName: '尺寸',
+              value: [
+                {
+                  name: 'width',
+                  displayName: '宽度',
+                  value: width,
+                  config: { span: 12, suffix: 'W' },
+                },
+                {
+                  name: 'height',
+                  displayName: '高度',
+                  value: height,
+                  config: { span: 12, suffix: 'H' },
+                },
+              ],
+              type: 'group',
+            },
+            {
+              rule: [['fillType', '$eq', 'pattern']],
+              type: 'range',
+              name: 'opacity',
+              displayName: '透明度',
+              value: opacity,
+              config: { max: 1, min: 0, step: 0.01 },
+            },
+        ],{defaultOpen:true},{rule:[["show","$eq",true],["showType","$eq","bar"]]}),
+        sc("icon","数据标记","",[
+            {
+              name: 'show',
+              displayName: '显示',
+              value: showIcon,
+              type: 'boolean',
+            },
+            {
+              rule: [['show', '$eq', true]],
+              name: 'mode',
+              displayName: '模式',
+              value: mode,
+              type: 'select',
+              config: {
+                options: [
+                  {
+                    name: '单圆',
+                    value: 'single',
+                  },
+                  {
+                    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: iconWidth,
+                  config: {
+                    span: 12,
+                    suffix: 'W',
+                  },
+                },
+                {
+                  name: 'height',
+                  displayName: '高度',
+                  value: iconHeight,
+                  config: {
+                    span: 12,
+                    suffix: 'H',
+                  },
+                },
+              ],
+              type: 'group',
+            },
+            {
+              rule: [
+                ['show', '$eq', true],
+                ['mode', '$eq', 'double'],
+              ],
+              name: 'inner',
+              displayName: '内圆',
+              value: [
+                {
+                  name: 'color',
+                  displayName: '颜色',
+                  value: innerColor,
+                  type: 'color',
+                },
+                {
+                  name: 'radius',
+                  displayName: '半径',
+                  value: innerRadius,
+                  type: 'number',
+                  config: {
+                    min: 0,
+                    suffix: 'px',
+                  },
+                },
+              ],
+            },
+            {
+              rule: [
+                ['show', '$eq', true],
+                ['mode', '$eq', 'double'],
+              ],
+              name: 'outer',
+              displayName: '外圆',
+              value: [
+                {
+                  name: 'color',
+                  displayName: '颜色',
+                  value: outerColor,
+                  type: 'color',
+                },
+                {
+                  name: 'radius',
+                  displayName: '半径',
+                  value: outerRadius,
+                  type: 'number',
+                  config: {
+                    min: 0,
+                    suffix: 'px',
+                  },
+                },
+              ],
+            },
+            {
+              rule: [
+                ['show', '$eq', true],
+                ['mode', '$eq', 'single'],
+              ],
+              name: 'color',
+              displayName: '颜色',
+              value: color,
+              type: 'color',
+              markColorType: 'palette',
+              markColorType: 'palette',
+            },
+            {
+              rule: [
+                ['show', '$eq', true],
+                ['mode', '$eq', 'single'],
+              ],
+              name: 'radius',
+              displayName: '半径',
+              value: radius,
+              type: 'number',
+              config: {
+                min: 0,
+                suffix: 'px',
+              },
+            },
+        ],{defaultOpen:true},{rule:[["show","$eq",true],["showType","$neq","bar"]]}),
+        sc("headDecorate","头部装饰","",[
+            show(showHead),
+            sc("type","类型","radio",headType,{options:[
+              {name:"图片",value:"image"},
+              {name:"视频",value:"video"}
+            ]}),
+            sc("url","图片","image",headUrl,{},showRule("type","$eq","image")),
+            sc("video","视频","video",video,{},showRule("type","$eq","video")),
+            sc("size","尺寸","group",[
+                sc("width","宽","number",headWidth,{span:12,suffix:"px"}),
+                sc("height","高","number",headHeight,{span:12,suffix:"px"})
+            ]),
+            translate(x,y)
+        ],{},{rule:[["show","$eq",true],["showType","$eq","bar"]]}),
+        sc("numlabel","数值标签","",[
+            {
+              name: 'show',
+              displayName: '显示',
+              value: showLabel,
+              type: 'boolean',
+            },
+            {
+              rule: [['show', '$eq', true]],
+              name: 'font',
+              displayName: '文本样式',
+              type: 'textStyle',
+              value: textStyle,
+            },
+            {
+              name: "position",
+              displayName: "位置",
+              value: position,
+              type: "select",
+              config: {
+                options: [
+                  { name: "起点", value: "start" },
+                  { name: "居中", value: "middle" },
+                  { name: "终点", value: "end" },
+                  { name: "终点外", value: "outerStart" },
+                  { name: "图表外", value: "chartStart" },
+                ],
+              },
+            },
+            {
+              rule:[["position","$neq","middle"],["position","$neq","chartStart"]],
+              name:"reverse",
+              displayName:"负值反向",
+              type:"boolean",
+              value:reverse,
+              tip:"开启后负值的标签会与正值对称显示"
+            },
+            {
+              name: 'translate',
+              displayName: '偏移',
+              type: 'group',
+              value: [
+                {
+                  name: 'x',
+                  displayName: 'X',
+                  type: 'number',
+                  value: labelX,
+                  config: {
+                    span: 12,
+                    suffix: 'px',
+                  },
+                },
+                {
+                  name: 'y',
+                  displayName: 'Y',
+                  type: 'number',
+                  value: labelY,
+                  config: {
+                    span: 12,
+                    suffix: 'px',
+                  },
+                },
+              ],
+            },
+            sc("suffix","后缀","",[
+              sc("content","内容","input",content),
+              sc("font","字体样式","textStyle",suffixFont),
+              translate(suffixX,suffixY)
+            ],{defaultOpen:true},showRule())
+        ],{},showRule())
+    ])
+}

package/src/index.js

@@ -49,6 +49,8 @@ import textOverflow from './textOverflow';
 import baseLine from './baseLine';
 import { control } from './control';
 import pieTooltip from './pieTooltip';
+import highlight from './highlight';
+
 export {
   pieTooltip,
   control,
@@ -102,5 +104,6 @@ export {
   pieCurrent,
   sc,
   shadow,
-  baseLine
+  baseLine,
+  highlight
 };

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: '极值高亮',