@easyv/config 1.1.34 → 1.1.36

package/src/control.js

@@ -1,67 +1,92 @@
-export const control = () => {
-  return {
-    name: "control",
-    displayName: "控制条",
-    value: [
-      {
-        name: "height",
-        displayName: "高度",
-        value: 20,
-        type: "number",
-      },
-      {
-        name: "color",
-        displayName: "背景颜色",
-        value: "rgba(20, 95, 255, 0.1)",
-        type: "color",
-      },
-      {
-        type: "group",
-        name: "margin",
-        displayName: "边距",
-        value: [
-          {
-            name: "left",
-            displayName: "左边距",
-            value: 40,
-            type: "number",
-            config: {
-              span: 12,
-            },
-          },
-          {
-            name: "right",
-            displayName: "右边距",
-            value: 40,
-            type: "number",
-            config: {
-              span: 12,
-            },
-          },
-        ],
-      },
-      {
-        name: "drag",
-        displayName: "详情区域",
-        value: [
-          {
-            name: "width",
-            displayName: "宽度",
-            value: 30,
-            type: "number",
-            config: {
-              suffix: "%",
-              min: 1,
-            },
-          },
-          {
-            name: "color",
-            displayName: "颜色",
-            value: "RGBA(255, 255, 255, .3)",
-            type: "color",
-          },
-        ],
-      },
-    ],
-  };
-};
+const defaultControl={
+  height:20,
+  color:"rgba(20, 95, 255, 0.1)",
+  margin:{
+    left:40,
+    right:40
+  },
+  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,
+  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: "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,36 @@
-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",
+};
+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",
+});

package/src/index.js

