Skip to content

Commit b1f0b3c

Browse files
JavaLionLigitee-org
authored andcommitted
!183 同步修复一些问题
Merge pull request !183 from 疯狂的狮子Li/dev
2 parents b2a4157 + b95a49c commit b1f0b3c

File tree

4 files changed

+14
-5
lines changed

4 files changed

+14
-5
lines changed

.env.development

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ VITE_APP_BASE_API = '/dev-api'
1111
VITE_APP_CONTEXT_PATH = '/'
1212

1313
# 监控地址
14-
VITE_APP_MONITOR_ADMIN = 'http://localhost:9090/applications'
14+
VITE_APP_MONITOR_ADMIN = 'http://localhost:9090/admin/applications'
1515

1616
# SnailJob 控制台地址
1717
VITE_APP_SNAILJOB_ADMIN = 'http://localhost:8800/snail-job'

src/assets/styles/element-ui.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,3 +146,8 @@
146146
.el-form--inline .el-input {
147147
width: 240px;
148148
}
149+
150+
/* 设置 el-message-box 消息弹框内容强制换行 */
151+
.el-message-box .el-message-box__message {
152+
word-break: break-word;
153+
}

src/components/Process/approvalRecord.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<el-table-column prop="updateTime" label="结束时间" width="160" :show-overflow-tooltip="true" sortable align="center"></el-table-column>
4343
<el-table-column
4444
prop="runDuration"
45-
label="运行时常"
45+
label="运行时长"
4646
width="140"
4747
:show-overflow-tooltip="true"
4848
sortable

src/utils/validate.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,13 @@
55
* @returns {Boolean}
66
*/
77
export function isPathMatch(pattern: string, path: string) {
8-
const regexPattern = pattern.replace(/\//g, '\\/').replace(/\*\*/g, '.*').replace(/\*/g, '[^\\/]*')
9-
const regex = new RegExp(`^${regexPattern}$`)
10-
return regex.test(path)
8+
const regexPattern = pattern
9+
.replace(/\//g, '\\/')
10+
.replace(/\*\*/g, '__DOUBLE_STAR__')
11+
.replace(/\*/g, '[^\\/]*')
12+
.replace(/__DOUBLE_STAR__/g, '.*');
13+
const regex = new RegExp(`^${regexPattern}$`);
14+
return regex.test(path);
1115
}
1216

1317
/**

0 commit comments

Comments
 (0)