dashboard-shell-shell 1.0.114 → 1.0.115

package/components/ResourceTable.vue

@@ -77,11 +77,6 @@ export default {
       default: null,
     },
 
-    groupBy: {
-      type:    String,
-      default: null
-    },
-
     namespaced: {
       type:    Boolean,
       default: null, // Automatic from schema
@@ -117,11 +112,35 @@ export default {
       default: true,
     },
 
+    /**
+     * Field to group rows by, row[groupBy] must be something that can be a map key
+     */
+    groupBy: {
+      type:    String,
+      default: null
+    },
+
+    /**
+     * Override any product based group options
+     */
+    groupOptions: {
+      type:    Array,
+      default: null
+    },
+
     groupable: {
       type:    Boolean,
       default: null, // Null: auto based on namespaced and type custom groupings
     },
 
+    /**
+     * If the current preference for group isn't applicable, or not set, use this instead
+     */
+    groupDefault: {
+      type:    String,
+      default: DEFAULT_GROUP,
+    },
+
     groupTooltip: {
       type:    String,
       default: 'resourceTable.groupBy.namespace',
@@ -188,11 +207,11 @@ export default {
       type:    Number,
       default: null, // Default comes from the user preference
     },
-
-    hideGroupingControls: {
-      type:    Boolean,
-      default: false
-    }
+    searchPlaceholder: {
+      // search框内的输入提示
+      type:    String,
+      default: '名称'
+    },
   },
 
   data() {
@@ -328,8 +347,18 @@ export default {
       // If we are grouping by a custom group, it may specify that we hide a specific column
       const custom = this._listGroupMapped?.[this.group];
 
+      let hideColumn;
+
       if (custom?.hideColumn) {
-        const idx = headers.findIndex((header) => header.name === custom.hideColumn);
+        hideColumn = custom.hideColumn;
+      } else {
+        const componentCustom = this.groupOptions?.find((go) => go.value === this.group);
+
+        hideColumn = componentCustom?.hideColumn;
+      }
+
+      if (hideColumn) {
+        const idx = headers.findIndex((header) => header.name === hideColumn);
 
         if ( idx >= 0 ) {
           headers.splice(idx, 1);
@@ -388,22 +417,24 @@ export default {
     group: {
       get() {
         // Check group is valid
-        const exists = this.groupOptions.find((g) => g.value === this._group);
+        const exists = this._groupOptions.find((g) => g.value === this._group);
 
         if (!exists) {
           // Attempt to find the default option in available options...
           // if not use the first value in the options collection...
           // and if not that just fall back to the default
-          if (this.groupOptions.find((g) => g.value === DEFAULT_GROUP)) {
-            return DEFAULT_GROUP;
+          if (this._groupOptions.find((g) => g.value === this.groupDefault)) {
+            return this.groupDefault;
           }
 
-          return this.groupOptions[0]?.value || DEFAULT_GROUP;
+          return this._groupOptions[0]?.value || this.groupDefault || DEFAULT_GROUP;
         }
 
         return this._group;
       },
       set(value) {
+        console.log('_group:===='+value);
+        
         this._group = value;
       }
     },
@@ -413,9 +444,13 @@ export default {
         const namespaceGroupable = this.$store.getters['isMultipleNamespaces'] && this.isNamespaced;
         const customGroupable = !!this.options?.listGroups?.length;
 
-        return namespaceGroupable || customGroupable;
+        // sshkey去掉分组按钮
+      if(this.parsedPagingParams.singularLabel === 'SSH Key' || this.parsedPagingParams.singularLabel === '负载均衡器'){
+        return false
       }
 
+        return namespaceGroupable || customGroupable || this.groupOptions?.length;
+      }
       return this.groupable || false;
     },
 
@@ -442,10 +477,20 @@ export default {
         return custom.field;
       }
 
+      const componentCustom = this.groupOptions?.find((go) => go.value === this.group);
+
+      if (componentCustom?.field) {
+        return componentCustom.field;
+      }
+
       return null;
     },
 
-    groupOptions() {
+    _groupOptions() {
+      if (this.groupOptions) {
+        return this.groupOptions;
+      }
+
       // Ignore the defaults below, we have an override set of groups
       // REPLACE (instead of SUPPLEMENT) defaults with listGroups (given listGroupsWillOverride is true)
       if (this.options?.listGroupsWillOverride && !!this.options?.listGroups?.length) {
@@ -566,10 +611,11 @@ export default {
     :headers="_headers"
     :rows="filteredRows"
     :loading="loading"
+    :search-placeholder="searchPlaceholder"
     :alt-loading="altLoading"
     :group-by="computedGroupBy"
     :group="group"
-    :group-options="groupOptions"
+    :group-options="_groupOptions"
     :search="search"
     :paging="true"
     :paging-params="parsedPagingParams"
@@ -596,14 +642,14 @@ export default {
     @enter="handleEnterKeyPress"
   >
     <template
-      v-if="!hideGroupingControls && showGrouping"
+      v-if="showGrouping && _groupOptions.length > 1"
       #header-middle
     >
       <slot name="more-header-middle" />
 
       <ButtonGroup
         v-model:value="group"
-        :options="groupOptions"
+        :options="_groupOptions"
       />
     </template>
 
@@ -639,11 +685,11 @@ export default {
         class="hide"
         @shortkey="keyAction('edit')"
       />
-      <button
+      <!-- <button
         v-shortkey.once="['y']"
         class="hide"
         @shortkey="keyAction('yaml')"
-      />
+      /> -->
       <button
         v-if="_showBulkActions"
         v-shortkey.once="['del']"

package/components/SideNav.vue

@@ -20,6 +20,7 @@ import { TYPE_MODES } from '@shell/store/type-map';
 import { NAME as NAVLINKS } from '@shell/config/product/navlinks';
 import Group from '@shell/components/nav/Group';
 import LocaleSelector from '@shell/components/LocaleSelector';
+import { cloud2harvesterhci, harvester2cloud } from '@shell/utils/router';
 
 export default {
   name:       'SideNav',
@@ -154,7 +155,7 @@ export default {
     },
 
     isVirtualProduct() {
-      return this.rootProduct.name === HARVESTER;
+      return this.rootProduct.name === harvester2cloud(HARVESTER);
     },
 
     allNavLinks() {
@@ -236,7 +237,7 @@ export default {
 
     getProductsGroups(out, loadProducts, namespaceMode, productMap) {
       const clusterId = this.$store.getters['clusterId'];
-      const currentType = this.$route.params.resource || '';
+      const currentType = cloud2harvesterhci(this.$route.params.resource) || '';
 
       for ( const productId of loadProducts ) {
         const modes = [TYPE_MODES.BASIC];
@@ -394,7 +395,14 @@ export default {
 </script>
 
 <template>
-  <nav class="side-nav">
+  <nav
+    class="side-nav"
+    role="navigation"
+    :aria-label="t('nav.ariaLabel.sideNav')"
+  >
+  <div class="side-all-title">
+          控制台
+  </div>
     <!-- Actual nav -->
     <div class="nav">
       <template
@@ -414,36 +422,36 @@ export default {
       </template>
     </div>
     <!-- SideNav footer area (seems to be tied to harvester) -->
-    <div
+    <!-- <div
       v-if="showProductFooter"
       class="footer"
-    >
+    > -->
       <!-- support link -->
-      <router-link
+      <!-- <router-link
         :to="supportLink"
         class="pull-right"
         role="link"
         :aria-label="t('nav.support', {hasSupport: true})"
       >
         {{ t('nav.support', {hasSupport: true}) }}
-      </router-link>
+      </router-link> -->
       <!-- version number -->
-      <span
+      <!-- <span
         v-clean-tooltip="{content: displayVersion, placement: 'top'}"
         class="clip version text-muted"
       >
         {{ displayVersion }}
-      </span>
+      </span> -->
 
       <!-- locale selector -->
-      <LocaleSelector
+      <!-- <LocaleSelector
         v-if="isSingleProduct && hasMultipleLocales && !isStandaloneHarvester"
         mode="login"
         :show-icon="false"
-      />
-    </div>
+      /> -->
+    <!-- </div> -->
     <!-- SideNav footer alternative -->
-    <div
+    <!-- <div
       v-else
       class="version text-muted flex"
     >
@@ -464,7 +472,7 @@ export default {
           (Harvester-{{ harvesterVersion }})
         </span>
       </template>
-    </div>
+    </div> -->
   </nav>
 </template>
 
@@ -490,6 +498,10 @@ export default {
 
       A { padding-left: 0; }
     }
+    :deep() A{
+      height: 50px;
+      background-color: #fff;
+    }
 
     .tools {
       display: flex;
@@ -565,4 +577,13 @@ export default {
     display: flex;
   }
 
+
+  .side-all-title{
+    height: 50px;
+    line-height: 50px;
+    font-size: 16px;
+    color: #7f7f7f;
+    padding-left: 21px;
+    font-weight: bold;
+  }
 </style>

package/components/SortableTable/THead.vue

@@ -237,7 +237,7 @@ export default {
         v-if="subExpandColumn"
         :width="expandWidth"
       />
-      <th
+      <!-- <th
         v-for="(col) in columns"
         v-show="!hasAdvancedFiltering || (hasAdvancedFiltering && col.isColVisible)"
         :key="col.name"
@@ -250,6 +250,20 @@ export default {
         @click.prevent="changeSort($event, col)"
         @keyup.enter="changeSort($event, col)"
         @keyup.space="changeSort($event, col)"
+      > -->
+      <th
+        v-for="(col) in columns"
+        v-show="!hasAdvancedFiltering || (hasAdvancedFiltering && col.isColVisible)"
+        :key="col.name"
+        :align="'left'"
+        :width="col.width"
+        :class="{ sortable: col.sort, [col.breakpoint]: !!col.breakpoint}"
+        :tabindex="col.sort ? 0 : -1"
+        class="sortable-table-head-element"
+        :aria-sort="ariaSort(col)"
+        @click.prevent="changeSort($event, col)"
+        @keyup.enter="changeSort($event, col)"
+        @keyup.space="changeSort($event, col)"
       >
         <div
           class="table-header-container"
@@ -352,10 +366,17 @@ export default {
           </div>
         </div>
       </th>
+      <!-- <th
+        v-else-if="rowActions"
+        :width="rowActionsWidth"
+      /> -->
       <th
         v-else-if="rowActions"
         :width="rowActionsWidth"
-      />
+        :align="'left'"
+      >
+        操作
+      </th>
     </tr>
   </thead>
 </template>
@@ -474,6 +495,8 @@ export default {
 
       &:last-child {
         padding-right: 10px;
+        padding-left: 12px;
+
       }
 
       &:not(.sortable) > SPAN {