feat:增加filterInputNumberOptions可设置数值框的参数

2018-12-14 10:52:32 +08:00 · 2018-12-14 10:52:32 +08:00 · 83915235e1
parent a31bc3e5ac
commit 83915235e1
13 changed files with 90 additions and 17 deletions
--- a/README.md
+++ b/README.md
@ -134,6 +134,7 @@ class Demo extends Component {
 | filterDropdownFocus | 触发点击下拉条件的回调，一般用于异步点击请求数据使用 | function | () => () |
 | filterDropdownType | 下拉条件类型，分为 string 和 number 条件类型 | string | string
 | filterDropdownIncludeKeys | 能够设置指定的下拉条件项，通过设置keys 其中string条件可设置:LIKE,ULIKE,EQ,UEQ,START,END.number条件可设置:GT,GTEQ,LT,LTEQ,EQ,UEQ | array | [] 不设置此属性为显示所有
+| filterInputNumberOptions | 数值框接收的props，具体属性参考bee-input-number | object | null



--- a/build/FilterType.js
+++ b/build/FilterType.js
@ -183,6 +183,7 @@ var FilterType = function (_Component) {

        _this.renderControl = function (rendertype) {
            var _this$props7 = _this.props,
+                filterInputNumberOptions = _this$props7.filterInputNumberOptions,
                filterDropdownIncludeKeys = _this$props7.filterDropdownIncludeKeys,
                dataIndex = _this$props7.dataIndex,
                filterDropdown = _this$props7.filterDropdown,
@ -222,12 +223,12 @@ var FilterType = function (_Component) {
                    return _react2["default"].createElement(
                        'div',
                        { className: clsPrefix + ' filter-wrap' },
-                        _react2["default"].createElement(_beeInputNumber2["default"], {
+                        _react2["default"].createElement(_beeInputNumber2["default"], _extends({}, filterInputNumberOptions, {
                            className: className,
                            value: _this.state.value,
                            onChange: _this.changeNumber,
                            iconStyle: 'one'
-                        }),
+                        })),
                        _react2["default"].createElement(_FilterDropDown2["default"], {
                            locale: locale,
                            dataIndex: dataIndex,
--- a/build/Table.js
+++ b/build/Table.js
@ -502,7 +502,8 @@ var Table = function (_Component) {
          filterdropdowndata: column.filterDropdownData, //自定义数据格式
          filterdropdownfocus: column.filterDropdownFocus, //焦点触发函数回调
          filterdropdowntype: column.filterDropdownType, //下拉的类型分为 String,Number 默认是String
-          filterdropdownincludekeys: column.filterDropdownIncludeKeys //下拉条件按照指定的keys去显示
+          filterdropdownincludekeys: column.filterDropdownIncludeKeys, //下拉条件按照指定的keys去显示
+          filterinputnumberoptions: column.filterInputNumberOptions //设置数值框内的详细属性
        });
      }
    });
--- a/build/TableHeader.js
+++ b/build/TableHeader.js
@ -244,6 +244,7 @@ var TableHeader = function (_Component) {
            , filterDropdown: rows[1][index]["filterdropdown"],
            filterDropdownType: rows[1][index]["filterdropdowntype"] //下拉的条件类型为string,number
            , filterDropdownIncludeKeys: rows[1][index]["filterdropdownincludekeys"] //下拉条件按照指定的keys去显示
+            , filterInputNumberOptions: rows[1][index]["filterinputnumberoptions"] //设置数值框内的详细属性
          });
        //下拉框选择
        case "dropdown":
--- a/demo/demolist/Demo29.js
+++ b/demo/demolist/Demo29.js
@ -13,9 +13,40 @@ import Button from 'bee-button';


 const columns29 = [
-  { title: "姓名", width: 180, dataIndex: "name", key: "name", filterType: "text", filterDropdown: "show",filterDropdownIncludeKeys:['LIKE','EQ'] },
-  { title: "年龄", width: 150, dataIndex: "age", key: "age", filterType: "dropdown", filterDropdown: "show",filterDropdownType:"number",filterDropdownIncludeKeys:['EQ'] },
-  { title: "日期", width: 200, dataIndex: "date", key: "date", filterType: "date", filterDropdown: "show", format: "YYYY-MM-DD" }
+  {
+    title: "姓名",
+    width: 180,
+    dataIndex: "name",
+    key: "name",
+    filterType: "text",
+    filterDropdown: "show",
+    filterDropdownIncludeKeys: ['LIKE', 'EQ']
+  },
+  {
+    title: "年龄",
+    width: 170,
+    dataIndex: "age",
+    key: "age",
+    filterType: "number",
+    filterDropdown: "show",
+    filterDropdownType: "number",
+    filterDropdownIncludeKeys: ['EQ'],
+    filterInputNumberOptions: {
+      max: 200,
+      min: 0,
+      step: 1,
+      precision: 0
+    }
+  },
+  {
+    title: "日期",
+    width: 200,
+    dataIndex: "date",
+    key: "date",
+    filterType: "date",
+    filterDropdown: "show",
+    format: "YYYY-MM-DD"
+  }
 ];

 const data29 = [
--- a/demo/index.js
+++ b/demo/index.js
--- a/dist/demo.js
+++ b/dist/demo.js
--- a/dist/demo.js.map
+++ b/dist/demo.js.map
--- a/docs/api.md
+++ b/docs/api.md
@ -81,6 +81,7 @@ import 'bee-table/build/Table.css';
 | filterDropdownFocus | 触发点击下拉条件的回调，一般用于异步点击请求数据使用 | function | () => () |
 | filterDropdownType | 下拉条件类型，分为 string 和 number 条件类型 | string | string
 | filterDropdownIncludeKeys | 能够设置指定的下拉条件项，通过设置keys 其中string条件可设置:LIKE,ULIKE,EQ,UEQ,START,END.number条件可设置:GT,GTEQ,LT,LTEQ,EQ,UEQ | array | [] 不设置此属性为显示所有
+| filterInputNumberOptions | 数值框接收的props，具体属性参考bee-input-number | object | null

 {% include "mixin.md"%}

--- a/src/FilterType.js
+++ b/src/FilterType.js
@ -157,7 +157,7 @@ class FilterType extends Component {
     * @returns
     */
    renderControl = (rendertype) => {
-        let { filterDropdownIncludeKeys, dataIndex, filterDropdown, filterDropdownType, format, className, onChange, onSelectDropdown, clsPrefix, locale } = this.props;
+        let { filterInputNumberOptions, filterDropdownIncludeKeys, dataIndex, filterDropdown, filterDropdownType, format, className, onChange, onSelectDropdown, clsPrefix, locale } = this.props;
        switch (rendertype) {
            case 'text':
                return <div className={`${clsPrefix} filter-wrap`}>
@ -184,6 +184,7 @@ class FilterType extends Component {
            case 'number':
                return <div className={`${clsPrefix} filter-wrap`}>
                    <InputNumber
+                        {...filterInputNumberOptions}
                        className={className}
                        value={this.state.value}
                        onChange={this.changeNumber}
--- a/src/Table.js
+++ b/src/Table.js
@ -402,7 +402,8 @@ class Table extends Component {
          filterdropdowndata: column.filterDropdownData,//自定义数据格式
          filterdropdownfocus: column.filterDropdownFocus,//焦点触发函数回调
          filterdropdowntype: column.filterDropdownType,//下拉的类型分为 String,Number 默认是String
-          filterdropdownincludekeys: column.filterDropdownIncludeKeys//下拉条件按照指定的keys去显示
+          filterdropdownincludekeys: column.filterDropdownIncludeKeys,//下拉条件按照指定的keys去显示
+          filterinputnumberoptions: column.filterInputNumberOptions//设置数值框内的详细属性
        });
      }
    });
--- a/src/TableHeader.js
+++ b/src/TableHeader.js
@ -417,6 +417,7 @@ class TableHeader extends Component {
            filterDropdown={rows[1][index]["filterdropdown"]}
            filterDropdownType={rows[1][index]["filterdropdowntype"]}//下拉的条件类型为string,number
            filterDropdownIncludeKeys={rows[1][index]["filterdropdownincludekeys"]}//下拉条件按照指定的keys去显示
+            filterInputNumberOptions={rows[1][index]["filterinputnumberoptions"]}//设置数值框内的详细属性
          />
        );
      //下拉框选择