dashboard-shell-shell 1.0.113 → 1.0.114

package/components/ResourceList/Masthead.vue

@@ -95,12 +95,10 @@ export default {
       query: { [AS]: _YAML },
     };
 
-    const tabList = ['集群配置'];
     return {
       formRoute,
       yamlRoute,
       hasEditComponent,
-      tabList,
     };
   },
 
@@ -127,28 +125,6 @@ export default {
 
       return this.$store.getters['type-map/labelFor'](this.schema, 99);
     },
-    _descriptionDisplay() {
-      const key = this.$route.path.split('/').pop();
-
-      return this.$store.getters['i18n/t'](`typeDescription."${ key.toLowerCase() }"`);
-    },
-    demoDisplay() {
-      const product = this.$store.getters['productId'];
-      const productId = this.$store.getters['type-map/groupForBasicType'](this.$store.getters['productId'], this._createLocation.params.resource);
-      const parts = productId?.split('::');
-      const newString = 'root';
-
-      if (!parts.includes(newString)) {
-        parts.unshift(newString); // 将字符串添加到数组第一位
-      }
-
-      const partsEn = parts.map((item) => {
-        return this.$store.getters['i18n/t'](`typeLabel."${ item.toLowerCase() }"`);
-      });
-
-      return partsEn;
-      // return this.$store.getters['i18n/t'](`typeLabel."${ productId.toLowerCase() }"`)
-    },
 
     _isYamlCreatable() {
       if ( this.isYamlCreatable !== null) {
@@ -189,30 +165,16 @@ export default {
 
 <template>
   <header class="with-subheader">
-    <!-- <slot name="typeDescription">
+    <slot name="typeDescription">
       <TypeDescription :resource="resource" />
-    </slot> -->
+    </slot>
     <div class="title">
-      <div class="excram-list">
-        <span
-          v-for="(item,index) in demoDisplay"
-          :key="index"
-        >
-          <span>{{ item }}</span>
-          <span>/</span>
-        </span>
-        <span class="excram-last-name">{{ _typeDisplay }}</span>
-      </div>
-      <h1 class="m-0 descrip-name">
+      <h1 class="m-0">
         <TabTitle>{{ _typeDisplay }}</TabTitle> <Favorite
           v-if="isExplorer"
           :resource="favoriteResource || resource"
         />
       </h1>
-      <!-- 描述 -->
-      <div class="masthod-title-description">
-        {{ _descriptionDisplay }}
-      </div>
       <ResourceLoadingIndicator
         v-if="showIncrementalLoadingIndicator"
         :resources="loadResources"
@@ -224,15 +186,7 @@ export default {
         <!--Slot content-->
       </slot>
     </div>
-    <div
-      v-if="!(tabList.includes(_typeDisplay))"
-      style="width: 110%;height: 1px;background-color: #D7D7D7;margin-top: 10px;margin-bottom: 20px;margin-left: -20px;margin-right: -20px;"
-    />
-    <div 
-     v-if="!(tabList.includes(_typeDisplay))"
-    class="actions-container"
-    style="width: 100%;min-height: 32px;text-align: left"
-    >
+    <div class="actions-container">
       <slot name="actions">
         <div class="actions">
           <slot name="extraActions" />
@@ -246,14 +200,14 @@ export default {
             >
               {{ _createButtonlabel }}
             </router-link>
-            <!-- <router-link
+            <router-link
               v-else-if="_isYamlCreatable"
               :to="_yamlCreateLocation"
               class="btn role-primary"
               :data-testid="componentTestid+'-create-yaml'"
             >
               {{ t("resourceList.head.createFromYaml") }}
-            </router-link> -->
+            </router-link>
           </slot>
         </div>
       </slot>
@@ -263,46 +217,30 @@ export default {
 
 <style lang="scss" scoped>
   .title {
-    /* align-items: center;
-    display: flex; */
+    align-items: center;
+    display: flex;
     h1 {
       margin: 0;
     }
   }
 
   header {
-    /* margin-bottom: 20px; */
+    margin-bottom: 20px;
   }
 
   header.with-subheader {
-    /* grid-template-areas:
+    grid-template-areas:
       'type-banner type-banner'
       'title actions'
       'sub-header sub-header'
-      'state-banner state-banner'; */
-      position: relative;
-      display: unset;
+      'state-banner state-banner';
   }
-  .excram-list{
-    font-size: 14px;
-    line-height: 22px;
-    margin-bottom: 20px;
-    font-family: 'Microsoft YaHei';
-  }
-  .excram-last-name{
-    color: var(--primary);
-  }
-  .descrip-name{
-    font-size: 26px;
-    font-family: 'Microsoft YaHei';
-  }
-  .masthod-title-description{
-    font-family: 'Microsoft YaHei';
-    margin: 20px 0px;
-  }
-  .actions-container{
-    /* display: flex; */
-    /* margin-left: 0px; */
-    position: absolute;
+
+  .sub-header {
+    grid-area: sub-header;
+
+    a {
+      display: inline-block;
+    }
   }
 </style>

package/components/ResourceTable.vue

@@ -77,6 +77,11 @@ export default {
       default: null,
     },
 
+    groupBy: {
+      type:    String,
+      default: null
+    },
+
     namespaced: {
       type:    Boolean,
       default: null, // Automatic from schema
@@ -112,35 +117,11 @@ 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',
@@ -208,6 +189,10 @@ export default {
       default: null, // Default comes from the user preference
     },
 
+    hideGroupingControls: {
+      type:    Boolean,
+      default: false
+    }
   },
 
   data() {
@@ -343,18 +328,8 @@ 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) {
-        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);
+        const idx = headers.findIndex((header) => header.name === custom.hideColumn);
 
         if ( idx >= 0 ) {
           headers.splice(idx, 1);
@@ -413,24 +388,22 @@ 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 === this.groupDefault)) {
-            return this.groupDefault;
+          if (this.groupOptions.find((g) => g.value === DEFAULT_GROUP)) {
+            return DEFAULT_GROUP;
           }
 
-          return this._groupOptions[0]?.value || this.groupDefault || DEFAULT_GROUP;
+          return this.groupOptions[0]?.value || DEFAULT_GROUP;
         }
 
         return this._group;
       },
       set(value) {
-        console.log('_group:===='+value);
-        
         this._group = value;
       }
     },
@@ -440,13 +413,9 @@ export default {
         const namespaceGroupable = this.$store.getters['isMultipleNamespaces'] && this.isNamespaced;
         const customGroupable = !!this.options?.listGroups?.length;
 
-        // sshkey去掉分组按钮
-      if(this.parsedPagingParams.singularLabel === 'SSH Key' || this.parsedPagingParams.singularLabel === '负载均衡器'){
-        return false
+        return namespaceGroupable || customGroupable;
       }
 
-        return namespaceGroupable || customGroupable || this.groupOptions?.length;
-      }
       return this.groupable || false;
     },
 
@@ -473,20 +442,10 @@ export default {
         return custom.field;
       }
 
-      const componentCustom = this.groupOptions?.find((go) => go.value === this.group);
-
-      if (componentCustom?.field) {
-        return componentCustom.field;
-      }
-
       return null;
     },
 
-    _groupOptions() {
-      if (this.groupOptions) {
-        return this.groupOptions;
-      }
-
+    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) {
@@ -610,7 +569,7 @@ export default {
     :alt-loading="altLoading"
     :group-by="computedGroupBy"
     :group="group"
-    :group-options="_groupOptions"
+    :group-options="groupOptions"
     :search="search"
     :paging="true"
     :paging-params="parsedPagingParams"
@@ -637,14 +596,14 @@ export default {
     @enter="handleEnterKeyPress"
   >
     <template
-      v-if="showGrouping && _groupOptions.length > 1"
+      v-if="!hideGroupingControls && showGrouping"
       #header-middle
     >
       <slot name="more-header-middle" />
 
       <ButtonGroup
         v-model:value="group"
-        :options="_groupOptions"
+        :options="groupOptions"
       />
     </template>
 

package/components/SideNav.vue

@@ -394,14 +394,7 @@ export default {
 </script>
 
 <template>
-  <nav
-    class="side-nav"
-    role="navigation"
-    :aria-label="t('nav.ariaLabel.sideNav')"
-  >
-  <div class="side-all-title">
-          控制台
-  </div>
+  <nav class="side-nav">
     <!-- Actual nav -->
     <div class="nav">
       <template
@@ -421,36 +414,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"
     >
@@ -471,7 +464,7 @@ export default {
           (Harvester-{{ harvesterVersion }})
         </span>
       </template>
-    </div> -->
+    </div>
   </nav>
 </template>
 
@@ -497,10 +490,6 @@ export default {
 
       A { padding-left: 0; }
     }
-    :deep() A{
-      height: 50px;
-      background-color: #fff;
-    }
 
     .tools {
       display: flex;
@@ -576,13 +565,4 @@ 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,25 +237,11 @@ export default {
         v-if="subExpandColumn"
         :width="expandWidth"
       />
-      <!-- <th
-        v-for="(col) in columns"
-        v-show="!hasAdvancedFiltering || (hasAdvancedFiltering && col.isColVisible)"
-        :key="col.name"
-        :align="col.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)"
-      > -->
       <th
         v-for="(col) in columns"
         v-show="!hasAdvancedFiltering || (hasAdvancedFiltering && col.isColVisible)"
         :key="col.name"
-        :align="'left'"
+        :align="col.align || 'left'"
         :width="col.width"
         :class="{ sortable: col.sort, [col.breakpoint]: !!col.breakpoint}"
         :tabindex="col.sort ? 0 : -1"
@@ -273,13 +259,10 @@ export default {
             v-clean-tooltip="tooltip(col)"
             class="content"
           >
-            <span
-              v-clean-html="labelFor(col)"
-              class="text-no-break"
-            />
+            <span v-clean-html="labelFor(col)" />
             <span
               v-if="col.subLabel"
-              class="text-muted text-no-break"
+              class="text-muted"
             >
               {{ col.subLabel }}
             </span>
@@ -299,12 +282,10 @@ export default {
               <i
                 v-if="isCurrent(col) && !descending"
                 class="icon icon-sort-down icon-stack-1x"
-                :alt="t('sortableTable.alt.sortingIconDesc')"
               />
               <i
                 v-if="isCurrent(col) && descending"
                 class="icon icon-sort-up icon-stack-1x"
-                :alt="t('sortableTable.alt.sortingIconAsc')"
               />
             </span>
           </div>
@@ -313,7 +294,6 @@ export default {
       <th
         v-if="rowActions && hasAdvancedFiltering && tableColsOptions.length"
         :width="rowActionsWidth"
-        :align="'left'"
       >
         <div
           ref="table-options"
@@ -372,17 +352,10 @@ 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>
@@ -462,7 +435,7 @@ export default {
     }
 
     th {
-      padding: 16.5px 5px;
+      padding: 8px 5px;
       font-weight: normal;
       border: 0;
       color: var(--body-text);
@@ -501,8 +474,6 @@ export default {
 
       &:last-child {
         padding-right: 10px;
-        padding-left: 12px;
-        width: 200px;
       }
 
       &:not(.sortable) > SPAN {

package/components/SortableTable/actions.js

@@ -1,7 +1,7 @@
 import debounce from 'lodash/debounce';
 
 // Use a visible display type to reduce flickering
-const displayType = 'inline-flex';
+const displayType = 'inline-block';
 
 export default {