dashboard-shell-shell 0.0.1000000000001125 → 0.0.1000000000001127

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -294,7 +294,6 @@ export default {
294
294
  :is-creatable="false"
295
295
  :type-display="t('members.clusterAndProject')"
296
296
  />
297
- <!-- harvester------------------------------------------------------2 -->
298
297
  <Banner
299
298
  v-if="isLocal"
300
299
  color="error"
@@ -441,7 +441,6 @@ export default {
441
441
  </router-link>
442
442
  </template>
443
443
  </Masthead>
444
- <!-- harvester------------------------------------------------------3 -->
445
444
  <!-- Extensions area -->
446
445
  <ExtensionPanel
447
446
  :resource="{}"
@@ -52,7 +52,14 @@ export default {
52
52
  const component = await importer.__asyncLoader();
53
53
 
54
54
  if ( component?.typeDisplay ) {
55
+
56
+ console.log(component, ' component-----------------');
57
+
55
58
  this.customTypeDisplay = component.typeDisplay.apply(this);
59
+
60
+
61
+ console.log(this.customTypeDisplay, ' this.customTypeDisplay-----------------');
62
+
56
63
  }
57
64
 
58
65
  // Is the custom component responsible fetching the resources?
@@ -98,6 +105,9 @@ export default {
98
105
 
99
106
  const showMasthead = getters[`type-map/optionsFor`](resource).showListMasthead;
100
107
 
108
+ console.log(schema, ' schema---------------------------')
109
+
110
+
101
111
  return {
102
112
  schema,
103
113
  hasListComponent,
@@ -206,6 +216,9 @@ export default {
206
216
 
207
217
  if ( hasListComponent ) {
208
218
  listComponent = this.$store.getters['type-map/importList'](resource);
219
+
220
+ console.log(listComponent, ' listComponent---------------------');
221
+
209
222
  }
210
223
 
211
224
  this.listComponent = listComponent;
@@ -246,6 +259,8 @@ export default {
246
259
  :show-incremental-loading-indicator="showIncrementalLoadingIndicator"
247
260
  :load-resources="loadResources"
248
261
  :load-indeterminate="loadIndeterminate"
262
+
263
+ :main-button-visible="false"
249
264
  >
250
265
  <template #extraActions>
251
266
  <slot name="extraActions" />
@@ -267,6 +282,11 @@ export default {
267
282
  :incremental-loading-indicator="showIncrementalLoadingIndicator"
268
283
  :rows="rows"
269
284
  v-bind="$data"
285
+
286
+ :schema="schema"
287
+ :type-display="customTypeDisplay"
288
+ :resource="resource"
289
+ :main-button-visible="true"
270
290
  />
271
291
  </div>
272
292
  <ResourceTable
@@ -285,7 +305,15 @@ export default {
285
305
  :external-pagination-enabled="canPaginate"
286
306
  :external-pagination-result="paginationResult"
287
307
  @pagination-changed="paginationChanged"
288
- />
308
+
309
+ :type-display="customTypeDisplay"
310
+ :resource="resource"
311
+ :main-button-visible="true"
312
+ >
313
+ <template #extraActions>
314
+ <slot name="extraActions" />
315
+ </template>
316
+ </ResourceTable>
289
317
  </div>
290
318
  </template>
291
319
 
@@ -204,7 +204,6 @@ export default {
204
204
  class="main-layout"
205
205
  :aria-label="t('layouts.default')"
206
206
  >
207
- 默认页面---------------------------------------------
208
207
  <router-view
209
208
  :key="$route.path"
210
209
  class="outlet"
@@ -94,7 +94,6 @@ export default {
94
94
  :load-indeterminate="loadIndeterminate"
95
95
  :create-button-label="t('fleet.gitRepo.repo.addRepo')"
96
96
  />
97
- <!-- harvester------------------------------------------------------5 -->
98
97
  <FleetRepos
99
98
  :rows="rows"
100
99
  :schema="schema"
@@ -143,7 +143,6 @@ export default {
143
143
  </router-link>
144
144
  </template>
145
145
  </Masthead>
146
- <!-- harvester------------------------------------------------------6 -->
147
146
 
148
147
  <ResourceTable
149
148
  :schema="schema"
@@ -136,7 +136,6 @@ export default {
136
136
  </n-link>
137
137
  </template>
138
138
  </Masthead>
139
- <!-- harvester------------------------------------------------------7 -->
140
139
 
141
140
  <ResourceTable
142
141
  v-if="rows && rows.length"
@@ -74,7 +74,6 @@ export default {
74
74
  :load-indeterminate="loadIndeterminate"
75
75
  :is-creatable="canCreateProjectHelmChart"
76
76
  />
77
- <!-- harvester------------------------------------------------------8 -->
78
77
  <Banner
79
78
  color="info"
80
79
  :label="t('monitoring.projectMonitoring.list.banner')"
@@ -140,7 +140,6 @@ export default {
140
140
  </router-link>
141
141
  </template>
142
142
  </Masthead>
143
- <!-- harvester------------------------------------------------------9 -->
144
143
 
145
144
  <ResourceTable
146
145
  :schema="schema"
@@ -224,7 +224,6 @@ export default {
224
224
  </router-link>
225
225
  </template>
226
226
  </Masthead>
227
- <!-- harvester------------------------------------------------------10 -->
228
227
 
229
228
  <Banner
230
229
  v-if="tokenExpiredData.expiring"
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "dashboard-shell-shell",
3
- "version": "0.0.1000000000001125",
3
+ "version": "0.0.1000000000001127",
4
4
  "description": "Rancher Dashboard Shell",
5
5
  "repository": "https://github.com/rancherlabs/dashboard",
6
6
  "license": "Apache-2.0",
@@ -56,7 +56,6 @@ export default {
56
56
  :favorite-resource="VIRTUAL_TYPES.NAMESPACE"
57
57
  :create-location="createLocation"
58
58
  />
59
- <!-- harvester------------------------------------------------------11 -->
60
59
  <ResourceTable
61
60
  v-bind="$attrs"
62
61
  :schema="schema"
@@ -70,7 +70,6 @@ export default {
70
70
  :yaml-create-location="yamlCreateLocation"
71
71
  :create-location="createLocation"
72
72
  />
73
- <!-- harvester------------------------------------------------------12 -->
74
73
 
75
74
  <SortableTable
76
75
  :headers="headers"
@@ -125,7 +125,6 @@ export default {
125
125
  :create-location="createLocation"
126
126
  :type-display="t('manager.cloudCredentials.label')"
127
127
  />
128
- <!-- harvester------------------------------------------------------13 -->
129
128
  <Banner
130
129
  v-if="expiredData.expiring"
131
130
  data-testid="cert-expiring-banner"
@@ -69,7 +69,6 @@ export default {
69
69
  />
70
70
  </template>
71
71
  </Masthead>
72
- <!-- harvester------------------------------------------------------14 -->
73
72
  <ResourceTable
74
73
  :schema="schema"
75
74
  :rows="rows"
@@ -38,7 +38,6 @@ export default {
38
38
  :resource="resource"
39
39
  :type-display="t('drivers.node.title')"
40
40
  />
41
- <!-- harvester------------------------------------------------------15 -->
42
41
  <ResourceTable
43
42
  :schema="schema"
44
43
  :rows="rows"
@@ -208,7 +208,6 @@ export default {
208
208
  <TypeDescription :resource="'jwt.authentication'" />
209
209
  </template>
210
210
  </Masthead>
211
- <!-- harvester------------------------------------------------------16 -->
212
211
 
213
212
  <Banner
214
213
  v-for="(err, i) in errors"
@@ -33,8 +33,8 @@ const hasOptions = (options: DropdownOption[]) => {
33
33
  :data-testid="dataTestid"
34
34
  :aria-label="buttonAriaLabel"
35
35
  >
36
- <img v-if="showIcon" src="@/shell/assets/images/action.svg" title="操作">
37
- <a v-else href="javascript:;">操作</a>
36
+ <!-- <img v-if="showIcon" src="@/shell/assets/images/action.svg" title="操作"> -->
37
+ <a href="javascript:;">操作</a>
38
38
  </rc-dropdown-trigger>
39
39
  <template #dropdownCollection>
40
40
  <template