dashboard-shell-shell 1.0.1000000113 → 1.0.1000000116

package/components/ExplorerProjectsNamespaces.vue

@@ -416,7 +416,6 @@ export default {
 </script>
 
 <template>
-  测试111111111111111111111111
   <div class="project-namespaces outlet">
     <Masthead
       :schema="projectSchema"

package/components/SortableTable/index.vue

@@ -415,16 +415,33 @@ export default {
 
     const isLoading = this.loading || false;
 
+    console.log(this.$route.path, ' this.$route?.path');
+
     let isCreatable = false;
-    const lastPath = this.$route.path.split('/'.pop());
+    const lastPath = this.$route?.path?.split('/').pop();
+
+    console.log(lastPath, ' lastPath-----------------------');
 
-    if (lastPath.includes('.')) {
+    if (lastPath?.includes('.')) {
       isCreatable = this.$store.getters['type-map/optionsFor'](lastPath).isCreatable;
     } else if (lastPath === 'namespace') {
       isCreatable = this.$store.getters['type-map/optionsFor'](this.$route.name).isCreatable;
     }
 
+    const resource = this.$route.params.resource;
+
+    let hasEditComponent = false
+
+    if (lastPath?.includes('.')) {
+      hasEditComponent = this.$store.getters['type-map/hasCustomEdit'](lastPath);
+    } else if (lastPath === 'namespace') {
+      hasEditComponent = this.$store.getters['type-map/hasCustomEdit'](this.$route.name);
+    } else {
+      hasEditComponent = this.$store.getters['type-map/hasCustomEdit'](resource);
+    }
+
     return {
+      hasEditComponent,
       refreshButtonPhase:         isLoading ? ASYNC_BUTTON_STATES.WAITING : ASYNC_BUTTON_STATES.ACTION,
       expanded:                   {},
       searchQuery,
@@ -1227,7 +1244,7 @@ export default {
     <div
       :class="{'titled': $slots.title && $slots.title.length,  'mb-40': isFilterLabel, 'mb-20': search || isCreatable}"
       class="sortable-table-header "
-       :style="{marginTop: search&& !isBanner ? marginTopValue + 'px' : '0px',marginLeft: isCreatable ? '100px' : '-10px',maxHeight: '32px'}"
+       :style="{marginTop: search&& !isBanner ? marginTopValue + 'px' : '0px',marginLeft: isCreatable && hasEditComponent ? '100px' : '-10px',maxHeight: '32px'}"
     >
       <slot name="title" />
       <div

package/components/auth/RoleDetailEdit.vue

@@ -737,7 +737,7 @@ export default {
         <Tab
           v-if="isRancherRoleTemplate"
           name="inherit-from"
-          label="Inherit From"
+          label="继承表单"
           :weight="0"
         >
           <ArrayList

package/config/router/navigation-guards/index.js

@@ -22,17 +22,17 @@ export function installNavigationGuards(router, context) {
     let changed = false;
     const params = { ...to.params };
 
-    if (params.product?.includes('cloud')) {
+    if (params?.product?.includes('cloud')) {
       params.product = params.product.replace(/cloud/g, 'harvester');
       changed = true;
     }
 
-    if (params.cluster?.includes('cloud')) {
+    if (params?.cluster?.includes('cloud')) {
       params.cluster = params.cluster.replace(/cloud/g, 'harvester');
       changed = true;
     }
 
-    if (params.resource?.includes('cloud')) {
+    if (params?.resource?.includes('cloud')) {
       params.resource = params.resource.replace(/cloud/g, 'harvester');
       changed = true;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dashboard-shell-shell",
-  "version": "1.0.1000000113",
+  "version": "1.0.1000000116",
   "description": "Rancher Dashboard Shell",
   "repository": "https://github.com/rancherlabs/dashboard",
   "license": "Apache-2.0",

package/utils/router.js

@@ -89,7 +89,7 @@ export const getPackageFromRoute = (route) => {
 };
 
 export const getResourceFromRoute = (to) => {
-  let resource = cloud2harvesterhci(to.params?.resource);
+  let resource = to.params?.resource;
 
   if (!resource) {
     resource = findMeta(to, 'resource');