@baishuyun/ui-business 6.0.1 → 6.0.3

package/dist/BubbleChart/{AutoGridEChart-BQsZw7nv.js → AutoGridEChart-CUNnImhh.js}

@@ -102,15 +102,15 @@ function l(e, t, n, r, i) {
 			})(),
 			bottom: (() => {
 				let t = 20;
-				return e.xAxis.position === "bottom" && (t += C + 10), e.legend.show && e.legend.top === "bottom" && (T += S, t += S), e.xAxis.title !== "" && e.xAxis.position === "bottom" && (t += 30), t;
+				return ["bottom", "zero"].includes(e.xAxis.position) && (t += C + 10), e.legend.show && (e.legend.top === "bottom" || e.legend.top === "zero") && (T += S, t += S), e.xAxis.title !== "" && (e.legend.top === "bottom" || e.xAxis.position === "zero") && (t += 30), t;
 			})(),
 			left: (() => {
 				let t = 20;
-				return e.yAxis.position === "left" && (t += w), e.legend.show && e.legend.left === "left" && (D += v, t += v), e.yAxis.title !== "" && e.yAxis.position === "left" && (t += 10), t;
+				return ["left", "zero"].includes(e.yAxis.position) && (t += w), e.legend.show && (e.legend.left === "left" || e.legend.left === "zero") && (D += v, t += v), e.yAxis.title !== "" && (e.yAxis.position === "left" || e.yAxis.position === "zero") && (t += 10), t;
 			})(),
 			right: (() => {
 				let t = 20;
-				return e.yAxis.position === "right" && (t += w + 10), e.legend.show && e.legend.left === "right" && (console.info("legendSideWidth", e, v), O += v, t += v), e.yAxis.title !== "" && e.yAxis.position === "right" && (t += 30), t;
+				return e.yAxis.position === "right" && (t += w + 10), e.legend.show && e.legend.left === "right" && (O += v, t += v), e.yAxis.title !== "" && e.yAxis.position === "right" && (t += 30), t;
 			})()
 		},
 		titleBottomHeight: T,
