From cb3b422935e006e04c7ba701d4749672d30c89c4 Mon Sep 17 00:00:00 2001
From: catchonme <catchonme@163.com>
Date: Tue, 20 Aug 2019 13:51:01 +0800
Subject: [PATCH 01/13] =?UTF-8?q?form=E5=A2=9E=E5=8A=A0trim=EF=BC=8CtreeSe?=
 =?UTF-8?q?lect=E5=A2=9E=E5=8A=A0maxLength/minLength?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Tree.tsx           | 11 +++++++++++
 src/renderers/Form/TreeSelect.tsx |  6 +++++-
 src/renderers/Form/index.tsx      |  9 +++++++--
 src/store/form.ts                 |  5 +++++
 src/store/formItem.ts             | 11 +++++++++--
 src/utils/helper.ts               | 14 ++++++++++++++
 6 files changed, 51 insertions(+), 5 deletions(-)

diff --git a/src/components/Tree.tsx b/src/components/Tree.tsx
index 72f75280d..35eb260ac 100644
--- a/src/components/Tree.tsx
+++ b/src/components/Tree.tsx
@@ -51,6 +51,8 @@ interface TreeSelectorProps {
     rootValue?: any;
     cascade?: boolean;
     selfDisabledAffectChildren?: boolean;
+    minLength?: number;
+    maxLength?: number;
 }
 
 interface TreeSelectorState {
@@ -292,6 +294,8 @@ export class TreeSelector extends React.Component<TreeSelectorProps, TreeSelecto
             classnames: cx,
             highlightTxt,
             data,
+            maxLength,
+            minLength
         } = this.props;
 
         let childrenChecked = 0;
@@ -327,6 +331,13 @@ export class TreeSelector extends React.Component<TreeSelectorProps, TreeSelecto
 
             let nodeDisabled = !!uncheckable || !!disabled || selfDisabled;
 
+            if (
+                (maxLength && !selfChecked && this.state.value.length >= maxLength)
+                || (minLength && selfChecked && this.state.value.length <= minLength)
+            ) {
+                nodeDisabled = true;
+            }
+
             const checkbox: JSX.Element | null = multiple ? (
                 <label className={cx(`Checkbox Checkbox--checkbox Checkbox--sm`)}>
                     <input
diff --git a/src/renderers/Form/TreeSelect.tsx b/src/renderers/Form/TreeSelect.tsx
index 3cbf025ec..e46c378c4 100644
--- a/src/renderers/Form/TreeSelect.tsx
+++ b/src/renderers/Form/TreeSelect.tsx
@@ -344,7 +344,9 @@ export default class TreeSelectControl extends React.Component<TreeSelectProps,
             classPrefix: ns,
             optionsPlaceholder,
             searchable,
-            autoComplete
+            autoComplete,
+            maxLength,
+            minLength
         } = this.props;
 
         let filtedOptions = !isEffectiveApi(autoComplete) && searchable && this.state.inputValue ? this.filterOptions(options, this.state.inputValue) : options;
@@ -389,6 +391,8 @@ export default class TreeSelectControl extends React.Component<TreeSelectProps,
                         hideRoot
                         value={value || ''}
                         nameField="label"
+                        maxLength={maxLength}
+                        minLength={minLength}
                     />
                 </PopOver>
             </Overlay>
diff --git a/src/renderers/Form/index.tsx b/src/renderers/Form/index.tsx
index 0494a9b27..9a7a195a7 100644
--- a/src/renderers/Form/index.tsx
+++ b/src/renderers/Form/index.tsx
@@ -486,9 +486,14 @@ export default class Form extends React.Component<FormProps, object> {
             target,
             env,
             onChange,
-            clearPersistDataAfterSubmit
+            clearPersistDataAfterSubmit,
+            trim
         } = this.props;
 
+        if (trim) {
+            store.trimValues();
+        }
+
         if (Array.isArray(action.required) && action.required.length) {
             return store
                 .validateFields(action.required)
@@ -1029,7 +1034,7 @@ export class FormRenderer extends Form {
             }
 
             const component = scoped.getComponentByName(name);
-            component && component.receive && component && component.receive(values, subPath);
+            component && component.receive && component.receive(values, subPath);
             return;
         }
 