@@ -1,105 +1,105 @@
-import show, { showRule } from './show';
-import font from './font';
-import translate from './translate';
-import gridLine from './gridLine';
-import tickLine from './tickLine';
-import axisLine from './axisLine';
-import extent from './extent';
-import unit from './unit';
-import margin from './margin';
-import multiColor from './multiColor';
-import animation, {
-  dataAnimation,
-  animationOfPie,
-  animationOfCarousel,
-} from './animation';
-import dimension from './dimension';
-import label, {
-  labelOfPie,
-  labelOfRose,
-  axisLabel,
-  valueAsixLabel,
-} from './label';
-import legend, { legendOfPie, legendOfRose, legendOfDoublePie } from './legend';
-import tooltip from './tooltip';
-import axes, { valueAxis, categoryAxis } from './axes';
-import mapping from './mapping';
-import { imageGroup } from './imageGroup';
-import {
-  bandSeries,
-  lineSeries,
-  areaSeries,
-  pieSeries,
-  purePieSeries,
-} from './series';
-import pie, {
-  rosePie,
-  rosePieDecorate,
-  donut,
-  carouselDonut,
-  nestRosePie,
-  carouselDonut2,
-  current as pieCurrent,
-} from './pie';
-import brush from './brush';
-import interaction from './interaction';
-import sc from './sc';
-import shadow from './shadow';
-import textOverflow from './textOverflow';
-import baseLine from './baseLine';
-import { control } from './control';
-import pieTooltip from './pieTooltip';
-export {
-  pieTooltip,
-  control,
-  show,
-  showRule,
-  font,
-  tooltip,
-  translate,
-  textOverflow,
-  extent,
-  unit,
-  margin,
-  multiColor,
-  animation,
-  dataAnimation,
-  animationOfPie,
-  animationOfCarousel,
-  dimension,
-  gridLine,
-  tickLine,
-  axisLine,
-  valueAxis,
-  categoryAxis,
-  axes,
-  imageGroup,
-  mapping,
-  bandSeries,
-  lineSeries,
-  areaSeries,
-  pieSeries,
-  purePieSeries,
-  brush,
-  interaction,
-  legend,
-  legendOfPie,
-  legendOfRose,
-  legendOfDoublePie,
-  label,
-  labelOfPie,
-  labelOfRose,
-  axisLabel,
-  valueAsixLabel,
-  pie,
-  rosePie,
-  nestRosePie,
-  rosePieDecorate,
-  donut,
-  carouselDonut,
-  carouselDonut2,
-  pieCurrent,
-  sc,
-  shadow,
-  baseLine
-};
+import show, { showRule } from './show';
+import font from './font';
+import translate from './translate';
+import gridLine from './gridLine';
+import tickLine from './tickLine';
+import axisLine from './axisLine';
+import extent from './extent';
+import unit from './unit';
+import margin from './margin';
+import multiColor from './multiColor';
+import animation, {
+  dataAnimation,
+  animationOfPie,
+  animationOfCarousel,
+} from './animation';
+import dimension from './dimension';
+import label, {
+  labelOfPie,
+  labelOfRose,
+  axisLabel,
+  valueAsixLabel,
+} from './label';
+import legend, { legendOfPie, legendOfRose, legendOfDoublePie } from './legend';
+import tooltip from './tooltip';
+import axes, { valueAxis, categoryAxis } from './axes';
+import mapping from './mapping';
+import { imageGroup } from './imageGroup';
+import {
+  bandSeries,
+  lineSeries,
+  areaSeries,
+  pieSeries,
+  purePieSeries,
+} from './series';
+import pie, {
+  rosePie,
+  rosePieDecorate,
+  donut,
+  carouselDonut,
+  nestRosePie,
+  carouselDonut2,
+  current as pieCurrent,
+} from './pie';
+import brush from './brush';
+import interaction from './interaction';
+import sc from './sc';
+import shadow from './shadow';
+import textOverflow from './textOverflow';
+import baseLine from './baseLine';
+import { control } from './control';
+import pieTooltip from './pieTooltip';
+export {
+  pieTooltip,
+  control,
+  show,
+  showRule,
+  font,
+  tooltip,
+  translate,
+  textOverflow,
+  extent,
+  unit,
+  margin,
+  multiColor,
+  animation,
+  dataAnimation,
+  animationOfPie,
+  animationOfCarousel,
+  dimension,
+  gridLine,
+  tickLine,
+  axisLine,
+  valueAxis,
+  categoryAxis,
+  axes,
+  imageGroup,
+  mapping,
+  bandSeries,
+  lineSeries,
+  areaSeries,
+  pieSeries,
+  purePieSeries,
+  brush,
+  interaction,
+  legend,
+  legendOfPie,
+  legendOfRose,
+  legendOfDoublePie,
+  label,
+  labelOfPie,
+  labelOfRose,
+  axisLabel,
+  valueAsixLabel,
+  pie,
+  rosePie,
+  nestRosePie,
+  rosePieDecorate,
+  donut,
+  carouselDonut,
+  carouselDonut2,
+  pieCurrent,
+  sc,
+  shadow,
+  baseLine
+};

package/src/label.js

@@ -361,6 +361,7 @@ const defaultAxisLabel = {
     speed: 5,
   },
   showLast: false,
+  autoSort: false,
   translate: { x: 0, y: 0 },
   font: font({ color: "rgba(230, 247, 255, 1)" }),
 };
@@ -378,6 +379,7 @@ export const axisLabel = ({
     speed = defaultAxisLabel.appearance.speed,
   } = defaultAxisLabel.appearance,
   showLast = defaultAxisLabel.showLast,
+  autoSort = defaultAxisLabel.autoSort,
   translate: {
     x: labelTranslateX = defaultAxisLabel.translate.x,
     y: labelTranslateY = defaultAxisLabel.translate.y,
@@ -642,6 +644,11 @@ export const axisLabel = ({
       type: "boolean",
       tip: "显示返回最新数据的轴标签",
     },
+    sc("autoSort","自动排序","boolean",autoSort,{
+      other:{
+        tip:"数据按时间自动排序展示"
+      }
+    },showRule()),
     {
       rule: [["show", "$eq", true]],
       ...translate(labelTranslateX, labelTranslateY),