@easyv/config 1.2.13 → 1.2.15

package/lib/legend.js

@@ -358,20 +358,34 @@ var defaultLegendOfPie = {
   name: {
     show: true,
     font: defaultFont,
-    maxWidth: 40
+    maxWidth: 40,
+    translate: {
+      x: 0,
+      y: 0
+    }
   },
   percent: {
     show: true,
     precision: 0,
     sameColor: false,
+    align: "left",
     gap: 0,
-    font: defaultFont
+    font: defaultFont,
+    translate: {
+      x: 0,
+      y: 0
+    }
   },
   value: {
     show: true,
     sameColor: false,
+    align: "left",
     gap: 0,
     font: defaultFont,
+    translate: {
+      x: 0,
+      y: 0
+    },
     suffix: {
       show: true,
       text: '',
@@ -418,6 +432,12 @@ var legendOfPie = function legendOfPie() {
     _ref3$name$maxWidth = _ref3$name.maxWidth,
     maxWidth = _ref3$name$maxWidth === void 0 ? defaultLegendOfPie.name.maxWidth : _ref3$name$maxWidth,
     overflow = _ref3$name.overflow,
+    _ref3$name$translate = _ref3$name.translate;
+  _ref3$name$translate = _ref3$name$translate === void 0 ? defaultLegendOfPie.name.translate : _ref3$name$translate;
+  var _ref3$name$translate$ = _ref3$name$translate.x,
+    nameX = _ref3$name$translate$ === void 0 ? defaultLegendOfPie.name.translate.x : _ref3$name$translate$,
+    _ref3$name$translate$2 = _ref3$name$translate.y,
+    nameY = _ref3$name$translate$2 === void 0 ? defaultLegendOfPie.name.translate.y : _ref3$name$translate$2,
     _ref3$percent = _ref3.percent;
   _ref3$percent = _ref3$percent === void 0 ? defaultLegendOfPie.percent : _ref3$percent;
   var _ref3$percent$show = _ref3$percent.show,
@@ -426,20 +446,36 @@ var legendOfPie = function legendOfPie() {
     precision = _ref3$percent$precisi === void 0 ? defaultLegendOfPie.percent.precision : _ref3$percent$precisi,
     _ref3$percent$sameCol = _ref3$percent.sameColor,
     percentSameColor = _ref3$percent$sameCol === void 0 ? defaultLegendOfPie.percent.sameColor : _ref3$percent$sameCol,
+    _ref3$percent$align = _ref3$percent.align,
+    percentAlign = _ref3$percent$align === void 0 ? defaultLegendOfPie.percent.align : _ref3$percent$align,
     _ref3$percent$gap = _ref3$percent.gap,
     percentGap = _ref3$percent$gap === void 0 ? defaultLegendOfPie.percent.gap : _ref3$percent$gap,
     _ref3$percent$font = _ref3$percent.font,
     percentFont = _ref3$percent$font === void 0 ? defaultLegendOfPie.percent.font : _ref3$percent$font,
+    _ref3$percent$transla = _ref3$percent.translate;
+  _ref3$percent$transla = _ref3$percent$transla === void 0 ? defaultLegendOfPie.percent.translate : _ref3$percent$transla;
+  var _ref3$percent$transla2 = _ref3$percent$transla.x,
+    percentX = _ref3$percent$transla2 === void 0 ? defaultLegendOfPie.percent.translate.x : _ref3$percent$transla2,
+    _ref3$percent$transla3 = _ref3$percent$transla.y,
+    percentY = _ref3$percent$transla3 === void 0 ? defaultLegendOfPie.percent.translate.y : _ref3$percent$transla3,
     _ref3$value = _ref3.value;
   _ref3$value = _ref3$value === void 0 ? defaultLegendOfPie.value : _ref3$value;
   var _ref3$value$show = _ref3$value.show,
     showValue = _ref3$value$show === void 0 ? defaultLegendOfPie.value.show : _ref3$value$show,
     _ref3$value$sameColor = _ref3$value.sameColor,
     valueSameColor = _ref3$value$sameColor === void 0 ? defaultLegendOfPie.value.sameColor : _ref3$value$sameColor,
+    _ref3$value$align = _ref3$value.align,
+    valueAlign = _ref3$value$align === void 0 ? defaultLegendOfPie.value.align : _ref3$value$align,
     _ref3$value$gap = _ref3$value.gap,
     valueGap = _ref3$value$gap === void 0 ? defaultLegendOfPie.value.gap : _ref3$value$gap,
     _ref3$value$font = _ref3$value.font,
     valueFont = _ref3$value$font === void 0 ? defaultLegendOfPie.value.font : _ref3$value$font,
+    _ref3$value$translate = _ref3$value.translate;
+  _ref3$value$translate = _ref3$value$translate === void 0 ? defaultLegendOfPie.value.translate : _ref3$value$translate;
+  var _ref3$value$translate2 = _ref3$value$translate.x,
+    valueX = _ref3$value$translate2 === void 0 ? defaultLegendOfPie.value.translate.x : _ref3$value$translate2,
+    _ref3$value$translate3 = _ref3$value$translate.y,
+    valueY = _ref3$value$translate3 === void 0 ? defaultLegendOfPie.value.translate.y : _ref3$value$translate3,
     _ref3$value$suffix = _ref3$value.suffix;
   _ref3$value$suffix = _ref3$value$suffix === void 0 ? defaultLegendOfPie.value.suffix : _ref3$value$suffix;
   var _ref3$value$suffix$sh = _ref3$value$suffix.show,
@@ -530,7 +566,7 @@ var legendOfPie = function legendOfPie() {
         markColorType: 'textColor'
       }, (0, _index.sc)("maxWidth", "宽度", "number", maxWidth, {
         suffix: "px"
-      }, showRule())].concat((0, _toConsumableArray2["default"])((0, _index.textOverflow)(overflow)))
+      }, showRule())].concat((0, _toConsumableArray2["default"])((0, _index.textOverflow)(overflow)), [(0, _index.translate)(nameX, nameY)])
     }), _objectSpread(_objectSpread({}, showRule()), {}, {
       name: 'percent',
       displayName: '占比值',
@@ -555,13 +591,34 @@ var legendOfPie = function legendOfPie() {
         displayName: '颜色跟随',
         value: percentSameColor,
         type: 'boolean'
+      }), _objectSpread(_objectSpread({}, showRule()), {}, {
+        name: "align",
+        displayName: "文本对齐",
+        value: percentAlign,
+        type: "radio",
+        config: {
+          mode: "icon",
+          options: [{
+            name: "左对齐",
+            value: "left",
+            icon: "align-left"
+          }, {
+            name: "居中对齐",
+            value: "center",
+            icon: "align-center"
+          }, {
+            name: "右对齐",
+            value: "right",
+            icon: "align-right"
+          }]
+        }
       }), _objectSpread(_objectSpread({}, showRule()), {}, {
         name: 'font',
         displayName: '文本样式',
         value: percentFont,
         type: 'textStyle',
         markColorType: 'textColor'
-      })]
+      }), (0, _index.translate)(percentX, percentY)]
     }), _objectSpread(_objectSpread({}, showRule()), {}, {
       name: 'value',
       displayName: '真实值',
@@ -603,13 +660,34 @@ var legendOfPie = function legendOfPie() {
         displayName: '颜色跟随',
         value: valueSameColor,
         type: 'boolean'
+      }), _objectSpread(_objectSpread({}, showRule()), {}, {
+        name: "align",
+        displayName: "文本对齐",
+        value: valueAlign,
+        type: "radio",
+        config: {
+          mode: "icon",
+          options: [{
+            name: "左对齐",
+            value: "left",
+            icon: "align-left"
+          }, {
+            name: "居中对齐",
+            value: "center",
+            icon: "align-center"
+          }, {
+            name: "右对齐",
+            value: "right",
+            icon: "align-right"
+          }]
+        }
       }), _objectSpread(_objectSpread({}, showRule()), {}, {
         name: 'font',
         displayName: '文本样式',
         value: valueFont,
         type: 'textStyle',
         markColorType: 'textColor'
-      })]
+      }), (0, _index.translate)(valueX, valueY)]
     }), _objectSpread(_objectSpread({}, showRule()), {}, {
       name: 'layout',
       displayName: '布局',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@easyv/config",
-  "version": "1.2.13",
+  "version": "1.2.15",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -28,4 +28,4 @@
       "commit": true
     }
   }
