Merge pull request #310 from actiontech/feature/issue-1733

[chore]: Expand character limit for name field in forms
actiontech · Aug 31, 2023 · e86632d · e86632d
2 parents 39bbc2a + b6cfa5c
commit e86632d
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 9 deletions.
diff --git a/src/page/AuditPlan/PlanForm/index.tsx b/src/page/AuditPlan/PlanForm/index.tsx
@@ -113,7 +113,7 @@ const PlanForm: React.FC<PlanFormProps> = ({ form, ...props }) => {
           {
             required: true,
           },
-          ...nameRule(),
+          ...nameRule(119),
         ]}
       >
         <Input

diff --git a/src/page/DataSource/DataSourceForm/index.tsx b/src/page/DataSource/DataSourceForm/index.tsx
@@ -167,13 +167,13 @@ const DataSourceForm: React.FC<IDataSourceFormProps> = (props) => {
         name="name"
         validateFirst={true}
         rules={[
+          ...nameRule(119),
           {
             required: true,
             message: t('common.form.rule.require', {
               name: t('dataSource.dataSourceForm.name'),
             }),
           },
-          ...nameRule(),
         ]}
       >
         <Input

diff --git a/src/page/GlobalRuleTemplate/RuleTemplateForm/BaseInfoForm/index.tsx b/src/page/GlobalRuleTemplate/RuleTemplateForm/BaseInfoForm/index.tsx
@@ -49,7 +49,7 @@ const BaseInfoForm: React.FC<RuleTemplateBaseInfoFormProps> = (props) => {
   ];
 
   if (!isUpdate) {
-    nameFormRule.push(...nameRule());
+    nameFormRule.push(...nameRule(119));
   }
 
   return (

diff --git a/src/page/RuleTemplate/RuleTemplateForm/BaseInfoForm/index.tsx b/src/page/RuleTemplate/RuleTemplateForm/BaseInfoForm/index.tsx
@@ -34,7 +34,7 @@ const BaseInfoForm: React.FC<RuleTemplateBaseInfoFormProps> = (props) => {
     ];
 
     if (!isUpdate) {
-      rule.push(...nameRule());
+      rule.push(...nameRule(119));
     }
     return rule;
   }, [isUpdate]);

diff --git a/src/page/UserCenter/Role/Modal/RoleForm/index.tsx b/src/page/UserCenter/Role/Modal/RoleForm/index.tsx
@@ -22,7 +22,7 @@ const RoleForm: React.FC<IRoleFormProps> = (props) => {
               name: t('role.roleForm.roleName'),
             }),
           },
-          ...nameRule(),
+          ...nameRule(119),
         ]}
       >
         <Input

diff --git a/src/page/UserCenter/User/Modal/UserForm/index.tsx b/src/page/UserCenter/User/Modal/UserForm/index.tsx
@@ -23,7 +23,7 @@ const UserForm: React.FC<IUserFormProps> = (props) => {
     if (props.isUpdate) {
       return baseRules;
     }
-    return [...baseRules, ...nameRule()];
+    return [...baseRules, ...nameRule(119)];
   };
 
   return (

diff --git a/src/page/UserCenter/UserGroup/Modal/UserGroupForm/UserGroupForm.tsx b/src/page/UserCenter/UserGroup/Modal/UserGroupForm/UserGroupForm.tsx
@@ -19,7 +19,7 @@ const UserGroupForm: React.FC<UserGroupFormProps> = (props) => {
           {
             required: true,
           },
-          ...nameRule(),
+          ...nameRule(119),
         ]}
       >
         <Input

diff --git a/src/utils/FormRule.ts b/src/utils/FormRule.ts
@@ -2,13 +2,13 @@ import { Rule } from 'rc-field-form/lib/interface';
 import { t } from '../locale';
 import { FormValidatorRule } from '../types/common.type';
 
-export const nameRule = (): Rule[] => {
+export const nameRule = (max = 59): Rule[] => {
   return [
     {
       validator: nameRuleValidator(),
     },
     {
-      max: 59,
+      max,
     },
   ];
 };