@easyv/config 1.0.49 → 1.0.54

package/src/series.js

@@ -5,7 +5,6 @@ const _mapping = { fieldName: '', displayName: '' };
 const defaultBandSeries = {
   mapping: _mapping,
   yOrZ: 'y',
-  fillType: 'color',
   fillImage: 'components/static-image/superChart/pattern.png',
   fill: {
     type: 'linear',
@@ -39,9 +38,9 @@ const defaultBandSeries = {
   },
   size: {
     width: 10,
-    height: 10
+    height: 10,
   },
-  opacity: 0.65
+  opacity: 0.65,
 };
 
 export const bandSeries = (
@@ -62,7 +61,7 @@ export const bandSeries = (
     fill = defaultBandSeries.fill,
     size: {
       width: urlWidth = defaultBandSeries.size.width,
-      height: urlHeight = defaultBandSeries.size.height
+      height: urlHeight = defaultBandSeries.size.height,
     } = defaultBandSeries.size,
     opacity = defaultBandSeries.opacity,
     highlight: {
@@ -95,7 +94,7 @@ export const bandSeries = (
         value: stack,
         type: 'input',
       },
-      patternType === undefined && {
+      fillType !== undefined && {
         name: 'fillType',
         displayName: '填充样式',
         value: fillType,
@@ -107,21 +106,23 @@ export const bandSeries = (
           ],
         },
       },
-      patternType === undefined && {
+      fillType !== undefined && {
         rule: [['fillType', '$eq', 'color']],
         name: 'fill',
         displayName: '颜色',
         type: 'multicolor',
         value: fill,
+        markColorType: 'seriesGradient',
+        
       },
-      patternType === undefined && {
+      fillType !== undefined && {
         rule: [['fillType', '$eq', 'pattern']],
         name: 'url',
         displayName: '纹理图片',
         type: 'uploadImage',
         value: fillImage,
       },
-      patternType === undefined && {
+      fillType !== undefined && {
         rule: [['fillType', '$eq', 'pattern']],
         name: 'size',
         displayName: '尺寸',
@@ -141,19 +142,20 @@ export const bandSeries = (
         ],
         type: 'group',
       },
-      patternType === undefined && {
+      fillType !== undefined && {
         rule: [['fillType', '$eq', 'pattern']],
-        type: "range",
-        name: "opacity",
-        displayName: "透明度",
+        type: 'range',
+        name: 'opacity',
+        displayName: '透明度',
         value: opacity,
-        config: { max: 1, min: 0, step: 0.01 }
+        config: { max: 1, min: 0, step: 0.01 },
       },
-      patternType !== undefined && {
+      (patternType !== undefined || fillType === undefined) && {
         name: 'fill',
         displayName: '颜色',
         type: 'multicolor',
         value: fill,
+        markColorType: 'seriesGradient',
       },
       patternType !== undefined && {
         name: 'patternType',
@@ -262,7 +264,7 @@ const defaultLineSeries = {
   areaType: 'color',
   size: {
     width: 10,
-    height: 10
+    height: 10,
   },
   url: 'components/static-image/superChart/pattern.png',
   opacity: 0.65,
@@ -282,7 +284,7 @@ const defaultLineSeries = {
 };
 const defaultIcon = {
   show: true,
-  mode: 'double',
+  mode: 'single',
   inner: { color: '#83C4FF', radius: 3 },
   outer: { color: 'rgba(24,144,255,0.4)', radius: 6 },
   color: '#1283E3',
@@ -290,8 +292,8 @@ const defaultIcon = {
   image: 'components/static-image/superChart/fang.png',
   size: {
     width: 10,
-    height: 10
-  }
+    height: 10,
+  },
 };
 
 const commonLine = (
@@ -304,64 +306,65 @@ const commonLine = (
     connectNulls = defaultLineSeries.line.connectNulls,
   } = defaultLineSeries.line
 ) => [
-    {
-      name: 'type',
-      displayName: '类型',
-      value: type,
-      type: 'select',
-      config: {
-        options: [
-          {
-            name: '实线',
-            value: 'solid',
-          },
-          {
-            name: '虚线',
-            value: 'dash',
-          },
-        ],
-      },
-    },
-    {
-      name: 'color',
-      displayName: '颜色',
-      value: color,
-      type: 'color',
-    },
-    {
-      name: 'lineWidth',
-      displayName: '粗细',
-      value: lineWidth,
-      type: 'input',
-      config: {
-        suffix: 'px',
-      },
-    },
-    {
-      name: 'curve',
-      displayName: '曲线',
-      value: curve,
-      type: 'boolean',
+  {
+    name: 'type',
+    displayName: '类型',
+    value: type,
+    type: 'select',
+    config: {
+      options: [
+        {
+          name: '实线',
+          value: 'solid',
+        },
+        {
+          name: '虚线',
+          value: 'dash',
+        },
+      ],
     },
-    {
-      rule: [['curve', '$eq', true]],
-      name: 'tension',
-      displayName: '曲线张力',
-      value: tension,
-      type: 'range',
-      config: {
-        min: 0,
-        max: 1,
-        step: 0.1,
-      },
+  },
+  {
+    name: 'color',
+    displayName: '颜色',
+    value: color,
+    type: 'color',
+    markColorType: 'palette',
+  },
+  {
+    name: 'lineWidth',
+    displayName: '粗细',
+    value: lineWidth,
+    type: 'input',
+    config: {
+      suffix: 'px',
     },
-    {
-      name: 'connectNulls',
-      displayName: 'null值连接',
-      value: connectNulls,
-      type: 'boolean',
+  },
+  {
+    name: 'curve',
+    displayName: '曲线',
+    value: curve,
+    type: 'boolean',
+  },
+  {
+    rule: [['curve', '$eq', true]],
+    name: 'tension',
+    displayName: '曲线张力',
+    value: tension,
+    type: 'range',
+    config: {
+      min: 0,
+      max: 1,
+      step: 0.1,
     },
-  ];
+  },
+  {
+    name: 'connectNulls',
+    displayName: 'null值连接',
+    value: connectNulls,
+    type: 'boolean',
+  },
+];
 
 const lighter = (
   {
@@ -387,6 +390,7 @@ const lighter = (
       displayName: '颜色',
       type: 'multicolor',
       value: fill,
+      markColorType: 'seriesGradient',
     },
     {
       rule: [['show', '$eq', true]],
@@ -428,8 +432,8 @@ const icon = ({
   image = defaultIcon.image,
   size: {
     width: imageWidth = defaultIcon.size.width,
-    height: imageHeight = defaultIcon.size.height
-  } = defaultIcon.size
+    height: imageHeight = defaultIcon.size.height,
+  } = defaultIcon.size,
 } = defaultIcon) => ({
   name: 'icon',
   displayName: '数据标记',
@@ -563,6 +567,7 @@ const icon = ({
       displayName: '颜色',
       value: color,
       type: 'color',
+      markColorType: 'palette',
     },
     {
       rule: [
@@ -643,9 +648,9 @@ export const areaSeries = (
     url = defaultLineSeries.url,
     size: {
       width: urlWidth = defaultLineSeries.size.width,
-      height: urlHeight = defaultLineSeries.size.height
+      height: urlHeight = defaultLineSeries.size.height,
     } = defaultLineSeries.size,
-    opacity = defaultLineSeries.opacity
+    opacity = defaultLineSeries.opacity,
   } = defaultLineSeries
 ) => ({
   name,
@@ -665,16 +670,16 @@ export const areaSeries = (
       },
     },
     {
-      name: "areaType",
-      displayName: "区域样式",
+      name: 'areaType',
+      displayName: '区域样式',
       value: areaType,
       type: 'radio',
       config: {
         options: [
-          { name: "颜色", value: "color" },
-          { name: "纹理", value: "pattern" }
-        ]
-      }
+          { name: '颜色', value: 'color' },
+          { name: '纹理', value: 'pattern' },
+        ],
+      },
     },
     {
       rule: [['areaType', '$eq', 'color']],
@@ -682,15 +687,14 @@ export const areaSeries = (
       displayName: '区域颜色',
       type: 'multicolor',
       value: areaColor,
+      markColorType: 'seriesGradient',
     },
     {
-      rule: [
-        ['areaType', '$eq', 'pattern']
-      ],
-      name: "url",
-      displayName: "纹理图片",
+      rule: [['areaType', '$eq', 'pattern']],
+      name: 'url',
+      displayName: '纹理图片',
       value: url,
-      type: "uploadImage"
+      type: 'uploadImage',
     },
     {
       rule: [['areaType', '$eq', 'pattern']],
@@ -714,11 +718,11 @@ export const areaSeries = (
     },
     {
       rule: [['areaType', '$eq', 'pattern']],
-      type: "range",
-      name: "opacity",
-      displayName: "透明度",
+      type: 'range',
+      name: 'opacity',
+      displayName: '透明度',
       value: opacity,
-      config: { max: 1, min: 0, step: 0.01 }
+      config: { max: 1, min: 0, step: 0.01 },
     },
     {
       name: 'line',
@@ -732,7 +736,7 @@ export const areaSeries = (
           tension,
           connectNulls,
         }),
-        // lineLighter && lighter(lineLighter),
+        lineLighter && lighter(lineLighter),
       ].filter((item) => !!item),
     },
     label(areaLabel),
@@ -764,7 +768,7 @@ export const pieSeries = (
       displayName = defaultPieSeries.mapping.displayName,
     } = defaultPieSeries.mapping,
     color = defaultPieSeries.color,
-    currentColor
+    currentColor,
   } = defaultPieSeries
 ) => ({
   name: name,
@@ -776,20 +780,21 @@ export const pieSeries = (
       displayName: currentColor != undefined ? '默认颜色' : '颜色',
       type: 'multicolor',
       value: multiColor(color),
+      markColorType: 'seriesGradient',
     },
     currentColor != undefined && {
       name: 'currentColor',
       displayName: '当前颜色',
-      type: "multicolor",
-      value: multiColor(currentColor)
-    }
+      type: 'multicolor',
+      value: multiColor(currentColor),
+    },
   ].filter((item) => !!item),
   type: 'object',
 });
 
 const defaultPurePieSeries = {
   mapping: _mapping,
-  color: "#fff"
+  color: '#fff',
 };
 export const purePieSeries = (
   name = Math.random() + '',
@@ -798,7 +803,7 @@ export const purePieSeries = (
       fieldName = defaultPurePieSeries.mapping.fieldName,
       displayName = defaultPurePieSeries.mapping.displayName,
     } = defaultPurePieSeries.mapping,
-    color = defaultPurePieSeries.color
+    color = defaultPurePieSeries.color,
   } = defaultPurePieSeries
 ) => ({
   name: name,
@@ -810,7 +815,8 @@ export const purePieSeries = (
       displayName: '填充',
       type: 'color',
       value: color,
-    }
+      markColorType: 'palette',
+    },
   ],
   type: 'object',
-});
+});

package/src/tickLine.js

@@ -25,6 +25,7 @@ export default ({
       displayName: '颜色',
       value: color,
       type: 'color',
+      markColorType: 'assistColor',
     },
     {
       rule: [['show', '$eq', true]],

package/src/tooltip.js

@@ -221,6 +221,7 @@ export default ({
                     letterSpacing: xAxisLetterSpacing,
                   },
                   type: 'textStyle',
+                  markColorType: 'textColor',
                 },
                 {
                   name: 'align',
@@ -275,6 +276,7 @@ export default ({
                     letterSpacing: nameLetterSpacing,
                   },
                   type: 'textStyle',
+                  markColorType: 'textColor',
                 },
                 {
                   name: 'value',
@@ -288,6 +290,7 @@ export default ({
                     letterSpacing: valueFontLetterSpacing,
                   },
                   type: 'textStyle',
+                  markColorType: 'textColor',
                 },
                 {
                   name: 'suffix',
@@ -386,6 +389,7 @@ export default ({
                         letterSpacing: suffixLetterSpacing,
                       },
                       type: 'textStyle',
+                      markColorType: 'textColor',
                     },
                     translate(x, y),
                   ],

package/src/unit.js

@@ -57,6 +57,7 @@ export default ({
         letterSpacing,
       },
       type: 'textStyle',
+      markColorType: 'textColor',
     },
     {
       rule: [['show', '$eq', true]],