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

package/edit/monitoring.coreos.com.alertmanagerconfig/types/message.vue

@@ -0,0 +1,52 @@
+<template>
+  <div>
+    <div class="mb-20">
+      <LabeledInput
+        v-model:value="message"
+        :placeholder="'请输入手机号'"
+        :label="'默认手机人电话'"
+      />
+    </div>
+    <div class="mb-20">
+      <LabeledInput
+        v-model:value="id"
+        :placeholder="'API密钥ID'"
+        :label="'默认API密钥ID'"
+      />
+    </div>
+    <div class="mb-20">
+      <LabeledInput
+        v-model:value="scret"
+        :placeholder="'API密钥secret'"
+        :label="'默认API密钥secret'"
+      />
+    </div>
+    <div class="mb-20">
+      <LabeledInput
+        v-model:value="templateId"
+        :placeholder="'请输入模板ID'"
+        :label="'模板ID'"
+      />
+    </div>
+  </div>
+</template>
+<script>
+import { LabeledInput } from '@components/Form/LabeledInput';
+// import { ref } from 'vue';
+// const id = ref('');
+// const scret = ref('');
+// const message = ref('');
+// const templateId = ref('');
+
+export default {
+  components: { LabeledInput },
+  data() {
+    return {
+      message:    '',
+      id:         '',
+      scret:      '',
+      templateId: ''
+    };
+  }
+};
+</script>

package/edit/monitoring.coreos.com.alertmanagerconfig/types/snmp.vue

@@ -0,0 +1,45 @@
+<template>
+  <div>
+    <div class="mb-20">
+      <LabeledInput
+        v-model:value="message"
+        :placeholder="'目标主机'"
+        :label="'目标主机'"
+      />
+    </div>
+    <div class="mb-20">
+      <LabeledInput
+        v-model:value="id"
+        :placeholder="'端口'"
+        :label="'端口'"
+      />
+    </div>
+    <div class="mb-20">
+      <LabeledInput
+        v-model:value="scret"
+        :placeholder="'团体字'"
+        :label="'团体字'"
+      />
+    </div>
+  </div>
+</template>
+<script>
+import { LabeledInput } from '@components/Form/LabeledInput';
+// import { ref } from 'vue';
+// const id = ref('');
+// const scret = ref('');
+// const message = ref('');
+// const templateId = ref('');
+
+export default {
+  components: { LabeledInput },
+  data() {
+    return {
+      message:    '',
+      id:         '',
+      scret:      '',
+      templateId: ''
+    };
+  }
+};
+</script>

package/edit/monitoring.coreos.com.alertmanagerconfig/types/work.vue

@@ -0,0 +1,31 @@
+<template>
+  <div>
+    <div class="mb-20">
+      <LabeledInput
+        v-model:value="message"
+        :placeholder="'webhook地址'"
+        :label="'webhook地址'"
+      />
+    </div>
+  </div>
+</template>
+<script>
+import { LabeledInput } from '@components/Form/LabeledInput';
+// import { ref } from 'vue';
+// const id = ref('');
+// const scret = ref('');
+// const message = ref('');
+// const templateId = ref('');
+
+export default {
+  components: { LabeledInput },
+  data() {
+    return {
+      message:    '',
+      id:         '',
+      scret:      '',
+      templateId: ''
+    };
+  }
+};
+</script>

package/edit/networking.k8s.io.ingress/Certificate.vue

