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

package/edit/workload/storage/azureFile.vue

@@ -26,8 +26,8 @@ export default {
 
 <template>
   <div>
-    <div class="row mb-10">
-      <div class="col span-6">
+    <div class="row">
+      <div class="col mr-10">
         <LabeledInput
           v-model:value="value.name"
           :required="true"
@@ -35,7 +35,7 @@ export default {
           :label="t('workload.storage.volumeName')"
         />
       </div>
-      <div class="col span-6">
+      <div class="col" style="display: flex;align-items: center;">
         <Checkbox
           v-model:value="value.azureFile.readOnly"
           :mode="mode"
@@ -43,8 +43,8 @@ export default {
         />
       </div>
     </div>
-    <div class="row mb-10">
-      <div class="col span-6">
+    <div class="row">
+      <div class="col">
         <LabeledInput
           v-model:value="value.azureFile.shareName"
           :mode="mode"
@@ -52,7 +52,9 @@ export default {
           :label="t('workload.storage.csi.shareName')"
         />
       </div>
-      <div class="col span-6">
+    </div>
+    <div class="row">
+      <div class="col">
         <LabeledInput
           v-model:value="value.azureFile.secretName"
           :mode="mode"
@@ -62,7 +64,7 @@ export default {
       </div>
     </div>
     <div class="row">
-      <div class="col span-6">
+      <div class="col">
         <LabeledInput
           v-model:value="value.azureFile.fsType"
           :mode="mode"

package/edit/workload/storage/csi/index.vue

@@ -77,8 +77,8 @@ export default {
 <template>
   <div>
     <div>
-      <div class="row mb-10">
-        <div class="col span-6">
+      <div class="row">
+        <div class="col mr-10">
           <LabeledInput
             v-model:value="value.name"
             :required="true"
@@ -86,7 +86,7 @@ export default {
             :label="t('workload.storage.volumeName')"
           />
         </div>
-        <div class="col span-6">
+        <div class="col" style="display: flex;align-items: center;">
           <Checkbox
             v-model:value="value.csi.readOnly"
             :mode="mode"
@@ -94,8 +94,8 @@ export default {
           />
         </div>
       </div>
-      <div class="row mb-10">
-        <div class="col span-6">
+      <div class="row">
+        <div class="col">
           <LabeledSelect
             v-model:value="value.csi.driver"
             data-testid="workload-storage-driver"
@@ -107,10 +107,7 @@ export default {
           />
         </div>
       </div>
-      <div
-        v-if="driverComponent"
-        class="mb-10"
-      >
+      <div v-if="driverComponent">
         <component
           :is="driverComponent"
           v-model:value="value.csi.volumeAttributes"

package/edit/workload/storage/emptyDir.vue

@@ -52,8 +52,8 @@ export default {
 </script>
 <template>
   <div>
-    <div class="row mb-10">
-      <div class="col span-6">
+    <div class="row">
+      <div class="col">
         <LabeledInput
           v-model:value="value.name"
           :required="true"
@@ -61,7 +61,9 @@ export default {
           :label="t('workload.storage.volumeName')"
         />
       </div>
-      <div class="col span-6">
+    </div>
+    <div class="row">
+      <div class="col">
         <LabeledSelect
           v-model:value="medium"
           :mode="mode"
@@ -71,8 +73,8 @@ export default {
         />
       </div>
     </div>
-    <div class="row mb-10">
-      <div class="col span-6">
+    <div class="row">
+      <div class="col">
         <UnitInput
           v-model:value="value.emptyDir.sizeLimit"
           :mode="mode"

package/edit/workload/storage/gcePersistentDisk.vue

@@ -26,8 +26,8 @@ export default {
 
 <template>
   <div>
-    <div class="row mb-10">
-      <div class="col span-6">
+    <div class="row">
+      <div class="col mr-10">
         <LabeledInput
           v-model:value="value.name"
           :required="true"
@@ -35,7 +35,7 @@ export default {
           :label="t('workload.storage.volumeName')"
         />
       </div>
-      <div class="col span-6">
+      <div class="col" style="display: flex;align-items: center;">
         <Checkbox
           v-model:value="value.gcePersistentDisk.readOnly"
           :mode="mode"
@@ -43,8 +43,8 @@ export default {
         />
       </div>
     </div>
-    <div class="row mb-10">
-      <div class="col span-6">
+    <div class="row">
+      <div class="col">
         <LabeledInput
           v-model:value="value.gcePersistentDisk.pdName"
           :mode="mode"
@@ -52,7 +52,9 @@ export default {
           :required="true"
         />
       </div>
-      <div class="col span-6">
+    </div>
+    <div class="row">
+      <div class="col">
         <LabeledInput
           v-model:value.number="value.gcePersistentDisk.partition"
           :mode="mode"
@@ -61,7 +63,7 @@ export default {
       </div>
     </div>
     <div class="row">
-      <div class="col span-6">
+      <div class="col">
         <LabeledInput
           v-model:value="value.gcePersistentDisk.fsType"
           :mode="mode"

package/edit/workload/storage/hostPath.vue

@@ -82,8 +82,8 @@ export default {
 <template>
   <div>
     <div>
-      <div class="row mb-10">
-        <div class="col span-6">
+      <div class="row">
+        <div class="col">
           <LabeledInput
             v-model:value="value.name"
             :required="true"
@@ -92,8 +92,8 @@ export default {
           />
         </div>
       </div>
-      <div class="row mb-10">
-        <div class="col span-6">
+      <div class="row">
+        <div class="col">
           <LabeledInput
             v-model:value="value.hostPath.path"
             :required="true"
@@ -101,7 +101,9 @@ export default {
             :label="t('workload.storage.nodePath')"
           />
         </div>
-        <div class="col span-6">
+      </div>
+      <div class="row">
+        <div class="col">
           <LabeledSelect
             v-model:value="value.hostPath.type"
             :mode="mode"

package/edit/workload/storage/nfs.vue

@@ -38,8 +38,8 @@ export default {
 <template>
   <div>
     <div>
-      <div class="row mb-10">
-        <div class="col span-6">
+      <div class="row">
+        <div class="col mr-10">
           <LabeledInput
             v-model:value="value.name"
             :required="true"
@@ -47,7 +47,7 @@ export default {
             :label="t('workload.storage.volumeName')"
           />
         </div>
-        <div class="col span-6">
+        <div class="col" style="display: flex;align-items: center;">
           <Checkbox
             v-model:value="value.nfs.readOnly"
             :mode="mode"
@@ -55,8 +55,8 @@ export default {
           />
         </div>
       </div>
-      <div class="row mb-10">
-        <div class="col span-6">
+      <div class="row">
+        <div class="col">
           <LabeledInput
             v-model:value="value.nfs.path"
             :required="true"
@@ -64,7 +64,9 @@ export default {
             :label="t('workload.storage.path')"
           />
         </div>
-        <div class="col span-6">
+      </div>
+      <div class="row">
+        <div class="col">
           <LabeledInput
             v-model:value="value.nfs.server"
             :required="true"

package/edit/workload/storage/persistentVolumeClaim/index.vue

@@ -121,8 +121,8 @@ export default {
           @removePvcForm="removePvcForm"
         />
       </div>
-      <div class="row mb-10">
-        <div class="col span-6">
+      <div class="row">
+        <div class="col mr-10">
           <LabeledInput
             v-model:value="value.name"
             :required="true"
@@ -130,7 +130,16 @@ export default {
             :label="t('workload.storage.volumeName')"
           />
         </div>
-        <div class="col span-6">
+        <div class="col" style="display: flex;align-items: center;">
+          <Checkbox
+            v-model:value="value.persistentVolumeClaim.readOnly"
+            :mode="mode"
+            :label="t('workload.storage.readOnly')"
+          />
+        </div>
+      </div>
+      <div class="row">
+        <div class="col">
           <LabeledSelect
             v-if="!createNew"
             v-model:value="value.persistentVolumeClaim.claimName"
@@ -142,13 +151,6 @@ export default {
           />
         </div>
       </div>
-      <div class="row">
-        <Checkbox
-          v-model:value="value.persistentVolumeClaim.readOnly"
-          :mode="mode"
-          :label="t('workload.storage.readOnly')"
-        />
-      </div>
     </div>
   </div>
 </template>

package/edit/workload/storage/persistentVolumeClaim/persistentvolumeclaim.vue

@@ -156,8 +156,8 @@ export default {
 
 <template>
   <div>
-    <div class="row mb-10">
-      <div class="col span-6">
+    <div class="row">
+      <div class="col">
         <LabeledInput
           v-model:value="value.metadata.name"
           :mode="mode"
@@ -167,8 +167,9 @@ export default {
         />
       </div>
     </div>
-    <div class="row mb-10">
-      <div class="col span-6">
+    <div class="row">
+      <div style="width: 160px;"></div>
+      <div class="col">
         <RadioGroup
           v-model:value="isCreatePV"
           name="isCreatePV"
@@ -177,7 +178,9 @@ export default {
           :mode="mode"
         />
       </div>
-      <div class="col span-6">
+    </div>
+    <div class="row">
+      <div class="col">
         <LabeledSelect
           v-if="isCreatePV"
           v-model:value="spec.storageClassName"
@@ -200,16 +203,16 @@ export default {
       </div>
     </div>
 
-    <div class="row mb-10">
-      <div class="col span-6">
-        <div class="access-modes">
-          <t
-            class="text-label"
-            k="persistentVolumeClaim.accessModes"
-          />
-          <span class="text-error">*</span>
-        </div>
+    <div class="row">
+      <div class="col">
         <div class="access-modes">
+          <div style="width: 160px;">
+            <t
+              class="text-label"
+              k="persistentVolumeClaim.accessModes"
+            />
+            <span class="text-error">*</span>
+          </div>
           <Checkbox
             :mode="mode"
             :value="value.spec.accessModes.includes('ReadWriteOnce')"
@@ -230,9 +233,11 @@ export default {
           />
         </div>
       </div>
+    </div>
+    <div class="row">
       <div
         v-if="isCreatePV"
-        class="col span-6"
+        class="col"
       >
         <UnitInput
           v-model:value="spec.resources.requests.storage"

package/edit/workload/storage/secret.vue

@@ -130,8 +130,8 @@ export default {
 <template>
   <div>
     <div>
-      <div class="row mb-10">
-        <div class="col span-6">
+      <div class="row">
+        <div class="col">
           <LabeledInput
             v-model:value="value.name"
             :required="true"
@@ -139,8 +139,9 @@ export default {
             :label="t('workload.storage.volumeName')"
           />
         </div>
-
-        <div class="col span-6">
+      </div>
+      <div class="row">
+        <div class="col">
           <LabeledInput
             v-model:value="defaultMode"
             :mode="mode"
@@ -149,7 +150,7 @@ export default {
         </div>
       </div>
       <div class="row">
-        <div class="col span-6">
+        <div class="col">
           <LabeledSelect
             v-if="type==='secret'"
             v-model:value="value[type].secretName"
@@ -169,7 +170,9 @@ export default {
             :loading="loading"
           />
         </div>
-        <div class="col span-6">
+      </div>
+      <div class="row">
+        <div class="col">
           <RadioGroup
             v-model:value="optional"
             :mode="mode"

package/edit/workload/storage/vsphereVolume.vue

@@ -25,8 +25,8 @@ export default {
 
 <template>
   <div>
-    <div class="row mb-10">
-      <div class="col span-6">
+    <div class="row">
+      <div class="col">
         <LabeledInput
           v-model:value="value.name"
           :required="true"
@@ -35,8 +35,8 @@ export default {
         />
       </div>
     </div>
-    <div class="row mb-10">
-      <div class="col span-6">
+    <div class="row">
+      <div class="col">
         <LabeledInput
           v-model:value="value.vsphereVolume.storagePolicyID"
           :mode="mode"
@@ -44,7 +44,9 @@ export default {
           :required="true"
         />
       </div>
-      <div class="col span-6">
+    </div>
+    <div class="row">
+      <div class="col">
         <LabeledInput
           v-model:value.number="value.vsphereVolume.storagePolicyName"
           :mode="mode"
@@ -53,7 +55,7 @@ export default {
       </div>
     </div>
     <div class="row">
-      <div class="col span-6">
+      <div class="col">
         <LabeledInput
           v-model:value="value.vsphereVolume.volumePath"
           :mode="mode"
@@ -61,7 +63,9 @@ export default {
           :required="true"
         />
       </div>
-      <div class="col span-6">
+    </div>
+    <div class="row">
+      <div class="col">
         <LabeledInput
           v-model:value="value.vsphereVolume.fsType"
           :mode="mode"

package/initialize/app-extended.js

@@ -55,7 +55,13 @@ async function extendApp(vueApp) {
   const next = (location) => appPartials.router.push(location);
   // Resolve route
 
-  const path = getLocation(router.options.base, router.options.mode);
+  let path = getLocation(router.options.base, router.options.mode);
+
+  // 🔹 增加 rewrite，不改变原逻辑
+  if (path.includes('/cloud/')) {
+    path = path.replace(/cloud/g, 'harvester');
+  }
+
   const route = router.resolve(path);
 
   // Set context to app.context

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

@@ -37,15 +37,17 @@ export default {
 
 <template>
   <div>
-    <Banner
-      color="info"
-      :label="t('podSecurityAdmission.banner.modifications')"
-    />
-
     <ResourceTable
       :loading="loading"
       :schema="schema"
       :rows="rows"
-    />
+    >
+      <template #banner>
+        <Banner
+          color="info"
+          :label="t('podSecurityAdmission.banner.modifications')"
+        />
+      </template>
+    </ResourceTable>
   </div>
 </template>

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/mixins/create-edit-view/impl.js

@@ -170,6 +170,16 @@ export default {
       } catch (err) {
         // This exception handles errors from the `request` action when it receives a failed http request. The `err` object could be from the action's error handler (raw http response object containing `status`) or thrown later on given the response of the action (a massaged object containing `_status`). TBD why one 409 triggers the error handler and another does not.
         const IS_ERR_409 = err.status === 409 || err._status === 409;
+        
+        const IS_ERR_403 = err.status === 403 || err._status === 403;
+
+        if (err.message === '' && err.fieldName && err.code) {
+          err.message = err.code + ' ' + err.fieldName
+        }
+        
+        if (IS_ERR_403) {
+          err.message = '权限不足'
+        }
 
         // Conflict, the resource being edited has changed since starting editing
         if (IS_ERR_409 && depth === 0 && this.isEdit) {