@easyv/config - npm Package Compare versions

Comparing version 1.0.47 to 1.0.48

lib/label.js

@@ -387,2 +387,3 @@ "use strict";
   },
+  showLast: false,
   translate: {
@@ -416,2 +417,4 @@ x: 0,
       wordBreak = _ref4$appearance$word === void 0 ? defaultAxisLabel.appearance.wordBreak : _ref4$appearance$word,
+      _ref4$showLast = _ref4.showLast,
+      showLast = _ref4$showLast === void 0 ? defaultAxisLabel.showLast : _ref4$showLast,
       _ref4$translate = _ref4.translate;
@@ -600,2 +603,8 @@ _ref4$translate = _ref4$translate === void 0 ? defaultAxisLabel.translate : _ref4$translate;
       type: 'group'
+    }, {
+      name: 'showLast',
+      displayName: '显示最新',
+      value: showLast,
+      type: 'boolean',
+      tip: '显示返回最新数据的轴标签'
     }, _objectSpread({
@@ -602,0 +611,0 @@ rule: [['show', '$eq', true]]

lib/series.js

@@ -22,2 +22,3 @@ "use strict";
   stack: '',
+  fillImage: 'components/static-image/superChart/pattern.png',
   fill: {
@@ -62,3 +63,8 @@ type: 'linear',
     }
-  }
+  },
+  size: {
+    width: 10,
+    height: 10
+  },
+  opacity: 0.65
 };
@@ -81,2 +87,5 @@
       patternType = _ref.patternType,
+      fillType = _ref.fillType,
+      _ref$fillImage = _ref.fillImage,
+      fillImage = _ref$fillImage === void 0 ? defaultBandSeries.fillImage : _ref$fillImage,
       patternWidth = _ref.patternWidth,
@@ -87,2 +96,10 @@ patternHeight = _ref.patternHeight,
       fill = _ref$fill === void 0 ? defaultBandSeries.fill : _ref$fill,
+      _ref$size = _ref.size;
+  _ref$size = _ref$size === void 0 ? defaultBandSeries.size : _ref$size;
+  var _ref$size$width = _ref$size.width,
+      urlWidth = _ref$size$width === void 0 ? defaultBandSeries.size.width : _ref$size$width,
+      _ref$size$height = _ref$size.height,
+      urlHeight = _ref$size$height === void 0 ? defaultBandSeries.size.height : _ref$size$height,
+      _ref$opacity = _ref.opacity,
+      opacity = _ref$opacity === void 0 ? defaultBandSeries.opacity : _ref$opacity,
       _ref$highlight = _ref.highlight;
@@ -121,3 +138,18 @@ _ref$highlight = _ref$highlight === void 0 ? defaultBandSeries.highlight : _ref$highlight;
       type: 'input'
-    }, {
+    }, fillType !== undefined && {
+      name: 'fillType',
+      displayName: '填充样式',
+      value: fillType,
+      type: 'radio',
+      config: {
+        options: [{
+          name: '颜色',
+          value: 'color'
+        }, {
+          name: '纹理',
+          value: 'pattern'
+        }]
+      }
+    }, fillType !== undefined && {
+      rule: [['fillType', '$eq', 'color']],
       name: 'fill',
@@ -127,3 +159,47 @@ displayName: '颜色',
       value: fill
+    }, fillType !== undefined && {
+      rule: [['fillType', '$eq', 'pattern']],
+      name: 'url',
+      displayName: '纹理图片',
+      type: 'uploadImage',
+      value: fillImage
+    }, fillType !== undefined && {
+      rule: [['fillType', '$eq', 'pattern']],
+      name: 'size',
+      displayName: '尺寸',
+      value: [{
+        name: 'width',
+        displayName: '宽度',
+        value: urlWidth,
+        config: {
+          span: 12,
+          suffix: 'W'
+        }
+      }, {
+        name: 'height',
+        displayName: '高度',
+        value: urlHeight,
+        config: {
+          span: 12,
+          suffix: 'H'
+        }
+      }],
+      type: 'group'
+    }, fillType !== undefined && {
+      rule: [['fillType', '$eq', 'pattern']],
+      type: "range",
+      name: "opacity",
+      displayName: "透明度",
+      value: opacity,
+      config: {
+        max: 1,
+        min: 0,
+        step: 0.01
+      }
     }, patternType !== undefined && {
+      name: 'fill',
+      displayName: '颜色',
+      type: 'multicolor',
+      value: fill
+    }, patternType !== undefined && {
       name: 'patternType',
@@ -237,2 +313,9 @@ displayName: '纹理类型',
   },