@@ -136,7 +136,7 @@ var u = {
 		if (!f.current) return;
 		p.current = t(f.current);
 		let e = v();
-		console.info(1111, e), p.current.setOption(e, !0), p.current.on("click", function(e) {
+		p.current.setOption(e, !0), p.current.on("click", function(e) {
 			n.onChartClick && n.onChartClick(e, n.options, n.dataList);
 		});
 		let r = () => {
@@ -154,7 +154,7 @@ var u = {
 		if (!p.current) return;
 		let e = v();
 		p.current.setOption(e, !0);
-	}, [n.option]), console.info(4545, n.option.yAxis?.position, h), /* @__PURE__ */ c("div", {
+	}, [n.option]), /* @__PURE__ */ c("div", {
 		className: e(n.className, u["auto-grid-echart"]),
 		children: [
 			/* @__PURE__ */ s("div", {
@@ -167,12 +167,12 @@ var u = {
 			}),
 			/* @__PURE__ */ s("div", {
 				className: e(u["xAxis-title"]),
-				style: n.option.xAxis?.position === "bottom" ? { bottom: h.titleBottomHeight + 20 } : n.option.xAxis?.position === "top" ? { top: h.titleTopHeight + 20 } : void 0,
+				style: ["bottom", "zero"].includes(n.option.xAxis?.position) ? { bottom: h.titleBottomHeight + 20 } : n.option.xAxis?.position === "top" ? { top: h.titleTopHeight + 20 } : void 0,
 				children: /* @__PURE__ */ s("span", { children: n.option.xAxis?.title })
 			}),
 			/* @__PURE__ */ s("div", {
 				className: e(u["yAxis-title"]),
-				style: n.option.yAxis?.position === "left" ? { left: h.titleLeftHeight } : n.option.yAxis?.position === "right" ? { right: h.titleRightHeight + 20 } : void 0,
+				style: ["left", "zero"].includes(n.option.yAxis?.position) ? { left: h.titleLeftHeight } : n.option.yAxis?.position === "right" ? { right: h.titleRightHeight + 20 } : void 0,
 				children: /* @__PURE__ */ s("span", { children: n.option.yAxis?.title })
 			})
 		]

package/dist/BubbleChart/{BubbleChart-BN3msB5e.js → BubbleChart-D2kLMmLH.js}

@@ -1,5 +1,5 @@
 import { n as e } from "../vendors/echarts.js";
-import { t } from "./AutoGridEChart-BQsZw7nv.js";
+import { t } from "./AutoGridEChart-CUNnImhh.js";
 import { forwardRef as n, useImperativeHandle as r, useRef as i } from "react";
 import { jsx as a } from "react/jsx-runtime";
 var o = n((n, o) => {
@@ -24,24 +24,28 @@ var o = n((n, o) => {
 				color: "#666666",
 				fontSize: 10,
 				show: !0,
+				hideOverlap: !n.options.xAxis?.label?.step,
 				rotate: n.options.xAxis?.label?.rotation?.toString() || "45"
 			},
 			min: n.options.xAxis?.min || void 0,
 			max: n.options.xAxis?.max || void 0,
 			title: n.options.xAxis?.title?.text || "",
-			position: n.options.xAxis?.position
+			position: n.options.xAxis?.position,
+			axisLine: { onZero: n.options.xAxis?.position === "zero" }
 		},
 		yAxis: {
 			axisLabel: {
 				color: "#666666",
 				fontSize: 10,
 				show: !0,
+				hideOverlap: !n.options.yAxis?.label?.step,
 				rotate: n.options.yAxis?.label?.rotation + " " || 45
 			},
 			min: n.options.yAxis?.min || void 0,
 			max: n.options.yAxis?.max || void 0,
 			title: n.options.yAxis?.title?.text,
-			position: n.options.yAxis?.position
+			position: n.options.yAxis?.position,
+			axisLine: { onZero: n.options.yAxis?.position === "zero" }
 		},
 		grid: {
 			top: 20,
@@ -130,7 +134,10 @@ var o = n((n, o) => {
 					return e.type === "fixed" && (e.field === n.options.xFields[0].tag && (t.xAxis = e.value || 0), (e.field === n.options.yFields[0].tag || e.field === "") && (t.yAxis = e.value || 0)), e.type === "dynamic" && (e.field === n.options.xFields[0].tag && (e.aggregate === "max" && (t.xAxis = d.max), e.aggregate === "min" && (t.xAxis = d.min), e.aggregate === "avg" && (t.xAxis = d.avg)), e.field === n.options.yFields[0].tag && (e.aggregate === "max" && (t.yAxis = f.max), e.aggregate === "min" && (t.yAxis = f.min), e.aggregate === "avg" && (t.yAxis = f.avg)), t.type = e.aggregate), t;
 				})
 			},
-			color: p.find((e) => e.title === t.name) ? p.find((e) => e.title === t.name).color : "",
+			color: (() => {
+				let e = p.find((e) => e.title === t.name);
+				return e ? e.color : "";
+			})(),
 			label: {
 				show: n.options.chart_label.enable,
 				distance: 5,

package/dist/BubbleChart/index.js

@@ -1,6 +1,6 @@
 import "../vendors/echarts.js";
-import "./AutoGridEChart-BQsZw7nv.js";
-import { t as e } from "./BubbleChart-BN3msB5e.js";
+import "./AutoGridEChart-CUNnImhh.js";
+import { t as e } from "./BubbleChart-D2kLMmLH.js";
 //#region src/components/BubbleChart/index.ts
 var t = e;
 //#endregion

package/dist/Scatterplot/{Scatterplot-BZC0IKc0.js → Scatterplot-BLA2S8uv.js}

@@ -1,4 +1,4 @@
-import { t as e } from "../BubbleChart/AutoGridEChart-BQsZw7nv.js";
+import { t as e } from "../BubbleChart/AutoGridEChart-CUNnImhh.js";
 import { forwardRef as t, useImperativeHandle as n, useRef as r } from "react";
 import { jsx as i } from "react/jsx-runtime";
 var a = t((t, a) => {
@@ -17,30 +17,36 @@ var a = t((t, a) => {
 			min: n,
 			avg: Number(r)
 		};
-	}, l = s(t.dataList), u = c(l.index0), d = c(l.index1), f = t.options.xFields[t.options.xFields.length - 1].colors || t.options.xFields[t.options.xFields.length - 1].color || [], p = {
+	}, l = s(t.dataList), u = c(l.index0), d = c(l.index1), f = t.options.xFields[t.options.xFields.length - 1].colors || t.options.xFields[t.options.xFields.length - 1].color || [];
+	console.info(t.options.xAxis?.label?.step);
+	let p = {
 		xAxis: {
 			axisLabel: {
 				color: "#666666",
 				fontSize: 10,
 				show: !0,
+				hideOverlap: !t.options.xAxis?.label?.step,
 				rotate: t.options.xAxis?.label?.rotation?.toString() || "45"
 			},
 			min: t.options.xAxis?.min || void 0,
 			max: t.options.xAxis?.max || void 0,
 			title: t.options.xAxis?.title?.text || "",
-			position: t.options.xAxis?.position
+			position: t.options.xAxis?.position,
+			axisLine: { onZero: t.options.xAxis?.position === "zero" }
 		},
 		yAxis: {
 			axisLabel: {
-				color: "#666666",
+				color: "#666",
 				fontSize: 10,
 				show: !0,
+				hideOverlap: !t.options.yAxis?.label?.step,
 				rotate: t.options.yAxis?.label?.rotation?.toString() || "45"
 			},
 			min: t.options.yAxis?.min || void 0,
 			max: t.options.yAxis?.max || void 0,
 			title: t.options.yAxis?.title?.text,
-			position: t.options.yAxis?.position
+			position: t.options.yAxis?.position,
+			axisLine: { onZero: t.options.yAxis?.position === "zero" }
 		},
 		tooltip: {
 			trigger: "item",
@@ -122,7 +128,10 @@ var a = t((t, a) => {
 					return e.type === "fixed" && (e.field === t.options.xFields[0].tag && (n.xAxis = e.value || 0), (e.field === t.options.yFields[0].tag || e.field === "") && (n.yAxis = e.value || 0)), e.type === "dynamic" && (e.field === t.options.xFields[0].tag && (e.aggregate === "max" && (n.xAxis = u.max), e.aggregate === "min" && (n.xAxis = u.min), e.aggregate === "avg" && (n.xAxis = u.avg)), e.field === t.options.yFields[0].tag && (e.aggregate === "max" && (n.yAxis = d.max), e.aggregate === "min" && (n.yAxis = d.min), e.aggregate === "avg" && (n.yAxis = d.avg)), n.type = e.aggregate), n;
 				})
 			},
-			color: f.find((t) => t.title === e.name) ? f.find((t) => t.title === e.name).color : "",
+			color: (() => {
+				let t = f.find((t) => t.title === e.name);
+				return t ? t.color : "";
+			})(),
 			label: {
 				show: t.options.chart_label.enable,
 				position: "top",

package/dist/Scatterplot/index.js

@@ -1,6 +1,6 @@
 import "../vendors/echarts.js";
-import "../BubbleChart/AutoGridEChart-BQsZw7nv.js";
-import { t as e } from "./Scatterplot-BZC0IKc0.js";
+import "../BubbleChart/AutoGridEChart-CUNnImhh.js";
+import { t as e } from "./Scatterplot-BLA2S8uv.js";
 //#region src/components/Scatterplot/index.ts
 var t = e;
 //#endregion

package/dist/components/BubbleChart/BubbleChart.type.d.ts

@@ -25,6 +25,7 @@ type BubbleChartConfig = {
         yAxis?: {
             label?: {
                 rotation: number;
+                step: boolean;
             };
             min?: number;
             max?: number;

package/dist/components/Scatterplot/Scatterplot.type.d.ts

@@ -18,6 +18,7 @@ type ScatterplotConfig = {
         yAxis?: {
             label?: {
                 rotation: number;
+                step: boolean;
             };
             min?: number;
             max?: number;

package/dist/index.js

@@ -15,9 +15,9 @@ import "./DeptsMemberSelector/Member-BY8mtQb0.js";
 import "./DeptsMemberSelector/Department-6R-BZNZ4.js";
 import { t as s } from "./ConfigProvider/ConfigProvider-CU5Z39Ex.js";
 import { t as c } from "./vendors/echarts.js";
-import "./BubbleChart/AutoGridEChart-BQsZw7nv.js";
-import { t as l } from "./BubbleChart/BubbleChart-BN3msB5e.js";
-import { t as u } from "./Scatterplot/Scatterplot-BZC0IKc0.js";
+import "./BubbleChart/AutoGridEChart-CUNnImhh.js";
+import { t as l } from "./BubbleChart/BubbleChart-D2kLMmLH.js";
+import { t as u } from "./Scatterplot/Scatterplot-BLA2S8uv.js";
 import { forwardRef as d, useEffect as f, useImperativeHandle as p, useRef as m } from "react";
 import { jsx as h, jsxs as g } from "react/jsx-runtime";
 //#region src/components/ProgressChart/ProgressChart.module.scss

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@baishuyun/ui-business",
-  "version": "6.0.1",
+  "version": "6.0.3",
   "description": "百数云业务组件库",
   "type": "module",
   "main": "dist/index.js",