Merge branch 'master' of github.com:KubeOperator/KubePi

1Panel-dev · Jan 12, 2022 · e90240a · e90240a
2 parents 5f1216b + 8437198
commit e90240a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/web/dashboard/src/business/custom-resource/cr/cr.vue b/web/dashboard/src/business/custom-resource/cr/cr.vue
@@ -75,6 +75,8 @@ export default {
                 version: this.version,
                 group: this.group,
                 names: this.names,
+              },
+              query: {
                 namespace: row.metadata.namespace
               }
             })

diff --git a/web/dashboard/src/business/custom-resource/cr/edit.vue b/web/dashboard/src/business/custom-resource/cr/edit.vue
@@ -22,8 +22,7 @@ export default {
     name: String,
     names: String,
     version: String,
-    group: String,
-    namespace: String,
+    group: String
   },
   data () {
     return {
@@ -61,6 +60,7 @@ export default {
   },
   created () {
     this.cluster = this.$route.query.cluster
+    this.namespace = this.$route.query.namespace
     this.getDetail()
   }
 }

diff --git a/web/dashboard/src/business/custom-resource/index.vue b/web/dashboard/src/business/custom-resource/index.vue
@@ -1,10 +1,11 @@
 <template>
   <layout-content>
-    <div v-loading="loading">
+    <div>
       <el-row>
         <el-col :span="6">
           <el-scrollbar style="height:900px">
             <el-tree
+                    v-loading="loading"
                     :empty-text="$t('commons.table.empty_text')"
                     class="filter-tree"
                     :default-expand-all="true"

diff --git a/web/dashboard/src/router/modules/clusters.js b/web/dashboard/src/router/modules/clusters.js
@@ -151,7 +151,7 @@ const Clusters = {
             },
         },
         {
-          path: "/resource/:group/:names/:version/:namespace/:name/edit",
+          path: "/resource/:group/:names/:version/:name/edit",
           component: () => import("@/business/custom-resource/cr/edit"),
           hidden: true,
           props: true,