@easyv/config 1.1.18 → 1.1.20

package/lib/animation.js

@@ -113,7 +113,8 @@ var animationOfPie = function animationOfPie() {
     _ref3$interval = _ref3.interval,
     interval = _ref3$interval === void 0 ? defaultAnimationOfPie.interval : _ref3$interval,
     _ref3$interactive = _ref3.interactive,
-    interactive = _ref3$interactive === void 0 ? defaultAnimationOfPie.interactive : _ref3$interactive;
+    interactive = _ref3$interactive === void 0 ? defaultAnimationOfPie.interactive : _ref3$interactive,
+    hoverStop = _ref3.hoverStop;
   return {
     name: 'animation',
     displayName: '轮播动画',
@@ -156,7 +157,6 @@ var animationOfPie = function animationOfPie() {
       }
     }, {
       tip: '选择点击或悬浮，鼠标点击/悬浮各数据块时停止轮播仅显示当前数据信息',
-      rule: [['on', '$eq', true]],
       name: 'interactive',
       displayName: '交互方式',
       value: interactive,
@@ -173,7 +173,15 @@ var animationOfPie = function animationOfPie() {
           value: 'hover'
         }]
       }
-    }]
+    }, hoverStop !== undefined && {
+      rule: [['on', '$eq', true]],
+      name: 'hoverStop',
+      displayName: '悬停暂停动画',
+      value: hoverStop,
+      type: 'boolean'
+    }].filter(function (d) {
+      return !!d;
+    })
   };
 };
 exports.animationOfPie = animationOfPie;
@@ -208,7 +216,8 @@ var animationOfCarousel = function animationOfCarousel() {
     _ref4$rotate = _ref4.rotate,
     rotate = _ref4$rotate === void 0 ? defaultAnimationOfCarousel.rotate : _ref4$rotate,
     _ref4$interactive = _ref4.interactive,
-    interactive = _ref4$interactive === void 0 ? defaultAnimationOfCarousel.interactive : _ref4$interactive;
+    interactive = _ref4$interactive === void 0 ? defaultAnimationOfCarousel.interactive : _ref4$interactive,
+    hoverStop = _ref4.hoverStop;
   return {
     name: 'animation',
     displayName: '轮播动画',
@@ -274,7 +283,15 @@ var animationOfCarousel = function animationOfCarousel() {
       displayName: '点击交互',
       value: interactive,
       type: 'boolean'
-    }]
+    }, hoverStop !== undefined && {
+      rule: [['on', '$eq', true]],
+      name: 'hoverStop',
+      displayName: '悬停暂停动画',
+      value: hoverStop,
+      type: 'boolean'
+    }].filter(function (d) {
+      return !!d;
+    })
   };
 };
 exports.animationOfCarousel = animationOfCarousel;

package/lib/pie.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.rosePieDecorate = exports.rosePie = exports.nestRosePie = exports.donut = exports["default"] = exports.current = exports.carouselDonut2 = exports.carouselDonut = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _ = require("./");
 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; }
