dashboard-shell-shell 0.0.4 → 0.0.1000000000001124

package/components/ResourceList/Masthead-btn.vue

@@ -0,0 +1,225 @@
+<script>
+import { mapGetters } from 'vuex';
+import Favorite from '@shell/components/nav/Favorite';
+import TypeDescription from '@shell/components/TypeDescription';
+import { get } from '@shell/utils/object';
+import { AS, _YAML } from '@shell/config/query-params';
+import ResourceLoadingIndicator from './ResourceLoadingIndicator';
+import TabTitle from '@shell/components/TabTitle';
+import { harvesterhci2cloud, cloud2harvesterhci } from '@shell/utils/router'
+
+/**
+ * Resource List Masthead component.
+ */
+export default {
+
+  name: 'MastheadResourceList-btn',
+
+  components: {
+    Favorite,
+    TypeDescription,
+    ResourceLoadingIndicator,
+    TabTitle
+  },
+  props: {
+    resource: {
+      type:     String,
+      required: true,
+    },
+
+    schema: {
+      type:    Object,
+      default: null,
+    },
+    typeDisplay: {
+      type:    String,
+      default: null,
+    },
+    isCreatable: {
+      type:    Boolean,
+      default: null,
+    },
+    isYamlCreatable: {
+      type:    Boolean,
+      default: null,
+    },
+    createLocation: {
+      type:    Object,
+      default: null,
+    },
+    yamlCreateLocation: {
+      type:    Object,
+      default: null,
+    },
+
+    createButtonLabel: {
+      type:    String,
+      default: null
+    },
+
+    /**
+     * Inherited global identifier prefix for tests
+     * Define a term based on the parent component to avoid conflicts on multiple components
+     */
+    componentTestid: {
+      type:    String,
+      default: 'masthead'
+    }
+  },
+
+  data() {
+    const params = { ...this.$route.params };
+
+    params.resource = harvesterhci2cloud(params.resource)
+
+    const formRoute = { name: `${ cloud2harvesterhci(this.$route.name) }-create`, params };
+
+    const hasEditComponent = this.$store.getters['type-map/hasCustomEdit'](this.resource);
+
+    const yamlRoute = {
+      name:  `${ cloud2harvesterhci(this.$route.name) }-create`,
+      params,
+      query: { [AS]: _YAML },
+    };
+
+    const tabList = ['集群配置'];
+    return {
+      formRoute,
+      yamlRoute,
+      hasEditComponent,
+      tabList,
+    };
+  },
+
+  computed: {
+    get,
+    ...mapGetters(['isExplorer', 'currentCluster']),
+
+    _typeDisplay() {
+      if ( this.typeDisplay !== null) {
+        return this.typeDisplay;
+      }
+
+      if ( !this.schema ) {
+        return '?';
+      }
+
+      return this.$store.getters['type-map/labelFor'](this.schema, 99);
+    },
+
+
+    _isYamlCreatable() {
+      if ( this.isYamlCreatable !== null) {
+        return this.isYamlCreatable;
+      }
+
+      return this.schema && this._isCreatable && this.$store.getters['type-map/optionsFor'](this.resource).canYaml;
+    },
+
+    _isCreatable() {
+      // Does not take into account hasEditComponent, such that _isYamlCreatable works
+      if ( this.isCreatable !== null) {
+        return this.isCreatable;
+      }
+
+      // blocked-post means you can post through norman, but not through steve.
+      if ( this.schema && !this.schema?.collectionMethods.find((x) => ['blocked-post', 'post'].includes(x.toLowerCase())) ) {
+        return false;
+      }
+
+      return this.$store.getters['type-map/optionsFor'](this.resource).isCreatable;
+    },
+
+    _createLocation() {
+      return this.createLocation || this.formRoute;
+    },
+
+    _yamlCreateLocation() {
+      return this.yamlCreateLocation || this.yamlRoute;
+    },
+
+    _createButtonlabel() {
+      return this.createButtonLabel || this.t('resourceList.head.create');
+    },
+  }
+};
+</script>
+
+<template>
+  <!-- 顶部 header，带有子标题（subheader）样式类 -->
+  <div style="display: flex;width: 100%;">
+
+    <!-- 操作按钮区域 -->
+    <div 
+      v-if="!(tabList.includes(_typeDisplay))"
+      class="actions-container"
+      style="min-height: 32px;align-self: flex-end;margin-right: 10px;"
+    >
+      <slot name="actions">
+        <div class="actions">
+          <slot name="extraActions" />
+
+          <slot name="createButton">
+            <router-link
+              v-if="hasEditComponent && _isCreatable"
+              :to="_createLocation"
+              class="btn role-primary"
+              :data-testid="componentTestid+'-create'"
+            >
+              {{ _createButtonlabel }}
+            </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>
+          </slot>
+        </div>
+      </slot>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+
+
+  header {
+    /* margin-bottom: 20px; */
+  }
+
+  header.with-subheader {
+    /* grid-template-areas:
+      'type-banner type-banner'
+      'title actions'
+      'sub-header sub-header'
+      'state-banner state-banner'; */
+    position: relative;
+    display: flex;
+    margin-bottom: 16px;
+    flex-direction: column;
+  }
+  .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-top: 20px;
+  }
+  .actions-container{
+    /* display: flex; */
+    /* margin-left: 0px; */
+  }
+</style>

