@whitesev/utils 2.8.0 → 2.8.2

package/src/Progress.ts

@@ -1,114 +1,108 @@
-import { CommonUtil } from "./CommonUtil";
-import type { ProgressParamConfig } from "./types/Progress";
-
-export class Progress {
-	#config: ProgressParamConfig = {
-		/**
-		 * canvas元素节点
-		 */
-		canvasNode: null as any,
-		/**
-		 * 绘制角度
-		 */
-		deg: 95,
-		/**
-		 * 进度
-		 */
-		progress: 0,
-		/**
-		 * 绘制的线宽度
-		 */
-		lineWidth: 10,
-		/**
-		 * 绘制的背景颜色
-		 */
-		lineBgColor: "#1e637c",
-		/**
-		 * 绘制的线的颜色
-		 */
-		lineColor: "#25deff",
-		/**
-		 * 绘制的字体颜色
-		 */
-		textColor: "#000000",
-		/**
-		 * 绘制的字体大小(px)
-		 */
-		fontSize: 22,
-		/**
-		 * 绘制的圆的半径
-		 */
-		circleRadius: 50,
-	};
-	#ctx: CanvasRenderingContext2D = null as any;
-	#width: number = null as any;
-	#height: number = null as any;
-	/**
-	 *
-	 * @param paramConfig 配置信息
-	 */
-	constructor(paramConfig: ProgressParamConfig) {
-		this.#config = CommonUtil.assign(this.#config, paramConfig);
-		if (!(this.#config.canvasNode instanceof HTMLCanvasElement)) {
-			throw new Error("Utils.Progress 参数 canvasNode 必须是 HTMLCanvasElement");
-		}
-		this.init();
-	}
-	/**
-	 * 初始化
-	 */
-	private init() {
-		/* 获取画笔 */
-		let ctx = this.#config.canvasNode.getContext("2d");
-		if (ctx == null) {
-			throw new Error("Utils.Progress 获取画笔失败");
-		}
-		this.#ctx = ctx;
-		/* 元素宽度 */
-		this.#width = this.#config.canvasNode.width;
-		/* 元素高度 */
-		this.#height = this.#config.canvasNode.height;
-		/* 清除锯齿 */
-		if (window.devicePixelRatio) {
-			this.#config.canvasNode.style.width = this.#width + "px";
-			this.#config.canvasNode.style.height = this.#height + "px";
-			this.#config.canvasNode.height = this.#height * window.devicePixelRatio;
-			this.#config.canvasNode.width = this.#width * window.devicePixelRatio;
-			this.#ctx.scale(window.devicePixelRatio, window.devicePixelRatio);
-		}
-		/* 设置线宽 */
-		this.#ctx.lineWidth = this.#config.lineWidth;
-	}
-	/**
-	 * 绘制
-	 */
-	draw() {
-		let degActive = (this.#config.progress * 360) / 100;
-		/* 清除画布 */
-		this.#ctx.clearRect(0, 0, this.#width, this.#height);
-		/* 开始绘制底圆 */
-		this.#ctx.beginPath();
-		this.#ctx.arc(this.#width / 2, this.#height / 2, this.#config.circleRadius, 1, 8);
-		this.#ctx.strokeStyle = this.#config.lineBgColor;
-		this.#ctx.stroke();
-		/* 开始绘制动态圆 */
-		this.#ctx.beginPath();
-		this.#ctx.arc(
-			this.#width / 2,
-			this.#height / 2,
-			this.#config.circleRadius,
-			-Math.PI / 2,
-			(degActive * Math.PI) / 180 - Math.PI / 2
-		);
-		this.#ctx.strokeStyle = this.#config.lineColor;
-		this.#ctx.stroke();
-		/* 获取百分比 */
-		let txt = parseInt(this.#config.progress.toString()) + "%";
-		this.#ctx.font = this.#config.fontSize + "px SimHei";
-		/* 获取文本宽度 */
-		let w = this.#ctx.measureText(txt).width;
-		let h = this.#config.fontSize / 2;
-		this.#ctx.fillStyle = this.#config.textColor;
-		this.#ctx.fillText(txt, this.#width / 2 - w / 2, this.#height / 2 + h / 2);
-	}
-}
+import { CommonUtil } from "./CommonUtil";
+import type { ProgressParamConfig } from "./types/Progress";
+
+export class Progress {
+  #config: ProgressParamConfig = {
+    /**
+     * canvas元素节点
+     */
+    canvasNode: null as any,
+    /**
+     * 绘制角度
+     */
+    deg: 95,
+    /**
+     * 进度
+     */
+    progress: 0,
+    /**
+     * 绘制的线宽度
+     */
+    lineWidth: 10,
+    /**
+     * 绘制的背景颜色
+     */
+    lineBgColor: "#1e637c",
+    /**
+     * 绘制的线的颜色
+     */
+    lineColor: "#25deff",
+    /**
+     * 绘制的字体颜色
+     */
+    textColor: "#000000",
+    /**
+     * 绘制的字体大小(px)
+     */
+    fontSize: 22,
+    /**
+     * 绘制的圆的半径
+     */
+    circleRadius: 50,
+  };
+  #ctx: CanvasRenderingContext2D;
+  #width: number;
+  #height: number;
+  /**
+   *
+   * @param paramConfig 配置信息
+   */
+  constructor(paramConfig: ProgressParamConfig) {
+    this.#config = CommonUtil.assign(this.#config, paramConfig);
+    if (!(this.#config.canvasNode instanceof HTMLCanvasElement)) {
+      throw new Error("Utils.Progress 参数 canvasNode 必须是 HTMLCanvasElement");
+    }
+    /* 获取画笔 */
+    const ctx = this.#config.canvasNode.getContext("2d");
+    if (ctx == null) {
+      throw new Error("Utils.Progress 获取画笔失败");
+    }
+    this.#ctx = ctx;
+    /* 元素宽度 */
+    this.#width = this.#config.canvasNode.width;
+    /* 元素高度 */
+    this.#height = this.#config.canvasNode.height;
+    /* 清除锯齿 */
+    if (window.devicePixelRatio) {
+      this.#config.canvasNode.style.width = `${this.#width}px`;
+      this.#config.canvasNode.style.height = `${this.#height}px`;
+      this.#config.canvasNode.height = this.#height * window.devicePixelRatio;
+      this.#config.canvasNode.width = this.#width * window.devicePixelRatio;
+      this.#ctx.scale(window.devicePixelRatio, window.devicePixelRatio);
+    }
+    /* 设置线宽 */
+    this.#ctx.lineWidth = this.#config.lineWidth;
+  }
+  /**
+   * 绘制
+   */
+  draw() {
+    const degActive = (this.#config.progress * 360) / 100;
+    /* 清除画布 */
+    this.#ctx.clearRect(0, 0, this.#width, this.#height);
+    /* 开始绘制底圆 */
+    this.#ctx.beginPath();
+    this.#ctx.arc(this.#width / 2, this.#height / 2, this.#config.circleRadius, 1, 8);
+    this.#ctx.strokeStyle = this.#config.lineBgColor;
+    this.#ctx.stroke();
+    /* 开始绘制动态圆 */
+    this.#ctx.beginPath();
+    this.#ctx.arc(
+      this.#width / 2,
+      this.#height / 2,
+      this.#config.circleRadius,
+      -Math.PI / 2,
+      (degActive * Math.PI) / 180 - Math.PI / 2
+    );
+    this.#ctx.strokeStyle = this.#config.lineColor;
+    this.#ctx.stroke();
+    /* 获取百分比 */
+    const txt = `${parseInt(this.#config.progress.toString())}%`;
+    this.#ctx.font = `${this.#config.fontSize}px SimHei`;
+    /* 获取文本宽度 */
+    const w = this.#ctx.measureText(txt).width;
+    const h = this.#config.fontSize / 2;
+    this.#ctx.fillStyle = this.#config.textColor;
+    this.#ctx.fillText(txt, this.#width / 2 - w / 2, this.#height / 2 + h / 2);
+  }
+}

package/src/TryCatch.ts

@@ -1,86 +1,86 @@
-import type { UtilsTryCatchConfig, UtilsTryCatchType } from "./types/TryCatch";
-
-export const TryCatch = function (...args: any) {
-	/* 定义变量和函数 */
-	let callbackFunction = null;
-	let context = null;
-	let handleError = (error: Error) => {};
-	let defaultDetails = {
-		log: true,
-	};
-
-	const TryCatchCore = {
-		/**
-		 *
-		 * @param paramDetails 配置
-		 * @returns
-		 */
-		config(paramDetails: UtilsTryCatchConfig) {
-			defaultDetails = Object.assign(defaultDetails, paramDetails);
-			return TryCatchCore;
-		},
-		/**
-		 * 处理错误
-		 * @param handler
-		 */
-		error(handler: ((...args: any[]) => any) | string | Function) {
-			handleError = handler as (error: Error) => void;
-			return TryCatchCore;
-		},
-		/**
-		 * 执行传入的函数并捕获其可能抛出的错误，并通过传入的错误处理函数进行处理。
-		 * @param callback 待执行函数，可以是 function 或者 string 类型。如果是 string 类型，则会被当做代码进行执行。
-		 * @param __context__ 待执行函数的作用域，用于apply指定
-		 * @returns 如果函数有返回值，则返回该返回值；否则返回 tryCatchObj 函数以支持链式调用。
-		 * @throws {Error} 如果传入参数不符合要求，则会抛出相应类型的错误。
-		 */
-		run<A extends any[], R>(
-			callback: ((...args: A) => R) | string | Function,
-			__context__?: any
-		): UtilsTryCatchType {
-			callbackFunction = callback;
-			context = __context__ || this;
-			let result = executeTryCatch(callbackFunction, handleError, context);
-			return result !== void 0 ? result : (TryCatchCore as any as UtilsTryCatchType);
-		},
-	};
-
-	/**
-	 * 执行传入的函数并捕获其可能抛出的错误，并通过传入的错误处理函数进行处理。
-	 * @param callback - 待执行函数，可以是 function 或者 string 类型。如果是 string 类型，则会被当做代码进行执行。
-	 * @param handleErrorFunc - 错误处理函数，可以是 function 或者 string 类型。如果是 string 类型，则会被当做代码进行执行。
-	 * @param funcThis - 待执行函数的作用域，用于apply指定
-	 * @returns 如果函数有返回值，则返回该返回值；否则返回 undefined。
-	 */
-	function executeTryCatch<A extends any[], R>(
-		callback: string | ((...args: A) => R) | Function,
-		handleErrorFunc: string | ((...args: any[]) => any),
-		funcThis?: any
-	) {
-		let result = void 0;
-		try {
-			if (typeof callback === "string") {
-				result = new Function(callback).apply(funcThis, args);
-			} else {
-				result = (callback as Function).apply(funcThis, args);
-			}
-		} catch (error) {
-			if (defaultDetails.log) {
-				callback = callback as Function;
-				console.log(`%c ${callback?.name ? callback?.name : callback + "出现错误"} `, "color: #f20000");
-				console.log(`%c 错误原因：${error}`, "color: #f20000");
-				console.trace(callback);
-			}
-			if (handleErrorFunc) {
-				if (typeof handleErrorFunc === "string") {
-					result = new Function(handleErrorFunc).apply(funcThis, [...args, error]);
-				} else {
-					result = handleErrorFunc.apply(funcThis, [...args, error]);
-				}
-			}
-		}
-		return result;
-	}
-
-	return TryCatchCore;
-};
+import type { UtilsTryCatchConfig, UtilsTryCatchType } from "./types/TryCatch";
+
+export const TryCatch = function (...args: any) {
+  /* 定义变量和函数 */
+  let callbackFunction = null;
+  let context = null;
+  let handleError: (error: Error) => void = () => {};
+  let defaultDetails = {
+    log: true,
+  };
+
+  const TryCatchCore = {
+    /**
+     *
+     * @param paramDetails 配置
+     * @returns
+     */
+    config(paramDetails: UtilsTryCatchConfig) {
+      defaultDetails = Object.assign(defaultDetails, paramDetails);
+      return TryCatchCore;
+    },
+    /**
+     * 处理错误
+     * @param handler
+     */
+    error(handler: ((...args: any[]) => any) | string | ((...args: any[]) => any)) {
+      handleError = handler as (error: Error) => void;
+      return TryCatchCore;
+    },
+    /**
+     * 执行传入的函数并捕获其可能抛出的错误，并通过传入的错误处理函数进行处理。
+     * @param callback 待执行函数，可以是 function 或者 string 类型。如果是 string 类型，则会被当做代码进行执行。
+     * @param __context__ 待执行函数的作用域，用于apply指定
+     * @returns 如果函数有返回值，则返回该返回值；否则返回 tryCatchObj 函数以支持链式调用。
+     * @throws {Error} 如果传入参数不符合要求，则会抛出相应类型的错误。
+     */
+    run<A extends any[], R>(
+      callback: ((...args: A) => R) | string | ((...args: any[]) => any),
+      __context__?: any
+    ): UtilsTryCatchType {
+      callbackFunction = callback;
+      context = __context__ || this;
+      const result = executeTryCatch(callbackFunction, handleError, context);
+      return result !== void 0 ? result : (TryCatchCore as any as UtilsTryCatchType);
+    },
+  };
+
+  /**
+   * 执行传入的函数并捕获其可能抛出的错误，并通过传入的错误处理函数进行处理。
+   * @param callback - 待执行函数，可以是 function 或者 string 类型。如果是 string 类型，则会被当做代码进行执行。
+   * @param handleErrorFunc - 错误处理函数，可以是 function 或者 string 类型。如果是 string 类型，则会被当做代码进行执行。
+   * @param funcThis - 待执行函数的作用域，用于apply指定
+   * @returns 如果函数有返回值，则返回该返回值；否则返回 undefined。
+   */
+  function executeTryCatch<A extends any[], R>(
+    callback: string | ((...args: A) => R) | ((...args: any[]) => any),
+    handleErrorFunc: string | ((...args: any[]) => any),
+    funcThis?: any
+  ) {
+    let result = void 0;
+    try {
+      if (typeof callback === "string") {
+        result = new Function(callback).apply(funcThis, args);
+      } else {
+        result = (callback as (...args: any[]) => any).apply(funcThis, args);
+      }
+    } catch (error) {
+      if (defaultDetails.log) {
+        callback = callback as (...args: any[]) => any;
+        console.log(`%c ${callback?.name ? callback?.name : `${callback}`} `, "color: #f20000");
+        console.log(`%c ${error}`, "color: #f20000");
+        console.trace(callback);
+      }
+      if (handleErrorFunc) {
+        if (typeof handleErrorFunc === "string") {
+          result = new Function(handleErrorFunc).apply(funcThis, [...args, error]);
+        } else {
+          result = handleErrorFunc.apply(funcThis, [...args, error]);
+        }
+      }
+    }
+    return result;
+  }
+
+  return TryCatchCore;
+};