+  areaType: 'color',
+  size: {
+    width: 10,
+    height: 10
+  },
+  url: 'components/static-image/superChart/pattern.png',
+  opacity: 0.65,
   areaColor: {
@@ -613,4 +696,16 @@ type: 'linear',
       areaLabel = _ref6$label === void 0 ? defaultLineSeries.label : _ref6$label,
+      _ref6$areaType = _ref6.areaType,
+      areaType = _ref6$areaType === void 0 ? defaultLineSeries.areaType : _ref6$areaType,
       _ref6$areaColor = _ref6.areaColor,
-      areaColor = _ref6$areaColor === void 0 ? defaultLineSeries.areaColor : _ref6$areaColor;
+      areaColor = _ref6$areaColor === void 0 ? defaultLineSeries.areaColor : _ref6$areaColor,
+      _ref6$url = _ref6.url,
+      url = _ref6$url === void 0 ? defaultLineSeries.url : _ref6$url,
+      _ref6$size = _ref6.size;
+  _ref6$size = _ref6$size === void 0 ? defaultLineSeries.size : _ref6$size;
+  var _ref6$size$width = _ref6$size.width,
+      urlWidth = _ref6$size$width === void 0 ? defaultLineSeries.size.width : _ref6$size$width,
+      _ref6$size$height = _ref6$size.height,
+      urlHeight = _ref6$size$height === void 0 ? defaultLineSeries.size.height : _ref6$size$height,
+      _ref6$opacity = _ref6.opacity,
+      opacity = _ref6$opacity === void 0 ? defaultLineSeries.opacity : _ref6$opacity;
   return {
@@ -637,2 +732,17 @@ name: name,
     }, {
+      name: "areaType",
+      displayName: "区域样式",
+      value: areaType,
+      type: 'radio',
+      config: {
+        options: [{
+          name: "颜色",
+          value: "color"
+        }, {
+          name: "纹理",
+          value: "pattern"
+        }]
+      }
+    }, {
+      rule: [['areaType', '$eq', 'color']],
       name: 'areaColor',
@@ -643,2 +753,41 @@ displayName: '区域颜色',
     }, {
+      rule: [['areaType', '$eq', 'pattern']],
+      name: "url",
+      displayName: "纹理图片",
+      value: url,
+      type: "uploadImage"
+    }, {
+      rule: [['areaType', '$eq', 'pattern']],
+      name: 'size',
+      displayName: '尺寸',
+      value: [{
+        name: 'width',
+        displayName: '宽度',
+        value: urlWidth,
+        config: {
+          span: 12,
+          suffix: 'W'
+        }
+      }, {
+        name: 'height',
+        displayName: '高度',
+        value: urlHeight,
+        config: {
+          span: 12,
+          suffix: 'H'
+        }
+      }],
+      type: 'group'
+    }, {
+      rule: [['areaType', '$eq', 'pattern']],
+      type: "range",
+      name: "opacity",
+      displayName: "透明度",
+      value: opacity,
+      config: {
+        max: 1,
+        min: 0,
+        step: 0.01
+      }
+    }, {
       name: 'line',
@@ -645,0 +794,0 @@ displayName: '折线',

package.json

 {
   "name": "@easyv/config",
-  "version": "1.0.47",
+  "version": "1.0.48",
   "description": "",
@@ -5,0 +5,0 @@ "main": "index.js",

src/label.js

@@ -158,7 +158,7 @@ import { translate, font, extent, showRule } from '.';
     },
-    lineColor !==undefined && {
-      name:"lineColor",
-      displayName:"线颜色",
-      value:lineColor,
-      type:"color"
+    lineColor !== undefined && {
+      name: "lineColor",
+      displayName: "线颜色",
+      value: lineColor,
+      type: "color"
     },
@@ -299,5 +299,5 @@ {
 }
-export const labelOfRose=({
+export const labelOfRose = ({
   show = defaultLabelOfRose.show,
-  font:labelFont = defaultLabelOfRose.font,
+  font: labelFont = defaultLabelOfRose.font,
   gap = defaultLabelOfRose.gap
@@ -323,8 +323,8 @@ } = defaultLabelOfRose) => ({
       ...showRule(),
-      name:"gap",
-      displayName:"间距",
-      value:gap,
-      type:"number",
-      config:{
-        suffix:"px"
+      name: "gap",
+      displayName: "间距",
+      value: gap,
+      type: "number",
+      config: {
+        suffix: "px"
       }
@@ -339,2 +339,3 @@ }
   appearance: { count: 3, angle: 0, wordBreak: 'keep-all' },
+  showLast: false,
   translate: { x: 0, y: 0 },
@@ -354,2 +355,3 @@ font: font({ color: 'rgba(230, 247, 255, 1)' }),
   } = defaultAxisLabel.appearance,
+  showLast = defaultAxisLabel.showLast,
   translate: {
@@ -581,2 +583,9 @@ x: labelTranslateX = defaultAxisLabel.translate.x,
     {
+      name: 'showLast',
+      displayName: '显示最新',
+      value: showLast,
+      type: 'boolean',
+      tip: '显示返回最新数据的轴标签',
+    },
+    {
       rule: [['show', '$eq', true]],
@@ -583,0 +592,0 @@ ...translate(labelTranslateX, labelTranslateY),

src/series.js

@@ -9,2 +9,3 @@ import { mapping, label, multiColor } from '.';
   stack: '',
+  fillImage: 'components/static-image/superChart/pattern.png',
   fill: {
@@ -40,2 +41,7 @@ type: 'linear',
   },
+  size: {
+    width: 10,
+    height: 10
+  },
+  opacity: 0.65
 };
@@ -53,2 +59,4 @@
     patternType,
+    fillType,
+    fillImage = defaultBandSeries.fillImage,
     patternWidth,
@@ -58,2 +66,7 @@ patternHeight,
     fill = defaultBandSeries.fill,
+    size: {
+      width: urlWidth = defaultBandSeries.size.width,
+      height: urlHeight = defaultBandSeries.size.height
+    } = defaultBandSeries.size,
+    opacity = defaultBandSeries.opacity,
     highlight: {
@@ -89,3 +102,16 @@ show: showHighlight = defaultBandSeries.highlight.show,
       },
-      {
+      fillType !== undefined && {
+        name: 'fillType',
+        displayName: '填充样式',
+        value: fillType,
+        type: 'radio',
+        config: {
+          options: [
+            { name: '颜色', value: 'color' },
+            { name: '纹理', value: 'pattern' },
+          ],
+        },
+      },
+      fillType !== undefined &&{
+        rule: [['fillType', '$eq', 'color']],
         name: 'fill',
@@ -96,3 +122,44 @@ displayName: '颜色',
       },
+      fillType !== undefined &&{
+        rule: [['fillType', '$eq', 'pattern']],
+        name: 'url',
+        displayName: '纹理图片',
+        type: 'uploadImage',
+        value: fillImage,
+      },
+      fillType !== undefined &&{
+        rule: [['fillType', '$eq', 'pattern']],
+        name: 'size',
+        displayName: '尺寸',
+        value: [
+          {
+            name: 'width',
+            displayName: '宽度',
+            value: urlWidth,
+            config: { span: 12, suffix: 'W' },
+          },
+          {
+            name: 'height',
+            displayName: '高度',
+            value: urlHeight,
+            config: { span: 12, suffix: 'H' },
+          },
+        ],
+        type: 'group',
+      },
+      fillType !== undefined &&{
+        rule: [['fillType', '$eq', 'pattern']],
+        type: "range",
+        name: "opacity",
+        displayName: "透明度",
+        value: opacity,
+        config: { max: 1, min: 0, step: 0.01 }
+      },
       patternType !== undefined && {
+        name: 'fill',
+        displayName: '颜色',
+        type: 'multicolor',
+        value: fill,
+      },
+      patternType !== undefined && {
         name: 'patternType',
@@ -201,2 +268,9 @@ displayName: '纹理类型',
   },
+  areaType: 'color',
+  size: {
+    width: 10,
+    height: 10
+  },
+  url: 'components/static-image/superChart/pattern.png',
+  opacity: 0.65,
   areaColor: {
@@ -574,3 +648,10 @@ type: 'linear',
     label: areaLabel = defaultLineSeries.label,
+    areaType = defaultLineSeries.areaType,
     areaColor = defaultLineSeries.areaColor,
+    url = defaultLineSeries.url,
+    size: {
+      width: urlWidth = defaultLineSeries.size.width,
+      height: urlHeight = defaultLineSeries.size.height
+    } = defaultLineSeries.size,
+    opacity = defaultLineSeries.opacity
   } = defaultLineSeries
@@ -595,2 +676,15 @@ ) => ({
     {
+      name: "areaType",
+      displayName: "区域样式",
+      value: areaType,
+      type: 'radio',
+      config: {
+        options: [
+          { name: "颜色", value: "color" },
+          { name: "纹理", value: "pattern" }
+        ]
+      }
+    },
+    {
+      rule: [['areaType', '$eq', 'color']],
       name: 'areaColor',
@@ -602,2 +696,39 @@ displayName: '区域颜色',
     {
+      rule: [
+        ['areaType', '$eq', 'pattern']
+      ],
+      name: "url",
+      displayName: "纹理图片",
+      value: url,
+      type: "uploadImage"
+    },
+    {
+      rule: [['areaType', '$eq', 'pattern']],
+      name: 'size',
+      displayName: '尺寸',
+      value: [
+        {
+          name: 'width',
+          displayName: '宽度',
+          value: urlWidth,
+          config: { span: 12, suffix: 'W' },
+        },
+        {
+          name: 'height',
+          displayName: '高度',
+          value: urlHeight,
+          config: { span: 12, suffix: 'H' },
+        },
+      ],
+      type: 'group',
+    },
+    {
+      rule: [['areaType', '$eq', 'pattern']],
+      type: "range",
+      name: "opacity",
+      displayName: "透明度",
+      value: opacity,
+      config: { max: 1, min: 0, step: 0.01 }
+    },
+    {
       name: 'line',
@@ -604,0 +735,0 @@ displayName: '折线',

No alert changes

Improved metrics

Total package byte prevSize

302633

2.8%

Lines of code

10533

2.91%

No dependency changes