@easyv/config 1.0.49 → 1.0.54

package/CHANGELOG.md

@@ -0,0 +1,9 @@
+# Changelog
+
+All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
+
+### [1.0.53](https://gitlab.prod.dtstack.cn:10022/visdev/visApplication/easyv-config/compare/v1.0.52...v1.0.53) (2022-04-08)
+
+### [1.0.52](https://gitlab.prod.dtstack.cn:10022/visdev/visApplication/easyv-config/compare/v1.0.51...v1.0.52) (2022-04-02)
+
+### 1.0.51 (2022-04-02)

package/lib/animation.js

@@ -204,7 +204,8 @@ var animationOfCarousel = function animationOfCarousel() {
         name: 'textStyle',
         displayName: '类目文本样式',
         value: (0, _.font)(textStyle),
-        type: "textStyle"
+        type: "textStyle",
+        markColorType: 'textColor'
       }, {
         name: 'gap',
         displayName: '类目文本间距',

package/lib/axisLine.js

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

package/lib/gridLine.js

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

package/lib/label.js

@@ -76,7 +76,8 @@ var _default = function _default() {
         italic: italic,
         letterSpacing: letterSpacing
       },
-      type: 'textStyle'
+      type: 'textStyle',
+      markColorType: 'textColor'
     }, position !== undefined && {
       name: 'position',
       displayName: '位置',
@@ -221,10 +222,10 @@ var labelOfPie = function labelOfPie() {
         step: 1
       }
     }, lineColor !== undefined && {
-      name: "lineColor",
-      displayName: "线颜色",
+      name: 'lineColor',
+      displayName: '线颜色',
       value: lineColor,
-      type: "color"
+      type: 'color'
     }, {
       rule: [['show', '$eq', true]],
       name: 'mode',
@@ -256,7 +257,8 @@ var labelOfPie = function labelOfPie() {
         name: 'font',
         displayName: '文本样式',
         value: nameFont,
-        type: 'textStyle'
+        type: 'textStyle',
+        markColorType: 'textColor'
       }]
     }, {
       rule: [['show', '$eq', true]],
@@ -281,7 +283,8 @@ var labelOfPie = function labelOfPie() {
         name: 'font',
         displayName: '文本样式',
         value: percentFont,
-        type: 'textStyle'
+        type: 'textStyle',
+        markColorType: 'textColor'
       }]
     }, {
       name: 'value',
@@ -323,7 +326,8 @@ var labelOfPie = function labelOfPie() {
         name: 'font',
         displayName: '文本样式',
         value: valueFont,
-        type: 'textStyle'
+        type: 'textStyle',
+        markColorType: 'textColor'
       }]
     }].filter(function (item) {
       return !!item;
@@ -359,14 +363,15 @@ var labelOfRose = function labelOfRose() {
       name: 'font',
       displayName: '文本样式',
       value: (0, _.font)(labelFont),
-      type: 'textStyle'
+      type: 'textStyle',
+      markColorType: 'textColor'
     }), _objectSpread(_objectSpread({}, (0, _.showRule)()), {}, {
-      name: "gap",
-      displayName: "间距",
+      name: 'gap',
+      displayName: '间距',
       value: gap,
-      type: "number",
+      type: 'number',
       config: {
-        suffix: "px"
+        suffix: 'px'
       }
     })]
   };
@@ -611,7 +616,8 @@ var axisLabel = function axisLabel() {
       name: 'font',
       displayName: '文本样式',
       value: font,
-      type: 'textStyle'
+      type: 'textStyle',
+      markColorType: 'textColor'
     }]
   };
 };

package/lib/legend.js

