@easyv/config 1.1.14 → 1.1.16

package/lib/label.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.valueAsixLabel = exports.labelOfRose = exports.labelOfPie = exports["default"] = exports.axisLabel = 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; }
@@ -112,7 +113,8 @@ var defaultLabelOfPie = {
   },
   name: {
     show: true,
-    font: defaultFont
+    font: defaultFont,
+    maxWidth: 40
   },
   percent: {
     show: true,
@@ -154,6 +156,9 @@ var labelOfPie = function labelOfPie() {
     showName = _ref2$name$show === void 0 ? defaultLabelOfPie.name.show : _ref2$name$show,
     _ref2$name$font = _ref2$name.font,
     nameFont = _ref2$name$font === void 0 ? defaultLabelOfPie.name.font : _ref2$name$font,
+    _ref2$name$maxWidth = _ref2$name.maxWidth,
+    maxWidth = _ref2$name$maxWidth === void 0 ? defaultLabelOfPie.name.maxWidth : _ref2$name$maxWidth,
+    overflow = _ref2$name.overflow,
     _ref2$percent = _ref2.percent;
   _ref2$percent = _ref2$percent === void 0 ? defaultLabelOfPie.percent : _ref2$percent;
   var _ref2$percent$show = _ref2$percent.show,
@@ -248,7 +253,9 @@ var labelOfPie = function labelOfPie() {
         value: nameFont,
         type: 'textStyle',
         markColorType: 'textColor'
-      }]
+      }, (0, _.sc)("maxWidth", "宽度", "number", maxWidth, {
+        suffix: "px"
+      }, (0, _.showRule)())].concat((0, _toConsumableArray2["default"])((0, _.textOverflow)(overflow)))
     }, {
       rule: [['show', '$eq', true]],
       name: 'percent',
@@ -372,7 +379,9 @@ var defaultAxisLabel = {
   appearance: {
     count: 3,
     angle: 0,
-    wordBreak: 'keep-all'
+    width: 40,
+    textOverflow: "ellipsis",
+    speed: 5
   },
   showLast: false,
   translate: {
@@ -399,9 +408,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,
-    overflow = _ref4.overflow,
+    _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;
@@ -574,23 +586,44 @@ 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
         }
       }],
       type: 'group'
-    },
-    //...textOverflow(overflow),
-    {
+    }, {
       name: 'showLast',
       displayName: '显示最新',
       value: showLast,
@@ -705,7 +738,7 @@ var valueAsixLabel = function valueAsixLabel() {
       value: step,
       type: 'number'
     }, {
-      rule: [['show', '$eq', true], ['auto', '$eq', false]],
+      rule: [['show', '$eq', true]],
       name: 'decimal',
       displayName: '小数位数',
       value: decimal,

package/lib/legend.js

@@ -204,6 +204,7 @@ var _default = function _default() {
 exports["default"] = _default;
 var defaultLegendOfRose = {
   show: true,
+  maxWidth: 40,
   font: defaultFont,
   iconSize: {
     width: 10,
@@ -227,6 +228,9 @@ var legendOfRose = function legendOfRose() {
   var _ref2 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : defaultLegendOfRose,
     _ref2$show = _ref2.show,
     show = _ref2$show === void 0 ? defaultLegendOfRose.show : _ref2$show,
+    _ref2$maxWidth = _ref2.maxWidth,
+    maxWidth = _ref2$maxWidth === void 0 ? defaultLegendOfRose.maxWidth : _ref2$maxWidth,
+    overflow = _ref2.overflow,
     _ref2$font = _ref2.font,
     font = _ref2$font === void 0 ? defaultLegendOfRose.font : _ref2$font,
     _ref2$iconSize = _ref2.iconSize;
@@ -258,7 +262,9 @@ var legendOfRose = function legendOfRose() {
   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: '文本样式',
@@ -334,7 +340,7 @@ var legendOfRose = function legendOfRose() {
           options: ['left top', 'center top', 'right top', 'center left', '', 'center right', 'left bottom', 'center bottom', 'right bottom']
         }
       }, _objectSpread({}, translateConfig(x, y))]
-    }],
+    }]),
     config: {
       defaultOpen: true
     }
