dashboard-shell-shell 3.0.5-test.1 → 3.0.5-test.10

package/components/form/WorkloadPorts.vue

@@ -280,145 +280,163 @@ export default {
         'show-ipam': showIpam,
       }"
     >
-      <div class="service-type">
-        <LabeledSelect
-          v-model:value="row._serviceType"
-          :mode="mode"
-          :label="t('workload.container.ports.createService')"
-          :options="serviceTypes"
-          :disabled="canNotAccessService"
-          :tooltip="serviceTypeTooltip"
-          @update:value="queueUpdate"
-        />
-      </div>
-
-      <div class="portName">
-        <LabeledInput
-          ref="name"
-          v-model:value="row.name"
-          :mode="mode"
-          :label="t('workload.container.ports.name')"
-          @update:value="queueUpdate"
-        />
-      </div>
+    
+      <div class="row mt-20">
+        <div
+          v-if="!row._showHost && row._serviceType !== 'LoadBalancer' && row._serviceType !== 'NodePort'"
+          class="add-host col"
+        >
+          <button
+            :disabled="mode==='view'"
+            type="button"
+            class="btn btn-sm role-tertiary"
+            @click="row._showHost = true"
+          >
+            {{ t('workloadPorts.addHost') }}
+          </button>
+        </div>
 
-      <div class="port">
-        <LabeledInput
-          v-model:value.number="row.containerPort"
-          :mode="mode"
-          type="number"
-          min="1"
-          max="65535"
-          placeholder="e.g. 8080"
-          :label="t('workload.container.ports.containerPort')"
-          :required="row._serviceType === 'LoadBalancer' "
-          @update:value="queueUpdate"
-        />
-      </div>
+        <div
+          v-if="showRemove"
+          class="remove"
+        >
+          <button
+            type="button"
+            class="btn role-link"
+            @click="remove(idx)"
+          >
+            {{ t('workloadPorts.remove') }}
+          </button>
+        </div>
 
-      <div class="protocol col">
-        <LabeledSelect
-          v-model:value="row.protocol"
-          :mode="mode"
-          :options="workloadPortOptions"
-          :multiple="false"
-          :label="t('workload.container.ports.protocol')"
-          @update:value="queueUpdate"
-        />
       </div>
 
-      <div
-        v-if="row._showHost"
-        class="targetPort"
-      >
-        <LabeledInput
-          ref="port"
-          v-model:value.number="row.hostPort"
-          :mode="mode"
-          type="number"
-          min="1"
-          max="65535"
-          placeholder="e.g. 80"
-          :label="t('workload.container.ports.hostPort')"
-          @update:value="queueUpdate"
-        />
+      <div class="row">
+        <div class="service-type col span-6">
+          <LabeledSelect
+            v-model:value="row._serviceType"
+            :mode="mode"
+            :label="t('workload.container.ports.createService')"
+            :options="serviceTypes"
+            :disabled="canNotAccessService"
+            :tooltip="serviceTypeTooltip"
+            @update:value="queueUpdate"
+          />
+        </div>
+    
+        <div class="portName col span-6">
+          <LabeledInput
+            ref="name"
+            v-model:value="row.name"
+            :mode="mode"
+            :label="t('workload.container.ports.name')"
+            @update:value="queueUpdate"
+          />
+        </div>
       </div>
 
-      <div
-        v-if="row._showHost"
-        class="hostip"
-      >
-        <LabeledInput
-          ref="port"
-          v-model:value="row.hostIP"
-          :mode="mode"
-          placeholder="e.g. 1.1.1.1"
-          :label="t('workload.container.ports.hostIP')"
-          @update:value="queueUpdate"
-        />
+      <div class="row">
+        <div class="port col span-6">
+          <LabeledInput
+            v-model:value.number="row.containerPort"
+            :mode="mode"
+            type="number"
+            min="1"
+            max="65535"
+            placeholder="e.g. 8080"
+            :label="t('workload.container.ports.containerPort')"
+            :required="row._serviceType === 'LoadBalancer' "
+            @update:value="queueUpdate"
+          />
+        </div>
+    
+        <div class="protocol col span-6">
+          <LabeledSelect
+            v-model:value="row.protocol"
+            :mode="mode"
+            :options="workloadPortOptions"
+            :multiple="false"
+            :label="t('workload.container.ports.protocol')"
+            @update:value="queueUpdate"
+          />
+        </div>
       </div>
 
-      <div
-        v-if="!row._showHost && row._serviceType !== 'LoadBalancer' && row._serviceType !== 'NodePort'"
-        class="add-host"
-      >
-        <button
-          :disabled="mode==='view'"
-          type="button"
-          class="btn btn-sm role-tertiary"
-          @click="row._showHost = true"
+      <div class="row">
+        <div
+          v-if="row._showHost"
+          class="targetPort col span-6"
         >
