@easyv/config 1.2.7 → 1.2.9

package/lib/extent.js

@@ -8,7 +8,8 @@ var extent = {
   min: "0",
   max: "",
   customDisplayName: "数值范围",
-  customName: "extent"
+  customName: "extent",
+  customSuffix: ""
 };
 var _default = function _default() {
   var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : extent,
@@ -19,7 +20,9 @@ var _default = function _default() {
     _ref$customDisplayNam = _ref.customDisplayName,
     customDisplayName = _ref$customDisplayNam === void 0 ? extent.customDisplayName : _ref$customDisplayNam,
     _ref$customName = _ref.customName,
-    customName = _ref$customName === void 0 ? extent.customName : _ref$customName;
+    customName = _ref$customName === void 0 ? extent.customName : _ref$customName,
+    _ref$customSuffix = _ref.customSuffix,
+    customSuffix = _ref$customSuffix === void 0 ? extent.customSuffix : _ref$customSuffix;
   return {
     name: customName,
     displayName: customDisplayName,
@@ -29,7 +32,8 @@ var _default = function _default() {
       value: min,
       type: "input",
       config: {
-        span: 12
+        span: 12,
+        suffix: customSuffix
       }
     }, {
       name: "max",
@@ -37,7 +41,8 @@ var _default = function _default() {
       value: max,
       type: "input",
       config: {
-        span: 12
+        span: 12,
+        suffix: customSuffix
       }
     }],
     type: "group"

package/lib/label.js

@@ -684,8 +684,13 @@ var defaultValueAxisLabel = {
     min: "0",
     max: ""
   },
+  percentageExtent: {
+    min: 80,
+    max: 120
+  },
   auto: false,
   mode: "count",
+  numericalRangeModel: "value",
   count: 3,
   step: 100,
   decimal: 0,
@@ -773,7 +778,7 @@ var valueCilpAsixLabel = function valueCilpAsixLabel() {
       displayName: "断轴模式",
       value: "manual",
       type: "radio",
-      tip: '手动模式需要指定断轴值，如果断轴值在数据范围内，就会执行断轴，自动模式设置断轴阈值，当数据离散程度超过阈值的时候执行断轴',
+      tip: "手动模式需要指定断轴值，如果断轴值在数据范围内，就会执行断轴，自动模式设置断轴阈值，当数据离散程度超过阈值的时候执行断轴",
       config: {
         options: [{
           name: "手动模式",
@@ -792,7 +797,7 @@ var valueCilpAsixLabel = function valueCilpAsixLabel() {
     }, {
       name: "clipDifferenceValue",
       displayName: "断轴差值",
-      tip: '差值越高，代表需要更大的数据离散程度才能触发断轴，反之同理',
+      tip: "差值越高，代表需要更大的数据离散程度才能触发断轴，反之同理",
       type: "number",
       value: 100,
       config: {
@@ -880,10 +885,18 @@ var valueAsixLabel = function valueAsixLabel() {
     min = _ref6$extent$min === void 0 ? defaultValueAxisLabel.extent.min : _ref6$extent$min,
     _ref6$extent$max = _ref6$extent.max,
     max = _ref6$extent$max === void 0 ? defaultValueAxisLabel.extent.max : _ref6$extent$max,
+    _ref6$percentageExten = _ref6.percentageExtent;
+  _ref6$percentageExten = _ref6$percentageExten === void 0 ? defaultValueAxisLabel.percentageExtent : _ref6$percentageExten;
+  var _ref6$percentageExten2 = _ref6$percentageExten.min,
+    percentMin = _ref6$percentageExten2 === void 0 ? defaultValueAxisLabel.percentageExtent.min : _ref6$percentageExten2,
+    _ref6$percentageExten3 = _ref6$percentageExten.max,
+    percentMax = _ref6$percentageExten3 === void 0 ? defaultValueAxisLabel.percentageExtent.max : _ref6$percentageExten3,
     _ref6$auto = _ref6.auto,
     auto = _ref6$auto === void 0 ? defaultValueAxisLabel.auto : _ref6$auto,
     _ref6$mode = _ref6.mode,
     mode = _ref6$mode === void 0 ? defaultValueAxisLabel.mode : _ref6$mode,
+    _ref6$numericalRangeM = _ref6.numericalRangeModel,
+    numericalRangeModel = _ref6$numericalRangeM === void 0 ? defaultValueAxisLabel.numericalRangeModel : _ref6$numericalRangeM,
     _ref6$count = _ref6.count,
     count = _ref6$count === void 0 ? defaultValueAxisLabel.count : _ref6$count,
     _ref6$step = _ref6.step,
@@ -908,11 +921,34 @@ var valueAsixLabel = function valueAsixLabel() {
       displayName: "显示",
       value: showLabel,
       type: "boolean"
+    }, {
+      rule: [["show", "$eq", true]],
+      name: "numericalRangeModel",
+      displayName: "范围模式",
+      value: numericalRangeModel,
+      type: "radio",
+      tip: "真实值模式会取填入的值来作为轴的最大最小值，而百分比模式会取数据中最小值乘上数值范围中的最小值百分比作为作为轴的最小值，最大值同理",
+      config: {
+        options: [{
+          name: "真实值",
+          value: "value"
+        }, {
+          name: "百分比",
+          value: "percentage"
+        }]
+      }
     }, _objectSpread({
-      rule: [["show", "$eq", true]]
+      rule: [["show", "$eq", true], ["numericalRangeModel", "$eq", "value"]]
     }, (0, _.extent)({
       min: min,
       max: max
+    })), _objectSpread({
+      rule: [["show", "$eq", true], ["numericalRangeModel", "$eq", "percentage"]]
+    }, (0, _.extent)({
+      min: percentMin,
+      max: percentMax,
+      customSuffix: '%',
+      customName: 'percentageExtent'
     })), {
       rule: [["show", "$eq", true]],
       name: "auto",

package/package.json

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

package/src/extent.js

@@ -3,34 +3,40 @@ const extent = {
   max: "",
   customDisplayName: "数值范围",
   customName: "extent",
+  customSuffix: "",
 };
 export default ({
   min = extent.min,
   max = extent.max,
   customDisplayName = extent.customDisplayName,
   customName = extent.customName,
-} = extent) => ({
-  name: customName,
-  displayName: customDisplayName,
-  value: [
-    {
-      name: "min",
-      displayName: "最小值",
-      value: min,
-      type: "input",
-      config: {
-        span: 12,
+  customSuffix = extent.customSuffix,
+} = extent) => {
+  return {
+    name: customName,
+    displayName: customDisplayName,
+    value: [
+      {
+        name: "min",
+        displayName: "最小值",
+        value: min,
+        type: "input",
+        config: {
+          span: 12,
+          suffix: customSuffix,
+        },
       },
-    },
-    {
-      name: "max",
-      displayName: "最大值",
-      value: max,
-      type: "input",
-      config: {
-        span: 12,
+      {
+        name: "max",
+        displayName: "最大值",
+        value: max,
+        type: "input",
+        config: {
+          span: 12,
+          suffix: customSuffix,
+        },
       },
-    },
-  ],
-  type: "group",
-});
+    ],
+    type: "group",
+  };
+};

package/src/label.js

@@ -73,11 +73,18 @@ export default ({
       _rule: [["show", "$eq", true]],
       ...translate(x, y),
     },
-    sc("suffix","后缀","",[
-      sc("content","内容","input",""),
-      sc("font","字体样式","textStyle",font()),
-      translate()
-    ],{defaultOpen:true},showRule())
+    sc(
+      "suffix",
+      "后缀",
+      "",
+      [
+        sc("content", "内容", "input", ""),
+        sc("font", "字体样式", "textStyle", font()),
+        translate(),
+      ],
+      { defaultOpen: true },
+      showRule()
+    ),
   ].filter((item) => !!item),
 });
 
@@ -650,19 +657,33 @@ export const axisLabel = ({
       type: "boolean",
       tip: "显示返回最新数据的轴标签",
     },
-    sc("autoSort","自动排序","boolean",autoSort,{
-      other:{
-        tip:"数据按时间自动排序展示"
-      }
-    },showRule()),
-    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"}
-      ]
-    },showRule("show","$eq",true)),
+    sc(
+      "autoSort",
+      "自动排序",
+      "boolean",
+      autoSort,
+      {
+        other: {
+          tip: "数据按时间自动排序展示",
+        },
+      },
+      showRule()
+    ),
+    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" },
+        ],
+      },
+      showRule("show", "$eq", true)
+    ),
     {
       rule: [["show", "$eq", true]],
       ...translate(labelTranslateX, labelTranslateY),
@@ -681,8 +702,10 @@ export const axisLabel = ({
 const defaultValueAxisLabel = {
   show: true,
   extent: { min: "0", max: "" },
+  percentageExtent: { min: 80, max: 120 },
   auto: false,
   mode: "count",
+  numericalRangeModel: "value",
   count: 3,
   step: 100,
   decimal: 0,
@@ -731,6 +754,7 @@ export const valueCilpAsixLabel = ({
       value: showLabel,
       type: "boolean",
     },
+
     {
       rule: [["show", "$eq", true]],
       ...extent({ min, max }),
@@ -752,13 +776,12 @@ export const valueCilpAsixLabel = ({
       displayName: "断轴模式",
       value: "manual",
       type: "radio",
-      tip:'手动模式需要指定断轴值，如果断轴值在数据范围内，就会执行断轴，自动模式设置断轴阈值，当数据离散程度超过阈值的时候执行断轴',
+      tip: "手动模式需要指定断轴值，如果断轴值在数据范围内，就会执行断轴，自动模式设置断轴阈值，当数据离散程度超过阈值的时候执行断轴",
       config: {
         options: [
           { name: "手动模式", value: "manual" },
           { name: "自动模式", value: "auto" },
         ],
-
       },
     },
     {
@@ -774,7 +797,7 @@ export const valueCilpAsixLabel = ({
     {
       name: "clipDifferenceValue",
       displayName: "断轴差值",
-      tip:'差值越高，代表需要更大的数据离散程度才能触发断轴，反之同理',
+      tip: "差值越高，代表需要更大的数据离散程度才能触发断轴，反之同理",
       type: "number",
       value: 100,
       config: {
@@ -888,8 +911,13 @@ export const valueAsixLabel = ({
     min = defaultValueAxisLabel.extent.min,
     max = defaultValueAxisLabel.extent.max,
   } = defaultValueAxisLabel.extent,
+  percentageExtent: {
+    min: percentMin = defaultValueAxisLabel.percentageExtent.min,
+    max: percentMax = defaultValueAxisLabel.percentageExtent.max,
+  } = defaultValueAxisLabel.percentageExtent,
   auto = defaultValueAxisLabel.auto,
   mode = defaultValueAxisLabel.mode,
+  numericalRangeModel = defaultValueAxisLabel.numericalRangeModel,
   count = defaultValueAxisLabel.count,
   step = defaultValueAxisLabel.step,
   decimal = defaultValueAxisLabel.decimal,
@@ -911,8 +939,32 @@ export const valueAsixLabel = ({
     },
     {
       rule: [["show", "$eq", true]],
+      name: "numericalRangeModel",
+      displayName: "范围模式",
+      value: numericalRangeModel,
+      type: "radio",
+      tip: "真实值模式会取填入的值来作为轴的最大最小值，而百分比模式会取数据中最小值乘上数值范围中的最小值百分比作为作为轴的最小值，最大值同理",
+      config: {
+        options: [
+          { name: "真实值", value: "value" },
+          { name: "百分比", value: "percentage" },
+        ],
+      },
+    },
+    {
+      rule: [
+        ["show", "$eq", true],
+        ["numericalRangeModel", "$eq", "value"],
+      ],
       ...extent({ min, max }),
     },
+    {
+      rule: [
+        ["show", "$eq", true],
+        ["numericalRangeModel", "$eq", "percentage"],
+      ],
+      ...extent({ min: percentMin, max: percentMax , customSuffix:'%',customName:'percentageExtent' }),
+    },
     {
       rule: [["show", "$eq", true]],
       name: "auto",