@@ -351,7 +357,8 @@ var defaultLegendOfPie = {
   iconGap: 5,
   name: {
     show: true,
-    font: defaultFont
+    font: defaultFont,
+    maxWidth: 40
   },
   percent: {
     show: true,
@@ -408,6 +415,9 @@ var legendOfPie = function legendOfPie() {
     showName = _ref3$name$show === void 0 ? defaultLegendOfPie.name.show : _ref3$name$show,
     _ref3$name$font = _ref3$name.font,
     nameFont = _ref3$name$font === void 0 ? defaultLegendOfPie.name.font : _ref3$name$font,
+    _ref3$name$maxWidth = _ref3$name.maxWidth,
+    maxWidth = _ref3$name$maxWidth === void 0 ? defaultLegendOfPie.name.maxWidth : _ref3$name$maxWidth,
+    overflow = _ref3$name.overflow,
     _ref3$percent = _ref3.percent;
   _ref3$percent = _ref3$percent === void 0 ? defaultLegendOfPie.percent : _ref3$percent;
   var _ref3$percent$show = _ref3$percent.show,
@@ -518,7 +528,9 @@ var legendOfPie = function legendOfPie() {
         value: nameFont,
         type: 'textStyle',
         markColorType: 'textColor'
-      }]
+      }, (0, _index.sc)("maxWidth", "宽度", "number", maxWidth, {
+        suffix: "px"
+      }, showRule())].concat((0, _toConsumableArray2["default"])((0, _index.textOverflow)(overflow)))
     }), _objectSpread(_objectSpread({}, showRule()), {}, {
       name: 'percent',
       displayName: '占比值',
@@ -656,7 +668,8 @@ var defaultLegendOfDoublePie = {
   iconGap: 5,
   name: {
     show: true,
-    font: defaultFont
+    font: defaultFont,
+    maxWidth: 40
   },
   percent: {
     show: true,
@@ -715,6 +728,9 @@ var legendOfDoublePie = function legendOfDoublePie() {
     showName = _ref4$name$show === void 0 ? defaultLegendOfDoublePie.name.show : _ref4$name$show,
     _ref4$name$font = _ref4$name.font,
     nameFont = _ref4$name$font === void 0 ? defaultLegendOfDoublePie.name.font : _ref4$name$font,
+    _ref4$name$maxWidth = _ref4$name.maxWidth,
+    maxWidth = _ref4$name$maxWidth === void 0 ? defaultLegendOfDoublePie.name.maxWidth : _ref4$name$maxWidth,
+    overflow = _ref4$name.overflow,
     _ref4$percent = _ref4.percent;
   _ref4$percent = _ref4$percent === void 0 ? defaultLegendOfDoublePie.percent : _ref4$percent;
   var _ref4$percent$show = _ref4$percent.show,
@@ -811,7 +827,9 @@ var legendOfDoublePie = function legendOfDoublePie() {
         value: nameFont,
         type: 'textStyle',
         markColorType: 'textColor'
-      }]
+      }, (0, _index.sc)("maxWidth", "宽度", "number", maxWidth, {
+        suffix: "px"
+      }, showRule())].concat((0, _toConsumableArray2["default"])((0, _index.textOverflow)(overflow)))
     }, {
       rule: [['show', '$eq', true]],
       name: 'percent',

package/package.json

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

package/src/label.js

@@ -1,4 +1,4 @@
-import { translate, font, extent, showRule, textOverflow } from '.';
+import { translate, font, extent, showRule, sc, textOverflow } from '.';
 
 const defaultFont = font();
 
@@ -82,7 +82,7 @@ const defaultLabelOfPie = {
   lineLength: 10,
   mode: 'horizontal',
   translate: { x: 0, y: 0 },
-  name: { show: true, font: defaultFont },
+  name: { show: true, font: defaultFont, maxWidth:40 },
   percent: { show: true, precision: 0, font: defaultFont },
   value: {
     show: true,
@@ -105,6 +105,8 @@ export const labelOfPie = ({
   name: {
     show: showName = defaultLabelOfPie.name.show,
     font: nameFont = defaultLabelOfPie.name.font,
+    maxWidth = defaultLabelOfPie.name.maxWidth,
+    overflow
   } = defaultLabelOfPie.name,
   percent: {
     show: showPercent = defaultLabelOfPie.percent.show,
@@ -204,6 +206,8 @@ export const labelOfPie = ({
           type: 'textStyle',
           markColorType: 'textColor',
         },
+        sc("maxWidth","宽度","number",maxWidth,{suffix:"px"},showRule()),
+        ...textOverflow(overflow),
       ],
     },
     {
@@ -337,7 +341,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,9 +355,10 @@ 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,
-  overflow,
   showLast = defaultAxisLabel.showLast,
   translate: {
     x: labelTranslateX = defaultAxisLabel.translate.x,
@@ -568,20 +573,42 @@ 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',
     },
-    //...textOverflow(overflow),
     {
       name: 'showLast',
       displayName: '显示最新',
@@ -695,8 +722,7 @@ export const valueAsixLabel = ({
     },
     {
       rule: [
-        ['show', '$eq', true],
-        ['auto', '$eq', false],
+        ['show', '$eq', true]
       ],
       name: 'decimal',
       displayName: '小数位数',

package/src/legend.js

@@ -211,6 +211,7 @@ export default ({
 
 const defaultLegendOfRose = {
   show: true,
+  maxWidth: 40,
   font: defaultFont,
   iconSize: {
     width: 10,
@@ -229,6 +230,8 @@ const defaultLegendOfRose = {
 };
 export const legendOfRose = ({
   show = defaultLegendOfRose.show,
+  maxWidth = defaultLegendOfRose.maxWidth,
+  overflow,
   font = defaultLegendOfRose.font,
   iconSize: {
     width = defaultLegendOfRose.iconSize.width,
@@ -252,6 +255,8 @@ export const legendOfRose = ({
   displayName: '图例',
   value: [
     showConfig(show),
+    sc("maxWidth","宽度","number",maxWidth,{suffix:"px"},showRule()),
+    ...textOverflow(overflow),
     {
       rule: [['show', '$eq', true]],
       name: 'font',
@@ -369,7 +374,7 @@ const defaultLegendOfPie = {
     height: 10,
   },
   iconGap: 5,
-  name: { show: true, font: defaultFont },
+  name: { show: true, font: defaultFont, maxWidth:40 },
   percent: {
     show: true,
     precision: 0,
@@ -407,6 +412,8 @@ export const legendOfPie = ({
   name: {
     show: showName = defaultLegendOfPie.name.show,
     font: nameFont = defaultLegendOfPie.name.font,
+    maxWidth = defaultLegendOfPie.name.maxWidth,
+    overflow
   } = defaultLegendOfPie.name,
   percent: {
     show: showPercent = defaultLegendOfPie.percent.show,
@@ -508,6 +515,8 @@ export const legendOfPie = ({
           type: 'textStyle',
           markColorType: 'textColor',
         },
+        sc("maxWidth","宽度","number",maxWidth,{suffix:"px"},showRule()),
+        ...textOverflow(overflow)
       ],
     },
     {
@@ -698,7 +707,7 @@ const defaultLegendOfDoublePie = {
     height: 10,
   },
   iconGap: 5,
-  name: { show: true, font: defaultFont },
+  name: { show: true, font: defaultFont, maxWidth:40 },
   percent: {
     show: true,
     precision: 0,
@@ -737,6 +746,8 @@ export const legendOfDoublePie = ({
   name: {
     show: showName = defaultLegendOfDoublePie.name.show,
     font: nameFont = defaultLegendOfDoublePie.name.font,
+    maxWidth = defaultLegendOfDoublePie.name.maxWidth,
+    overflow
   } = defaultLegendOfDoublePie.name,
   percent: {
     show: showPercent = defaultLegendOfDoublePie.percent.show,
@@ -825,6 +836,8 @@ export const legendOfDoublePie = ({
           type: 'textStyle',
           markColorType: 'textColor',
         },
+        sc("maxWidth","宽度","number",maxWidth,{suffix:"px"},showRule()),
+        ...textOverflow(overflow)
       ],
     },
     {