@@ -456,7 +457,8 @@ var defaultCurrent = {
     name: {
       show: true,
       sameColor: false,
-      font: (0, _.font)()
+      font: (0, _.font)(),
+      maxWidth: 40
     },
     percent: {
       show: true,
@@ -505,7 +507,9 @@ var current = function current() {
     _ref9$current$name$fo = _ref9$current$name.font,
     nameFont = _ref9$current$name$fo === void 0 ? defaultCurrent.current.name.font : _ref9$current$name$fo,
     nameTranslate = _ref9$current$name.translate,
-    textBreak = _ref9$current$name.textBreak,
+    _ref9$current$name$ma = _ref9$current$name.maxWidth,
+    maxWidth = _ref9$current$name$ma === void 0 ? defaultCurrent.current.name.maxWidth : _ref9$current$name$ma,
+    overflow = _ref9$current$name.overflow,
     _ref9$current$percent = _ref9$current.percent;
   _ref9$current$percent = _ref9$current$percent === void 0 ? defaultCurrent.current.percent : _ref9$current$percent;
   var _ref9$current$percent2 = _ref9$current$percent.show,
@@ -573,10 +577,9 @@ var current = function current() {
         value: nameFont,
         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: '个'
-      }))].filter(function (item) {
+      }, nameTranslate != undefined && _objectSpread(_objectSpread({}, (0, _.showRule)()), (0, _.translate)(nameTranslate.x, nameTranslate.y)), (0, _.sc)("maxWidth", "宽度", "number", maxWidth, {
+        suffix: "px"
+      }, (0, _.showRule)())].concat((0, _toConsumableArray2["default"])((0, _.textOverflow)(overflow))).filter(function (item) {
         return !!item;
       })
     }, {

package/package.json

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

package/src/animation.js

@@ -86,7 +86,7 @@ const defaultAnimationOfPie = {
   show: true,
   current: { heighten: 10, opacity: 60 },
   interval: 3,
-  interactive: '',
+  interactive: ''
 };
 export const animationOfPie = ({
   show = defaultAnimationOfPie.show,
@@ -96,6 +96,7 @@ export const animationOfPie = ({
   } = defaultAnimationOfPie.current,
   interval = defaultAnimationOfPie.interval,
   interactive = defaultAnimationOfPie.interactive,
+  hoverStop
 } = defaultAnimationOfPie) => ({
   name: 'animation',
   displayName: '轮播动画',
@@ -145,7 +146,6 @@ export const animationOfPie = ({
     },
     {
       tip: '选择点击或悬浮，鼠标点击/悬浮各数据块时停止轮播仅显示当前数据信息',
-      rule: [['on', '$eq', true]],
       name: 'interactive',
       displayName: '交互方式',
       value: interactive,
@@ -158,7 +158,14 @@ export const animationOfPie = ({
         ],
       },
     },
-  ],
+    hoverStop !==undefined && {
+      rule: [['on', '$eq', true]],
+      name: 'hoverStop',
+      displayName: '悬停暂停动画',
+      value: hoverStop,
+      type: 'boolean'
+    }
+  ].filter(d=>!!d),
 });
 
 const defaultAnimationOfCarousel = {
@@ -184,6 +191,7 @@ export const animationOfCarousel = ({
   interval = defaultAnimationOfCarousel.interval,
   rotate = defaultAnimationOfCarousel.rotate,
   interactive = defaultAnimationOfCarousel.interactive,
+  hoverStop
 } = defaultAnimationOfCarousel) => ({
   name: 'animation',
   displayName: '轮播动画',
@@ -260,5 +268,12 @@ export const animationOfCarousel = ({
       value: interactive,
       type: 'boolean',
     },
-  ],
+    hoverStop !==undefined && {
+      rule: [['on', '$eq', true]],
+      name: 'hoverStop',
+      displayName: '悬停暂停动画',
+      value: hoverStop,
+      type: 'boolean'
+    }
+  ].filter(d=>!!d),
 });

package/src/pie.js

@@ -5,6 +5,7 @@ import {
   translate as translateConfig,
   axisLine,
   sc,
+  textOverflow
 } from './';
 
 const defaultBasePie = {
@@ -460,13 +461,13 @@ const defaultCurrent = {
   current: {
     show: true,
     gap: 45,
-    name: { show: true, sameColor: false, font: font() },
+    name: { show: true, sameColor: false, font: font(), maxWidth:40 },
     percent: {
       show: true,
       sameColor: false,
       precision: 0,
       font: font(),
-      translate: { x: 0, y: 0 },
+      translate: { x: 0, y: 0 }
     },
     value: {
       show: true,
@@ -491,7 +492,8 @@ export const current = ({
       sameColor: nameColor = defaultCurrent.current.name.sameColor,
       font: nameFont = defaultCurrent.current.name.font,
       translate: nameTranslate,
-      textBreak,
+      maxWidth = defaultCurrent.current.name.maxWidth,
+      overflow
     } = defaultCurrent.current.name,
     percent: {
       show: showPercent = defaultCurrent.current.percent.show,
@@ -556,13 +558,8 @@ export const current = ({
           ...showRule(),
           ...translateConfig(nameTranslate.x, nameTranslate.y),
         },
-        textBreak != undefined && {
-          ...showRule(),
-          ...sc('textBreak', '首行字数', 'number', textBreak, {
-            min: 0,
-            suffix: '个',
-          }),
-        },
+        sc("maxWidth","宽度","number",maxWidth,{suffix:"px"},showRule()),
+        ...textOverflow(overflow),
       ].filter((item) => !!item),
     },
     {