Merge pull request #345 from actiontech/fix/issue-2067-3

[fix]: change file valid locale
actiontech · Nov 29, 2023 · ad12569 · ad12569
2 parents 95b3296 + 382f723
commit ad12569
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 17 deletions.
diff --git a/src/locale/en-US/common.ts b/src/locale/en-US/common.ts
@@ -53,6 +53,7 @@ export default {
     placeholder: {
       input: 'Please input {{name}}',
       select: 'Please select {{name}}',
+      upload: 'Please upload {{name}}',
       searchInput: 'Input the {{name}} to search',
       searchSelect: 'Select the {{name}} to search',
     },

diff --git a/src/locale/en-US/order.ts b/src/locale/en-US/order.ts
@@ -153,7 +153,6 @@ export default {
     instanceSchema: '数据库',
     sql: 'SQL语句',
     sqlFile: 'SQL文件',
-    validateSqlFileMsg: '请上传SQL文件',
     mybatisFile: 'Mybatis的XML文件',
     zipFile: 'ZIP文件',
 

diff --git a/src/locale/zh-CN/common.ts b/src/locale/zh-CN/common.ts
@@ -95,6 +95,7 @@ export default {
     placeholder: {
       input: '请输入{{name}}',
       select: '请选择{{name}}',
+      upload: '请上传{{name}}',
       searchInput: '请输入要搜索的 {{name}}',
       searchSelect: '请选择要搜索的 {{name}}',
     },

diff --git a/src/locale/zh-CN/order.ts b/src/locale/zh-CN/order.ts
@@ -153,7 +153,6 @@ export default {
     instanceSchema: '数据库',
     sql: 'SQL语句',
     sqlFile: 'SQL文件',
-    validateSqlFileMsg: '请上传SQL文件',
     mybatisFile: 'Mybatis的XML文件',
     zipFile: 'ZIP文件',
 

diff --git a/src/page/Order/SqlStatementFormTabs/SqlStatementForm.tsx b/src/page/Order/SqlStatementFormTabs/SqlStatementForm.tsx
@@ -59,7 +59,7 @@ const SqlStatementForm: React.FC<SqlStatementFormProps> = ({
 
   const resetUploadTypeContent = () => {
     setCurrentSQLInputTYpe(SQLInputType.manualInput);
-  }
+  };
 
   const { editorDidMount } = useMonacoEditor(form, {
     formName: generateFieldName('sql'),
@@ -88,8 +88,7 @@ const SqlStatementForm: React.FC<SqlStatementFormProps> = ({
       );
     };
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [])
-
+  }, []);
 
   return (
     <>
@@ -126,9 +125,9 @@ const SqlStatementForm: React.FC<SqlStatementFormProps> = ({
           }}
           rules={[
             {
-              required: true
+              required: true,
             },
-            ...whiteSpaceSql()
+            ...whiteSpaceSql(),
           ]}
         >
           <MonacoEditorFunComponent
@@ -151,7 +150,9 @@ const SqlStatementForm: React.FC<SqlStatementFormProps> = ({
           rules={[
             {
               required: true,
-              message: t('order.sqlInfo.validateSqlFileMsg')
+              message: t('common.form.placeholder.upload', {
+                name: t('order.sqlInfo.sqlFile'),
+              }),
             },
           ]}
           getValueFromEvent={getFileFromUploadChangeEvent}
@@ -173,7 +174,9 @@ const SqlStatementForm: React.FC<SqlStatementFormProps> = ({
           rules={[
             {
               required: true,
-              message: t('order.sqlInfo.validateSqlFileMsg')
+              message: t('common.form.placeholder.upload', {
+                name: t('order.sqlInfo.mybatisFile'),
+              }),
             },
           ]}
           getValueFromEvent={getFileFromUploadChangeEvent}
@@ -196,7 +199,9 @@ const SqlStatementForm: React.FC<SqlStatementFormProps> = ({
           rules={[
             {
               required: true,
-              message: t('order.sqlInfo.validateSqlFileMsg')
+              message: t('common.form.placeholder.upload', {
+                name: t('order.sqlInfo.zipFile'),
+              }),
             },
           ]}
           getValueFromEvent={getFileFromUploadChangeEvent}

diff --git a/src/page/SqlAuditRecord/Create/SQLInfoForm.tsx b/src/page/SqlAuditRecord/Create/SQLInfoForm.tsx
@@ -12,7 +12,11 @@ import {
   Tooltip,
   Upload,
 } from 'antd';
-import { PageFormLayout, ResponseCode, SqlFiledInitialValue } from '../../../data/common';
+import {
+  PageFormLayout,
+  ResponseCode,
+  SqlFiledInitialValue,
+} from '../../../data/common';
 import {
   AuditTypeEnum,
   SQLInfoFormFields,
@@ -49,7 +53,7 @@ import { RuleUrlParamKey } from '../../Rule/useRuleFilterForm';
 import { Link } from 'react-router-dom';
 import { getInstanceTipListV1FunctionalModuleEnum } from '../../../api/instance/index.enum';
 import EmptyBox from '../../../components/EmptyBox';
-import { whiteSpaceSql } from '../../../utils/FormRule';
+import { whiteSpaceSql, nameRule } from '../../../utils/FormRule';
 
 const MonacoEditorFunComponent =
   MonacoEditor as ComponentType<MonacoEditorProps>;
@@ -95,7 +99,6 @@ const SQLInfoForm: React.ForwardRefRenderFunction<
       rules: [
         {
           required: true,
-          message: t('order.sqlInfo.validateSqlFileMsg')
         },
       ],
     };
@@ -108,7 +111,12 @@ const SQLInfoForm: React.ForwardRefRenderFunction<
           ...PageFormLayout.wrapperCol,
           className: theme.editor,
         },
-        rules: [{ required: uploadType === UploadTypeEnum.sql }, ...whiteSpaceSql()],
+        rules: [
+          {
+            required: uploadType === UploadTypeEnum.sql,
+          },
+          ...whiteSpaceSql(),
+        ],
 
         children: (
           <MonacoEditorFunComponent
@@ -127,7 +135,14 @@ const SQLInfoForm: React.ForwardRefRenderFunction<
       return {
         name: 'sqlFile',
         label: t('sqlAudit.create.SQLInfo.uploadLabelEnum.sqlFile'),
-        rules: [{ required: uploadType === UploadTypeEnum.sqlFile }],
+        rules: [
+          {
+            required: uploadType === UploadTypeEnum.sqlFile,
+            message: t('common.form.placeholder.upload', {
+              name: t('sqlAudit.create.SQLInfo.uploadLabelEnum.sqlFile'),
+            }),
+          },
+        ],
         children: (
           <Upload
             accept=".sql"
@@ -143,7 +158,14 @@ const SQLInfoForm: React.ForwardRefRenderFunction<
       return {
         name: 'mybatisFile',
         label: t('sqlAudit.create.SQLInfo.uploadLabelEnum.xmlFile'),
-        rules: [{ required: uploadType === UploadTypeEnum.xmlFile }],
+        rules: [
+          {
+            required: uploadType === UploadTypeEnum.xmlFile,
+            message: t('common.form.placeholder.upload', {
+              name: t('sqlAudit.create.SQLInfo.uploadLabelEnum.xmlFile'),
+            }),
+          },
+        ],
         children: (
           <Upload
             accept=".xml"
@@ -159,7 +181,14 @@ const SQLInfoForm: React.ForwardRefRenderFunction<
       return {
         name: 'zipFile',
         label: t('sqlAudit.create.SQLInfo.uploadLabelEnum.zipFile'),
-        rules: [{ required: uploadType === UploadTypeEnum.zipFile }],
+        rules: [
+          {
+            required: uploadType === UploadTypeEnum.zipFile,
+            message: t('common.form.placeholder.upload', {
+              name: t('sqlAudit.create.SQLInfo.uploadLabelEnum.zipFile'),
+            }),
+          },
+        ],
         children: (
           <Upload
             accept=".zip"