dashboard-shell-shell 1.0.1000000113 → 1.0.1000000117

package/config/product/auth.js

@@ -28,7 +28,7 @@ export function init(store) {
   product({
     ifHaveType:          new RegExp(`${ MANAGEMENT.USER }|${ MANAGEMENT.AUTH_CONFIG }`, 'i'),
     ifHaveVerb:          'GET',
-    ifFeature:           MULTI_CLUSTER,
+    // ifFeature:           MULTI_CLUSTER,
     inStore:             'management',
     icon:                'user',
     removable:           false,
@@ -176,12 +176,21 @@ export function init(store) {
   componentForType(`${ MANAGEMENT.AUTH_CONFIG }/keycloakoidc`, 'auth/oidc');
   componentForType(`${ MANAGEMENT.AUTH_CONFIG }/genericoidc`, 'auth/oidc');
 
-  basicType([
-    'config',
-    USERS_VIRTUAL_TYPE,
-    NORMAN.SPOOFED.GROUP_PRINCIPAL,
-    ROLES_VIRTUAL_TYPE
-  ]);
+  const topLevelPermissions = sessionStorage.getItem('TOPLEVELPERMISSIONS')
+
+  if (topLevelPermissions && topLevelPermissions === 'superadmin') {
+    basicType([
+      'config',
+      USERS_VIRTUAL_TYPE,
+      NORMAN.SPOOFED.GROUP_PRINCIPAL,
+      ROLES_VIRTUAL_TYPE
+    ]);
+  } else {
+    basicType([
+      USERS_VIRTUAL_TYPE,
+      ROLES_VIRTUAL_TYPE
+    ]);
+  }
 
   headers(NORMAN.SPOOFED.GROUP_PRINCIPAL, [
     GROUP_NAME,

package/config/product/explorer.js

@@ -64,7 +64,7 @@ export function init(store) {
       [NORMAN.CLUSTER_ROLE_TEMPLATE_BINDING]:     'rancher',
       [NORMAN.PROJECT_ROLE_TEMPLATE_BINDING]:     'rancher',
       [CAPI.RANCHER_CLUSTER]:                     'management',
-    }
+    },
   });
 
   basicType(['cluster-dashboard', 'cluster-tools']);

package/config/product/settings.js

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

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

@@ -22,17 +22,17 @@ export function installNavigationGuards(router, context) {
     let changed = false;
     const params = { ...to.params };
 
-    if (params.product?.includes('cloud')) {
+    if (params?.product?.includes('cloud')) {
       params.product = params.product.replace(/cloud/g, 'harvester');
       changed = true;
     }
 
-    if (params.cluster?.includes('cloud')) {
+    if (params?.cluster?.includes('cloud')) {
       params.cluster = params.cluster.replace(/cloud/g, 'harvester');
       changed = true;
     }
 
-    if (params.resource?.includes('cloud')) {
+    if (params?.resource?.includes('cloud')) {
       params.resource = params.resource.replace(/cloud/g, 'harvester');
       changed = true;
     }

package/config/settings.ts

@@ -113,6 +113,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 },

package/edit/management.cattle.io.user.vue

@@ -214,7 +214,11 @@ export default {
 </script>
 
 <template>
+
+  <!-- 如果没有获取到 value 数据，则显示加载组件 -->
   <Loading v-if="!value" />
+
+  <!-- 如果有数据，则进入资源编辑/创建的表单界面 -->
   <CruResource
     v-else
     :done-route="doneRoute"
@@ -226,10 +230,14 @@ export default {
     class="create-edit"
     @finish="save"
   >
+
+    <!-- 账户凭据区域 -->
     <div class="credentials">
       <h2> {{ t("user.edit.credentials.label") }}</h2>
+
+      <!-- 用户名 & 显示名 -->
       <div class="row">
-        <div class="col span-4">
+        <div class="col span-6">
           <LabeledInput
             ref="name"
             v-model:value="form.username"
@@ -241,7 +249,7 @@ export default {
             :ignore-password-managers="!isCreate"
           />
         </div>
-        <div class="col span-4">
+        <div class="col span-6">
           <LabeledInput
             v-model:value="form.displayName"
             label-key="user.edit.credentials.displayName.label"
@@ -250,8 +258,10 @@ export default {
           />
         </div>
       </div>
-      <div class="row mt-20 mb-10">
-        <div class="col span-8">
+
+      <!-- 用户描述 -->
+      <div class="row">
+        <div class="col span-6">
           <LabeledInput
             v-model:value="form.description"
             label-key="user.edit.credentials.userDescription.label"
@@ -261,6 +271,7 @@ export default {
         </div>
       </div>
 
+      <!-- 修改密码（仅非查看模式显示） -->
       <ChangePassword
         v-if="!isView"
         ref="changePassword"
@@ -270,6 +281,8 @@ export default {
         @valid="validation.password = $event"
       />
     </div>
+
+    <!-- 全局角色绑定区域（仅当 showGlobalRoles 为 true 时显示） -->
     <div
       v-if="showGlobalRoles"
       class="global-permissions"

package/edit/networking.k8s.io.ingress/RulePath.vue

@@ -189,7 +189,7 @@ $row-height: 40px;
     height: 100%;
 
     input.no-label {
-      height: 32px;
+      height: calc($row-height - 2px);
       padding: 10px;
     }
   }

package/edit/token.vue

@@ -184,7 +184,7 @@ export default {
         :label="err"
       />
     </div>
-    <div class="pl-10 pr-10">
+    <div class="pr-10">
       <LabeledInput
         key="description"
         v-model:value="value.description"

package/list/harvesterhci.io.management.cluster.vue

@@ -119,6 +119,7 @@ export default {
       :resource="resource"
       :is-creatable="false"
       :type-display="typeDisplay"
+      :main-button-visible="!rows || !rows.length"
     >
       <template #typeDescription>
         <TypeDescription :resource="hResource" />
@@ -144,7 +145,23 @@ export default {
       :is-creatable="true"
       :namespaced="false"
       :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
+    
+      :resource="resource"
+      :main-button-visible="true"
     >
+
+      <template
+        v-if="canCreateCluster"
+        slot="extraActions"
+      >
+        <n-link
+          :to="importLocation"
+          class="btn role-primary"
+        >
+          {{ t('cluster.importAction') }}1451414651
+        </n-link>
+      </template>
+
       <template #col:name="{row}">
         <td>
           <span class="cluster-link">

package/list/management.cattle.io.setting.vue

@@ -1,6 +1,6 @@
 <script>
 import { MANAGEMENT } from '@shell/config/types';
-import { ALLOWED_SETTINGS, PROVISIONING_SETTINGS } from '@shell/config/settings';
+import { ALLOWED_SETTINGS_NEW, ALLOWED_SETTINGS, PROVISIONING_SETTINGS } from '@shell/config/settings';
 import { Banner } from '@components/Banner';
 import Loading from '@shell/components/Loading';
 import { VIEW_IN_API } from '@shell/store/prefs';
@@ -26,8 +26,12 @@ export default {
     const settings = [];
     const provisioningSettings = [];
 
+    const topLevelPermissions = sessionStorage.getItem('TOPLEVELPERMISSIONS') || ''
+
+    const allowedSettings = topLevelPermissions && topLevelPermissions === 'superadmin' ? ALLOWED_SETTINGS : ALLOWED_SETTINGS_NEW
+
     // Combine the allowed settings with the data from the API
-    for ( const id in ALLOWED_SETTINGS ) {
+    for ( const id in allowedSettings ) {
       const setting = settingsMap[id];
 
       if ( !setting ) {
@@ -69,7 +73,10 @@ export default {
   },
 
   data() {
-    return { settings: null, provisioningSettings: null };
+
+    const topLevelPermissions = sessionStorage.getItem('TOPLEVELPERMISSIONS') || ''
+
+    return { topLevelPermissions, settings: null, provisioningSettings: null };
   },
   computed: { ...mapGetters({ t: 'i18n/t' }) }
 };
@@ -96,16 +103,18 @@ export default {
       />
     </div>
 
-    <h2>
-      {{ t('advancedSettings.provisioning.header') }}
-    </h2>
-    <div
-      v-for="(setting) in provisioningSettings"
-      :key="setting.id"
-    >
-      <Setting
-        :value="setting"
-      />
+    <div v-if="topLevelPermissions && topLevelPermissions === 'superadmin'">
+      <h2>
+        {{ t('advancedSettings.provisioning.header') }}
+      </h2>
+      <div
+        v-for="(setting) in provisioningSettings"
+        :key="setting.id"
+      >
+        <Setting
+          :value="setting"
+        />
+      </div>
     </div>
   </div>
 </template>

package/list/management.cattle.io.user.vue

@@ -122,18 +122,9 @@ export default {
       :show-incremental-loading-indicator="incrementalLoadingIndicator"
       :load-resources="loadResources"
       :load-indeterminate="loadIndeterminate"
+      :main-button-visible="false"
     >
-      <template #extraActions>
-        <AsyncButton
-          v-if="canRefreshAccess"
-          mode="refresh"
-          :action-label="t('authGroups.actions.refresh')"
-          :waiting-label="t('authGroups.actions.refresh')"
-          :success-label="t('authGroups.actions.refresh')"
-          :error-label="t('authGroups.actions.refresh')"
-          @click="refreshGroupMemberships"
-        />
-      </template>
+
       <template
         v-if="isAdmin"
         #subHeader
@@ -142,9 +133,10 @@ export default {
           :to="{ name: 'c-cluster-auth-user.retention'}"
           class="btn role-link btn-sm btn-user-retention"
           data-testid="router-link-user-retention"
+          style="text-align: left;min-width: auto !important;width: auto;"
         >
-          <i class="icon icon-gear" />
-          {{ t('user.retention.button.label') }}
+          <!-- <i class="icon icon-gear"/> -->
+          <!-- {{ t('user.retention.button.label') }} -->
         </router-link>
       </template>
     </Masthead>
@@ -156,7 +148,23 @@ export default {
       :loading="loading"
       :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
       :force-update-live-and-delayed="forceUpdateLiveAndDelayed"
+
+      :resource="resource"
+      :main-button-visible="true"
     >
+      <template #extraActions>
+        <AsyncButton
+          v-if="canRefreshAccess"
+          style="margin-right: 6px;"
+          mode="refresh"
+          :action-label="t('authGroups.actions.refresh')"
+          :waiting-label="t('authGroups.actions.refresh')"
+          :success-label="t('authGroups.actions.refresh')"
+          :error-label="t('authGroups.actions.refresh')"
+          @click="refreshGroupMemberships"
+        />
+      </template>
+
       <template #col:user-state="{row}">
         <td>
           <TableDataUserIcon
@@ -171,8 +179,11 @@ export default {
 
 <style lang="scss">
   .btn-user-retention {
-    display: flex;
+    display: block;
     gap: 0.25rem;
     padding: 0;
   }
+  .btn-user-retention:hover {
+    color: #333 !important;
+  }
 </style>

package/list/provisioning.cattle.io.cluster.vue

@@ -307,19 +307,18 @@ export default {
         <router-link
           v-if="row.mgmt && row.mgmt.isReady && !row.hasError"
           data-testid="cluster-manager-list-explore-management"
-          class="btn btn-sm role-secondary"
           :to="{name: 'c-cluster', params: {cluster: row.mgmt.id}}"
         >
-          {{ t('cluster.explore') }}
+          <a href="javascript:;">
+            {{ t('cluster.explore') }}
+          </a>
         </router-link>
-        <button
-          v-else
+        <span
           data-testid="cluster-manager-list-explore"
-          :disabled="true"
-          class="btn btn-sm role-secondary"
+          v-else
         >
           {{ t('cluster.explore') }}
-        </button>
+        </span>
       </template>
     </ResourceTable>
   </div>

package/mixins/brand.js

@@ -176,7 +176,24 @@ export default {
       const vars = createCssVars(color, this.theme, name);
 
       for (const prop in vars) {
+
         document.body.style.setProperty(prop, vars[prop]);
+
+        // 主色调hover值动态
+        if (prop === '--primary-hover-bg') {
+          // 如果是你要设置透明度的变量，比如 hover
+          let value = '#E8F4FF';
+          if (vars[prop]) {
+            const match = vars[prop].match(/rgb\((\d+),\s*(\d+),\s*(\d+)\)/);
+            if (match) {
+              const [_, r, g, b] = match;
+              value = `rgba(${r}, ${g}, ${b}, 0.15)`;
+            }
+          }
+
+          document.body.style.setProperty('--nav-hover-color', vars[prop]);
+          document.body.style.setProperty('--nav-active', value);
+        }
       }
     },
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dashboard-shell-shell",
-  "version": "1.0.1000000113",
+  "version": "1.0.1000000117",
   "description": "Rancher Dashboard Shell",
   "repository": "https://github.com/rancherlabs/dashboard",
   "license": "Apache-2.0",