@easyv/config 1.1.7 → 1.1.10

package/src/baseLine.js

@@ -1,177 +1,216 @@
-//@ts-check
-import { font, translate } from '.';
-
-const defaultBaseLine = {
-  line: {
-    yOrZ: 'y',
-    margin: {
-      marginLeft: 25,
-      marginRight: 25
-    },
-    lineType: 'solid',
-    color: '#BAE7FF',
-    lineWidth: 1,
-    strokeDasharray: '3,3'
-  },
-  dataStyle: {
-    font: font(),
-    translate: { x: 0, y: 0 },
-    suffix: {
-      show: false,
-      font: font(),
-      translate: { x: 0, y: 0 },
-    }
-  }
-};
-export default ({
-  line: {
-    yOrZ = defaultBaseLine.line.yOrZ,
-    margin: {
-      marginLeft = defaultBaseLine.line.margin.marginLeft,
-      marginRight = defaultBaseLine.line.margin.marginRight,
-    } = defaultBaseLine.line.margin,
-    lineType = defaultBaseLine.line.lineType,
-    color = defaultBaseLine.line.color,
-    lineWidth = defaultBaseLine.line.lineWidth,
-    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,
-  } = defaultBaseLine.dataStyle
-
-} = defaultBaseLine) => [
-    {
-      name: 'line',
-      displayName: '线样式',
-      config: {
-        layout: 'horizontal'
-      },
-      value: [
-        {
-          name: 'yOrZ',
-          displayName: '纵轴选择',
-          value: yOrZ,
-          type: 'select',
-          config: {
-            options: [
-              { name: 'Y轴', value: 'y' },
-              { name: 'Z轴', value: 'z' },
-            ],
-          },
-        },
-        {
-          name: 'margin',
-          displayName: '边距',
-          type: 'group',
-          value: [
-            {
-              type: 'number',
-              name: 'marginLeft',
-              displayName: '左',
-              value: marginLeft,
-              config: {
-                span: 12,
-                showStep: false,
-              },
-            },
-            {
-              type: 'number',
-              name: 'marginRight',
-              displayName: '右',
-              value: marginRight,
-              config: {
-                span: 12,
-                showStep: false,
-              },
-            }
-          ]
-        },
-        {
-          name: 'lineType',
-          displayName: '线样式',
-          value: lineType,
-          type: 'select',
-          config: {
-            options: [{
-              name: '实线',
-              value: 'solid'
-            }, {
-              name: '虚线',
-              value: 'dash'
-            }]
-          },
-        },
-        {
-          name: 'color',
-          displayName: '颜色',
-          value: color,
-          type: 'color',
-          markColorType: 'assistColor',
-        },
-        {
-          name: 'lineWidth',
-          displayName: '粗细',
-          value: lineWidth,
-          type: 'number',
-          config: {
-            suffix: 'px',
-          },
-        },
-        {
-          rule: [['lineType', '$eq', 'dash']],
-          name: 'strokeDasharray',
-          displayName: '虚线样式',
-          value: strokeDasharray,
-          type: 'input',
-          tip: '格式使用半角字符，如3,3',
-        },
-      ],
-    },
-    {
-      name: 'dataStyle',
-      displayName: '数据样式',
-      value: [
-        {
-          name: 'textStyle',
-          displayName: '文本样式',
-          value: font(textStyle),
-          type: 'textStyle',
-          markColorType: 'textColor',
-        },
-        translate(x, y),
-        {
-          name: 'suffix',
-          displayName: '后缀',
-          value: [
-            {
-              name: 'show',
-              displayName: '显示',
-              value: show,
-              type: 'boolean',
-            },
-            {
-              rule: [['show', '$eq', true]],
-              name: 'suffixStyle',
-              displayName: '文本样式',
-              value: font(suffixStyle),
-              type: 'textStyle',
-              markColorType: 'textColor',
-            },
-            {
-              rule: [['show', '$eq', true]],
-              ...translate(suffixTranslateX, suffixTranslateY)
-            }
-          ]
-        }
-      ]
-    }
-  ];
+//@ts-check
+import { font, translate } from '.';
+const defaultBaseLine = {
+  line: {
+    yOrZ: 'y',
+    margin: {
+      marginLeft: 0,
+      marginRight: 100
+    },
+    lineType: 'dash',
+    color: '#FF781E',
+    lineWidth: 1,
+    strokeDasharray: '3,4'
+  },
+  dataStyle: {
+    label: {
+      show: true,
+      text: '平均值',
+      font: font({
+        color: 'rgba(255, 120, 30, 0.7)',
+        fontFamily: 'Mircosoft Yahei',
+        fontSize: 12,
+        bold: false,
+        italic: false,
+        letterSpacing: 0,
+      }),
+      translate: { x: 4, y: 1 },
+    },
+    data: {
+      show: false,
+      font: font(),
+      translate: { x: 0, y: 0 },
+    }
+  }
+};
+export default ({
+  line: {
+    yOrZ = defaultBaseLine.line.yOrZ,
+    margin: {
+      marginLeft = defaultBaseLine.line.margin.marginLeft,
+      marginRight = defaultBaseLine.line.margin.marginRight,
+    } = defaultBaseLine.line.margin,
+    lineType = defaultBaseLine.line.lineType,
+    color = defaultBaseLine.line.color,
+    lineWidth = defaultBaseLine.line.lineWidth,
+    strokeDasharray = defaultBaseLine.line.strokeDasharray
+  } = defaultBaseLine.line,
+  dataStyle: {
+    label: {
+      showLabel = defaultBaseLine.dataStyle.label.show,
+      text = defaultBaseLine.dataStyle.label.text,
+      textStyle = defaultBaseLine.dataStyle.label.font,
+      translate: { x, y } = defaultBaseLine.dataStyle.label.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) => [
+    {
+      name: 'line',
+      displayName: '线样式',
+      config: {
+        layout: 'horizontal'
+      },
+      value: [
+        {
+          name: 'yOrZ',
+          displayName: '纵轴选择',
+          value: yOrZ,
+          type: 'select',
+          config: {
+            options: [
+              { name: 'Y轴', value: 'y' },
+              { name: 'Z轴', value: 'z' },
+            ],
+          },
+        },
+        {
+          name: 'margin',
+          displayName: '边距',
+          type: 'group',
+          value: [
+            {
+              type: 'number',
+              name: 'marginLeft',
+              displayName: '左',
+              value: marginLeft,
+              config: {
+                span: 12,
+                showStep: false,
+              },
+            },
+            {
+              type: 'number',
+              name: 'marginRight',
+              displayName: '右',
+              value: marginRight,
+              config: {
+                span: 12,
+                showStep: false,
+              },
+            }
+          ]
+        },
+        {
+          name: 'lineType',
+          displayName: '线样式',
+          value: lineType,
+          type: 'select',
+          config: {
+            options: [{
+              name: '实线',
+              value: 'solid'
+            }, {
+              name: '虚线',
+              value: 'dash'
+            }]
+          },
+        },
+        {
+          name: 'color',
+          displayName: '颜色',
+          value: color,
+          type: 'color',
+          markColorType: 'assistColor',
+        },
+        {
+          name: 'lineWidth',
+          displayName: '粗细',
+          value: lineWidth,
+          type: 'number',
+          config: {
+            data: 'px',
+          },
+        },
+        {
+          rule: [['lineType', '$eq', 'dash']],
+          name: 'strokeDasharray',
+          displayName: '虚线样式',
+          value: strokeDasharray,
+          type: 'input',
+          tip: '格式使用半角字符，如3,3',
+        },
+      ],
+    },
+    {
+      name: 'dataStyle',
+      displayName: '数据样式',
+      value: [
+        {
+          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)
+            }]
+        },
+        {
+          name: 'data',
+          displayName: '数值',
+          value: [
+            {
+              name: 'show',
+              displayName: '显示',
+              value: showData,
+              type: 'boolean',
+            },
+            {
+              rule: [['show', '$eq', true]],
+              name: 'dataStyle',
+              displayName: '文本样式',
+              value: font(dataStyle),
+              type: 'textStyle',
+              markColorType: 'textColor',
+            },
+            {
+              rule: [['show', '$eq', true]],
+              ...translate(dataTranslateX, dataTranslateY)
+            }
+          ]
+        }
+      ]
+    }
+  ];

