@easyv/config 1.3.3 → 1.3.5

package/lib/axes.js

@@ -12,20 +12,20 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var defaultFont = (0, _.font)();
 var defaultFontAxisY = (0, _.font)({
-  color: 'rgba(230, 247, 255, 1)'
+  color: "rgba(230, 247, 255, 1)"
 });
 var defaultCategoryAxis = {
   on: true,
   label: {
     show: true,
     format: {
-      type: 'date',
-      showType: 'MM月'
+      type: "date",
+      showType: "MM月"
     },
     appearance: {
       count: 3,
       angle: 0,
-      wordBreak: 'keep-all'
+      wordBreak: "keep-all"
     },
     translate: {
       x: 0,
@@ -35,19 +35,19 @@ var defaultCategoryAxis = {
   },
   axisLine: {
     show: true,
-    color: '#BAE7FF',
+    color: "#BAE7FF",
     lineWidth: 1
   },
   tickLine: {
     show: false,
-    color: 'rgba(186,231,255,1)',
+    color: "rgba(186,231,255,1)",
     lineWidth: 1,
     tickSize: 6
   },
   gridLine: {
     show: true,
-    strokeDasharray: '3,3',
-    color: 'rgba(230, 247, 255, 0.2)',
+    strokeDasharray: "3,3",
+    color: "rgba(230, 247, 255, 0.2)",
     lineWidth: 1
   }
 };
@@ -64,18 +64,18 @@ var categoryAxis = function categoryAxis() {
     _ref$gridLine = _ref.gridLine,
     gridLine_ = _ref$gridLine === void 0 ? defaultCategoryAxis.gridLine : _ref$gridLine;
   return [{
-    name: 'on',
-    displayName: '启用',
+    name: "on",
+    displayName: "启用",
     value: on,
-    type: 'boolean'
+    type: "boolean"
   }, _objectSpread({
-    rule: [['on', '$eq', true]]
+    rule: [["on", "$eq", true]]
   }, (0, _label.axisLabel)(label)), _objectSpread({
-    rule: [['on', '$eq', true]]
+    rule: [["on", "$eq", true]]
   }, (0, _.axisLine)(axisLine_)), _objectSpread({
-    rule: [['on', '$eq', true]]
+    rule: [["on", "$eq", true]]
   }, (0, _.tickLine)(tickLine_)), _objectSpread({
-    rule: [['on', '$eq', true]]
+    rule: [["on", "$eq", true]]
   }, (0, _.gridLine)(gridLine_))];
 };
 exports.categoryAxis = categoryAxis;
@@ -84,15 +84,15 @@ var defaultValueAxis = {
   label: {
     show: true,
     extent: {
-      min: '0',
-      max: ''
+      min: "0",
+      max: ""
     },
-    auto: false,
-    mode: 'count',
+    auto: true,
+    mode: "count",
     count: 3,
     step: 100,
     decimal: 0,
-    suffix: '',
+    suffix: "",
     translate: {
       x: 6,
       y: 0
@@ -101,7 +101,7 @@ var defaultValueAxis = {
   },
   unit: {
     show: false,
-    text: '单位',
+    text: "单位",
     font: defaultFont,
     translate: {
       x: 0,
@@ -110,19 +110,19 @@ var defaultValueAxis = {
   },
   axisLine: {
     show: true,
-    color: '#BAE7FF',
+    color: "#BAE7FF",
     lineWidth: 1
   },
   tickLine: {
     show: true,
-    color: 'rgba(186,231,255,1)',
+    color: "rgba(186,231,255,1)",
     lineWidth: 1,
     tickSize: 6
   },
   gridLine: {
     show: true,
-    strokeDasharray: '3,3',
-    color: 'rgba(230, 247, 255, 0.2)',
+    strokeDasharray: "3,3",
+    color: "rgba(230, 247, 255, 0.2)",
     lineWidth: 1
   }
 };
@@ -147,10 +147,10 @@ var valueAxis = function valueAxis() {
     _ref2$gridLine = _ref2.gridLine,
     gridLine_ = _ref2$gridLine === void 0 ? defaultValueAxis.gridLine : _ref2$gridLine;
   return [{
-    name: 'on',
-    displayName: '启用',
+    name: "on",
+    displayName: "启用",
     value: on,
-    type: 'boolean'
+    type: "boolean"
   }, reverse != undefined && (0, _.sc)("reverse", "反转", "boolean", reverse), openClip != undefined && (0, _.sc)("openClip", "开启断轴", "boolean", false), clipAxis != undefined && (0, _.sc)("clipAxis", "轴段区间", "array", [(0, _.sc)("range1", "区间", "object", [(0, _.sc)("value", "区间值", "number", 50), (0, _.sc)("offset", "高度占比", "range", 25)]), (0, _.sc)("range2", "区间", "object", [(0, _.sc)("value", "区间值", "number", 100), (0, _.sc)("offset", "高度占比", "range", 50)]), (0, _.sc)("range3", "区间", "object", [(0, _.sc)("value", "区间值", "number", 1000), (0, _.sc)("offset", "高度占比", "range", 75)])], {
     template: (0, _.sc)("range", "区间", "object", [(0, _.sc)("value", "区间值", "number", 0), (0, _.sc)("offset", "高度占比", "range", 0)]),
     other: {
@@ -159,17 +159,17 @@ var valueAxis = function valueAxis() {
   }, {
     rule: [["openClip", "$eq", true]]
   }), openClipAxis === true && _objectSpread(_objectSpread({}, (0, _label.valueCilpAsixLabel)()), {}, {
-    rule: [['on', '$eq', true]]
+    rule: [["on", "$eq", true]]
   }), (openClipAxis === false || !!!openClipAxis) && _objectSpread({
-    rule: [['on', '$eq', true]]
+    rule: [["on", "$eq", true]]
   }, (0, _label.valueAsixLabel)(label)), _objectSpread({
-    rule: [['on', '$eq', true]]
+    rule: [["on", "$eq", true]]
   }, (0, _.unit)(unit_)), _objectSpread({
-    rule: [['on', '$eq', true]]
+    rule: [["on", "$eq", true]]
   }, (0, _.axisLine)(axisLine_)), _objectSpread({
-    rule: [['on', '$eq', true]]
+    rule: [["on", "$eq", true]]
   }, (0, _.tickLine)(tickLine_)), _objectSpread({
-    rule: [['on', '$eq', true]]
+    rule: [["on", "$eq", true]]
   }, (0, _.gridLine)(gridLine_))].filter(function (item) {
     return !!item;
   });
@@ -186,27 +186,27 @@ var _default = function _default() {
     yAxis = _ref3$yAxis === void 0 ? defaultValueAxis : _ref3$yAxis,
     zAxis = _ref3.zAxis;
   return {
-    name: 'axes',
-    displayName: '坐标轴',
+    name: "axes",
+    displayName: "坐标轴",
     value: [{
-      name: 'xAxis',
-      displayName: 'X轴',
+      name: "xAxis",
+      displayName: "X轴",
       value: categoryAxis(xAxis)
     }, {
-      name: 'yAxis',
-      displayName: 'Y轴',
+      name: "yAxis",
+      displayName: "Y轴",
       value: valueAxis(yAxis)
     }, zAxis && {
-      name: 'zAxis',
-      displayName: 'Z轴',
+      name: "zAxis",
+      displayName: "Z轴",
       value: valueAxis(zAxis)
     }].filter(function (item) {
       return !!item;
     }),
     config: {
-      layout: 'horizontal'
+      layout: "horizontal"
     },
-    type: 'menu'
+    type: "menu"
   };
 };
 exports["default"] = _default;

package/lib/label.js

@@ -344,10 +344,10 @@ var labelOfPie = function labelOfPie() {
           min: 0
         }
       }, {
-        "name": "sameColor",
-        "displayName": "颜色跟随",
-        "value": percentSameColor,
-        "type": "boolean"
+        name: "sameColor",
+        displayName: "颜色跟随",
+        value: percentSameColor,
+        type: "boolean"
       }, {
         rule: [["show", "$eq", true]],
         name: "font",
@@ -365,11 +365,11 @@ var labelOfPie = function labelOfPie() {
         value: showValue,
         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]],
         name: "suffix",
@@ -452,10 +452,9 @@ var labelOfRose = function labelOfRose() {
 exports.labelOfRose = labelOfRose;
 var defaultAxisLabel = {
   show: true,
-  format: {
-    type: "date",
-    showType: "MM月"
-  },
+  type: "date",
+  showType: "MM月",
+  labelNum: "Fixed",
   appearance: {
     count: 3,
     angle: 0,
@@ -478,12 +477,12 @@ var axisLabel = function axisLabel() {
   var _ref4 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : defaultAxisLabel,
     _ref4$show = _ref4.show,
     showLabel = _ref4$show === void 0 ? defaultAxisLabel.show : _ref4$show,
-    _ref4$format = _ref4.format;
-  _ref4$format = _ref4$format === void 0 ? defaultAxisLabel.format : _ref4$format;
-  var _ref4$format$type = _ref4$format.type,
-    labelType = _ref4$format$type === void 0 ? defaultAxisLabel.format.type : _ref4$format$type,
-    _ref4$format$showType = _ref4$format.showType,
-    labelShowType = _ref4$format$showType === void 0 ? defaultAxisLabel.format.showType : _ref4$format$showType,
+    _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;
   _ref4$appearance = _ref4$appearance === void 0 ? defaultAxisLabel.appearance : _ref4$appearance;
   var _ref4$appearance$coun = _ref4$appearance.count,
@@ -522,143 +521,155 @@ var axisLabel = function 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
-        }
-      }, {
-        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
-        }
-      }],
-      type: "group"
+      value: labelType,
+      type: "radio",
+      config: {
+        options: [{
+          name: "类目型",
+          value: "category"
+        }, {
+          name: "时间型",
+          value: "date"
+        }],
+        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: "展示标签的数量会根据原标签数量进行整除后按间距调整标签分布，如果输入的数量不能被整除，则无法按照输入数量进行展示。",
@@ -728,22 +739,29 @@ var axisLabel = function axisLabel() {
       other: {
         tip: "数据按时间自动排序展示"
       }
-    }, (0, _.showRule)()), (0, _.sc)("textAlign", "对齐", "radio", textAlign, {
-      mode: "icon",
-      options: [{
-        name: "左对齐",
-        value: "left",
-        icon: "align-left"
-      }, {
-        name: "居中对齐",
-        value: "center",
-        icon: "align-center"
-      }, {
-        name: "右对齐",
-        value: "right",
-        icon: "align-right"
-      }]
-    }, (0, _.showRule)("show", "$eq", true)), _objectSpread({
+    }, (0, _.showRule)("format", "$eq", "date")), {
+      rule: [["labelNum", "$eq", "Fixed"]],
+      type: "radio",
+      name: "textAlign",
+      displayName: "对齐",
+      value: textAlign,
+      config: {
+        mode: "icon",
+        options: [{
+          name: "左对齐",
+          value: "left",
+          icon: "align-left"
+        }, {
+          name: "居中对齐",
+          value: "center",
+          icon: "align-center"
+        }, {
+          name: "右对齐",
+          value: "right",
+          icon: "align-right"
+        }]
+      }
+    }, _objectSpread({
       rule: [["show", "$eq", true]]
     }, (0, _.translate)(labelTranslateX, labelTranslateY)), {
       rule: [["show", "$eq", true]],
@@ -1025,8 +1043,8 @@ var valueAsixLabel = function valueAsixLabel() {
     }, (0, _.extent)({
       min: percentMin,
       max: percentMax,
-      customSuffix: '%',
-      customName: 'percentageExtent'
+      customSuffix: "%",
+      customName: "percentageExtent"
     })), {
       rule: [["show", "$eq", true]],
       name: "auto",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@easyv/config",
-  "version": "1.3.3",
+  "version": "1.3.5",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -28,4 +28,4 @@
       "commit": true
     }
   }
-}
+}