Merge pull request #2062 from hqwcxy/master

[FIX] <pro>Table: Fixed the issue where pressing Enter could not move…

Author: Huihuawk

CHANGELOG.en-US.md

@@ -86,6 +86,7 @@ timeline: true
 - 🐞 `<pro>Tooltip`: Fixed the issue where the pop-up window did not disappear after the `dom` was removed from the `DOM` tree.
 - 🐞 `<pro>Table`: Fixed the issue where pressing Enter from the second page onwards could not move to the next line for editing.
 - 🐞 `<pro>Table`: Fixed the issue of row numbers being incorrect in data grouping mode and cells misaligning after deleting data.
+- 🐞 `<pro>Table`: Fixed the issue where pressing Enter could not move to the next line when the cell editor was set as a IntlField.
 - 🐞 `<pro>Button`: Fixed the issue where text overflow ellipsis style would fail when disabled.
 
 ## 1.6.7

CHANGELOG.zh-CN.md

@@ -86,6 +86,7 @@ timeline: true
 - 🐞 `<pro>Tooltip`: 修复触发 dom 从 DOM 树中移除后, 弹窗不消失的问题。
 - 🐞 `<pro>Table`: 修复从第二页起无法通过回车跳转到下一行编辑的问题。
 - 🐞 `<pro>Table`: 修复数据分组模式下行号错乱，删除数据后单元格错位的问题。
+- 🐞 `<pro>Table`: 修复编辑器为多语言输入框时，无法通过回车跳转到下一行。
 - 🐞 `<pro>Button`: 修复禁用状态下文字溢出省略的样式失效的问题。
 
 ## 1.6.7

components-pro/intl-field/IntlField.tsx

@@ -38,6 +38,8 @@ export interface IntlFieldProps extends TextAreaProps {
 export default class IntlField extends TextArea<IntlFieldProps> {
   static displayName = 'IntlField';
 
+  static __PRO_INTLFIELD = true;
+
   static defaultProps = {
     ...TextArea.defaultProps,
     rows: 3,

components-pro/table/TableEditor.tsx

@@ -27,6 +27,7 @@ import { ShowHelp } from '../field/enum';
 import autobind from '../_util/autobind';
 import { TextAreaProps } from '../text-area/TextArea';
 import { ResizeType } from '../text-area/enum';
+import { IntlType } from '../intl-field/enum';
 import { ColumnLock } from './enum';
 import transform from '../_util/transform';
 import { LabelLayout, ShowValidation } from '../form/enum';
@@ -39,6 +40,10 @@ function isTextArea(editor: ReactElement<FormFieldProps>): editor is ReactElemen
   return (editor.type as any).__PRO_TEXTAREA;
 }
 
+function isIntlField(editor: ReactElement<FormFieldProps>): boolean {
+  return (editor.type as any).__PRO_INTLFIELD;
+}
+
 function isHTMLElement(el): el is HTMLElement {
   return el;
 }
@@ -553,6 +558,8 @@ export default class TableEditor extends Component<TableEditorProps> {
         if (height !== undefined) {
           style.height = pxToRem(height, true);
         }
+        const isMultipleLineIntlField = isIntlField(cellEditor) && this.editorProps.type === IntlType.multipleLine;
+        const isTextAreaEditor = isTextArea(cellEditor) && (!isIntlField(cellEditor) || isMultipleLineIntlField);
         const newEditorProps = {
           ...otherProps,
           style,
@@ -561,7 +568,7 @@ export default class TableEditor extends Component<TableEditorProps> {
           name,
           tagRenderer,
           onKeyDown: this.handleEditorKeyDown,
-          onEnterDown: isTextArea(cellEditor) ? undefined : this.handleEditorKeyEnterDown,
+          onEnterDown: isTextAreaEditor ? undefined : this.handleEditorKeyEnterDown,
           onBlur: this.handleEditorBlur,
           tabIndex: currentEditorName ? 0 : -1,
           showHelp: ShowHelp.none,