dashboard-shell-shell 3.0.5-test.2 → 3.0.5-test.20

package/components/ResourceDetail/Masthead/legacy.vue

@@ -443,7 +443,7 @@ export default {
 
       const resources = this.location?.params?.resource || ''
 
-      return this.$store.getters['type-map/groupsForVirTypes'](product, resources);
+      return this.$store.getters['type-map/groupsForVirTypes'](product, resources) || 'default menuIcon';
     },
 
     location() {
@@ -491,192 +491,263 @@ export default {
 </script>
 
 <template>
-
-  <!-- 顶部区域的容器 -->
   <div class="masthead">
     <div class="title">
-
-      <!-- 面包屑导航（创建 API 密钥时不显示） -->
-      <!-- <div
+      <!-- 创建api密钥不需要面包屑 -->
+      <div
         v-if="!(parentRouteOverride === 'account' && resource=== 'token')"
         class="excram-list"
       >
-
-        遍历 demoDisplay 生成面包屑路径
         <span
           v-for="(item,index) in demoDisplay"
           :key="index"
         >
-          <span v-if="item">{{ item }}</span>
-          <span v-if="item">/</span>
+          <span>{{ item }}</span>
+          <span>/</span>
         </span>
-
-        最后一个面包屑显示当前操作（查看/编辑/创建）+ 父资源名称
         <span class="excram-last-name">
-          {{ (realMode === 'view'? '查看': realMode === 'edit' ? '编辑':'创建') + parent.displayName }}
+          {{ (realMode === 'view'? '查看': realMode === 'edit' ? '编辑':'创建') + parent?.displayName }}
         </span>
-      </div> -->
-
-      <header>
-        <div class="title">
-          <div class="primaryheader">
-            <span class="primary-title">
-                
-                <!-- 图标区 -->
-                <span v-if="menuIcon && !(parentRouteOverride === 'account' && resource=== 'token')" class="detailIcon-span">
-                  <!-- 如果是账户 API token，则显示图片，否则显示 icon -->
-                  <img
-                    v-if="parentRouteOverride === 'account' && resource=== 'token'"
-                    :src="Svg"
-                    style="margin-top: 4px; margin-left: 5px;"
-                  >
-                  <i
-                    v-else
-                    :class="'icon-'+ menuIcon + ' detailIcon'"
-                  />
-                </span>
-
-                <!-- 资源标题（创建时只显示“创建+名称”，否则显示“名称:”） -->
-                <span class="detailIcon-span-title">{{ realMode=== 'create'? '创建': '' }}{{ parent.displayName }}{{ realMode=== 'create'? '': '名称:' }}</span>
-                
-                <!-- 如果不是创建模式，显示操作描述 -->
-                <span v-if="realMode !== 'create'">
-
-                  <!-- 如果有覆盖方法，优先显示覆盖内容 -->
-                  <span v-if="value.detailPageHeaderActionOverride && value.detailPageHeaderActionOverride(realMode)">{{ value.detailPageHeaderActionOverride(realMode) }}</span>
-                  
-                  <!-- 否则用 t 组件国际化显示 -->
-                  <t
-                    v-else
-                    :k="'resourceDetail.header.' + realMode"
-                    :subtype="resourceSubtype"
-                    :name="displayName"
-                    :escapehtml="false"
-                  />
-                </span>
-
-                <!-- 状态点（DotState 组件） -->
-                <DotState
-                  v-if="!isCreate && parent.showState"
-                  class="masthead-state"
-                  :value="value"
-                />
-
-                <!-- Istio 注入状态 -->
-                <span
-                  v-if="!isCreate && value.injectionEnabled"
-                  class="masthead-istio"
+      </div>
+    <header>
+      <div class="title">
+        <div class="primaryheader">
+          <span class="primary-title">
+              <!-- <nuxt-link
+                v-if="location"
+                :to="location"
+              >
+                {{ parent.displayName }}:
+              </nuxt-link> -->
+              <span class="detailIcon-span">
+                <img
+                  v-if="parentRouteOverride === 'account' && resource=== 'token'"
+                  :src="Svg"
+                  style="margin-top: 4px; margin-left: 5px;"
                 >
-                  <i
-                    v-clean-tooltip="t('projectNamespaces.isIstioInjectionEnabled')"
-                    class="icon icon-sm icon-istio"
-                  />
-                </span>
+                <i
+                  v-else
+                  :class="'icon-'+ menuIcon + ' detailIcon'"
+                />
               </span>
-
-              <!-- 如果有返回路径，显示分隔符和“返回”链接 -->
+              <span class="detailIcon-span-title">{{ realMode=== 'create'? '创建': '' }}{{ parent?.displayName }}{{ realMode=== 'create'? '': '名称:' }}</span>
+              <span v-if="realMode !== 'create'">
+                <span v-if="value.detailPageHeaderActionOverride && value.detailPageHeaderActionOverride(realMode)">{{ value.detailPageHeaderActionOverride(realMode) }}</span>
+                <t
+                  v-else
+                  :k="'resourceDetail.header.' + realMode"
+                  :subtype="resourceSubtype"
+                  :name="displayName"
+                  :escapehtml="false"
+                />
+              </span>
+              <DotState
+                v-if="!isCreate && parent.showState"
+                class="masthead-state"
+                :value="value"
+              />
               <span
-                v-if="location"
-                class="valid"
-              >|</span>
-              <router-link
-                v-if="location"
-                :to="location"
+                v-if="!isCreate && value.injectionEnabled"
+                class="masthead-istio"
               >
-                返回
-              </router-link>
-          </div>
+                <i
+                  v-clean-tooltip="t('projectNamespaces.isIstioInjectionEnabled')"
+                  class="icon icon-sm icon-istio"
+                />
+              </span>
+            </span>
+            <span
+              v-if="location"
+              class="valid"
+            >|</span>
+            <router-link
+              v-if="location"
+              :to="location"
+            >
+              返回
+            </router-link>
+          <!-- <h1>
+            <TabTitle
+              v-if="isCreate"
+              :showChild="false"
+            >
+              {{ parent.displayName }}
+            </TabTitle>
+            <TabTitle
+              v-else
+              :showChild="false"
+            >
+              {{ displayName }}
+            </TabTitle>
+            <router-link
+              v-if="location"
+              :to="location"
+              role="link"
+              class="masthead-resource-list-link"
+              :aria-label="parent.displayName"
+            >
+              {{ parent.displayName }}:
+            </router-link>
+            <span v-else>{{ parent.displayName }}:</span>
+            <span v-if="value?.detailPageHeaderActionOverride && value?.detailPageHeaderActionOverride(realMode)">{{ value?.detailPageHeaderActionOverride(realMode) }}</span>
+            <t
+              v-else
+              class="masthead-resource-title"
+              :k="'resourceDetail.header.' + realMode"
+              :subtype="resourceSubtype"
+              :name="displayName"
+              :escapehtml="false"
+            />
+            <BadgeState
+              v-if="!isCreate && parent.showState"
+              class="masthead-state"
+              :value="value"
+            />
+            <span
+              v-if="!isCreate && value.injectionEnabled"
+              class="masthead-istio"
+            >
+              <i
+                v-clean-tooltip="t('projectNamespaces.isIstioInjectionEnabled')"
+                class="icon icon-sm icon-istio"
+              />
+            </span>
+            <a
+              v-if="dev && !!resourceExternalLink"
+              v-clean-tooltip="t(resourceExternalLink.tipsKey || 'generic.resourceExternalLinkTips')"
+              class="resource-external"
+              rel="nofollow noopener noreferrer"
+              target="_blank"
+              :href="resourceExternalLink.url"
+            >
+              <i class="icon icon-external-link" />
+            </a>
+          </h1> -->
         </div>
-
-        <!-- 右侧操作按钮区域（支持通过 slot 覆盖） -->
-        <slot name="right">
-          <div class="actions-container align-start" style="padding-right: 15px;">
-            <div class="actions">
-
-              <!-- 详情模式下的主操作按钮 -->
+        <!-- <div
+          v-if="!isCreate"
+          class="subheader"
+        >
+          <span v-if="isNamespace && project">{{ t("resourceDetail.masthead.project") }}: <router-link :to="project.detailLocation">{{ project.nameDisplay }}</router-link></span>
+          <span v-else-if="isWorkspace">{{ t("resourceDetail.masthead.workspace") }}: <router-link :to="workspaceLocation">{{ namespace }}</router-link></span>
+          <span v-else-if="namespace && !hasMultipleNamespaces">
+            {{ t("resourceDetail.masthead.namespace") }}:
+            <router-link
+              v-if="!hideNamespaceLocation"
+              :to="namespaceLocation"
+              data-testid="masthead-subheader-namespace"
+            >
+              {{ namespace }}
+            </router-link>
+            <span v-else>
+              {{ namespace }}
+            </span>
+          </span>
+          <span v-if="parent.showAge">
+            {{ t("resourceDetail.masthead.age") }}:
+            <LiveDate
+              class="live-date"
+              :value="value.creationTimestamp"
+            />
+          </span>
+          <span
+            v-if="value.showCreatedBy"
+            data-testid="masthead-subheader-createdBy"
+          >
+            {{ t("resourceDetail.masthead.createdBy") }}:
+            <router-link
+              v-if="value.createdBy.location"
+              :to="value.createdBy.location"
+              data-testid="masthead-subheader-createdBy-link"
+            >
+              {{ value.createdBy.displayName }}
+            </router-link>
+            <span
+              v-else
+              data-testid="masthead-subheader-createdBy_plain-text"
+            >
+              {{ value.createdBy.displayName }}
+            </span>
+          </span>
+          <span v-if="value.showPodRestarts">{{ t("resourceDetail.masthead.restartCount") }}:<span class="live-data"> {{ value.restartCount }}</span></span>
+        </div> -->
+      </div>
+      <slot name="right">
+        <div class="actions-container align-start">
+          <div class="actions">
+            <button
+              v-if="detailsAction && currentView === DETAIL_VIEW && isView"
+              type="button"
+              class="btn role-primary actions mr-10"
+              :disabled="!detailsAction.enabled"
+              @click="invokeDetailsAction"
+            >
+              {{ detailsAction.label }}
+            </button>
+            <ButtonGroup
+              v-if="showSensitiveToggle"
+              :value="!!hideSensitiveData"
+              icon-size="lg"
+              :options="sensitiveOptions"
+              class="mr-10"
+              @update:value="toggleSensitiveData"
+            />
+
+            <ButtonGroup
+              v-if="viewOptions && isView"
+              v-model:value="currentView"
+              :options="viewOptions"
+              class="mr-10"
+            />
+
+            <template v-if="featureDropdownMenu">
+              <ActionMenu
+                v-if="isView"
+                button-role="multiAction"
+                button-size="compact"
+                :resource="value"
+                data-testid="masthead-action-menu"
+              />
+            </template>
+            <template v-else>
               <button
-                v-if="detailsAction && currentView === DETAIL_VIEW && isView && isManuallyHide"
+                v-if="isView"
+                ref="actions"
+                data-testid="masthead-action-menu"
+                aria-haspopup="true"
                 type="button"
-                class="btn role-primary actions mr-10"
-                :disabled="!detailsAction.enabled"
-                @click="invokeDetailsAction"
+                class="btn role-multi-action actions"
+                @click="showActions"
               >
-                {{ detailsAction.label }}
+                <i class="icon icon-actions" />
               </button>
-
-              <!-- 敏感信息显示/隐藏切换 -->
-              <ButtonGroup
-                v-if="showSensitiveToggle"
-                :value="!!hideSensitiveData"
-                icon-size="lg"
-                :options="sensitiveOptions"
-                class="mr-10"
-                @update:value="toggleSensitiveData"
-              />
-
-              <!-- 视图切换按钮 -->
-              <ButtonGroup
-                v-if="viewOptions && isView"
-                v-model:value="currentView"
-                :options="viewOptions"
-                class="mr-10"
-              />
-
-              <!-- 功能菜单：优先使用 ActionMenu 组件 -->
-              <template v-if="featureDropdownMenu">
-                <ActionMenu
-                  v-if="isView"
-                  button-role="multiAction"
-                  button-size="compact"
-                  :resource="value"
-                  data-testid="masthead-action-menu"
-                />
-              </template>
-
-              <!-- 如果没有 featureDropdownMenu，则使用普通的多操作按钮 -->
-              <template v-else>
-                <button
-                  v-if="isView"
-                  ref="actions"
-                  data-testid="masthead-action-menu"
-                  aria-haspopup="true"
-                  type="button"
-                  class="btn role-multi-action actions"
-                  @click="showActions"
-                >
-                  <i class="icon icon-actions" />
-                </button>
-              </template>
-            </div>
+            </template>
           </div>
-        </slot>
-      </header>
-
-      <!-- 扩展区域 -->
-      <ExtensionPanel
-        :resource="value"
-        :type="extensionType"
-        :location="extensionLocation"
-      />
-
-      <!-- 顶部状态 Banner -->
-      <Banner
-        v-if="banner && isView && !parent.hideBanner"
-        class="state-banner mb-10"
-        :color="banner.color"
-        :label="banner.message == 'Waiting for API to be available' ? '等待 API 可用' : banner.message"
-      />
-
-      <!-- 管理警告 Banner -->
-      <Banner
-        v-if="managedWarning.show"
-        color="warning"
-        class="mb-20"
-        :label="t('resourceDetail.masthead.managedWarning', managedWarning)"
-      />
-
-      <!-- 内容插槽 -->
-      <slot />
+        </div>
+      </slot>
+    </header>
+
+    <!-- Extension area -->
+    <ExtensionPanel
+      :resource="value"
+      :type="extensionType"
+      :location="extensionLocation"
+    />
+
+    <Banner
+      v-if="banner && isView && !parent.hideBanner"
+      class="state-banner mb-10"
+      :color="banner.color"
+      :label="banner.message"
+    />
+    <Banner
+      v-if="managedWarning.show"
+      color="warning"
+      class="mb-20"
+      :label="t('resourceDetail.masthead.managedWarning', managedWarning)"
+    />
+
+    <slot />
     </div>
   </div>
 </template>

package/components/ResourceDetail/legacy.vue

@@ -6,13 +6,14 @@ import {
   _VIEW, _EDIT, _CLONE, _IMPORT, _STAGE, _CREATE,
   AS, _YAML, _DETAIL, _CONFIG, _GRAPH, PREVIEW, MODE,
 } from '@shell/config/query-params';
-import { SCHEMA } from '@shell/config/types';
+import { FLEET, SCHEMA } from '@shell/config/types';
 import { createYaml } from '@shell/utils/create-yaml';
 import Masthead from '@shell/components/ResourceDetail/Masthead';
 import DetailTop from '@shell/components/DetailTop';
 import { clone, diff } from '@shell/utils/object';
 import IconMessage from '@shell/components/IconMessage';
 import ForceDirectedTreeChart from '@shell/components/ForceDirectedTreeChart';
+import { checkSchemasForFindAllHash } from '@shell/utils/auth';
 import { stringify } from '@shell/utils/error';
 import { Banner } from '@components/Banner';
 
@@ -171,6 +172,28 @@ export default {
         yaml = createYaml(schemas, resourceType, data);
       }
     } else {
+      if ( as === _GRAPH ) {
+        const graphSchema = await checkSchemasForFindAllHash({
+          cluster: {
+            inStoreType: 'management',
+            type:        FLEET.CLUSTER
+          },
+          bundle: {
+            inStoreType: 'management',
+            type:        FLEET.BUNDLE,
+            opt:         { excludeFields: ['metadata.managedFields', 'spec.resources'] },
+          },
+
+          bundleDeployment: {
+            inStoreType: 'management',
+            type:        FLEET.BUNDLE_DEPLOYMENT
+          }
+
+        }, this.$store);
+
+        this.canViewChart = graphSchema.cluster && graphSchema.bundle && graphSchema.bundleDeployment;
+      }
+
       let fqid = id;
 
       if ( schema.attributes?.namespaced && namespace ) {
@@ -273,6 +296,7 @@ export default {
       value:           null,
       model:           null,
       notFound:        null,
+      canViewChart:    true,
       canViewYaml:     null,
       errors:          []
     };
@@ -451,17 +475,16 @@ export default {
       :has-graph="hasGraph"
       :has-detail="hasCustomDetail"
       :has-edit="hasCustomEdit"
-      :can-view-yaml="canViewYaml"
       :resource-subtype="resourceSubtype"
       :parent-route-override="parentRouteOverride"
       :store-override="storeOverride"
 
       :isManuallyHide="false"
     >
-      <DetailTop
+      <!-- <DetailTop
         v-if="isView && isDetail"
         :value="liveModel"
-      />
+      /> -->
     </Masthead>
     <div
       v-if="hasErrors"
@@ -481,7 +504,7 @@ export default {
     </div>
 
     <ForceDirectedTreeChart
-      v-if="isGraph"
+      v-if="isGraph && canViewChart"
       :data="chartData"
       :fdc-config="getGraphConfig"
     />
@@ -495,27 +518,26 @@ export default {
       :offer-preview="offerPreview"
       :done-route="doneRoute"
       :done-override="value ? value.doneOverride : null"
-      :show-errors="false"
       @update:value="$emit('input', $event)"
-      @error="onYamlError"
+      @error="e=>errors.push(e)"
     />
 
     <component
-      :is="showComponent"
-      v-else
-      ref="comp"
-      v-model:value="value"
-      v-bind="$data"
-      :done-params="doneParams"
-      :done-route="doneRoute"
-      :mode="mode"
-      :initial-value="initialModel"
-      :live-value="liveModel"
-      :real-mode="realMode"
-      :class="{'flex-content': flexContent}"
-      @update:value="$emit('input', $event)"
-      @update:mode="setMode"
-      @set-subtype="setSubtype"
+    :is="showComponent"
+    v-else
+    ref="comp"
+    v-model:value="value"
+    v-bind="$data"
+    :done-params="doneParams"
+    :done-route="doneRoute"
+    :mode="mode"
+    :initial-value="initialModel"
+    :live-value="liveModel"
+    :real-mode="realMode"
+    :class="{'flex-content': flexContent}"
+    @update:value="$emit('input', $event)"
+    @update:mode="setMode"
+    @set-subtype="setSubtype"
     />
 
     <button
@@ -555,10 +577,4 @@ export default {
   flex-direction: column;
   flex-grow: 1;
 }
-.cru__errors {
-  position: sticky;
-  top: 0;
-  z-index: 1;
-  background-color: var(--header-bg);
-}
 </style>

package/components/ResourceList/Masthead.vue

@@ -156,37 +156,34 @@ export default {
     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 productId = this.$store.getters['type-map/groupForBasicType'](this.$store.getters['productId'], this._createLocation?.params?.resource);
+      console.log(this._createLocation, 'this._createLocation?.params?.resource')
+      console.log(this._createLocation?.params?.resource, 'this._createLocation?.params?.resource')
+      let parts = productId?.split('::');
       const newString = 'root';
 
-      // 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) {
+        if (this.$route.path.includes('/c/local/explorer/secret')) {
+          parts = ['storage']          
+        }
+      }
       
       const breadcrumbList = {
         'harvesterhci.io.management.cluster': {
           origin: 'Harvester 集群',
           bread: ['虚拟化管理'],
-          description: '提供虚拟化集群的实时健康状态监控、版本号管理及资源负载管理，支持批量导入/删除集群、配置调优与权限分级功能，实现高效运维管控。'
         },
         'management.cattle.io.user': {
           origin: '用户',
           bread: ['用户 & 认证'],
-          description: '用于管理用户账号，支持创建、维护用户信息，可设置用户权限、管理密码等，保障系统资源仅由授权用户访问，提升系统安全性。'
         },
         'management.cattle.io.setting':{
           origin: '基础设置',
           bread: ['全局设置'],
-          description: '统一配置平台基础选项与全局设置，支持CA证书、密码规则、域名、Token时效等核心配置。'
         },
         'management.cattle.io.feature':{
           origin: '功能开关',
           bread: ['全局设置'],
-          description: '还没有添加描述。。。。'
         },
       }
       const resourcePath = this.$route.params.resource || ''
@@ -194,7 +191,6 @@ export default {
       const breadcrumb = []
       if (breadcrumbList[resourcePath] && Object.keys(breadcrumbList[resourcePath]).length > 0) {
         breadcrumb.push(...breadcrumbList[resourcePath].bread)
-        this.description = breadcrumbList[resourcePath].description
         return breadcrumb
       } else {
         if (!parts?.includes(newString)) {
@@ -325,7 +321,7 @@ export default {
       <!-- 操作按钮区域 -->
       <div 
         ref="actionsContainer"
-        v-if="!(tabList.includes(_typeDisplay)) && mainButtonVisible"
+        v-if="!(tabList.includes(_typeDisplay))"
         class="actions-container actions-positioning"
         style="min-height: 32px;align-self: flex-end;"
       >
@@ -419,6 +415,6 @@ export default {
   .actions-positioning {
     position: absolute;
     bottom: -48px;
-    z-index: 20;
+    z-index: 15;
   }
 </style>

package/components/SideNav.vue

@@ -436,7 +436,7 @@ export default {
     :aria-label="t('nav.ariaLabel.sideNav')"
   >
     <div class="side-all-title">
-      {{ prod == 'Cloud' && currentCluster ? '控制台' : prod }}
+      {{ (prod == 'Cloud' || prod == 'Harvester') && currentCluster ? '控制台' : prod }}
     </div>
 
     <!-- Actual nav -->