From 3624c7b9a828fd90704982d8582fbeb3779680be Mon Sep 17 00:00:00 2001
From: catchonme <catchonme@163.com>
Date: Thu, 14 Nov 2019 15:44:32 +0800
Subject: [PATCH 1/3] =?UTF-8?q?select=E4=B8=AD=E6=96=87=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E6=9C=AA=E5=AE=8C=E6=88=90=E6=97=B6=E4=B8=8D=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E9=80=89=E9=A1=B9=E7=9A=84=E8=AF=B7=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Select.tsx     | 22 +++++++++++++++++++++-
 src/renderers/Form/Item.tsx   |  2 +-
 src/renderers/Form/Select.tsx |  2 +-
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/components/Select.tsx b/src/components/Select.tsx
index 8a3fe0c8..785da3dd 100644
--- a/src/components/Select.tsx
+++ b/src/components/Select.tsx
@@ -197,6 +197,7 @@ interface SelectState {
   inputValue: string;
   highlightedIndex: number;
   selection: Array<Option>;
+  composing: boolean;
 }
 
 export class Select extends React.Component<SelectProps, SelectState> {
@@ -244,10 +245,13 @@ export class Select extends React.Component<SelectProps, SelectState> {
     this.handleAddClick = this.handleAddClick.bind(this);
     this.handleEditClick = this.handleEditClick.bind(this);
     this.handleDeleteClick = this.handleDeleteClick.bind(this);
+    this.onCompositionStart = this.onCompositionStart.bind(this);
+    this.onCompositionEnd = this.onCompositionEnd.bind(this);
 
     this.state = {
       isOpen: false,
       isFocused: false,
+      composing: false,
       inputValue: '',
       highlightedIndex: -1,
       selection: value2array(props.value, props)
@@ -349,6 +353,20 @@ export class Select extends React.Component<SelectProps, SelectState> {
     this.props.onBlur && this.props.onBlur(e);
   }
 
+  // 输入中文未完成时不发送加载选项的请求
+  onCompositionStart(e: any) {
+    this.setState({
+      composing: true
+    });
+  }
+
+  onCompositionEnd(e: any) {
+    this.setState({
+      composing: false
+    });
+    this.handleInputChange(e);
+  }
+
   focus() {
     this.input
       ? this.input.focus()
@@ -406,7 +424,7 @@ export class Select extends React.Component<SelectProps, SelectState> {
       {
         inputValue: evt.currentTarget.value
       },
-      () => loadOptions && loadOptions(this.state.inputValue)
+      () => !this.state.composing && loadOptions && loadOptions(this.state.inputValue)
     );
   }
 
@@ -603,6 +621,8 @@ export class Select extends React.Component<SelectProps, SelectState> {
                 disabled: disabled,
                 placeholder: searchPromptText,
                 onChange: this.handleInputChange,
+                onCompositionStart: this.onCompositionStart,
+                onCompositionEnd: this.onCompositionEnd,
                 ref: this.inputRef
               })}
             />
diff --git a/src/renderers/Form/Item.tsx b/src/renderers/Form/Item.tsx
index 4f956394..2939b601 100644
--- a/src/renderers/Form/Item.tsx
+++ b/src/renderers/Form/Item.tsx
@@ -244,7 +244,7 @@ export class FormItemWrap extends React.Component<FormItemProps> {
 
     // 强制不渲染 label 的话
     if (renderLabel === false) {
-      label = false;
+      label = label === false ? false : '';
     }
 
     description = description || desc;
diff --git a/src/renderers/Form/Select.tsx b/src/renderers/Form/Select.tsx
index 85c5e144..fcb808b0 100644
--- a/src/renderers/Form/Select.tsx
+++ b/src/renderers/Form/Select.tsx
@@ -115,7 +115,7 @@ export default class SelectControl extends React.Component<SelectProps, any> {
       throw new Error('fetcher is required');
     }
 
-    if (this.cache[input] || ~input.indexOf("'") /*中文没输完 233*/) {
+    if (this.cache[input]) {
       let options = this.cache[input] || [];
       let combinedOptions = this.mergeOptions(options);
       setOptions(combinedOptions);

From 0782266701d5b75af71c22bad9dfe7ba7de0a8f5 Mon Sep 17 00:00:00 2001
From: catchonme <catchonme@163.com>
Date: Fri, 15 Nov 2019 10:43:54 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=B8=AD=E6=96=87=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E6=9C=AA=E5=AE=8C=E6=88=90=E6=97=B6=E4=B8=8D=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E9=80=89=E9=A1=B9=E7=9A=84=E8=AF=B7=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Input.tsx    | 63 +++++++++++++++++++++++++++++++++++++
 src/components/Select.tsx   | 25 ++-------------
 src/renderers/Form/Text.tsx |  3 +-
 3 files changed, 68 insertions(+), 23 deletions(-)
 create mode 100644 src/components/Input.tsx

diff --git a/src/components/Input.tsx b/src/components/Input.tsx
new file mode 100644
index 00000000..ac3891fe
--- /dev/null
+++ b/src/components/Input.tsx
@@ -0,0 +1,63 @@
+import React from 'react';
+import {autobind} from '../utils/helper';
+
+export interface InputProps
+  extends React.InputHTMLAttributes<HTMLInputElement> {
+  forwardedRef: React.Ref<HTMLInputElement>;
+}
+
+export interface InputState {
+  value: any;
+}
+
+class InputInner extends React.Component<InputProps, InputState> {
+  isOnComposition: boolean = false;
+  state = {value: this.props.value};
+
+  componentWillReceiveProps(nextProps: InputProps) {
+    if (this.props.value !== nextProps.value) {
+      this.setState({
+        value: nextProps.value
+      });
+    }
+  }
+
+  @autobind
+  handleComposition(e: React.CompositionEvent<HTMLInputElement>) {
+    this.isOnComposition = e.type !== 'compositionend';
+    if (!this.isOnComposition) {
+      this.handleChange(e as any);
+    }
+  }
+
+  @autobind
+  handleChange(e: React.ChangeEvent<HTMLInputElement>) {
+    const {onChange} = this.props;
+    const value = e.currentTarget.value;
+
+    this.isOnComposition || (onChange && onChange(e));
+    this.setState({
+      value
+    });
+  }
+
+  render() {
+    const {forwardedRef, ...rest} = this.props;
+
+    return (
+      <input
+        {...rest}
+        value={this.state.value}
+        ref={forwardedRef}
+        onChange={this.handleChange}
+        onCompositionStart={this.handleComposition}
+        onCompositionUpdate={this.handleComposition}
+        onCompositionEnd={this.handleComposition}
+      />
+    );
+  }
+}
+
+export default React.forwardRef<HTMLInputElement>((props, ref) => {
+  return <InputInner {...props} forwardedRef={ref} />;
+}) as React.ReactType<React.InputHTMLAttributes<HTMLInputElement>>;
\ No newline at end of file
diff --git a/src/components/Select.tsx b/src/components/Select.tsx
index 785da3dd..b1b8e493 100644
--- a/src/components/Select.tsx
+++ b/src/components/Select.tsx
@@ -22,6 +22,7 @@ import {highlight} from '../renderers/Form/Options';
 import {findDOMNode} from 'react-dom';
 import {ClassNamesFn, themeable} from '../theme';
 import Checkbox from './Checkbox';
+import Input from './Input';
 
 export interface Option {
   label?: string;
@@ -197,7 +198,6 @@ interface SelectState {
   inputValue: string;
   highlightedIndex: number;
   selection: Array<Option>;
-  composing: boolean;
 }
 
 export class Select extends React.Component<SelectProps, SelectState> {
@@ -245,13 +245,10 @@ export class Select extends React.Component<SelectProps, SelectState> {
     this.handleAddClick = this.handleAddClick.bind(this);
     this.handleEditClick = this.handleEditClick.bind(this);
     this.handleDeleteClick = this.handleDeleteClick.bind(this);
-    this.onCompositionStart = this.onCompositionStart.bind(this);
-    this.onCompositionEnd = this.onCompositionEnd.bind(this);
 
     this.state = {
       isOpen: false,
       isFocused: false,
-      composing: false,
       inputValue: '',
       highlightedIndex: -1,
       selection: value2array(props.value, props)
@@ -353,20 +350,6 @@ export class Select extends React.Component<SelectProps, SelectState> {
     this.props.onBlur && this.props.onBlur(e);
   }
 
-  // 输入中文未完成时不发送加载选项的请求
-  onCompositionStart(e: any) {
-    this.setState({
-      composing: true
-    });
-  }
-
-  onCompositionEnd(e: any) {
-    this.setState({
-      composing: false
-    });
-    this.handleInputChange(e);
-  }
-
   focus() {
     this.input
       ? this.input.focus()
@@ -424,7 +407,7 @@ export class Select extends React.Component<SelectProps, SelectState> {
       {
         inputValue: evt.currentTarget.value
       },
-      () => !this.state.composing && loadOptions && loadOptions(this.state.inputValue)
+      () => loadOptions && loadOptions(this.state.inputValue)
     );
   }
 
@@ -614,15 +597,13 @@ export class Select extends React.Component<SelectProps, SelectState> {
             })}
           >
             <Icon icon="search" className="icon" />
-            <input
+            <Input
               {...getInputProps({
                 onFocus: this.onFocus,
                 onBlur: this.onBlur,
                 disabled: disabled,
                 placeholder: searchPromptText,
                 onChange: this.handleInputChange,
-                onCompositionStart: this.onCompositionStart,
-                onCompositionEnd: this.onCompositionEnd,
                 ref: this.inputRef
               })}
             />
diff --git a/src/renderers/Form/Text.tsx b/src/renderers/Form/Text.tsx
index aef0e087..2f0c4c8c 100644
--- a/src/renderers/Form/Text.tsx
+++ b/src/renderers/Form/Text.tsx
@@ -9,6 +9,7 @@ import debouce = require('lodash/debounce');
 import {filter} from '../../utils/tpl';
 import find = require('lodash/find');
 import {Icon} from '../../components/icons';
+import Input from '../../components/Input';
 import {autobind, createObject, setVariable} from '../../utils/helper';
 import {isEffectiveApi} from '../../utils/api';
 
@@ -495,7 +496,7 @@ export default class TextControl extends React.PureComponent<
                   )
                 )}
 
-                <input
+                <Input
                   {...getInputProps({
                     name,
                     ref: this.inputRef,

From af2de7be16681deb5074e068007ac615678d8b1d Mon Sep 17 00:00:00 2001
From: catchonme <catchonme@163.com>
Date: Fri, 15 Nov 2019 11:03:35 +0800
Subject: [PATCH 3/3] =?UTF-8?q?combo=E4=BF=AE=E6=94=B9tab=E7=9A=84activeKe?=
 =?UTF-8?q?y=E4=B8=BA=E6=9C=89=E6=95=88=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderers/Form/Combo.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderers/Form/Combo.tsx b/src/renderers/Form/Combo.tsx
index 84e60f89..0c22092c 100644
--- a/src/renderers/Form/Combo.tsx
+++ b/src/renderers/Form/Combo.tsx
@@ -153,7 +153,7 @@ export default class ComboControl extends React.Component<ComboProps> {
       });
 
       if (store.activeKey >= values.length) {
-        store.setActiveKey(values.length - 1);
+        store.setActiveKey(Math.max(0, values.length - 1));
       }
     }
   }