dashboard-shell-shell 3.0.5-test.9 → 3.0.5-tsh.2

package/components/form/ArrayList.vue

@@ -263,174 +263,180 @@ export default {
     role="group"
     :aria-label="title || t('generic.ariaLabel.arrayList')"
   >
-    <div
-      v-if="title"
-      class="clearfix"
-      role="group"
-    >
-      <slot name="title">
-        <h3>
-          {{ title }}
-          <span
-            v-if="required"
-            class="required"
-            aria-hidden="true"
-          >*</span>
-          <i
-            v-if="showProtip"
-            v-clean-tooltip="{content: protip, triggers: ['hover', 'touch', 'focus'] }"
-            class="icon icon-info"
-            tabindex="0"
-          />
-        </h3>
-      </slot>
-    </div>
 
-    <div>
-      <div
-        v-if="showAdd && !isView"
-        class="footer mmt-6"
-      >
-        <slot
-          v-if="showAdd"
-          name="add"
-          :add="add"
-        >
-          <button
-            type="button"
-            class="btn role-tertiary add"
-            :class="[addClass]"
-            :disabled="loading || disableAdd"
-            :data-testid="`${componentTestid}-button`"
-            :aria-label="_addLabel"
-            role="button"
-            @click="add()"
-          >
-            <i
-              class="mr-5 icon"
-              :class="loading ? ['icon-lg', 'icon-spinner','icon-spin']: [addIcon]"
-            />
-            {{ _addLabel }}
-          </button>
-        </slot>
-      </div>
-      <template v-if="rows.length">
+    <div class="row">
+      <div v-if="title" style="width: 100%;" class="col">
         <div
-          v-if="showHeader"
-          class="array-list-header-group"
+          class="clearfix"
           role="group"
         >
-          <slot name="column-headers">
-            <label class="value text-label mb-10">
-              {{ valueLabel }}
-            </label>
+          <slot name="title">
+            <h3>
+              {{ title }}
+              <span
+                v-if="required"
+                class="required"
+                aria-hidden="true"
+              >*</span>
+              <i
+                v-if="showProtip"
+                v-clean-tooltip="{content: protip, triggers: ['hover', 'touch', 'focus'] }"
+                class="icon icon-info"
+                tabindex="0"
+              />
+            </h3>
           </slot>
         </div>
-        <div
-          v-for="(row, idx) in rows"
-          :key="idx"
-          :data-testid="`${componentTestid}-box${ idx }`"
-          class="box"
-          :class="{'hide-remove-is-view': isView}"
-          role="group"
-        >
-          <slot
-            name="columns"
-            :queueUpdate="queueUpdate"
-            :i="idx"
-            :rows="rows"
-            :row="row"
-            :mode="mode"
-            :isView="isView"
-          >
-            <div class="value">
+      </div>
+      <div style="width: 100%;" class="col">
+        <div>
+          <template v-if="rows.length">
+            <div
+              v-if="showHeader"
+              class="array-list-header-group"
+              role="group"
+            >
+              <slot name="column-headers">
+                <label class="value text-label mb-10">
+                  {{ valueLabel }}
+                </label>
+              </slot>
+            </div>
+            <div
+              v-for="(row, idx) in rows"
+              :key="idx"
+              :data-testid="`${componentTestid}-box${ idx }`"
+              class="box"
+              :class="{'hide-remove-is-view': isView}"
+              role="group"
+            >
               <slot
-                name="value"
+                name="columns"
+                :queueUpdate="queueUpdate"
+                :i="idx"
+                :rows="rows"
                 :row="row"
                 :mode="mode"
                 :isView="isView"
-                :queue-update="queueUpdate"
               >
-                <TextAreaAutoGrow
-                  v-if="valueMultiline"
-                  ref="value"
-                  v-model:value="row.value"
-                  :data-testid="`${componentTestid}-textarea-${idx}`"
-                  :placeholder="valuePlaceholder"
-                  :mode="mode"
-                  :disabled="disabled"
-                  :aria-label="a11yLabel ? `${a11yLabel} ${t('generic.ariaLabel.genericRow', {index: idx+1})}` : undefined"
-                  @paste="onPaste(idx, $event)"
-                  @update:value="queueUpdate"
-                />
-                <LabeledInput
-                  v-else-if="rules.length > 0"
-                  ref="value"
-                  v-model:value="row.value"
-                  :data-testid="`${componentTestid}-labeled-input-${idx}`"
-                  :placeholder="valuePlaceholder"
-                  :disabled="isView || disabled"
-                  :rules="rules"
-                  :compact="false"
-                  :aria-label="a11yLabel ? `${a11yLabel} ${t('generic.ariaLabel.genericRow', {index: idx+1})}` : undefined"
-                  @paste="onPaste(idx, $event)"
-                  @update:value="queueUpdate"
-                />
-                <input
-                  v-else
-                  ref="value"
-                  v-model="row.value"
-                  :data-testid="`${componentTestid}-input-${idx}`"
-                  :placeholder="valuePlaceholder"
-                  :disabled="isView || disabled"
-                  :aria-label="a11yLabel ? `${a11yLabel} ${t('generic.ariaLabel.genericRow', {index: idx+1})}` : undefined"
-                  @paste="onPaste(idx, $event)"
-                >
+                <div class="value">
+                  <slot
+                    name="value"
+                    :row="row"
+                    :mode="mode"
+                    :isView="isView"
+                    :queue-update="queueUpdate"
+                  >
+                    <TextAreaAutoGrow
+                      v-if="valueMultiline"
+                      ref="value" 
+                      v-model:value="row.value"
+                      :data-testid="`${componentTestid}-textarea-${idx}`"
+                      :placeholder="valuePlaceholder"
+                      :mode="mode"
+                      :disabled="disabled"
+                      :aria-label="a11yLabel ? `${a11yLabel} ${t('generic.ariaLabel.genericRow', {index: idx+1})}` : undefined"
+                      @paste="onPaste(idx, $event)"
+                      @update:value="queueUpdate"
+                    />
+                    <LabeledInput
+                      v-else-if="rules.length > 0"
+                      ref="value"
+                      v-model:value="row.value"
+                      :data-testid="`${componentTestid}-labeled-input-${idx}`"
+                      :placeholder="valuePlaceholder"
+                      :disabled="isView || disabled"
+                      :rules="rules"
+                      :compact="false"
+                      :aria-label="a11yLabel ? `${a11yLabel} ${t('generic.ariaLabel.genericRow', {index: idx+1})}` : undefined"
+                      @paste="onPaste(idx, $event)"
+                      @update:value="queueUpdate"
+                    />
+                    <input
+                      v-else
+                      ref="value"
+                      v-model="row.value"
+                      :data-testid="`${componentTestid}-input-${idx}`"
+                      :placeholder="valuePlaceholder"
+                      :disabled="isView || disabled"
+                      :aria-label="a11yLabel ? `${a11yLabel} ${t('generic.ariaLabel.genericRow', {index: idx+1})}` : undefined"
+                      @paste="onPaste(idx, $event)"
+                    >
+                  </slot>
+                </div>
               </slot>
+              <div
+                v-if="showRemove && !isView"
+                class="remove"
+              >
+                <slot
+                  name="remove-button"
+                  :remove="() => remove(row, idx)"
+                  :i="idx"
+                  :row="row"
+                >
+                  <button
+                    type="button"
+                    :disabled="isView"
+                    class="btn role-link"
+                    :data-testid="`${componentTestid}-remove-item-${idx}`"
+                    :aria-label="t('generic.ariaLabel.remove', {index: idx+1})"
+                    role="button"
+                    @click="remove(row, idx)"
+                  >
+                    {{ _removeLabel }}
+                  </button>
+                </slot>
+              </div>
+              <slot
+                name="value-sub-row"
+                :row="row"
+                :mode="mode"
+                :isView="isView"
+              />
             </div>
-          </slot>
+          </template>
+          <div v-else>
+            <slot name="empty">
+              <div
+                v-if="mode==='view'"
+                class="text-muted"
+              >
+                &mdash;
+              </div>
+            </slot>
+          </div>
           <div
-            v-if="showRemove && !isView"
-            class="remove"
+            v-if="showAdd && !isView"
+            class="footer"
           >
             <slot
-              name="remove-button"
-              :remove="() => remove(row, idx)"
-              :i="idx"
-              :row="row"
+              v-if="showAdd"
+              name="add"
+              :add="add"
             >
               <button
                 type="button"
-                :disabled="isView"
-                class="btn role-link"
-                :data-testid="`${componentTestid}-remove-item-${idx}`"
-                :aria-label="t('generic.ariaLabel.remove', {index: idx+1})"
+                class="btn role-tertiary add"
+                :class="[addClass]"
+                :disabled="loading || disableAdd"
+                :data-testid="`${componentTestid}-button`"
+                :aria-label="_addLabel"
                 role="button"
-                @click="remove(row, idx)"
+                @click="add()"
               >
-                {{ _removeLabel }}
+                <i
+                  class="mr-5 icon"
+                  :class="loading ? ['icon-lg', 'icon-spinner','icon-spin']: [addIcon]"
+                />
+                {{ _addLabel }}
               </button>
             </slot>
           </div>
-          <slot
-            name="value-sub-row"
-            :row="row"
-            :mode="mode"
-            :isView="isView"
-          />
         </div>
-      </template>
-      <div v-else>
-        <slot name="empty">
-          <div
-            v-if="mode==='view'"
-            class="text-muted"
-          >
-            &mdash;
-          </div>
-        </slot>
       </div>
     </div>
+
   </div>
 </template>
 
@@ -444,13 +450,15 @@ export default {
   }
 
   .box {
-    display: grid;
-    grid-template-columns: auto $array-list-remove-margin;
-    align-items: center;
-    margin-bottom: 10px;
+    // display: grid;
+    // grid-template-columns: auto $array-list-remove-margin;
+    // align-items: center;
+    // margin-bottom: 10px;
+    display: flex;
     .value {
-      flex: 1;
+      // flex: 1;
       INPUT {
+        width: $input-width;
         height: $input-height;
         border: solid var(--border-width) var(--input-border);
         padding: 4px 11px;
@@ -462,9 +470,15 @@ export default {
   }
   .remove {
     text-align: right;
+    display: flex;
+    align-items: center;
+
+    button{
+      min-width: auto;
+    }
   }
   .footer {
-    margin-bottom: 24px;
+    margin-bottom: 20px;
     .protip {
       float: right;
       padding: 5px 0;
@@ -481,4 +495,7 @@ export default {
     margin-bottom: 10px;
   }
     
+  H3{
+    width: 160px;
+  }
 </style>

package/components/form/ArrayListGrouped.vue

@@ -120,15 +120,16 @@ export default {
 
 <style lang="scss">
 .array-list-grouped {
-    & > .box {
+    .box {
+      border: 0px solid var(--tabbed-border) !important;
       position: relative;
       display: block;
 
       & > .remove {
         position: absolute;
 
-        top: 10px;
-        right: 10px;
+        top: 0px !important;
+        right: 0px !important;
         & > .close{
           width: 32px;
           min-width: 32px !important;
@@ -140,6 +141,7 @@ export default {
       }
 
       & > .info-box {
+        border: 1px solid var(--tabbed-border) !important;
         margin-bottom: 0;
         padding-right: 25px;
       }

package/components/form/ChangePassword.vue

@@ -432,7 +432,7 @@ export default {
     }
 
     &.create, &.edit {
-      height: 185px;
+      height: 160px;
       .form {
         .fields {
           display: flex;

package/components/form/ClusterAppearance.vue

@@ -88,11 +88,12 @@ export default {
 <style lang="scss" scoped>
   .cluster-appearance {
     display: flex;
-    flex-direction: column;
-    margin: 3px 35px 0px 0px;
+    // flex-direction: column;
+    // align-items: center;
+    // margin: 3px 35px 0px 0px;
 
     label {
-      margin: 6px 0 0;
+      margin: 10px 10px 0 0;
     }
 
     &-preview {

package/components/form/Command.vue

@@ -146,9 +146,9 @@ export default {
       </div>
     </div>
 
-    <div class="row mt-20">
+    <div class="row">
       <div
-        class="col span-6"
+        class="span-6"
         data-testid="input-command-workingDir"
       >
         <LabeledInput
@@ -159,13 +159,13 @@ export default {
           @update:value="update"
         />
       </div>
-      <div class="col span-6">
+      <div class="span-6">
         <div
           :style="{ 'align-items': 'center' }"
           class="row"
         >
           <div
-            class="col span-6"
+            class="col"
             data-testid="input-command-stdin"
           >
             <LabeledSelect
@@ -191,7 +191,6 @@ export default {
         </div>
       </div>
     </div>
-    <div class="spacer" />
     <h3>{{ t('workload.container.titles.env') }}</h3>
     <EnvVars
       :mode="mode"

package/components/form/Conditions.vue

@@ -68,6 +68,20 @@ export default {
         };
       });
     },
+  },
+  methods: {
+    hans(row) {
+      const conditionMap = {
+      'DiskPressure': '磁盘压力',
+      'MemoryPressure': '内存压力',
+      'PIDPressure': '进程数压力',
+      'Ready': '就绪状态',
+      'EtcdIsVoter': 'Etcd投票成员',
+      'NetworkUnavailable': '网络不可用',
+    };
+    
+      return conditionMap[row.condition] || row.condition;
+    }
   }
 };
 </script>
@@ -83,7 +97,7 @@ export default {
     :search="false"
   >
     <template #cell:condition="{row}">
-      <span :class="{'text-error': row.error}">{{ row.condition }}</span>
+      <span :class="{'text-error': row.error}">{{ hans(row) }}</span>
     </template>
 
     <template #cell:status="{row}">

package/components/form/Footer.vue

@@ -105,6 +105,7 @@ export default defineComponent({
     .left {
       grid-area: left;
       text-align: left;
+      margin-right: 10px;
 
       .btn, button {
         margin: 0 $column-gutter 0 0;

package/components/form/HealthCheck.vue

@@ -56,7 +56,6 @@ export default {
         />
       </div>
     </div>
-    <div class="spacer" />
 
     <div>
       <div class="row">
@@ -70,7 +69,6 @@ export default {
         />
       </div>
     </div>
-    <div class="spacer" />
 
     <div class="row">
       <Probe