@easyv/config 1.0.50 → 1.0.55

package/lib/series.js

@@ -149,7 +149,8 @@ var bandSeries = function bandSeries() {
       name: 'fill',
       displayName: '颜色',
       type: 'multicolor',
-      value: fill
+      value: fill,
+      markColorType: 'seriesGradient'
     }, fillType !== undefined && {
       rule: [['fillType', '$eq', 'pattern']],
       name: 'url',
@@ -180,9 +181,9 @@ var bandSeries = function bandSeries() {
       type: 'group'
     }, fillType !== undefined && {
       rule: [['fillType', '$eq', 'pattern']],
-      type: "range",
-      name: "opacity",
-      displayName: "透明度",
+      type: 'range',
+      name: 'opacity',
+      displayName: '透明度',
       value: opacity,
       config: {
         max: 1,
@@ -193,7 +194,8 @@ var bandSeries = function bandSeries() {
       name: 'fill',
       displayName: '颜色',
       type: 'multicolor',
-      value: fill
+      value: fill,
+      markColorType: 'seriesGradient'
     }, patternType !== undefined && {
       name: 'patternType',
       displayName: '纹理类型',
@@ -331,7 +333,7 @@ var defaultLineSeries = {
 };
 var defaultIcon = {
   show: true,
-  mode: 'double',
+  mode: 'single',
   inner: {
     color: '#83C4FF',
     radius: 3
@@ -382,7 +384,8 @@ var commonLine = function commonLine() {
     name: 'color',
     displayName: '颜色',
     value: color,
-    type: 'color'
+    type: 'color',
+    markColorType: 'palette'
   }, {
     name: 'lineWidth',
     displayName: '粗细',
@@ -441,7 +444,8 @@ var lighter = function lighter() {
       name: 'fill',
       displayName: '颜色',
       type: 'multicolor',
-      value: fill
+      value: fill,
+      markColorType: 'seriesGradient'
     }, {
       rule: [['show', '$eq', true]],
       name: 'length',
@@ -592,7 +596,8 @@ var icon = function icon() {
       name: 'color',
       displayName: '颜色',
       value: color,
-      type: 'color'
+      type: 'color',
+      markColorType: 'palette'
     }, {
       rule: [['show', '$eq', true], ['mode', '$eq', 'single']],
       name: 'radius',
@@ -720,17 +725,17 @@ var areaSeries = function areaSeries() {
         }]
       }
     }, {
-      name: "areaType",
-      displayName: "区域样式",
+      name: 'areaType',
+      displayName: '区域样式',
       value: areaType,
       type: 'radio',
       config: {
         options: [{
-          name: "颜色",
-          value: "color"
+          name: '颜色',
+          value: 'color'
         }, {
-          name: "纹理",
-          value: "pattern"
+          name: '纹理',
+          value: 'pattern'
         }]
       }
     }, {
@@ -738,13 +743,14 @@ var areaSeries = function areaSeries() {
       name: 'areaColor',
       displayName: '区域颜色',
       type: 'multicolor',
-      value: areaColor
+      value: areaColor,
+      markColorType: 'seriesGradient'
     }, {
       rule: [['areaType', '$eq', 'pattern']],
-      name: "url",
-      displayName: "纹理图片",
+      name: 'url',
+      displayName: '纹理图片',
       value: url,
-      type: "uploadImage"
+      type: 'uploadImage'
     }, {
       rule: [['areaType', '$eq', 'pattern']],
       name: 'size',
@@ -769,9 +775,9 @@ var areaSeries = function areaSeries() {
       type: 'group'
     }, {
       rule: [['areaType', '$eq', 'pattern']],
-      type: "range",
-      name: "opacity",
-      displayName: "透明度",
+      type: 'range',
+      name: 'opacity',
+      displayName: '透明度',
       value: opacity,
       config: {
         max: 1,
@@ -781,14 +787,14 @@ var areaSeries = function areaSeries() {
     }, {
       name: 'line',
       displayName: '折线',
-      value: (0, _toConsumableArray2["default"])(commonLine({
+      value: [].concat((0, _toConsumableArray2["default"])(commonLine({
         type: type,
         color: color,
         lineWidth: lineWidth,
         curve: curve,
         tension: tension,
         connectNulls: connectNulls
-      })).filter(function (item) {
+      })), [lineLighter && lighter(lineLighter)]).filter(function (item) {
         return !!item;
       })
     }, (0, _.label)(areaLabel)],
@@ -843,11 +849,12 @@ var pieSeries = function pieSeries() {
       name: 'color',
       displayName: currentColor != undefined ? '默认颜色' : '颜色',
       type: 'multicolor',
-      value: (0, _.multiColor)(color)
+      value: (0, _.multiColor)(color),
+      markColorType: 'seriesGradient'
     }, currentColor != undefined && {
       name: 'currentColor',
       displayName: '当前颜色',
-      type: "multicolor",
+      type: 'multicolor',
       value: (0, _.multiColor)(currentColor)
     }].filter(function (item) {
       return !!item;
@@ -859,7 +866,7 @@ var pieSeries = function pieSeries() {
 exports.pieSeries = pieSeries;
 var defaultPurePieSeries = {
   mapping: _mapping,
-  color: "#fff"
+  color: '#fff'
 };
 
 var purePieSeries = function purePieSeries() {
@@ -885,7 +892,8 @@ var purePieSeries = function purePieSeries() {
       name: 'color',
       displayName: '填充',
       type: 'color',
-      value: color
+      value: color,
+      markColorType: 'palette'
     }],
     type: 'object'
   };

package/lib/tickLine.js

@@ -35,7 +35,8 @@ var _default = function _default() {
       name: 'color',
       displayName: '颜色',
       value: color,
-      type: 'color'
+      type: 'color',
+      markColorType: 'assistColor'
     }, {
       rule: [['show', '$eq', true]],
       name: 'lineWidth',

package/lib/tooltip.js

@@ -249,7 +249,8 @@ var _default = function _default() {
               italic: xAxisItalic,
               letterSpacing: xAxisLetterSpacing
             },
-            type: 'textStyle'
+            type: 'textStyle',
+            markColorType: 'textColor'
           }, {
             name: 'align',
             displayName: '对齐方式',
@@ -296,7 +297,8 @@ var _default = function _default() {
               italic: nameItalic,
               letterSpacing: nameLetterSpacing
             },
-            type: 'textStyle'
+            type: 'textStyle',
+            markColorType: 'textColor'
           }, {
             name: 'value',
             displayName: '系列值',
@@ -308,7 +310,8 @@ var _default = function _default() {
               italic: valueFontItalic,
               letterSpacing: valueFontLetterSpacing
             },
-            type: 'textStyle'
+            type: 'textStyle',
+            markColorType: 'textColor'
           }, {
             name: 'suffix',
             displayName: '后缀',
@@ -388,7 +391,8 @@ var _default = function _default() {
                 italic: suffixItalic,
                 letterSpacing: suffixLetterSpacing
               },
-              type: 'textStyle'
+              type: 'textStyle',
+              markColorType: 'textColor'
             }, (0, _.translate)(x, y)]
           }]
         }]

package/lib/unit.js

@@ -86,7 +86,8 @@ var _default = function _default() {
         italic: italic,
         letterSpacing: letterSpacing
       },
-      type: 'textStyle'
+      type: 'textStyle',
+      markColorType: 'textColor'
     }, _objectSpread({
       rule: [['show', '$eq', true]]
     }, translate(x, y))]

package/package.json

@@ -1,10 +1,12 @@
 {
   "name": "@easyv/config",
-  "version": "1.0.50",
+  "version": "1.0.55",
   "description": "",
   "main": "index.js",
   "scripts": {
-    "make": "babel src -d lib"
+    "make": "babel src -d lib",
+    "release": "standard-version",
+    "publish": "npm run make && npm run release"
   },
   "keywords": [],
   "author": "",
@@ -17,7 +19,14 @@
     "@babel/plugin-transform-runtime": "^7.11.5",
     "@babel/preset-env": "^7.11.5",
     "@babel/preset-react": "^7.10.4",
+    "@babel/runtime": "^7.17.7",
     "babel-plugin-transform-import-styles": "0.0.11",
-    "babel-preset-env": "^1.7.0"
+    "babel-preset-env": "^1.7.0",
+    "standard-version": "^9.3.2"
+  },
+  "standard-version": {
+    "skip": {
+      "commit": true
+    }
   }
 }

package/src/animation.js

@@ -1,4 +1,4 @@
-import { multiColor,font } from './';
+import { multiColor, font } from './';
 const animation = {
   show: false,
   duration: 3,
@@ -43,6 +43,37 @@ export default ({
   ],
 });
 
+const defaultDataAnimation = {
+  show: false,
+  duration: 3,
+};
+export const dataAnimation = ({
+  show = defaultDataAnimation.show,
+  duration = defaultDataAnimation.duration,
+} = defaultDataAnimation) => ({
+  name: 'dataAnimation',
+  displayName: '数据动画',
+  value: [
+    {
+      name: 'show',
+      displayName: '打开',
+      value: show,
+      type: 'boolean',
+    },
+    {
+      rule: [['show', '$eq', true]],
+      name: 'duration',
+      displayName: '滚动时长',
+      value: duration,
+      type: 'number',
+      config: {
+        span: 12,
+        suffix: 's',
+      },
+    },
+  ],
+});
+
 const defaultAnimationOfPie = {
   show: true,
   current: { heighten: 10, opacity: 60 },
@@ -62,10 +93,10 @@ export const animationOfPie = ({
   displayName: '轮播动画',
   value: [
     {
-      name: 'on', 
-      displayName: '开启', 
-      value: show, 
-      type: 'boolean'
+      name: 'on',
+      displayName: '开启',
+      value: show,
+      type: 'boolean',
     },
     {
       rule: [['on', '$eq', true]],
@@ -84,8 +115,8 @@ export const animationOfPie = ({
           value: opacity,
           type: 'range',
           config: {
-            min:0,
-            max:100,
+            min: 0,
+            max: 100,
             suffix: '%',
           },
         },
@@ -122,38 +153,38 @@ export const animationOfPie = ({
   ],
 });
 
-const defaultAnimationOfCarousel= {
+const defaultAnimationOfCarousel = {
   show: true,
-  current: { 
-    width: 0.1, 
+  current: {
+    width: 0.1,
     color: multiColor(),
-    font:font(),
-    gap: 15
+    font: font(),
+    gap: 15,
   },
   interval: 3,
   rotate: 30,
   interactive: true,
 };
-export const animationOfCarousel= ({
+export const animationOfCarousel = ({
   show = defaultAnimationOfCarousel.show,
   current: {
     width = defaultAnimationOfCarousel.current.width,
     color = defaultAnimationOfCarousel.current.color,
     textStyle = defaultAnimationOfCarousel.current.font,
-    gap = defaultAnimationOfCarousel.current.gap
+    gap = defaultAnimationOfCarousel.current.gap,
   } = defaultAnimationOfCarousel.current,
   interval = defaultAnimationOfCarousel.interval,
   rotate = defaultAnimationOfCarousel.rotate,
-  interactive = defaultAnimationOfCarousel.interactive
+  interactive = defaultAnimationOfCarousel.interactive,
 } = defaultAnimationOfCarousel) => ({
   name: 'animation',
   displayName: '轮播动画',
   value: [
     {
-      name: 'on', 
-      displayName: '开启', 
-      value: show, 
-      type: 'boolean'
+      name: 'on',
+      displayName: '开启',
+      value: show,
+      type: 'boolean',
     },
     {
       rule: [['on', '$eq', true]],
@@ -175,18 +206,19 @@ export const animationOfCarousel= ({
         {
           name: 'textStyle',
           displayName: '类目文本样式',
-          value:font(textStyle),
-          type:"textStyle"
+          value: font(textStyle),
+          type: 'textStyle',
+          markColorType: 'textColor',
         },
         {
           name: 'gap',
           displayName: '类目文本间距',
           value: gap,
           type: 'number',
-          config:{
-            suffix:"px"
-          }
-        }
+          config: {
+            suffix: 'px',
+          },
+        },
       ],
       config: {
         defaultOpen: true,
@@ -209,8 +241,8 @@ export const animationOfCarousel= ({
       value: rotate,
       type: 'number',
       config: {
-        min:0,
-        max:360,
+        min: 0,
+        max: 360,
         suffix: '°',
       },
     },
@@ -218,7 +250,7 @@ export const animationOfCarousel= ({
       name: 'interactive',
       displayName: '点击交互',
       value: interactive,
-      type:"boolean"
-    }
+      type: 'boolean',
+    },
   ],
 });

package/src/axisLine.js

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

package/src/gridLine.js

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

package/src/label.js

@@ -52,6 +52,7 @@ export default ({
         letterSpacing,
       },
       type: 'textStyle',
+      markColorType: 'textColor',
     },
     position !== undefined && {
       name: 'position',
@@ -98,7 +99,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: {
@@ -156,10 +157,10 @@ export const labelOfPie = ({
       },
     },
     lineColor !== undefined && {
-      name: "lineColor",
-      displayName: "线颜色",
+      name: 'lineColor',
+      displayName: '线颜色',
       value: lineColor,
-      type: "color"
+      type: 'color',
     },
     {
       rule: [['show', '$eq', true]],
@@ -201,6 +202,7 @@ export const labelOfPie = ({
           displayName: '文本样式',
           value: nameFont,
           type: 'textStyle',
+          markColorType: 'textColor',
         },
       ],
     },
@@ -231,6 +233,7 @@ export const labelOfPie = ({
           displayName: '文本样式',
           value: percentFont,
           type: 'textStyle',
+          markColorType: 'textColor',
         },
       ],
     },
@@ -284,6 +287,7 @@ export const labelOfPie = ({
           displayName: '文本样式',
           value: valueFont,
           type: 'textStyle',
+          markColorType: 'textColor',
         },
       ],
     },
@@ -294,11 +298,11 @@ const defaultLabelOfRose = {
   show: true,
   font: defaultFont,
   gap: 10,
-}
+};
 export const labelOfRose = ({
   show = defaultLabelOfRose.show,
   font: labelFont = defaultLabelOfRose.font,
-  gap = defaultLabelOfRose.gap
+  gap = defaultLabelOfRose.gap,
 } = defaultLabelOfRose) => ({
   name: 'label',
   displayName: '数值标签',
@@ -315,17 +319,18 @@ export const labelOfRose = ({
       displayName: '文本样式',
       value: font(labelFont),
       type: 'textStyle',
+      markColorType: 'textColor',
     },
     {
       ...showRule(),
-      name: "gap",
-      displayName: "间距",
+      name: 'gap',
+      displayName: '间距',
       value: gap,
-      type: "number",
+      type: 'number',
       config: {
-        suffix: "px"
-      }
-    }
+        suffix: 'px',
+      },
+    },
   ],
 });
 
@@ -591,6 +596,7 @@ export const axisLabel = ({
       displayName: '文本样式',
       value: font,
       type: 'textStyle',
+      markColorType: 'textColor',
     },
   ],
 });

package/src/legend.js

@@ -1,4 +1,10 @@
-const { translate: translateConfig, font, show: showConfig, showRule } = require('.');
+const {
+  translate: translateConfig,
+  font,
+  show: showConfig,
+  showRule,
+} = require('.');
+
 const defaultFont = font({
   fontFamily: 'Mircosoft Yahei',
   fontSize: 12,
@@ -65,6 +71,7 @@ export default ({
       displayName: '文本样式',
       value: font,
       type: 'textStyle',
+      markColorType: 'textColor',
     },
     {
       name: 'iconSize',
@@ -212,8 +219,8 @@ const defaultLegendOfRose = {
     },
     alignment: 'center bottom',
     translate: { x: 0, y: 0 },
-  }
-}
+  },
+};
 export const legendOfRose = ({
   show = defaultLegendOfRose.show,
   font = defaultLegendOfRose.font,
@@ -233,8 +240,8 @@ export const legendOfRose = ({
       x = defaultLegendOfRose.layout.translate.x,
       y = defaultLegendOfRose.layout.translate.y,
     } = defaultLegendOfRose.layout.translate,
-  } = defaultLegendOfRose.layout
-} = defaultLegendOfRose)=>({
+  } = defaultLegendOfRose.layout,
+} = defaultLegendOfRose) => ({
   name: 'legend',
   displayName: '图例',
   value: [
@@ -245,6 +252,7 @@ export const legendOfRose = ({
       displayName: '文本样式',
       value: font,
       type: 'textStyle',
+      markColorType: 'textColor',
     },
     {
       name: 'iconSize',
@@ -340,12 +348,12 @@ export const legendOfRose = ({
           ...translateConfig(x, y),
         },
       ],
-    }
+    },
   ],
   config: {
     defaultOpen: true,
   },
-})
+});
 
 const defaultLegendOfPie = {
   show: true,
@@ -492,6 +500,7 @@ export const legendOfPie = ({
           displayName: '文本样式',
           value: nameFont,
           type: 'textStyle',
+          markColorType: 'textColor',
         },
       ],
     },
@@ -534,6 +543,7 @@ export const legendOfPie = ({
           displayName: '文本样式',
           value: percentFont,
           type: 'textStyle',
+          markColorType: 'textColor',
         },
       ],
     },
@@ -603,6 +613,7 @@ export const legendOfPie = ({
           displayName: '文本样式',
           value: valueFont,
           type: 'textStyle',
+          markColorType: 'textColor',
         },
       ],
     },
@@ -672,10 +683,10 @@ export const legendOfPie = ({
   },
 });
 
-const defaultLegendOfDoublePie={
+const defaultLegendOfDoublePie = {
   show: true,
-  key:"legend",
-  displayName:"图例",
+  key: 'legend',
+  displayName: '图例',
   iconSize: {
     width: 10,
     height: 10,
@@ -754,7 +765,7 @@ export const legendOfDoublePie = ({
       x = defaultLegendOfDoublePie.layout.translate.x,
       y = defaultLegendOfDoublePie.layout.translate.y,
     } = defaultLegendOfDoublePie.layout.translate,
-    extraInput = []
+    extraInput = [],
   } = defaultLegendOfDoublePie.layout,
 } = defaultLegendOfDoublePie) => ({
   name: key,
@@ -806,6 +817,7 @@ export const legendOfDoublePie = ({
           displayName: '文本样式',
           value: nameFont,
           type: 'textStyle',
+          markColorType: 'textColor',
         },
       ],
     },
@@ -848,6 +860,7 @@ export const legendOfDoublePie = ({
           displayName: '文本样式',
           value: percentFont,
           type: 'textStyle',
+          markColorType: 'textColor',
         },
       ],
     },
@@ -917,6 +930,7 @@ export const legendOfDoublePie = ({
           displayName: '文本样式',
           value: valueFont,
           type: 'textStyle',
+          markColorType: 'textColor',
         },
       ],
     },
@@ -958,8 +972,8 @@ export const legendOfDoublePie = ({
           ],
           type: 'group',
         },
-        ...extraInput
-      ].filter(item=>!!item),
+        ...extraInput,
+      ].filter((item) => !!item),
     },
   ],
   config: {