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

package/components/form/WorkloadPorts.vue

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

package/components/formatter/BadgeStateFormatter.vue

@@ -1,9 +1,8 @@
 <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, DotState },
+  components: { BadgeState },
   props:      {
     value: {
       type:    String,
@@ -50,17 +49,15 @@ 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,6 +1,5 @@
 <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';
@@ -66,7 +65,8 @@ 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).locale('zh-cn').format('YYYY年M月D日 Ah:mm:ss');
+      const out = day(this.value).format(`${ dateFormat } ${ timeFormat }`);
+
       return out;
     },
 
@@ -126,7 +126,7 @@ export default {
       let label = diff.label;
 
       if ( diff.diff === 0 ) {
-        label = '刚刚';
+        label = 'Just now';
       } else {
         label += ` ${ prefix }${ this.t(diff.unitsKey, { count: diff.label }) }`;
         label = label.trim();

package/components/nav/Favorite.vue

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