package/components/ResourceList/Masthead.vue

@@ -80,12 +80,19 @@ export default {
     componentTestid: {
       type:    String,
       default: 'masthead'
-    }
+    },
+
+    mainButtonVisible: {
+      type:    Boolean,
+      default: true
+    },
   },
 
   data() {
     const params = { ...this.$route.params };
 
+    console.log(params.product, ' params.product----------------');
+
     params.resource = harvesterhci2cloud(params.resource)
 
     const formRoute = { name: `${ cloud2harvesterhci(this.$route.name) }-create`, params };
@@ -191,80 +198,94 @@ export default {
 </script>
 
 <template>
+  <!-- 顶部 header，带有子标题（subheader）样式类 -->
   <header class="with-subheader">
-    <!-- <slot name="typeDescription">
-      <TypeDescription :resource="resource" />
-    </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 style="display: flex;width: 100%;">
+      <div style="flex: 1;">
+        <!-- 标题区域 -->
+        <div class="title">
+          <div class="excram-list">
+            <span
+              v-for="(item,index) in demoDisplay"
+              :key="index"
+            >
+              <span v-if="item">{{ item }}</span>
+              <span v-if="item">/</span>
+            </span>
+            <span class="excram-last-name">{{ _typeDisplay }}</span>
+          </div>
+          <h1 style="display: flex;align-items: center;" class="m-0 descrip-name">
+            <TabTitle>{{ _typeDisplay }}</TabTitle>
+            
+            <!-- <Favorite
+              v-if="isExplorer"
+              :resource="favoriteResource || resource"
+            /> -->
+
+            <ResourceLoadingIndicator
+              style="margin-left: 10px;"
+              v-if="showIncrementalLoadingIndicator"
+              :resources="loadResources"
+              :indeterminate="loadIndeterminate"
+            />
+          </h1>
+          
+          <!-- 插槽：typeDescription，用于插入类型描述组件 -->
+          <div v-if="_descriptionDisplay" class="masthod-title-description">
+            {{ _descriptionDisplay }}
+          </div>
+  
+        </div>
+    
+        <!-- 子标题区域 -->
+        <div class="sub-header">
+          <slot name="subHeader">
+            <!--Slot content-->
+          </slot>
+        </div>
       </div>
-      <h1 class="m-0 descrip-name">
-        <TabTitle>{{ _typeDisplay }}</TabTitle> <Favorite
-          v-if="isExplorer"
-          :resource="favoriteResource || resource"
-        />
-      </h1>
-      <!-- 描述 -->
-      <div class="masthod-title-description">
-        {{ _descriptionDisplay }}
+  
+      <!-- 操作按钮区域 -->
+      <div 
+        v-if="!(tabList.includes(_typeDisplay)) && mainButtonVisible"
+        class="actions-container"
+        style="min-height: 32px;align-self: flex-end;"
+      >
+        <slot name="actions">
+          <div class="actions">
+            <slot name="extraActions" />
+  
+            <slot name="createButton">
+              <router-link
+                v-if="hasEditComponent && _isCreatable"
+                :to="_createLocation"
+                class="btn role-primary"
+                :data-testid="componentTestid+'-create'"
+              >
+                {{ _createButtonlabel }}
+              </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>
+            </slot>
+          </div>
+        </slot>
       </div>
-      <ResourceLoadingIndicator
-        v-if="showIncrementalLoadingIndicator"
-        :resources="loadResources"
-        :indeterminate="loadIndeterminate"
-      />
-    </div>
-    <div class="sub-header">
-      <slot name="subHeader">
-        <!--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;"
+      style="width: 110%;height: 1px;background-color: #D7D7D7;margin-top: 16px;margin-left: -20px;margin-right: -20px;"
     />
-    <div 
-     v-if="!(tabList.includes(_typeDisplay))"
-    class="actions-container"
-    style="width: 100%;min-height: 32px;text-align: left"
-    >
-      <slot name="actions">
-        <div class="actions">
-          <slot name="extraActions" />
-
-          <slot name="createButton">
-            <router-link
-              v-if="hasEditComponent && _isCreatable"
-              :to="_createLocation"
-              class="btn role-primary"
-              :data-testid="componentTestid+'-create'"
-            >
-              {{ _createButtonlabel }}
-            </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> -->
-          </slot>
-        </div>
-      </slot>
-    </div>
   </header>
 </template>
 
 <style lang="scss" scoped>
+
   .title {
     /* align-items: center;
     display: flex; */
@@ -283,8 +304,10 @@ export default {
       'title actions'
       'sub-header sub-header'
       'state-banner state-banner'; */
-      position: relative;
-      display: unset;
+    position: relative;
+    display: flex;
+    margin-bottom: 16px;
+    flex-direction: column;
   }
   .excram-list{
     font-size: 14px;
@@ -301,11 +324,16 @@ export default {
   }
   .masthod-title-description{
     font-family: 'Microsoft YaHei';
-    margin: 20px 0px;
+    margin-top: 20px;
   }
   .actions-container{
     /* display: flex; */
     /* margin-left: 0px; */
-    position: absolute;
+  }
+
+  .sub-header {
+    .btn {
+      text-align: left !important;
+    }
   }
 </style>

package/components/ResourceList/ResourceLoadingIndicator.vue

@@ -77,7 +77,7 @@ export default {
 <template>
   <div
     v-if="count && !haveAll"
-    class="ml-10 resource-loading-indicator"
+    class="resource-loading-indicator"
   >
     <div class="inner">
       <div class="resource-loader">
@@ -118,10 +118,12 @@ export default {
     .resource-loader {
       padding: 1px 10px;
       width: max-content;
+      height: 20px;
 
       .rl-fg, .rl-bg {
-        align-content: center;
         display: flex;
+        align-content: center;
+        font-size: 12px;
 
         > i {
           font-size: 18px;
@@ -129,6 +131,7 @@ export default {
         }
 
         > span {
+          margin-top: 2px;
           margin-left: 5px;
         }
       }

package/components/ResourceTable.vue

@@ -4,6 +4,7 @@ import { get } from '@shell/utils/object';
 import { mapPref, GROUP_RESOURCES } from '@shell/store/prefs';
 import ButtonGroup from '@shell/components/ButtonGroup';
 import SortableTable from '@shell/components/SortableTable';
+import MastheadBtn from '@shell/components/ResourceList/Masthead-btn.vue';
 import { NAMESPACE, AGE } from '@shell/config/table-headers';
 import { findBy } from '@shell/utils/array';
 import { ExtensionPoint, TableColumnLocation } from '@shell/core/types';
@@ -43,7 +44,7 @@ export default {
 
   emits: ['clickedActionButton'],
 
-  components: { ButtonGroup, SortableTable },
+  components: { ButtonGroup, SortableTable, MastheadBtn },
 
   props: {
     schema: {
@@ -212,6 +213,49 @@ export default {
       type:    String,
       default: '名称'
     },
+
+    resource: {
+      type:     String,
+      required: true,
+    },
+
+    typeDisplay: {
+      type:    String,
+      default: null,
+    },
+    isCreatable: {
+      type:    Boolean,
+      default: null,
+    },
+    isYamlCreatable: {
+      type:    Boolean,
+      default: null,
+    },
+    createLocation: {
+      type:    Object,
+      default: null,
+    },
+    yamlCreateLocation: {
+      type:    Object,
+      default: null,
+    },
+    createButtonLabel: {
+      type:    String,
+      default: null
+    },
+    /**
+     * Inherited global identifier prefix for tests
+     * Define a term based on the parent component to avoid conflicts on multiple components
+     */
+    componentTestid: {
+      type:    String,
+      default: 'masthead'
+    },
+
+    mainButtonVisible: {
+      type:    Boolean,
+      default: false
+    },
   },
 
   data() {
@@ -641,6 +685,25 @@ export default {
     @group-value-change="group = $event"
     @enter="handleEnterKeyPress"
   >
+
+    <template #search-main-button>
+      <MastheadBtn
+        v-if="mainButtonVisible"
+        :schema="schema"
+        :resource="resource"
+      >
+      
+        <template #extraActions>
+          <slot name="extraActions" />
+        </template>
+
+        <template #createButton>
+          <slot name="createButton" />
+        </template>
+
+      </ MastheadBtn>
+    </template>
+
     <template
       v-if="showGrouping && _groupOptions.length > 1"
       #header-middle

package/components/SideNav.vue

@@ -113,7 +113,7 @@ export default {
 
   computed: {
     ...mapState(['managementReady', 'clusterReady']),
-    ...mapGetters(['isStandaloneHarvester', 'productId', 'clusterId', 'currentProduct', 'rootProduct', 'isSingleProduct', 'namespaceMode', 'isExplorer', 'isVirtualCluster']),
+    ...mapGetters(['isStandaloneHarvester', 'productId', 'clusterId', 'currentProduct', 'rootProduct', 'currentCluster', 'isSingleProduct', 'namespaceMode', 'isExplorer', 'isVirtualCluster']),
     ...mapGetters({ locale: 'i18n/selectedLocaleLabel', hasMultipleLocales: 'i18n/hasMultipleLocales' }),
     ...mapGetters('type-map', ['activeProducts']),
 
@@ -185,6 +185,12 @@ export default {
     allNavLinksIds() {
       return this.allNavLinks.map((a) => a.id);
     },
+
+    prod() {
+      const name = this.rootProduct.name;
+
+      return this.$store.getters['i18n/withFallback'](`product."${ name }"`, null, ucFirst(name));
+    },
   },
 
   methods: {
@@ -400,9 +406,10 @@ export default {
     role="navigation"
     :aria-label="t('nav.ariaLabel.sideNav')"
   >
-  <div class="side-all-title">
-          控制台
-  </div>
+    <div class="side-all-title">
+      {{ currentCluster ? currentCluster.spec.displayName : prod }}
+    </div>
+
     <!-- Actual nav -->
     <div class="nav">
       <template
@@ -422,36 +429,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"
     >
@@ -472,13 +479,14 @@ export default {
           (Harvester-{{ harvesterVersion }})
         </span>
       </template>
-    </div> -->
+    </div>
   </nav>
 </template>
 
 <style lang="scss" scoped>
   .side-nav {
     display: flex;
+    z-index: 10;
     flex-direction: column;
     .nav {
       flex: 1;
@@ -498,9 +506,8 @@ export default {
 
       A { padding-left: 0; }
     }
-    :deep() A{
+    :deep() A:not(.menuRouterLink){
       height: 50px;
-      background-color: #fff;
     }
 
     .tools {

package/components/SortableTable/THead.vue

@@ -274,6 +274,12 @@ export default {
             class="content"
           >
             <span
+              v-if="(col.name === 'harvester' || col.name === 'explorer') && col.label === ' '"
+            >
+              管理
+            </span>
+            <span
+              v-if="!((col.name === 'harvester' || col.name === 'explorer') && col.label === ' ')"
               v-clean-html="labelFor(col)"
               class="text-no-break"
             />