⚡ 优化

eiam-console/src/main/console-fe/src/pages/account/IdentitySourceDetail/components/BasicConfig/DingTalkConfig.tsx

@@ -151,6 +151,9 @@ const DingTalkConfig = (props: DingTalkConfigProps) => {
             }),
           },
         ]}
+        addonWarpStyle={{
+          flexWrap: 'nowrap',
+        }}
         addonAfter={
           <Button type={'default'} onClick={configValidator}>
             {intl.formatMessage({ id: 'pages.account.identity_source_detail.common.test_connect' })}

eiam-console/src/main/console-fe/src/pages/account/IdentitySourceDetail/components/BasicConfig/FeiShuConfig.tsx

@@ -129,6 +129,9 @@ const FeiShuConfig = (props: {
             }),
           },
         ]}
+        addonWarpStyle={{
+          flexWrap: 'nowrap',
+        }}
         addonAfter={
           <Button type={'default'} onClick={configValidator}>
             {intl.formatMessage({ id: 'pages.account.identity_source_detail.common.test_connect' })}

eiam-console/src/main/console-fe/src/pages/account/IdentitySourceDetail/components/BasicConfig/WeChatWorkConfig.tsx

@@ -125,6 +125,9 @@ const WeChatWorkConfig = (props: {
             }),
           },
         ]}
