@baishuyun/ui-business 5.1.5 → 5.1.6

package/dist/BubbleChart/{AutoGridEChart-B2a7zGgi.js → AutoGridEChart-nA3DwlqB.js}

@@ -19,9 +19,10 @@ function l(e, t, n, r, i) {
 		return t && t.trim() || e.textFont || e.font;
 	}
 	function f(e, t) {
-		t.fontSize = parseInt(t.fontSize), t.fontFamily = t.fontFamily || "verdana";
-		let n = d(t), r = document.createElement("canvas").getContext("2d") || {};
-		return r.font = n, r?.measureText(e)?.width || 0;
+		let n = { ...t };
+		n.fontSize = parseInt(n.fontSize), n.fontFamily = n.fontFamily || "verdana";
+		let r = d(n), i = document.createElement("canvas").getContext("2d") || {};
+		return i.font = r, i?.measureText(e)?.width || 0;
 	}
 	function p(e, t) {
 		if (Array.isArray(e)) for (let n = 0, r = e.length; n < r && t.apply(e[n], [n, e[n]]) !== !1; n++);
@@ -74,52 +75,53 @@ function l(e, t, n, r, i) {
 		return n > 10 ? e = 20 : n > 5 && (e = 10), e;
 	}
 	if (e.legend.type === "scroll") return s + 10 + m() + h() + g();
+	let _ = e.legend.itemWidth || 25, v = e.legend.itemGap ?? 10;
 	p(t, (e, t) => {
 		let i = f(t, r || {
 			fontFamily: "verdana",
 			fontSize: 10,
 			fontStyle: "normal",
 			fontWeight: "normal"
-		});
-		o += i + 10 + 14 + 5, o > n && (a++, o = i + 10 + 14 + 5);
+		}) + v + _ + 5;
+		o > 0 && o + i > n ? (a++, o = i) : o += i;
 	});