-}
+}

package/src/legend.js

@@ -4,7 +4,7 @@ const {
   show: showConfig,
   showRule
 } = require('.');
-import { textOverflow, sc } from './index';
+import { textOverflow, sc, translate } from './index';
 
 const defaultFont = font({
   fontFamily: 'Mircosoft Yahei',
@@ -374,19 +374,23 @@ const defaultLegendOfPie = {
     height: 10,
   },
   iconGap: 5,
-  name: { show: true, font: defaultFont, maxWidth:40 },
+  name: { show: true, font: defaultFont, maxWidth:40, translate:{ x:0, y:0 } },
   percent: {
     show: true,
     precision: 0,
     sameColor: false,
+    align:"left",
     gap: 0,
     font: defaultFont,
+    translate:{ x:0, y:0 }
   },
   value: {
     show: true,
     sameColor: false,
+    align:"left",
     gap: 0,
     font: defaultFont,
+    translate:{ x:0, y:0 },
     suffix: {
       show: true,
       text: '',
@@ -413,20 +417,34 @@ export const legendOfPie = ({
     show: showName = defaultLegendOfPie.name.show,
     font: nameFont = defaultLegendOfPie.name.font,
     maxWidth = defaultLegendOfPie.name.maxWidth,
-    overflow
+    overflow,
+    translate:{
+      x:nameX = defaultLegendOfPie.name.translate.x,
+      y:nameY = defaultLegendOfPie.name.translate.y
+    } = defaultLegendOfPie.name.translate
   } = defaultLegendOfPie.name,
   percent: {
     show: showPercent = defaultLegendOfPie.percent.show,
     precision = defaultLegendOfPie.percent.precision,
     sameColor: percentSameColor = defaultLegendOfPie.percent.sameColor,
+    align: percentAlign = defaultLegendOfPie.percent.align,
     gap: percentGap = defaultLegendOfPie.percent.gap,
     font: percentFont = defaultLegendOfPie.percent.font,
+    translate:{
+      x:percentX = defaultLegendOfPie.percent.translate.x,
+      y:percentY = defaultLegendOfPie.percent.translate.y
+    } = defaultLegendOfPie.percent.translate
   } = defaultLegendOfPie.percent,
   value: {
     show: showValue = defaultLegendOfPie.value.show,
     sameColor: valueSameColor = defaultLegendOfPie.value.sameColor,
+    align: valueAlign = defaultLegendOfPie.value.align,
     gap: valueGap = defaultLegendOfPie.value.gap,
     font: valueFont = defaultLegendOfPie.value.font,
+    translate:{
+      x:valueX = defaultLegendOfPie.value.translate.x,
+      y:valueY = defaultLegendOfPie.value.translate.y
+    } = defaultLegendOfPie.value.translate,
     suffix: {
       show: showSuffix = defaultLegendOfPie.value.suffix.show,
       text = defaultLegendOfPie.value.suffix.text,
@@ -516,7 +534,8 @@ export const legendOfPie = ({
           markColorType: 'textColor',
         },
         sc("maxWidth","宽度","number",maxWidth,{suffix:"px"},showRule()),
-        ...textOverflow(overflow)
+        ...textOverflow(overflow),
+        translate(nameX, nameY)
       ],
     },
     {
@@ -552,6 +571,21 @@ export const legendOfPie = ({
           value: percentSameColor,
           type: 'boolean',
         },
+        {
+          ...showRule(),
+          name:"align",
+          displayName:"文本对齐",
+          value:percentAlign,
+          type:"radio",
+          config:{
+            mode:"icon",
+            options:[
+              { name:"左对齐", value:"left", icon:"align-left" },
+              { name:"居中对齐", value:"center", icon:"align-center" },
+              { name:"右对齐", value:"right", icon:"align-right" }
+            ]
+          }
+        },
         {
           ...showRule(),
           name: 'font',
@@ -560,6 +594,7 @@ export const legendOfPie = ({
           type: 'textStyle',
           markColorType: 'textColor',
         },
+        translate(percentX, percentY)
       ],
     },
     {
@@ -622,6 +657,21 @@ export const legendOfPie = ({
           value: valueSameColor,
           type: 'boolean',
         },
+        {
+          ...showRule(),
+          name:"align",
+          displayName:"文本对齐",
+          value:valueAlign,
+          type:"radio",
+          config:{
+            mode:"icon",
+            options:[
+              { name:"左对齐", value:"left", icon:"align-left" },
+              { name:"居中对齐", value:"center", icon:"align-center" },
+              { name:"右对齐", value:"right", icon:"align-right" }
+            ]
+          }
+        },
         {
           ...showRule(),
           name: 'font',
@@ -630,6 +680,7 @@ export const legendOfPie = ({
           type: 'textStyle',
           markColorType: 'textColor',
         },
+        translate(valueX, valueY)
       ],
     },
     {