From b1f0b3c096cdf4401e135b2950c2a97791c3f928 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 07 二月 2025 14:20:16 +0800
Subject: [PATCH] !183 同步修复一些问题 Merge pull request !183 from 疯狂的狮子Li/dev
---
.env.development | 2 +-
src/assets/styles/element-ui.scss | 5 +++++
src/utils/validate.ts | 10 +++++++---
src/components/Process/approvalRecord.vue | 2 +-
4 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/.env.development b/.env.development
index fa845e7..14e1335 100644
--- a/.env.development
+++ b/.env.development
@@ -11,7 +11,7 @@
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'
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;
+}
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 @@
<el-table-column prop="updateTime" label="缁撴潫鏃堕棿" width="160" :show-overflow-tooltip="true" sortable align="center"></el-table-column>
<el-table-column
prop="runDuration"
- label="杩愯鏃跺父"
+ label="杩愯鏃堕暱"
width="140"
:show-overflow-tooltip="true"
sortable
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);
}
/**
--
Gitblit v1.9.3