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

package/components/form/ValueFromResource.vue

@@ -284,128 +284,141 @@ export default {
 
 <template>
   <div class="var-row">
-    <div class="type">
-      <LabeledSelect
-        v-model:value="type"
-        :mode="mode"
-        :multiple="false"
-        :options="options"
-        option-label="label"
-        :searchable="false"
-        :reduce="e=>e.value"
-        :label="t('workload.container.command.fromResource.type')"
-        @update:value="updateRow"
-      />
-    </div>
-
-    <div
-      v-if="!hideVariableName"
-      class="name"
-    >
-      <LabeledInput
-        v-model:value="name"
-        :label="nameLabel"
-        :placeholder="t('workload.container.command.fromResource.name.placeholder')"
-        :mode="mode"
-        @update:value="updateRow"
-      />
-    </div>
-
-    <div
-      v-if="type==='simple'"
-      class="single-value"
-    >
-      <LabeledInput
-        v-model:value="valStr"
-        :label="t('workload.container.command.fromResource.value.label')"
-        :placeholder="t('workload.container.command.fromResource.value.placeholder')"
-        :mode="mode"
-        @update:value="updateRow"
-      />
+    <div class="row">
+      <div class="remove">
+        <button
+          v-if="!isView"
+          type="button"
+          class="btn role-link"
+          @click.stop="$emit('remove')"
+        >
+          {{ t('generic.remove') }}
+        </button>
+      </div>
     </div>
 
-    <template v-else-if="needsSource">
-      <div :class="{'single-value': type === 'configMapRef' || type === 'secretRef'}">
+    <div class="row">
+      <div class="type span-6 col">
         <LabeledSelect
-          v-model:value="referenced"
-          :options="sourceOptions"
-          :multiple="false"
-          :get-option-label="opt=>get(opt, 'metadata.name') || opt"
-          :get-option-key="opt=>opt.id|| opt"
+          v-model:value="type"
           :mode="mode"
-          :label="sourceLabel"
-          :loading="loading"
-        />
-      </div>
-      <div v-if="type!=='secretRef' && type!== 'configMapRef'">
-        <LabeledSelect
-          v-model:value="key"
           :multiple="false"
-          :options="keys"
-          :mode="mode"
+          :options="options"
           option-label="label"
-          :label="t('workload.container.command.fromResource.key.label')"
-          :loading="loading"
+          :searchable="false"
+          :reduce="e=>e.value"
+          :label="t('workload.container.command.fromResource.type')"
           @update:value="updateRow"
         />
       </div>
-    </template>
-
-    <template v-else-if="type==='resourceFieldRef'">
-      <div>
+  
+      <div
+        v-if="!hideVariableName"
+        class="name span-6 col"
+      >
         <LabeledInput
-          v-model:value="refName"
-          :label="t('workload.container.command.fromResource.containerName')"
-          :placeholder="t('workload.container.command.fromResource.source.placeholder')"
+          v-model:value="name"
+          :label="nameLabel"
+          :placeholder="t('workload.container.command.fromResource.name.placeholder')"
           :mode="mode"
           @update:value="updateRow"
         />
       </div>
-      <div>
-        <LabeledSelect
-          v-model:value="key"
-          :label="t('workload.container.command.fromResource.key.label')"
-          :multiple="false"
-          :options="resourceKeyOpts"
-          :mode="mode"
-          :searchable="false"
-          :placeholder="t('workload.container.command.fromResource.key.placeholder', null, true)"
-          @update:value="updateRow"
-        />
-      </div>
-    </template>
+    </div>
 
-    <template v-else>
-      <div class="single-value">
+    <div class="row">
+      <div
+        v-if="type==='simple'"
+        class="single-value span-6 col"
+      >
         <LabeledInput
-          v-model:value="fieldPath"
-          :placeholder="t('workload.container.command.fromResource.key.placeholder', null, true)"
-          :label="t('workload.container.command.fromResource.key.label')"
+          v-model:value="valStr"
+          :label="t('workload.container.command.fromResource.value.label')"
+          :placeholder="t('workload.container.command.fromResource.value.placeholder')"
           :mode="mode"
           @update:value="updateRow"
         />
       </div>
-    </template>
-    <div class="remove">
-      <button
-        v-if="!isView"
-        type="button"
-        class="btn role-link"
-        @click.stop="$emit('remove')"
-      >
-        {{ t('generic.remove') }}
-      </button>
+  
+      <template v-else-if="needsSource">
+        <div
+          :class="{'single-value': type === 'configMapRef' || type === 'secretRef'}"
+          class="span-6 col"
+        >
+          <LabeledSelect
+            v-model:value="referenced"
+            :options="sourceOptions"
+            :multiple="false"
+            :get-option-label="opt=>get(opt, 'metadata.name') || opt"
+            :get-option-key="opt=>opt.id|| opt"
+            :mode="mode"
+            :label="sourceLabel"
+            :loading="loading"
+          />
+        </div>
+        <div
+          v-if="type!=='secretRef' && type!== 'configMapRef'"
+          class="span-6 col"
+        >
+          <LabeledSelect
+            v-model:value="key"
+            :multiple="false"
+            :options="keys"
+            :mode="mode"
+            option-label="label"
+            :label="t('workload.container.command.fromResource.key.label')"
+            :loading="loading"
+            @update:value="updateRow"
+          />
+        </div>
+      </template>
+  
+      <template v-else-if="type==='resourceFieldRef'">
+        <div class="span-6 col">
+          <LabeledInput
+            v-model:value="refName"
+            :label="t('workload.container.command.fromResource.containerName')"
+            :placeholder="t('workload.container.command.fromResource.source.placeholder')"
+            :mode="mode"
+            @update:value="updateRow"
+          />
+        </div>
+        <div class="span-6 col">
+          <LabeledSelect
+            v-model:value="key"
+            :label="t('workload.container.command.fromResource.key.label')"
+            :multiple="false"
+            :options="resourceKeyOpts"
+            :mode="mode"
+            :searchable="false"
+            :placeholder="t('workload.container.command.fromResource.key.placeholder', null, true)"
+            @update:value="updateRow"
+          />
+        </div>
+      </template>
+  
+      <template v-else>
+        <div class="single-value span-6 col">
+          <LabeledInput
+            v-model:value="fieldPath"
+            :placeholder="t('workload.container.command.fromResource.key.placeholder', null, true)"
+            :label="t('workload.container.command.fromResource.key.label')"
+            :mode="mode"
+            @update:value="updateRow"
+          />
+        </div>
+      </template>
     </div>
   </div>
 </template>
 
 <style lang='scss' scoped>
 .var-row{
-  display: grid;
-  grid-template-columns: 1fr 1fr 1fr 1fr 100px;
-  grid-column-gap: 20px;
-  margin-bottom: 10px;
-  align-items: center;
+  // display: grid;
+  // grid-template-columns: 1fr 1fr 1fr 1fr 100px;
+  // grid-column-gap: 20px;
+  // margin-bottom: 10px;
+  // align-items: center;
 
   .single-value {
     grid-column: span 2;
@@ -413,6 +426,7 @@ export default {
 
   .remove BUTTON {
     padding: 0px;
+    min-width: auto;
   }
 }
 

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/formatter/BadgeStateFormatter.vue

@@ -1,8 +1,9 @@
 <script>
 import { BadgeState } from '@components/BadgeState';
+import DotState from '@shell/components/DotState'
 import { colorForState, stateDisplay } from '@shell/plugins/dashboard-store/resource-class';
 export default {
-  components: { BadgeState },
+  components: { BadgeState, DotState },
   props:      {
     value: {
       type:    String,
@@ -49,15 +50,17 @@ export default {
 <template>
   <div>
     <div v-if="arbitrary">
-      <BadgeState
+      <!-- <BadgeState
         v-if="value"
         :color="stateBackground"
         :label="stateDisplay"
-      />
+      /> -->
+      <DotState  v-if="value" :color="stateBackground" :label="stateDisplay" />
     </div>
-    <BadgeState
+    <!-- <BadgeState
       v-else
       :value="row"
-    />
+    /> -->
+    <DotState v-else :value="row" />
   </div>
 </template>

package/components/formatter/LiveDate.vue

@@ -1,5 +1,6 @@
 <script>
 import day from 'dayjs';
+import 'dayjs/locale/zh-cn';
 import { DATE_FORMAT, TIME_FORMAT } from '@shell/store/prefs';
 import { escapeHtml } from '@shell/utils/string';
 import { diffFrom } from '@shell/utils/time';
@@ -65,8 +66,7 @@ export default {
       const dateFormat = escapeHtml( this.$store.getters['prefs/get'](DATE_FORMAT));
       const timeFormat = escapeHtml( this.$store.getters['prefs/get'](TIME_FORMAT));
 
-      const out = day(this.value).format(`${ dateFormat } ${ timeFormat }`);
-
+      const out = day(this.value).locale('zh-cn').format('YYYY年M月D日 Ah:mm:ss');
       return out;
     },
 
@@ -126,7 +126,7 @@ export default {
       let label = diff.label;
 
       if ( diff.diff === 0 ) {
-        label = 'Just now';
+        label = '刚刚';
       } else {
         label += ` ${ prefix }${ this.t(diff.unitsKey, { count: diff.label }) }`;
         label = label.trim();

package/components/formatter/WorkloadHealthScale.vue

@@ -204,6 +204,7 @@ export default {
     <div
       :id="id"
       class="hs-popover__content"
+      style="width: auto;padding-right: 10px;"
       :class="{expanded, [id]:true}"
     >
       <div>
@@ -212,14 +213,14 @@ export default {
           :key="i"
           class="counts"
         >
-          <span class="counts-label">{{ obj.label }}</span>
-          <span>{{ obj.value }}</span>
+          <span class="counts-label" style="white-space: normal;">{{ obj.label }}</span>
+          <span style="white-space: normal;">{{ obj.value }}</span>
         </div>
         <div
           v-if="canScale"
           class="text-center scale"
         >
-          <span>{{ t('tableHeaders.scale') }} </span>
+          <span style="white-space: nowrap;margin-right: 5px;">{{ t('tableHeaders.scale') }} </span>
           <PlusMinus
             :value="row.spec.replicas"
             :disabled="disabled"

package/components/nav/Favorite.vue

@@ -44,9 +44,13 @@ export default {
 
 <style lang="scss" scoped>
   .favorite {
+    display: flex;
+    align-items: center;
     position: relative;
     cursor: pointer;
-    font-size: 20px;
+    font-size: 22px;
+    margin-top: 4px;
+    margin-left: 10px;
     transform: ease-in-out-all 1s;
 
     &.icon-star-open {