From 4f86c9700d59e403e69c739ef0b7cd6851fe90bb Mon Sep 17 00:00:00 2001
From: awenes <1121353141@qq.com>
Date: Sat, 6 Apr 2024 19:32:37 +0800
Subject: [PATCH] =?UTF-8?q?:zap:=20=E4=BC=98=E5=8C=96=E5=AD=98=E5=82=A8?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/setting/Storage/StorageProvider.tsx | 76 ++++++++++---------
 .../Storage/components/AliCloud/index.tsx     |  4 +-
 .../Storage/components/MinIo/index.tsx        | 28 ++++---
 .../setting/Storage/components/S3/index.tsx   | 56 +++++++-------
 .../Storage/components/Tencent/index.tsx      |  4 +-
 5 files changed, 88 insertions(+), 80 deletions(-)

diff --git a/eiam-console/src/main/console-fe/src/pages/setting/Storage/StorageProvider.tsx b/eiam-console/src/main/console-fe/src/pages/setting/Storage/StorageProvider.tsx
index 5763ea9b..3208b641 100644
--- a/eiam-console/src/main/console-fe/src/pages/setting/Storage/StorageProvider.tsx
+++ b/eiam-console/src/main/console-fe/src/pages/setting/Storage/StorageProvider.tsx
@@ -22,7 +22,7 @@ import {
   PageContainer,
   ProCard,
   ProForm,
-  ProFormSelect,
+  ProFormSegmented,
   ProFormSwitch,
 } from '@ant-design/pro-components';
 import { useAsyncEffect } from 'ahooks';
