@easyv/config 1.1.13 → 1.1.15

package/lib/label.js

@@ -372,7 +372,9 @@ var defaultAxisLabel = {
   appearance: {
     count: 3,
     angle: 0,
-    wordBreak: 'keep-all'
+    width: 40,
+    textOverflow: "ellipsis",
+    speed: 5
   },
   showLast: false,
   translate: {
@@ -399,8 +401,12 @@ var axisLabel = function axisLabel() {
     count = _ref4$appearance$coun === void 0 ? defaultAxisLabel.appearance.count : _ref4$appearance$coun,
     _ref4$appearance$angl = _ref4$appearance.angle,
     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$appearance$widt = _ref4$appearance.width,
+    width = _ref4$appearance$widt === void 0 ? defaultAxisLabel.appearance.width : _ref4$appearance$widt,
+    _ref4$appearance$text = _ref4$appearance.textOverflow,
+    textOverflow = _ref4$appearance$text === void 0 ? defaultAxisLabel.appearance.textOverflow : _ref4$appearance$text,
+    _ref4$appearance$spee = _ref4$appearance.speed,
+    speed = _ref4$appearance$spee === void 0 ? defaultAxisLabel.appearance.speed : _ref4$appearance$spee,
     _ref4$showLast = _ref4.showLast,
     showLast = _ref4$showLast === void 0 ? defaultAxisLabel.showLast : _ref4$showLast,
     _ref4$translate = _ref4.translate;
@@ -573,16 +579,39 @@ var axisLabel = function axisLabel() {
           suffix: '°'
         }
       }, {
-        name: 'wordBreak',
-        displayName: '行字数限制',
-        value: wordBreak,
-        type: 'select',
+        name: 'width',
+        displayName: '宽度',
+        value: width,
+        type: 'number',
+        config: {
+          suffix: "px",
+          span: 12
+        }
+      }, {
+        name: 'textOverflow',
+        displayName: '文本溢出',
+        value: textOverflow,
+        type: "select",
         config: {
           options: [{
-            name: '不限制',
-            value: 'keep-all'
+            name: '换行',
+            value: 'break-word'
+          }, {
+            name: '省略号',
+            value: 'ellipsis'
+          }, {
+            name: '跑马灯',
+            value: 'marquee'
           }],
-          allowInput: true,
+          span: 12
+        }
+      }, {
+        rule: [["textOverflow", "$eq", "marquee"]],
+        name: "speed",
+        displayName: "速度",
+        value: speed,
+        type: "number",
+        config: {
           span: 12
         }
       }],

package/lib/legend.js

@@ -5,8 +5,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.legendOfRose = exports.legendOfPie = exports.legendOfDoublePie = exports["default"] = void 0;
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _index = require("./index");
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var _require = require('.'),
@@ -24,6 +25,7 @@ var defaultFont = font({
 });
 var defaultLegend = {
   show: true,
+  maxWidth: 40,
   font: defaultFont,
   iconSize: {
     width: 10,
@@ -51,6 +53,9 @@ var _default = function _default() {
   var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : defaultLegend,
     _ref$show = _ref.show,
     show = _ref$show === void 0 ? defaultLegend.show : _ref$show,
+    _ref$maxWidth = _ref.maxWidth,
+    maxWidth = _ref$maxWidth === void 0 ? defaultLegend.maxWidth : _ref$maxWidth,
+    overflow = _ref.overflow,
     _ref$font = _ref.font,
     font = _ref$font === void 0 ? defaultLegend.font : _ref$font,
     _ref$iconSize = _ref.iconSize;
@@ -88,7 +93,9 @@ var _default = function _default() {
   return {
     name: 'legend',
     displayName: '图例',
-    value: [showConfig(show), {
+    value: [showConfig(show), (0, _index.sc)("maxWidth", "宽度", "number", maxWidth, {
+      suffix: "px"
+    }, showRule())].concat((0, _toConsumableArray2["default"])((0, _index.textOverflow)(overflow)), [{
       rule: [['show', '$eq', true]],
       name: 'font',
       displayName: '文本样式',
@@ -186,7 +193,7 @@ var _default = function _default() {
           suffix: '%'
         }
       }]
-    }].filter(function (item) {
+    }]).filter(function (item) {
       return !!item;
     }),
     config: {

package/lib/tooltip.js

@@ -44,7 +44,7 @@ var defaultTooltip = {
       data: {
         lineHeight: 18,
         iconSize: 10,
-        num: 2,
+        num: 0,
         name: {
           fontFamily: 'Mircosoft Yahei',
           fontSize: 12,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@easyv/config",
-  "version": "1.1.13",
+  "version": "1.1.15",
   "description": "",
   "main": "index.js",
   "scripts": {

package/src/label.js

@@ -337,7 +337,7 @@ export const labelOfRose = ({
 const defaultAxisLabel = {
   show: true,
   format: { type: 'date', showType: 'MM月' },
-  appearance: { count: 3, angle: 0, wordBreak: 'keep-all' },
+  appearance: { count: 3, angle: 0, width: 40, textOverflow:"ellipsis", speed:5 },
   showLast: false,
   translate: { x: 0, y: 0 },
   font: font({ color: 'rgba(230, 247, 255, 1)' }),
@@ -351,7 +351,9 @@ export const axisLabel = ({
   appearance: {
     count = defaultAxisLabel.appearance.count,
     angle = defaultAxisLabel.appearance.angle,
-    wordBreak = defaultAxisLabel.appearance.wordBreak,
+    width = defaultAxisLabel.appearance.width,
+    textOverflow = defaultAxisLabel.appearance.textOverflow,
+    speed = defaultAxisLabel.appearance.speed
   } = defaultAxisLabel.appearance,
   showLast = defaultAxisLabel.showLast,
   translate: {
@@ -567,16 +569,39 @@ export const axisLabel = ({
           },
         },
         {
-          name: 'wordBreak',
-          displayName: '行字数限制',
-          value: wordBreak,
-          type: 'select',
+          name: 'width',
+          displayName: '宽度',
+          value: width,
+          type: 'number',
           config: {
-            options: [{ name: '不限制', value: 'keep-all' }],
-            allowInput: true,
+            suffix:"px",
             span: 12,
           },
         },
+        {
+          name: 'textOverflow',
+          displayName: '文本溢出',
+          value: textOverflow,
+          type: "select",
+          config: {
+            options:[
+              { name: '换行', value: 'break-word' },
+              { name: '省略号', value: 'ellipsis' },
+              { name: '跑马灯', value: 'marquee' },
+            ],
+            span: 12,
+          }
+        },
+        {
+          rule:[["textOverflow","$eq","marquee"]],
+          name:"speed",
+          displayName:"速度",
+          value:speed,
+          type:"number",
+          config:{
+            span:12
+          }
+        }
       ],
       type: 'group',
     },

package/src/legend.js

@@ -2,8 +2,9 @@ const {
   translate: translateConfig,
   font,
   show: showConfig,
-  showRule,
+  showRule
 } = require('.');
+import { textOverflow, sc } from './index';
 
 const defaultFont = font({
   fontFamily: 'Mircosoft Yahei',
@@ -16,6 +17,7 @@ const defaultFont = font({
 
 const defaultLegend = {
   show: true,
+  maxWidth:40,
   font: defaultFont,
   iconSize: {
     width: 10,
@@ -38,6 +40,8 @@ const defaultLegend = {
 };
 export default ({
   show = defaultLegend.show,
+  maxWidth = defaultLegend.maxWidth,
+  overflow,
   font = defaultLegend.font,
   iconSize: {
     width = defaultLegend.iconSize.width,
@@ -65,6 +69,8 @@ export default ({
   displayName: '图例',
   value: [
     showConfig(show),
+    sc("maxWidth","宽度","number",maxWidth,{suffix:"px"},showRule()),
+    ...textOverflow(overflow),
     {
       rule: [['show', '$eq', true]],
       name: 'font',

package/src/tooltip.js

@@ -30,7 +30,7 @@ const defaultTooltip = {
       data: {
         lineHeight: 18,
         iconSize: 10,
-        num:2,
+        num:0,
         name: {
           fontFamily: 'Mircosoft Yahei',
           fontSize: 12,