dashboard-shell-shell 0.0.1000000000001124 → 0.0.1000000000001126

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,11 +256,14 @@ export default {
       :show-incremental-loading-indicator="showIncrementalLoadingIndicator"
       :load-resources="loadResources"
       :load-indeterminate="loadIndeterminate"
+
+      :main-button-visible="false"
     >
       <template #extraActions>
         <slot name="extraActions" />
       </template>
     </Masthead>
+    <!-- harvester------------------------------------------------------4 -->
     <!-- Extensions area -->
     <ExtensionPanel
       :resource="{}"
@@ -266,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
@@ -284,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/ResourceTable.vue

@@ -691,6 +691,13 @@ export default {
         v-if="mainButtonVisible"
         :schema="schema"
         :resource="resource"
+        :create-button-label="createButtonLabel"
+        :yaml-create-button-label="yamlCreateLocation"
+        :create-location="createLocation"
+        :is-yaml-creatable="isYamlCreatable"
+        :is-creatable="isCreatable"
+        :type-display="typeDisplay"
+        :component-testid="componentTestid"
       >
       
         <template #extraActions>

package/package.json

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

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