@easyv/config 1.2.29 → 1.3.1

package/lib/sc.js

@@ -21,7 +21,7 @@ var _default = function _default(name, displayName) {
   if (type) res["type"] = type;
   if (config) {
     if (config.other) res = _objectSpread(_objectSpread({}, res), config.other);
-    res['config'] = config;
+    res["config"] = config;
   }
   if (rule) res = _objectSpread(_objectSpread({}, rule), res);
   return res;

package/lib/textOverflow.js

@@ -1,45 +1,45 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = void 0;
-var defaultTextOverflow = {
-  textOverflow: 'ellipsis',
-  speed: 5
-};
-var _default = function _default() {
-  var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : defaultTextOverflow,
-    _ref$textOverflow = _ref.textOverflow,
-    textOverflow = _ref$textOverflow === void 0 ? defaultTextOverflow.textOverflow : _ref$textOverflow,
-    _ref$speed = _ref.speed,
-    speed = _ref$speed === void 0 ? defaultTextOverflow.speed : _ref$speed;
-  return [{
-    name: 'textOverflow',
-    displayName: '文本溢出',
-    value: textOverflow,
-    type: 'select',
-    config: {
-      options: [{
-        name: '换行',
-        value: 'break-word'
-      }, {
-        name: '省略号',
-        value: 'ellipsis'
-      }, {
-        name: '跑马灯',
-        value: 'marquee'
-      }]
-    }
-  }, {
-    rule: [['textOverflow', '$eq', 'marquee'], ["LegendType", "$eq", "FixedWidth"]],
-    name: 'speed',
-    displayName: '滚动速度',
-    type: 'number',
-    value: speed,
-    config: {
-      min: 1
-    }
-  }];
-};
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+var defaultTextOverflow = {
+  textOverflow: 'ellipsis',
+  speed: 5
+};
+var _default = function _default() {
+  var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : defaultTextOverflow,
+    _ref$textOverflow = _ref.textOverflow,
+    textOverflow = _ref$textOverflow === void 0 ? defaultTextOverflow.textOverflow : _ref$textOverflow,
+    _ref$speed = _ref.speed,
+    speed = _ref$speed === void 0 ? defaultTextOverflow.speed : _ref$speed;
+  return [{
+    name: 'textOverflow',
+    displayName: '文本溢出',
+    value: textOverflow,
+    type: 'select',
+    config: {
+      options: [{
+        name: '换行',
+        value: 'break-word'
+      }, {
+        name: '省略号',
+        value: 'ellipsis'
+      }, {
+        name: '跑马灯',
+        value: 'marquee'
+      }]
+    }
+  }, {
+    rule: [['textOverflow', '$eq', 'marquee'], ["LegendType", "$eq", "FixedWidth"]],
+    name: 'speed',
+    displayName: '滚动速度',
+    type: 'number',
+    value: speed,
+    config: {
+      min: 1
+    }
+  }];
+};
 exports["default"] = _default;

package/package.json

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

package/src/animation.js

@@ -1,4 +1,4 @@
-import { multiColor, font } from './';
+import { multiColor, font } from "./";
 const animation = {
   show: false,
   duration: 3,
@@ -8,47 +8,47 @@ export default ({
   show = animation.show,
   duration = animation.duration,
   interval = animation.interval,
-  hoverStop
+  hoverStop,
 } = animation) => ({
-  name: 'animation',
-  displayName: '轮播动画',
+  name: "animation",
+  displayName: "轮播动画",
   value: [
     {
-      name: 'show',
-      displayName: '',
+      name: "show",
+      displayName: "",
       value: show,
-      type: 'boolean',
+      type: "boolean",
     },
     {
-      rule: [['show', '$eq', true]],
-      name: 'duration',
-      displayName: '滚动时长',
+      rule: [["show", "$eq", true]],
+      name: "duration",
+      displayName: "滚动时长",
       value: duration,
-      type: 'number',
+      type: "number",
       config: {
         span: 12,
-        suffix: 's',
+        suffix: "s",
       },
     },
     {
-      rule: [['show', '$eq', true]],
-      name: 'interval',
-      displayName: '间隔时长',
+      rule: [["show", "$eq", true]],
+      name: "interval",
+      displayName: "间隔时长",
       value: interval,
-      type: 'number',
+      type: "number",
       config: {
         span: 12,
-        suffix: 's',
+        suffix: "s",
       },
     },
-    hoverStop !==undefined && {
-      rule: [['show', '$eq', true]],
-      name: 'hover',
-      displayName: '悬停暂停动画',
+    hoverStop !== undefined && {
+      rule: [["show", "$eq", true]],
+      name: "hover",
+      displayName: "悬停暂停动画",
       value: hoverStop,
-      type: 'boolean'
-    }
-  ].filter(d=>!!d),
+      type: "boolean",
+    },
+  ].filter((d) => !!d),
 });
 
 const defaultDataAnimation = {
@@ -59,24 +59,24 @@ export const dataAnimation = ({
   show = defaultDataAnimation.show,
   duration = defaultDataAnimation.duration,
 } = defaultDataAnimation) => ({
-  name: 'dataAnimation',
-  displayName: '数据动画',
+  name: "dataAnimation",
+  displayName: "数据动画",
   value: [
     {
-      name: 'show',
-      displayName: '',
+      name: "show",
+      displayName: "",
       value: show,
-      type: 'boolean',
+      type: "boolean",
     },
     {
-      rule: [['show', '$eq', true]],
-      name: 'duration',
-      displayName: '滚动时长',
+      rule: [["show", "$eq", true]],
+      name: "duration",
+      displayName: "滚动时长",
       value: duration,
-      type: 'number',
+      type: "number",
       config: {
         span: 12,
-        suffix: 's',
+        suffix: "s",
       },
     },
   ],
@@ -86,7 +86,8 @@ const defaultAnimationOfPie = {
   show: true,
   current: { heighten: 10, opacity: 60 },
   interval: 3,
-  interactive: ''
+  interactive: "",
+  canCancel: false,
 };
 export const animationOfPie = ({
   show = defaultAnimationOfPie.show,
@@ -97,82 +98,91 @@ export const animationOfPie = ({
   } = defaultAnimationOfPie.current,
   interval = defaultAnimationOfPie.interval,
   interactive = defaultAnimationOfPie.interactive,
-  hoverStop
+  canCancel = defaultAnimationOfPie.canCancel,
+  hoverStop,
 } = defaultAnimationOfPie) => ({
-  name: 'animation',
-  displayName: '轮播动画',
+  name: "animation",
+  displayName: "轮播动画",
   value: [
     {
-      name: 'on',
-      displayName: '开启',
+      name: "on",
+      displayName: "开启",
       value: show,
-      type: 'boolean',
+      type: "boolean",
     },
     {
-      rule: [['on', '$eq', true]],
-      name: 'current',
-      displayName: '当前值',
+      rule: [["on", "$eq", true]],
+      name: "current",
+      displayName: "当前值",
       value: [
         {
-          name: 'heighten',
-          displayName: '高度增长',
+          name: "heighten",
+          displayName: "高度增长",
           value: heighten,
-          type: 'number',
+          type: "number",
         },
-        widthen!=undefined?{
-          name: 'widthen',
-          displayName: '半径增长',
-          value: widthen,
-          type: 'number',
-        }:undefined,
+        widthen != undefined
+          ? {
+              name: "widthen",
+              displayName: "半径增长",
+              value: widthen,
+              type: "number",
+            }
+          : undefined,
         {
-          name: 'opacity',
-          displayName: '透明度',
+          name: "opacity",
+          displayName: "透明度",
           value: opacity,
-          type: 'range',
+          type: "range",
           config: {
             min: 0,
             max: 100,
-            suffix: '%',
+            suffix: "%",
           },
         },
-      ].filter(d=>!!d),
+      ].filter((d) => !!d),
       config: {
         defaultOpen: true,
       },
     },
     {
-      rule: [['on', '$eq', true]],
-      name: 'interval',
-      displayName: '间隔时长',
+      rule: [["on", "$eq", true]],
+      name: "interval",
+      displayName: "间隔时长",
       value: interval,
-      type: 'number',
+      type: "number",
       config: {
-        suffix: 's',
+        suffix: "s",
       },
     },
     {
-      tip: '选择点击或悬浮，鼠标点击/悬浮各数据块时停止轮播仅显示当前数据信息',
-      name: 'interactive',
-      displayName: '交互方式',
+      tip: "选择点击或悬浮，鼠标点击/悬浮各数据块时停止轮播仅显示当前数据信息",
+      name: "interactive",
+      displayName: "交互方式",
       value: interactive,
-      type: 'radio',
+      type: "radio",
       config: {
         options: [
-          { name: '无', value: '' },
-          { name: '点击', value: 'click' },
-          { name: '悬停', value: 'hover' },
+          { name: "无", value: "" },
+          { name: "点击", value: "click" },
+          { name: "悬停", value: "hover" },
         ],
       },
     },
-    hoverStop !==undefined && {
-      rule: [['on', '$eq', true]],
-      name: 'hoverStop',
-      displayName: '悬停暂停动画',
+    {
+      name: "canCancel",
+      displayName: "允许取消",
+      type: "boolean",
+      value: canCancel,
+    },
+    hoverStop !== undefined && {
+      rule: [["on", "$eq", true]],
+      name: "hoverStop",
+      displayName: "悬停暂停动画",
       value: hoverStop,
-      type: 'boolean'
-    }
-  ].filter(d=>!!d),
+      type: "boolean",
+    },
+  ].filter((d) => !!d),
 });
 
 const defaultAnimationOfCarousel = {
@@ -198,48 +208,48 @@ export const animationOfCarousel = ({
   interval = defaultAnimationOfCarousel.interval,
   rotate = defaultAnimationOfCarousel.rotate,
   interactive = defaultAnimationOfCarousel.interactive,
-  hoverStop
+  hoverStop,
 } = defaultAnimationOfCarousel) => ({
-  name: 'animation',
-  displayName: '轮播动画',
+  name: "animation",
+  displayName: "轮播动画",
   value: [
     {
-      name: 'on',
-      displayName: '开启',
+      name: "on",
+      displayName: "开启",
       value: show,
-      type: 'boolean',
+      type: "boolean",
     },
     {
-      rule: [['on', '$eq', true]],
-      name: 'current',
-      displayName: '当前值',
+      rule: [["on", "$eq", true]],
+      name: "current",
+      displayName: "当前值",
       value: [
         {
-          name: 'width',
-          displayName: '弧宽增长',
+          name: "width",
+          displayName: "弧宽增长",
           value: width,
-          type: 'number',
+          type: "number",
         },
         {
-          name: 'color',
-          displayName: '颜色',
+          name: "color",
+          displayName: "颜色",
           value: multiColor(color),
-          type: 'multicolor',
+          type: "multicolor",
         },
         {
-          name: 'textStyle',
-          displayName: '类目文本样式',
+          name: "textStyle",
+          displayName: "类目文本样式",
           value: font(textStyle),
-          type: 'textStyle',
-          markColorType: 'textColor',
+          type: "textStyle",
+          markColorType: "textColor",
         },
         {
-          name: 'gap',
-          displayName: '类目文本间距',
+          name: "gap",
+          displayName: "类目文本间距",
           value: gap,
-          type: 'number',
+          type: "number",
           config: {
-            suffix: 'px',
+            suffix: "px",
           },
         },
       ],
@@ -248,39 +258,39 @@ export const animationOfCarousel = ({
       },
     },
     {
-      rule: [['on', '$eq', true]],
-      name: 'interval',
-      displayName: '间隔时长',
+      rule: [["on", "$eq", true]],
+      name: "interval",
+      displayName: "间隔时长",
       value: interval,
-      type: 'number',
+      type: "number",
       config: {
-        suffix: 's',
+        suffix: "s",
       },
     },
     {
-      rule: [['on', '$eq', true]],
-      name: 'rotate',
-      displayName: '旋转',
+      rule: [["on", "$eq", true]],
+      name: "rotate",
+      displayName: "旋转",
       value: rotate,
-      type: 'number',
+      type: "number",
       config: {
         min: 0,
         max: 360,
-        suffix: '°',
+        suffix: "°",
       },
     },
     {
-      name: 'interactive',
-      displayName: '点击交互',
+      name: "interactive",
+      displayName: "点击交互",
       value: interactive,
-      type: 'boolean',
+      type: "boolean",
     },
-    hoverStop !==undefined && {
-      rule: [['on', '$eq', true]],
-      name: 'hoverStop',
-      displayName: '悬停暂停动画',
+    hoverStop !== undefined && {
+      rule: [["on", "$eq", true]],
+      name: "hoverStop",
+      displayName: "悬停暂停动画",
       value: hoverStop,
-      type: 'boolean'
-    }
-  ].filter(d=>!!d),
+      type: "boolean",
+    },
+  ].filter((d) => !!d),
 });

package/src/font.js

@@ -1,23 +1,23 @@
-const defaultFont = {
-  fontFamily: 'SourceHanSansCN-Medium',
-  fontSize: 12,
-  color: 'rgba(230,247,255,0.7)',
-  bold: false,
-  italic: false,
-  letterSpacing: 0,
-};
-export default ({
-  fontFamily = defaultFont.fontFamily,
-  fontSize = defaultFont.fontSize,
-  color = defaultFont.color,
-  bold = defaultFont.bold,
-  italic = defaultFont.italic,
-  letterSpacing = defaultFont.letterSpacing,
-} = defaultFont) => ({
-  fontFamily,
-  fontSize,
-  color,
-  bold,
-  italic,
-  letterSpacing,
-});
+const defaultFont = {
+  fontFamily: 'SourceHanSansCN-Medium',
+  fontSize: 12,
+  color: 'rgba(230,247,255,0.7)',
+  bold: false,
+  italic: false,
+  letterSpacing: 0,
+};
+export default ({
+  fontFamily = defaultFont.fontFamily,
+  fontSize = defaultFont.fontSize,
+  color = defaultFont.color,
+  bold = defaultFont.bold,
+  italic = defaultFont.italic,
+  letterSpacing = defaultFont.letterSpacing,
+} = defaultFont) => ({
+  fontFamily,
+  fontSize,
+  color,
+  bold,
+  italic,
+  letterSpacing,
+});

package/src/label.js

@@ -102,9 +102,10 @@ const defaultLabelOfPie = {
   distance: 30,
   lineLength: 10,
   mode: "horizontal",
+  align:"center",
   translate: { x: 0, y: 0 },
-  name: { show: true, font: defaultFont, maxWidth: 40 },
-  percent: { show: true, precision: 0, font: defaultFont },
+  name: { show: true, font: defaultFont, maxWidth: 40, translate: { x: 0, y: 0 } },
+  percent: { show: true, precision: 0, font: defaultFont, translate: { x: 0, y: 0 } },
   value: {
     show: true,
     suffix: {
@@ -114,6 +115,7 @@ const defaultLabelOfPie = {
       translate: { x: 0, y: 0 },
     },
     font: defaultFont,
+    translate: { x: 0, y: 0 }
   },
 };
 export const labelOfPie = ({
@@ -122,17 +124,26 @@ export const labelOfPie = ({
   lineLength = defaultLabelOfPie.lineLength,
   lineColor, //这个是可选项，如果不在main.js里赋值，就不会出现
   mode = defaultLabelOfPie.mode,
+  align = defaultLabelOfPie.align,
   translate: { x, y } = defaultLabelOfPie.show,
   name: {
     show: showName = defaultLabelOfPie.name.show,
     font: nameFont = defaultLabelOfPie.name.font,
     maxWidth = defaultLabelOfPie.name.maxWidth,
     overflow,
+    translate:{
+      x:nameX = defaultLabelOfPie.name.translate.x,
+      y:nameY = defaultLabelOfPie.name.translate.y
+    } = defaultLabelOfPie.name.translate
   } = defaultLabelOfPie.name,
   percent: {
     show: showPercent = defaultLabelOfPie.percent.show,
     precision = defaultLabelOfPie.percent.precision,
     font: percentFont = defaultLabelOfPie.percent.font,
+    translate:{
+      x:percentX = defaultLabelOfPie.percent.translate.x,
+      y:percentY = defaultLabelOfPie.percent.translate.y
+    } = defaultLabelOfPie.percent.translate
   } = defaultLabelOfPie.percent,
   value: {
     show: showValue = defaultLabelOfPie.value.show,
@@ -146,6 +157,10 @@ export const labelOfPie = ({
       } = defaultLabelOfPie.value.suffix.translate,
     } = defaultLabelOfPie.value.suffix,
     font: valueFont = defaultLabelOfPie.value.font,
+    translate:{
+      x:valueX = defaultLabelOfPie.value.translate.x,
+      y:valueY = defaultLabelOfPie.value.translate.y
+    } = defaultLabelOfPie.value.translate
   } = defaultLabelOfPie.value,
 } = defaultLabelOfPie) => ({
   name: "label",
@@ -204,6 +219,21 @@ export const labelOfPie = ({
         ],
       },
     },
+    {
+      rule:[["show","$eq",true],["mode","$eq","vertical"]],
+      name:"align",
+      displayName:"对齐",
+      type:"radio",
+      value:"center",
+      config:{
+        mode:"icon",
+        options:[
+          { name:"左对齐", value:"left", icon:"align-left" },
+          { name:"居中对齐", value:"center", icon:"align-center" },
+          { name:"右对齐", value:"right", icon:"align-right" }
+        ]
+      }
+    },
     {
       rule: [["show", "$eq", true]],
       ...translate(x, y),
@@ -236,6 +266,7 @@ export const labelOfPie = ({
           showRule()
         ),
         ...textOverflow(overflow),
+        translate(nameX, nameY),
       ],
     },
     {
@@ -267,6 +298,7 @@ export const labelOfPie = ({
           type: "textStyle",
           markColorType: "textColor",
         },
+        translate(percentX, percentY),
       ],
     },
     {
@@ -321,6 +353,7 @@ export const labelOfPie = ({
           type: "textStyle",
           markColorType: "textColor",
         },
+        translate(valueX, valueY),
       ],
     },
   ].filter((item) => !!item),

package/src/sc.js

@@ -1,12 +1,18 @@
+export default (
+  name,
+  displayName,
+  type = "",
+  value,
+  config = "",
+  rule = ""
+) => {
+  let res = { name, displayName, value };
+  if (type) res["type"] = type;
+  if (config) {
+    if (config.other) res = { ...res, ...config.other };
+    res["config"] = config;
+  }
+  if (rule) res = { ...rule, ...res };
 
-export default (name,displayName,type="",value,config="",rule="")=>{
-    let res={name,displayName,value};
-    if(type) res["type"]=type;
-    if(config){
-        if(config.other) res={...res,...config.other};
-        res['config']=config;
-    }
-    if(rule) res={...rule,...res}
-
-    return res;
-}
+  return res;
+};