Browse Source

!183 同步修复一些问题
Merge pull request !183 from 疯狂的狮子Li/dev

疯狂的狮子Li 2 tháng trước cách đây
mục cha
commit
b1f0b3c096

+ 1 - 1
.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'

+ 5 - 0
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;
+}

+ 1 - 1
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

+ 7 - 3
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);
 }
 
 /**