dashboard-shell-shell 1.0.113 → 1.0.115

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

@@ -207,7 +207,11 @@ export default {
       type:    Number,
       default: null, // Default comes from the user preference
     },
-
+    searchPlaceholder: {
+      // search框内的输入提示
+      type:    String,
+      default: '名称'
+    },
   },
 
   data() {
@@ -607,6 +611,7 @@ export default {
     :headers="_headers"
     :rows="filteredRows"
     :loading="loading"
+    :search-placeholder="searchPlaceholder"
     :alt-loading="altLoading"
     :group-by="computedGroupBy"
     :group="group"
@@ -680,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];

package/components/SortableTable/THead.vue

@@ -273,13 +273,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 +296,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 +308,6 @@ export default {
       <th
         v-if="rowActions && hasAdvancedFiltering && tableColsOptions.length"
         :width="rowActionsWidth"
-        :align="'left'"
       >
         <div
           ref="table-options"
@@ -462,7 +456,7 @@ export default {
     }
 
     th {
-      padding: 16.5px 5px;
+      padding: 8px 5px;
       font-weight: normal;
       border: 0;
       color: var(--body-text);
@@ -502,7 +496,7 @@ 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 {