@@ -102,7 +102,8 @@ var _default = function _default() {
       name: 'font',
       displayName: '文本样式',
       value: font,
-      type: 'textStyle'
+      type: 'textStyle',
+      markColorType: 'textColor'
     }, {
       name: 'iconSize',
       displayName: '图标尺寸',
@@ -267,7 +268,8 @@ var legendOfRose = function legendOfRose() {
       name: 'font',
       displayName: '文本样式',
       value: font,
-      type: 'textStyle'
+      type: 'textStyle',
+      markColorType: 'textColor'
     }, {
       name: 'iconSize',
       displayName: '图标尺寸',
@@ -522,7 +524,8 @@ var legendOfPie = function legendOfPie() {
         name: 'font',
         displayName: '文本样式',
         value: nameFont,
-        type: 'textStyle'
+        type: 'textStyle',
+        markColorType: 'textColor'
       }]
     }), _objectSpread(_objectSpread({}, showRule()), {}, {
       name: 'percent',
@@ -552,7 +555,8 @@ var legendOfPie = function legendOfPie() {
         name: 'font',
         displayName: '文本样式',
         value: percentFont,
-        type: 'textStyle'
+        type: 'textStyle',
+        markColorType: 'textColor'
       })]
     }), _objectSpread(_objectSpread({}, showRule()), {}, {
       name: 'value',
@@ -599,7 +603,8 @@ var legendOfPie = function legendOfPie() {
         name: 'font',
         displayName: '文本样式',
         value: valueFont,
-        type: 'textStyle'
+        type: 'textStyle',
+        markColorType: 'textColor'
       })]
     }), _objectSpread(_objectSpread({}, showRule()), {}, {
       name: 'layout',
@@ -651,8 +656,8 @@ var legendOfPie = function legendOfPie() {
 exports.legendOfPie = legendOfPie;
 var defaultLegendOfDoublePie = {
   show: true,
-  key: "legend",
-  displayName: "图例",
+  key: 'legend',
+  displayName: '图例',
   iconSize: {
     width: 10,
     height: 10
@@ -815,7 +820,8 @@ var legendOfDoublePie = function legendOfDoublePie() {
         name: 'font',
         displayName: '文本样式',
         value: nameFont,
-        type: 'textStyle'
+        type: 'textStyle',
+        markColorType: 'textColor'
       }]
     }, {
       rule: [['show', '$eq', true]],
@@ -850,7 +856,8 @@ var legendOfDoublePie = function legendOfDoublePie() {
         name: 'font',
         displayName: '文本样式',
         value: percentFont,
-        type: 'textStyle'
+        type: 'textStyle',
+        markColorType: 'textColor'
       }]
     }, {
       rule: [['show', '$eq', true]],
@@ -906,7 +913,8 @@ var legendOfDoublePie = function legendOfDoublePie() {
         name: 'font',
         displayName: '文本样式',
         value: valueFont,
-        type: 'textStyle'
+        type: 'textStyle',
+        markColorType: 'textColor'
       }]
     }, {
       rule: [['show', '$eq', true]],

package/lib/pie.js

@@ -220,20 +220,21 @@ var roseCategoryAxis = function roseCategoryAxis() {
       _ref4$axis$gridLine = _ref4$axis.gridLine,
       gridLine_ = _ref4$axis$gridLine === void 0 ? defaultRoseAxis.axis.gridLine : _ref4$axis$gridLine;
   return {
-    name: "categoryAxis",
-    displayName: "类目轴",
+    name: 'categoryAxis',
+    displayName: '类目轴',
     value: [{
-      name: "textStyle",
-      displayName: "标签文本",
+      name: 'textStyle',
+      displayName: '标签文本',
       value: (0, _.font)(textStyle),
-      type: "textStyle"
+      type: 'textStyle',
+      markColorType: 'textColor'
     }, {
-      name: "gap",
-      displayName: "边距",
+      name: 'gap',
+      displayName: '边距',
       value: gap,
-      type: "number",
+      type: 'number',
       config: {
-        suffix: "px"
+        suffix: 'px'
       }
     }, (0, _.axisLine)(axisLine_), gridLine(gridLine_)],
     config: {
@@ -258,25 +259,26 @@ var roseValueAxis = function roseValueAxis() {
       _ref5$axis$gridLine = _ref5$axis.gridLine,
       gridLine_ = _ref5$axis$gridLine === void 0 ? defaultRoseAxis.axis.gridLine : _ref5$axis$gridLine;
   return {
-    name: "valueAxis",
-    displayName: "数值轴",
+    name: 'valueAxis',
+    displayName: '数值轴',
     value: [{
-      name: "count",
-      displayName: "数量",
+      name: 'count',
+      displayName: '数量',
       value: count,
-      type: "number"
+      type: 'number'
     }, {
-      name: "textStyle",
-      displayName: "标签文本",
+      name: 'textStyle',
+      displayName: '标签文本',
       value: (0, _.font)(textStyle),
-      type: "textStyle"
+      type: 'textStyle',
+      markColorType: 'textColor'
     }, {
-      name: "gap",
-      displayName: "边距",
+      name: 'gap',
+      displayName: '边距',
       value: gap,
-      type: "number",
+      type: 'number',
       config: {
-        suffix: "px"
+        suffix: 'px'
       }
     }, (0, _.axisLine)(axisLine_), gridLine(gridLine_)],
     config: {
@@ -314,14 +316,15 @@ var categoryText = function categoryText(_ref6) {
       name: 'textStyle',
       displayName: '文本样式',
       value: font,
-      type: "textStyle"
+      type: 'textStyle',
+      markColorType: 'textColor'
     }), _objectSpread(_objectSpread({}, (0, _.showRule)()), {}, {
       name: 'gap',
       displayName: '间距',
       value: gap,
       type: 'number',
       config: {
-        suffix: "px"
+        suffix: 'px'
       }
     })]
   };
@@ -466,7 +469,7 @@ var decorate2 = function decorate2(_ref8) {
       config: {
         min: 0,
         max: 100,
-        suffix: "%"
+        suffix: '%'
       }
     }]
   };
@@ -581,10 +584,11 @@ var current = function current() {
         name: 'font',
         displayName: '文本样式',
         value: nameFont,
-        type: 'textStyle'
-      }, nameTranslate != undefined && _objectSpread(_objectSpread({}, (0, _.showRule)()), (0, _.translate)(nameTranslate.x, nameTranslate.y)), textBreak != undefined && _objectSpread(_objectSpread({}, (0, _.showRule)()), (0, _.sc)("textBreak", "首行字数", "number", textBreak, {
+        type: 'textStyle',
+        markColorType: 'textColor'
+      }, nameTranslate != undefined && _objectSpread(_objectSpread({}, (0, _.showRule)()), (0, _.translate)(nameTranslate.x, nameTranslate.y)), textBreak != undefined && _objectSpread(_objectSpread({}, (0, _.showRule)()), (0, _.sc)('textBreak', '首行字数', 'number', textBreak, {
         min: 0,
-        suffix: "个"
+        suffix: '个'
       }))].filter(function (item) {
         return !!item;
       })
@@ -606,7 +610,8 @@ var current = function current() {
         name: 'font',
         displayName: '文本样式',
         value: percentFont,
-        type: 'textStyle'
+        type: 'textStyle',
+        markColorType: 'textColor'
       }, _objectSpread({
         rule: [['show', '$eq', true]]
       }, (0, _.translate)(percentTranslateX, percentTranslateY))]
@@ -619,7 +624,8 @@ var current = function current() {
         name: 'font',
         displayName: '文本样式',
         value: valueFont,
-        type: 'textStyle'
+        type: 'textStyle',
+        markColorType: 'textColor'
       }, _objectSpread({
         rule: [['show', '$eq', true]]
       }, (0, _.translate)(valueTranslateX, valueTranslateY)), {
@@ -720,12 +726,12 @@ var baseOuter = function baseOuter() {
 
 var defaultOuterDecorate = {
   outerDecorate: {
-    color: "#CF00FF",
+    color: '#CF00FF',
     width: 10,
     tick: {
       show: true,
       count: 12,
-      color: "#CF00FF",
+      color: '#CF00FF',
       width: 3,
       length: 8
     }
@@ -762,46 +768,46 @@ var outerDecorate = function outerDecorate() {
       value: color,
       type: 'color'
     }, {
-      name: "width",
-      displayName: "粗细",
+      name: 'width',
+      displayName: '粗细',
       value: width,
-      type: "number",
+      type: 'number',
       config: {
         min: 0,
         max: 100,
-        suffix: "px"
+        suffix: 'px'
       }
     }, {
       name: 'tick',
       displayName: '刻度',
       value: [(0, _.show)(show), _objectSpread(_objectSpread({}, (0, _.showRule)()), {}, {
-        name: "count",
-        displayName: "个数",
+        name: 'count',
+        displayName: '个数',
         value: count,
-        type: "number",
+        type: 'number',
         config: {
           min: 0
         }
       }), _objectSpread(_objectSpread({}, (0, _.showRule)()), {}, {
-        name: "color",
-        displayName: "颜色",
+        name: 'color',
+        displayName: '颜色',
         value: tickColor,
-        type: "color"
+        type: 'color'
       }), _objectSpread(_objectSpread({}, (0, _.showRule)()), {}, {
-        name: "width",
-        displayName: "粗细",
+        name: 'width',
+        displayName: '粗细',
         value: tickWidth,
-        type: "number",
+        type: 'number',
         config: {
-          suffix: "px"
+          suffix: 'px'
         }
       }), _objectSpread(_objectSpread({}, (0, _.showRule)()), {}, {
-        name: "length",
-        displayName: "长度",
+        name: 'length',
+        displayName: '长度',
         value: length,
-        type: "number",
+        type: 'number',
         config: {
-          suffix: "px"
+          suffix: 'px'
         }
       })]
     }]

package/lib/series.js

@@ -18,7 +18,6 @@ var _mapping = {
 var defaultBandSeries = {
   mapping: _mapping,
   yOrZ: 'y',
-  fillType: 'color',
   fillImage: 'components/static-image/superChart/pattern.png',
   fill: {
     type: 'linear',
@@ -131,7 +130,7 @@ var bandSeries = function bandSeries() {
       displayName: '堆叠',
       value: stack,
       type: 'input'
-    }, patternType === undefined && {
+    }, fillType !== undefined && {
       name: 'fillType',
       displayName: '填充样式',
       value: fillType,
@@ -145,19 +144,20 @@ var bandSeries = function bandSeries() {
           value: 'pattern'
         }]
       }
-    }, patternType === undefined && {
+    }, fillType !== undefined && {
       rule: [['fillType', '$eq', 'color']],
       name: 'fill',
       displayName: '颜色',
       type: 'multicolor',
-      value: fill
-    }, patternType === undefined && {
+      value: fill,
+      markColorType: 'seriesGradient'
+    }, fillType !== undefined && {
       rule: [['fillType', '$eq', 'pattern']],
       name: 'url',
       displayName: '纹理图片',
       type: 'uploadImage',
       value: fillImage
-    }, patternType === undefined && {
+    }, fillType !== undefined && {
       rule: [['fillType', '$eq', 'pattern']],
       name: 'size',
       displayName: '尺寸',
@@ -179,22 +179,23 @@ var bandSeries = function 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
       }
-    }, patternType !== undefined && {
+    }, (patternType !== undefined || fillType === undefined) && {
       name: 'fill',
       displayName: '颜色',
       type: 'multicolor',
-      value: fill
+      value: fill,
+      markColorType: 'seriesGradient'
     }, patternType !== undefined && {
       name: 'patternType',
       displayName: '纹理类型',
@@ -332,7 +333,7 @@ var defaultLineSeries = {
 };
 var defaultIcon = {
   show: true,
-  mode: 'double',
+  mode: 'single',
   inner: {
     color: '#83C4FF',
     radius: 3
@@ -383,7 +384,8 @@ var commonLine = function commonLine() {
     name: 'color',
     displayName: '颜色',
     value: color,
-    type: 'color'
+    type: 'color',
+    markColorType: 'palette'
   }, {
     name: 'lineWidth',
     displayName: '粗细',
@@ -442,7 +444,8 @@ var lighter = function lighter() {
       name: 'fill',
       displayName: '颜色',
       type: 'multicolor',
-      value: fill
+      value: fill,
+      markColorType: 'seriesGradient'
     }, {
       rule: [['show', '$eq', true]],
       name: 'length',
@@ -593,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',
@@ -721,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'
         }]
       }
     }, {
@@ -739,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',
@@ -770,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,
@@ -782,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)],
@@ -844,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;
@@ -860,7 +866,7 @@ var pieSeries = function pieSeries() {
 exports.pieSeries = pieSeries;
 var defaultPurePieSeries = {
   mapping: _mapping,
-  color: "#fff"
+  color: '#fff'
 };
 
 var purePieSeries = function purePieSeries() {
@@ -886,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',