@easyv/config 1.3.5 → 1.3.6

package/lib/label.js

@@ -454,7 +454,6 @@ var defaultAxisLabel = {
   show: true,
   type: "date",
   showType: "MM月",
-  labelNum: "Fixed",
   appearance: {
     count: 3,
     angle: 0,
@@ -462,6 +461,7 @@ var defaultAxisLabel = {
     textOverflow: "ellipsis",
     speed: 5
   },
+  adaptive: false,
   showLast: false,
   autoSort: false,
   textAlign: "center",
@@ -479,8 +479,6 @@ var axisLabel = function axisLabel() {
     showLabel = _ref4$show === void 0 ? defaultAxisLabel.show : _ref4$show,
     _ref4$labelType = _ref4.labelType,
     labelType = _ref4$labelType === void 0 ? defaultAxisLabel.type : _ref4$labelType,
-    _ref4$labelNum = _ref4.labelNum,
-    labelNum = _ref4$labelNum === void 0 ? defaultAxisLabel.labelNum : _ref4$labelNum,
     _ref4$showType = _ref4.showType,
     labelShowType = _ref4$showType === void 0 ? defaultAxisLabel.showType : _ref4$showType,
     _ref4$appearance = _ref4.appearance;
@@ -495,6 +493,8 @@ var axisLabel = function axisLabel() {
     textOverflow = _ref4$appearance$text === void 0 ? defaultAxisLabel.appearance.textOverflow : _ref4$appearance$text,
     _ref4$appearance$spee = _ref4$appearance.speed,
     speed = _ref4$appearance$spee === void 0 ? defaultAxisLabel.appearance.speed : _ref4$appearance$spee,
+    _ref4$adaptive = _ref4.adaptive,
+    adaptive = _ref4$adaptive === void 0 ? defaultAxisLabel.adaptive : _ref4$adaptive,
     _ref4$showLast = _ref4.showLast,
     showLast = _ref4$showLast === void 0 ? defaultAxisLabel.showLast : _ref4$showLast,
     _ref4$autoSort = _ref4.autoSort,
@@ -653,23 +653,12 @@ var axisLabel = function axisLabel() {
       }
     }, {
       rule: [["show", "$eq", true]],
-      type: "radio",
-      name: "labelNum",
-      displayName: "标签数量",
-      value: labelNum,
-      config: {
-        options: [{
-          name: "固定",
-          value: "Fixed"
-        }, {
-          name: "自动",
-          value: "auto"
-        }],
-        span: 24,
-        mode: "normal"
-      }
+      name: "adaptive",
+      displayName: "刻度自适应",
+      value: adaptive,
+      type: "boolean"
     }, {
-      rule: [["show", "$eq", true], ["labelNum", "$eq", "Fixed"]],
+      rule: [["show", "$eq", true], ["adaptive", "$eq", false]],
       name: "appearance",
       displayName: "展示",
       tip: "展示标签的数量会根据原标签数量进行整除后按间距调整标签分布，如果输入的数量不能被整除，则无法按照输入数量进行展示。",
@@ -740,7 +729,7 @@ var axisLabel = function axisLabel() {
         tip: "数据按时间自动排序展示"
       }
     }, (0, _.showRule)("format", "$eq", "date")), {
-      rule: [["labelNum", "$eq", "Fixed"]],
+      rule: [["adaptive", "$eq", false]],
       type: "radio",
       name: "textAlign",
       displayName: "对齐",

package/package.json

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

package/src/label.js

@@ -434,7 +434,6 @@ const defaultAxisLabel = {
   show: true,
   type: "date",
   showType: "MM月",
-  labelNum: "Fixed",
   appearance: {
     count: 3,
     angle: 0,
@@ -442,6 +441,7 @@ const defaultAxisLabel = {
     textOverflow: "ellipsis",
     speed: 5,
   },
+  adaptive:false,
   showLast: false,
   autoSort: false,
   textAlign: "center",
@@ -451,7 +451,6 @@ const defaultAxisLabel = {
 export const axisLabel = ({
   show: showLabel = defaultAxisLabel.show,
   labelType: labelType = defaultAxisLabel.type,
-  labelNum: labelNum = defaultAxisLabel.labelNum,
   showType: labelShowType = defaultAxisLabel.showType,
   appearance: {
     count = defaultAxisLabel.appearance.count,
@@ -460,6 +459,7 @@ export const axisLabel = ({
     textOverflow = defaultAxisLabel.appearance.textOverflow,
     speed = defaultAxisLabel.appearance.speed,
   } = defaultAxisLabel.appearance,
+  adaptive=defaultAxisLabel.adaptive,
   showLast = defaultAxisLabel.showLast,
   autoSort = defaultAxisLabel.autoSort,
   textAlign = defaultAxisLabel.textAlign,
@@ -655,30 +655,17 @@ export const axisLabel = ({
       },
     },
     {
-      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]
+      ],
+      name: "adaptive",
+      displayName: "刻度自适应",
+      value: adaptive,
+      type: "boolean"
     },
     {
       rule: [
-        ["show", "$eq", true],
-        ["labelNum", "$eq", "Fixed"],
+        ["show", "$eq", true],["adaptive", "$eq", false]
       ],
       name: "appearance",
       displayName: "展示",
@@ -761,7 +748,7 @@ export const axisLabel = ({
       showRule("format", "$eq", "date")
     ),
     {
-      rule: [["labelNum", "$eq", "Fixed"]],
+      rule: [["adaptive", "$eq", false]],
       type: "radio",
       name: "textAlign",
       displayName: "对齐",