npm - @easyv/config - Versions diffs - 1.1.7 → 1.1.8 - Mend

@easyv/config 1.1.7 → 1.1.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/lib/baseLine.js CHANGED Viewed

@@ -19,8 +19,8 @@ var defaultBaseLine = {
   line: {
     yOrZ: 'y',
     margin: {
-      marginLeft: 25,
-      marginRight: 25
+      marginLeft: 0,
+      marginRight: 100
     },
     lineType: 'solid',
     color: '#BAE7FF',
@@ -28,12 +28,16 @@ var defaultBaseLine = {
     strokeDasharray: '3,3'
   },
   dataStyle: {
-    font: (0, _.font)(),
-    translate: {
-      x: 0,
-      y: 0
+    label: {
+      show: true,
+      text: '平均值',
+      font: (0, _.font)(),
+      translate: {
+        x: 0,
+        y: 0
+      }
     },
-    suffix: {
+    data: {
       show: false,
       font: (0, _.font)(),
       translate: {
@@ -67,24 +71,29 @@ var _default = function _default() {
       strokeDasharray = _ref$line$strokeDasha === void 0 ? defaultBaseLine.line.strokeDasharray : _ref$line$strokeDasha,
       _ref$dataStyle = _ref.dataStyle;
   _ref$dataStyle = _ref$dataStyle === void 0 ? defaultBaseLine.dataStyle : _ref$dataStyle;
-  var _ref$dataStyle$textSt = _ref$dataStyle.textStyle,
-      textStyle = _ref$dataStyle$textSt === void 0 ? defaultBaseLine.dataStyle.font : _ref$dataStyle$textSt,
-      _ref$dataStyle$transl = _ref$dataStyle.translate;
-  _ref$dataStyle$transl = _ref$dataStyle$transl === void 0 ? defaultBaseLine.dataStyle.translate : _ref$dataStyle$transl;
-  var x = _ref$dataStyle$transl.x,
-      y = _ref$dataStyle$transl.y,
-      _ref$dataStyle$suffix = _ref$dataStyle.suffix;
-  _ref$dataStyle$suffix = _ref$dataStyle$suffix === void 0 ? defaultBaseLine.dataStyle.suffix : _ref$dataStyle$suffix;
-  var _ref$dataStyle$suffix2 = _ref$dataStyle$suffix.show,
-      show = _ref$dataStyle$suffix2 === void 0 ? defaultBaseLine.dataStyle.suffix.show : _ref$dataStyle$suffix2,
-      _ref$dataStyle$suffix3 = _ref$dataStyle$suffix.suffixStyle,
-      suffixStyle = _ref$dataStyle$suffix3 === void 0 ? defaultBaseLine.dataStyle.suffix.suffixStyle : _ref$dataStyle$suffix3,
-      _ref$dataStyle$suffix4 = _ref$dataStyle$suffix.suffixTranslate;
-  _ref$dataStyle$suffix4 = _ref$dataStyle$suffix4 === void 0 ? defaultBaseLine.dataStyle.suffix.translate : _ref$dataStyle$suffix4;
-  var _ref$dataStyle$suffix5 = _ref$dataStyle$suffix4.x,
-      suffixTranslateX = _ref$dataStyle$suffix5 === void 0 ? defaultBaseLine.dataStyle.suffix.translate.x : _ref$dataStyle$suffix5,
-      _ref$dataStyle$suffix6 = _ref$dataStyle$suffix4.y,
-      suffixTranslateY = _ref$dataStyle$suffix6 === void 0 ? defaultBaseLine.dataStyle.suffix.translate.y : _ref$dataStyle$suffix6;
+  var _ref$dataStyle$label = _ref$dataStyle.label,
+      _ref$dataStyle$label$ = _ref$dataStyle$label.showLabel,
+      showLabel = _ref$dataStyle$label$ === void 0 ? defaultBaseLine.dataStyle.label.show : _ref$dataStyle$label$,
+      _ref$dataStyle$label$2 = _ref$dataStyle$label.text,
+      text = _ref$dataStyle$label$2 === void 0 ? defaultBaseLine.dataStyle.label : _ref$dataStyle$label$2,
+      _ref$dataStyle$label$3 = _ref$dataStyle$label.textStyle,
+      textStyle = _ref$dataStyle$label$3 === void 0 ? defaultBaseLine.dataStyle.font : _ref$dataStyle$label$3,
+      _ref$dataStyle$label$4 = _ref$dataStyle$label.translate;
+  _ref$dataStyle$label$4 = _ref$dataStyle$label$4 === void 0 ? defaultBaseLine.dataStyle.translate : _ref$dataStyle$label$4;
+  var x = _ref$dataStyle$label$4.x,
+      y = _ref$dataStyle$label$4.y,
+      _ref$dataStyle$data = _ref$dataStyle.data;
+  _ref$dataStyle$data = _ref$dataStyle$data === void 0 ? defaultBaseLine.dataStyle.data : _ref$dataStyle$data;
+  var _ref$dataStyle$data$s = _ref$dataStyle$data.showData,
+      showData = _ref$dataStyle$data$s === void 0 ? defaultBaseLine.dataStyle.data.show : _ref$dataStyle$data$s,
+      _ref$dataStyle$data$d = _ref$dataStyle$data.dataStyle,
+      dataStyle = _ref$dataStyle$data$d === void 0 ? defaultBaseLine.dataStyle.data.dataStyle : _ref$dataStyle$data$d,
+      _ref$dataStyle$data$d2 = _ref$dataStyle$data.dataTranslate;
+  _ref$dataStyle$data$d2 = _ref$dataStyle$data$d2 === void 0 ? defaultBaseLine.dataStyle.data.translate : _ref$dataStyle$data$d2;
+  var _ref$dataStyle$data$d3 = _ref$dataStyle$data$d2.x,
+      dataTranslateX = _ref$dataStyle$data$d3 === void 0 ? defaultBaseLine.dataStyle.data.translate.x : _ref$dataStyle$data$d3,
+      _ref$dataStyle$data$d4 = _ref$dataStyle$data$d2.y,
+      dataTranslateY = _ref$dataStyle$data$d4 === void 0 ? defaultBaseLine.dataStyle.data.translate.y : _ref$dataStyle$data$d4;
   return [{
     name: 'line',
     displayName: '线样式',
@@ -154,7 +163,7 @@ var _default = function _default() {
       value: lineWidth,
       type: 'number',
       config: {
-        suffix: 'px'
+        data: 'px'
       }
     }, {
       rule: [['lineType', '$eq', 'dash']],
@@ -168,29 +177,50 @@ var _default = function _default() {
     name: 'dataStyle',
     displayName: '数据样式',
     value: [{
-      name: 'textStyle',
-      displayName: '文本样式',
-      value: (0, _.font)(textStyle),
-      type: 'textStyle',
-      markColorType: 'textColor'
-    }, (0, _.translate)(x, y), {
-      name: 'suffix',
-      displayName: '后缀',
+      name: 'label',
+      displayName: '标签',
+      config: {
+        defaultOpen: true
+      },
+      value: [{
+        name: 'show',
+        displayName: '显示',
+        value: showLabel,
+        type: 'boolean'
+      }, {
+        rule: [['show', '$eq', true]],
+        name: "label",
+        displayName: "标签内容",
+        type: 'input',
+        value: text
+      }, {
+        rule: [['show', '$eq', true]],
+        name: 'textStyle',
+        displayName: '文本样式',
+        value: (0, _.font)(textStyle),
+        type: 'textStyle',
+        markColorType: 'textColor'
+      }, _objectSpread({
+        rule: [['show', '$eq', true]]
+      }, (0, _.translate)(x, y))]
+    }, {
+      name: 'data',
+      displayName: '数值',
       value: [{
         name: 'show',
         displayName: '显示',
-        value: show,
+        value: showData,
         type: 'boolean'
       }, {
         rule: [['show', '$eq', true]],
-        name: 'suffixStyle',
+        name: 'dataStyle',
         displayName: '文本样式',
-        value: (0, _.font)(suffixStyle),
+        value: (0, _.font)(dataStyle),
         type: 'textStyle',
         markColorType: 'textColor'
       }, _objectSpread({
         rule: [['show', '$eq', true]]
-      }, (0, _.translate)(suffixTranslateX, suffixTranslateY))]
+      }, (0, _.translate)(dataTranslateX, dataTranslateY))]
     }]
   }];
 };

package/package.json CHANGED Viewed

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

package/src/baseLine.js CHANGED Viewed

@@ -5,8 +5,8 @@ const defaultBaseLine = {
   line: {
     yOrZ: 'y',
     margin: {
-      marginLeft: 25,
-      marginRight: 25
+      marginLeft: 0,
+      marginRight: 100
     },
     lineType: 'solid',
     color: '#BAE7FF',
@@ -14,9 +14,13 @@ const defaultBaseLine = {
     strokeDasharray: '3,3'
   },
   dataStyle: {
-    font: font(),
-    translate: { x: 0, y: 0 },
-    suffix: {
+    label: {
+      show: true,
+      text: '平均值',
+      font: font(),
+      translate: { x: 0, y: 0 },
+    },
+    data: {
       show: false,
       font: font(),
       translate: { x: 0, y: 0 },
@@ -36,16 +40,20 @@ export default ({
     strokeDasharray = defaultBaseLine.line.strokeDasharray
   } = defaultBaseLine.line,
   dataStyle: {
-    textStyle = defaultBaseLine.dataStyle.font,
-    translate: { x, y } = defaultBaseLine.dataStyle.translate,
-    suffix: {
-      show = defaultBaseLine.dataStyle.suffix.show,
-      suffixStyle = defaultBaseLine.dataStyle.suffix.suffixStyle,
-      suffixTranslate: {
-        x: suffixTranslateX = defaultBaseLine.dataStyle.suffix.translate.x,
-        y: suffixTranslateY = defaultBaseLine.dataStyle.suffix.translate.y
-      } = defaultBaseLine.dataStyle.suffix.translate
-    } = defaultBaseLine.dataStyle.suffix,
+    label: {
+      showLabel = defaultBaseLine.dataStyle.label.show,
+      text = defaultBaseLine.dataStyle.label,
+      textStyle = defaultBaseLine.dataStyle.font,
+      translate: { x, y } = defaultBaseLine.dataStyle.translate,
+    },
+    data: {
+      showData = defaultBaseLine.dataStyle.data.show,
+      dataStyle = defaultBaseLine.dataStyle.data.dataStyle,
+      dataTranslate: {
+        x: dataTranslateX = defaultBaseLine.dataStyle.data.translate.x,
+        y: dataTranslateY = defaultBaseLine.dataStyle.data.translate.y
+      } = defaultBaseLine.dataStyle.data.translate
+    } = defaultBaseLine.dataStyle.data,
   } = defaultBaseLine.dataStyle
 } = defaultBaseLine) => [
@@ -123,7 +131,7 @@ export default ({
           value: lineWidth,
           type: 'number',
           config: {
-            suffix: 'px',
+            data: 'px',
           },
         },
         {
@@ -141,34 +149,59 @@ export default ({
       displayName: '数据样式',
       value: [
         {
-          name: 'textStyle',
-          displayName: '文本样式',
-          value: font(textStyle),
-          type: 'textStyle',
-          markColorType: 'textColor',
+          name: 'label',
+          displayName: '标签',
+          config: {
+            defaultOpen: true
+          },
+          value: [
+            {
+              name: 'show',
+              displayName: '显示',
+              value: showLabel,
+              type: 'boolean',
+            },
+            {
+              rule: [['show', '$eq', true]],
+              name: "label",
+              displayName: "标签内容",
+              type: 'input',
+              value: text,
+            },
+            {
+              rule: [['show', '$eq', true]],
+              name: 'textStyle',
+              displayName: '文本样式',
+              value: font(textStyle),
+              type: 'textStyle',
+              markColorType: 'textColor',
+            },
+            {
+              rule: [['show', '$eq', true]],
+              ...translate(x, y)
+            }]
         },
-        translate(x, y),
         {
-          name: 'suffix',
-          displayName: '后缀',
+          name: 'data',
+          displayName: '数值',
           value: [
             {
               name: 'show',
               displayName: '显示',
-              value: show,
+              value: showData,
               type: 'boolean',
             },
             {
               rule: [['show', '$eq', true]],
-              name: 'suffixStyle',
+              name: 'dataStyle',
               displayName: '文本样式',
-              value: font(suffixStyle),
+              value: font(dataStyle),
               type: 'textStyle',
               markColorType: 'textColor',
             },
             {
               rule: [['show', '$eq', true]],
-              ...translate(suffixTranslateX, suffixTranslateY)
+              ...translate(dataTranslateX, dataTranslateY)
             }
           ]
         }