@easyv/config 1.0.45 → 1.0.49

package/.babelrc

@@ -1,9 +1,9 @@
-{
-  "presets": ["@babel/preset-env", "@babel/preset-react"],
-  "plugins": [
-    "@babel/plugin-proposal-export-default-from",
-    "@babel/plugin-transform-runtime",
-    "@babel/plugin-proposal-class-properties",
-    "babel-plugin-transform-import-styles"
-  ]
-}
+{
+  "presets": ["@babel/preset-env", "@babel/preset-react"],
+  "plugins": [
+    "@babel/plugin-proposal-export-default-from",
+    "@babel/plugin-transform-runtime",
+    "@babel/plugin-proposal-class-properties",
+    "babel-plugin-transform-import-styles"
+  ]
+}

package/index.js

@@ -1,3 +1,3 @@
-const config = require('./lib');
-
-module.exports = config;
+const config = require('./lib');
+
+module.exports = config;

package/lib/interaction.js

@@ -9,8 +9,8 @@ exports["default"] = void 0;
 
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
-/**
- * TODO:有个触发回调的类型
+/**
+ * TODO:有个触发回调的类型
  */
 var defaultAction = 'click';
 var defaultCallback = {

package/lib/label.js

@@ -384,6 +384,7 @@ var defaultAxisLabel = {
     angle: 0,
     wordBreak: 'keep-all'
   },
+  showLast: false,
   translate: {
     x: 0,
     y: 0
@@ -412,6 +413,8 @@ var axisLabel = function axisLabel() {
       angle = _ref4$appearance$angl === void 0 ? defaultAxisLabel.appearance.angle : _ref4$appearance$angl,
       _ref4$appearance$word = _ref4$appearance.wordBreak,
       wordBreak = _ref4$appearance$word === void 0 ? defaultAxisLabel.appearance.wordBreak : _ref4$appearance$word,
+      _ref4$showLast = _ref4.showLast,
+      showLast = _ref4$showLast === void 0 ? defaultAxisLabel.showLast : _ref4$showLast,
       _ref4$translate = _ref4.translate;
   _ref4$translate = _ref4$translate === void 0 ? defaultAxisLabel.translate : _ref4$translate;
   var _ref4$translate$x = _ref4$translate.x,
@@ -595,6 +598,12 @@ var axisLabel = function axisLabel() {
         }
       }],
       type: 'group'
+    }, {
+      name: 'showLast',
+      displayName: '显示最新',
+      value: showLast,
+      type: 'boolean',
+      tip: '显示返回最新数据的轴标签'
     }, _objectSpread({
       rule: [['show', '$eq', true]]
     }, (0, _.translate)(labelTranslateX, labelTranslateY)), {

package/lib/series.js

@@ -18,7 +18,8 @@ var _mapping = {
 var defaultBandSeries = {
   mapping: _mapping,
   yOrZ: 'y',
-  stack: '',
+  fillType: 'color',
+  fillImage: 'components/static-image/superChart/pattern.png',
   fill: {
     type: 'linear',
     pure: '#fff',
@@ -58,7 +59,12 @@ var defaultBandSeries = {
         opacity: 1
       }
     }
-  }
+  },
+  size: {
+    width: 10,
+    height: 10
+  },
+  opacity: 0.65
 };
 
 var bandSeries = function bandSeries() {
@@ -76,11 +82,22 @@ var bandSeries = function bandSeries() {
       yOrZ = _ref$yOrZ === void 0 ? defaultBandSeries.yOrZ : _ref$yOrZ,
       stack = _ref.stack,
       patternType = _ref.patternType,
+      fillType = _ref.fillType,
+      _ref$fillImage = _ref.fillImage,
+      fillImage = _ref$fillImage === void 0 ? defaultBandSeries.fillImage : _ref$fillImage,
       patternWidth = _ref.patternWidth,
       patternHeight = _ref.patternHeight,
       patternImage = _ref.patternImage,
       _ref$fill = _ref.fill,
       fill = _ref$fill === void 0 ? defaultBandSeries.fill : _ref$fill,
+      _ref$size = _ref.size;
+  _ref$size = _ref$size === void 0 ? defaultBandSeries.size : _ref$size;
+  var _ref$size$width = _ref$size.width,
+      urlWidth = _ref$size$width === void 0 ? defaultBandSeries.size.width : _ref$size$width,
+      _ref$size$height = _ref$size.height,
+      urlHeight = _ref$size$height === void 0 ? defaultBandSeries.size.height : _ref$size$height,
+      _ref$opacity = _ref.opacity,
+      opacity = _ref$opacity === void 0 ? defaultBandSeries.opacity : _ref$opacity,
       _ref$highlight = _ref.highlight;
   _ref$highlight = _ref$highlight === void 0 ? defaultBandSeries.highlight : _ref$highlight;
   var _ref$highlight$show = _ref$highlight.show,
@@ -114,7 +131,66 @@ var bandSeries = function bandSeries() {
       displayName: '堆叠',
       value: stack,
       type: 'input'
-    }, {
+    }, patternType === undefined && {
+      name: 'fillType',
+      displayName: '填充样式',
+      value: fillType,
+      type: 'radio',
+      config: {
+        options: [{
+          name: '颜色',
+          value: 'color'
+        }, {
+          name: '纹理',
+          value: 'pattern'
+        }]
+      }
+    }, patternType === undefined && {
+      rule: [['fillType', '$eq', 'color']],
+      name: 'fill',
+      displayName: '颜色',
+      type: 'multicolor',
+      value: fill
+    }, patternType === undefined && {
+      rule: [['fillType', '$eq', 'pattern']],
+      name: 'url',
+      displayName: '纹理图片',
+      type: 'uploadImage',
+      value: fillImage
+    }, patternType === undefined && {
+      rule: [['fillType', '$eq', 'pattern']],
+      name: 'size',
+      displayName: '尺寸',
+      value: [{
+        name: 'width',
+        displayName: '宽度',
+        value: urlWidth,
+        config: {
+          span: 12,
+          suffix: 'W'
+        }
+      }, {
+        name: 'height',
+        displayName: '高度',
+        value: urlHeight,
+        config: {
+          span: 12,
+          suffix: 'H'
+        }
+      }],
+      type: 'group'
+    }, patternType === undefined && {
+      rule: [['fillType', '$eq', 'pattern']],
+      type: "range",
+      name: "opacity",
+      displayName: "透明度",
+      value: opacity,
+      config: {
+        max: 1,
+        min: 0,
+        step: 0.01
+      }
+    }, patternType !== undefined && {
       name: 'fill',
       displayName: '颜色',
       type: 'multicolor',
@@ -228,6 +304,13 @@ var defaultLineSeries = {
       unitStep: 1
     }
   },
+  areaType: 'color',
+  size: {
+    width: 10,
+    height: 10
+  },
+  url: 'components/static-image/superChart/pattern.png',
+  opacity: 0.65,
   areaColor: {
     type: 'linear',
     pure: '#fff',
@@ -259,7 +342,12 @@ var defaultIcon = {
     radius: 6
   },
   color: '#1283E3',
-  radius: 4
+  radius: 4,
+  image: 'components/static-image/superChart/fang.png',
+  size: {
+    width: 10,
+    height: 10
+  }
 };
 
 var commonLine = function commonLine() {
@@ -399,7 +487,15 @@ var icon = function icon() {
       _ref4$color = _ref4.color,
       color = _ref4$color === void 0 ? defaultIcon.color : _ref4$color,
       _ref4$radius = _ref4.radius,
-      radius = _ref4$radius === void 0 ? defaultIcon.radius : _ref4$radius;
+      radius = _ref4$radius === void 0 ? defaultIcon.radius : _ref4$radius,
+      _ref4$image = _ref4.image,
+      image = _ref4$image === void 0 ? defaultIcon.image : _ref4$image,
+      _ref4$size = _ref4.size;
+  _ref4$size = _ref4$size === void 0 ? defaultIcon.size : _ref4$size;
+  var _ref4$size$width = _ref4$size.width,
+      imageWidth = _ref4$size$width === void 0 ? defaultIcon.size.width : _ref4$size$width,
+      _ref4$size$height = _ref4$size.height,
+      imageHeight = _ref4$size$height === void 0 ? defaultIcon.size.height : _ref4$size$height;
   return {
     name: 'icon',
     displayName: '数据标记',
@@ -421,8 +517,39 @@ var icon = function icon() {
         }, {
           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: imageWidth,
+        config: {
+          span: 12,
+          suffix: 'W'
+        }
+      }, {
+        name: 'height',
+        displayName: '高度',
+        value: imageHeight,
+        config: {
+          span: 12,
+          suffix: 'H'
+        }
+      }],
+      type: 'group'
     }, {
       rule: [['show', '$eq', true], ['mode', '$eq', 'double']],
       name: 'inner',
@@ -559,8 +686,20 @@ var areaSeries = function areaSeries() {
       lineLighter = _ref6$line.lighter,
       _ref6$label = _ref6.label,
       areaLabel = _ref6$label === void 0 ? defaultLineSeries.label : _ref6$label,
+      _ref6$areaType = _ref6.areaType,
+      areaType = _ref6$areaType === void 0 ? defaultLineSeries.areaType : _ref6$areaType,
       _ref6$areaColor = _ref6.areaColor,
-      areaColor = _ref6$areaColor === void 0 ? defaultLineSeries.areaColor : _ref6$areaColor;
+      areaColor = _ref6$areaColor === void 0 ? defaultLineSeries.areaColor : _ref6$areaColor,
+      _ref6$url = _ref6.url,
+      url = _ref6$url === void 0 ? defaultLineSeries.url : _ref6$url,
+      _ref6$size = _ref6.size;
+  _ref6$size = _ref6$size === void 0 ? defaultLineSeries.size : _ref6$size;
+  var _ref6$size$width = _ref6$size.width,
+      urlWidth = _ref6$size$width === void 0 ? defaultLineSeries.size.width : _ref6$size$width,
+      _ref6$size$height = _ref6$size.height,
+      urlHeight = _ref6$size$height === void 0 ? defaultLineSeries.size.height : _ref6$size$height,
+      _ref6$opacity = _ref6.opacity,
+      opacity = _ref6$opacity === void 0 ? defaultLineSeries.opacity : _ref6$opacity;
   return {
     name: name,
     displayName: '系列',
@@ -582,10 +721,64 @@ var areaSeries = function areaSeries() {
         }]
       }
     }, {
+      name: "areaType",
+      displayName: "区域样式",
+      value: areaType,
+      type: 'radio',
+      config: {
+        options: [{
+          name: "颜色",
+          value: "color"
+        }, {
+          name: "纹理",
+          value: "pattern"
+        }]
+      }
+    }, {
+      rule: [['areaType', '$eq', 'color']],
       name: 'areaColor',
       displayName: '区域颜色',
       type: 'multicolor',
       value: areaColor
+    }, {
+      rule: [['areaType', '$eq', 'pattern']],
+      name: "url",
+      displayName: "纹理图片",
+      value: url,
+      type: "uploadImage"
+    }, {
+      rule: [['areaType', '$eq', 'pattern']],
+      name: 'size',
+      displayName: '尺寸',
+      value: [{
+        name: 'width',
+        displayName: '宽度',
+        value: urlWidth,
+        config: {
+          span: 12,
+          suffix: 'W'
+        }
+      }, {
+        name: 'height',
+        displayName: '高度',
+        value: urlHeight,
+        config: {
+          span: 12,
+          suffix: 'H'
+        }
+      }],
+      type: 'group'
+    }, {
+      rule: [['areaType', '$eq', 'pattern']],
+      type: "range",
+      name: "opacity",
+      displayName: "透明度",
+      value: opacity,
+      config: {
+        max: 1,
+        min: 0,
+        step: 0.01
+      }
     }, {
       name: 'line',
       displayName: '折线',

package/lib/tooltip.js

@@ -43,8 +43,9 @@ var defaultTooltip = {
           y: 0
         }
       },
-      lineHeight: 18,
       data: {
+        lineHeight: 18,
+        iconSize: 10,
         name: {
           fontFamily: 'Mircosoft Yahei',
           fontSize: 12,
@@ -60,6 +61,20 @@ var defaultTooltip = {
           bold: false,
           italic: false,
           letterSpacing: 0
+        },
+        suffix: {
+          font: {
+            fontFamily: 'Mircosoft Yahei',
+            fontSize: 12,
+            color: '#D4EFFC',
+            bold: false,
+            italic: false,
+            letterSpacing: 0
+          },
+          translate: {
+            x: 0,
+            y: 0
+          }
         }
       }
     }
@@ -123,11 +138,13 @@ var _default = function _default() {
   _ref$tip$data$xAxis$t = _ref$tip$data$xAxis$t === void 0 ? defaultTooltip.tip.data.xAxis.translate : _ref$tip$data$xAxis$t;
   var x = _ref$tip$data$xAxis$t.x,
       y = _ref$tip$data$xAxis$t.y,
-      _ref$tip$data$lineHei = _ref$tip$data.lineHeight,
-      lineHeight = _ref$tip$data$lineHei === void 0 ? defaultTooltip.tip.data.lineHeight : _ref$tip$data$lineHei,
       _ref$tip$data$data = _ref$tip$data.data;
   _ref$tip$data$data = _ref$tip$data$data === void 0 ? defaultTooltip.tip.data.data : _ref$tip$data$data;
-  var _ref$tip$data$data$na = _ref$tip$data$data.name;
+  var _ref$tip$data$data$li = _ref$tip$data$data.lineHeight,
+      lineHeight = _ref$tip$data$data$li === void 0 ? defaultTooltip.tip.data.lineHeight : _ref$tip$data$data$li,
+      _ref$tip$data$data$ic = _ref$tip$data$data.iconSize,
+      iconSize = _ref$tip$data$data$ic === void 0 ? defaultTooltip.tip.data.iconSize : _ref$tip$data$data$ic,
+      _ref$tip$data$data$na = _ref$tip$data$data.name;
   _ref$tip$data$data$na = _ref$tip$data$data$na === void 0 ? defaultTooltip.tip.data.data.name : _ref$tip$data$data$na;
   var nameFontFamily = _ref$tip$data$data$na.fontFamily,
       nameFontSize = _ref$tip$data$data$na.fontSize,
@@ -143,6 +160,16 @@ var _default = function _default() {
       valueFontBold = _ref$tip$data$data$va.bold,
       valueFontItalic = _ref$tip$data$data$va.italic,
       valueFontLetterSpacing = _ref$tip$data$data$va.letterSpacing,
+      _ref$tip$data$data$su = _ref$tip$data$data.suffix;
+  _ref$tip$data$data$su = _ref$tip$data$data$su === void 0 ? defaultTooltip.tip.data.data.suffix : _ref$tip$data$data$su;
+  var _ref$tip$data$data$su2 = _ref$tip$data$data$su.font;
+  _ref$tip$data$data$su2 = _ref$tip$data$data$su2 === void 0 ? defaultTooltip.tip.data.data.suffix.font : _ref$tip$data$data$su2;
+  var suffixFontFamily = _ref$tip$data$data$su2.fontFamily,
+      suffixFontSize = _ref$tip$data$data$su2.fontSize,
+      suffixColor = _ref$tip$data$data$su2.color,
+      suffixBold = _ref$tip$data$data$su2.bold,
+      suffixItalic = _ref$tip$data$data$su2.italic,
+      suffixLetterSpacing = _ref$tip$data$data$su2.letterSpacing,
       _ref$indicator = _ref.indicator;
   _ref$indicator = _ref$indicator === void 0 ? defaultTooltip.indicator : _ref$indicator;
   var _ref$indicator$width = _ref$indicator.width,
@@ -210,7 +237,7 @@ var _default = function _default() {
         displayName: '框内数据',
         value: [{
           name: 'xAxis',
-          displayName: 'X轴标签',
+          displayName: '类目标签',
           value: [{
             name: 'font',
             displayName: '文本样式',
@@ -246,14 +273,19 @@ var _default = function _default() {
             }
           }, (0, _.translate)(x, y)]
         }, {
-          displayName: '行高',
-          type: 'number',
-          value: lineHeight,
-          name: 'lineHeight'
-        }, {
-          displayName: '数据样式',
+          displayName: '数据',
           name: 'data',
           value: [{
+            displayName: '行间距',
+            type: 'number',
+            value: lineHeight,
+            name: 'lineHeight'
+          }, {
+            displayName: '图标尺寸',
+            type: 'number',
+            value: iconSize,
+            name: 'iconSize'
+          }, {
             name: 'name',
             displayName: '系列名称',
             value: {
@@ -277,6 +309,87 @@ var _default = function _default() {
               letterSpacing: valueFontLetterSpacing
             },
             type: 'textStyle'
+          }, {
+            name: 'suffix',
+            displayName: '后缀',
+            value: [{
+              name: 'show',
+              displayName: '显示',
+              value: false,
+              type: 'boolean'
+            }, {
+              name: 'content',
+              displayName: '内容',
+              value: [{
+                name: "suffixText1",
+                displayName: "后缀",
+                type: "object",
+                value: [{
+                  name: "suffix",
+                  displayName: "后缀",
+                  type: "group",
+                  value: [{
+                    name: "name",
+                    displayName: "系列名",
+                    value: "系列一",
+                    type: "input",
+                    config: {
+                      span: 12
+                    }
+                  }, {
+                    name: "suffix",
+                    displayName: "后缀",
+                    value: "%",
+                    type: "input",
+                    config: {
+                      span: 12
+                    }
+                  }]
+                }]
+              }],
+              config: {
+                template: [{
+                  name: "suffixText",
+                  displayName: "后缀",
+                  type: "object",
+                  value: [{
+                    name: "suffix",
+                    displayName: "后缀",
+                    type: "group",
+                    value: [{
+                      name: "name",
+                      displayName: "系列名",
+                      value: "",
+                      type: "input",
+                      config: {
+                        span: 12
+                      }
+                    }, {
+                      name: "suffix",
+                      displayName: "后缀",
+                      value: "",
+                      type: "input",
+                      config: {
+                        span: 12
+                      }
+                    }]
+                  }]
+                }]
+              },
+              type: 'array'
+            }, {
+              name: 'font',
+              displayName: '文本样式',
+              value: {
+                fontFamily: suffixFontFamily,
+                fontSize: suffixFontSize,
+                color: suffixColor,
+                bold: suffixBold,
+                italic: suffixItalic,
+                letterSpacing: suffixLetterSpacing
+              },
+              type: 'textStyle'
+            }, (0, _.translate)(x, y)]
           }]
         }]
       }]

package/package.json

@@ -1,23 +1,23 @@
-{
-  "name": "@easyv/config",
-  "version": "1.0.45",
-  "description": "",
-  "main": "index.js",
-  "scripts": {
-    "make": "babel src -d lib"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "devDependencies": {
-    "@babel/cli": "^7.6.0",
-    "@babel/core": "^7.11.5",
-    "@babel/plugin-proposal-class-properties": "^7.10.4",
-    "@babel/plugin-proposal-export-default-from": "^7.10.4",
-    "@babel/plugin-transform-runtime": "^7.11.5",
-    "@babel/preset-env": "^7.11.5",
-    "@babel/preset-react": "^7.10.4",
-    "babel-plugin-transform-import-styles": "0.0.11",
-    "babel-preset-env": "^1.7.0"
-  }
-}
+{
+  "name": "@easyv/config",
+  "version": "1.0.49",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "make": "babel src -d lib"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "devDependencies": {
+    "@babel/cli": "^7.6.0",
+    "@babel/core": "^7.11.5",
+    "@babel/plugin-proposal-class-properties": "^7.10.4",
+    "@babel/plugin-proposal-export-default-from": "^7.10.4",
+    "@babel/plugin-transform-runtime": "^7.11.5",
+    "@babel/preset-env": "^7.11.5",
+    "@babel/preset-react": "^7.10.4",
+    "babel-plugin-transform-import-styles": "0.0.11",
+    "babel-preset-env": "^1.7.0"
+  }
+}