diff --git a/build/lib/filterColumn.js b/build/lib/filterColumn.js index d160962..5bac9a9 100644 --- a/build/lib/filterColumn.js +++ b/build/lib/filterColumn.js @@ -239,11 +239,7 @@ function filterColumn(Table, Popover) { _react2["default"].createElement( _beeCheckbox2["default"], paramObj, - _react2["default"].createElement( - "span", - null, - da.title - ) + da.title ) ); }); diff --git a/build/lib/sum.js b/build/lib/sum.js index 5987695..d4c452f 100644 --- a/build/lib/sum.js +++ b/build/lib/sum.js @@ -106,9 +106,9 @@ function sum(Table) { return _this; } - /** - * 获取当前的表格类型。 - * + /** + * 获取当前的表格类型。 + * */ diff --git a/build/lib/util.js b/build/lib/util.js index 9ea2e19..8d6a331 100644 --- a/build/lib/util.js +++ b/build/lib/util.js @@ -1,7 +1,7 @@ 'use strict'; Object.defineProperty(exports, "__esModule", { - value: true + value: true }); var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; @@ -9,71 +9,71 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument exports.sortBy = sortBy; exports.compare = compare; exports.ObjectAssign = ObjectAssign; -/* -* 快速排序,按某个属性,或按“获取排序依据的函数”,来排序. -* @method soryBy -* @static -* @param {array} arr 待处理数组 -* @param {string|function} prop 排序依据属性,获取 -* @param {boolean} desc 降序 -* @return {array} 返回排序后的新数组 +/* +* 快速排序,按某个属性,或按“获取排序依据的函数”,来排序. +* @method soryBy +* @static +* @param {array} arr 待处理数组 +* @param {string|function} prop 排序依据属性,获取 +* @param {boolean} desc 降序 +* @return {array} 返回排序后的新数组 */ function sortBy(arr, prop, desc) { - var props = [], - ret = [], - i = 0, - len = arr.length; - if (typeof prop == 'string') { - for (; i < len; i++) { - var oI = arr[i]; - (props[i] = new String(oI && oI[prop] || ''))._obj = oI; - } - } else if (typeof prop == 'function') { - for (; i < len; i++) { - var _oI = arr[i]; - (props[i] = new String(_oI && prop(_oI) || ''))._obj = _oI; - } - } else { - throw '参数类型错误'; + var props = [], + ret = [], + i = 0, + len = arr.length; + if (typeof prop == 'string') { + for (; i < len; i++) { + var oI = arr[i]; + (props[i] = new String(oI && oI[prop] || ''))._obj = oI; } - props.sort(); - for (i = 0; i < len; i++) { - ret[i] = props[i]._obj; + } else if (typeof prop == 'function') { + for (; i < len; i++) { + var _oI = arr[i]; + (props[i] = new String(_oI && prop(_oI) || ''))._obj = _oI; } - if (desc) ret.reverse(); - return ret; + } else { + throw '参数类型错误'; + } + props.sort(); + for (i = 0; i < len; i++) { + ret[i] = props[i]._obj; + } + if (desc) ret.reverse(); + return ret; }; -/** - * 数组对象排序 - * console.log(arr.sort(compare('age'))) - * @param {} property +/** + * 数组对象排序 + * console.log(arr.sort(compare('age'))) + * @param {} property */ function compare(property) { - return function (a, b) { - var value1 = a[property]; - var value2 = b[property]; - return value1 - value2; - }; + return function (a, b) { + var value1 = a[property]; + var value2 = b[property]; + return value1 - value2; + }; } -/** - * 简单数组数据对象拷贝 - * @param {*} obj 要拷贝的对象 +/** + * 简单数组数据对象拷贝 + * @param {*} obj 要拷贝的对象 */ function ObjectAssign(obj) { - var b = obj instanceof Array; - var tagObj = b ? [] : {}; - if (b) { - //数组 - obj.forEach(function (da) { - var _da = {}; - _extends(_da, da); - tagObj.push(_da); - }); - } else { - _extends(tagObj, obj); - } - return tagObj; + var b = obj instanceof Array; + var tagObj = b ? [] : {}; + if (b) { + //数组 + obj.forEach(function (da) { + var _da = {}; + _extends(_da, da); + tagObj.push(_da); + }); + } else { + _extends(tagObj, obj); + } + return tagObj; } \ No newline at end of file diff --git a/build/render/CheckboxRender.js b/build/render/CheckboxRender.js index 8473356..1e4ba25 100644 --- a/build/render/CheckboxRender.js +++ b/build/render/CheckboxRender.js @@ -19,11 +19,11 @@ function _possibleConstructorReturn(self, call) { if (!self) { throw new Referen function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : _defaults(subClass, superClass); } -/** - * 渲染checkbox - * @param Checkbox - * @param Icon - * @returns {CheckboxRender} +/** + * 渲染checkbox + * @param Checkbox + * @param Icon + * @returns {CheckboxRender} */ function renderCheckbox(Checkbox, Icon) { return function (_Component) { diff --git a/build/render/InputRender.js b/build/render/InputRender.js index 04c7002..68f898d 100644 --- a/build/render/InputRender.js +++ b/build/render/InputRender.js @@ -28,12 +28,12 @@ function _possibleConstructorReturn(self, call) { if (!self) { throw new Referen function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : _defaults(subClass, superClass); } -/** - * 渲染输入框 - * @param Form - * @param Input - * @param Icon - * @returns {InputRender} +/** + * 渲染输入框 + * @param Form + * @param Input + * @param Icon + * @returns {InputRender} */ function renderInput(Form, Input, Icon) { var _class, _temp2; diff --git a/build/render/SelectRender.js b/build/render/SelectRender.js index a1d55db..d72159b 100644 --- a/build/render/SelectRender.js +++ b/build/render/SelectRender.js @@ -26,11 +26,11 @@ function _possibleConstructorReturn(self, call) { if (!self) { throw new Referen function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : _defaults(subClass, superClass); } -/** - * 渲染下拉框 - * @param Select - * @param Icon - * @returns {SelectRender} +/** + * 渲染下拉框 + * @param Select + * @param Icon + * @returns {SelectRender} */ function renderSelect(Select, Icon) { var _class, _temp2; diff --git a/demo/demolist/Demo0201.js b/demo/demolist/Demo0201.js index 459f51b..b8ba1a4 100644 --- a/demo/demolist/Demo0201.js +++ b/demo/demolist/Demo0201.js @@ -2,7 +2,7 @@ * * @title 横向滚动条 * @parent 滚动 Scroll View -* @description 设置`scroll`属性支持横向或纵向滚动,x/y的取值可以是正整数、百分比、布尔值 +* @description 设置`scroll`属性支持横向或纵向滚动,x的取值可以是:正整数(自动转为相应的像素值)、百分比(相对于表格真实宽度的百分比,大于100%时会出现滚动条)、布尔值。y的取值是正整数。 * demo0201 */ diff --git a/demo/demolist/Demo0405.js b/demo/demolist/Demo0405.js index 5dd334a..69490f8 100644 --- a/demo/demolist/Demo0405.js +++ b/demo/demolist/Demo0405.js @@ -7,13 +7,13 @@ */ import React, { Component } from "react"; -import {Button,Checkbox} from "tinper-bee"; +import {Checkbox} from "tinper-bee"; import Table from "../../src"; import sum from "../../src/lib/sum.js"; import multiSelect from "../../src/lib/multiSelect.js"; let ComplexTable = multiSelect(sum(Table), Checkbox); - +let _sum = 0; const columns = [ { title: "单据编号", @@ -81,6 +81,8 @@ function getData(){ total: i + Math.floor(Math.random()*10), money: 20 * Math.floor(Math.random()*10) }); + _sum += data[i].total; + _sum += data[i].money; } return data; } @@ -90,32 +92,20 @@ class Demo35 extends Component { constructor(props) { super(props); this.state = { - data: getData() + data: getData(), + sum:_sum }; } - changeData = ()=>{ - this.setState({ - data: getData() - }); - } - render() { const {data} = this.state; return (