@easyv/config 1.1.14 → 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,9 +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,
-    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 +579,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,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@easyv/config",
-  "version": "1.1.14",
+  "version": "1.1.15",
   "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 } from '.';
 
 const defaultFont = font();
 
@@ -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,9 +351,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 +569,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: '显示最新',