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

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

@@ -74,8 +74,8 @@ export default {
         <h3>{{ t('logging.output.sections.target') }}</h3>
       </div>
     </div>
-    <div class="row mb-10">
-      <div class="col span-2">
+    <div class="row">
+      <div class="col span-6">
         <LabeledSelect
           v-model:value="value.scheme"
           :mode="mode"
@@ -85,7 +85,7 @@ export default {
           :label="t('logging.elasticsearch.scheme')"
         />
       </div>
-      <div class="col span-8">
+      <div class="col span-6">
         <LabeledInput
           v-model:value="value.host"
           :mode="mode"
@@ -94,7 +94,7 @@ export default {
           :label="t('logging.elasticsearch.host')"
         />
       </div>
-      <div class="col span-2">
+      <div class="col span-6">
         <LabeledInput
           v-model:value.number="port"
           :mode="mode"
@@ -123,8 +123,8 @@ export default {
         <h3>{{ t('logging.output.sections.access') }}</h3>
       </div>
     </div>
-    <div class="row">
-      <div class="col span-6">
+    <div>
+      <div>
         <LabeledInput
           v-model:value="value.user"
           :mode="mode"
@@ -132,7 +132,7 @@ export default {
           :label="t('logging.elasticsearch.user')"
         />
       </div>
-      <div class="col span-6">
+      <div>
         <SecretSelector
           v-model:value="value.password"
           :secret-name-label="t('logging.elasticsearch.password')"
@@ -149,8 +149,8 @@ export default {
         <h3>{{ t('logging.output.sections.certificate') }}</h3>
       </div>
     </div>
-    <div class="row mb-10">
-      <div class="col span-6">
+    <div>
+      <div>
         <SecretSelector
           v-model:value="value.ca_file"
           mount-key="mountFrom"
@@ -161,7 +161,7 @@ export default {
           :show-key-selector="true"
         />
       </div>
-      <div class="col span-6">
+      <div>
         <SecretSelector
           v-model:value="value.client_cert"
           mount-key="mountFrom"
@@ -173,8 +173,8 @@ export default {
         />
       </div>
     </div>
-    <div class="row">
-      <div class="col span-6">
+    <div>
+      <div>
         <SecretSelector
           v-model:value="value.client_key"
           mount-key="mountFrom"
@@ -185,7 +185,7 @@ export default {
           :show-key-selector="true"
         />
       </div>
-      <div class="col span-6">
+      <div>
         <SecretSelector
           v-model:value="value.client_key_pass"
           :mode="mode"
@@ -196,7 +196,7 @@ export default {
         />
       </div>
     </div>
-    <div class="row mb-10">
+    <div class="row">
       <div class="col span-6 vertically-center">
         <Checkbox
           v-model:value="value.ssl_verify"

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

@@ -55,8 +55,8 @@ export default {
         <h3>{{ t('logging.output.sections.target') }}</h3>
       </div>
     </div>
-    <div class="row mb-10">
-      <div class="col span-8">
+    <div class="row">
+      <div class="col span-6">
         <LabeledInput
           v-model:value="value.host"
           :mode="mode"
@@ -65,7 +65,7 @@ export default {
           :label="t('logging.redis.host')"
         />
       </div>
-      <div class="col span-2">
+      <div class="col span-6">
         <LabeledInput
           v-model:value.number="port"
           :mode="mode"
@@ -104,7 +104,7 @@ export default {
         <h3>{{ t('logging.redis.format.title') }}</h3>
       </div>
     </div>
-    <div class="row mb-10">
+    <div class="row">
       <div class="col span-6">
         <LabeledSelect
           v-model:value="value.format.type"
@@ -121,8 +121,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.password"
           :secret-name-label="t('logging.elasticsearch.password')"

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

@@ -47,39 +47,39 @@ 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.s3_endpoint"
-          :mode="mode"
-          :disabled="disabled"
-          :label="t('logging.s3.endpoint')"
+        <LabeledInput
+          v-model:value="value.s3_endpoint"
+          :mode="mode"
+          :disabled="disabled"
+          :label="t('logging.s3.endpoint')"
         />
       </div>
       <div class="col span-6">
-        <LabeledInput
-          v-model:value="value.s3_bucket"
-          :mode="mode"
-          :disabled="disabled"
-          :label="t('logging.s3.bucket')"
+        <LabeledInput
+          v-model:value="value.s3_bucket"
+          :mode="mode"
+          :disabled="disabled"
+          :label="t('logging.s3.bucket')"
         />
       </div>
     </div>
     <div class="row">
       <div class="col span-6">
-        <LabeledInput
-          v-model:value="value.path"
-          :mode="mode"
-          :disabled="disabled"
-          :label="t('logging.s3.path')"
+        <LabeledInput
+          v-model:value="value.path"
+          :mode="mode"
+          :disabled="disabled"
+          :label="t('logging.s3.path')"
         />
       </div>
       <div class="col span-6 overwrite">
-        <Checkbox
-          v-model:value="overwrite"
-          :mode="mode"
-          :disabled="disabled"
-          :label="t('logging.s3.overwriteExistingPath')"
+        <Checkbox
+          v-model:value="overwrite"
+          :mode="mode"
+          :disabled="disabled"
+          :label="t('logging.s3.overwriteExistingPath')"
         />
       </div>
     </div>
@@ -90,7 +90,7 @@ export default {
       </div>
     </div>
     <div class="row">
-      <div class="col span-6">
+      <div class="col span-12">
         <SecretSelector
           v-model:value="value.aws_key_id"
           :mode="mode"
@@ -100,7 +100,7 @@ export default {
           :show-key-selector="true"
         />
       </div>
-      <div class="col span-6">
+      <div class="col span-12">
         <SecretSelector
           v-model:value="value.aws_sec_key"
           :mode="mode"

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

@@ -51,8 +51,8 @@ export default {
   <div class="splunk">
     <div>
       <h3>{{ t('logging.output.sections.target') }}</h3>
-      <div class="row mb-10">
-        <div class="col span-2">
+      <div class="row">
+        <div class="col span-6">
           <LabeledSelect
             v-model:value="value.protocol"
             :mode="mode"
@@ -61,7 +61,7 @@ export default {
             :label="t('logging.splunk.protocol')"
           />
         </div>
-        <div class="col span-8">
+        <div class="col span-6">
           <LabeledInput
             v-model:value="value.hec_host"
             :mode="mode"
@@ -69,7 +69,7 @@ export default {
             :label="t('logging.splunk.host')"
           />
         </div>
-        <div class="col span-2">
+        <div class="col span-6">
           <LabeledInput
             v-model:value="port"
             :mode="mode"
@@ -103,8 +103,8 @@ export default {
     <div class="spacer" />
     <div>
       <h3>{{ t('logging.output.sections.access') }}</h3>
-      <div class="row">
-        <div class="col span-6">
+      <div>
+        <div>
           <SecretSelector
             v-model:value="value.hec_token"
             :mode="mode"
@@ -118,7 +118,7 @@ export default {
     </div>
     <div class="spacer" />
     <h3>{{ t('logging.output.sections.certificate') }}</h3>
-    <div class="row mb-10">
+    <div class="row">
       <div class="col span-6">
         <Checkbox
           v-model:value="value.insecure_ssl"
@@ -128,8 +128,8 @@ export default {
         />
       </div>
     </div>
-    <div class="row mb-10">
-      <div class="col span-6">
+    <div>
+      <div>
         <SecretSelector
           v-model:value="value.ca_file"
           mount-key="mountFrom"
@@ -140,7 +140,7 @@ export default {
           :show-key-selector="true"
         />
       </div>
-      <div class="col span-6">
+      <div>
         <SecretSelector
           v-model:value="value.ca_path"
           mount-key="mountFrom"
@@ -152,8 +152,8 @@ export default {
         />
       </div>
     </div>
-    <div class="row">
-      <div class="col span-6">
+    <div>
+      <div>
         <SecretSelector
           v-model:value="value.client_cert"
           mount-key="mountFrom"
@@ -164,7 +164,7 @@ export default {
           :show-key-selector="true"
         />
       </div>
-      <div class="col span-6">
+      <div>
         <SecretSelector
           v-model:value="value.client_key"
           mount-key="mountFrom"

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

@@ -35,7 +35,7 @@ export default {
       </div>
     </div>
     <div class="row">
-      <div class="col span-6">
+      <div class="col span-12">
         <LabeledInput
           v-model:value="value.source_name"
           class="source-name"
@@ -44,7 +44,7 @@ export default {
           :label="t('logging.sumologic.sourceName')"
         />
       </div>
-      <div class="col span-6">
+      <div class="col span-12">
         <SecretSelector
           v-model:value="value.endpoint"
           :mode="mode"

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

@@ -67,15 +67,15 @@ export default {
       </div>
     </div>
     <div class="row">
-      <div class="col span-8">
-        <LabeledInput
-          v-model:value="value.host"
-          :mode="mode"
-          :disabled="disabled"
-          :label="t('logging.syslog.host')"
+      <div class="col span-6">
+        <LabeledInput
+          v-model:value="value.host"
+          :mode="mode"
+          :disabled="disabled"
+          :label="t('logging.syslog.host')"
         />
       </div>
-      <div class="col span-4">
+      <div class="col span-6">
         <LabeledInput
           v-model:value="port"
           :mode="mode"
@@ -92,7 +92,7 @@ export default {
         <h3>{{ t('logging.output.sections.certificate') }}</h3>
       </div>
     </div>
-    <div class="row mb-10">
+    <div class="row">
       <div class="col span-6">
         <LabeledSelect
           v-model:value="value.transport"
@@ -103,16 +103,16 @@ export default {
         />
       </div>
       <div class="col span-6 insecure">
-        <Checkbox
-          v-model:value="value.insecure"
-          :mode="mode"
-          :disabled="disabled"
-          :label="t('logging.syslog.insecure')"
+        <Checkbox
+          v-model:value="value.insecure"
+          :mode="mode"
+          :disabled="disabled"
+          :label="t('logging.syslog.insecure')"
         />
       </div>
     </div>
-    <div class="row mb-10">
-      <div class="col span-6">
+    <div class="row">
+      <div class="col span-12">
         <SecretSelector
           v-model:value="value.trusted_ca_path"
           mount-key="mountFrom"
@@ -130,7 +130,7 @@ export default {
         <h3>{{ t('logging.syslog.format.title') }}</h3>
       </div>
     </div>
-    <div class="row mb-10">
+    <div class="row">
       <div class="col span-6">
         <LabeledSelect
           v-model:value="value.format.type"
@@ -149,21 +149,21 @@ export default {
     </div>
     <div class="row mb-20">
       <div class="col span-6">
-        <LabeledInput
-          v-model:value="value.buffer.tags"
-          :mode="mode"
-          :disabled="disabled"
-          :label="t('logging.syslog.buffer.tags')"
+        <LabeledInput
+          v-model:value="value.buffer.tags"
+          :mode="mode"
+          :disabled="disabled"
+          :label="t('logging.syslog.buffer.tags')"
         />
       </div>
     </div>
-    <div class="row mb-10">
+    <div class="row">
       <div class="col span-6">
-        <LabeledInput
-          v-model:value="value.buffer.chunk_limit_size"
-          :mode="mode"
-          :disabled="disabled"
-          :label="t('logging.syslog.buffer.chunkLimitSize')"
+        <LabeledInput
+          v-model:value="value.buffer.chunk_limit_size"
+          :mode="mode"
+          :disabled="disabled"
+          :label="t('logging.syslog.buffer.chunkLimitSize')"
         />
       </div>
       <div class="col span-6">
@@ -178,49 +178,49 @@ export default {
     </div>
     <div class="row mb-20">
       <div class="col span-6">
-        <LabeledInput
-          v-model:value="value.buffer.total_limit_size"
-          :mode="mode"
-          :disabled="disabled"
-          :label="t('logging.syslog.buffer.totalLimitSize')"
+        <LabeledInput
+          v-model:value="value.buffer.total_limit_size"
+          :mode="mode"
+          :disabled="disabled"
+          :label="t('logging.syslog.buffer.totalLimitSize')"
         />
       </div>
     </div>
     <div class="row mb-20">
       <div class="col span-6">
-        <LabeledInput
-          v-model:value="value.buffer.flush_interval"
-          :mode="mode"
-          :disabled="disabled"
-          :label="t('logging.syslog.buffer.flushInterval')"
+        <LabeledInput
+          v-model:value="value.buffer.flush_interval"
+          :mode="mode"
+          :disabled="disabled"
+          :label="t('logging.syslog.buffer.flushInterval')"
         />
       </div>
     </div>
-    <div class="row mb-10">
+    <div class="row">
       <div class="col span-6">
-        <LabeledInput
-          v-model:value="value.buffer.timekey"
-          :mode="mode"
-          :disabled="disabled"
-          :label="t('logging.syslog.buffer.timekey')"
+        <LabeledInput
+          v-model:value="value.buffer.timekey"
+          :mode="mode"
+          :disabled="disabled"
+          :label="t('logging.syslog.buffer.timekey')"
         />
       </div>
       <div class="col span-6">
-        <LabeledInput
-          v-model:value="value.buffer.timekey_wait"
-          :mode="mode"
-          :disabled="disabled"
-          :label="t('logging.syslog.buffer.timekeyWait')"
+        <LabeledInput
+          v-model:value="value.buffer.timekey_wait"
+          :mode="mode"
+          :disabled="disabled"
+          :label="t('logging.syslog.buffer.timekeyWait')"
         />
       </div>
     </div>
-    <div class="row mb-10">
+    <div class="row">
       <div class="col span-6">
-        <Checkbox
-          v-model:value="value.buffer.timekey_use_utc"
-          :mode="mode"
-          :disabled="disabled"
-          :label="t('logging.syslog.buffer.timekeyUseUTC')"
+        <Checkbox
+          v-model:value="value.buffer.timekey_use_utc"
+          :mode="mode"
+          :disabled="disabled"
+          :label="t('logging.syslog.buffer.timekeyUseUTC')"
         />
       </div>
     </div>

package/edit/management.cattle.io.user.vue

@@ -214,7 +214,11 @@ export default {
 </script>
 
 <template>
+
+  <!-- 如果没有获取到 value 数据，则显示加载组件 -->
   <Loading v-if="!value" />
+
+  <!-- 如果有数据，则进入资源编辑/创建的表单界面 -->
   <CruResource
     v-else
     :done-route="doneRoute"
@@ -226,10 +230,14 @@ export default {
     class="create-edit"
     @finish="save"
   >
+
+    <!-- 账户凭据区域 -->
     <div class="credentials">
       <h2> {{ t("user.edit.credentials.label") }}</h2>
+
+      <!-- 用户名 & 显示名 -->
       <div class="row">
-        <div class="col span-4">
+        <div class="col span-6">
           <LabeledInput
             ref="name"
             v-model:value="form.username"
@@ -241,7 +249,7 @@ export default {
             :ignore-password-managers="!isCreate"
           />
         </div>
-        <div class="col span-4">
+        <div class="col span-6">
           <LabeledInput
             v-model:value="form.displayName"
             label-key="user.edit.credentials.displayName.label"
@@ -250,8 +258,10 @@ export default {
           />
         </div>
       </div>
-      <div class="row mt-20 mb-10">
-        <div class="col span-8">
+
+      <!-- 用户描述 -->
+      <div class="row">
+        <div class="col span-6">
           <LabeledInput
             v-model:value="form.description"
             label-key="user.edit.credentials.userDescription.label"
@@ -261,6 +271,7 @@ export default {
         </div>
       </div>
 
+      <!-- 修改密码（仅非查看模式显示） -->
       <ChangePassword
         v-if="!isView"
         ref="changePassword"
@@ -270,6 +281,8 @@ export default {
         @valid="validation.password = $event"
       />
     </div>
+
+    <!-- 全局角色绑定区域（仅当 showGlobalRoles 为 true 时显示） -->
     <div
       v-if="showGlobalRoles"
       class="global-permissions"

package/edit/monitoring.coreos.com.alertmanagerconfig/auth.vue

@@ -243,14 +243,14 @@ export default {
           v-model:value="authType"
           :disabled="mode === view"
           :options="authOptions"
-          label="Auth Type"
+          label="验证类型"
           @update:value="initializeType(authOptions, authType)"
         />
       </div>
     </div>
-    <div
-      v-if="authType === 'basicAuth'"
-      class="row mb-20"
+    <div
+      v-if="authType === 'basicAuth'"
+      class="row mb-20"
     >
       <SimpleSecretSelector
         v-if="namespace"
@@ -265,16 +265,16 @@ export default {
         @updateSecretName="updateBasicAuthUsernameSecretName"
         @updateSecretKey="updateBasicAuthUsernameSecretKey"
       />
-      <Banner
-        v-else
-        color="error"
+      <Banner
+        v-else
+        color="error"
       >
         {{ t("alertmanagerConfigReceiver.namespaceWarning") }}
       </Banner>
     </div>
-    <div
-      v-if="authType === 'basicAuth'"
-      class="row mb-20"
+    <div
+      v-if="authType === 'basicAuth'"
+      class="row mb-20"
     >
       <SimpleSecretSelector
         v-if="namespace"
@@ -289,16 +289,16 @@ export default {
         @updateSecretName="updateBasicAuthPasswordSecretName"
         @updateSecretKey="updateBasicAuthPasswordSecretKey"
       />
-      <Banner
-        v-else
-        color="error"
+      <Banner
+        v-else
+        color="error"
       >
         {{ t("alertmanagerConfigReceiver.namespaceWarning") }}
       </Banner>
     </div>
-    <div
-      v-if="authType === 'bearerTokenSecret'"
-      class="row mb-20"
+    <div
+      v-if="authType === 'bearerTokenSecret'"
+      class="row mb-20"
     >
       <SimpleSecretSelector
         v-if="namespace"
@@ -313,9 +313,9 @@ export default {
         @updateSecretName="updateBearerTokenSecretName"
         @updateSecretKey="updateBearerTokenSecretKey"
       />
-      <Banner
-        v-else
-        color="error"
+      <Banner
+        v-else
+        color="error"
       >
         {{ t("alertmanagerConfigReceiver.namespaceWarning") }}
       </Banner>