@easyv/config 1.0.37 → 1.0.38

package/src/legend.js

@@ -1,4 +1,4 @@
-const { translate: translateConfig, font, show: showConfig } = require('.');
+const { translate: translateConfig, font, show: showConfig, showRule } = require('.');
 const defaultFont = font({
   fontFamily: 'Mircosoft Yahei',
   fontSize: 12,
@@ -283,6 +283,7 @@ export const legendOfPie = ({
   value: [
     showConfig(show),
     {
+      ...showRule(),
       name: 'order',
       displayName: '顺序',
       value: order,
@@ -296,6 +297,7 @@ export const legendOfPie = ({
       },
     },
     {
+      ...showRule(),
       name: 'iconSize',
       displayName: '图标尺寸',
       value: [
@@ -319,6 +321,7 @@ export const legendOfPie = ({
       type: 'group',
     },
     {
+      ...showRule(),
       name: 'iconGap',
       displayName: '间距',
       value: iconGap,
@@ -327,7 +330,7 @@ export const legendOfPie = ({
       },
     },
     {
-      rule: [['show', '$eq', true]],
+      ...showRule(),
       name: 'name',
       displayName: '类目',
       value: [
@@ -342,13 +345,13 @@ export const legendOfPie = ({
       ],
     },
     {
-      rule: [['show', '$eq', true]],
+      ...showRule(),
       name: 'percent',
       displayName: '占比值',
       value: [
         showConfig(showPercent),
         {
-          rule: [['show', '$eq', true]],
+          ...showRule(),
           name: 'precision',
           displayName: '小数位数',
           value: precision,
@@ -358,7 +361,7 @@ export const legendOfPie = ({
           },
         },
         {
-          rule: [['show', '$eq', true]],
+          ...showRule(),
           name: 'gap',
           displayName: '间距',
           value: percentGap,
@@ -368,14 +371,14 @@ export const legendOfPie = ({
           },
         },
         {
-          rule: [['show', '$eq', true]],
+          ...showRule(),
           name: 'sameColor',
           displayName: '颜色跟随',
           value: percentSameColor,
           type: 'boolean',
         },
         {
-          rule: [['show', '$eq', true]],
+          ...showRule(),
           name: 'font',
           displayName: '文本样式',
           value: percentFont,
@@ -384,13 +387,13 @@ export const legendOfPie = ({
       ],
     },
     {
-      rule: [['show', '$eq', true]],
+      ...showRule(),
       name: 'value',
       displayName: '真实值',
       value: [
         showConfig(showValue),
         {
-          rule: [['show', '$eq', true]],
+          ...showRule(),
           name: 'suffix',
           displayName: '后缀',
           value: [
@@ -401,14 +404,14 @@ export const legendOfPie = ({
               type: 'boolean',
             },
             {
-              rule: [['show', '$eq', true]],
+              ...showRule(),
               name: 'text',
               displayName: '内容',
               value: text,
               type: 'input',
             },
             {
-              rule: [['show', '$eq', true]],
+              ...showRule(),
               name: 'fontSize',
               displayName: '字号',
               value: fontSize,
@@ -418,7 +421,7 @@ export const legendOfPie = ({
               },
             },
             {
-              rule: [['show', '$eq', true]],
+              ...showRule(),
               ...translateConfig(suffixTranslateX, suffixTranslateY),
             },
           ],
@@ -427,7 +430,7 @@ export const legendOfPie = ({
           },
         },
         {
-          rule: [['show', '$eq', true]],
+          ...showRule(),
           name: 'gap',
           displayName: '间距',
           value: valueGap,
@@ -437,14 +440,14 @@ export const legendOfPie = ({
           },
         },
         {
-          rule: [['show', '$eq', true]],
+          ...showRule(),
           name: 'sameColor',
           displayName: '颜色跟随',
           value: valueSameColor,
           type: 'boolean',
         },
         {
-          rule: [['show', '$eq', true]],
+          ...showRule(),
           name: 'font',
           displayName: '文本样式',
           value: valueFont,
@@ -453,7 +456,7 @@ export const legendOfPie = ({
       ],
     },
     {
-      rule: [['show', '$eq', true]],
+      ...showRule(),
       name: 'layout',
       displayName: '布局',
       value: [

package/src/mutiColor.js

@@ -0,0 +1,31 @@
+const defaultMutiColor = {
+    type: 'linear',
+    pure: '#fff',
+    linear: {
+        stops: [
+            { offset: 0, color: '#fff' },
+            { offset: 50, color: '#ff0' },
+            { offset: 100, color: '#f0f' }
+        ],
+        angle: 30,
+        opacity: 1
+    }
+};
+export default ({
+    type = defaultMutiColor.type,
+    pure = defaultMutiColor.pure,
+    linear:{
+        stops = defaultMutiColor.linear.stops,
+        angle = defaultMutiColor.linear.angle,
+        opacity = defaultMutiColor.linear.opacity,
+    } = defaultMutiColor.linear
+} = defaultMutiColor) => ({
+    type,
+    pure,
+    linear:{
+        stops,
+        angle,
+        opacity
+    }
+});
+  

package/src/pie.js

@@ -1,4 +1,4 @@
-import { font, show as showConfig, translate as translateConfig } from './';
+import { font, show as showConfig, showRule, translate as translateConfig } from './';
 
 const defaultBasePie = {
   chart: {
@@ -8,7 +8,6 @@ const defaultBasePie = {
     padAngle: 2,
   },
 };
-
 const basePie = ({
   chart: {
     innerRadius = defaultBasePie.chart.innerRadius,
@@ -72,14 +71,15 @@ const basePie = ({
 const defaultCategoryText = {
   categoryText: {
       show:true,
-      font:font()
+      font:font(),
+      gap:10
   }
 }
-
 const categoryText=({
   categoryText: {
-    show = defaultCategoryText.show,
-    font = defaultCategoryText.font
+    show = defaultCategoryText.categoryText.show,
+    font = defaultCategoryText.categoryText.font,
+    gap = defaultCategoryText.categoryText.gap
   } = defaultCategoryText,
 })=>({
   name: 'categoryText',
@@ -92,11 +92,21 @@ const categoryText=({
       type: 'boolean',
     },
     {
-      rule: [['show', '$eq', true]],
+      ...showRule(),
       name: 'textStyle',
       displayName: '文本样式',
       value: font,
       type:"textStyle"
+    },
+    {
+      ...showRule(),
+      name: 'gap',
+      displayName: '间距',
+      value: gap,
+      type: 'number',
+      config:{
+        suffix:"px"
+      }
     }
   ]
 })
@@ -111,7 +121,6 @@ const defaultDecorate = {
     direction: 'clockwise',
   },
 };
-
 const decorate = ({
   decorate: {
     show = defaultDecorate.show,
@@ -208,7 +217,6 @@ const defaultDecorate2 = {
   radiusWidth: 0.3,
   opacity: 80,
 };
-
 const decorate2 = ({
   show = defaultDecorate2.show,
   radiusWidth = defaultDecorate2.radiusWidth,
@@ -249,6 +257,95 @@ const decorate2 = ({
   ]
 });
 
+const defaultOuterDecorate = {
+  color:"#CF00FF",
+  width:10,
+  tick:{
+    show:true,
+    count:12,
+    color:"#CF00FF",
+    width:3,
+    length:8
+  }
+}
+const outerDecorate=({
+  color = defaultOuterDecorate.color,
+  width = defaultOuterDecorate.width,
+  tick:{
+    show = defaultOuterDecorate.tick.show,
+    count = defaultOuterDecorate.tick.count,
+    color: tickColor = defaultOuterDecorate.tick.color,
+    width: tickWidth = defaultOuterDecorate.tick.width,
+    length = defaultOuterDecorate.tick.length
+  } = defaultOuterDecorate.tick
+} = defaultOuterDecorate)=>({
+  name: 'outerDecorate',
+  displayName: '外环装饰',
+  value: [
+    {
+      name: 'color',
+      displayName: '颜色',
+      value: color,
+      type: 'color'
+    },
+    {
+      name:"width",
+      displayName:"粗细",
+      value: width,
+      type: "number",
+      config:{
+        min:0,
+        max:100,
+        suffix:"px"
+      }
+    },
+    {
+      name: 'tick',
+      displayName: '刻度',
+      value: [
+        showConfig(show),
+        {
+          ...showRule(),
+          name:"count",
+          displayName:"个数",
+          value:count,
+          type:"number",
+          config:{
+            min:0
+          }
+        },
+        {
+          ...showRule(),
+          name:"color",
+          displayName:"颜色",
+          value:tickColor,
+          type:"color"
+        },
+        {
+          ...showRule(),
+          name:"width",
+          displayName:"粗细",
+          value:tickWidth,
+          type:"number",
+          config:{
+            suffix:"px"
+          }
+        },
+        {
+          ...showRule(),
+          name:"length",
+          displayName:"长度",
+          value:length,
+          type:"number",
+          config:{
+            suffix:"px"
+          }
+        }
+      ],
+    }
+  ]
+})
+
 const defaultCurrent = {
   current: {
     show: true,
@@ -273,7 +370,6 @@ const defaultCurrent = {
     },
   },
 };
-
 const current = ({
   current: {
     show = defaultCurrent.current.show,
@@ -427,6 +523,12 @@ export const rosePie = (_basePie = defaultBasePie) => ({
   value: [basePie(_basePie)],
 });
 
+export const rosePieDecorate = (_basePie = defaultBasePie, _outerDecorate = defaultOuterDecorate)=>({
+  name: ' fan',
+  displayName: '环图属性',
+  value:[basePie(_basePie),outerDecorate(_outerDecorate)]
+})
+
 export const donut = (
   {
     basePie: _basePie = defaultBasePie,

package/src/show.js

@@ -3,3 +3,9 @@ export default (show = false) => ({
   value: show,
   type: 'boolean',
 });
+
+export const showRule=(name="show",type="$eq",value=true)=>{
+  return {
+    rule:[[name,type,value]]
+  }
+}