From 2f32b53d1928c380e1fb61f338dd44a800a1370f Mon Sep 17 00:00:00 2001 From: kuaifan Date: Wed, 12 Nov 2025 07:07:00 +0000 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=20getDomain=20?= =?UTF-8?q?=E5=87=BD=E6=95=B0=E4=BB=A5=E6=94=AF=E6=8C=81=E5=8F=AF=E9=80=89?= =?UTF-8?q?=E7=9A=84=E5=B0=8F=E5=86=99=E8=BD=AC=E6=8D=A2=E5=8F=82=E6=95=B0?= =?UTF-8?q?=EF=BC=9B=E6=9B=B4=E6=96=B0=20getObject=20=E5=87=BD=E6=95=B0?= =?UTF-8?q?=E7=9A=84=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- electron/lib/utils.js | 5 +++-- resources/assets/js/functions/common.js | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/electron/lib/utils.js b/electron/lib/utils.js index f7fa0f063..a1bce2940 100644 --- a/electron/lib/utils.js +++ b/electron/lib/utils.js @@ -274,10 +274,11 @@ const utils = { * @param weburl * @returns {string|string} */ - getDomain(weburl) { + getDomain(weburl, toLowerCase = true) { const urlReg = /http(s)?:\/\/([^\/]+)/i; const domain = `${weburl}`.match(urlReg); - return ((domain != null && domain.length > 0) ? domain[2] : ""); + const result = ((domain != null && domain.length > 0) ? domain[2] : ""); + return toLowerCase ? result.toLowerCase() : result; }, /** diff --git a/resources/assets/js/functions/common.js b/resources/assets/js/functions/common.js index f167b3d8a..38f42b827 100755 --- a/resources/assets/js/functions/common.js +++ b/resources/assets/js/functions/common.js @@ -518,7 +518,7 @@ const timezone = require("dayjs/plugin/timezone"); * @param defaultValue * @returns {string|*} */ - getObject(obj, keys, defaultValue = undefined) { + getObject(obj, keys, defaultValue = "") { let keyArray; if (typeof keys === 'string') { keyArray = keys.replace(/,/g, "|").replace(/\./g, "|").split("|");