@easyv/config 1.3.3 → 1.3.5

package/src/label.js

@@ -71,12 +71,15 @@ export default ({
       },
     },
     reverse !== undefined && {
-      rule: [["position", "$neq", "middle"], ["position", "$neq", "chartStart"]],
+      rule: [
+        ["position", "$neq", "middle"],
+        ["position", "$neq", "chartStart"],
+      ],
       name: "reverse",
       displayName: "负值反向",
       type: "boolean",
       value: reverse,
-      tip: "开启后负值的标签会与正值对称显示"
+      tip: "开启后负值的标签会与正值对称显示",
     },
     {
       _rule: [["show", "$eq", true]],
@@ -102,10 +105,20 @@ const defaultLabelOfPie = {
   distance: 30,
   lineLength: 10,
   mode: "horizontal",
-  align:"center",
+  align: "center",
   translate: { x: 0, y: 0 },
-  name: { show: true, font: defaultFont, maxWidth: 40, translate: { x: 0, y: 0 } },
-  percent: { show: true, precision: 0, font: defaultFont, translate: { x: 0, y: 0 } },
+  name: {
+    show: true,
+    font: defaultFont,
+    maxWidth: 40,
+    translate: { x: 0, y: 0 },
+  },
+  percent: {
+    show: true,
+    precision: 0,
+    font: defaultFont,
+    translate: { x: 0, y: 0 },
+  },
   value: {
     show: true,
     suffix: {
@@ -115,7 +128,7 @@ const defaultLabelOfPie = {
       translate: { x: 0, y: 0 },
     },
     font: defaultFont,
-    translate: { x: 0, y: 0 }
+    translate: { x: 0, y: 0 },
   },
 };
 export const labelOfPie = ({
@@ -131,20 +144,20 @@ export const labelOfPie = ({
     font: nameFont = defaultLabelOfPie.name.font,
     maxWidth = defaultLabelOfPie.name.maxWidth,
     overflow,
-    translate:{
-      x:nameX = defaultLabelOfPie.name.translate.x,
-      y:nameY = defaultLabelOfPie.name.translate.y
-    } = defaultLabelOfPie.name.translate
+    translate: {
+      x: nameX = defaultLabelOfPie.name.translate.x,
+      y: nameY = defaultLabelOfPie.name.translate.y,
+    } = defaultLabelOfPie.name.translate,
   } = defaultLabelOfPie.name,
   percent: {
     show: showPercent = defaultLabelOfPie.percent.show,
     precision = defaultLabelOfPie.percent.precision,
     sameColor: percentSameColor = defaultLabelOfPie.percent.sameColor,
     font: percentFont = defaultLabelOfPie.percent.font,
-    translate:{
-      x:percentX = defaultLabelOfPie.percent.translate.x,
-      y:percentY = defaultLabelOfPie.percent.translate.y
-    } = defaultLabelOfPie.percent.translate
+    translate: {
+      x: percentX = defaultLabelOfPie.percent.translate.x,
+      y: percentY = defaultLabelOfPie.percent.translate.y,
+    } = defaultLabelOfPie.percent.translate,
   } = defaultLabelOfPie.percent,
   value: {
     show: showValue = defaultLabelOfPie.value.show,
@@ -159,10 +172,10 @@ export const labelOfPie = ({
       } = defaultLabelOfPie.value.suffix.translate,
     } = defaultLabelOfPie.value.suffix,
     font: valueFont = defaultLabelOfPie.value.font,
-    translate:{
-      x:valueX = defaultLabelOfPie.value.translate.x,
-      y:valueY = defaultLabelOfPie.value.translate.y
-    } = defaultLabelOfPie.value.translate
+    translate: {
+      x: valueX = defaultLabelOfPie.value.translate.x,
+      y: valueY = defaultLabelOfPie.value.translate.y,
+    } = defaultLabelOfPie.value.translate,
   } = defaultLabelOfPie.value,
 } = defaultLabelOfPie) => ({
   name: "label",
@@ -222,19 +235,22 @@ export const labelOfPie = ({
       },
     },
     {
-      rule:[["show","$eq",true],["mode","$eq","vertical"]],
-      name:"align",
-      displayName:"对齐",
-      type:"radio",
-      value:"center",
-      config:{
-        mode:"icon",
-        options:[
-          { name:"左对齐", value:"left", icon:"align-left" },
-          { name:"居中对齐", value:"center", icon:"align-center" },
-          { name:"右对齐", value:"right", icon:"align-right" }
-        ]
-      }
+      rule: [
+        ["show", "$eq", true],
+        ["mode", "$eq", "vertical"],
+      ],
+      name: "align",
+      displayName: "对齐",
+      type: "radio",
+      value: "center",
+      config: {
+        mode: "icon",
+        options: [
+          { name: "左对齐", value: "left", icon: "align-left" },
+          { name: "居中对齐", value: "center", icon: "align-center" },
+          { name: "右对齐", value: "right", icon: "align-right" },
+        ],
+      },
     },
     {
       rule: [["show", "$eq", true]],
@@ -293,11 +309,11 @@ export const labelOfPie = ({
           },
         },
         {
-          "name": "sameColor",
-          "displayName": "颜色跟随",
-          "value": percentSameColor,
-          "type": "boolean"
-      },
+          name: "sameColor",
+          displayName: "颜色跟随",
+          value: percentSameColor,
+          type: "boolean",
+        },
         {
           rule: [["show", "$eq", true]],
           name: "font",
@@ -320,11 +336,11 @@ export const labelOfPie = ({
           type: "boolean",
         },
         {
-          rule: [['show', '$eq', true]],
-          name: 'sameColor',
-          displayName: '颜色跟随',
+          rule: [["show", "$eq", true]],
+          name: "sameColor",
+          displayName: "颜色跟随",
           value: valueSameColor,
-          type: 'boolean',
+          type: "boolean",
         },
         {
           rule: [["show", "$eq", true]],
@@ -416,7 +432,9 @@ export const labelOfRose = ({
 
 const defaultAxisLabel = {
   show: true,
-  format: { type: "date", showType: "MM月" },
+  type: "date",
+  showType: "MM月",
+  labelNum: "Fixed",
   appearance: {
     count: 3,
     angle: 0,
@@ -432,10 +450,9 @@ const defaultAxisLabel = {
 };
 export const axisLabel = ({
   show: showLabel = defaultAxisLabel.show,
-  format: {
-    type: labelType = defaultAxisLabel.format.type,
-    showType: labelShowType = defaultAxisLabel.format.showType,
-  } = defaultAxisLabel.format,
+  labelType: labelType = defaultAxisLabel.type,
+  labelNum: labelNum = defaultAxisLabel.labelNum,
+  showType: labelShowType = defaultAxisLabel.showType,
   appearance: {
     count = defaultAxisLabel.appearance.count,
     angle = defaultAxisLabel.appearance.angle,
@@ -465,187 +482,204 @@ export const axisLabel = ({
       rule: [["show", "$eq", true]],
       name: "format",
       displayName: "格式",
-      value: [
-        {
-          name: "type",
-          displayName: "",
-          value: labelType,
-          type: "radio",
-          config: {
-            options: [
-              {
-                name: "类目型",
-                value: "category",
-              },
-              {
-                name: "时间型",
-                value: "date",
-              },
-            ],
-            span: 24,
+      value: labelType,
+      type: "radio",
+      config: {
+        options: [
+          {
+            name: "类目型",
+            value: "category",
           },
-        },
-        {
-          rule: [["type", "$eq", "date"]],
-          name: "showType",
-          displayName: "",
-          value: labelShowType,
-          type: "select",
-          config: {
-            options: [
-              {
-                name: "2017年1月1日 08:00:00",
-                value: "YYYY年M月D日 HH:mm:ss",
-              },
-              {
-                name: "2017年01月01日 08:00:00",
-                value: "YYYY年MM月DD日 HH:mm:ss",
-              },
-              {
-                name: "2017-1-1 08:00:00",
-                value: "YYYY-M-D HH:mm:ss",
-              },
-              {
-                name: "2017-01-01 08:00:00",
-                value: "YYYY-MM-DD HH:mm:ss",
-              },
-              {
-                name: "2017.1.1 08:00:00",
-                value: "YYYY.M.D HH:mm:ss",
-              },
-              {
-                name: "2017.01.01 08:00:00",
-                value: "YYYY.MM.DD HH:mm:ss",
-              },
-              {
-                name: "2017年1月1日",
-                value: "YYYY年M月D日",
-              },
-              {
-                name: "2017年01月01日",
-                value: "YYYY年MM月DD日",
-              },
-              {
-                name: "2017年01月",
-                value: "YYYY年MM月",
-              },
-              {
-                name: "2017-1-1",
-                value: "YYYY-M-D",
-              },
-              {
-                name: "2017-01",
-                value: "YYYY-MM",
-              },
-              {
-                name: "2017-01-01",
-                value: "YYYY-MM-DD",
-              },
-              {
-                name: "2017.1.1",
-                value: "YYYY.M.D",
-              },
-              {
-                name: "2017.01.01",
-                value: "YYYY.MM.DD",
-              },
-              {
-                name: "2017年",
-                value: "YYYY年",
-              },
-              {
-                name: "2017(年)",
-                value: "YYYY(年)",
-              },
-              {
-                name: "1月1日",
-                value: "M月D日",
-              },
-              {
-                name: "01月01日",
-                value: "MM月DD日",
-              },
-              {
-                name: "01月01日01时",
-                value: "MM月DD日HH时",
-              },
-              {
-                name: "1-1",
-                value: "M-D",
-              },
-              {
-                name: "01-01",
-                value: "MM-DD",
-              },
-              {
-                name: "1.1",
-                value: "M.D",
-              },
-              {
-                name: "01.01",
-                value: "MM.DD",
-              },
-              {
-                name: "1月",
-                value: "M月",
-              },
-              {
-                name: "01月",
-                value: "MM月",
-              },
-              {
-                name: "1(月)",
-                value: "M",
-              },
-              {
-                name: "01(月)",
-                value: "MM",
-              },
-              {
-                name: "1日",
-                value: "D日",
-              },
-              {
-                name: "01日",
-                value: "DD日",
-              },
-              {
-                name: "1(日)",
-                value: "D",
-              },
-              {
-                name: "01(日)",
-                value: "DD",
-              },
-              {
-                name: "08:00:00",
-                value: "HH:mm:ss",
-              },
-              {
-                name: "08:00",
-                value: "HH:mm",
-              },
-              {
-                name: "星期一",
-                value: "X",
-              },
-              {
-                name: "Monday",
-                value: "W",
-              },
-              {
-                name: "Mon",
-                value: "w",
-              },
-            ],
-            span: 24,
+          {
+            name: "时间型",
+            value: "date",
           },
-        },
-      ],
-      type: "group",
+        ],
+        span: 24,
+      },
+    },
+    {
+      rule: [["format", "$eq", "date"]],
+      name: "showType",
+      displayName: "",
+      value: labelShowType,
+      type: "select",
+      config: {
+        options: [
+          {
+            name: "2017年1月1日 08:00:00",
+            value: "YYYY年M月D日 HH:mm:ss",
+          },
+          {
+            name: "2017年01月01日 08:00:00",
+            value: "YYYY年MM月DD日 HH:mm:ss",
+          },
+          {
+            name: "2017-1-1 08:00:00",
+            value: "YYYY-M-D HH:mm:ss",
+          },
+          {
+            name: "2017-01-01 08:00:00",
+            value: "YYYY-MM-DD HH:mm:ss",
+          },
+          {
+            name: "2017.1.1 08:00:00",
+            value: "YYYY.M.D HH:mm:ss",
+          },
+          {
+            name: "2017.01.01 08:00:00",
+            value: "YYYY.MM.DD HH:mm:ss",
+          },
+          {
+            name: "2017年1月1日",
+            value: "YYYY年M月D日",
+          },
+          {
+            name: "2017年01月01日",
+            value: "YYYY年MM月DD日",
+          },
+          {
+            name: "2017年01月",
+            value: "YYYY年MM月",
+          },
+          {
+            name: "2017-1-1",
+            value: "YYYY-M-D",
+          },
+          {
+            name: "2017-01",
+            value: "YYYY-MM",
+          },
+          {
+            name: "2017-01-01",
+            value: "YYYY-MM-DD",
+          },
+          {
+            name: "2017.1.1",
+            value: "YYYY.M.D",
+          },
+          {
+            name: "2017.01.01",
+            value: "YYYY.MM.DD",
+          },
+          {
+            name: "2017年",
+            value: "YYYY年",
+          },
+          {
+            name: "2017(年)",
+            value: "YYYY(年)",
+          },
+          {
+            name: "1月1日",
+            value: "M月D日",
+          },
+          {
+            name: "01月01日",
+            value: "MM月DD日",
+          },
+          {
+            name: "01月01日01时",
+            value: "MM月DD日HH时",
+          },
+          {
+            name: "1-1",
+            value: "M-D",
+          },
+          {
+            name: "01-01",
+            value: "MM-DD",
+          },
+          {
+            name: "1.1",
+            value: "M.D",
+          },
+          {
+            name: "01.01",
+            value: "MM.DD",
+          },
+          {
+            name: "1月",
+            value: "M月",
+          },
+          {
+            name: "01月",
+            value: "MM月",
+          },
+          {
+            name: "1(月)",
+            value: "M",
+          },
+          {
+            name: "01(月)",
+            value: "MM",
+          },
+          {
+            name: "1日",
+            value: "D日",
+          },
+          {
+            name: "01日",
+            value: "DD日",
+          },
+          {
+            name: "1(日)",
+            value: "D",
+          },
+          {
+            name: "01(日)",
+            value: "DD",
+          },
+          {
+            name: "08:00:00",
+            value: "HH:mm:ss",
+          },
+          {
+            name: "08:00",
+            value: "HH:mm",
+          },
+          {
+            name: "星期一",
+            value: "X",
+          },
+          {
+            name: "Monday",
+            value: "W",
+          },
+          {
+            name: "Mon",
+            value: "w",
+          },
+        ],
+        span: 24,
+      },
     },
     {
       rule: [["show", "$eq", true]],
+      type: "radio",
+      name: "labelNum",
+      displayName: "标签数量",
+      value: labelNum,
+      config: {
+        options: [
+          {
+            name: "固定",
+            value: "Fixed",
+          },
+          {
+            name: "自动",
+            value: "auto",
+          },
+        ],
+        span: 24,
+        mode: "normal",
+      },
+    },
+    {
+      rule: [
+        ["show", "$eq", true],
+        ["labelNum", "$eq", "Fixed"],
+      ],
       name: "appearance",
       displayName: "展示",
       tip: "展示标签的数量会根据原标签数量进行整除后按间距调整标签分布，如果输入的数量不能被整除，则无法按照输入数量进行展示。",
@@ -724,14 +758,15 @@ export const axisLabel = ({
           tip: "数据按时间自动排序展示",
         },
       },
-      showRule()
+      showRule("format", "$eq", "date")
     ),
-    sc(
-      "textAlign",
-      "对齐",
-      "radio",
-      textAlign,
-      {
+    {
+      rule: [["labelNum", "$eq", "Fixed"]],
+      type: "radio",
+      name: "textAlign",
+      displayName: "对齐",
+      value: textAlign,
+      config: {
         mode: "icon",
         options: [
           { name: "左对齐", value: "left", icon: "align-left" },
@@ -739,8 +774,7 @@ export const axisLabel = ({
           { name: "右对齐", value: "right", icon: "align-right" },
         ],
       },
-      showRule("show", "$eq", true)
-    ),
+    },
     {
       rule: [["show", "$eq", true]],
       ...translate(labelTranslateX, labelTranslateY),
@@ -1020,7 +1054,12 @@ export const valueAsixLabel = ({
         ["show", "$eq", true],
         ["numericalRangeModel", "$eq", "percentage"],
       ],
-      ...extent({ min: percentMin, max: percentMax, customSuffix: '%', customName: 'percentageExtent' }),
+      ...extent({
+        min: percentMin,
+        max: percentMax,
+        customSuffix: "%",
+        customName: "percentageExtent",
+      }),
     },
     {
       rule: [["show", "$eq", true]],