mrxy-yk 1.8.7 → 1.9.0

package/dist/utils/echarts/hooks/index.d.ts

@@ -64,8 +64,14 @@ export declare function useEcLineOption(...args: ConstructorParameters<typeof Ec
  * const chartHook = useEcPieOption({
  *   name: '报警种类',
  *   unit: '次',
- *   lengthFormatter: '{name}{unit}{value}{percent}',
+ *   // 格式化图例
+ *   lengthFormatter: '{name}{value}{unit}({percent}%)',
+ *   // 标签显示在中心
  *   showCenterLabelData: true,
+ *   // 标签数据格式化
+ *   labelFormatter: '{total}\n{unit}\n{name}',
+ *   // 中心标签数据保留位数
+ *   centerLabelDataFractionDigits: 2
  * })
  * chartHook.setSeriesData([
  *   {name: 'A', value: 100},

package/dist/utils/echarts/hooks/index.js

@@ -79,8 +79,14 @@ function useEcLineOption(...args) {
 * const chartHook = useEcPieOption({
 *   name: '报警种类',
 *   unit: '次',
-*   lengthFormatter: '{name}{unit}{value}{percent}',
+*   // 格式化图例
+*   lengthFormatter: '{name}{value}{unit}({percent}%)',
+*   // 标签显示在中心
 *   showCenterLabelData: true,
+*   // 标签数据格式化
+*   labelFormatter: '{total}\n{unit}\n{name}',
+*   // 中心标签数据保留位数
+*   centerLabelDataFractionDigits: 2
 * })
 * chartHook.setSeriesData([
 *   {name: 'A', value: 100},

package/dist/utils/echarts/modules/series/pie.js

@@ -18,7 +18,7 @@ var EcPieOption = class extends EcBasicOption {
 	showCenterLabelData = false;
 	centerLabelData = 0;
 	constructor(option) {
-		const { unit, name, lengthFormatter, showCenterLabelData, labelFormatter, series: seriesOption = {}, option: ecOptionBasicOption } = option || {};
+		const { unit, name, lengthFormatter, showCenterLabelData, labelDataFractionDigits = 2, labelFormatter, series: seriesOption = {}, option: ecOptionBasicOption } = option || {};
 		const seriesLabel = { rich: {
 			name: {
 				fontSize: 14,
@@ -48,9 +48,11 @@ var EcPieOption = class extends EcBasicOption {
 			if (typeof labelFormatter === "function") return labelFormatter({
 				name,
 				unit: this.unit,
-				total: this.centerLabelData
+				total: this.centerLabelData,
+				value: e.value,
+				e
 			});
-			return labelFormatter.replace(/\{name}/g, `{name|${name}}`).replace(/\{unit}/g, `{unit|${unit || ""}}`).replace(/\{total}/g, `{total|${this.centerLabelData.toFixed(2)}}`);
+			return labelFormatter.replace(/\{name}/g, `{name|${name}}`).replace(/\{unit}/g, `{unit|${unit || ""}}`).replace(/\{value}/g, `{value|${e.value || ""}}`).replace(/\{total}/g, `{total|${this.centerLabelData.toFixed(labelDataFractionDigits)}}`);
 		} });
 		seriesOption.label = ObjectUtil.assignDeep(seriesLabel, seriesOption.label || {});
 		const series = [new EcPieSeries({

package/dist/utils/echarts/modules/type.d.ts

@@ -86,17 +86,19 @@ export namespace PieModule {
         unit: string,
         value: number,
         percent: string,
-        total: number
+        total: number,
       }): string
     }
     // 是否显示中心标签数据
     showCenterLabelData?: boolean
+    // 标签数据保留位数，缺省值：2
+    labelDataFractionDigits?: number
     /**
      * 标签数据格式化
      * @example
-     * {name}{unit}{total}
+     * {unit}{total}{name}
      */
-    labelFormatter?: string | { (params: { name: string, unit: string, total: number }): string }
+    labelFormatter?: string | { (params: { name: string, unit: string, total: number, value: number, e: any }): string }
     option?: EcOptionBasicOption
   }
 }

package/dist/utils/echarts/utils/index.js

@@ -7,7 +7,7 @@ var resizeObserver = new ResizeObserver(ObjectUtil.debounce((entries) => {
 		const dom = entries[i].target;
 		const raw = resizePool.get(dom);
 		const { width, height } = dom.getBoundingClientRect();
-		if (raw.size.width !== width || raw.size.height !== height) {
+		if (raw.size.width && raw.size.height && width && height) {
 			let duration = 500;
 			if (dom.dataset.resizeInit === "true") {
 				dom.dataset.resizeInit = "false";
@@ -18,6 +18,8 @@ var resizeObserver = new ResizeObserver(ObjectUtil.debounce((entries) => {
 				easing: "cubicOut"
 			} });
 		}
+		raw.size.width = width;
+		raw.size.height = height;
 	}
 }, 50));
 var EChartsUtil = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mrxy-yk",
-  "version": "1.8.7",
+  "version": "1.9.0",
   "private": false,
   "type": "module",
   "description": "A collection of Vue 3 components and utilities",