@easyv/config 1.2.29 → 1.3.0

package/lib/label.js

@@ -117,6 +117,7 @@ var defaultLabelOfPie = {
   distance: 30,
   lineLength: 10,
   mode: "horizontal",
+  align: "center",
   translate: {
     x: 0,
     y: 0
@@ -124,12 +125,20 @@ var defaultLabelOfPie = {
   name: {
     show: true,
     font: defaultFont,
-    maxWidth: 40
+    maxWidth: 40,
+    translate: {
+      x: 0,
+      y: 0
+    }
   },
   percent: {
     show: true,
     precision: 0,
-    font: defaultFont
+    font: defaultFont,
+    translate: {
+      x: 0,
+      y: 0
+    }
   },
   value: {
     show: true,
@@ -142,7 +151,11 @@ var defaultLabelOfPie = {
         y: 0
       }
     },
-    font: defaultFont
+    font: defaultFont,
+    translate: {
+      x: 0,
+      y: 0
+    }
   }
 };
 var labelOfPie = function labelOfPie() {
@@ -156,6 +169,8 @@ var labelOfPie = function labelOfPie() {
     lineColor = _ref2.lineColor,
     _ref2$mode = _ref2.mode,
     mode = _ref2$mode === void 0 ? defaultLabelOfPie.mode : _ref2$mode,
+    _ref2$align = _ref2.align,
+    align = _ref2$align === void 0 ? defaultLabelOfPie.align : _ref2$align,
     _ref2$translate = _ref2.translate;
   _ref2$translate = _ref2$translate === void 0 ? defaultLabelOfPie.show : _ref2$translate;
   var x = _ref2$translate.x,
@@ -169,6 +184,12 @@ var labelOfPie = function labelOfPie() {
     _ref2$name$maxWidth = _ref2$name.maxWidth,
     maxWidth = _ref2$name$maxWidth === void 0 ? defaultLabelOfPie.name.maxWidth : _ref2$name$maxWidth,
     overflow = _ref2$name.overflow,
+    _ref2$name$translate = _ref2$name.translate;
+  _ref2$name$translate = _ref2$name$translate === void 0 ? defaultLabelOfPie.name.translate : _ref2$name$translate;
+  var _ref2$name$translate$ = _ref2$name$translate.x,
+    nameX = _ref2$name$translate$ === void 0 ? defaultLabelOfPie.name.translate.x : _ref2$name$translate$,
+    _ref2$name$translate$2 = _ref2$name$translate.y,
+    nameY = _ref2$name$translate$2 === void 0 ? defaultLabelOfPie.name.translate.y : _ref2$name$translate$2,
     _ref2$percent = _ref2.percent;
   _ref2$percent = _ref2$percent === void 0 ? defaultLabelOfPie.percent : _ref2$percent;
   var _ref2$percent$show = _ref2$percent.show,
@@ -177,6 +198,12 @@ var labelOfPie = function labelOfPie() {
     precision = _ref2$percent$precisi === void 0 ? defaultLabelOfPie.percent.precision : _ref2$percent$precisi,
     _ref2$percent$font = _ref2$percent.font,
     percentFont = _ref2$percent$font === void 0 ? defaultLabelOfPie.percent.font : _ref2$percent$font,
+    _ref2$percent$transla = _ref2$percent.translate;
+  _ref2$percent$transla = _ref2$percent$transla === void 0 ? defaultLabelOfPie.percent.translate : _ref2$percent$transla;
+  var _ref2$percent$transla2 = _ref2$percent$transla.x,
+    percentX = _ref2$percent$transla2 === void 0 ? defaultLabelOfPie.percent.translate.x : _ref2$percent$transla2,
+    _ref2$percent$transla3 = _ref2$percent$transla.y,
+    percentY = _ref2$percent$transla3 === void 0 ? defaultLabelOfPie.percent.translate.y : _ref2$percent$transla3,
     _ref2$value = _ref2.value;
   _ref2$value = _ref2$value === void 0 ? defaultLabelOfPie.value : _ref2$value;
   var _ref2$value$show = _ref2$value.show,
@@ -196,7 +223,13 @@ var labelOfPie = function labelOfPie() {
     _ref2$value$suffix$tr3 = _ref2$value$suffix$tr.y,
     suffixTranslateY = _ref2$value$suffix$tr3 === void 0 ? defaultLabelOfPie.value.suffix.translate.y : _ref2$value$suffix$tr3,
     _ref2$value$font = _ref2$value.font,
-    valueFont = _ref2$value$font === void 0 ? defaultLabelOfPie.value.font : _ref2$value$font;
+    valueFont = _ref2$value$font === void 0 ? defaultLabelOfPie.value.font : _ref2$value$font,
+    _ref2$value$translate = _ref2$value.translate;
+  _ref2$value$translate = _ref2$value$translate === void 0 ? defaultLabelOfPie.value.translate : _ref2$value$translate;
+  var _ref2$value$translate2 = _ref2$value$translate.x,
+    valueX = _ref2$value$translate2 === void 0 ? defaultLabelOfPie.value.translate.x : _ref2$value$translate2,
+    _ref2$value$translate3 = _ref2$value$translate.y,
+    valueY = _ref2$value$translate3 === void 0 ? defaultLabelOfPie.value.translate.y : _ref2$value$translate3;
   return {
     name: "label",
     displayName: "数值标签",
@@ -245,6 +278,28 @@ var labelOfPie = function labelOfPie() {
           value: "horizontal"
         }]
       }
+    }, {
+      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"
+        }]
+      }
     }, _objectSpread({
       rule: [["show", "$eq", true]]
     }, (0, _.translate)(x, y)), {
@@ -265,7 +320,7 @@ var labelOfPie = function labelOfPie() {
         markColorType: "textColor"
       }, (0, _.sc)("maxWidth", "宽度", "number", maxWidth, {
         suffix: "px"
-      }, (0, _.showRule)())].concat((0, _toConsumableArray2["default"])((0, _.textOverflow)(overflow)))
+      }, (0, _.showRule)())].concat((0, _toConsumableArray2["default"])((0, _.textOverflow)(overflow)), [(0, _.translate)(nameX, nameY)])
     }, {
       rule: [["show", "$eq", true]],
       name: "percent",
@@ -291,7 +346,7 @@ var labelOfPie = function labelOfPie() {
         value: percentFont,
         type: "textStyle",
         markColorType: "textColor"
-      }]
+      }, (0, _.translate)(percentX, percentY)]
     }, {
       name: "value",
       displayName: "真实值",
@@ -334,7 +389,7 @@ var labelOfPie = function labelOfPie() {
         value: valueFont,
         type: "textStyle",
         markColorType: "textColor"
-      }]
+      }, (0, _.translate)(valueX, valueY)]
     }].filter(function (item) {
       return !!item;
     })

package/package.json

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

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),