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

package/config/table-headers.js

@@ -52,6 +52,7 @@ export const NAME = {
   getValue:      (row) => row.nameDisplay,
   sort:          ['nameSort'],
   formatter:     'LinkDetail',
+  width:         200,
   canBeVariable: true,
 };
 
@@ -161,7 +162,7 @@ export const NAMESPACE = {
   name:        'namespace',
   labelKey:    'tableHeaders.namespace',
   value:       'namespace',
-  getValue:    (row) => row.namespace,
+  getValue:    row => row && row.namespace && row.namespace,
   sort:        'namespace',
   dashIfEmpty: true,
 };
@@ -280,7 +281,7 @@ export const NS_SNAPSHOT_QUOTA = {
   labelKey:      'harvester.tableHeaders.totalSnapshotQuota',
   value:         'snapshotSizeQuota',
   sort:          'snapshotSizeQuota',
-  align:         'center',
+  align:         'left',
   formatter:     'Si',
   formatterOpts: {
     opts: {

package/detail/node.vue

@@ -196,28 +196,7 @@ export default {
     v-else
     class="node"
   >
-    <div class="spacer" />
-    <div class="alerts">
-      <Alert
-        class="mr-10"
-        :status="pidPressureStatus"
-        :message="t('node.detail.glance.pidPressure')"
-      />
-      <Alert
-        class="mr-10"
-        :status="diskPressureStatus"
-        :message="t('node.detail.glance.diskPressure')"
-      />
-      <Alert
-        class="mr-10"
-        :status="memoryPressureStatus"
-        :message="t('node.detail.glance.memoryPressure')"
-      />
-      <Alert
-        :status="kubeletStatus"
-        :message="t('node.detail.glance.kubelet')"
-      />
-    </div>
+    <div style="font-size: 14px;margin-bottom: 32px;">监控数据</div>
     <div class="mt-20 resources">
       <ConsumptionGauge
         :resource-name="t('node.detail.glance.consumptionGauge.cpu')"
@@ -237,7 +216,24 @@ export default {
         :used="value.podConsumed"
       />
     </div>
-    <div class="spacer" />
+    <div class="alerts mt-10">
+      <Alert
+        :status="pidPressureStatus"
+        :message="t('node.detail.glance.pidPressure')"
+      />
+      <Alert
+        :status="diskPressureStatus"
+        :message="t('node.detail.glance.diskPressure')"
+      />
+      <Alert
+        :status="memoryPressureStatus"
+        :message="t('node.detail.glance.memoryPressure')"
+      />
+      <Alert
+        :status="kubeletStatus"
+        :message="t('node.detail.glance.kubelet')"
+      />
+    </div>
     <ResourceTabs
       :value="value"
       :mode="mode"
@@ -331,4 +327,13 @@ export default {
     width: 30%;
   }
 }
+.alerts{
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-between;
+  >div{
+    width: 30%;
+    margin-bottom: 10px;
+  }
+}
 </style>

package/dialog/AddCustomBadgeDialog.vue

@@ -236,7 +236,7 @@ export default {
           <div class="badge-preview-header">
             <p> {{ t('clusterBadge.modal.previewHeader') }}</p>
             <div
-              class="col span-12"
+              class="span-12"
             >
               <ClusterProviderIcon
                 :cluster="{...previewCluster, badge: displayClusterPrevIcon}"
@@ -340,7 +340,7 @@ export default {
   display: flex;
   width: 100%;
   gap: 40px;
-  padding: 10px 5px;
+  // padding: 10px 5px;
   margin-bottom: 30px;
   margin-top: 5px;
   background: var(--body-bg);
@@ -424,26 +424,34 @@ export default {
 }
 
 .badge-customisation {
-  display: flex;
-  gap: 10px;
+  // display: flex;
+  // gap: 10px;
 
-  div {
+  >div {
     display: flex;
+    // align-items: flex-end;
+    margin-bottom: 30px;
     flex-direction: column;
-    flex: 1;
-    gap: 10px;
+    // flex: 1;
+    // gap: 10px;
 
     .color-input {
       display: flex;
       padding: 6px 10px;
       min-height: 61px;
     }
+
+    .checkbox-outer-container{
+      min-width: 160px;
+      margin-bottom: 10px;
+      // align-items: flex-start;
+    }
   }
 
   &-color {
     display: flex;
-    flex-direction: column;
-    gap: 10px;
+    // flex-direction: column;
+    // gap: 10px;
   }
 }
 

package/dialog/ForceMachineRemoveDialog.vue

@@ -98,9 +98,9 @@ export default {
           v-model="confirmName"
           type="text"
         >
-        <div class="text-info mt-20">
+        <!-- <div class="text-info mt-20">
           {{ protip }}
-        </div>
+        </div> -->
         <Banner
           v-for="(error, i) in errors"
           :key="i"

package/dialog/RollbackWorkloadDialog.vue

@@ -204,7 +204,7 @@ export default {
   >
     <template #title>
       <h4 class="text-default-text">
-        {{ t('promptRollback.modalTitle', { workloadName }, true) }}
+        {{ t('promptRollback.modalTitle', { workloadName }) }}
       </h4>
     </template>
     <template #body>

package/dialog/ScalePoolDownDialog.vue

@@ -91,9 +91,9 @@ export default {
             @update:value="update()"
           />
         </div>
-        <div class="text-info mt-20">
+        <!-- <div class="text-info mt-20">
           {{ protip }}
-        </div>
+        </div> -->
       </div>
     </template>
     <template #actions>

package/edit/autoscaling.horizontalpodautoscaler/external-metric.vue

@@ -41,7 +41,7 @@ export default {
 
 <template>
   <div>
-    <div class="row mb-20">
+    <div class="row">
       <MetricTarget
         v-model:value="value.target"
         :mode="mode"

package/edit/autoscaling.horizontalpodautoscaler/hpa-scaling-rule.vue

@@ -49,8 +49,8 @@ export default {
 
 <template>
   <div>
-    <div class="row mb-20">
-      <div class="col span-12">
+    <div class="row">
+      <div class="span-12">
         <ArrayListGrouped
           v-model:value="value.spec.behavior[type].policies"
           :add-label="t('hpa.scalingRule.addPolicy')"
@@ -59,7 +59,7 @@ export default {
         >
           <template #default="props">
             <div class="row">
-              <div class="col span-4">
+              <div class="col">
                 <LabeledSelect
                   v-model:value="props.row.value.type"
                   :mode="mode"
@@ -72,7 +72,9 @@ export default {
                   :label="t('hpa.scalingRule.policy.type')"
                 />
               </div>
-              <div class="col span-4">
+            </div>
+            <div class="row">
+              <div class="col">
                 <LabeledInput
                   v-model:value.number="props.row.value.value"
                   :mode="mode"
@@ -83,7 +85,9 @@ export default {
                   :label="t('hpa.scalingRule.policy.value')"
                 />
               </div>
-              <div class="col span-4">
+            </div>
+            <div class="row">
+              <div class="col">
                 <LabeledInput
                   v-model:value.number="props.row.value.periodSeconds"
                   :mode="mode"
@@ -125,6 +129,5 @@ export default {
         />
       </div>
     </div>
-    <div class="row mb-40" />
   </div>
 </template>

package/edit/autoscaling.horizontalpodautoscaler/index.vue

@@ -215,7 +215,7 @@ export default {
           :label="t('hpa.tabs.target')"
           :weight="10"
         >
-          <div class="row mb-20">
+          <div class="row">
             <div class="col span-6">
               <LabeledSelect
                 v-model:value="value.spec.scaleTargetRef"
@@ -242,6 +242,8 @@ export default {
                 type="number"
               />
             </div>
+          </div>
+          <div class="row">
             <div class="col span-6">
               <LabeledInput
                 v-model:value.number="value.spec.maxReplicas"

package/edit/autoscaling.horizontalpodautoscaler/metric-identifier.vue

@@ -51,8 +51,8 @@ export default {
 
 <template>
   <div class="col span-12">
-    <div class="row mb-20">
-      <div class="col span-6">
+    <div class="row">
+      <div class="col">
         <LabeledInput
           v-model:value="value.name"
           :mode="mode"

package/edit/autoscaling.horizontalpodautoscaler/metric-object-reference.vue

@@ -21,9 +21,9 @@ export default {
 </script>
 
 <template>
-  <div class="col span-12">
-    <div class="row mb-20">
-      <div class="col span-6">
+  <div class="span-12">
+    <div class="row">
+      <div class="col">
         <LabeledInput
           v-model:value="value.apiVersion"
           :mode="mode"
@@ -33,7 +33,9 @@ export default {
           type="text"
         />
       </div>
-      <div class="col span-6">
+    </div>
+    <div class="row">
+      <div class="col">
         <LabeledInput
           v-model:value="value.kind"
           :mode="mode"
@@ -45,7 +47,7 @@ export default {
       </div>
     </div>
     <div class="row">
-      <div class="col span-6">
+      <div class="col">
         <LabeledInput
           v-model:value="value.name"
           :mode="mode"

package/edit/autoscaling.horizontalpodautoscaler/metric-target.vue

@@ -149,7 +149,7 @@ export default {
 <template>
   <div class="metric-target">
     <div class="row">
-      <div class="col span-6">
+      <div class="col">
         <LabeledSelect
           v-model:value="value.type"
           :mode="mode"
@@ -157,9 +157,11 @@ export default {
           :options="targetTypes"
         />
       </div>
+    </div>
+    <div class="row">
       <div
         v-if="isResourceMetricType"
-        class="col span-6"
+        class="col"
       >
         <UnitInput
           v-if="value.type === 'Utilization'"
@@ -197,7 +199,7 @@ export default {
       </div>
       <div
         v-else
-        class="col span-6"
+        class="col"
       >
         <LabeledInput
           v-model:value="quantity"

package/edit/autoscaling.horizontalpodautoscaler/metrics-row.vue

@@ -159,8 +159,8 @@ export default {
       :label="t('hpa.warnings.resource')"
       color="warning"
     />
-    <div class="row mb-20">
-      <div class="col span-6">
+    <div class="row">
+      <div class="col">
         <LabeledSelect
           v-model:value="value.type"
           :reduce="(val) => val.label"

package/edit/autoscaling.horizontalpodautoscaler/object-metric.vue

@@ -48,14 +48,14 @@ export default {
 
 <template>
   <div>
-    <div class="row mb-20">
+    <div class="row">
       <MetricTarget
         v-model:value="value.target"
         :mode="mode"
         metric-resource="object"
       />
     </div>
-    <div class="row mb-20">
+    <div class="row">
       <MetricObjectReference
         v-model:value="value.describedObject"
         :mode="mode"

package/edit/autoscaling.horizontalpodautoscaler/pod-metric.vue

@@ -41,7 +41,7 @@ export default {
 
 <template>
   <div>
-    <div class="row mb-20">
+    <div class="row">
       <MetricTarget
         v-model:value="value.target"
         :mode="mode"

package/edit/autoscaling.horizontalpodautoscaler/resource-metric.vue

@@ -43,8 +43,8 @@ export default {
 
 <template>
   <div class="resource-metric">
-    <div class="row mb-20">
-      <div class="col span-6">
+    <div class="row">
+      <div class="col">
         <LabeledSelect
           v-model:value="value.name"
           :mode="mode"

package/edit/configmap.vue

@@ -166,4 +166,8 @@ export default {
 .no-binary-data {
   opacity: 0.8;
 }
+
+::v-deep .CodeMirror-scroll {
+  min-height: auto;
+}
 </style>

package/edit/logging-flow/index.vue

@@ -418,10 +418,9 @@ export default {
           class="mt-0"
           :label="t('logging.flow.matches.banner')"
         />
-        <div v-if="isHarvester">
+        <div class="mb-20" v-if="isHarvester">
           <LabeledSelect
             v-model:value="loggingType"
-            class="mb-20"
             :options="flowTypeOptions"
             :mode="mode"
             :disabled="!isCreate"

package/edit/logging.banzaicloud.io.output/providers/awsElasticsearch.vue

@@ -50,8 +50,8 @@ export default {
         <h3>{{ t('logging.output.sections.access') }}</h3>
       </div>
     </div>
-    <div class="row mb-10">
-      <div class="col span-6">
+    <div>
+      <div>
         <SecretSelector
           v-model:value="value.endpoint.access_key_id"
           :mode="mode"
@@ -61,7 +61,7 @@ export default {
           :show-key-selector="true"
         />
       </div>
-      <div class="col span-6">
+      <div>
         <SecretSelector
           v-model:value="value.endpoint.secret_access_key"
           :mode="mode"

package/edit/logging.banzaicloud.io.output/providers/azurestorage.vue

@@ -34,31 +34,31 @@ export default {
         <h3>{{ t('logging.output.sections.target') }}</h3>
       </div>
     </div>
-    <div class="row mb-10">
+    <div class="row">
       <div class="col span-6">
-        <LabeledInput
-          v-model:value="value.azure_container"
-          :mode="mode"
-          :disabled="disabled"
-          :label="t('logging.azurestorage.container')"
+        <LabeledInput
+          v-model:value="value.azure_container"
+          :mode="mode"
+          :disabled="disabled"
+          :label="t('logging.azurestorage.container')"
         />
       </div>
       <div class="col span-6">
-        <LabeledInput
-          v-model:value="value.path"
-          :mode="mode"
-          :disabled="disabled"
-          :label="t('logging.azurestorage.path')"
+        <LabeledInput
+          v-model:value="value.path"
+          :mode="mode"
+          :disabled="disabled"
+          :label="t('logging.azurestorage.path')"
         />
       </div>
     </div>
     <div class="row">
       <div class="col span-6">
-        <LabeledInput
-          v-model:value="value.store_as"
-          :mode="mode"
-          :disabled="disabled"
-          :label="t('logging.azurestorage.storeAs')"
+        <LabeledInput
+          v-model:value="value.store_as"
+          :mode="mode"
+          :disabled="disabled"
+          :label="t('logging.azurestorage.storeAs')"
         />
       </div>
     </div>
@@ -68,8 +68,8 @@ export default {
         <h3>{{ t('logging.output.sections.access') }}</h3>
       </div>
     </div>
-    <div class="row mb-10">
-      <div class="col span-6">
+    <div>
+      <div>
         <SecretSelector
           v-model:value="value.azure_storage_account"
           :mode="mode"
@@ -79,7 +79,7 @@ export default {
           :show-key-selector="true"
         />
       </div>
-      <div class="col span-6">
+      <div>
         <SecretSelector
           v-model:value="value.azure_storage_access_key"
           :mode="mode"

package/edit/logging.banzaicloud.io.output/providers/cloudwatch.vue

@@ -36,19 +36,19 @@ export default {
     </div>
     <div class="row">
       <div class="col span-6">
-        <LabeledInput
-          v-model:value="value.region"
-          :mode="mode"
-          :disabled="disabled"
-          :label="t('logging.cloudwatch.region')"
+        <LabeledInput
+          v-model:value="value.region"
+          :mode="mode"
+          :disabled="disabled"
+          :label="t('logging.cloudwatch.region')"
         />
       </div>
       <div class="col span-6">
-        <LabeledInput
-          v-model:value="value.endpoint"
-          :mode="mode"
-          :disabled="disabled"
-          :label="t('logging.cloudwatch.endpoint')"
+        <LabeledInput
+          v-model:value="value.endpoint"
+          :mode="mode"
+          :disabled="disabled"
+          :label="t('logging.cloudwatch.endpoint')"
         />
       </div>
     </div>
@@ -57,8 +57,8 @@ export default {
         <h3>{{ t('logging.output.sections.access') }}</h3>
       </div>
     </div>
-    <div class="row mb-10">
-      <div class="col span-6">
+    <div>
+      <div>
         <SecretSelector
           v-model:value="value.aws_key_id"
           :mode="mode"
@@ -68,7 +68,7 @@ export default {
           :show-key-selector="true"
         />
       </div>
-      <div class="col span-6">
+      <div>
         <SecretSelector
           v-model:value="value.aws_sec_key"
           :mode="mode"
@@ -86,19 +86,19 @@ export default {
     </div>
     <div class="row">
       <div class="col span-6">
-        <LabeledInput
-          v-model:value="value.log_group_name"
-          :mode="mode"
-          :disabled="disabled"
-          :label="t('logging.cloudwatch.logGroupName')"
+        <LabeledInput
+          v-model:value="value.log_group_name"
+          :mode="mode"
+          :disabled="disabled"
+          :label="t('logging.cloudwatch.logGroupName')"
         />
       </div>
       <div class="col span-6">
-        <LabeledInput
-          v-model:value="value.log_stream_name"
-          :mode="mode"
-          :disabled="disabled"
-          :label="t('logging.cloudwatch.logStreamName')"
+        <LabeledInput
+          v-model:value="value.log_stream_name"
+          :mode="mode"
+          :disabled="disabled"
+          :label="t('logging.cloudwatch.logStreamName')"
         />
       </div>
     </div>

package/edit/logging.banzaicloud.io.output/providers/datadog.vue

@@ -39,11 +39,11 @@ export default {
     </div>
     <div class="row">
       <div class="col span-6">
-        <LabeledInput
-          v-model:value="value.host"
-          :mode="mode"
-          :disabled="disabled"
-          :label="t('logging.datadog.host')"
+        <LabeledInput
+          v-model:value="value.host"
+          :mode="mode"
+          :disabled="disabled"
+          :label="t('logging.datadog.host')"
         />
       </div>
     </div>
@@ -53,8 +53,8 @@ export default {
         <h3>{{ t('logging.output.sections.access') }}</h3>
       </div>
     </div>
-    <div class="row">
-      <div class="col span-6">
+    <div>
+      <div>
         <SecretSelector
           v-model:value="value.api_key"
           :mode="mode"
@@ -71,23 +71,23 @@ export default {
         <h3>{{ t('logging.output.sections.certificate') }}</h3>
       </div>
     </div>
-    <div class="row mb-10">
+    <div class="row">
       <div class="col span-6">
-        <Checkbox
-          v-model:value="value.use_ssl"
-          :mode="mode"
-          :disabled="disabled"
-          :label="t('logging.datadog.useSSL')"
+        <Checkbox
+          v-model:value="value.use_ssl"
+          :mode="mode"
+          :disabled="disabled"
+          :label="t('logging.datadog.useSSL')"
         />
       </div>
     </div>
-    <div class="row mb-10">
+    <div class="row">
       <div class="col span-6">
-        <Checkbox
-          v-model:value="value.use_compression"
-          :mode="mode"
-          :disabled="disabled"
-          :label="t('logging.datadog.useCompression')"
+        <Checkbox
+          v-model:value="value.use_compression"
+          :mode="mode"
+          :disabled="disabled"
+          :label="t('logging.datadog.useCompression')"
         />
       </div>
     </div>