package/src/brush.js

@@ -1,90 +1,90 @@
-const defaultBrush = {
-  height: 20,
-  background: 'rgba(20, 95, 255, 0.1)',
-  margin: {
-    marginLeft: 40,
-    marginRight: 40,
-  },
-  detail: {
-    width: 30,
-    color: 'rgba(255, 255, 255, 0.3)',
-  },
-};
-
-export default ({
-  height = defaultBrush.height,
-  background = defaultBrush.background,
-  margin: {
-    marginLeft = defaultBrush.margin.marginLeft,
-    marginRight = defaultBrush.margin.marginRight,
-  } = defaultBrush.margin,
-  detail: {
-    width = defaultBrush.detail.width,
-    color = defaultBrush.detail.color,
-  } = defaultBrush.detail,
-} = defaultBrush) => ({
-  name: 'brush',
-  displayName: '控制条',
-  value: [
-    {
-      name: 'height',
-      displayName: '高度',
-      value: height,
-      type: 'number',
-    },
-    {
-      name: 'background',
-      displayName: '背景',
-      value: background,
-      type: 'color',
-    },
-    {
-      name: 'margin',
-      displayName: '间距',
-      value: [
-        {
-          name: 'marginLeft',
-          displayName: '左',
-          value: marginLeft,
-          type: 'number',
-          config: {
-            span: 12,
-          },
-        },
-        {
-          name: 'marginRight',
-          displayName: '右',
-          value: marginRight,
-          type: 'number',
-          config: {
-            span: 12,
-          },
-        },
-      ],
-      type: 'group',
-    },
-    {
-      name: 'detail',
-      displayName: '详情区域',
-      value: [
-        {
-          name: 'width',
-          displayName: '宽度',
-          value: width,
-          type: 'number',
-          config: {
-            suffix: '%',
-            min: 0,
-            max: 100,
-          },
-        },
-        {
-          name: 'color',
-          displayName: '颜色',
-          value: color,
-          type: 'color',
-        },
-      ],
-    },
-  ],
-});
+const defaultBrush = {
+  height: 20,
+  background: 'rgba(20, 95, 255, 0.1)',
+  margin: {
+    marginLeft: 40,
+    marginRight: 40,
+  },
+  detail: {
+    width: 30,
+    color: 'rgba(255, 255, 255, 0.3)',
+  },
+};
+
+export default ({
+  height = defaultBrush.height,
+  background = defaultBrush.background,
+  margin: {
+    marginLeft = defaultBrush.margin.marginLeft,
+    marginRight = defaultBrush.margin.marginRight,
+  } = defaultBrush.margin,
+  detail: {
+    width = defaultBrush.detail.width,
+    color = defaultBrush.detail.color,
+  } = defaultBrush.detail,
+} = defaultBrush) => ({
+  name: 'brush',
+  displayName: '控制条',
+  value: [
+    {
+      name: 'height',
+      displayName: '高度',
+      value: height,
+      type: 'number',
+    },
+    {
+      name: 'background',
+      displayName: '背景',
+      value: background,
+      type: 'color',
+    },
+    {
+      name: 'margin',
+      displayName: '间距',
+      value: [
+        {
+          name: 'marginLeft',
+          displayName: '左',
+          value: marginLeft,
+          type: 'number',
+          config: {
+            span: 12,
+          },
+        },
+        {
+          name: 'marginRight',
+          displayName: '右',
+          value: marginRight,
+          type: 'number',
+          config: {
+            span: 12,
+          },
+        },
+      ],
+      type: 'group',
+    },
+    {
+      name: 'detail',
+      displayName: '详情区域',
+      value: [
+        {
+          name: 'width',
+          displayName: '宽度',
+          value: width,
+          type: 'number',
+          config: {
+            suffix: '%',
+            min: 0,
+            max: 100,
+          },
+        },
+        {
+          name: 'color',
+          displayName: '颜色',
+          value: color,
+          type: 'color',
+        },
+      ],
+    },
+  ],
+});

