ASW-179 fix: 修改页面路径

4 files changed, 21 insertions, 16 deletions

diff --git a/src/router/permissions.js b/src/router/permissions.js
index 19b1a5a..7714ac4 100644
--- a/src/router/permissions.js
+++ b/src/router/permissions.js
@@ -44,7 +44,7 @@ const systemRoutes = {
       },
     },
     {
-      path: '/:workspace?/applications/:branch/merge/:id/detail',
+      path: '/:workspace?/applications/:branch/merge/:id',
       name: 'application_merge_detail',
       component: () => import('@/views/applications/mergeDetail.vue'),
       meta: {
@@ -68,7 +68,7 @@ const systemRoutes = {
       },
     },
     {
-      path: '/:workspace?/applications/:branch/history/:id/detail',
+      path: '/:workspace?/applications/:branch/history/:id',
       name: 'application_history_detail',
       component: () => import('@/views/applications/historyDetail.vue'),
       meta: {
@@ -116,7 +116,7 @@ const systemRoutes = {
       },
     },
     {
-      path: '/:workspace?/pcaps/:id/detail',
+      path: '/:workspace?/pcaps/:id',
       name: 'pcap_view',
       component: () => import('@/views/pcaps/detail.vue'),
       meta: {
@@ -165,7 +165,7 @@ const systemRoutes = {
       },
     },
     {
-      path: '/:workspace?/workspace/members',
+      path: '/:workspace?/members',
       name: 'workspace_members',
       component: () => import('@/views/workspaces/members/index.vue'),
       meta: {
@@ -197,14 +197,6 @@ const systemRoutes = {
       },
     },
     {
-      path: '/:workspace?/packages/:id/edit',
-      name: 'package_edit',
-      component: () => import('@/views/packages/index.vue'),
-      meta: {
-        permission: 'packages',
-      },
-    },
-    {
       path: '/:workspace?/jobs',
       name: 'jobs',
       component: () => import('@/views/jobs/index.vue'),
diff --git a/src/views/applications/edit.vue b/src/views/applications/edit.vue
index fc53af9..8c5d398 100644
--- a/src/views/applications/edit.vue
+++ b/src/views/applications/edit.vue
@@ -1205,6 +1205,14 @@ watch(
             flex: 1;
             width: 50%;
             height: 100%;
+            .monaco {
+              :deep(.monaco-editor) {
+                border-radius: 4px;
+                .overflow-guard {
+                  border-radius: 4px;
+                }
+              }
+            }
             .code-diff-view {
               border: none;
               height: 100%;
diff --git a/src/views/applications/mergeConflict.vue b/src/views/applications/mergeConflict.vue
index 07e0336..4700396 100644
--- a/src/views/applications/mergeConflict.vue
+++ b/src/views/applications/mergeConflict.vue
@@ -344,7 +344,7 @@ onBeforeMount(() => {
           :deep(.monaco-editor) {
             border-radius: 6px;
             .overflow-guard {
-              border-radius: 6px 0 0 6px;
+              border-radius: 6px;
             }
           }
         }
diff --git a/src/views/applications/mergeDetail.vue b/src/views/applications/mergeDetail.vue
index 87166a1..e7ae5fa 100644
--- a/src/views/applications/mergeDetail.vue
+++ b/src/views/applications/mergeDetail.vue
@@ -75,6 +75,7 @@
       <el-tabs class="mr-tab">
         <el-tab-pane :label="t('application.commits')">
           <el-table
+            v-loading="commitLoading"
             height="100%"
             v-el-table-infinite-scroll="loadMore"
             :infinite-scroll-disabled="disabledLoad"
@@ -119,7 +120,7 @@
           </el-table>
         </el-tab-pane>
         <el-tab-pane :label="t('application.changes')">
-          <el-scrollbar class="diff-list-scroll">
+          <el-scrollbar class="diff-list-scroll" v-loading="diffLoading">
             <diff-list :fileList="diffData"></diff-list>
           </el-scrollbar>
         </el-tab-pane>
@@ -265,7 +266,7 @@ const getCommits = async () => {
   } else {
     ElMessage.error(res.msg || res.error);
   }
-  commitLoading.value = true;
+  commitLoading.value = false;
 };
 
 const diffData = ref([]);
@@ -292,7 +293,7 @@ const getDiff = async () => {
   } else {
     ElMessage.error(res.msg || res.error);
   }
-  diffLoading.value = true;
+  diffLoading.value = false;
 };
 
 const hasConflict = computed(() => {
@@ -390,6 +391,10 @@ onBeforeMount(() => {
                 display: none;
               }
             }
+            .el-loading-mask{
+              left: 20px;
+              right: 20px;
+            }
           }
         }
       }