+        addonWarpStyle={{
+          flexWrap: 'nowrap',
+        }}
         addonAfter={
           <Button type={'default'} onClick={configValidator}>
             {intl.formatMessage({ id: 'pages.account.identity_source_detail.common.test_connect' })}

eiam-console/src/main/console-fe/src/pages/account/IdentitySourceDetail/components/JobConfig/index.tsx

@@ -156,6 +156,9 @@ export default (props: { configured: boolean }) => {
                 addonBefore={intl.formatMessage({
                   id: 'pages.account.identity_source_detail.job_config.interval.addon_before',
                 })}
+                addonWarpStyle={{
+                  flexWrap: 'nowrap',
+                }}
                 addonAfter={intl.formatMessage({
                   id: 'pages.account.identity_source_detail.job_config.interval.addon_after',
                 })}

eiam-console/src/main/console-fe/src/pages/account/IdentitySourceDetail/components/SyncHistory/SyncHistory.tsx

@@ -168,7 +168,7 @@ export default (props: { identitySourceId: string }) => {
         fail: { text: intl.formatMessage({ id: 'app.fail' }) },
         pending: {
           text: intl.formatMessage({
-            id: 'pages.account.identity_source_detail.sync_history.columns.status.valu_enum.pending',
+            id: 'pages.account.identity_source_detail.sync_history.columns.status.pending',
           }),
         },
       },
@@ -181,7 +181,7 @@ export default (props: { identitySourceId: string }) => {
           {text === 'pending' && (
             <Tag icon={<SyncOutlined spin />} color="#1677ff">
               {intl.formatMessage({
-                id: 'pages.account.identity_source_detail.sync_history.columns.status.valu_enum.pending',
+                id: 'pages.account.identity_source_detail.sync_history.columns.status.pending',
               })}
             </Tag>
           )}

eiam-console/src/main/console-fe/src/pages/account/IdentitySourceDetail/locales/zh-CN.ts

@@ -56,7 +56,7 @@ export default {
   'pages.account.identity_source_detail.sync_history.columns.end_time': '结束时间',
   'pages.account.identity_source_detail.sync_history.columns.spend_time': '耗时',
   'pages.account.identity_source_detail.sync_history.columns.status': '状态',
-  'pages.account.identity_source_detail.sync_history.columns.status.valu_enum.pending': '同步中',
+  'pages.account.identity_source_detail.sync_history.columns.status.pending': '同步中',
   'pages.account.identity_source_detail.sync_history.columns.option': '操作',
   'pages.account.identity_source_detail.sync_history.tool_bar_render.title': '一键拉取',
   'pages.account.identity_source_detail.sync_history.tool_bar_render.success.title': '任务触发成功',

eiam-console/src/main/console-fe/src/pages/account/UserGroupDetail/components/AddMember/AddMember.tsx

@@ -60,7 +60,7 @@ export default (props: ModalProps) => {
       fixed: 'left',
       filterSearch: true,
       ellipsis: true,
-      render: (dom, record) => (
+      render: (_dom, record) => (
         <Space>
           <Avatar avatar={record.avatar} username={record.username} />
           <Tooltip title={record.username}>

eiam-console/src/main/console-fe/src/pages/account/UserList/components/CreateUser/CreateUser.tsx

@@ -209,7 +209,7 @@ const CreateUser = (props: CreateUserProps) => {
                 }),
               },
               {
-                validator: async (rule, value) => {
+                validator: async (_rule, value) => {
                   if (!value) {
                     return Promise.resolve();
                   }
@@ -283,6 +283,9 @@ const CreateUser = (props: CreateUserProps) => {
                 }),
               },
             ]}
+            addonWarpStyle={{
+              flexWrap: 'nowrap',
+            }}
             addonAfter={
               <Button
                 key={'autoGeneration'}
@@ -365,7 +368,7 @@ const CreateUser = (props: CreateUserProps) => {
                   fieldProps={{ autoComplete: 'off' }}
                   rules={[
                     {
-                      validator: async (rule, value) => {
+                      validator: async (_rule, value) => {
                         if (!value) {
                           return Promise.resolve();
                         }
@@ -434,7 +437,7 @@ const CreateUser = (props: CreateUserProps) => {
                 }),
               },
               {
-                validator: async (rule, value) => {
+                validator: async (_rule, value) => {
                   if (!value) {
                     return Promise.resolve();
                   }

eiam-console/src/main/console-fe/src/pages/account/UserList/components/UpdateUser/UpdateUser.tsx

@@ -276,7 +276,7 @@ const UpdateUser = (props: UpdateFormProps) => {
                 }),
               },
               {
-                validator: async (rule, value) => {
+                validator: async (_rule, value) => {
                   if (!value) {
                     return Promise.resolve();
                   }

eiam-console/src/main/console-fe/src/pages/account/UserList/components/User/ResetPasswordModel.tsx

@@ -124,6 +124,9 @@ export default (props: {
               }),
             },
           ]}
+          addonWarpStyle={{
+            flexWrap: 'nowrap',
+          }}
           addonAfter={
             <Button
               key={'autoGeneration'}

eiam-console/src/main/console-fe/src/pages/app/AppDetail/components/AppProtocol/JwtProtocolConfig/JwtProtocolConfig.tsx

@@ -219,6 +219,9 @@ export default (props: { app: GetApp | Record<string, any> }) => {
             label={intl.formatMessage({
               id: 'pages.app.config.detail.items.login_access.protocol_config.jwt.idtoken_time_to_live',
             })}
+            addonWarpStyle={{
+              flexWrap: 'nowrap',
+            }}
             addonAfter={'秒'}
             max={84600}
             min={1}

eiam-console/src/main/console-fe/src/pages/app/AppDetail/components/AppProtocol/OidcProtocolConfig/OidcProtocolConfig.tsx

@@ -580,6 +580,9 @@ export default (props: { app: GetApp | Record<string, any> }) => {
                         id: 'pages.app.config.detail.items.login_access.protocol_config.oidc.advanced.access_token_time_to_live',
                       })}
                       name={'accessTokenTimeToLive'}
+                      addonWarpStyle={{
+                        flexWrap: 'nowrap',
+                      }}
                       addonAfter={intl.formatMessage({ id: 'app.minute' })}
                       extra={intl.formatMessage({
                         id: 'pages.app.config.detail.items.login_access.protocol_config.oidc.advanced.access_token_time_to_live.extra',
@@ -590,6 +593,9 @@ export default (props: { app: GetApp | Record<string, any> }) => {
                         id: 'pages.app.config.detail.items.login_access.protocol_config.oidc.advanced.refresh_token_time_to_live',
                       })}
                       name={'refreshTokenTimeToLive'}
+                      addonWarpStyle={{
+                        flexWrap: 'nowrap',
+                      }}
                       addonAfter={intl.formatMessage({ id: 'app.minute' })}
                       extra={intl.formatMessage({
                         id: 'pages.app.config.detail.items.login_access.protocol_config.oidc.advanced.refresh_token_time_to_live.extra',
@@ -601,6 +607,9 @@ export default (props: { app: GetApp | Record<string, any> }) => {
                       })}
                       readonly
                       name={'idTokenTimeToLive'}
+                      addonWarpStyle={{
+                        flexWrap: 'nowrap',
+                      }}
                       addonAfter={intl.formatMessage({ id: 'app.minute.not_update' })}
                       extra={intl.formatMessage({
                         id: 'pages.app.config.detail.items.login_access.protocol_config.oidc.advanced.idtoken_time_to_live.extra',

eiam-console/src/main/console-fe/src/pages/app/AppDetail/data.d.ts

@@ -39,4 +39,3 @@ export type GetApp = {
   remark: string;
   groupIds: string[];
 };
-

eiam-console/src/main/console-fe/src/pages/app/AppDetail/service.ts

@@ -16,9 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import { request } from '@@/exports';
-import {
+import { GetApp } from './data.d';
-  GetApp,
-} from './data.d';
 
 /**
  * Get Application
@@ -28,4 +26,3 @@ export async function getApp(id: string): Promise<API.ApiResult<GetApp>> {
     method: 'GET',
   });
 }
-

eiam-console/src/main/console-fe/src/pages/app/AppList/service.ts

@@ -30,5 +30,3 @@ export async function enableApp(id: string): Promise<API.ApiResult<boolean>> {
 export async function disableApp(id: string): Promise<API.ApiResult<boolean>> {
   return request(`/api/v1/app/disable/${id}`, { method: 'PUT' });
 }
-
-

eiam-console/src/main/console-fe/src/pages/authn/IdentityProvider/constant.ts

@@ -32,7 +32,6 @@ export enum IdentityProviderType {
   dingtalk_qr = 'dingtalk_qr',
   feishu_oauth = 'feishu_oauth',
   dingtalk_oauth = 'dingtalk_oauth',
-  ldap = 'ldap',
   //社交
   qq_oauth = 'qq_oauth',
   gitee_oauth = 'gitee_oauth',

eiam-console/src/main/console-fe/src/pages/security/Administrator/Administrator.tsx

@@ -102,7 +102,7 @@ export const Administrator = () => {
       title: intl.formatMessage({ id: 'pages.setting.administrator.table.columns.auth_total' }),
       dataIndex: 'authTotal',
       search: false,
-      render: (dom, record) => {
+      render: (_dom, record) => {
         return <span>{record.authTotal ? record.authTotal : 0}</span>;
       },
     },

eiam-console/src/main/console-fe/src/pages/security/Administrator/components/UpdateAdministrator/UpdateAdministrator.tsx

@@ -159,7 +159,7 @@ export default (props: {
                       validateTrigger: ['onBlur'],
                     },
                     {
-                      validator: async (rule, value) => {
+                      validator: async (_rule, value) => {
                         if (!value || !phoneChanged) {
                           return Promise.resolve();
                         }
@@ -248,7 +248,7 @@ export default (props: {
                 }),
               },
               {
-                validator: async (rule, value) => {
+                validator: async (_rule, value) => {
                   if (!value) {
                     return Promise.resolve();
                   }

eiam-console/src/main/console-fe/src/pages/security/PasswordPolicy/data.d.ts

@@ -26,4 +26,4 @@ export type WeakPasswordLib = {
 /**
  * 密码策略
  */
-export type PasswordPolicyConfig = {};
+export type PasswordPolicyConfig = NonNullable<unknown>;

eiam-console/src/main/console-fe/src/pages/security/Setting/components/Basic/Basic.tsx

@@ -103,11 +103,14 @@ export default () => {
             readonly
             width={100}
             label={intl.formatMessage({
-              id: 'pages.setting.security.basic.session_validtime',
+              id: 'pages.setting.security.basic.session_valid_time',
             })}
             name={'sessionValidTime'}
+            addonWarpStyle={{
+              flexWrap: 'nowrap',
+            }}
             addonAfter={intl.formatMessage({
-              id: 'pages.setting.security.basic.session_validtime.addon_after',
+              id: 'pages.setting.security.basic.session_valid_time.addon_after',
             })}
           />
           <ProFormDigit
@@ -116,6 +119,9 @@ export default () => {
             })}
             width={100}
             name={'rememberMeValidTime'}
+            addonWarpStyle={{
+              flexWrap: 'nowrap',
+            }}
             addonAfter={intl.formatMessage({
               id: 'pages.setting.security.basic.remember_me_validtime.addon_after',
             })}
@@ -132,6 +138,9 @@ export default () => {
             extra={intl.formatMessage({
               id: 'pages.setting.security.basic.verify_code_valid_time.extra',
             })}
+            addonWarpStyle={{
+              flexWrap: 'nowrap',
+            }}
             addonAfter={intl.formatMessage({
               id: 'pages.setting.security.basic.verify_code_valid_time.addon_after',
             })}

eiam-console/src/main/console-fe/src/pages/security/Setting/components/DefensePolicy/DefensePolicy.tsx

@@ -96,6 +96,9 @@ export default () => {
               id: 'pages.setting.security.basic.login_failure_duration',
             })}
             name="loginFailureDuration"
+            addonWarpStyle={{
+              flexWrap: 'nowrap',
+            }}
             addonAfter={intl.formatMessage({
               id: 'pages.setting.security.basic.login_failure_duration.addon_after',
             })}
@@ -109,6 +112,9 @@ export default () => {
             extra={intl.formatMessage({
               id: 'pages.setting.security.basic.login_failure_count.extra',
             })}
+            addonWarpStyle={{
+              flexWrap: 'nowrap',
+            }}
             addonAfter={intl.formatMessage({
               id: 'pages.setting.security.basic.login_failure_count.addon_after',
             })}
@@ -122,6 +128,9 @@ export default () => {
             extra={intl.formatMessage({
               id: 'pages.setting.security.basic.auto_unlock_time.extra',
             })}
+            addonWarpStyle={{
+              flexWrap: 'nowrap',
+            }}
             addonAfter={intl.formatMessage({
               id: 'pages.setting.security.basic.auto_unlock_time.addon_after',
             })}

eiam-console/src/main/console-fe/src/pages/security/Setting/locales/zh-CN.ts

@@ -21,8 +21,8 @@ export default {
   'pages.setting.basic_setting': '基础设置',
   'pages.setting.security.basic.session_maximum': '用户并发数',
   'pages.setting.security.basic.session_maximum.extra': '同一用户同时在线数量，-1为不限制。',
-  'pages.setting.security.basic.session_validtime': '会话有效时间',
+  'pages.setting.security.basic.session_valid_time': '会话有效时间',
-  'pages.setting.security.basic.session_validtime.addon_after': '秒（暂未支持）',
+  'pages.setting.security.basic.session_valid_time.addon_after': '秒（暂未支持）',
   'pages.setting.security.basic.remember_me_validtime': '记住我有效时间',
   'pages.setting.security.basic.remember_me_validtime.addon_after': '秒',
   'pages.setting.security.basic.verify_code_valid_time': '验证码有效时间',

eiam-console/src/main/console-fe/src/pages/setting/Message/components/SmsProvider/SmsProvider.tsx

@@ -181,7 +181,7 @@ export default (props: { visible: boolean }) => {
       align: 'center',
       width: 90,
       editable: false,
-      render: (text: any, row: Record<string, string>) => {
+      render: (_text: any, row: Record<string, string>) => {
         return [
           <a
             key={row.type}
@@ -327,7 +327,7 @@ export default (props: { visible: boolean }) => {
               editorFormRef.current?.resetFields();
             }}
             submitter={{
-              render: (p, dom) => {
+              render: (_p, dom) => {
                 return <FooterToolbar>{dom}</FooterToolbar>;
               },
               submitButtonProps: {

eiam-console/src/main/console-fe/src/pages/user/Profile/components/ModifyPhone.tsx

@@ -150,7 +150,7 @@ export default (props: {
                     message: <FormattedMessage id={'page.user.profile.common.form.phone.rule.0'} />,
                   },
                   {
-                    validator: async (rule, value) => {
+                    validator: async (_rule, value) => {
                       if (!value) {
                         return Promise.resolve();
                       }

eiam-console/src/main/console-fe/src/services/account.ts

@@ -58,9 +58,7 @@ export async function getFilterOrganizationTree(
 /**
  * Get organization Details
  */
-export async function getOrganization(
+export async function getOrganization(id: Key): Promise<API.ApiResult<AccountAPI.GetOrganization>> {
-  id: Key,
-): Promise<API.ApiResult<AccountAPI.GetOrganization>> {
   return request<API.ApiResult<AccountAPI.GetOrganization>>(`/api/v1/organization/get/${id}`);
 }
 

eiam-console/src/main/console-fe/src/utils/tree.ts

@@ -31,6 +31,7 @@ export type DataNode = {
  * @param list
  * @param key
  * @param children
+ * @param disabledId
  */
 export function updateTreeData(
   list: DataNode[],