-          {{ t('workloadPorts.addHost') }}
-        </button>
-      </div>
-
-      <div v-if="row._serviceType === 'LoadBalancer' || row._serviceType === 'NodePort'">
-        <LabeledInput
-          ref="port"
-          v-model:value.number="row._listeningPort"
-          type="number"
-          :mode="mode"
-          :label="t('workload.container.ports.listeningPort')"
-          :required="row._serviceType === 'LoadBalancer' "
-          @update:value="queueUpdate"
-        />
-      </div>
-
-      <div v-if="showIpam && row._serviceType === 'LoadBalancer' && row.protocol === 'TCP'">
-        <div v-if="idx === ipamIndex">
-          <LabeledSelect
-            v-model:value="row._ipam"
+          <LabeledInput
+            ref="port"
+            v-model:value.number="row.hostPort"
             :mode="mode"
-            :options="ipamOptions"
-            :label="t('servicesPage.harvester.ipam.label')"
-            :disabled="mode === 'edit'"
+            type="number"
+            min="1"
+            max="65535"
+            placeholder="e.g. 80"
+            :label="t('workload.container.ports.hostPort')"
             @update:value="queueUpdate"
           />
         </div>
-        <div v-else>
-          <LabeledSelect
-            v-model:value="rows[ipamIndex]._ipam"
+    
+        <div
+          v-if="row._showHost"
+          class="hostip col span-6"
+        >
+          <LabeledInput
+            ref="port"
+            v-model:value="row.hostIP"
             :mode="mode"
-            :options="ipamOptions"
-            :label="t('servicesPage.harvester.ipam.label')"
-            :disabled="true"
+            placeholder="e.g. 1.1.1.1"
+            :label="t('workload.container.ports.hostIP')"
             @update:value="queueUpdate"
           />
         </div>
       </div>
 
-      <div
-        v-if="showRemove"
-        class="remove"
-      >
-        <button
-          type="button"
-          class="btn role-link"
-          @click="remove(idx)"
+      <div class="row">
+        <div
+          v-if="row._serviceType === 'LoadBalancer' || row._serviceType === 'NodePort'"
+          class="col"
         >
-          {{ t('workloadPorts.remove') }}
-        </button>
+          <LabeledInput
+            ref="port"
+            v-model:value.number="row._listeningPort"
+            type="number"
+            :mode="mode"
+            :label="t('workload.container.ports.listeningPort')"
+            :required="row._serviceType === 'LoadBalancer' "
+            @update:value="queueUpdate"
+          />
+        </div>
       </div>
+
+      <div class="row">
+        <div v-if="showIpam && row._serviceType === 'LoadBalancer' && row.protocol === 'TCP'">
+          <div v-if="idx === ipamIndex">
+            <LabeledSelect
+              v-model:value="row._ipam"
+              :mode="mode"
+              :options="ipamOptions"
+              :label="t('servicesPage.harvester.ipam.label')"
+              :disabled="mode === 'edit'"
+              @update:value="queueUpdate"
+            />
+          </div>
+          <div v-else>
+            <LabeledSelect
+              v-model:value="rows[ipamIndex]._ipam"
+              :mode="mode"
+              :options="ipamOptions"
+              :label="t('servicesPage.harvester.ipam.label')"
+              :disabled="true"
+              @update:value="queueUpdate"
+            />
+          </div>
+        </div>
+      </div>
+
     </div>
     <div
       v-if="showAdd"
