From e8bbe0ac15b3d13e687054105de2b89974d2ba09 Mon Sep 17 00:00:00 2001 From: WeiHan <1844152414@qq.com> Date: Fri, 24 Jan 2025 07:10:25 +0000 Subject: [PATCH 1/4] update src/components/Process/approvalRecord.vue. Signed-off-by: WeiHan <1844152414@qq.com> --- src/components/Process/approvalRecord.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Process/approvalRecord.vue b/src/components/Process/approvalRecord.vue index 5c46a58..a4bd607 100644 --- a/src/components/Process/approvalRecord.vue +++ b/src/components/Process/approvalRecord.vue @@ -42,7 +42,7 @@ Date: Tue, 4 Feb 2025 21:11:48 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E5=BC=B9=E6=A1=86=E5=86=85=E5=AE=B9=E8=BF=87=E9=95=BF?= =?UTF-8?q?=E4=B8=8D=E6=8D=A2=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/styles/element-ui.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/assets/styles/element-ui.scss b/src/assets/styles/element-ui.scss index 5dd573d..e38c703 100644 --- a/src/assets/styles/element-ui.scss +++ b/src/assets/styles/element-ui.scss @@ -146,3 +146,8 @@ .el-form--inline .el-input { width: 240px; } + +/* 设置 el-message-box 消息弹框内容强制换行 */ +.el-message-box .el-message-box__message { + word-break: break-word; +} From fb7bca27eb17aedf33fe5a1e9be63eb43ec299eb Mon Sep 17 00:00:00 2001 From: QianRj <14974713+qianrj@user.noreply.gitee.com> Date: Thu, 6 Feb 2025 20:20:40 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20=E8=B7=AF?= =?UTF-8?q?=E7=94=B1=E5=AE=88=E5=8D=AB=E7=99=BD=E5=90=8D=E5=8D=95=E9=80=9A?= =?UTF-8?q?=E9=85=8D=E7=AC=A6=E6=AD=A3=E5=88=99=E8=A6=86=E7=9B=96=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/validate.ts | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/utils/validate.ts b/src/utils/validate.ts index 788095c..e2886e4 100644 --- a/src/utils/validate.ts +++ b/src/utils/validate.ts @@ -5,9 +5,13 @@ * @returns {Boolean} */ export function isPathMatch(pattern: string, path: string) { - const regexPattern = pattern.replace(/\//g, '\\/').replace(/\*\*/g, '.*').replace(/\*/g, '[^\\/]*') - const regex = new RegExp(`^${regexPattern}$`) - return regex.test(path) + const regexPattern = pattern + .replace(/\//g, '\\/') + .replace(/\*\*/g, '__DOUBLE_STAR__') + .replace(/\*/g, '[^\\/]*') + .replace(/__DOUBLE_STAR__/g, '.*'); + const regex = new RegExp(`^${regexPattern}$`); + return regex.test(path); } /** From b95a49c7d74e5c7f45cd7c65f45502edf7f203dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Fri, 7 Feb 2025 13:08:28 +0800 Subject: [PATCH 4/4] =?UTF-8?q?reset=20=E5=9B=9E=E6=BB=9A=E6=9C=89?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E7=9A=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.development b/.env.development index fa845e7..14e1335 100644 --- a/.env.development +++ b/.env.development @@ -11,7 +11,7 @@ VITE_APP_BASE_API = '/dev-api' VITE_APP_CONTEXT_PATH = '/' # 监控地址 -VITE_APP_MONITOR_ADMIN = 'http://localhost:9090/applications' +VITE_APP_MONITOR_ADMIN = 'http://localhost:9090/admin/applications' # SnailJob 控制台地址 VITE_APP_SNAILJOB_ADMIN = 'http://localhost:8800/snail-job'