dashboard-shell-shell 1.0.10000011122 → 1.6.0-alpha.2

package/edit/storage.k8s.io.storageclass/index.vue

@@ -224,9 +224,9 @@ export default {
       :mode="modeOverride"
       :searchable="true"
       :taggable="true"
-      class="mb-20"
       @update:value="updateProvisioner($event)"
     />
+    <div style="height: 20px;"></div>
     <Banner
       v-if="provisionerIsDeprecated"
       color="warning"
@@ -237,7 +237,10 @@ export default {
         :provisioner="provisionerLabel(value.provisioner)"
       />
     </Banner>
-    <Tabbed :side-tabs="true">
+    <Tabbed
+      :side-tabs="true"
+      :use-hash="useTabbedHash"
+    >
       <Tab
         name="parameters"
         :label="t('storageClass.parameters.label')"
@@ -256,8 +259,8 @@ export default {
         :label="t('storageClass.customize.label')"
       >
         <div class="row mt-20">
-          <div class="col span-6">
-            <div class="row mb-20">
+          <div class="span-6">
+            <div class="row">
               <div class="col span-12">
                 <RadioGroup
                   v-model:value="value.reclaimPolicy"
@@ -268,7 +271,7 @@ export default {
                 />
               </div>
             </div>
-            <div class="row mb-20">
+            <div class="row">
               <div class="col span-12">
                 <RadioGroup
                   v-model:value="value.allowVolumeExpansion"
@@ -280,8 +283,10 @@ export default {
               </div>
             </div>
           </div>
-          <div class="col span-6">
-            <h3>{{ t('storageClass.customize.mountOptions.label') }}</h3>
+        </div>
+        <div class="row">
+          <div style="display: flex;">
+            <div style="min-width: 160px;padding-top: 10px;">{{ t('storageClass.customize.mountOptions.label') }}</div>
             <ArrayList
               v-model:value="value.mountOptions"
               :mode="mode"
@@ -290,8 +295,8 @@ export default {
             />
           </div>
         </div>
-        <div class="row">
-          <div class="col span-6">
+        <div class="row" style="margin-top: -24px;">
+          <div class="col">
             <RadioGroup
               v-model:value="value.volumeBindingMode"
               name="volumeBindingMode"

package/edit/storage.k8s.io.storageclass/provisioners/kubernetes.io/aws-ebs.vue

@@ -104,34 +104,34 @@ export default {
 </script>
 <template>
   <div>
-    <div class="row mb-20">
-      <div class="col span-6">
+    <div class="row">
+      <div class="col">
         <RadioGroup
           v-model:value="value.parameters.type"
           name="volumeType"
           :label="t('storageClass.aws-ebs.volumeType.label')"
           :mode="mode"
           :options="volumeTypeOptions"
+          class="mb-20"
         />
         <UnitInput
           v-if="value.parameters.type === 'io1' || value.parameters.type === 'gp3'"
           v-model:value="iopsPerGB"
-          class="mt-10"
           :label="t('storageClass.aws-ebs.volumeType.provisionedIops.label')"
           :suffix="t('storageClass.aws-ebs.volumeType.provisionedIops.suffix')"
           :mode="mode"
         />
-        <LabeledInput
-          v-model:value="value.parameters.fsType"
-          class="mt-10"
-          :placeholder="t('storageClass.aws-ebs.filesystemType.placeholder')"
-          :label="t('storageClass.aws-ebs.filesystemType.label')"
-          :mode="mode"
+        <div v-if="value.parameters.type === 'io1' || value.parameters.type === 'gp3'" style="height: 24px;"></div>
+        <LabeledInput
+          v-model:value="value.parameters.fsType"
+          :placeholder="t('storageClass.aws-ebs.filesystemType.placeholder')"
+          :label="t('storageClass.aws-ebs.filesystemType.label')"
+          :mode="mode"
         />
       </div>
     </div>
-    <div class="row mb-20">
-      <div class="col span-6">
+    <div class="row">
+      <div class="col">
         <RadioGroup
           v-model:value="availabilityZone"
           name="availabilityZone"
@@ -139,17 +139,20 @@ export default {
           :mode="mode"
           :options="availabilityZoneOptions"
         />
-        <LabeledInput
-          v-if="availabilityZone === 'manual'"
-          v-model:value="value.parameters.zones"
-          class="mt-10"
-          :placeholder="t('storageClass.aws-ebs.availabilityZone.placeholder')"
-          :mode="mode"
-        />
+        <div style="display: flex;">
+          <div style="width: 160px;"></div>
+          <LabeledInput
+            v-if="availabilityZone === 'manual'"
+            v-model:value="value.parameters.zones"
+            class="mt-10"
+            :placeholder="t('storageClass.aws-ebs.availabilityZone.placeholder')"
+            :mode="mode"
+          />
+        </div>
       </div>
     </div>
     <div class="row">
-      <div class="col span-6">
+      <div class="col">
         <RadioGroup
           v-model:value="value.parameters.encrypted"
           name="encryption"
@@ -158,22 +161,26 @@ export default {
           :options="encryptionOptions"
         />
       </div>
-      <div class="col span-6">
+    </div>
+    <div class="row">
+      <div class="col">
         <RadioGroup
           v-if="value.parameters.encrypted === 'true'"
           v-model:value="keyId"
-          class="mt-10"
           name="keyId"
           :label="t('storageClass.aws-ebs.keyId.label')"
           :mode="mode"
           :options="keyIdOptions"
         />
-        <LabeledInput
-          v-if="keyId === 'manual'"
-          v-model:value="value.parameters.kmsKeyId"
-          class="mt-10"
-          :mode="mode"
-        />
+        <div class="row">
+          <div v-if="keyId === 'manual'" style="min-width: 160px;"></div>
+          <LabeledInput
+            v-if="keyId === 'manual'"
+            v-model:value="value.parameters.kmsKeyId"
+            class="mt-10"
+            :mode="mode"
+          />
+        </div>
       </div>
     </div>
   </div>

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

@@ -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/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"