@easyv/config 1.0.46 → 1.0.47

package/lib/series.js

@@ -259,7 +259,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 +404,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 +434,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',

package/package.json

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

package/src/series.js

@@ -213,6 +213,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 +230,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 +351,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 +382,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],
@@ -589,17 +642,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',
 });