@easyv/config 1.1.19 → 1.1.21

package/lib/animation.js

@@ -157,7 +157,6 @@ var animationOfPie = function animationOfPie() {
       }
     }, {
       tip: '选择点击或悬浮，鼠标点击/悬浮各数据块时停止轮播仅显示当前数据信息',
-      rule: [['on', '$eq', true]],
       name: 'interactive',
       displayName: '交互方式',
       value: interactive,

package/lib/axes.js

@@ -130,6 +130,8 @@ var valueAxis = function valueAxis() {
   var _ref2 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : defaultValueAxis,
     _ref2$on = _ref2.on,
     on = _ref2$on === void 0 ? defaultValueAxis.on : _ref2$on,
+    openClip = _ref2.openClip,
+    clipAxis = _ref2.clipAxis,
     _ref2$label = _ref2.label,
     label = _ref2$label === void 0 ? defaultValueAxis.label : _ref2$label,
     _ref2$unit = _ref2.unit,
@@ -145,7 +147,14 @@ var valueAxis = function valueAxis() {
     displayName: '启用',
     value: on,
     type: 'boolean'
-  }, _objectSpread({
+  }, 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: {
+      tip: "不用设置高度占比为0或100的区间"
+    }
+  }, {
+    rule: [["openClip", "$eq", true]]
+  }), _objectSpread({
     rule: [['on', '$eq', true]]
   }, (0, _label.valueAsixLabel)(label)), _objectSpread({
     rule: [['on', '$eq', true]]
@@ -155,7 +164,9 @@ var valueAxis = function valueAxis() {
     rule: [['on', '$eq', true]]
   }, (0, _.tickLine)(tickLine_)), _objectSpread({
     rule: [['on', '$eq', true]]
-  }, (0, _.gridLine)(gridLine_))];
+  }, (0, _.gridLine)(gridLine_))].filter(function (item) {
+    return !!item;
+  });
 };
 exports.valueAxis = valueAxis;
 var _default = function _default() {

package/lib/label.js

@@ -497,6 +497,12 @@ var axisLabel = function axisLabel() {
           }, {
             name: '2017.01.01',
             value: 'YYYY.MM.DD'
+          }, {
+            name: '2017年',
+            value: 'YYYY年'
+          }, {
+            name: '2017(年)',
+            value: 'YYYY(年)'
           }, {
             name: '1月1日',
             value: 'M月D日'

package/lib/legend.js

@@ -93,9 +93,9 @@ var _default = function _default() {
   return {
     name: 'legend',
     displayName: '图例',
-    value: [showConfig(show), (0, _index.sc)("maxWidth", "宽度", "number", maxWidth, {
+    value: [showConfig(show), overflow != undefined && (0, _index.sc)("maxWidth", "宽度", "number", maxWidth, {
       suffix: "px"
-    }, showRule())].concat((0, _toConsumableArray2["default"])((0, _index.textOverflow)(overflow)), [{
+    }, showRule())].concat((0, _toConsumableArray2["default"])(overflow != undefined ? (0, _index.textOverflow)(overflow) : []), [{
       rule: [['show', '$eq', true]],
       name: 'font',
       displayName: '文本样式',

package/lib/pie.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.rosePieDecorate = exports.rosePie = exports.nestRosePie = exports.donut = exports["default"] = exports.current = exports.carouselDonut2 = exports.carouselDonut = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _ = require("./");
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -456,7 +457,8 @@ var defaultCurrent = {
     name: {
       show: true,
       sameColor: false,
-      font: (0, _.font)()
+      font: (0, _.font)(),
+      maxWidth: 40
     },
     percent: {
       show: true,
@@ -505,7 +507,9 @@ var current = function current() {
     _ref9$current$name$fo = _ref9$current$name.font,
     nameFont = _ref9$current$name$fo === void 0 ? defaultCurrent.current.name.font : _ref9$current$name$fo,
     nameTranslate = _ref9$current$name.translate,
-    textBreak = _ref9$current$name.textBreak,
+    _ref9$current$name$ma = _ref9$current$name.maxWidth,
+    maxWidth = _ref9$current$name$ma === void 0 ? defaultCurrent.current.name.maxWidth : _ref9$current$name$ma,
+    overflow = _ref9$current$name.overflow,
     _ref9$current$percent = _ref9$current.percent;
   _ref9$current$percent = _ref9$current$percent === void 0 ? defaultCurrent.current.percent : _ref9$current$percent;
   var _ref9$current$percent2 = _ref9$current$percent.show,
@@ -573,10 +577,9 @@ var current = function current() {
         value: nameFont,
         type: 'textStyle',
         markColorType: 'textColor'
-      }, nameTranslate != undefined && _objectSpread(_objectSpread({}, (0, _.showRule)()), (0, _.translate)(nameTranslate.x, nameTranslate.y)), textBreak != undefined && _objectSpread(_objectSpread({}, (0, _.showRule)()), (0, _.sc)('textBreak', '首行字数', 'number', textBreak, {
-        min: 0,
-        suffix: '个'
-      }))].filter(function (item) {
+      }, nameTranslate != undefined && _objectSpread(_objectSpread({}, (0, _.showRule)()), (0, _.translate)(nameTranslate.x, nameTranslate.y)), (0, _.sc)("maxWidth", "宽度", "number", maxWidth, {
+        suffix: "px"
+      }, (0, _.showRule)())].concat((0, _toConsumableArray2["default"])((0, _.textOverflow)(overflow))).filter(function (item) {
         return !!item;
       })
     }, {

package/package.json

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

package/src/animation.js

@@ -146,7 +146,6 @@ export const animationOfPie = ({
     },
     {
       tip: '选择点击或悬浮，鼠标点击/悬浮各数据块时停止轮播仅显示当前数据信息',
-      rule: [['on', '$eq', true]],
       name: 'interactive',
       displayName: '交互方式',
       value: interactive,

package/src/axes.js

@@ -1,4 +1,4 @@
-import { gridLine, tickLine, axisLine, unit, font } from '.';
+import { gridLine, tickLine, axisLine, unit, font, sc } from '.';
 import { axisLabel, valueAsixLabel } from './label';
 const defaultFont = font();
 const defaultFontAxisY = font({
@@ -96,6 +96,8 @@ const defaultValueAxis = {
 
 export const valueAxis = ({
   on = defaultValueAxis.on,
+  openClip,
+  clipAxis,
   label = defaultValueAxis.label,
   unit: unit_ = defaultValueAxis.unit,
   axisLine: axisLine_ = defaultValueAxis.axisLine,
@@ -108,6 +110,29 @@ export const valueAxis = ({
     value: on,
     type: 'boolean',
   },
+  openClip!=undefined && sc("openClip","开启断轴","boolean",false),
+  clipAxis!=undefined && sc("clipAxis","轴段区间","array",[
+    sc("range1","区间","object",[
+      sc("value","区间值","number",50),
+      sc("offset","高度占比","range",25)
+    ]),
+    sc("range2","区间","object",[
+      sc("value","区间值","number",100),
+      sc("offset","高度占比","range",50)
+    ]),
+    sc("range3","区间","object",[
+      sc("value","区间值","number",1000),
+      sc("offset","高度占比","range",75)
+    ])
+  ],{
+    template:sc("range","区间","object",[
+      sc("value","区间值","number",0),
+      sc("offset","高度占比","range",0)
+    ]),
+    other:{
+      tip:"不用设置高度占比为0或100的区间"
+    }
+  },{rule:[["openClip","$eq",true]]}),
   {
     rule: [['on', '$eq', true]],
     ...valueAsixLabel(label),
@@ -128,7 +153,7 @@ export const valueAxis = ({
     rule: [['on', '$eq', true]],
     ...gridLine(gridLine_),
   },
-];
+].filter(item=>!!item);
 
 export default (
   { xAxis = defaultCategoryAxis, yAxis = defaultValueAxis, zAxis } = {

package/src/label.js

@@ -459,6 +459,14 @@ export const axisLabel = ({
                 name: '2017.01.01',
                 value: 'YYYY.MM.DD',
               },
+              {
+                name:'2017年',
+                value:'YYYY年'
+              },
+              {
+                name:'2017(年)',
+                value:'YYYY(年)'
+              },
               {
                 name: '1月1日',
                 value: 'M月D日',

package/src/legend.js

@@ -69,8 +69,8 @@ export default ({
   displayName: '图例',
   value: [
     showConfig(show),
-    sc("maxWidth","宽度","number",maxWidth,{suffix:"px"},showRule()),
-    ...textOverflow(overflow),
+    overflow!=undefined && sc("maxWidth","宽度","number",maxWidth,{suffix:"px"},showRule()),
+    ...(overflow!=undefined?textOverflow(overflow):[]),
     {
       rule: [['show', '$eq', true]],
       name: 'font',

package/src/pie.js

@@ -5,6 +5,7 @@ import {
   translate as translateConfig,
   axisLine,
   sc,
+  textOverflow
 } from './';
 
 const defaultBasePie = {
@@ -460,13 +461,13 @@ const defaultCurrent = {
   current: {
     show: true,
     gap: 45,
-    name: { show: true, sameColor: false, font: font() },
+    name: { show: true, sameColor: false, font: font(), maxWidth:40 },
     percent: {
       show: true,
       sameColor: false,
       precision: 0,
       font: font(),
-      translate: { x: 0, y: 0 },
+      translate: { x: 0, y: 0 }
     },
     value: {
       show: true,
@@ -491,7 +492,8 @@ export const current = ({
       sameColor: nameColor = defaultCurrent.current.name.sameColor,
       font: nameFont = defaultCurrent.current.name.font,
       translate: nameTranslate,
-      textBreak,
+      maxWidth = defaultCurrent.current.name.maxWidth,
+      overflow
     } = defaultCurrent.current.name,
     percent: {
       show: showPercent = defaultCurrent.current.percent.show,
@@ -556,13 +558,8 @@ export const current = ({
           ...showRule(),
           ...translateConfig(nameTranslate.x, nameTranslate.y),
         },
-        textBreak != undefined && {
-          ...showRule(),
-          ...sc('textBreak', '首行字数', 'number', textBreak, {
-            min: 0,
-            suffix: '个',
-          }),
-        },
+        sc("maxWidth","宽度","number",maxWidth,{suffix:"px"},showRule()),
+        ...textOverflow(overflow),
       ].filter((item) => !!item),
     },
     {