diff --git a/src/store/form.ts b/src/store/form.ts
index caca950b1..e31f5fa90 100644
--- a/src/store/form.ts
+++ b/src/store/form.ts
@@ -180,6 +180,10 @@ export const FormStore = ServiceStore
             self.data = data;
         }
 
+        function trimValues() {
+            self.items.forEach(item => item.trimValue());
+        }
+
         function syncOptions() {
             self.items.forEach(item => item.syncOptions());
         }
@@ -410,6 +414,7 @@ export const FormStore = ServiceStore
             setInited,
             setValues,
             setValueByName,
+            trimValues,
             submit,
             validate,
             validateFields,
diff --git a/src/store/formItem.ts b/src/store/formItem.ts
index f5bdb307c..fa94e8691 100644
--- a/src/store/formItem.ts
+++ b/src/store/formItem.ts
@@ -23,7 +23,8 @@ import findIndex = require('lodash/findIndex');
 import {
     isArrayChilrenModified,
     hasOwnProperty,
-    isObject
+    isObject,
+    iterateChildren
 } from '../utils/helper';
 import {
     flattenTree
@@ -491,6 +492,11 @@ export const FormItemStore = types
             clearError();
         }
 
+        function trimValue() {
+            let value = iterateChildren(self.value, (item:any) => typeof item === 'string' && item.trim());
+            value && changeValue(value, false);
+        }
+
         return {
             config,
             changeValue,
@@ -502,7 +508,8 @@ export const FormItemStore = types
             loadOptions,
             syncOptions,
             setLoading,
-            reset
+            reset,
+            trimValue
         }
     });
 
diff --git a/src/utils/helper.ts b/src/utils/helper.ts
index 3c67e00be..68fe42d2b 100644
--- a/src/utils/helper.ts
+++ b/src/utils/helper.ts
@@ -724,4 +724,18 @@ export function chainFunctions(...fns:Array<(...args:Array<any>) => void>):(...a
     return (...args:Array<any>) => {
         fns.forEach(fn => fn && fn(...args));
     }
+}
+
+export function iterateChildren(value: any, fn: Function): any {
+    if (Array.isArray(value)) {
+        return value.map(item => iterateChildren(item, fn));
+    }
+    if (isObject(value)) {
+        let tmpValue = Object.assign({}, value);
+        Object.keys(tmpValue).forEach(key => {
+            (tmpValue as {[propName: string]: any})[key] = iterateChildren((tmpValue as {[propName: string]: any})[key], fn);
+        });
+        return tmpValue;
+    }
+    return fn(value);
 }
\ No newline at end of file

From 19755b7af57c9c4f06ef7edf0a4085ddfb23154e Mon Sep 17 00:00:00 2001
From: catchonme <catchonme@163.com>
Date: Tue, 20 Aug 2019 19:19:39 +0800
Subject: [PATCH 02/13] =?UTF-8?q?=E5=A2=9E=E5=8A=A0each=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/renderers.md           |  2 +-
 docs/renderers/Each.md      | 19 +++++++++++++++++++
 examples/components/Doc.jsx |  7 +++++++
 3 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 docs/renderers/Each.md

diff --git a/docs/renderers.md b/docs/renderers.md
index b13e03b86..fc681c8dd 100644
--- a/docs/renderers.md
+++ b/docs/renderers.md
@@ -40,7 +40,7 @@ amis 页面是通过 JSON 配置出来的，是由一个一个渲染模型组成
     -   [Date-Range](./renderers/Form/Date-Range.md): 日期范围类型
     -   [Color](./renderers/Form/Color.md): 颜色选择器
     -   [Range](./renderers/Form/Range.md): 范围输入框
-    -   [Image](./renderers/Form/Image.md): 图片格式输
+    -   [Image](./renderers/Form/Image.md): 图片输入
     -   [File](./renderers/Form/File.md): 文件输入
     -   [Matrix](./renderers/Form/Matrix.md): 矩阵类型的输入框
     -   [Tree](./renderers/Form/Tree.md): 树形结构输入框
