@easyv/config 1.0.46 → 1.0.50

package/lib/label.js

@@ -384,6 +384,7 @@ var defaultAxisLabel = {
     angle: 0,
     wordBreak: 'keep-all'
   },
+  showLast: false,
   translate: {
     x: 0,
     y: 0
@@ -412,6 +413,8 @@ var axisLabel = function axisLabel() {
       angle = _ref4$appearance$angl === void 0 ? defaultAxisLabel.appearance.angle : _ref4$appearance$angl,
       _ref4$appearance$word = _ref4$appearance.wordBreak,
       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;
   _ref4$translate = _ref4$translate === void 0 ? defaultAxisLabel.translate : _ref4$translate;
   var _ref4$translate$x = _ref4$translate.x,
@@ -595,6 +598,12 @@ var axisLabel = function axisLabel() {
         }
       }],
       type: 'group'
+    }, {
+      name: 'showLast',
+      displayName: '显示最新',
+      value: showLast,
+      type: 'boolean',
+      tip: '显示返回最新数据的轴标签'
     }, _objectSpread({
       rule: [['show', '$eq', true]]
     }, (0, _.translate)(labelTranslateX, labelTranslateY)), {

package/lib/series.js

@@ -18,7 +18,7 @@ var _mapping = {
 var defaultBandSeries = {
   mapping: _mapping,
   yOrZ: 'y',
-  stack: '',
+  fillImage: 'components/static-image/superChart/pattern.png',
   fill: {
     type: 'linear',
     pure: '#fff',
@@ -58,7 +58,12 @@ var defaultBandSeries = {
         opacity: 1
       }
     }
-  }
+  },
+  size: {
+    width: 10,
+    height: 10
+  },
+  opacity: 0.65
 };
 
 var bandSeries = function bandSeries() {
@@ -76,11 +81,22 @@ var bandSeries = function bandSeries() {
       yOrZ = _ref$yOrZ === void 0 ? defaultBandSeries.yOrZ : _ref$yOrZ,
       stack = _ref.stack,
       patternType = _ref.patternType,
+      fillType = _ref.fillType,
+      _ref$fillImage = _ref.fillImage,
+      fillImage = _ref$fillImage === void 0 ? defaultBandSeries.fillImage : _ref$fillImage,
       patternWidth = _ref.patternWidth,
       patternHeight = _ref.patternHeight,
       patternImage = _ref.patternImage,
       _ref$fill = _ref.fill,
       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;
   _ref$highlight = _ref$highlight === void 0 ? defaultBandSeries.highlight : _ref$highlight;
   var _ref$highlight$show = _ref$highlight.show,
@@ -114,7 +130,66 @@ var bandSeries = function bandSeries() {
       displayName: '堆叠',
       value: stack,
       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',
+      displayName: '颜色',
+      type: 'multicolor',
+      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 || fillType === undefined) && {
       name: 'fill',
       displayName: '颜色',
       type: 'multicolor',
@@ -228,6 +303,13 @@ var defaultLineSeries = {
       unitStep: 1
     }
   },
+  areaType: 'color',
+  size: {
+    width: 10,
+    height: 10
+  },
+  url: 'components/static-image/superChart/pattern.png',
+  opacity: 0.65,
   areaColor: {
     type: 'linear',
     pure: '#fff',
@@ -259,7 +341,12 @@ var defaultIcon = {
     radius: 6
   },
   color: '#1283E3',
-  radius: 4
+  radius: 4,
+  image: 'components/static-image/superChart/fang.png',
+  size: {
+    width: 10,
+    height: 10
+  }
 };
 
 var commonLine = function commonLine() {
@@ -399,7 +486,15 @@ var icon = function icon() {
       _ref4$color = _ref4.color,
       color = _ref4$color === void 0 ? defaultIcon.color : _ref4$color,
       _ref4$radius = _ref4.radius,
-      radius = _ref4$radius === void 0 ? defaultIcon.radius : _ref4$radius;
+      radius = _ref4$radius === void 0 ? defaultIcon.radius : _ref4$radius,
+      _ref4$image = _ref4.image,
+      image = _ref4$image === void 0 ? defaultIcon.image : _ref4$image,
+      _ref4$size = _ref4.size;
+  _ref4$size = _ref4$size === void 0 ? defaultIcon.size : _ref4$size;
+  var _ref4$size$width = _ref4$size.width,
+      imageWidth = _ref4$size$width === void 0 ? defaultIcon.size.width : _ref4$size$width,
+      _ref4$size$height = _ref4$size.height,
+      imageHeight = _ref4$size$height === void 0 ? defaultIcon.size.height : _ref4$size$height;
   return {
     name: 'icon',
     displayName: '数据标记',
@@ -421,8 +516,39 @@ var icon = function icon() {
         }, {
           name: '双圆',
           value: 'double'
+        }, {
+          name: '自定义',
+          value: 'custom'
         }]
       }
+    }, {
+      rule: [['show', '$eq', true], ['mode', '$eq', 'custom']],
+      name: 'image',
+      displayName: '图片',
+      value: image,
+      type: 'uploadImage'
+    }, {
+      rule: [['show', '$eq', true], ['mode', '$eq', 'custom']],
+      name: 'size',
+      displayName: '尺寸',
+      value: [{
+        name: 'width',
+        displayName: '宽度',
+        value: imageWidth,
+        config: {
+          span: 12,
+          suffix: 'W'
+        }
+      }, {
+        name: 'height',
+        displayName: '高度',
+        value: imageHeight,
+        config: {
+          span: 12,
+          suffix: 'H'
+        }
+      }],
+      type: 'group'
     }, {
       rule: [['show', '$eq', true], ['mode', '$eq', 'double']],
       name: 'inner',
@@ -559,8 +685,20 @@ var areaSeries = function areaSeries() {
       lineLighter = _ref6$line.lighter,
       _ref6$label = _ref6.label,
       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 {
     name: name,
     displayName: '系列',
@@ -582,10 +720,64 @@ var areaSeries = function areaSeries() {
         }]
       }
     }, {
+      name: "areaType",
+      displayName: "区域样式",
+      value: areaType,
+      type: 'radio',
+      config: {
+        options: [{
+          name: "颜色",
+          value: "color"
+        }, {
+          name: "纹理",
+          value: "pattern"
+        }]
+      }
+    }, {
+      rule: [['areaType', '$eq', 'color']],
       name: 'areaColor',
       displayName: '区域颜色',
       type: 'multicolor',
       value: areaColor
+    }, {
+      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',
       displayName: '折线',

package/package.json

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

package/src/label.js

@@ -155,11 +155,11 @@ export const labelOfPie = ({
         step: 1,
       },
     },
-    lineColor !==undefined && {
-      name:"lineColor",
-      displayName:"线颜色",
-      value:lineColor,
-      type:"color"
+    lineColor !== undefined && {
+      name: "lineColor",
+      displayName: "线颜色",
+      value: lineColor,
+      type: "color"
     },
     {
       rule: [['show', '$eq', true]],
@@ -295,9 +295,9 @@ const defaultLabelOfRose = {
   font: defaultFont,
   gap: 10,
 }
-export const labelOfRose=({
+export const labelOfRose = ({
   show = defaultLabelOfRose.show,
-  font:labelFont = defaultLabelOfRose.font,
+  font: labelFont = defaultLabelOfRose.font,
   gap = defaultLabelOfRose.gap
 } = defaultLabelOfRose) => ({
   name: 'label',
@@ -318,12 +318,12 @@ export const labelOfRose=({
     },
     {
       ...showRule(),
-      name:"gap",
-      displayName:"间距",
-      value:gap,
-      type:"number",
-      config:{
-        suffix:"px"
+      name: "gap",
+      displayName: "间距",
+      value: gap,
+      type: "number",
+      config: {
+        suffix: "px"
       }
     }
   ],
@@ -333,6 +333,7 @@ const defaultAxisLabel = {
   show: true,
   format: { type: 'date', showType: 'MM月' },
   appearance: { count: 3, angle: 0, wordBreak: 'keep-all' },
+  showLast: false,
   translate: { x: 0, y: 0 },
   font: font({ color: 'rgba(230, 247, 255, 1)' }),
 };
@@ -347,6 +348,7 @@ export const axisLabel = ({
     angle = defaultAxisLabel.appearance.angle,
     wordBreak = defaultAxisLabel.appearance.wordBreak,
   } = defaultAxisLabel.appearance,
+  showLast = defaultAxisLabel.showLast,
   translate: {
     x: labelTranslateX = defaultAxisLabel.translate.x,
     y: labelTranslateY = defaultAxisLabel.translate.y,
@@ -572,6 +574,13 @@ export const axisLabel = ({
       ],
       type: 'group',
     },
+    {
+      name: 'showLast',
+      displayName: '显示最新',
+      value: showLast,
+      type: 'boolean',
+      tip: '显示返回最新数据的轴标签',
+    },
     {
       rule: [['show', '$eq', true]],
       ...translate(labelTranslateX, labelTranslateY),

package/src/series.js

@@ -5,7 +5,7 @@ const _mapping = { fieldName: '', displayName: '' };
 const defaultBandSeries = {
   mapping: _mapping,
   yOrZ: 'y',
-  stack: '',
+  fillImage: 'components/static-image/superChart/pattern.png',
   fill: {
     type: 'linear',
     pure: '#fff',
@@ -36,6 +36,11 @@ const defaultBandSeries = {
       },
     },
   },
+  size: {
+    width: 10,
+    height: 10
+  },
+  opacity: 0.65
 };
 
 export const bandSeries = (
@@ -48,10 +53,17 @@ export const bandSeries = (
     yOrZ = defaultBandSeries.yOrZ,
     stack,
     patternType,
+    fillType,
+    fillImage = defaultBandSeries.fillImage,
     patternWidth,
     patternHeight,
     patternImage,
     fill = defaultBandSeries.fill,
+    size: {
+      width: urlWidth = defaultBandSeries.size.width,
+      height: urlHeight = defaultBandSeries.size.height
+    } = defaultBandSeries.size,
+    opacity = defaultBandSeries.opacity,
     highlight: {
       show: showHighlight = defaultBandSeries.highlight.show,
       extent: highlightExtent = defaultBandSeries.highlight.extent,
@@ -82,7 +94,61 @@ export const bandSeries = (
         value: stack,
         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',
+        displayName: '颜色',
+        type: 'multicolor',
+        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 || fillType === undefined) && {
         name: 'fill',
         displayName: '颜色',
         type: 'multicolor',
@@ -192,6 +258,13 @@ const defaultLineSeries = {
       unitStep: 1,
     },
   },
+  areaType: 'color',
+  size: {
+    width: 10,
+    height: 10
+  },
+  url: 'components/static-image/superChart/pattern.png',
+  opacity: 0.65,
   areaColor: {
     type: 'linear',
     pure: '#fff',
@@ -213,6 +286,11 @@ const defaultIcon = {
   outer: { color: 'rgba(24,144,255,0.4)', radius: 6 },
   color: '#1283E3',
   radius: 4,
+  image: 'components/static-image/superChart/fang.png',
+  size: {
+    width: 10,
+    height: 10
+  }
 };
 
 const commonLine = (
@@ -225,64 +303,64 @@ const commonLine = (
     connectNulls = defaultLineSeries.line.connectNulls,
   } = defaultLineSeries.line
 ) => [
-  {
-    name: 'type',
-    displayName: '类型',
-    value: type,
-    type: 'select',
-    config: {
-      options: [
-        {
-          name: '实线',
-          value: 'solid',
-        },
-        {
-          name: '虚线',
-          value: 'dash',
-        },
-      ],
+    {
+      name: 'type',
+      displayName: '类型',
+      value: type,
+      type: 'select',
+      config: {
+        options: [
+          {
+            name: '实线',
+            value: 'solid',
+          },
+          {
+            name: '虚线',
+            value: 'dash',
+          },
+        ],
+      },
     },
-  },
-  {
-    name: 'color',
-    displayName: '颜色',
-    value: color,
-    type: 'color',
-  },
-  {
-    name: 'lineWidth',
-    displayName: '粗细',
-    value: lineWidth,
-    type: 'input',
-    config: {
-      suffix: 'px',
+    {
+      name: 'color',
+      displayName: '颜色',
+      value: color,
+      type: 'color',
     },
-  },
-  {
-    name: 'curve',
-    displayName: '曲线',
-    value: curve,
-    type: 'boolean',
-  },
-  {
-    rule: [['curve', '$eq', true]],
-    name: 'tension',
-    displayName: '曲线张力',
-    value: tension,
-    type: 'range',
-    config: {
-      min: 0,
-      max: 1,
-      step: 0.1,
+    {
+      name: 'lineWidth',
+      displayName: '粗细',
+      value: lineWidth,
+      type: 'input',
+      config: {
+        suffix: 'px',
+      },
     },
-  },
-  {
-    name: 'connectNulls',
-    displayName: 'null值连接',
-    value: connectNulls,
-    type: 'boolean',
-  },
-];
+    {
+      name: 'curve',
+      displayName: '曲线',
+      value: curve,
+      type: 'boolean',
+    },
+    {
+      rule: [['curve', '$eq', true]],
+      name: 'tension',
+      displayName: '曲线张力',
+      value: tension,
+      type: 'range',
+      config: {
+        min: 0,
+        max: 1,
+        step: 0.1,
+      },
+    },
+    {
+      name: 'connectNulls',
+      displayName: 'null值连接',
+      value: connectNulls,
+      type: 'boolean',
+    },
+  ];
 
 const lighter = (
   {
@@ -346,6 +424,11 @@ const icon = ({
   } = defaultIcon.outer,
   color = defaultIcon.color,
   radius = defaultIcon.radius,
+  image = defaultIcon.image,
+  size: {
+    width: imageWidth = defaultIcon.size.width,
+    height: imageHeight = defaultIcon.size.height
+  } = defaultIcon.size
 } = defaultIcon) => ({
   name: 'icon',
   displayName: '数据标记',
@@ -372,9 +455,52 @@ const icon = ({
             name: '双圆',
             value: 'double',
           },
+          {
+            name: '自定义',
+            value: 'custom',
+          },
         ],
       },
     },
+    {
+      rule: [
+        ['show', '$eq', true],
+        ['mode', '$eq', 'custom'],
+      ],
+      name: 'image',
+      displayName: '图片',
+      value: image,
+      type: 'uploadImage',
+    },
+    {
+      rule: [
+        ['show', '$eq', true],
+        ['mode', '$eq', 'custom'],
+      ],
+      name: 'size',
+      displayName: '尺寸',
+      value: [
+        {
+          name: 'width',
+          displayName: '宽度',
+          value: imageWidth,
+          config: {
+            span: 12,
+            suffix: 'W',
+          },
+        },
+        {
+          name: 'height',
+          displayName: '高度',
+          value: imageHeight,
+          config: {
+            span: 12,
+            suffix: 'H',
+          },
+        },
+      ],
+      type: 'group',
+    },
     {
       rule: [
         ['show', '$eq', true],
@@ -511,7 +637,14 @@ export const areaSeries = (
       lighter: lineLighter,
     } = defaultLineSeries.line,
     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
 ) => ({
   name,
@@ -531,11 +664,61 @@ export const areaSeries = (
       },
     },
     {
+      name: "areaType",
+      displayName: "区域样式",
+      value: areaType,
+      type: 'radio',
+      config: {
+        options: [
+          { name: "颜色", value: "color" },
+          { name: "纹理", value: "pattern" }
+        ]
+      }
+    },
+    {
+      rule: [['areaType', '$eq', 'color']],
       name: 'areaColor',
       displayName: '区域颜色',
       type: 'multicolor',
       value: areaColor,
     },
+    {
+      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',
       displayName: '折线',
@@ -589,17 +772,17 @@ export const pieSeries = (
     mapping({ fieldName, displayName }),
     {
       name: 'color',
-      displayName: currentColor !=undefined?'默认颜色':'颜色',
+      displayName: currentColor != undefined ? '默认颜色' : '颜色',
       type: 'multicolor',
       value: multiColor(color),
     },
-    currentColor !=undefined && {
+    currentColor != undefined && {
       name: 'currentColor',
       displayName: '当前颜色',
-      type:"multicolor",
+      type: "multicolor",
       value: multiColor(currentColor)
     }
-  ].filter((item)=>!!item),
+  ].filter((item) => !!item),
   type: 'object',
 });