@@ -159,7 +159,7 @@ const Storage = () => {
                 form.setFieldsValue({ enabled, provider });
               }}
               submitter={{
-                render: (p, dom) => {
+                render: (_p, dom) => {
                   return (
                     <Form.Item {...tailFormItemLayout}>
                       <Space>{dom}</Space>
@@ -191,16 +191,16 @@ const Storage = () => {
             >
               {enabled && (
                 <>
-                  <ProFormSelect
+                  <ProFormSegmented
                     name="provider"
                     label={intl.formatMessage({
                       id: 'pages.setting.storage_provider.provider',
                     })}
                     rules={[{ required: true }]}
                     fieldProps={{
-                      onChange: async (value: string) => {
+                      onChange: async (value) => {
                         setLoading(true);
-                        setProvider(value);
+                        setProvider(value as string);
                         form.resetFields();
                         form.setFieldsValue({
                           provider: value,
@@ -215,38 +215,40 @@ const Storage = () => {
                         setLoading(false);
                       },
                     }}
-                    options={[
-                      {
-                        value: OssProvider.ALIYUN_OSS,
-                        label: intl.formatMessage({
-                          id: 'pages.setting.storage_provider.provider.aliyun_oss',
-                        }),
-                      },
-                      {
-                        value: OssProvider.TENCENT_COS,
-                        label: intl.formatMessage({
-                          id: 'pages.setting.storage_provider.provider.tencent_cos',
-                        }),
-                      },
-                      {
-                        value: OssProvider.QINIU_KODO,
-                        label: intl.formatMessage({
-                          id: 'pages.setting.storage_provider.provider.qiniu_kodo',
-                        }),
-                      },
-                      {
-                        value: OssProvider.MINIO,
-                        label: intl.formatMessage({
-                          id: 'pages.setting.storage_provider.provider.minio',
-                        }),
-                      },
-                      {
-                        value: OssProvider.S3,
-                        label: intl.formatMessage({
-                          id: 'pages.setting.storage_provider.provider.s3',
-                        }),
-                      },
-                    ]}
+                    request={async () => {
+                      return [
+                        {
+                          value: OssProvider.ALIYUN_OSS,
+                          label: intl.formatMessage({
+                            id: 'pages.setting.storage_provider.provider.aliyun_oss',
+                          }),
+                        },
+                        {
+                          value: OssProvider.TENCENT_COS,
+                          label: intl.formatMessage({
+                            id: 'pages.setting.storage_provider.provider.tencent_cos',
+                          }),
+                        },
+                        {
+                          value: OssProvider.QINIU_KODO,
+                          label: intl.formatMessage({
+                            id: 'pages.setting.storage_provider.provider.qiniu_kodo',
+                          }),
+                        },
+                        {
+                          value: OssProvider.MINIO,
+                          label: intl.formatMessage({
+                            id: 'pages.setting.storage_provider.provider.minio',
+                          }),
+                        },
+                        {
+                          value: OssProvider.S3,
+                          label: intl.formatMessage({
+                            id: 'pages.setting.storage_provider.provider.s3',
+                          }),
+                        },
+                      ];
+                    }}
                   />
                   {provider === OssProvider.ALIYUN_OSS && <AliCloudOss />}
                   {provider === OssProvider.TENCENT_COS && <TencentCos />}
diff --git a/eiam-console/src/main/console-fe/src/pages/setting/Storage/components/AliCloud/index.tsx b/eiam-console/src/main/console-fe/src/pages/setting/Storage/components/AliCloud/index.tsx
index 8ab270e2..b3a87185 100644
--- a/eiam-console/src/main/console-fe/src/pages/setting/Storage/components/AliCloud/index.tsx
+++ b/eiam-console/src/main/console-fe/src/pages/setting/Storage/components/AliCloud/index.tsx
@@ -80,7 +80,9 @@ export default () => {
       />
       <ProFormText
         name={['config', 'endpoint']}
-        label="Endpoint"
+        label={intl.formatMessage({
+          id: `pages.setting.storage_provider.provider.aliyun_oss.endpoint`,
+        })}
         placeholder={intl.formatMessage({
           id: 'pages.setting.storage_provider.provider.aliyun_oss.endpoint.placeholder',
         })}
diff --git a/eiam-console/src/main/console-fe/src/pages/setting/Storage/components/MinIo/index.tsx b/eiam-console/src/main/console-fe/src/pages/setting/Storage/components/MinIo/index.tsx
index 2eaf9f98..539c5413 100644
--- a/eiam-console/src/main/console-fe/src/pages/setting/Storage/components/MinIo/index.tsx
+++ b/eiam-console/src/main/console-fe/src/pages/setting/Storage/components/MinIo/index.tsx
@@ -27,13 +27,13 @@ export default () => {
         name={['config', 'accessKey']}
         label="AccessKey"
         placeholder={intl.formatMessage({
-          id: 'pages.setting.storage_provider.minio.access_key.placeholder',
+          id: 'pages.setting.storage_provider.provider.minio.access_key.placeholder',
         })}
         rules={[
           {
             required: true,
             message: intl.formatMessage({
-              id: 'pages.setting.storage_provider.minio.access_key.rule.0.message',
+              id: 'pages.setting.storage_provider.provider.minio.access_key.rule.0.message',
             }),
           },
         ]}
@@ -46,12 +46,12 @@ export default () => {
           {
             required: true,
             message: intl.formatMessage({
-              id: 'pages.setting.storage_provider.minio.secret_key.rule.0.message',
+              id: 'pages.setting.storage_provider.provider.minio.secret_key.rule.0.message',
             }),
           },
         ]}
         placeholder={intl.formatMessage({
-          id: 'pages.setting.storage_provider.minio.secret_key.placeholder',
+          id: 'pages.setting.storage_provider.provider.minio.secret_key.placeholder',
         })}
         fieldProps={{
           autoComplete: 'new-password',
@@ -62,15 +62,17 @@ export default () => {
       />
       <ProFormText
         name={['config', 'domain']}
-        label="Domain"
+        label={intl.formatMessage({
+          id: `pages.setting.storage_provider.provider.minio.domain`,
+        })}
         placeholder={intl.formatMessage({
-          id: 'pages.setting.storage_provider.minio.domain.placeholder',
+          id: 'pages.setting.storage_provider.provider.minio.domain.placeholder',
         })}
         rules={[
           {
             required: true,
             message: intl.formatMessage({
-              id: 'pages.setting.storage_provider.minio.domain.rule.0.message',
+              id: 'pages.setting.storage_provider.provider.minio.domain.rule.0.message',
             }),
           },
         ]}
@@ -80,15 +82,17 @@ export default () => {
       />
       <ProFormText
         name={['config', 'endpoint']}
-        label="Endpoint"
+        label={intl.formatMessage({
+          id: `pages.setting.storage_provider.provider.minio.endpoint`,
+        })}
         placeholder={intl.formatMessage({
-          id: 'pages.setting.storage_provider.minio.endpoint.placeholder',
+          id: 'pages.setting.storage_provider.provider.minio.endpoint.placeholder',
         })}
         rules={[
           {
             required: true,
             message: intl.formatMessage({
-              id: 'pages.setting.storage_provider.minio.endpoint.rule.0.message',
+              id: 'pages.setting.storage_provider.provider.minio.endpoint.rule.0.message',
             }),
           },
         ]}
@@ -100,13 +104,13 @@ export default () => {
         name={['config', 'bucket']}
         label={'Bucket'}
         placeholder={intl.formatMessage({
-          id: 'pages.setting.storage_provider.minio.bucket.placeholder',
+          id: 'pages.setting.storage_provider.provider.minio.bucket.placeholder',
         })}
         rules={[
           {
             required: true,
             message: intl.formatMessage({
-              id: 'pages.setting.storage_provider.minio.bucket.rule.0.message',
+              id: 'pages.setting.storage_provider.provider.minio.bucket.rule.0.message',
             }),
           },
         ]}
diff --git a/eiam-console/src/main/console-fe/src/pages/setting/Storage/components/S3/index.tsx b/eiam-console/src/main/console-fe/src/pages/setting/Storage/components/S3/index.tsx
index 23580e02..fb2326f2 100644
--- a/eiam-console/src/main/console-fe/src/pages/setting/Storage/components/S3/index.tsx
+++ b/eiam-console/src/main/console-fe/src/pages/setting/Storage/components/S3/index.tsx
@@ -23,51 +23,51 @@ export default () => {
   return (
     <>
       <ProFormText
-        name={['config', 'domain']}
+        name={['config', 'endpoint']}
         label={intl.formatMessage({
-          id: 'pages.setting.storage_provider.provider.s3.domain',
+          id: `pages.setting.storage_provider.provider.s3.endpoint`,
         })}
         placeholder={intl.formatMessage({
-          id: 'pages.setting.storage_provider.provider.s3.domain.placeholder',
+          id: `pages.setting.storage_provider.provider.s3.endpoint.placeholder`,
         })}
         rules={[
           {
             required: true,
             message: intl.formatMessage({
-              id: 'pages.setting.storage_provider.provider.s3.domain.rule.0.message',
+              id: `pages.setting.storage_provider.provider.s3.endpoint.rule.0.message`,
+            }),
+          },
+        ]}
+      />
+      <ProFormText
+        name={['config', 'domain']}
+        label={intl.formatMessage({
+          id: `pages.setting.storage_provider.provider.s3.domain`,
+        })}
+        placeholder={intl.formatMessage({
+          id: `pages.setting.storage_provider.provider.s3.domain.placeholder`,
+        })}
+        rules={[
+          {
+            required: true,
+            message: intl.formatMessage({
+              id: `pages.setting.storage_provider.provider.s3.domain.rule.0.message`,
             }),
           },
         ]}
         fieldProps={{ autoComplete: 'off' }}
       />
-      <ProFormText
-        name={['config', 'endpoint']}
-        label={intl.formatMessage({
-          id: 'pages.setting.storage_provider.provider.s3.endpoint',
-        })}
-        placeholder={intl.formatMessage({
-          id: 'pages.setting.storage_provider.provider.s3.endpoint.placeholder',
-        })}
-        rules={[
-          {
-            required: true,
-            message: intl.formatMessage({
-              id: 'pages.setting.storage_provider.provider.s3.endpoint.rule.0.message',
-            }),
-          },
-        ]}
-      />
       <ProFormText
         name={['config', 'accessKeyId']}
         label="AccessKeyId"
         placeholder={intl.formatMessage({
-          id: 'pages.setting.storage_provider.provider.s3.access_key_id.placeholder',
+          id: `pages.setting.storage_provider.provider.s3.access_key_id.placeholder`,
         })}
         rules={[
           {
             required: true,
             message: intl.formatMessage({
-              id: 'pages.setting.storage_provider.provider.s3.access_key_id.rule.0.message',
+              id: `pages.setting.storage_provider.provider.s3.access_key_id.rule.0.message`,
             }),
           },
         ]}
@@ -79,13 +79,13 @@ export default () => {
         name={['config', 'secretAccessKey']}
         label="SecretAccessKey"
         placeholder={intl.formatMessage({
-          id: 'pages.setting.storage_provider.provider.s3.secret_access_key.placeholder',
+          id: `pages.setting.storage_provider.provider.s3.secret_access_key.placeholder`,
         })}
         rules={[
           {
             required: true,
             message: intl.formatMessage({
-              id: 'pages.setting.storage_provider.provider.s3.secret_access_key.rule.0.message',
+              id: `pages.setting.storage_provider.provider.s3.secret_access_key.rule.0.message`,
             }),
           },
         ]}
@@ -95,13 +95,13 @@ export default () => {
         name={['config', 'bucket']}
         label={'Bucket'}
         placeholder={intl.formatMessage({
-          id: 'pages.setting.storage_provider.provider.s3.bucket.placeholder',
+          id: `pages.setting.storage_provider.provider.s3.bucket.placeholder`,
         })}
         rules={[
           {
             required: true,
             message: intl.formatMessage({
-              id: 'pages.setting.storage_provider.provider.s3.bucket.rule.0.message',
+              id: `pages.setting.storage_provider.provider.s3.bucket.rule.0.message`,
             }),
           },
         ]}
@@ -111,7 +111,7 @@ export default () => {
         name={['config', 'region']}
         label={'Region'}
         placeholder={intl.formatMessage({
-          id: 'pages.setting.storage_provider.provider.s3.region.placeholder',
+          id: `pages.setting.storage_provider.provider.s3.region.placeholder`,
         })}
         fieldProps={{ autoComplete: 'off' }}
       />
diff --git a/eiam-console/src/main/console-fe/src/pages/setting/Storage/components/Tencent/index.tsx b/eiam-console/src/main/console-fe/src/pages/setting/Storage/components/Tencent/index.tsx
index 3b784166..96ae1e05 100644
--- a/eiam-console/src/main/console-fe/src/pages/setting/Storage/components/Tencent/index.tsx
+++ b/eiam-console/src/main/console-fe/src/pages/setting/Storage/components/Tencent/index.tsx
@@ -80,13 +80,13 @@ export default () => {
         name={['config', 'secretKey']}
         label="SecretKey"
         placeholder={intl.formatMessage({
-          id: 'pages.setting.storage_provider.provider.tencent_cos.secret_Key.placeholder',
+          id: 'pages.setting.storage_provider.provider.tencent_cos.secret_key.placeholder',
         })}
         rules={[
           {
             required: true,
             message: intl.formatMessage({
-              id: 'pages.setting.storage_provider.provider.tencent_cos.secret_Key.rule.0.message',
+              id: 'pages.setting.storage_provider.provider.tencent_cos.secret_key.rule.0.message',
             }),
           },
         ]}