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

package/edit/storage.k8s.io.storageclass/provisioners/kubernetes.io/gce-pd.vue

@@ -68,7 +68,7 @@ export default {
 </script>
 <template>
   <div>
-    <div class="row mb-20">
+    <div class="row">
       <div class="col span-6">
         <RadioGroup
           v-model:value="value.parameters.type"
@@ -77,14 +77,16 @@ export default {
           :mode="mode"
           :options="volumeTypeOptions"
         />
-        <LabeledInput
-          v-model:value="value.parameters.fsType"
-          class="mt-10"
-          :placeholder="t('storageClass.gce-pd.filesystemType.placeholder')"
-          :label="t('storageClass.gce-pd.filesystemType.label')"
-          :mode="mode"
+        <div style="height: 24px;"></div>
+        <LabeledInput
+          v-model:value="value.parameters.fsType"
+          :placeholder="t('storageClass.gce-pd.filesystemType.placeholder')"
+          :label="t('storageClass.gce-pd.filesystemType.label')"
+          :mode="mode"
         />
       </div>
+    </div>
+    <div class="row">
       <div class="col span-6">
         <RadioGroup
           v-model:value="availabilityZone"
@@ -93,12 +95,12 @@ export default {
           :mode="mode"
           :options="availabilityZoneOptions"
         />
-        <LabeledInput
-          v-if="availabilityZone === 'manual'"
-          v-model:value="value.parameters.zones"
-          class="mt-10"
-          :placeholder="t('storageClass.gce-pd.availabilityZone.placeholder')"
-          :mode="mode"
+        <LabeledInput
+          v-if="availabilityZone === 'manual'"
+          v-model:value="value.parameters.zones"
+          class="mt-10"
+          :placeholder="t('storageClass.gce-pd.availabilityZone.placeholder')"
+          :mode="mode"
         />
       </div>
     </div>

package/edit/storage.k8s.io.storageclass/provisioners/kubernetes.io/vsphere-volume.vue

@@ -41,55 +41,57 @@ export default {
 </script>
 <template>
   <div>
-    <div class="row mb-10">
-      <div class="col span-4">
-        <LabeledSelect
-          v-model:value="value.parameters.diskformat"
-          :options="diskFormatOptions"
-          :label="t('storageClass.vsphere-volume.diskFormat.label')"
-          :mode="mode"
-        />
-      </div>
-      <div class="col span-4">
-        <LabeledInput
-          v-model:value="value.parameters.storagePolicyName"
-          :placeholder="t('storageClass.vsphere-volume.storagePolicyName.placeholder')"
-          :label="t('storageClass.vsphere-volume.storagePolicyName.label')"
-          :mode="mode"
+    <div class="row">
+      <div class="col span-6">
+        <LabeledSelect
+          v-model:value="value.parameters.diskformat"
+          :options="diskFormatOptions"
+          :label="t('storageClass.vsphere-volume.diskFormat.label')"
+          :mode="mode"
         />
       </div>
-      <div class="col span-4">
-        <LabeledInput
-          v-model:value="value.parameters.datastore"
-          :placeholder="t('storageClass.vsphere-volume.datastore.placeholder')"
-          :label="t('storageClass.vsphere-volume.datastore.label')"
-          :mode="mode"
+      <div class="col span-6">
+        <LabeledInput
+          v-model:value="value.parameters.storagePolicyName"
+          :placeholder="t('storageClass.vsphere-volume.storagePolicyName.placeholder')"
+          :label="t('storageClass.vsphere-volume.storagePolicyName.label')"
+          :mode="mode"
         />
       </div>
     </div>
     <div class="row">
-      <div class="col span-4">
-        <LabeledInput
-          v-model:value="value.parameters.hostFailuresToTolerate"
-          :placeholder="t('storageClass.vsphere-volume.hostFailuresToTolerate.placeholder')"
-          :label="t('storageClass.vsphere-volume.hostFailuresToTolerate.label')"
-          :mode="mode"
+      <div class="col span-6">
+        <LabeledInput
+          v-model:value="value.parameters.datastore"
+          :placeholder="t('storageClass.vsphere-volume.datastore.placeholder')"
+          :label="t('storageClass.vsphere-volume.datastore.label')"
+          :mode="mode"
         />
       </div>
-      <div class="col span-4">
-        <LabeledInput
-          v-model:value="value.parameters.cachereservation"
-          :placeholder="t('storageClass.vsphere-volume.cacheReservation.placeholder')"
-          :label="t('storageClass.vsphere-volume.cacheReservation.label')"
-          :mode="mode"
+      <div class="col span-6">
+        <LabeledInput
+          v-model:value="value.parameters.hostFailuresToTolerate"
+          :placeholder="t('storageClass.vsphere-volume.hostFailuresToTolerate.placeholder')"
+          :label="t('storageClass.vsphere-volume.hostFailuresToTolerate.label')"
+          :mode="mode"
+        />
+      </div>
+    </div>
+    <div class="row">
+      <div class="col span-6">
+        <LabeledInput
+          v-model:value="value.parameters.cachereservation"
+          :placeholder="t('storageClass.vsphere-volume.cacheReservation.placeholder')"
+          :label="t('storageClass.vsphere-volume.cacheReservation.label')"
+          :mode="mode"
         />
       </div>
-      <div class="col span-4">
-        <LabeledInput
-          v-model:value="value.parameters.fstype"
-          :placeholder="t('storageClass.vsphere-volume.filesystemType.placeholder')"
-          :label="t('storageClass.vsphere-volume.filesystemType.label')"
-          :mode="mode"
+      <div class="col span-6">
+        <LabeledInput
+          v-model:value="value.parameters.fstype"
+          :placeholder="t('storageClass.vsphere-volume.filesystemType.placeholder')"
+          :label="t('storageClass.vsphere-volume.filesystemType.label')"
+          :mode="mode"
         />
       </div>
     </div>

package/edit/token.vue

@@ -175,7 +175,16 @@ export default {
 
 <template>
   <div v-if="!created">
-    <div class="pl-10 pr-10">
+    <div
+      v-for="(err,idx) in errors"
+      :key="idx"
+    >
+      <Banner
+        color="error"
+        :label="err"
+      />
+    </div>
+    <div class="pr-10">
       <LabeledInput
         key="description"
         v-model:value="value.description"
@@ -184,19 +193,20 @@ export default {
         mode="edit"
         :min-height="30"
       />
+      <div class="mt-20">
+        <LabeledSelect
+          v-model:value="value.clusterId"
+          class="scope-select"
+          label-key="accountAndKeys.apiKeys.add.scope"
+          :options="scopes"
+        />
+      </div>
 
-      <LabeledSelect
-        v-model:value="value.clusterId"
-        class="mt-20 scope-select"
-        label-key="accountAndKeys.apiKeys.add.scope"
-        :options="scopes"
-      />
-
-      <h5 class="pt-20">
+      <div style="font-size: 14px; margin-top: 32px;">
         {{ t('accountAndKeys.apiKeys.add.expiry.label') }}
-      </h5>
+      </div>
 
-      <div class="ml-10">
+      <div class="mt-20">
         <RadioGroup
           v-model:value="form.expiryType"
           :options="expiryOptions"
@@ -204,11 +214,12 @@ export default {
           class="mr-20"
           name="expiryGroup"
         />
-        <div class="ml-20 mt-10 expiry">
+        <div class="mt-20 expiry">
           <input
             v-model="form.customExpiry"
             :disabled="form.expiryType !== 'custom'"
             type="number"
+            class="expire-input"
             :mode="mode"
             :aria-label="t('accountAndKeys.apiKeys.add.ariaLabel.expiration')"
           >
@@ -299,6 +310,14 @@ export default {
       flex: 0 0 200px;
       margin-right: 10px;
     }
+    .expire-input{
+      border: solid var(--border-width) var(--input-border);
+      padding: 0px 0px 0px 11px;
+      line-height: 30px;
+      /* &['disabled']{
+        border: solid var(--border-width) var(--input-border);
+      } */
+    }
   }
 
   .buttons {

package/edit/workload/Job.vue

@@ -150,7 +150,7 @@ export default {
 
 <template>
   <form>
-    <div class="row mb-20">
+    <div class="row">
       <div
         data-testid="input-job-completions"
         class="col span-6"
@@ -178,7 +178,7 @@ export default {
         />
       </div>
     </div>
-    <div class="row mb-20">
+    <div class="row">
       <div
         data-testid="input-job-backoffLimit"
         class="col span-6"
@@ -208,7 +208,7 @@ export default {
     </div>
 
     <template v-if="isCronJob">
-      <div class="row  mb-20">
+      <div class="row ">
         <div
           data-testid="input-job-successful"
           class="col span-6"
@@ -234,7 +234,7 @@ export default {
           />
         </div>
       </div>
-      <div class="row mb-20">
+      <div class="row">
         <div
           data-testid="input-job-startingDeadlineSeconds"
           class="col span-6"
@@ -274,36 +274,33 @@ export default {
           </UnitInput>
         </div>
       </div>
-      <div class="row">
-        <div
-          data-testid="input-job-concurrencyPolicy"
-
-          class="col span-6"
-        >
-          <RadioGroup
-            v-model:value="concurrencyPolicy"
-            :mode="mode"
-            :label="t('workload.upgrading.concurrencyPolicy.label')"
-            name="concurrency"
-            :options="['Allow', 'Forbid', 'Replace']"
-            :labels="[t('workload.upgrading.concurrencyPolicy.options.allow'), t('workload.upgrading.concurrencyPolicy.options.forbid'), t('workload.upgrading.concurrencyPolicy.options.replace')]"
-            @update:value="update"
-          />
-        </div>
-        <div
-          data-testid="input-job-suspend"
-          class="col span-6"
-        >
-          <RadioGroup
-            v-model:value="suspend"
-            :mode="mode"
-            :label="t('workload.job.suspend')"
-            name="suspend"
-            :options="[true, false]"
-            :labels="['Yes', 'No']"
-            @update:value="update"
-          />
-        </div>
+      <div
+        data-testid="input-job-concurrencyPolicy"
+        class="col span-8"
+      >
+        <RadioGroup
+          v-model:value="concurrencyPolicy"
+          :mode="mode"
+          :label="t('workload.upgrading.concurrencyPolicy.label')"
+          name="concurrency"
+          :options="['Allow', 'Forbid', 'Replace']"
+          :labels="[t('workload.upgrading.concurrencyPolicy.options.allow'), t('workload.upgrading.concurrencyPolicy.options.forbid'), t('workload.upgrading.concurrencyPolicy.options.replace')]"
+          @update:value="update"
+        />
+      </div>
+      <div
+        data-testid="input-job-suspend"
+        class="col span-8"
+      >
+        <RadioGroup
+          v-model:value="suspend"
+          :mode="mode"
+          :label="t('workload.job.suspend')"
+          name="suspend"
+          :options="[true, false]"
+          :labels="['Yes', 'No']"
+          @update:value="update"
+        />
       </div>
     </template>
     <div

package/edit/workload/Upgrading.vue

@@ -223,7 +223,7 @@ export default {
     <!--workload  spec.upgradeStrategy -->
     <div
       v-if="strategyOptions && !noDeploymentSpec"
-      class="row mb-20"
+      class="row"
     >
       <div
         class="col"
@@ -241,7 +241,7 @@ export default {
     </div>
     <div
       v-if="isStatefulSet && !noDeploymentSpec"
-      class="row mb-20"
+      class="row"
     >
       <div
         class="col span-6"
@@ -252,7 +252,7 @@ export default {
           name="podManagement"
           :mode="mode"
           :label="t('workload.upgrading.podManagementPolicy.label')"
-          :options="['OrderedReady', 'Parallel']"
+          :options="['OrderedReady (顺序就绪模式)', 'Parallel (并行模式)']"
           @update:value="update"
         />
       </div>
@@ -260,7 +260,7 @@ export default {
     <template v-if="strategy === 'RollingUpdate' && !noDeploymentSpec">
       <div
         v-if="isDeployment || isDaemonSet"
-        class="row mb-20"
+        class="row"
         data-testid="input-policy-surge"
       >
         <div
@@ -299,7 +299,7 @@ export default {
     <!-- workload spec -->
     <div
       v-if="!noDeploymentSpec"
-      class="row mb-20"
+      class="row"
     >
       <div
         v-if="!isStatefulSet"

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"
@@ -186,6 +186,7 @@ export default {
                   type="button"
                   class="btn-sm role-link"
                   @click="removeContainer(tab)"
+                  style="min-width: auto;padding-left: 0;"
                 >
                   {{ t('workload.container.removeContainer') }}
                 </button>
@@ -193,7 +194,7 @@ export default {
               <div>
                 <div
                   :style="{'align-items':'center'}"
-                  class="row mb-20"
+                  class="row"
                 >
                   <div class="col span-6">
                     <LabeledInput
@@ -213,8 +214,8 @@ export default {
                     />
                   </div>
                 </div>
-                <h3>{{ t('workload.container.titles.image') }}</h3>
-                <div class="row mb-20">
+                <h3 class="mt-20">{{ t('workload.container.titles.image') }}</h3>
+                <div class="row">
                   <div class="col span-6">
                     <LabeledInput
                       v-model:value.trim="allContainers[i].image"
@@ -250,9 +251,8 @@ export default {
                   </div>
                 </div>
               </div>
-              <div class="spacer" />
               <div>
-                <h3>
+                <h3 class="mt-20">
                   {{ t('workload.container.ports.expose') }}
                   <i
                     v-clean-tooltip="{content: t('workload.container.ports.toolTip'), triggers: ['hover', 'touch', 'focus'] }"
@@ -274,8 +274,7 @@ export default {
                   />
                 </div>
               </div>
-              <div class="spacer" />
-              <div>
+              <div class="mt-40">
                 <h3>{{ t('workload.container.titles.command') }}</h3>
                 <Command
                   v-model:value="allContainers[i]"
@@ -295,8 +294,7 @@ export default {
                 :loading="isLoadingSecondaryResources"
                 @update:value="updateServiceAccount"
               />
-              <div class="spacer" />
-              <div>
+              <div class="mt-40">
                 <h3>{{ t('workload.container.titles.lifecycle') }}</h3>
                 <LifecycleHooks
                   v-model:value="allContainers[i].lifecycle"
@@ -449,8 +447,7 @@ export default {
                   </div>
                 </div>
 
-                <div>
-                  <div class="spacer" />
+                <div class="mt-40">
                   <h3 class="mb-10">
                     <t k="workload.scheduling.titles.priority" />
                   </h3>
@@ -563,7 +560,7 @@ export default {
             >
               <div>
                 <h3>{{ t('workload.container.titles.podLabels') }}</h3>
-                <div class="row mb-20">
+                <div class="row">
                   <KeyValue
                     key="labels"
                     v-model:value="podLabels"
@@ -573,8 +570,7 @@ export default {
                     :protip="false"
                   />
                 </div>
-                <div class="spacer" />
-                <h3>{{ t('workload.container.titles.podAnnotations') }}</h3>
+                <h3 class="mt-40">{{ t('workload.container.titles.podAnnotations') }}</h3>
                 <div class="row">
                   <KeyValue
                     key="annotations"
@@ -664,10 +660,18 @@ export default {
 .deployment-tabs {
   > .tabs.horizontal {
     border-bottom: 1px solid var(--border);
-    margin-bottom: 10px;
+  }
+
+  > .tab-container{
+    padding: 20px 20px 0;
+    // border: none !important;
   }
 }
 .padded {
   padding-bottom: 10px;
 }
+
+H3{
+  font-size: 14px;
+}
 </style>

package/edit/workload/storage/Mount.vue

@@ -148,6 +148,7 @@ export default {
 
   .remove BUTTON {
     padding: 0px;
+    min-width: auto;
   }
 }
 

package/edit/workload/storage/awsElasticBlockStore.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.awsElasticBlockStore.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.awsElasticBlockStore.volumeID"
           :required="true"
@@ -52,7 +52,9 @@ export default {
           :label="t('workload.storage.csi.volumeID')"
         />
       </div>
-      <div class="col span-6">
+    </div>
+    <div class="row">
+      <div class="col">
         <LabeledInput
           v-model:value.number="value.awsElasticBlockStore.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.awsElasticBlockStore.fsType"
           :mode="mode"

package/edit/workload/storage/azureDisk.vue

@@ -34,8 +34,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"
@@ -43,7 +43,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.azureDisk.readOnly"
           :mode="mode"
@@ -51,8 +51,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.azureDisk.diskName"
           :mode="mode"
@@ -60,7 +60,9 @@ export default {
           :label="t('workload.storage.csi.diskName')"
         />
       </div>
-      <div class="col span-6">
+    </div>
+    <div class="row">
+      <div class="col">
         <LabeledInput
           v-model:value.number="value.azureDisk.diskURI"
           :mode="mode"
@@ -69,8 +71,8 @@ export default {
         />
       </div>
     </div>
-    <div class="row mb-10">
-      <div class="col span-6">
+    <div class="row">
+      <div class="col">
         <RadioGroup
           v-model:value="value.azureDisk.kind"
           :mode="mode"
@@ -80,7 +82,9 @@ export default {
           :labels="[t('workload.storage.csi.kind.options.dedicated'), t('workload.storage.csi.kind.options.managed'), t('workload.storage.csi.kind.options.shared')]"
         />
       </div>
-      <div class="col span-6">
+    </div>
+    <div class="row">
+      <div class="col">
         <RadioGroup
           v-model:value="value.azureDisk.cachingMode"
           name="cachingMode"
@@ -92,7 +96,7 @@ export default {
       </div>
     </div>
     <div class="row">
-      <div class="col span-6">
+      <div class="col">
         <LabeledInput
           v-model:value="value.azureDisk.fsType"
           :mode="mode"