dashboard-shell-shell 3.0.5-test.6 → 3.0.5-test.61

package/components/nav/Type.vue

@@ -3,6 +3,7 @@ import Favorite from '@shell/components/nav/Favorite';
 import { TYPE_MODES } from '@shell/store/type-map';
 
 import TabTitle from '@shell/components/TabTitle';
+import { menuRouteMap } from '@shell/config/menuRouteMap';
 
 const showFavoritesFor = [TYPE_MODES.FAVORITE, TYPE_MODES.USED];
 
@@ -61,6 +62,13 @@ export default {
       const pageFullPath = this.$route.fullPath?.toLowerCase().split('#')[0]; // Ignore the shebang when comparing routes
       const routeMetaNav = this.$route.meta?.nav;
 
+      const resource = this.$route?.params?.resource || ''
+
+      // 菜单选中动态映射逻辑
+      if (menuRouteMap[this.type.name] && menuRouteMap[this.type.name].includes(resource)) {
+        return true;
+      }
+
       // If the route explicitly declares the nav path that should be highlighted, then use that
       if (routeMetaNav) {
         const cluster = this.$route.params?.cluster;
@@ -112,6 +120,7 @@ export default {
 </script>
 
 <template>
+  <!-- 当 type 有 route 时，渲染一个 Vue Router 自定义链接 -->
   <router-link
     v-if="type.route"
     :key="type.name"
@@ -119,60 +128,78 @@ export default {
     custom
     :to="type.route"
   >
+
+    <!-- 导航项容器 -->
     <li
       class="child nav-type"
       :class="{'root': isRoot, [`depth-${depth}`]: true, 'router-link-active': isActive, 'router-link-exact-active': isExactActive}"
       @click="navigate"
       @keypress.enter="navigate"
     >
+
+      <!-- 如果是精确匹配激活状态，则显示 TabTitle 组件 -->
       <TabTitle
         v-if="isExactActive"
         :show-child="false"
       >
         {{ type.labelKey ? t(type.labelKey) : (type.labelDisplay || type.label) }}
       </TabTitle>
+
+      <!-- 链接主体 -->
       <a
         role="link"
         :aria-label="type.labelKey ? t(type.labelKey) : (type.labelDisplay || type.label)"
-        :href="href"
+        :href="href.replace(/harvester/g, 'cloud')"
         class="type-link"
         :aria-current="isActive ? 'page' : undefined"
         @click="selectType(); navigate($event);"
         @mouseenter="setNear(true)"
         @mouseleave="setNear(false)"
       >
+        <!-- 文本标签：优先使用多语言 key -->
         <span
           v-if="type.labelKey"
           class="label"
         ><t :k="type.labelKey" /></span>
-        <span
-          v-else
-          v-clean-html="type.labelDisplay || type.label"
-          class="label"
-          :class="{'no-icon': !type.icon}"
-        />
-        <span
+
+        <!-- 没有 labelKey 时，直接使用 HTML 文本 -->
+         <div v-else style="display: flex; align-items: center;" class="labelKey_menu">
+          <i v-if="!type.labelDisplay || (type.labelDisplay && type.labelDisplay.indexOf('</i>') === -1)" class="icon icon-fw icon-globe" style="color: var(--muted);width: 32px;text-align: left;"></i>
+           <span
+             v-clean-html="type.labelDisplay || type.label"
+             class="label"
+             :class="{'no-icon': !type.icon}"
+           />
+         </div>
+
+        <!-- 右侧附加信息（收藏按钮 / 命名空间图标 / 计数） -->
+        <!-- <span
           v-if="showFavorite || namespaceIcon || showCount"
           class="count"
         >
+
           <Favorite
             v-if="showFavorite"
             :resource="type.name"
           />
+
           <i
             v-if="namespaceIcon"
             class="icon icon-namespace"
             :class="{'ns-and-icon': showCount}"
             data-testid="type-namespaced"
           />
+
           <span
             v-if="showCount"
             data-testid="type-count"
           >{{ count }}</span>
-        </span>
+        </span> -->
       </a>
     </li>
   </router-link>
+
+  <!-- 当 type 没有 route 但有外部 link 时 -->
   <li
     v-else-if="type.link"
     class="child nav-type nav-link"
@@ -180,7 +207,7 @@ export default {
   >
     <a
       role="link"
-      :href="type.link"
+      :href="type.link.replace(/harvester/g, 'cloud')"
       :target="type.target"
       rel="noopener noreferrer nofollow"
       :aria-label="type.label"
@@ -188,6 +215,8 @@ export default {
       <span class="label">{{ type.label }}&nbsp;<i class="icon icon-external-link" /></span>
     </a>
   </li>
+
+  <!-- 兜底情况：既没有 route，也没有 link -->
   <li v-else>
     {{ type }}?
   </li>
@@ -214,6 +243,7 @@ export default {
     .label {
       align-items: center;
       grid-area: label;
+      display: flex;
       overflow: hidden;
       text-overflow: ellipsis;
 
@@ -221,13 +251,13 @@ export default {
         padding-left: 3px;
       }
 
-      :deep() .highlight {
+      ::v-deep .highlight {
         background: var(--diff-ins-bg);
         color: var(--body-text);
         padding: 2px;
       }
 
-      :deep() .icon {
+      ::v-deep .icon {
         position: relative;
         color: var(--muted);
       }
@@ -236,24 +266,28 @@ export default {
     A {
       display: grid;
       grid-template-areas: "label count";
-      grid-template-columns: auto auto;
+      grid-template-columns: auto 20px;
       grid-column-gap: 5px;
       font-size: 14px;
       line-height: 24px;
-      padding: 7.5px 7px 7.5px 10px;
+      /* padding: 7.5px 7px 7.5px 10px; */
+      padding: 0px 16px 0px 30px;
+      height: 50px;
       margin: 0 0 0 -3px;
       overflow: hidden;
       text-overflow: ellipsis;
       white-space: nowrap;
       color: var(--body-text);
-      height: 33px;
 
       &:hover {
-        background: var(--nav-hover);
+        background: var(--nav-active) !important;
+        color: var(--nav-hover-color);
+        /* background: var(--nav-hover); */
         text-decoration: none;
 
-        :deep() .icon {
-          color: var(--body-text);
+        ::v-deep .icon {
+          /* color: var(--body-text); */
+          color: var(--nav-hover-color);
         }
       }
     }
@@ -262,46 +296,42 @@ export default {
       grid-area: favorite;
       font-size: 12px;
       position: relative;
-      vertical-align: middle;
-      margin-right: 4px;
     }
 
     .count {
+      grid-area: count;
       font-size: 12px;
+      text-align: right;
       justify-items: center;
-      padding-right: 4px;
-      display: flex;
-      align-items: center;
-    }
-
-    &.nav-type.nav-link {
-      a .label {
-        display: flex;
-      }
+      line-height: 50px;
     }
 
     &.nav-type:not(.depth-0) {
       A {
-        padding-left: 16px;
+        font-size: 13px;
+        padding: 5.5px 7px 5.5px 40px;
       }
 
-      :deep() .label I {
+      ::v-deep .label I {
         padding-right: 2px;
       }
     }
+  }
 
-    &.nav-type:is(.depth-1) {
-      A {
-        font-size: 13px;
-        padding-left: 23px;
-      }
-    }
-
-    &.nav-type:not(.depth-0):not(.depth-1) {
-      A {
-        padding-left: 14px;
-      }
+.labelKey_menu{
+  display: flex;
+  align-items: center;
+}
+.labelKey_menu:hover{
+  i{
+    color: var(--nav-hover-color) !important;
+  }
+}
+.router-link-active{
+  .labelKey_menu{
+    i{
+      color: var(--nav-hover-color) !important;
     }
   }
-
+}
 </style>

package/composables/useClickOutside.ts

@@ -76,6 +76,6 @@ export const useClickOutside = <T extends OnClickOutsideOptions>(
 
   onBeforeUnmount(() => {
     window.removeEventListener('click', listener as any);
-    window.removeEventListener('pointerDown', setShouldListen);
+    window.removeEventListener('pointerdown', setShouldListen);
   });
 };

package/config/menuRouteMap.js

@@ -0,0 +1,10 @@
+// menuRouteMap.js
+export const menuRouteMap = {
+  'projects-namespaces': [
+    'management.cattle.io.project', // 创建项目
+    'namespace',
+  ],
+  'cluster-members': [
+    'management.cattle.io.clusterroletemplatebinding'
+  ]
+};

package/config/private-label.js

@@ -58,17 +58,20 @@ export function matches(pl) {
 }
 
 export function getVendor() {
-  if ( vendor === SETTING.PL_RANCHER_VALUE ) {
-    // Custom vendor override based on brand
-    if (brand && CUSTOM_VENDOR[brand]) {
-      return CUSTOM_VENDOR[brand];
-    }
+  return '云翼云管平台';
+}
+// export function getVendor() {
+//   if ( vendor === SETTING.PL_RANCHER_VALUE ) {
+//     // Custom vendor override based on brand
+//     if (brand && CUSTOM_VENDOR[brand]) {
+//       return CUSTOM_VENDOR[brand];
+//     }
 
-    return STANDARD_VENDOR;
-  }
+//     return STANDARD_VENDOR;
+//   }
 
-  return vendor;
-}
+//   return vendor;
+// }
 
 export function getProduct() {
   return product;
@@ -80,13 +83,13 @@ export function setTitle() {
   if (v === 'Harvester') {
     const ico = require(`~shell/assets/images/pl/harvester.png`);
 
-    document.title = 'Harvester';
+    document.title = '云翼云管平台';
     const link = document.createElement('link');
 
     link.hid = 'icon';
     link.rel = 'icon';
     link.type = 'image/x-icon';
-    link.hrefv = ico;
+    link.href = ico;
     const head = document.getElementsByTagName('head')[0];
 
     head.appendChild(link);

package/config/product/auth.js

@@ -191,13 +191,23 @@ export function init(store) {
   componentForType(`${ MANAGEMENT.AUTH_CONFIG }/genericoidc`, 'auth/oidc');
   componentForType(`${ MANAGEMENT.AUTH_CONFIG }/cognito`, 'auth/oidc');
 
-  basicType([
-    'config',
-    USERS_VIRTUAL_TYPE,
-    NORMAN.SPOOFED.GROUP_PRINCIPAL,
-    ROLES_VIRTUAL_TYPE,
-    MANAGEMENT.OIDC_CLIENT
-  ]);
+  const topLevelPermissions = sessionStorage.getItem('TOPLEVELPERMISSIONS')
+
+  if (topLevelPermissions && topLevelPermissions === 'superadmin') {
+    basicType([
+      'config',
+      USERS_VIRTUAL_TYPE,
+      NORMAN.SPOOFED.GROUP_PRINCIPAL,
+      ROLES_VIRTUAL_TYPE,
+      MANAGEMENT.OIDC_CLIENT
+    ]);
+  } else {
+    basicType([
+      USERS_VIRTUAL_TYPE,
+      ROLES_VIRTUAL_TYPE
+    ]);
+  }
+
 
   headers(NORMAN.SPOOFED.GROUP_PRINCIPAL, [
     GROUP_NAME,

package/config/product/explorer.js

@@ -67,16 +67,37 @@ export function init(store) {
     }
   });
 
+  const topLevelPermissions = sessionStorage.getItem('TOPLEVELPERMISSIONS')
+
   basicType(['cluster-dashboard', 'cluster-tools']);
-  basicType([
-    'cluster-dashboard',
-    'projects-namespaces',
-    'namespaces',
-    NODE,
-    VIRTUAL_TYPES.CLUSTER_MEMBERS,
-    EVENT,
-    'c-cluster-explorer-tools'
-  ], 'cluster');
+
+  if (topLevelPermissions && topLevelPermissions === 'superadmin') {
+    basicType([
+      'cluster-dashboard',
+      'projects-namespaces',
+      'namespaces',
+      'namespace',
+      NODE,
+      VIRTUAL_TYPES.CLUSTER_MEMBERS,
+      EVENT,
+      'c-cluster-explorer-tools',
+      'management.cattle.io.project',
+      'management.cattle.io.clusterroletemplatebinding'
+    ], 'cluster');
+  } else {
+    basicType([
+      'cluster-dashboard',
+      'projects-namespaces',
+      'namespaces',
+      'namespace',
+      NODE,
+      VIRTUAL_TYPES.CLUSTER_MEMBERS,
+      EVENT,
+      'management.cattle.io.project',
+      'management.cattle.io.clusterroletemplatebinding'
+    ], 'cluster');
+  }
+
   basicType([
     LIMIT_RANGE,
     NETWORK_POLICY,
@@ -95,6 +116,7 @@ export function init(store) {
     STORAGE_CLASS,
     SECRET,
     VIRTUAL_TYPES.PROJECT_SECRETS,
+    VIRTUAL_TYPES.NAMESPACES,
     CONFIG_MAP
   ], 'storage');
   basicType([
@@ -633,7 +655,7 @@ export function init(store) {
   virtualType({
     label:            store.getters['i18n/t'](`typeLabel.${ VIRTUAL_TYPES.PROJECT_SECRETS }`, { count: 2 }),
     group:            'storage',
-    icon:             'globe',
+    icon:             'default',
     namespaced:       false,
     ifRancherCluster: true,
     name:             VIRTUAL_TYPES.PROJECT_SECRETS,

package/config/product/manager.js

@@ -13,6 +13,7 @@ import { DSL } from '@shell/store/type-map';
 import { BLANK_CLUSTER } from '@shell/store/store-types.js';
 
 export const NAME = 'manager';
+const topLevelPermissions = sessionStorage.getItem('TOPLEVELPERMISSIONS')
 
 export function init(store) {
   const {
@@ -60,11 +61,17 @@ export function init(store) {
     route:      { name: 'c-cluster-manager-cloudCredential' },
   });
 
-  basicType([
-    CAPI.RANCHER_CLUSTER,
-    'cloud-credentials',
-    'drivers',
-  ]);
+  if (topLevelPermissions && topLevelPermissions === 'superadmin') {
+    basicType([
+      CAPI.RANCHER_CLUSTER,
+      'cloud-credentials',
+      'drivers',
+    ]);
+  } else {
+    basicType([
+      CAPI.RANCHER_CLUSTER,
+    ]);
+  }
 
   configureType(SNAPSHOT, { depaginate: true });
 
@@ -111,10 +118,12 @@ export function init(store) {
     exact:      true
   });
 
-  basicType([
-    'rke-kontainer-drivers',
-    'rke-node-drivers',
-  ], 'drivers');
+  if (topLevelPermissions && topLevelPermissions === 'superadmin') {
+    basicType([
+      'rke-kontainer-drivers',
+      'rke-node-drivers',
+    ], 'drivers');
+  }
 
   weightType(CAPI.MACHINE_DEPLOYMENT, 4, true);
   weightType(CAPI.MACHINE_SET, 3, true);
@@ -123,14 +132,16 @@ export function init(store) {
   weightType(MANAGEMENT.PSA, 5, true);
   weightType(VIRTUAL_TYPES.JWT_AUTHENTICATION, 0, true);
 
-  basicType([
-    CAPI.MACHINE_DEPLOYMENT,
-    CAPI.MACHINE_SET,
-    CAPI.MACHINE,
-    CATALOG.CLUSTER_REPO,
-    MANAGEMENT.PSA,
-    VIRTUAL_TYPES.JWT_AUTHENTICATION
-  ], 'advanced');
+  if (topLevelPermissions && topLevelPermissions === 'superadmin') {
+    basicType([
+      CAPI.MACHINE_DEPLOYMENT,
+      CAPI.MACHINE_SET,
+      CAPI.MACHINE,
+      CATALOG.CLUSTER_REPO,
+      MANAGEMENT.PSA,
+      VIRTUAL_TYPES.JWT_AUTHENTICATION
+    ], 'advanced');
+  }
 
   weightGroup('advanced', -1, true);
 

package/config/product/settings.js

@@ -112,15 +112,25 @@ export function init(store) {
     route:      { name: 'c-cluster-settings-fleet' }
   });
 
-  basicType([
-    'settings',
-    'features',
-    'brand',
-    'banners',
-    'performance',
-    'links',
-    'fleet-settings'
-  ]);
+  const topLevelPermissions = sessionStorage.getItem('TOPLEVELPERMISSIONS')
+
+  if (topLevelPermissions && topLevelPermissions === 'superadmin') {
+    basicType([
+      'settings',
+      'features',
+      'brand',
+      'banners',
+      'performance',
+      'links',
+      'fleet-settings'
+    ]);
+  } else {
+    basicType([
+      'settings',
+      'brand',
+    ]);
+  }
+
 
   configureType(MANAGEMENT.SETTING, {
     isCreatable: false,

package/config/product/uiplugins.js

@@ -5,14 +5,17 @@ export const NAME = 'uiplugins';
 export function init(store) {
   const { product } = DSL(store, NAME);
 
-  // Add a product for UI Plugins - will appear in the top-level menu
-  product({
-    ifHave:              IF_HAVE.ADMIN, // Only admins can see the UI Plugin Custom Resource by default
-    inStore:             'management',
-    icon:                'extension',
-    removable:           false,
-    showClusterSwitcher: false,
-    category:            'configuration',
-    weight:              50,
-  });
+  if (sessionStorage.getItem('TOPLEVELPERMISSIONS') && sessionStorage.getItem('TOPLEVELPERMISSIONS') === 'superadmin') {
+    // Add a product for UI Plugins - will appear in the top-level menu
+    product({
+      ifHave:              IF_HAVE.ADMIN, // Only admins can see the UI Plugin Custom Resource by default
+      inStore:             'management',
+      icon:                'extension',
+      removable:           false,
+      showClusterSwitcher: false,
+      category:            'configuration',
+      weight:              50,
+    });
+  }
+
 }

package/config/router/navigation-guards/index.js

@@ -11,13 +11,71 @@ import { install as installPageTitle } from '@shell/config/router/navigation-gua
 import { install as installServerUpgradeGrowl } from '@shell/config/router/navigation-guards/server-upgrade-growl';
 
 /**
- * Install our router navigation guards. i.e. router.beforeEach(), router.afterEach()
+ * Install router navigation guards
+ * 1. 保留原有导航守卫顺序
+ * 2. 不在 beforeEach 改 params，只在 push/replace & afterEach 改 URL
  */
 export function installNavigationGuards(router, context) {
-  // NOTE: the order of the installation matters.
-  // Be intentional when adding, removing or modifying the guards that are installed.
+  // 最早执行：保证进入逻辑时 params 始终是 harvester
+  router.beforeEach((to, from, next) => {
+    let changed = false;
+    const params = { ...to.params };
+
+    if (params?.product?.includes('cloud')) {
+      params.product = params.product.replace(/cloud/g, 'harvester');
+      changed = true;
+    }
+
+    if (params?.cluster?.includes('cloud')) {
+      params.cluster = params.cluster.replace(/cloud/g, 'harvester');
+      changed = true;
+    }
+
+    if (params?.resource?.includes('cloud')) {
+      params.resource = params.resource.replace(/cloud/g, 'harvester');
+      changed = true;
+    }
+
+    if (changed) {
+      // 触发路由重定向
+      return next({ ...to, params });
+    }
+
+    next();
+  });
+
 
   const navigationGuardInstallers = [installLoadInitialSettings, installAttemptFirstLogin, installAuthentication, installProducts, installClusters, installRuntimeExtensionRoute, installI18N, installHandleInstallRedirect, installPageTitle, installRecordLastRoute, installServerUpgradeGrowl];
 
   navigationGuardInstallers.forEach((installer) => installer(router, context));
+
+  // 🔹 最后执行：只改地址栏，不改内部
+  router.afterEach((to) => {
+    const base = router.options.history?.base || '';
+    const pathParts = to.path.split('/');
+
+    const newPathParts = pathParts.map((part) => {
+      // 只替换 cluster/product/resource 对应的 segment
+      for (const key of ['cluster', 'product', 'resource']) {
+        if (to.params[key] && to.params[key] === part) {
+          return part.replace(/harvester/g, 'cloud');
+        }
+      }
+      return part;
+    });
+
+    let cloudPath = newPathParts.join('/');
+    if (!cloudPath.startsWith(base)) {
+      cloudPath = base + cloudPath;
+    }
+
+    const currentLocation = window.location.pathname + window.location.search + window.location.hash;
+
+    if (cloudPath !== currentLocation) {
+      console.info('[URL Replace] Updating address bar:', currentLocation, '→', cloudPath);
+      window.history.replaceState({}, '', cloudPath);
+    }
+  });
+
 }
+

package/config/settings.ts

@@ -112,6 +112,34 @@ export const SETTING = {
   CLUSTER_AGENT_DEFAULT_POD_DISTRIBUTION_BUDGET: 'cluster-agent-default-pod-disruption-budget'
 } as const;
 
+export const ALLOWED_SETTINGS_NEW: GlobalSetting = {
+  [SETTING.CA_CERTS]:            { kind: 'multiline', readOnly: true },
+  [SETTING.PASSWORD_MIN_LENGTH]: {
+    kind:    'integer',
+    ruleSet: [
+      {
+        name:       'betweenValues',
+        key:        'Password',
+        factoryArg: [2, 256]
+      },
+      {
+        name: 'isInteger',
+        key:  'Password',
+      },
+      {
+        name: 'isPositive',
+        key:  'Password',
+      },
+      {
+        name: 'isOctal',
+        key:  'Password',
+      }
+    ],
+  },
+  [SETTING.AUTH_USER_SESSION_TTL_MINUTES]:        {},
+  [SETTING.AUTH_TOKEN_MAX_TTL_MINUTES]:           {},
+}
+
 // These are the settings that are allowed to be edited via the UI
 export const ALLOWED_SETTINGS: GlobalSetting = {
   [SETTING.CA_CERTS]:            { kind: 'multiline', readOnly: true },