diff --git a/docs/renderers/Each.md b/docs/renderers/Each.md
new file mode 100644
index 000000000..b1f12730c
--- /dev/null
+++ b/docs/renderers/Each.md
@@ -0,0 +1,19 @@
+## Each
+
+基于现有变量循环输出渲染器
+
+-   `type` 请设置 `each`。
+-   `value` 格式为数组。
+-   `items` 使用`value`中的数据，循环输出渲染器。
+
+
+```schema:height="160" scope="body"
+{
+    "type": "each",
+    "value": ["A", "B", "C"],
+    "items": {
+        "type": "tpl",
+        "tpl": "<span class='label label-default'><%= data.item %></span> "
+    }
+}
+```
diff --git a/examples/components/Doc.jsx b/examples/components/Doc.jsx
index 54691fe47..3b6e73881 100644
--- a/examples/components/Doc.jsx
+++ b/examples/components/Doc.jsx
@@ -436,6 +436,13 @@ export default {
                         cb(null, makeMarkdownRenderer(doc));
                     }),
                 },
+                {
+                    label: 'Each',
+                    path: '/docs/renderers/Each',
+                    getComponent: (location, cb) => require(['../../docs/renderers/Each.md'], (doc) => {
+                        cb(null, makeMarkdownRenderer(doc));
+                    }),
+                },
                 {
                     label: 'Tpl',
                     path: '/docs/renderers/Tpl',

From f1f0ae7b0ec15c1dcda7fd43313748e694101bd3 Mon Sep 17 00:00:00 2001
From: liaoxuezhi <liaoxuezhi@baidu.com>
Date: Tue, 20 Aug 2019 23:26:05 +0800
Subject: [PATCH 03/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=B9=20children=20?=
 =?UTF-8?q?=E7=9A=84=E8=B0=83=E7=94=A8=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/factory.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/factory.tsx b/src/factory.tsx
index 4c9d597cd..3218089b5 100644
--- a/src/factory.tsx
+++ b/src/factory.tsx
@@ -486,12 +486,12 @@ class SchemaRenderer extends React.Component<SchemaRendererProps, any> {
         if (Array.isArray(schema)) {
             return renderChildren($path, schema, rest) as JSX.Element;
         } else if (schema.children) {
-            return typeof schema.children === 'function' ? schema.children({
+            return React.isValidElement(schema.children) ? schema.children : React.createElement(schema.children as any, {
                 ...rest,
                 $path: $path,
                 render: this.renderChild,
                 ref: this.refFn,
-            }, schema) : schema.children;
+            });
         } else if (!this.renderer) {
             return (
                 <LazyComponent

From d79394a7985f70e8cba250fd3f500f32e38c8551 Mon Sep 17 00:00:00 2001
From: liaoxuezhi <liaoxuezhi@baidu.com>
Date: Tue, 20 Aug 2019 23:47:02 +0800
Subject: [PATCH 04/13] rm ref

---
 src/factory.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/factory.tsx b/src/factory.tsx
index 3218089b5..8ea08651b 100644
--- a/src/factory.tsx
+++ b/src/factory.tsx
@@ -489,8 +489,7 @@ class SchemaRenderer extends React.Component<SchemaRendererProps, any> {
             return React.isValidElement(schema.children) ? schema.children : React.createElement(schema.children as any, {
                 ...rest,
                 $path: $path,
-                render: this.renderChild,
-                ref: this.refFn,
+                render: this.renderChild
             });
         } else if (!this.renderer) {
             return (

From 891a935f65a37e23d911ef167fbf2cde345374ff Mon Sep 17 00:00:00 2001
From: catchonme <catchonme@163.com>
Date: Wed, 21 Aug 2019 10:22:08 +0800
Subject: [PATCH 05/13] =?UTF-8?q?treeSelect=E5=A2=9E=E5=8A=A0=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Tree.tsx           |  8 ++++++--
 src/renderers/Form/Options.tsx    |  4 ++++
 src/renderers/Form/TreeSelect.tsx | 16 ++++++++++++++++
 src/utils/helper.ts               |  2 +-
 4 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/src/components/Tree.tsx b/src/components/Tree.tsx
index 35eb260ac..4e538c3d0 100644
--- a/src/components/Tree.tsx
+++ b/src/components/Tree.tsx
@@ -331,9 +331,13 @@ export class TreeSelector extends React.Component<TreeSelectorProps, TreeSelecto
 
             let nodeDisabled = !!uncheckable || !!disabled || selfDisabled;
 
+            // todo 加验证，提交前需要验证不能超出 maxLength 或者少于 minLength
             if (
-                (maxLength && !selfChecked && this.state.value.length >= maxLength)
-                || (minLength && selfChecked && this.state.value.length <= minLength)
+                !nodeDisabled
+                && (
+                    (maxLength && !selfChecked && this.state.value.length >= maxLength)
+                    || (minLength && selfChecked && this.state.value.length <= minLength)
+                )
             ) {
                 nodeDisabled = true;
             }
diff --git a/src/renderers/Form/Options.tsx b/src/renderers/Form/Options.tsx
index 33b4c8ed4..217dc1273 100644
--- a/src/renderers/Form/Options.tsx
+++ b/src/renderers/Form/Options.tsx
@@ -158,6 +158,10 @@ export function registerOptionsControl(config: OptionsConfig) {
             return false;
         }
 
+        validate() {
+            return Control.prototype.validate && Control.prototype.validate.call(this);
+        }
+
         componentWillReceiveProps(nextProps:OptionsControlProps) {
             const props = this.props;
             const formItem = nextProps.formItem as IFormItemStore;
diff --git a/src/renderers/Form/TreeSelect.tsx b/src/renderers/Form/TreeSelect.tsx
index e46c378c4..549a4d64a 100644
--- a/src/renderers/Form/TreeSelect.tsx
+++ b/src/renderers/Form/TreeSelect.tsx
@@ -122,6 +122,22 @@ export default class TreeSelectControl extends React.Component<TreeSelectProps,
         }
     }
 
+    validate():any {
+        const {
+            value,
+            minLength,
+            maxLength,
+            delimiter
+        } = this.props;
+
+        let curValue = Array.isArray(value) ? value : (value ? value : '').split(delimiter || ',');
+        if (minLength && curValue.length < minLength) {
+            return `已选择数量低于设定的最小个数${minLength}，请选择更多的选项。`;
+        } else if (maxLength && curValue.length > maxLength) {
+            return `已选择数量超出设定的最大个数${maxLength}，请取消选择超出的选项。`;
+        }
+    }
+
     removeItem(index:number, e?: React.MouseEvent<HTMLElement>) {
         const {
             selectedOptions,
diff --git a/src/utils/helper.ts b/src/utils/helper.ts
index 68fe42d2b..9223777a1 100644
--- a/src/utils/helper.ts
+++ b/src/utils/helper.ts
@@ -733,7 +733,7 @@ export function iterateChildren(value: any, fn: Function): any {
     if (isObject(value)) {
         let tmpValue = Object.assign({}, value);
         Object.keys(tmpValue).forEach(key => {
-            (tmpValue as {[propName: string]: any})[key] = iterateChildren((tmpValue as {[propName: string]: any})[key], fn);
+            (tmpValue as PlainObject)[key] = iterateChildren((tmpValue as PlainObject)[key], fn);
         });
         return tmpValue;
     }

From 7d5401c2373ed9710d011a5b41a0031a7a529f19 Mon Sep 17 00:00:00 2001
From: catchonme <catchonme@163.com>
Date: Wed, 21 Aug 2019 11:17:47 +0800
Subject: [PATCH 06/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9Options=E7=9A=84?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Tree.tsx        | 1 -
 src/renderers/Form/Options.tsx | 8 ++++----
 src/renderers/Form/index.tsx   | 5 +++--
 src/store/formItem.ts          | 2 +-
 src/utils/helper.ts            | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/components/Tree.tsx b/src/components/Tree.tsx
index 4e538c3d0..1c638f92d 100644
--- a/src/components/Tree.tsx
+++ b/src/components/Tree.tsx
@@ -331,7 +331,6 @@ export class TreeSelector extends React.Component<TreeSelectorProps, TreeSelecto
 
             let nodeDisabled = !!uncheckable || !!disabled || selfDisabled;
 
-            // todo 加验证，提交前需要验证不能超出 maxLength 或者少于 minLength
             if (
                 !nodeDisabled
                 && (
diff --git a/src/renderers/Form/Options.tsx b/src/renderers/Form/Options.tsx
index 217dc1273..ccbb9990a 100644
--- a/src/renderers/Form/Options.tsx
+++ b/src/renderers/Form/Options.tsx
@@ -158,10 +158,6 @@ export function registerOptionsControl(config: OptionsConfig) {
             return false;
         }
 
-        validate() {
-            return Control.prototype.validate && Control.prototype.validate.call(this);
-        }
-
         componentWillReceiveProps(nextProps:OptionsControlProps) {
             const props = this.props;
             const formItem = nextProps.formItem as IFormItemStore;
@@ -230,6 +226,10 @@ export function registerOptionsControl(config: OptionsConfig) {
             }
         }
 
+        getWrappedInstance() {
+            return this.input;
+        }
+
         inputRef(ref:any) {
             this.input = ref;
         }
diff --git a/src/renderers/Form/index.tsx b/src/renderers/Form/index.tsx
index 9a7a195a7..227904e41 100644
--- a/src/renderers/Form/index.tsx
+++ b/src/renderers/Form/index.tsx
@@ -89,6 +89,7 @@ export interface FormProps extends RendererProps, FormSchema {
     canAccessSuperData: boolean;
     persistData: boolean;   // 开启本地缓存
     clearPersistDataAfterSubmit: boolean; // 提交成功后清空本地缓存
+    trimValues?: boolean;
     onInit?: (values:object) => any;
     onReset?: (values:object) => void;
     onSubmit?: (values:object, action:any) => any;
@@ -487,10 +488,10 @@ export default class Form extends React.Component<FormProps, object> {
             env,
             onChange,
             clearPersistDataAfterSubmit,
-            trim
+            trimValues
         } = this.props;
 
-        if (trim) {
+        if (trimValues) {
             store.trimValues();
         }
 
diff --git a/src/store/formItem.ts b/src/store/formItem.ts
index fa94e8691..c23945f64 100644
--- a/src/store/formItem.ts
+++ b/src/store/formItem.ts
@@ -493,7 +493,7 @@ export const FormItemStore = types
         }
 
         function trimValue() {
-            let value = iterateChildren(self.value, (item:any) => typeof item === 'string' && item.trim());
+            let value = iterateChildren(self.value, (item:any) => typeof item === 'string' ? item.trim() : item);
             value && changeValue(value, false);
         }
 
diff --git a/src/utils/helper.ts b/src/utils/helper.ts
index 9223777a1..4506082de 100644
--- a/src/utils/helper.ts
+++ b/src/utils/helper.ts
@@ -731,7 +731,7 @@ export function iterateChildren(value: any, fn: Function): any {
         return value.map(item => iterateChildren(item, fn));
     }
     if (isObject(value)) {
-        let tmpValue = Object.assign({}, value);
+        let tmpValue = {...value};
         Object.keys(tmpValue).forEach(key => {
             (tmpValue as PlainObject)[key] = iterateChildren((tmpValue as PlainObject)[key], fn);
         });

From 61d72b2cbdf7b0f4a9e1646d1cc60086e65f3f9c Mon Sep 17 00:00:00 2001
From: catchonme <catchonme@163.com>
Date: Wed, 21 Aug 2019 13:50:28 +0800
Subject: [PATCH 07/13] =?UTF-8?q?=E6=96=87=E6=A1=A3=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/getting_started.md      | 2 +-
 docs/renderers/Form/Image.md | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/getting_started.md b/docs/getting_started.md
index 44f57f94f..d41ad49c5 100644
--- a/docs/getting_started.md
+++ b/docs/getting_started.md
@@ -222,7 +222,7 @@ class MyComponent extends React.Component<any, any> {
 
 注意：以上的 SDK 地址是一个页面跳转，会跳转到一个 CDN 地址，而且每次跳转都是最新的版本，随着 amis 的升级这个地址会一直变动，如果你的页面已经完成功能回归，请直接使用某个固定地址，这样才不会因为 amis 升级而导致你的页面不可用。
 
-另外，sdk 代码也伴随 npm 一起发布了，不实用 CDN 版本，直接替换成npm包里面的 `amis/sdk/sdk.js` 和 `amis/sdk/sdk.css` 即可。
+另外，sdk 代码也伴随 npm 一起发布了，不使用 CDN 版本，直接替换成npm包里面的 `amis/sdk/sdk.js` 和 `amis/sdk/sdk.css` 即可。
 
 示例:
 
diff --git a/docs/renderers/Form/Image.md b/docs/renderers/Form/Image.md
index 73cfae05b..74964ce14 100644
--- a/docs/renderers/Form/Image.md
+++ b/docs/renderers/Form/Image.md
@@ -25,6 +25,7 @@
     -   `minHeight` 限制图片最小高度。
     -   `maxWidth` 限制图片最大宽度。
     -   `maxHeight` 限制图片最大高度。
+    -   `aspectRatio` 限制图片宽高比，格式为浮点型数字，默认 `1` 即 `1:1`，如果要设置 `16:9` 请设置 `1.7777777777777777` 即 `16 / 9`。。
 -   **还有更多通用配置请参考** [FormItem](./FormItem.md)
 
 ```schema:height="250" scope="form-item"

From cc7009b72945ae2e54880dade3114381c373575f Mon Sep 17 00:00:00 2001
From: liaoxuezhi <liaoxuezhi@baidu.com>
Date: Wed, 21 Aug 2019 15:57:18 +0800
Subject: [PATCH 08/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20Drawer=20actions=20?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=8D=E5=90=8C=E6=AD=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderers/Drawer.tsx       |  4 ++++
 src/renderers/Form/Control.tsx | 18 ++++++++++++------
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/renderers/Drawer.tsx b/src/renderers/Drawer.tsx
index 162238930..1f2b8b2a9 100644
--- a/src/renderers/Drawer.tsx
+++ b/src/renderers/Drawer.tsx
@@ -241,6 +241,10 @@ export default class Drawer extends React.Component<DrawerProps, object> {
     renderBody(body: SchemaNode, key?: any): React.ReactNode {
         let {render, store} = this.props;
 
+        if (Array.isArray(body)) {
+            return body.map((body, key) => this.renderBody(body, key));
+        }
+
         let schema: Schema = body as Schema;
         let subProps: any = {
             key,
diff --git a/src/renderers/Form/Control.tsx b/src/renderers/Form/Control.tsx
index 4556b7578..a480d09e9 100644
--- a/src/renderers/Form/Control.tsx
+++ b/src/renderers/Form/Control.tsx
@@ -368,18 +368,24 @@ export default class FormControl extends React.Component<FormControlProps, any>
     }
 
     handleBulkChange(values:any, submitOnChange:boolean = this.props.control.submitOnChange) {
-        if (!isObject(values) || !this.model) {
-            return;
-        }
-        
         const {
             formStore: form,
             onChange,
             control: {
-                validateOnChange
-            }
+                validateOnChange,
+                type
+            },
+            onBulkChange
         } = this.props;
 
+
+        if (!isObject(values)) {
+            return;
+        } else if (!this.model || ~['service'].indexOf(type)) {
+            onBulkChange && onBulkChange(values);
+            return;
+        }
+
         let lastKey:string = '', lastValue:any;
         Object.keys(values).forEach(key => {
             const value = values[key];

From 8b710d7aff0eb93aa12fb6f075d3ee1c922ec449 Mon Sep 17 00:00:00 2001
From: liaoxuezhi <liaoxuezhi@baidu.com>
Date: Wed, 21 Aug 2019 20:03:24 +0800
Subject: [PATCH 09/13] =?UTF-8?q?index.tsx=20=E6=B7=BB=E5=8A=A0=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fis-conf.js   |  7 +++++++
 src/index.tsx | 10 ++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/fis-conf.js b/fis-conf.js
index 5b1f73bd0..f19878c5f 100644
--- a/fis-conf.js
+++ b/fis-conf.js
@@ -2,6 +2,7 @@
  * @file fis-conf.js 配置
  */
 const path = require('path');
+const package = require('./package.json');
 const parserMarkdown = require('./build/md-parser');
 fis.get('project.ignore').push(
     'public/**',
@@ -62,6 +63,12 @@ fis.match('/docs/**.md', {
     isMod: true
 });
 
+fis.on('compile:parser', function (file) {
+    if (file.subpath === '/src/index.tsx') {
+        file.setContent(file.getContent().replace('@version', package.version));
+    }
+});
+
 fis.match('{*.ts,*.jsx,*.tsx,/src/**.js,/src/**.ts}', {
     parser: [fis.plugin('typescript', {
         importHelpers: true,
diff --git a/src/index.tsx b/src/index.tsx
index 0613716a0..465853286 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -1,8 +1,10 @@
-/**
- * @file 文件入口
- * @author fex
+/** @license amis v@version
+ *
+ * Copyright Baidu
+ *
+ * This source code is licensed under the Apache license found in the
+ * LICENSE file in the root directory of this source tree.
  */
-
 import {render, Renderer, getRendererByName, resolveRenderer, filterSchema} from './factory';
 import {wrapFetcher, buildApi} from './utils/api';
 import {filter, reigsterTplEnginer} from './utils/tpl'

From 8f943646b9403c6e14128b5bcae69ab205db639d Mon Sep 17 00:00:00 2001
From: catchonme <catchonme@163.com>
Date: Thu, 22 Aug 2019 10:17:07 +0800
Subject: [PATCH 10/13] =?UTF-8?q?trimValues=E6=97=B6form=E7=9A=84=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=85=A8=E9=83=A8trim=E4=B8=80=E9=81=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/form.ts     | 11 +++++++++--
 src/store/formItem.ts | 11 ++---------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/store/form.ts b/src/store/form.ts
index e31f5fa90..2625c8a26 100644
--- a/src/store/form.ts
+++ b/src/store/form.ts
@@ -28,7 +28,8 @@ import {
     difference,
     guid,
     isObject,
-    isEmpty
+    isEmpty,
+    iterateChildren
 } from '../utils/helper';
 import { IComboStore } from "./combo";
 import isEqual = require('lodash/isEqual');
@@ -181,7 +182,13 @@ export const FormStore = ServiceStore
         }
 
         function trimValues() {
-            self.items.forEach(item => item.trimValue());
+            let data = iterateChildren(self.data, (item:any) => {
+                if (typeof item === 'string' && item.trim() !== '') {
+                    return item.trim();
+                }
+                return item;
+            });
+            self.updateData(data);
         }
 
         function syncOptions() {
diff --git a/src/store/formItem.ts b/src/store/formItem.ts
index c23945f64..f5bdb307c 100644
--- a/src/store/formItem.ts
+++ b/src/store/formItem.ts
@@ -23,8 +23,7 @@ import findIndex = require('lodash/findIndex');
 import {
     isArrayChilrenModified,
     hasOwnProperty,
-    isObject,
-    iterateChildren
+    isObject
 } from '../utils/helper';
 import {
     flattenTree
@@ -492,11 +491,6 @@ export const FormItemStore = types
             clearError();
         }
 
-        function trimValue() {
-            let value = iterateChildren(self.value, (item:any) => typeof item === 'string' ? item.trim() : item);
-            value && changeValue(value, false);
-        }
-
         return {
             config,
             changeValue,
@@ -508,8 +502,7 @@ export const FormItemStore = types
             loadOptions,
             syncOptions,
             setLoading,
-            reset,
-            trimValue
+            reset
         }
     });
 

From cc8fa6c5a4f09926aa8a9bf255c3a054e7556b09 Mon Sep 17 00:00:00 2001
From: catchonme <catchonme@163.com>
Date: Thu, 22 Aug 2019 10:23:10 +0800
Subject: [PATCH 11/13] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=95=B0=E6=8D=AEtrim?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E2=80=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/form.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/store/form.ts b/src/store/form.ts
index 2625c8a26..64c3594e4 100644
--- a/src/store/form.ts
+++ b/src/store/form.ts
@@ -183,7 +183,7 @@ export const FormStore = ServiceStore
 
         function trimValues() {
             let data = iterateChildren(self.data, (item:any) => {
-                if (typeof item === 'string' && item.trim() !== '') {
+                if (typeof item === 'string') {
                     return item.trim();
                 }
                 return item;

From 13831522b12e636382db807b327d192f2b24cc6b Mon Sep 17 00:00:00 2001
From: catchonme <catchonme@163.com>
Date: Thu, 22 Aug 2019 10:25:26 +0800
Subject: [PATCH 12/13] =?UTF-8?q?=E4=BC=98=E5=8C=96trim=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/form.ts | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/store/form.ts b/src/store/form.ts
index 64c3594e4..50578444c 100644
--- a/src/store/form.ts
+++ b/src/store/form.ts
@@ -182,12 +182,7 @@ export const FormStore = ServiceStore
         }
 
         function trimValues() {
-            let data = iterateChildren(self.data, (item:any) => {
-                if (typeof item === 'string') {
-                    return item.trim();
-                }
-                return item;
-            });
+            let data = iterateChildren(self.data, (item:any) => typeof item === 'string' ? item.trim() : item);
             self.updateData(data);
         }
 

From d0d902a6bec6c3cecc6580cd87116dd24bb5bc4d Mon Sep 17 00:00:00 2001
From: catchonme <catchonme@163.com>
Date: Thu, 22 Aug 2019 10:33:27 +0800
Subject: [PATCH 13/13] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=87=BD=E6=95=B0?=
 =?UTF-8?q?=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/form.ts   | 4 ++--
 src/utils/helper.ts | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/store/form.ts b/src/store/form.ts
index 50578444c..5f5d014be 100644
--- a/src/store/form.ts
+++ b/src/store/form.ts
@@ -29,7 +29,7 @@ import {
     guid,
     isObject,
     isEmpty,
-    iterateChildren
+    mapObject
 } from '../utils/helper';
 import { IComboStore } from "./combo";
 import isEqual = require('lodash/isEqual');
@@ -182,7 +182,7 @@ export const FormStore = ServiceStore
         }
 
         function trimValues() {
-            let data = iterateChildren(self.data, (item:any) => typeof item === 'string' ? item.trim() : item);
+            let data = mapObject(self.data, (item:any) => typeof item === 'string' ? item.trim() : item);
             self.updateData(data);
         }
 
diff --git a/src/utils/helper.ts b/src/utils/helper.ts
index 4506082de..4319ec94e 100644
--- a/src/utils/helper.ts
+++ b/src/utils/helper.ts
@@ -726,14 +726,14 @@ export function chainFunctions(...fns:Array<(...args:Array<any>) => void>):(...a
     }
 }
 
-export function iterateChildren(value: any, fn: Function): any {
+export function mapObject(value: any, fn: Function): any {
     if (Array.isArray(value)) {
-        return value.map(item => iterateChildren(item, fn));
+        return value.map(item => mapObject(item, fn));
     }
     if (isObject(value)) {
         let tmpValue = {...value};
         Object.keys(tmpValue).forEach(key => {
-            (tmpValue as PlainObject)[key] = iterateChildren((tmpValue as PlainObject)[key], fn);
+            (tmpValue as PlainObject)[key] = mapObject((tmpValue as PlainObject)[key], fn);
         });
         return tmpValue;
     }