mrxy-yk 1.9.7 → 1.9.9

package/dist/element-plus/type.d.ts

@@ -1,15 +0,0 @@
-import { TableColumnCtx } from 'element-plus';
-export namespace TableSlot {
-  export type Default<T> = {
-    row: T,
-    column: TableColumnCtx<T>,
-    $index: number
-  }
-  export type D<T> = TableSlot.Default<Partial<T>>
-
-  export type Header<T> = {
-    column: TableColumnCtx<T>,
-    $index: number
-  }
-  export type H<T> = TableSlot.Header<Partial<T>>
-}

package/dist/utils/echarts/modules/series/pie.d.ts

@@ -5,13 +5,22 @@ import { PieSeriesOption } from 'echarts';
  * 饼图配置
  */
 export declare class EcPieOption extends EcBasicOption {
+    /**
+     * 单位
+     */
     unit?: string;
     /**
      * 格式化图例
      * {name}{unit}{value}{percent}
      */
     lengthFormatter?: PieModule.ConstructorOption['lengthFormatter'];
+    /**
+     * 是否显示中心标签数据
+     */
     showCenterLabelData?: boolean;
+    /**
+     * 中心标签数据
+     */
     centerLabelData: number;
     constructor(option?: PieModule.ConstructorOption);
     /**

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

@@ -9,13 +9,22 @@ import "echarts";
 * 饼图配置
 */
 var EcPieOption = class extends EcBasicOption {
+	/**
+	* 单位
+	*/
 	unit = void 0;
 	/**
 	* 格式化图例
 	* {name}{unit}{value}{percent}
 	*/
 	lengthFormatter = void 0;
+	/**
+	* 是否显示中心标签数据
+	*/
 	showCenterLabelData = false;
+	/**
+	* 中心标签数据
+	*/
 	centerLabelData = 0;
 	constructor(option) {
 		const { unit, name, lengthFormatter, showCenterLabelData, labelDataFractionDigits = 2, labelFormatter, series: seriesOption = {}, option: ecOptionBasicOption } = option || {};
@@ -38,7 +47,7 @@ var EcPieOption = class extends EcBasicOption {
 			show: true,
 			position: "center",
 			formatter: (e) => {
-				let ret = `{total|${this.centerLabelData}}`;
+				let ret = `{total|${this.centerLabelData.toFixed(labelDataFractionDigits)}}`;
 				if (unit) ret += `\n{unit|${unit}}`;
 				if (name) ret += `\n{name|${name}}`;
 				return ret;
@@ -57,10 +66,15 @@ var EcPieOption = class extends EcBasicOption {
 		seriesOption.label = ObjectUtil.assignDeep(seriesLabel, seriesOption.label || {});
 		const series = [new EcPieSeries({
 			unit,
-			series: seriesOption
+			series: {
+				center: option.center,
+				radius: option.radius,
+				...seriesOption
+			}
 		})];
 		delete option?.option?.series;
 		const defaultOption = assignEcOptionBasicOption({
+			color: option.color,
 			legend: [{
 				right: 15,
 				top: "center",
@@ -81,7 +95,11 @@ var EcPieOption = class extends EcBasicOption {
 	*/
 	setSeriesData(data) {
 		if (this.ec) {
-			const option = { series: [{ data }] };
+			const series = this.currentOption.series[0];
+			const option = { series: [{
+				data,
+				label: series instanceof EcPieSeries ? series.seriesOption?.label : series?.label
+			}] };
 			const sum = data.reduce((ret, item) => {
 				const value = Number(item.value);
 				return ret + (Number.isNaN(value) ? 0 : value);
@@ -100,8 +118,8 @@ var EcPieOption = class extends EcBasicOption {
 					return this.lengthFormatter.replace(/\{name}/g, name).replace(/\{unit}/g, this.unit || "").replace(/\{value}/g, dataDic[name].value).replace(/\{percent}/g, percent);
 				} };
 			}
-			this.ec.setOption(option);
 			this.centerLabelData = sum;
+			this.ec.setOption(option);
 			return sum;
 		}
 	}

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

@@ -1,4 +1,4 @@
-import { BarSeriesOption, EChartsOption, LineSeriesOption, PictorialBarSeriesOption, SeriesOption, RadarSeriesOption } from 'echarts';
+import { BarSeriesOption, EChartsOption, LineSeriesOption, PieSeriesOption, PictorialBarSeriesOption, SeriesOption, RadarSeriesOption } from 'echarts';
 import { EcBasicSeries } from '.';
 // region 根配置
 export type EcOptionBasicOption = Omit<EChartsOption, 'series'> & {
@@ -75,6 +75,12 @@ export namespace PieModule {
   export type ConstructorOption = SeriesConstructorOption & {
     // 单位
     unit?: string
+    // 颜色
+    color?: string[]
+    // 环形饼图内外圆心半径
+    radius?: [string, string]
+    // 圆心位置
+    center?: [string, string]
     /**
      * 格式化图例
      * @example

package/package.json

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