@easyv/config 1.2.6 → 1.2.8

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/interaction.js

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-/**
- * TODO:有个触发回调的类型
+/**
+ * TODO:有个触发回调的类型
  */
 var defaultAction = 'click';
 var defaultCallback = {

package/lib/label.js

@@ -684,8 +684,13 @@ var defaultValueAxisLabel = {
     min: "0",
     max: ""
   },
+  percentageExtent: {
+    min: 80,
+    max: 120
+  },
   auto: false,
   mode: "count",
+  numericalRangeModel: "percentage",
   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/lib/pie.js

@@ -176,6 +176,7 @@ var gridLine = function gridLine() {
 };
 var defaultRoseAxis = {
   axis: {
+    layout: "ring",
     count: 6,
     textStyle: (0, _.font)(),
     gap: 10,
@@ -195,7 +196,9 @@ var roseCategoryAxis = function roseCategoryAxis() {
   var _ref4 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : defaultRoseAxis,
     _ref4$axis = _ref4.axis;
   _ref4$axis = _ref4$axis === void 0 ? defaultRoseAxis.axis : _ref4$axis;
-  var _ref4$axis$textStyle = _ref4$axis.textStyle,
+  var _ref4$axis$layout = _ref4$axis.layout,
+    layout = _ref4$axis$layout === void 0 ? defaultRoseAxis.axis.layout : _ref4$axis$layout,
+    _ref4$axis$textStyle = _ref4$axis.textStyle,
     textStyle = _ref4$axis$textStyle === void 0 ? defaultRoseAxis.axis.textStyle : _ref4$axis$textStyle,
     _ref4$axis$gap = _ref4$axis.gap,
     gap = _ref4$axis$gap === void 0 ? defaultRoseAxis.axis.gap : _ref4$axis$gap,
@@ -206,7 +209,15 @@ var roseCategoryAxis = function roseCategoryAxis() {
   return {
     name: 'categoryAxis',
     displayName: '类目轴',
-    value: [{
+    value: [(0, _.sc)("layout", "布局", "radio", layout, {
+      options: [{
+        name: "环形",
+        value: 'ring'
+      }, {
+        name: "横排",
+        value: "line"
+      }]
+    }), {
       name: 'textStyle',
       displayName: '标签文本',
       value: (0, _.font)(textStyle),

package/package.json

@@ -1,31 +1,31 @@
-{
-  "name": "@easyv/config",
-  "version": "1.2.6",
-  "description": "",
-  "main": "index.js",
-  "scripts": {
-    "make": "babel src -d lib",
-    "release": "standard-version"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "devDependencies": {
-    "@babel/cli": "^7.6.0",
-    "@babel/core": "^7.11.5",
-    "@babel/plugin-proposal-class-properties": "^7.10.4",
-    "@babel/plugin-proposal-export-default-from": "^7.10.4",
-    "@babel/plugin-transform-runtime": "^7.11.5",
-    "@babel/preset-env": "^7.11.5",
-    "@babel/preset-react": "^7.10.4",
-    "@babel/runtime": "^7.17.7",
-    "babel-plugin-transform-import-styles": "0.0.11",
-    "babel-preset-env": "^1.7.0",
-    "standard-version": "^9.3.2"
-  },
-  "standard-version": {
-    "skip": {
-      "commit": true
-    }
-  }
+{
+  "name": "@easyv/config",
+  "version": "1.2.8",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "make": "babel src -d lib",
+    "release": "standard-version"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "devDependencies": {
+    "@babel/cli": "^7.6.0",
+    "@babel/core": "^7.11.5",
+    "@babel/plugin-proposal-class-properties": "^7.10.4",
+    "@babel/plugin-proposal-export-default-from": "^7.10.4",
+    "@babel/plugin-transform-runtime": "^7.11.5",
+    "@babel/preset-env": "^7.11.5",
+    "@babel/preset-react": "^7.10.4",
+    "@babel/runtime": "^7.17.7",
+    "babel-plugin-transform-import-styles": "0.0.11",
+    "babel-preset-env": "^1.7.0",
+    "standard-version": "^9.3.2"
+  },
+  "standard-version": {
+    "skip": {
+      "commit": true
+    }
+  }
 }

package/src/control.js

@@ -1,104 +1,104 @@
-const defaultControl={
-  height:20,
-  color:"rgba(20, 95, 255, 0.1)",
-  margin:{
-    left:40,
-    right:40
-  },
-  gap:20,
-  drag:{
-    width:30,
-    color:"RGBA(255, 255, 255, .3)"
-  }
-}
-
-export const control = ({
-  height = defaultControl.height,
-  color = defaultControl.color,
-  margin:{
-    left = defaultControl.margin.left,
-    right = defaultControl.margin.right
-  } = defaultControl.margin,
-  gap = defaultControl.gap,
-  drag:{
-    width = defaultControl.drag.width,
-    color:dragColor = defaultControl.drag.color
-  } = defaultControl.drag
-} = defaultControl) => {
-  return {
-    name: "control",
-    displayName: "控制条",
-    value: [
-      {
-        name: "height",
-        displayName: "高度",
-        value: height,
-        type: "number",
-      },
-      {
-        name: "color",
-        displayName: "背景颜色",
-        value: color,
-        type: "color",
-      },
-      {
-        type: "group",
-        name: "margin",
-        displayName: "边距",
-        value: [
-          {
-            name: "left",
-            displayName: "左边距",
-            value: left,
-            type: "number",
-            config: {
-              span: 12,
-            },
-          },
-          {
-            name: "right",
-            displayName: "右边距",
-            value: right,
-            type: "number",
-            config: {
-              span: 12,
-            },
-          },
-        ],
-      },
-      {
-        name:"gap",
-        displayName:"上间距",
-        type:"number",
-        value:gap,
-        config:{
-          suffix:"px"
-        },
-        tip:"与X轴的距离"
-      },
-      {
-        name: "drag",
-        displayName: "详情区域",
-        value: [
-          {
-            name: "width",
-            displayName: "宽度",
-            value: width,
-            type: "range",
-            config: {
-              suffix: "%",
-              min: 1,
-              max:100
-            },
-          },
-          {
-            name: "color",
-            displayName: "颜色",
-            value: dragColor,
-            type: "color",
-          },
-        ],
-      },
-    ],
-  };
-};
+const defaultControl={
+  height:20,
+  color:"rgba(20, 95, 255, 0.1)",
+  margin:{
+    left:40,
+    right:40
+  },
+  gap:20,
+  drag:{
+    width:30,
+    color:"RGBA(255, 255, 255, .3)"
+  }
+}
+
+export const control = ({
+  height = defaultControl.height,
+  color = defaultControl.color,
+  margin:{
+    left = defaultControl.margin.left,
+    right = defaultControl.margin.right
+  } = defaultControl.margin,
+  gap = defaultControl.gap,
+  drag:{
+    width = defaultControl.drag.width,
+    color:dragColor = defaultControl.drag.color
+  } = defaultControl.drag
+} = defaultControl) => {
+  return {
+    name: "control",
+    displayName: "控制条",
+    value: [
+      {
+        name: "height",
+        displayName: "高度",
+        value: height,
+        type: "number",
+      },
+      {
+        name: "color",
+        displayName: "背景颜色",
+        value: color,
+        type: "color",
+      },
+      {
+        type: "group",
+        name: "margin",
+        displayName: "边距",
+        value: [
+          {
+            name: "left",
+            displayName: "左边距",
+            value: left,
+            type: "number",
+            config: {
+              span: 12,
+            },
+          },
+          {
+            name: "right",
+            displayName: "右边距",
+            value: right,
+            type: "number",
+            config: {
+              span: 12,
+            },
+          },
+        ],
+      },
+      {
+        name:"gap",
+        displayName:"上间距",
+        type:"number",
+        value:gap,
+        config:{
+          suffix:"px"
+        },
+        tip:"与X轴的距离"
+      },
+      {
+        name: "drag",
+        displayName: "详情区域",
+        value: [
+          {
+            name: "width",
+            displayName: "宽度",
+            value: width,
+            type: "range",
+            config: {
+              suffix: "%",
+              min: 1,
+              max:100
+            },
+          },
+          {
+            name: "color",
+            displayName: "颜色",
+            value: dragColor,
+            type: "color",
+          },
+        ],
+      },
+    ],
+  };
+};

package/src/extent.js

@@ -1,36 +1,42 @@
-const extent = {
-  min: "0",
-  max: "",
-  customDisplayName: "数值范围",
-  customName: "extent",
-};
-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,
-      },
-    },
-    {
-      name: "max",
-      displayName: "最大值",
-      value: max,
-      type: "input",
-      config: {
-        span: 12,
-      },
-    },
-  ],
-  type: "group",
-});
+const extent = {
+  min: "0",
+  max: "",
+  customDisplayName: "数值范围",
+  customName: "extent",
+  customSuffix: "",
+};
+export default ({
+  min = extent.min,
+  max = extent.max,
+  customDisplayName = extent.customDisplayName,
+  customName = extent.customName,
+  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,
+          suffix: customSuffix,
+        },
+      },
+    ],
+    type: "group",
+  };
+};