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

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

@@ -142,9 +142,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>
@@ -171,8 +172,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/namespace.vue

@@ -42,6 +42,9 @@ export default {
     headers() {
       const headersFromSchema = this.$store.getters['type-map/headersFor'](this.schema);
 
+      [headersFromSchema[0], headersFromSchema[1]] = [headersFromSchema[1], headersFromSchema[0]];
+      headersFromSchema[0].width = '200px';
+      headersFromSchema[1].width = '100px';
       // harvester is reusing this namespace.js to render ns page, we need to make sure harvester backend support quota schema to show this column.
       if (this.hasHarvesterResourceQuotaSchema && Array.isArray(headersFromSchema) && headersFromSchema.length > 1) {
         const columnIdx = headersFromSchema.length - 1;

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

@@ -175,7 +175,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": "3.0.5-test.6",
+  "version": "3.0.5-test.8",
   "description": "Rancher Dashboard Shell",
   "repository": "https://github.com/rancherlabs/dashboard",
   "license": "Apache-2.0",

package/pages/account/pri.vue

@@ -0,0 +1,229 @@
+<script>
+import { NORMAN } from '@shell/config/types';
+
+export default {
+  props: {
+    value: {
+      type:     String,
+      required: true,
+    },
+
+    useMuted: {
+      type:    Boolean,
+      default: true,
+    },
+
+    showLabels: {
+      type:    Boolean,
+      default: false,
+    },
+    isShowPass: {
+      type:    Boolean,
+      default: false,
+    }
+  },
+
+  async fetch() {
+    this.principal = this.$store.getters['rancher/byId'](NORMAN.PRINCIPAL, this.value);
+
+    if ( this.principal ) {
+      return;
+    }
+
+    const principalId = escape(this.value).replace(/\//g, '%2F');
+
+    try {
+      this.principal = await this.$store.dispatch('rancher/find', {
+        type: NORMAN.PRINCIPAL,
+        id:   this.value,
+        opt:  { url: `/v3/principals/${ principalId }` }
+      });
+    } catch (e) {
+      console.error('Failed to fetch principal', this.value, principalId); // eslint-disable-line no-console
+    }
+  },
+
+  data() {
+    // Load from cache immediately if possible
+    return { principal: null };
+  },
+
+  computed: {
+    showBoth() {
+      const p = this.principal;
+
+      return p.name && p.loginName && p.name.trim().toLowerCase() !== p.loginName.trim().toLowerCase();
+    }
+  },
+};
+</script>
+
+<template>
+  <div
+    class="principal"
+    :class="{'showLabels': showLabels}"
+  >
+    <template v-if="!principal && $fetchState.pending">
+      <div class="avatar">
+        <div class="empty">
+          <i class="icon icon-spinner icon-lg" />
+        </div>
+      </div>
+      <div
+        v-clean-html="t('principal.loading', null, true)"
+        class="name"
+        :class="{'text-muted': useMuted}"
+      />
+      <div class="description" />
+    </template>
+
+    <template v-else-if="principal">
+      <div class="avatar">
+        <img
+          src="@shell/assets/images/user.png"
+        >
+      </div>
+      <div
+        v-if="showLabels"
+        class="name"
+      >
+        <table>
+          <tr class="mb-10">
+            <td>{{ t('principal.name') }}: </td><td>{{ principal.name || principal.loginName }}</td>
+          </tr>
+          <tr class="mb-10">
+            <td>{{ t('principal.loginName') }}: </td><td>{{ principal.loginName }}</td>
+          </tr>
+          <tr
+            v-if="isShowPass"
+            class="mb-10"
+          >
+            <td>修改密码: </td><td>****** <slot name="edit" /></td>
+          </tr>
+          <tr><td>{{ t('principal.type') }}: </td><td>{{ principal.displayType }}</td></tr>
+        </table>
+      </div>
+      <template v-else>
+        <div class="name">
+          <template v-if="showBoth">
+            {{ principal.name }}
+            <span
+              v-if="principal.loginName"
+              :class="{'text-muted': useMuted}"
+            >({{ principal.loginName }})</span>
+          </template>
+          <template v-else-if="principal.name">
+            {{ principal.name }}
+          </template>
+          <template v-else>
+            {{ principal.loginName }}
+          </template>
+        </div>
+        <div
+          class="description"
+          :class="{'text-muted': useMuted}"
+        >
+          {{ principal.displayType }}
+        </div>
+      </template>
+    </template>
+
+    <template v-else>
+      <div class="avatar">
+        <div
+          class="empty"
+          :class="{'text-muted': useMuted}"
+        >
+          <i class="icon icon-warning icon-lg" />
+        </div>
+      </div>
+      <div
+        v-t="'principal.error'"
+        class="name text-error"
+      />
+      <div
+        class="description"
+        :class="{'text-muted': useMuted}"
+      >
+        {{ value }}
+      </div>
+    </template>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+  $size: 79px;
+
+  .principal {
+    display: grid;
+    grid-template-areas:
+      "avatar name"
+      "avatar description";
+    grid-template-columns: $size auto;
+    grid-template-rows: auto math.div($size, 2);
+    column-gap: 10px;
+
+    th {
+      text-align: left;
+      font-weight: normal;
+      padding-right: 10px;
+    }
+
+    &.showLabels {
+      /* grid-template-areas:
+        "avatar name";
+      grid-template-columns: 60px auto;
+      grid-template-rows: 60px;
+      column-gap: 0; */
+      display: flex;
+      column-gap:0;
+      .name {
+        display: flex;
+        line-height: unset;
+      }
+      table tr {
+        display: block;
+      }
+      table tr td:not(:first-of-type) {
+        padding-left: 10px;
+      }
+      table tr td:not(:last-of-type) {
+        width: 100px;
+      }
+    }
+
+    .avatar {
+      /* grid-area: avatar;
+      text-align: center; */
+      width: 287px;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+
+      DIV.empty {
+        border: 1px solid var(--border);
+        line-height: $size;
+      }
+
+      IMG {
+        width: $size;
+        height: $size;
+      }
+
+      DIV.round, IMG.round {
+        border-radius: 50%;
+      }
+    }
+
+    .name {
+      grid-area: name;
+      line-height: math.div($size, 2);
+      overflow-wrap: anywhere;
+    }
+
+    .description {
+      grid-area: description;
+      line-height: math.div($size, 2);
+    }
+  }
+</style>