dashboard-shell-shell 0.0.1000000000001128 → 0.0.1000000000001130

package/assets/styles/global/_tooltip.scss

@@ -147,9 +147,7 @@
 }
 
 .v-popper__popper.v-popper--theme-dropdown {
-  border-radius: 4px;
   z-index: z-index('tooltip');
-  border: 1px solid #d9d9d9 !important;
 
   &.containerLogsDropdown, &.fleet-summary-tooltip{
     .v-popper__arrow-container {
@@ -206,8 +204,4 @@
   .v-popper__inner {
     padding: 0px;
   }
-}
-
-// .v-popper__arrow-container {
-//   display: none; 
-// }
+}

package/components/BrandImage.vue

@@ -80,18 +80,13 @@ export default {
 
     pathToBrandedImage() {
 
-      console.log(this.fileName, ' this.fileName;')
-
       if (this.fileName === 'rancher-logo.svg' || this.supportCustomLogo) {
         if (this.theme === 'dark' && this.uiLogoDark) {
 
-          console.log(this.uiLogoDark, ' this.uiLogoDark;')
-          
           return this.uiLogoDark;
         }
 
         if (this.uiLogoLight) {
-          console.log(this.uiLogoLight, ' this.uiLogoLight;')
 
           return this.uiLogoLight;
         }
@@ -99,13 +94,11 @@ export default {
 
       if (this.fileName === 'banner.svg') {
         if (this.theme === 'dark' && this.uiBannerDark) {
-          console.log(this.uiBannerDark, ' this.uiBannerDark;')
 
           return this.uiBannerDark;
         }
 
         if (this.uiBannerLight) {
-          console.log(this.uiBannerLight, ' this.uiBannerLight;')
 
           return this.uiBannerLight;
         }
@@ -113,13 +106,11 @@ export default {
 
       if (this.fileName === 'login-landscape.svg') {
         if (this.theme === 'dark' && this.uiLoginBackgroundDark) {
-          console.log(this.uiLoginBackgroundDark, ' this.uiLoginBackgroundDark;')
 
           return this.uiLoginBackgroundDark;
         }
 
         if (this.uiLoginBackgroundLight) {
-          console.log(this.uiLoginBackgroundLight, ' this.uiLoginBackgroundLight;')
 
           return this.uiLoginBackgroundLight;
         }
@@ -127,8 +118,6 @@ export default {
 
       if (!this.brand) {
 
-        console.log(this.defaultPathToBrandedImage, ' this.defaultPathToBrandedImage;')
-
         return this.defaultPathToBrandedImage;
       } else {
         if (this.theme === 'dark' || this.dark) {
@@ -140,8 +129,6 @@ export default {
           return require(`~shell/assets/brand/${ this.brand }/${ this.fileName }`);
         } catch {}
 
-        console.log(this.defaultPathToBrandedImage, ' this.defaultPathToBrandedImage;')
-
         return this.defaultPathToBrandedImage;
       }
     },

package/components/ExplorerProjectsNamespaces.vue

@@ -441,6 +441,7 @@ export default {
         </router-link>
       </template>
     </Masthead>
+    <!-- harvester------------------------------------------------------3 -->
     <!-- Extensions area -->
     <ExtensionPanel
       :resource="{}"

package/components/ResourceDetail/Masthead.vue

@@ -494,167 +494,245 @@ export default {
           {{ (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"
+    <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"
+                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"
-      />
-
-      <!-- 管理警告 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/ResourceList/Masthead-btn.vue

@@ -82,12 +82,6 @@ export default {
       query: { [AS]: _YAML },
     };
 
-    console.log(schema, ' schema-----------------------------------------2');
-
-    console.log(_typeDisplay, ' _typeDisplay-------------------------------------2');
-
-    console.log(_isCreatable, ' _isCreatable----------------------------------2');
-
     const tabList = ['集群配置'];
     return {
       formRoute,