-	function _(e, t, n, r) {
-		let i = r.legend;
-		if (!i.show) return 0;
-		let a = n.itemHeight + n.padding, o = i.itemWidth || 12, s = e.map((e) => e.name || e), c = (e) => {
-			let t = (e.match(/[\u4e00-\u9fa5]/g) || []).length, n = e.length - t;
-			return t * 12 + n * 7;
-		};
-		if (r.legend.left === "left" || r.legend.right === "right") {
-			let n = Math.max(...s.map((e) => c(e))), r = o + 5 + n;
-			return Math.ceil(a * e.length / t) * (r + 10) + 20;
+	function y(e, t, n, i) {
+		let a = i.legend;
+		if (!a.show) return 0;
+		let o = n.itemHeight || 25, s = n.itemGap ?? 10, c = a.itemWidth || 25, l = e.map((e) => e.name || e), u = n.textStyle || r || {
+			fontSize: 12,
+			fontFamily: "verdana"
+		}, d = (e) => f(e, u);
+		if (i.legend.left === "left" || i.legend.right === "right") {
+			let n = Math.max(0, ...l.map((e) => d(e))), r = c + 5 + n;
+			return Math.ceil(o * e.length / t) * (r + s) + 20;
 		}
 		return 0;
 	}
-	let v = _(u, i, e.legend, e), y = (a + 1) * (s + 10), b = m(), x = h(), S = -5, C = -5, w = -5, T = -5;
+	let b = y(u, i, e.legend, e), x = e.legend.itemHeight || 25, S = e.legend.itemGap ?? 10, C = typeof e.legend.padding == "number" ? e.legend.padding : Array.isArray(e.legend.padding) ? e.legend.padding[0] ?? 5 : 5, w = (a + 1) * x + a * S + C * 2, T = m(), E = h(), D = -5, O = -5, k = -5, A = -5;
 	return {
 		grid: {
 			top: (() => {
 				let t = 20;
-				return e.xAxis.position === "top" && (t += b + 10), e.legend.show && e.legend.top === "top" && (C += y, t += y), e.xAxis.title !== "" && e.xAxis.position === "top" && (t += 30), t;
+				return e.xAxis.position === "top" && (t += T + 10), e.legend.show && (e.legend.top === "top" || e.legend.top === "") && (O += w, t += w), e.xAxis.title !== "" && e.xAxis.position === "top" && (t += 30), t;
 			})(),
 			bottom: (() => {
 				let t = 20;
-				return e.xAxis.position === "bottom" && (t += b + 10), e.legend.show && (e.legend.top === "bottom" || e.legend.top === "") && (S += y, t += y), e.xAxis.title !== "" && e.xAxis.position === "bottom" && (t += 30), t;
+				return e.xAxis.position === "bottom" && (t += T + 10), e.legend.show && e.legend.top === "bottom" && (D += w, t += w), e.xAxis.title !== "" && e.xAxis.position === "bottom" && (t += 30), t;
 			})(),
 			left: (() => {
 				let t = 20;
-				return e.yAxis.position === "left" && (t += x), e.legend.show && e.legend.left === "left" && (w += v, t += v), e.yAxis.title !== "" && e.yAxis.position === "left" && (t += 10), t;
+				return e.yAxis.position === "left" && (t += E), e.legend.show && e.legend.left === "left" && (k += b, t += b), e.yAxis.title !== "" && e.yAxis.position === "left" && (t += 10), t;
 			})(),
 			right: (() => {
-				let t = 20 + x;
-				return e.yAxis.position === "right" && (t += 10), e.legend.show && e.legend.left === "right" && (T += v, t += v), e.yAxis.title !== "" && e.yAxis.position === "right" && (t += 30), t;
+				let t = 20;
+				return e.yAxis.position === "right" && (t += E + 10), e.legend.show && e.legend.left === "right" && (A += b, t += b), e.yAxis.title !== "" && e.yAxis.position === "right" && (t += 30), t;
 			})()
 		},
-		titleBottomHeight: S,
-		titleTopHeight: C,
-		titleLeftHeight: w,
-		titleRightHeight: T
+		titleBottomHeight: D,
+		titleTopHeight: O,
+		titleLeftHeight: k,
+		titleRightHeight: A
 	};
 }
 //#endregion

package/dist/BubbleChart/{BubbleChart-BPIsaE-C.js → BubbleChart-Bq-qzSTk.js}

@@ -1,5 +1,5 @@
 import { n as e } from "../vendors/echarts.js";
-import { t } from "./AutoGridEChart-B2a7zGgi.js";
+import { t } from "./AutoGridEChart-nA3DwlqB.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) => {
@@ -80,6 +80,7 @@ var o = n((n, o) => {
 			padding: 10,
 			itemWidth: 12,
 			itemHeight: 14,
+			type: n.options.legend.type || "plain",
 			textStyle: { fontStyle: "normal" }
 		},
 		graphic: n.options.guideline?.map((e) => ({
@@ -125,7 +126,7 @@ var o = n((n, o) => {
 							distance: 5
 						}
 					};
-					return e.type === "fixed" && (e.field === n.options.xFields[0].tag && (t.xAxis = e.value || 0), e.field === n.options.yFields[0].tag && (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;
+					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 : "",

package/dist/BubbleChart/index.js

@@ -1,6 +1,6 @@
 import "../vendors/echarts.js";
-import "./AutoGridEChart-B2a7zGgi.js";
-import { t as e } from "./BubbleChart-BPIsaE-C.js";
+import "./AutoGridEChart-nA3DwlqB.js";
+import { t as e } from "./BubbleChart-Bq-qzSTk.js";
 //#region src/components/BubbleChart/index.ts
 var t = e;
 //#endregion

package/dist/Scatterplot/{Scatterplot-C1XSsAKR.js → Scatterplot-COVrzURp.js}

@@ -1,4 +1,4 @@
-import { t as e } from "../BubbleChart/AutoGridEChart-B2a7zGgi.js";
+import { t as e } from "../BubbleChart/AutoGridEChart-nA3DwlqB.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) => {
@@ -73,6 +73,7 @@ var a = t((t, a) => {
 			padding: 10,
 			itemWidth: 12,
 			itemHeight: 14,
+			type: t.options.legend.type || "plain",
 			textStyle: { fontStyle: "normal" }
 		},
 		graphic: t.options.guideline?.map((e) => ({
@@ -117,7 +118,7 @@ var a = t((t, a) => {
 							color: e.color
 						}
 					};
-					return e.type === "fixed" && (e.field === t.options.xFields[0].tag && (n.xAxis = e.value || 0), e.field === t.options.yFields[0].tag && (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;
+					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 : "",

package/dist/Scatterplot/index.js

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

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

@@ -48,6 +48,7 @@ type BubbleChartConfig = {
         legend: {
             enable: boolean;
             position: string;
+            type?: string;
         };
         guideline?: Array<{
             label: string;

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

@@ -41,6 +41,7 @@ type ScatterplotConfig = {
         legend: {
             enable: boolean;
             position: string;
+            type?: string;
         };
         guideline?: Array<{
             label: string;

package/dist/index.js

@@ -15,9 +15,9 @@ import "./DeptsMemberSelector/Member-B4tEHksu.js";
 import "./DeptsMemberSelector/Department-12ftZfXD.js";
 import { t as s } from "./ConfigProvider/ConfigProvider-C0c1mKeR.js";
 import { t as c } from "./vendors/echarts.js";
-import "./BubbleChart/AutoGridEChart-B2a7zGgi.js";
-import { t as l } from "./BubbleChart/BubbleChart-BPIsaE-C.js";
-import { t as u } from "./Scatterplot/Scatterplot-C1XSsAKR.js";
+import "./BubbleChart/AutoGridEChart-nA3DwlqB.js";
+import { t as l } from "./BubbleChart/BubbleChart-Bq-qzSTk.js";
+import { t as u } from "./Scatterplot/Scatterplot-COVrzURp.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": "5.1.5",
+  "version": "5.1.6",
   "description": "百数云业务组件库",
   "type": "module",
   "main": "dist/index.js",
@@ -43,7 +43,7 @@
   "author": "BSY Team",
   "license": "MIT",
   "peerDependencies": {
-    "@baishuyun/ui-base": ">=2.3.3",
+    "@baishuyun/ui-base": ">=2.3.4",
     "ahooks": ">=3.7.0",
     "antd": ">=5.1.2",
     "immer": "^10.0.0",
@@ -67,7 +67,7 @@
     "sass": "^1.90.0",
     "vite": "^8.0.0",
     "vite-plugin-dts": "^4.5.4",
-    "@baishuyun/ui-base": "2.3.3"
+    "@baishuyun/ui-base": "2.3.4"
   },
   "dependencies": {
     "autoprefixer": "^10.4.21",