@easyv/config 1.3.1 → 1.3.2

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.3.1",
+  "version": "1.3.2",
   "description": "",
   "main": "index.js",
   "scripts": {

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

@@ -139,6 +139,7 @@ export const labelOfPie = ({
   percent: {
     show: showPercent = defaultLabelOfPie.percent.show,
     precision = defaultLabelOfPie.percent.precision,
+    sameColor: percentSameColor = defaultLabelOfPie.percent.sameColor,
     font: percentFont = defaultLabelOfPie.percent.font,
     translate:{
       x:percentX = defaultLabelOfPie.percent.translate.x,
@@ -147,6 +148,7 @@ export const labelOfPie = ({
   } = defaultLabelOfPie.percent,
   value: {
     show: showValue = defaultLabelOfPie.value.show,
+    sameColor: valueSameColor = defaultLabelOfPie.value.sameColor,
     suffix: {
       show: showSuffix = defaultLabelOfPie.value.suffix.show,
       text: suffixText = defaultLabelOfPie.value.suffix.text,
@@ -290,6 +292,12 @@ export const labelOfPie = ({
             min: 0,
           },
         },
+        {
+          "name": "sameColor",
+          "displayName": "颜色跟随",
+          "value": percentSameColor,
+          "type": "boolean"
+      },
         {
           rule: [["show", "$eq", true]],
           name: "font",
@@ -311,6 +319,13 @@ export const labelOfPie = ({
           value: showValue,
           type: "boolean",
         },
+        {
+          rule: [['show', '$eq', true]],
+          name: 'sameColor',
+          displayName: '颜色跟随',
+          value: valueSameColor,
+          type: 'boolean',
+        },
         {
           rule: [["show", "$eq", true]],
           name: "suffix",