@@ -447,11 +465,11 @@ $checkbox: 75;
   }
 }
 .ports-headers, .ports-row{
-  display: grid;
-  grid-template-columns: 28% 28% 15% 10% 75px 0.5fr;
-  grid-column-gap: $column-gutter;
-  margin-bottom: 10px;
-  align-items: center;
+  // display: grid;
+  // grid-template-columns: 28% 28% 15% 10% 75px 0.5fr;
+  // grid-column-gap: $column-gutter;
+  // margin-bottom: 20px;
+  // align-items: center;
   & .port{
     display: flex;
     justify-content: space-between;
@@ -475,6 +493,7 @@ $checkbox: 75;
 }
 
 .add-host {
+  margin-right: 20px;
   justify-self: center;
 }
 
@@ -492,6 +511,7 @@ $checkbox: 75;
 
 .remove BUTTON {
   padding: 0px;
+  min-width: auto;
 }
 
 .ports-row INPUT {

package/components/nav/Header.vue

@@ -80,7 +80,7 @@ export default {
       ctx:                    this,
       showImportModal:        false,
       showSearchModal:        false,
-      userIcon:               require('~shell/assets/images/logo.png'),
+      userIcon:               require('@shell/assets/images/logo.png'),
     };
   },
 
@@ -548,7 +548,6 @@ export default {
 
       <!-- ===== 左侧 logo 区域 ===== -->
     <div class="menu-spacer">
-
       <!-- 如果是单产品模式且不是 RancherInHarvester，就显示 logo 路由跳转 -->
       <router-link
         v-if="isSingleProduct && !isRancherInHarvester"
@@ -556,9 +555,9 @@ export default {
       >
 
         <!-- 显示用户头像或 logo 图片 -->
-        <!-- <img
+        <img
           :src="userIcon"
-        > -->
+        >
       </router-link>
     </div>
     

package/components/nav/NamespaceFilter.vue

@@ -949,7 +949,6 @@ export default {
   .ns-filter {
     width: 280px;
     display: inline-block;
-    border-radius: var(--border-radius);
 
     .ns-glass {
       top: 0;
@@ -968,9 +967,9 @@ export default {
     }
 
     .ns-clear {
-      padding: 0 5px;
       &:hover {
         color: var(--primary);
+        cursor: pointer;
       }
     }
 

package/edit/workload/index.vue

@@ -108,7 +108,7 @@ export default {
       >
         <div
           v-if="isCronJob"
-          class="col span-3"
+          class="col span-6"
         >
           <LabeledInput
             v-model:value="spec.schedule"
@@ -122,7 +122,7 @@ export default {
         </div>
         <div
           v-if="isReplicable"
-          class="col span-3"
+          class="col span-6"
         >
           <LabeledInput
             v-model:value.number="spec.replicas"
@@ -135,7 +135,7 @@ export default {
         </div>
         <div
           v-if="isStatefulSet"
-          class="col span-3"
+          class="col span-6"
         >
           <LabeledSelect
             v-model:value="spec.serviceName"

package/package.json

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

package/pages/account/index.vue

@@ -3,8 +3,7 @@ import BackLink from '@shell/components/BackLink';
 import { MANAGEMENT, NORMAN } from '@shell/config/types';
 import { SETTING } from '@shell/config/settings';
 import Loading from '@shell/components/Loading';
-// import Principal from '@shell/components/auth/Principal';
-import Principal from './pri.vue';
+import Principal from '@shell/components/auth/Principal';
 import BackRoute from '@shell/mixins/back-link';
 import { mapGetters } from 'vuex';
 
@@ -17,7 +16,7 @@ const API_ENDPOINT = '/v3';
 
 export default {
   components: {
-    CopyToClipboardText, BackLink, Banner, PromptChangePassword, Loading, ResourceTable, Principal, TabTitle
+    CopyToClipboardText, BackLink, Banner, Loading, ResourceTable, Principal, TabTitle
   },
   mixins: [BackRoute],
   async fetch() {
@@ -152,37 +151,21 @@ export default {
 <template>
   <Loading v-if="$fetchState.pending" />
   <div v-else>
-    <!-- <BackLink :link="backLink" />
+    <BackLink :link="backLink" />
     <h1>
       <TabTitle breadcrumb="vendor-only">
         {{ t('accountAndKeys.title') }}
       </TabTitle>
-    </h1> -->
-    <div class="api-key-title mb-20">
-      {{ t('accountAndKeys.title') }}
-    </div>
+    </h1>
 
-    <!-- <h2 v-t="'accountAndKeys.account.title'" /> -->
+    <h2 v-t="'accountAndKeys.account.title'" />
     <div class="account">
-      <div class="account-title">
-        {{ t('accountAndKeys.account.title') }}
-      </div>
       <Principal
         :value="principal.id"
         :use-muted="false"
         :show-labels="true"
-        :isShowPass="true"
-      >
-      <template #edit>
-          <span
-            v-if="canChangePassword"
-            class="edit-pass-txt"
-            @click="$refs.promptChangePassword.show(true)"
-          >修改
-          </span>
-        </template>
-    </Principal>
-      <!-- <div>
+      />
+      <div>
         <button
           v-if="canChangePassword"
           role="button"
@@ -190,25 +173,17 @@ export default {
           type="button"
           class="btn role-primary"
           data-testid="account_change_password"
-          @click="$refs.promptChangePassword.show(true)"
+          @click="showChangePasswordDialog"
         >
           {{ t("accountAndKeys.account.change") }}
         </button>
-      </div> -->
+      </div>
     </div>
-    <PromptChangePassword ref="promptChangePassword" />
 
-    <!-- <hr role="none"> -->
-     <div  
-     style=" border: 1px solid #d7d7d7;padding: 20px 20px 0px 20px;"
-     class="mt-20">
+    <hr role="none">
     <div class="keys-header">
       <div>
-        <!-- <h2 v-t="'accountAndKeys.apiKeys.title'" /> -->
-        <div
-            v-t="'accountAndKeys.apiKeys.title'"
-            class="account-title mb-20"
-          />
+        <h2 v-t="'accountAndKeys.apiKeys.title'" />
         <div class="api-url">
           <span>{{ t("accountAndKeys.apiKeys.apiEndpoint") }}</span>
           <CopyToClipboardText
@@ -217,10 +192,20 @@ export default {
           />
         </div>
       </div>
+      <button
+        v-if="apiKeySchema"
+        role="button"
+        :aria-label="t('accountAndKeys.apiKeys.add.label')"
+        class="btn role-primary add mb-20"
+        data-testid="account_create_api_keys"
+        @click="addKey"
+      >
+        {{ t('accountAndKeys.apiKeys.add.label') }}
+      </button>
     </div>
     <div
       v-if="apiKeySchema"
-      class="keys mb-20"
+      class="keys"
     >
       <ResourceTable
         :schema="apiKeySchema"
@@ -231,20 +216,7 @@ export default {
         :search="true"
         :row-actions="true"
         :table-actions="true"
-      >
-      <template #header-right>
-        <button
-        v-if="apiKeySchema"
-        role="button"
-        :aria-label="t('accountAndKeys.apiKeys.add.label')"
-        class="btn role-primary add mb-20"
-        data-testid="account_create_api_keys"
-        @click="addKey"
-      >
-        {{ t('accountAndKeys.apiKeys.add.label') }}
-      </button>
-          </template>
-    </ResourceTable>
+      />
     </div>
     <div v-else>
       <Banner
@@ -253,7 +225,6 @@ export default {
       />
     </div>
   </div>
-  </div>
 </template>
 
 <style lang='scss' scoped>
@@ -262,12 +233,8 @@ export default {
   }
 
   .account {
-    /* display: flex;
-    justify-content: space-between */
-    border: 1px solid #D7D7D7;
-    padding: 20px;
-    box-sizing: border-box;
-
+    display: flex;
+    justify-content: space-between
   }
 
   .keys-header {
@@ -280,10 +247,8 @@ export default {
   .keys {
     display: flex;
     flex-direction: column;
-    margin-top: 20px;
     .add {
       align-self: flex-end;
-      margin-left: 10px
     }
   }
 
@@ -294,23 +259,4 @@ export default {
       margin-right: 6px;
     }
   }
-  .api-key-title{
-    font-size: 26px;
-    /* line-height: 20px; */
-    font-weight: 400;
-  }
-
-  .edit-pass-txt{
-    cursor: pointer;
-    color: var(--primary);
-  }
-
-  .table-account{
-    border: 1px solid #d7d7d7;
-  }
-  .account-title{
-      font-size: 14px;
-      line-height: 19px;
-      margin-bottom: 16px;
-    }
 </style>

package/pages/c/_cluster/auth/roles/index.vue

@@ -162,7 +162,7 @@ export default {
         </h1>
         <div style="margin: 20px 0;">支持管理员创建与管理不同角色‌，每个角色可预设特定权限集合，可简化用户权限分配流程，提升权限管理的灵活性与安全性。</div>
       </div>
-      <div class="actions-container actions-container-box">
+      <!-- <div class="actions-container actions-container-box">
         <div class="actions">
           <router-link
             v-if="canCreate"
@@ -172,7 +172,7 @@ export default {
             {{ createLabel }}
           </router-link>
         </div>
-      </div>
+      </div> -->
     </header>
     <Tabbed>
       <Tab
@@ -184,7 +184,18 @@ export default {
         <ResourceTable
           :schema="tabs[GLOBAL].schema"
           :rows="globalResources"
-        />
+        >
+          <template #header-right>
+            <router-link
+              v-if="canCreate"
+              :to="createLocation"
+              style="margin-right: 10px;"
+              class="btn role-primary"
+            >
+              {{ createLabel }}
+            </router-link>
+          </template>
+        </ResourceTable>
       </Tab>
 
       <Tab
@@ -197,7 +208,18 @@ export default {
           :schema="tabs[CLUSTER].schema"
           :headers="tabs[CLUSTER].headers"
           :rows="clusterResources"
-        />
+        >
+          <template #header-right>
+            <router-link
+              v-if="canCreate"
+              :to="createLocation"
+              style="margin-right: 10px;"
+              class="btn role-primary"
+            >
+              {{ createLabel }}
+            </router-link>
+          </template>
+        </ResourceTable>
       </Tab>
 
       <Tab
@@ -210,7 +232,18 @@ export default {
           :schema="tabs[PROJECT].schema"
           :headers="tabs[PROJECT].headers"
           :rows="namespaceResources"
-        />
+        >
+          <template #header-right>
+            <router-link
+              v-if="canCreate"
+              :to="createLocation"
+              style="margin-right: 10px;"
+              class="btn role-primary"
+            >
+              {{ createLabel }}
+            </router-link>
+          </template>
+        </ResourceTable>
       </Tab>
     </Tabbed>
   </div>