@easyv/config 1.0.45 → 1.0.46

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/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.46",
+  "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"
+  }
+}