dashboard-shell-shell 0.0.1000000000001125 → 0.0.1000000000001126

package/components/ExplorerMembers.vue

@@ -294,7 +294,6 @@ export default {
       :is-creatable="false"
       :type-display="t('members.clusterAndProject')"
     />
-    <!-- harvester------------------------------------------------------2 -->
     <Banner
       v-if="isLocal"
       color="error"

package/components/ExplorerProjectsNamespaces.vue

@@ -441,7 +441,6 @@ export default {
         </router-link>
       </template>
     </Masthead>
-    <!-- harvester------------------------------------------------------3 -->
     <!-- Extensions area -->
     <ExtensionPanel
       :resource="{}"

package/components/ResourceList/index.vue

@@ -52,7 +52,14 @@ export default {
       const component = await importer.__asyncLoader();
 
       if ( component?.typeDisplay ) {
+
+        console.log(component, ' component-----------------');
+        
         this.customTypeDisplay = component.typeDisplay.apply(this);
+        
+        
+        console.log(this.customTypeDisplay, ' this.customTypeDisplay-----------------');
+
       }
 
       // Is the custom component responsible fetching the resources?
@@ -206,6 +213,9 @@ export default {
 
     if ( hasListComponent ) {
       listComponent = this.$store.getters['type-map/importList'](resource);
+
+      console.log(listComponent, ' listComponent---------------------');
+      
     }
 
     this.listComponent = listComponent;
@@ -246,6 +256,8 @@ export default {
       :show-incremental-loading-indicator="showIncrementalLoadingIndicator"
       :load-resources="loadResources"
       :load-indeterminate="loadIndeterminate"
+
+      :main-button-visible="false"
     >
       <template #extraActions>
         <slot name="extraActions" />
@@ -267,6 +279,10 @@ export default {
         :incremental-loading-indicator="showIncrementalLoadingIndicator"
         :rows="rows"
         v-bind="$data"
+        
+        :type-display="customTypeDisplay"
+        :resource="resource"
+        :main-button-visible="true"
       />
     </div>
     <ResourceTable
@@ -285,7 +301,15 @@ export default {
       :external-pagination-enabled="canPaginate"
       :external-pagination-result="paginationResult"
       @pagination-changed="paginationChanged"
-    />
+
+      :type-display="customTypeDisplay"
+      :resource="resource"
+      :main-button-visible="true"
+    >
+      <template #extraActions>
+        <slot name="extraActions" />
+      </template>
+    </ResourceTable>
   </div>
 </template>
 

package/components/templates/default.vue

@@ -204,7 +204,6 @@ export default {
         class="main-layout"
         :aria-label="t('layouts.default')"
       >
-        默认页面---------------------------------------------
         <router-view
           :key="$route.path"
           class="outlet"

package/list/fleet.cattle.io.gitrepo.vue

@@ -94,7 +94,6 @@ export default {
       :load-indeterminate="loadIndeterminate"
       :create-button-label="t('fleet.gitRepo.repo.addRepo')"
     />
-    <!-- harvester------------------------------------------------------5 -->
     <FleetRepos
       :rows="rows"
       :schema="schema"

package/list/group.principal.vue

@@ -143,7 +143,6 @@ export default {
         </router-link>
       </template>
     </Masthead>
-    <!-- harvester------------------------------------------------------6 -->
 
     <ResourceTable
       :schema="schema"

package/list/harvesterhci.io.management.cluster.vue

@@ -136,7 +136,6 @@ export default {
         </n-link>
       </template>
     </Masthead>
-    <!-- harvester------------------------------------------------------7 -->
 
     <ResourceTable
       v-if="rows && rows.length"

package/list/helm.cattle.io.projecthelmchart.vue

@@ -74,7 +74,6 @@ export default {
       :load-indeterminate="loadIndeterminate"
       :is-creatable="canCreateProjectHelmChart"
     />
-    <!-- harvester------------------------------------------------------8 -->
     <Banner
       color="info"
       :label="t('monitoring.projectMonitoring.list.banner')"

package/list/management.cattle.io.user.vue

@@ -140,7 +140,6 @@ export default {
         </router-link>
       </template>
     </Masthead>
-    <!-- harvester------------------------------------------------------9 -->
 
     <ResourceTable
       :schema="schema"

package/list/provisioning.cattle.io.cluster.vue

@@ -224,7 +224,6 @@ export default {
         </router-link>
       </template>
     </Masthead>
-    <!-- harvester------------------------------------------------------10 -->
 
     <Banner
       v-if="tokenExpiredData.expiring"

package/package.json

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

package/pages/c/_cluster/_product/namespaces.vue

@@ -56,7 +56,6 @@ export default {
       :favorite-resource="VIRTUAL_TYPES.NAMESPACE"
       :create-location="createLocation"
     />
-    <!-- harvester------------------------------------------------------11 -->
     <ResourceTable
       v-bind="$attrs"
       :schema="schema"

package/pages/c/_cluster/gatekeeper/constraints/index.vue

@@ -70,7 +70,6 @@ export default {
       :yaml-create-location="yamlCreateLocation"
       :create-location="createLocation"
     />
-    <!-- harvester------------------------------------------------------12 -->
 
     <SortableTable
       :headers="headers"

package/pages/c/_cluster/manager/cloudCredential/index.vue

@@ -125,7 +125,6 @@ export default {
       :create-location="createLocation"
       :type-display="t('manager.cloudCredentials.label')"
     />
-    <!-- harvester------------------------------------------------------13 -->
     <Banner
       v-if="expiredData.expiring"
       data-testid="cert-expiring-banner"

package/pages/c/_cluster/manager/drivers/kontainerDriver/index.vue

@@ -69,7 +69,6 @@ export default {
         />
       </template>
     </Masthead>
-    <!-- harvester------------------------------------------------------14 -->
     <ResourceTable
       :schema="schema"
       :rows="rows"

package/pages/c/_cluster/manager/drivers/nodeDriver/index.vue

@@ -38,7 +38,6 @@ export default {
       :resource="resource"
       :type-display="t('drivers.node.title')"
     />
-    <!-- harvester------------------------------------------------------15 -->
     <ResourceTable
       :schema="schema"
       :rows="rows"

package/pages/c/_cluster/manager/jwt.authentication/index.vue

@@ -208,7 +208,6 @@ export default {
         <TypeDescription :resource="'jwt.authentication'" />
       </template>
     </Masthead>
-    <!-- harvester------------------------------------------------------16 -->
 
     <Banner
       v-for="(err, i) in errors"

package/rancher-components/RcDropdown/RcDropdownMenu.vue

@@ -33,8 +33,8 @@ const hasOptions = (options: DropdownOption[]) => {
       :data-testid="dataTestid"
       :aria-label="buttonAriaLabel"
     >
-    <img v-if="showIcon" src="@/shell/assets/images/action.svg" title="操作">
-    <a v-else href="javascript:;">操作</a>
+    <!-- <img v-if="showIcon" src="@/shell/assets/images/action.svg" title="操作"> -->
+    <a href="javascript:;">操作</a>
     </rc-dropdown-trigger>
     <template #dropdownCollection>
       <template