@@ -89,10 +89,10 @@ export default {
 
 <template>
   <div
-    class="cert row"
+    class="cert row mb-10"
     @update:value="update"
   >
-    <div class="col span-6">
+    <div>
       <LabeledSelect
         v-model:value="secretVal"
         class="secret-name"
@@ -107,7 +107,9 @@ export default {
         @update:value="onSecretInput"
       />
     </div>
-    <div class="col span-6">
+  </div>
+  <div class="row ingressBox">
+    <div style="padding-left: 160px;">
       <ArrayList
         :value="hosts"
         :add-label="t('ingress.certificates.addHost')"
@@ -127,6 +129,13 @@ export default {
   position: absolute;
 }
 
+.ingressBox 
+  :deep() .box {
+    border: 0px solid var(--tabbed-border);
+    >.remove {
+    top: 1px;
+  }
+}
 .cert {
   position: relative;
 
@@ -135,8 +144,8 @@ export default {
   }
 
   &:not(:last-of-type) {
-    padding-bottom: 10px;
-    margin-bottom: 30px;
+    // padding-bottom: 10px;
+    // margin-bottom: 30px;
   }
 }
 </style>

package/edit/networking.k8s.io.ingress/DefaultBackend.vue

@@ -96,7 +96,7 @@ export default {
       v-if="serviceName || !isView"
       class="row"
     >
-      <div class="col span-4">
+      <div class="col span-6">
         <LabeledSelect
           v-model:value="serviceName"
           :taggable="true"
@@ -111,7 +111,7 @@ export default {
         />
       </div>
       <div
-        class="col span-3"
+        class="col span-6"
         :style="{'margin-right': '0px'}"
       >
         <LabeledInput

package/edit/networking.k8s.io.ingress/Rule.vue

@@ -107,10 +107,10 @@ export default {
 
 <template>
   <div class="rule">
-    <div class="row mb-20">
+    <div class="row">
       <div
         id="host"
-        class="col span-6"
+        class="col"
       >
         <LabeledInput
           ref="host"
@@ -121,12 +121,8 @@ export default {
           @update:value="update"
         />
       </div>
-      <div
-        id="spacer"
-        class="col span-5"
-      />
     </div>
-    <div class="rule-path-headings row">
+    <!-- <div class="rule-path-headings row">
       <div
         class="col"
         :class="{'span-6': ingress.showPathType, 'span-4': !ingress.showPathType}"
@@ -134,20 +130,18 @@ export default {
         <label>{{ t("ingress.rules.path.label") }}</label>
       </div>
       <div
-        class="col"
         :class="{'span-3': ingress.showPathType, 'span-4': !ingress.showPathType}"
       >
         <label>{{ t("ingress.rules.target.label") }}</label>
       </div>
       <div
-        class="col"
         :class="{'span-2': ingress.showPathType, 'span-3': !ingress.showPathType}"
         :style="{ 'margin-right': '0px' }"
       >
         <label>{{ t("ingress.rules.port.label") }}</label>
       </div>
       <div class="col" />
-    </div>
+    </div> -->
     <template
       v-for="(path, i) in paths"
       :key="path.id"
@@ -155,7 +149,7 @@ export default {
       <RulePath
         ref="paths"
         v-model:value="paths[i]"
-        class="row mb-10"
+        class="row"
         :rule-mode="ruleMode"
         :service-targets="serviceTargets"
         :ingress="ingress"

package/edit/networking.k8s.io.ingress/RulePath.vue

@@ -107,118 +107,127 @@ export default {
 };
 </script>
 <template>
-  <div class="rule-path row">
-    <div
-      v-if="ingress.showPathType"
-      class="col span-6"
-    >
-      <InputWithSelect
-        ref="first"
-        class="path-type"
-        :options="pathTypes"
-        :placeholder="t('ingress.rules.path.placeholder', undefined, true)"
-        :select-value="value.pathType"
-        :text-value="value.path"
-        :searchable="false"
-        :text-rules="rules.path"
-        @update:value="queueUpdatePathTypeAndPath"
-      />
-    </div>
-    <div
-      v-else
-      class="col span-4"
-    >
-      <input
-        ref="first"
-        v-model="path"
-        :placeholder="t('ingress.rules.path.placeholder', undefined, true)"
-        @input="queueUpdate"
+  <div class="rule-path" style="display: block;">
+    <div class="row">
+      <button
+        class="btn btn-sm role-link remove"
+        @click="remove"
       >
+        {{ t('ingress.rules.removePath') }}
+      </button>
+    </div>
+    <div class="flex col">
+      <div class="label">{{ t("ingress.rules.target.label") }}</div>
+      <div class="service" style="width: 400px;">
+        <Select
+          v-model:value="serviceName"
+          :options="serviceTargets"
+          :status="serviceTargetStatus"
+          :taggable="true"
+          :searchable="true"
+          :tooltip="serviceTargetTooltip"
+          :hover-tooltip="true"
+          @update:value="servicePort = ''; queueUpdate();"
+        />
+      </div>
     </div>
-    <div
-      class="col"
-      :class="{'span-3': ingress.showPathType, 'span-4': !ingress.showPathType}"
-    >
-      <Select
-        v-model:value="serviceName"
-        :options="serviceTargets"
-        :status="serviceTargetStatus"
-        :taggable="true"
-        :searchable="true"
-        :tooltip="serviceTargetTooltip"
-        :hover-tooltip="true"
-        @update:value="servicePort = ''; queueUpdate();"
-      />
+    <div class="flex col">
+      <div class="label">{{ t("ingress.rules.port.label") }}</div>
+      <div>
+        <LabeledInput
+          v-if="portOptions.length === 0"
+          v-model:value="servicePort"
+          class="fullHeightInput"
+          :placeholder="t('ingress.rules.port.placeholder')"
+          :rules="rules.port"
+          @update:value="queueUpdate"
+        />
+        <Select
+          v-else
+          v-model:value="servicePort"
+          :options="portOptions"
+          :placeholder="t('ingress.rules.port.placeholder')"
+          :rules="rules.port"
+          @update:value="queueUpdate"
+        />
+      </div>
     </div>
-    <div
-      class="col"
-      :class="{'span-2': ingress.showPathType, 'span-3': !ingress.showPathType}"
-      :style="{'margin-right': '0px'}"
-    >
-      <LabeledInput
-        v-if="portOptions.length === 0"
-        v-model:value="servicePort"
-        class="fullHeightInput"
-        :placeholder="t('ingress.rules.port.placeholder')"
-        :rules="rules.port"
-        @update:value="queueUpdate"
-      />
-      <Select
-        v-else
-        v-model:value="servicePort"
-        :options="portOptions"
-        :placeholder="t('ingress.rules.port.placeholder')"
-        :rules="rules.port"
-        @update:value="queueUpdate"
-      />
+    <div class="flex" :style="{marginBottom: !ingress.showPathType ? '24px': '' }">
+      <div class="label">
+        <div style="padding-bottom: 43px;" v-if="ingress.showPathType">
+          匹配模式
+        </div>
+        <div :style="{paddingBottom: ingress.showPathType ? '15px' : ''}">
+          {{ t("ingress.rules.path.label") }}
+        </div>
+      </div>
+      <div
+        v-if="ingress.showPathType"
+        class="path_row"
+      >
+        <InputWithSelect
+          ref="first"
+          class="path-type"
+          :options="pathTypes"
+          :placeholder="t('ingress.rules.path.placeholder', undefined, true)"
+          :select-value="value.pathType"
+          :text-value="value.path"
+          :searchable="false"
+          :text-rules="rules.path"
+          @update:value="queueUpdatePathTypeAndPath"
+        />
+      </div>
+      <div v-else class="path_row2">
+        <input
+          ref="first"
+          v-model="path"
+          :placeholder="t('ingress.rules.path.placeholder', undefined, true)"
+          @input="queueUpdate"
+        >
+      </div>
     </div>
-    <button
-      class="btn btn-sm role-link col"
-      @click="remove"
-    >
-      {{ t('ingress.rules.removePath') }}
-    </button>
   </div>
 </template>
 <style lang="scss" scoped>
 // TODO #11952: Correct deep statement
-$row-height: 40px;
-.rule-path {
-  :deep(.labeled-input) {
-    padding: 0 !important;
-    height: 100%;
-
-    input.no-label {
-      height: calc($row-height - 2px);
-      padding: 10px;
-    }
-  }
-
-  :deep(.col), INPUT {
-    height: $row-height;
+::v-deep .input-container{
+  display: flex !important;
+  .unlabeled-select{
+    height: 34px !important;
   }
-  &, :deep(.input-container) {
-    height: $row-height;
+  .in-input.unlabeled-select{
+    margin-right: -1px;
+    margin-bottom: 24px;
+    width: 400px;
   }
+}
 
-  :deep(.input-container) :deep(.in-input.unlabeled-select) {
-    width: initial;
-  }
+.flex{
+  display: flex;
+  align-items: center;
 
-  button {
-    line-height: $row-height;
+  .label{
+    min-width: 160px;
   }
+}
 
-  :deep(.v-select) INPUT {
-    height: 50px;
-  }
-  :deep(.labeled-input) {
-    padding-top: 6px;
+::v-deep .path_row{
+  width: 800px;
+  .input-container{
+    flex-direction: column;
   }
 
-  :deep(.unlabeled-select) {
-    height: 100%;
-    min-width: 200px;
+  .labeled-container{
+    width: 0px !important;
   }
 }
+
+.path_row2{
+  width: 400px;
+}
+
+.remove{
+  padding: 0px;
+  min-width: auto;
+}
 </style>

package/edit/networking.k8s.io.networkpolicy/PolicyRule.vue

@@ -40,8 +40,8 @@ export default {
 
 <template>
   <div class="rule">
-    <div class="row mb-40">
-      <div class="col span-12">
+    <div class="row">
+      <div class="span-12">
         <h2>
           {{ t(`networkpolicy.${type}.ruleLabel`) }}
           <i
@@ -68,7 +68,7 @@ export default {
         </ArrayListGrouped>
       </div>
     </div>
-    <div class="row mb-20">
+    <div class="row">
       <div class="col span-12">
         <h2>
           {{ t('networkpolicy.rules.ports.label') }}

package/edit/networking.k8s.io.networkpolicy/PolicyRulePort.vue

@@ -26,7 +26,7 @@ export default {
 
 <template>
   <div class="row">
-    <div class="col span-4">
+    <div class="col">
       <LabeledInput
         v-model:value.number="value.port"
         :mode="mode"
@@ -37,7 +37,9 @@ export default {
         :label="t('networkpolicy.rules.ports.port.label')"
       />
     </div>
-    <div class="col span-4">
+  </div>
+  <div class="row">
+    <div class="col">
       <LabeledSelect
         v-model:value="value.protocol"
         :mode="mode"

package/edit/networking.k8s.io.networkpolicy/PolicyRuleTarget.vue

@@ -221,8 +221,8 @@ export default {
 
 <template>
   <div class="rule">
-    <div class="row mb-20">
-      <div class="col span-6">
+    <div class="row">
+      <div class="col">
         <LabeledSelect
           v-model:value="targetType"
           data-testid="policy-rule-target-type-labeled-select"
@@ -236,7 +236,7 @@ export default {
     </div>
     <div v-if="targetType === TARGET_OPTIONS.IP_BLOCK">
       <div class="row">
-        <div class="col span-6">
+        <div class="col">
           <LabeledInput
             v-model:value="value[TARGET_OPTIONS.IP_BLOCK].cidr"
             data-testid="labeled-input-ip-block-selector"
@@ -250,14 +250,15 @@ export default {
         v-if="invalidCidr"
         class="row"
       >
-        <div class="col span-12">
+        <div class="col">
           <Banner color="error">
             <t k="networkpolicy.rules.ipBlock.invalidCidr" />
           </Banner>
         </div>
       </div>
-      <div class="row mt-20">
-        <div class="col span-12">
+      <div class="row">
+        <div class="col" style="display: flex;">
+          <div style="min-width: 160px;"></div>
           <ArrayList
             v-model:value="value[TARGET_OPTIONS.IP_BLOCK].except"
             :add-label="t('networkpolicy.rules.ipBlock.addExcept')"
@@ -281,7 +282,7 @@ export default {
     </div>
     <div v-if="targetType === TARGET_OPTIONS.POD_SELECTOR">
       <div class="row">
-        <div class="col span-12">
+        <div class="span-12">
           <Banner color="success">
             <span v-clean-html="t('networkpolicy.selectors.matchingPods.matchesSome', matchingPods)" />
           </Banner>
@@ -302,7 +303,7 @@ export default {
     </div>
     <div v-if="targetType === TARGET_OPTIONS.NAMESPACE_SELECTOR">
       <div class="row">
-        <div class="col span-12">
+        <div class="span-12">
           <Banner color="success">
             <span
               v-clean-html="t('networkpolicy.selectors.matchingNamespaces.matchesSome', matchingNamespaces)"
@@ -326,7 +327,7 @@ export default {
     </div>
     <div v-if="targetType === TARGET_OPTIONS.NAMESPACE_AND_POD_SELECTOR">
       <div class="row">
-        <div class="col span-12">
+        <div class="span-12">
           <Banner color="success">
             <span
               v-if="!namespaceSelectorExpressions.length"
@@ -345,7 +346,7 @@ export default {
             {{ t('networkpolicy.rules.namespace') }}
           </span>
         </div>
-        <div class="col span-11">
+        <div class="col">
           <MatchExpressions
             v-model:value="namespaceSelectorExpressions"
             data-testid="match-expression-namespace-and-pod-selector-ns-rule"
@@ -364,7 +365,7 @@ export default {
             {{ t('networkpolicy.rules.pod') }}
           </span>
         </div>
-        <div class="col span-11">
+        <div class="col">
           <MatchExpressions
             v-model:value="podSelectorExpressions"
             data-testid="match-expression-namespace-and-pod-selector-pod-rule"

package/edit/networking.k8s.io.networkpolicy/index.vue

@@ -252,7 +252,7 @@ export default {
               </div>
             </div>
             <div class="row">
-              <div class="col span-12">
+              <div class="span-12">
                 <Banner color="success">
                   <span v-clean-html="t('networkpolicy.selectors.matchingPods.matchesSome', matchingPods)" />
                 </Banner>

package/edit/persistentvolume/index.vue

@@ -298,7 +298,7 @@ export default {
         :label="t('persistentVolume.customize.label')"
         :weight="0"
       >
-        <div class="row mb-20">
+        <div class="row">
           <div class="col span-6">
             <h3>{{ t('persistentVolume.customize.accessModes.label') }}</h3>
             <div>
@@ -323,6 +323,8 @@ export default {
               />
             </div>
           </div>
+        </div>
+        <div class="row">
           <div class="col span-6">
             <ArrayList
               v-model:value="value.spec.mountOptions"

package/edit/persistentvolumeclaim.vue

@@ -257,6 +257,8 @@ export default {
               @update:value="updateDefaults"
             />
           </div>
+        </div>
+        <div class="row">
           <div class="col span-6">
             <div class="row">
               <div

package/edit/provisioning.cattle.io.cluster/tabs/Basics.vue

@@ -704,6 +704,6 @@ export default {
 
 <style lang="scss" scoped>
   .patch-version {
-    margin-top: 5px;
+    margin-top: 10px;
   }
 </style>

package/edit/secret/index.vue

@@ -444,7 +444,7 @@ export default {
         v-if="isCustomSecretCreate"
         class="row"
       >
-        <div class="col span-3">
+        <div class="col span-6">
           <LabeledSelect
             v-model:value="secretType"
             :options="secretTypes"
@@ -458,7 +458,7 @@ export default {
           />
         </div>
 
-        <div class="col span-3">
+        <div class="col span-6">
           <LabeledInput
             v-if="showCustomSecretType"
             ref="customType"