From 5963f3e53ac89baebc65f9a71a123ec2c5b88df5 Mon Sep 17 00:00:00 2001 From: bootx Date: Wed, 1 Jul 2026 11:34:55 +0800 Subject: [PATCH] =?UTF-8?q?refactor(h5):=20=E5=B7=A5=E5=85=B7=E5=87=BD?= =?UTF-8?q?=E6=95=B0=E6=B6=88=E9=99=A4=E5=89=AF=E4=BD=9C=E7=94=A8=E4=B8=89?= =?UTF-8?q?=E5=85=83=E4=B8=8E=E9=87=8D=E5=A4=8D=E8=B0=83=E7=94=A8,=20?= =?UTF-8?q?=E6=94=B9=E7=94=A8=20if=20=E8=AF=AD=E5=8F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/shared/utils/index.ts | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/src/shared/utils/index.ts b/src/shared/utils/index.ts index 9bbea15..5f8dcbb 100644 --- a/src/shared/utils/index.ts +++ b/src/shared/utils/index.ts @@ -3,7 +3,12 @@ import { isObject } from './is/index' export function deepMerge(src: any = {}, target: any = {}): T { let key: string for (key in target) { - src[key] = isObject(src[key]) ? deepMerge(src[key], target[key]) : (src[key] = target[key]) + if (isObject(src[key])) { + src[key] = deepMerge(src[key], target[key]) + } + else { + src[key] = target[key] + } } return src } @@ -17,7 +22,11 @@ export function deepMerge(src: any = {}, target: any = {}): T { function addLight(color: string, amount: number) { const cc = Number.parseInt(color, 16) + amount const c = cc > 255 ? 255 : cc - return c.toString(16).length > 1 ? c.toString(16) : `0${c.toString(16)}` + const hex = c.toString(16) + if (hex.length > 1) { + return hex + } + return `0${hex}` } /** @@ -78,7 +87,11 @@ export function arrayTrans(arr: number[]): number[][] { function subtractLight(color: string, amount: number) { const cc = Number.parseInt(color, 16) - amount const c = cc < 0 ? 0 : cc - return c.toString(16).length > 1 ? c.toString(16) : `0${c.toString(16)}` + const hex = c.toString(16) + if (hex.length > 1) { + return hex + } + return `0${hex}` } export function hexToRgba(hex: string, opacity: number) {