From 38f0f0806bb24226bbe97a38f95014b8c6bc869f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=85=89=E5=BC=98?= Date: Fri, 7 Apr 2017 14:49:46 +0800 Subject: [PATCH] ver. 1.12.22 --- HISTORY.md | 4 ++++ package.json | 2 +- src/CellField/SelectField.jsx | 8 ++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/HISTORY.md b/HISTORY.md index 0719001..1b34b88 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -2,6 +2,10 @@ --- +## 1.12.22 + +* `CHANGED` rowData will be passed in selectCellField's `beforeFetch` & `afterFetch` method. + ## 1.12.21 * `FIXED` set `this.data` in constructor diff --git a/package.json b/package.json index bb5e318..f5d2954 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "uxcore-table", - "version": "1.12.21", + "version": "1.12.22", "description": "table ui component for react", "repository": "https://github.com/uxcore/uxcore-table.git", "author": "zhouquan.yezq", diff --git a/src/CellField/SelectField.jsx b/src/CellField/SelectField.jsx index 29548e2..139312c 100644 --- a/src/CellField/SelectField.jsx +++ b/src/CellField/SelectField.jsx @@ -84,9 +84,9 @@ class SelectField extends CellField { : (/\.jsonp/.test(config.fetchUrl)), data: (config.beforeFetch || defaultBeforeFetch)({ q: value, - }), + }, me.props.rowData), fit: (response) => { - const content = response.content || response; + const content = response.content === undefined ? response : response.content; let success = true; if (response.success !== undefined) { success = response.success; @@ -101,7 +101,7 @@ class SelectField extends CellField { Promise, }); me.fetch().then((content) => { - const fetchData = (config.afterFetch || defaultAfterFetch)(content); + const fetchData = (config.afterFetch || defaultAfterFetch)(content, me.props.rowData); me.setState({ data: fetchData, }); @@ -140,7 +140,7 @@ class SelectField extends CellField { } else { const onSearch = me.getConfig().onSearch; if (typeof onSearch === 'function') { - onSearch(key); + onSearch(key, me.props.rowData); } } }, me.getConfig().searchDelay || 100);