@easyv/config 1.2.8 → 1.2.10

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

@@ -645,7 +645,7 @@ var axisLabel = function axisLabel() {
       displayName: "显示最新",
       value: showLast,
       type: "boolean",
-      tip: "显示返回最新数据的轴标签"
+      tip: "开启后会必定展示首尾日期的数据，但可能会导致标签数量和预期不一致"
     }, (0, _.sc)("autoSort", "自动排序", "boolean", autoSort, {
       other: {
         tip: "数据按时间自动排序展示"
@@ -690,7 +690,7 @@ var defaultValueAxisLabel = {
   },
   auto: false,
   mode: "count",
-  numericalRangeModel: "percentage",
+  numericalRangeModel: "value",
   count: 3,
   step: 100,
   decimal: 0,

package/lib/tooltip.js

@@ -14,6 +14,7 @@ var defaultTooltip = {
       x: 0,
       y: 0
     },
+    bgColor: 'rgba(48, 55, 66, 0.85)',
     image: '',
     size: {
       width: 120,
@@ -27,6 +28,8 @@ var defaultTooltip = {
     },
     data: {
       xAxis: {
+        background: "",
+        gap: 5,
         font: {
           fontFamily: 'Mircosoft Yahei',
           fontSize: 16,
@@ -43,7 +46,9 @@ var defaultTooltip = {
       },
       data: {
         lineHeight: 18,
+        gap: 5,
         iconSize: 10,
+        background: "",
         num: "",
         name: {
           fontFamily: 'Mircosoft Yahei',
@@ -99,6 +104,8 @@ var _default = function _default() {
     tipTranslateX = _ref$tip$translate$x === void 0 ? defaultTooltip.tip.translate.x : _ref$tip$translate$x,
     _ref$tip$translate$y = _ref$tip$translate.y,
     tipTranslateY = _ref$tip$translate$y === void 0 ? defaultTooltip.tip.translate.y : _ref$tip$translate$y,
+    _ref$tip$bgColor = _ref$tip.bgColor,
+    bgColor = _ref$tip$bgColor === void 0 ? defaultTooltip.tip.bgColor : _ref$tip$bgColor,
     _ref$tip$image = _ref$tip.image,
     image = _ref$tip$image === void 0 ? defaultTooltip.tip.image : _ref$tip$image,
     _ref$tip$size = _ref$tip.size;
@@ -121,7 +128,11 @@ var _default = function _default() {
   _ref$tip$data = _ref$tip$data === void 0 ? defaultTooltip.tip.data : _ref$tip$data;
   var _ref$tip$data$xAxis = _ref$tip$data.xAxis;
   _ref$tip$data$xAxis = _ref$tip$data$xAxis === void 0 ? defaultTooltip.tip.data.xAxis : _ref$tip$data$xAxis;
-  var _ref$tip$data$xAxis$f = _ref$tip$data$xAxis.font;
+  var _ref$tip$data$xAxis$b = _ref$tip$data$xAxis.background,
+    xAxisBg = _ref$tip$data$xAxis$b === void 0 ? defaultTooltip.tip.data.xAxis.background : _ref$tip$data$xAxis$b,
+    _ref$tip$data$xAxis$g = _ref$tip$data$xAxis.gap,
+    xAxisGap = _ref$tip$data$xAxis$g === void 0 ? defaultTooltip.tip.data.xAxis.gap : _ref$tip$data$xAxis$g,
+    _ref$tip$data$xAxis$f = _ref$tip$data$xAxis.font;
   _ref$tip$data$xAxis$f = _ref$tip$data$xAxis$f === void 0 ? defaultTooltip.tip.data.xAxis.font : _ref$tip$data$xAxis$f;
   var xAxisFontFamily = _ref$tip$data$xAxis$f.fontFamily,
     xAxisFontSize = _ref$tip$data$xAxis$f.fontSize,
@@ -139,10 +150,14 @@ var _default = function _default() {
   _ref$tip$data$data = _ref$tip$data$data === void 0 ? defaultTooltip.tip.data.data : _ref$tip$data$data;
   var _ref$tip$data$data$li = _ref$tip$data$data.lineHeight,
     lineHeight = _ref$tip$data$data$li === void 0 ? defaultTooltip.tip.data.lineHeight : _ref$tip$data$data$li,
+    _ref$tip$data$data$ga = _ref$tip$data$data.gap,
+    dataGap = _ref$tip$data$data$ga === void 0 ? defaultTooltip.tip.data.gap : _ref$tip$data$data$ga,
     _ref$tip$data$data$ic = _ref$tip$data$data.iconSize,
     iconSize = _ref$tip$data$data$ic === void 0 ? defaultTooltip.tip.data.iconSize : _ref$tip$data$data$ic,
     _ref$tip$data$data$nu = _ref$tip$data$data.num,
     num = _ref$tip$data$data$nu === void 0 ? defaultTooltip.tip.data.num : _ref$tip$data$data$nu,
+    _ref$tip$data$data$ba = _ref$tip$data$data.background,
+    dataBg = _ref$tip$data$data$ba === void 0 ? defaultTooltip.tip.data.background : _ref$tip$data$data$ba,
     _ref$tip$data$data$na = _ref$tip$data$data.name;
   _ref$tip$data$data$na = _ref$tip$data$data$na === void 0 ? defaultTooltip.tip.data.data.name : _ref$tip$data$data$na;
   var nameFontFamily = _ref$tip$data$data$na.fontFamily,
@@ -201,6 +216,12 @@ var _default = function _default() {
       name: 'tip',
       displayName: '提示框',
       value: [(0, _.translate)(tipTranslateX, tipTranslateY), {
+        name: "bgColor",
+        displayName: "背景色",
+        type: "color",
+        value: bgColor,
+        tip: "如果没有背景图，则启用背景色作为背景"
+      }, {
         type: 'uploadImage',
         name: 'image',
         displayName: '背景',
@@ -238,6 +259,16 @@ var _default = function _default() {
           name: 'xAxis',
           displayName: '类目标签',
           value: [{
+            name: "background",
+            displayName: "背景图",
+            type: "image",
+            value: xAxisBg
+          }, {
+            name: "gap",
+            displayName: "下间距",
+            type: "number",
+            value: xAxisGap
+          }, {
             name: 'font',
             displayName: '文本样式',
             value: {
@@ -276,15 +307,25 @@ var _default = function _default() {
           displayName: '数据',
           name: 'data',
           value: [{
-            displayName: '行间距',
+            displayName: '行高',
             type: 'number',
             value: lineHeight,
             name: 'lineHeight'
+          }, {
+            displayName: '行间距',
+            type: 'number',
+            value: dataGap,
+            name: 'gap'
           }, {
             displayName: '图标尺寸',
             type: 'number',
             value: iconSize,
             name: 'iconSize'
+          }, {
+            name: "background",
+            displayName: "背景图",
+            type: "image",
+            value: dataBg
           }, {
             displayName: "保留小数",
             type: "input",

package/package.json

@@ -1,31 +1,31 @@
-{
-  "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
-    }
-  }
+{
+  "name": "@easyv/config",
+  "version": "1.2.10",
+  "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,42 +1,42 @@
-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",
-  };
-};
+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",
+  };
+};