package/src/dimension.js

@@ -1,49 +1,49 @@
-const defaultDimension = {
-  width: 450,
-  height: 250,
-  left: 100,
-  top: 100,
-};
-export default ({
-  width = defaultDimension.width,
-  height = defaultDimension.height,
-  left = defaultDimension.left,
-  top = defaultDimension.top,
-} = defaultDimension) => ({
-  name: 'dimension',
-  displayName: '位置尺寸',
-  value: [
-    {
-      name: 'chartPosition',
-      displayName: '图表位置',
-      value: [
-        {
-          name: 'left',
-          displayName: 'X轴坐标',
-          value: left,
-        },
-        {
-          name: 'top',
-          displayName: 'Y轴坐标',
-          value: top,
-        },
-      ],
-    },
-    {
-      name: 'chartDimension',
-      displayName: '图表尺寸',
-      value: [
-        {
-          name: 'width',
-          displayName: '宽度',
-          value: width,
-        },
-        {
-          name: 'height',
-          displayName: '高度',
-          value: height,
-        },
-      ],
-    },
-  ],
-});
+const defaultDimension = {
+  width: 450,
+  height: 250,
+  left: 100,
+  top: 100,
+};
+export default ({
+  width = defaultDimension.width,
+  height = defaultDimension.height,
+  left = defaultDimension.left,
+  top = defaultDimension.top,
+} = defaultDimension) => ({
+  name: 'dimension',
+  displayName: '位置尺寸',
+  value: [
+    {
+      name: 'chartPosition',
+      displayName: '图表位置',
+      value: [
+        {
+          name: 'left',
+          displayName: 'X轴坐标',
+          value: left,
+        },
+        {
+          name: 'top',
+          displayName: 'Y轴坐标',
+          value: top,
+        },
+      ],
+    },
+    {
+      name: 'chartDimension',
+      displayName: '图表尺寸',
+      value: [
+        {
+          name: 'width',
+          displayName: '宽度',
+          value: width,
+        },
+        {
+          name: 'height',
+          displayName: '高度',
+          value: height,
+        },
+      ],
+    },
+  ],
+});