过滤面板,热区扩大为整行
This commit is contained in:
parent
9b81845b3d
commit
a050e18497
|
@ -337,7 +337,7 @@
|
||||||
cursor: pointer; }
|
cursor: pointer; }
|
||||||
.u-table-filter-column-pop-cont-item .u-checkbox {
|
.u-table-filter-column-pop-cont-item .u-checkbox {
|
||||||
margin: 0px; }
|
margin: 0px; }
|
||||||
.u-table-filter-column-pop-cont-item > span {
|
.u-table-filter-column-pop-cont-item span.drop-menu-title {
|
||||||
margin-left: -3px;
|
margin-left: -3px;
|
||||||
max-width: 132px;
|
max-width: 132px;
|
||||||
width: auto !important;
|
width: auto !important;
|
||||||
|
|
|
@ -239,11 +239,7 @@ function filterColumn(Table, Popover) {
|
||||||
_react2["default"].createElement(
|
_react2["default"].createElement(
|
||||||
_beeCheckbox2["default"],
|
_beeCheckbox2["default"],
|
||||||
paramObj,
|
paramObj,
|
||||||
_react2["default"].createElement(
|
da.title
|
||||||
"span",
|
|
||||||
null,
|
|
||||||
da.title
|
|
||||||
)
|
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
|
@ -106,9 +106,9 @@ function sum(Table) {
|
||||||
return _this;
|
return _this;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取当前的表格类型。
|
* 获取当前的表格类型。
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
Object.defineProperty(exports, "__esModule", {
|
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; };
|
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.sortBy = sortBy;
|
||||||
exports.compare = compare;
|
exports.compare = compare;
|
||||||
exports.ObjectAssign = ObjectAssign;
|
exports.ObjectAssign = ObjectAssign;
|
||||||
/*
|
/*
|
||||||
* 快速排序,按某个属性,或按“获取排序依据的函数”,来排序.
|
* 快速排序,按某个属性,或按“获取排序依据的函数”,来排序.
|
||||||
* @method soryBy
|
* @method soryBy
|
||||||
* @static
|
* @static
|
||||||
* @param {array} arr 待处理数组
|
* @param {array} arr 待处理数组
|
||||||
* @param {string|function} prop 排序依据属性,获取
|
* @param {string|function} prop 排序依据属性,获取
|
||||||
* @param {boolean} desc 降序
|
* @param {boolean} desc 降序
|
||||||
* @return {array} 返回排序后的新数组
|
* @return {array} 返回排序后的新数组
|
||||||
*/
|
*/
|
||||||
|
|
||||||
function sortBy(arr, prop, desc) {
|
function sortBy(arr, prop, desc) {
|
||||||
var props = [],
|
var props = [],
|
||||||
ret = [],
|
ret = [],
|
||||||
i = 0,
|
i = 0,
|
||||||
len = arr.length;
|
len = arr.length;
|
||||||
if (typeof prop == 'string') {
|
if (typeof prop == 'string') {
|
||||||
for (; i < len; i++) {
|
for (; i < len; i++) {
|
||||||
var oI = arr[i];
|
var oI = arr[i];
|
||||||
(props[i] = new String(oI && oI[prop] || ''))._obj = oI;
|
(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 '参数类型错误';
|
|
||||||
}
|
}
|
||||||
props.sort();
|
} else if (typeof prop == 'function') {
|
||||||
for (i = 0; i < len; i++) {
|
for (; i < len; i++) {
|
||||||
ret[i] = props[i]._obj;
|
var _oI = arr[i];
|
||||||
|
(props[i] = new String(_oI && prop(_oI) || ''))._obj = _oI;
|
||||||
}
|
}
|
||||||
if (desc) ret.reverse();
|
} else {
|
||||||
return ret;
|
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')))
|
* console.log(arr.sort(compare('age')))
|
||||||
* @param {} property
|
* @param {} property
|
||||||
*/
|
*/
|
||||||
function compare(property) {
|
function compare(property) {
|
||||||
return function (a, b) {
|
return function (a, b) {
|
||||||
var value1 = a[property];
|
var value1 = a[property];
|
||||||
var value2 = b[property];
|
var value2 = b[property];
|
||||||
return value1 - value2;
|
return value1 - value2;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 简单数组数据对象拷贝
|
* 简单数组数据对象拷贝
|
||||||
* @param {*} obj 要拷贝的对象
|
* @param {*} obj 要拷贝的对象
|
||||||
*/
|
*/
|
||||||
function ObjectAssign(obj) {
|
function ObjectAssign(obj) {
|
||||||
var b = obj instanceof Array;
|
var b = obj instanceof Array;
|
||||||
var tagObj = b ? [] : {};
|
var tagObj = b ? [] : {};
|
||||||
if (b) {
|
if (b) {
|
||||||
//数组
|
//数组
|
||||||
obj.forEach(function (da) {
|
obj.forEach(function (da) {
|
||||||
var _da = {};
|
var _da = {};
|
||||||
_extends(_da, da);
|
_extends(_da, da);
|
||||||
tagObj.push(_da);
|
tagObj.push(_da);
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
_extends(tagObj, obj);
|
_extends(tagObj, obj);
|
||||||
}
|
}
|
||||||
return tagObj;
|
return tagObj;
|
||||||
}
|
}
|
|
@ -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); }
|
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
|
* 渲染checkbox
|
||||||
* @param Checkbox
|
* @param Checkbox
|
||||||
* @param Icon
|
* @param Icon
|
||||||
* @returns {CheckboxRender}
|
* @returns {CheckboxRender}
|
||||||
*/
|
*/
|
||||||
function renderCheckbox(Checkbox, Icon) {
|
function renderCheckbox(Checkbox, Icon) {
|
||||||
return function (_Component) {
|
return function (_Component) {
|
||||||
|
|
|
@ -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); }
|
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 Form
|
||||||
* @param Input
|
* @param Input
|
||||||
* @param Icon
|
* @param Icon
|
||||||
* @returns {InputRender}
|
* @returns {InputRender}
|
||||||
*/
|
*/
|
||||||
function renderInput(Form, Input, Icon) {
|
function renderInput(Form, Input, Icon) {
|
||||||
var _class, _temp2;
|
var _class, _temp2;
|
||||||
|
|
|
@ -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); }
|
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 Select
|
||||||
* @param Icon
|
* @param Icon
|
||||||
* @returns {SelectRender}
|
* @returns {SelectRender}
|
||||||
*/
|
*/
|
||||||
function renderSelect(Select, Icon) {
|
function renderSelect(Select, Icon) {
|
||||||
var _class, _temp2;
|
var _class, _temp2;
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
*
|
*
|
||||||
* @title 横向滚动条
|
* @title 横向滚动条
|
||||||
* @parent 滚动 Scroll View
|
* @parent 滚动 Scroll View
|
||||||
* @description 设置`scroll`属性支持横向或纵向滚动,x/y的取值可以是正整数、百分比、布尔值
|
* @description 设置`scroll`属性支持横向或纵向滚动,x的取值可以是:正整数(自动转为相应的像素值)、百分比(相对于表格真实宽度的百分比,大于100%时会出现滚动条)、布尔值。y的取值是正整数。
|
||||||
* demo0201
|
* demo0201
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
|
@ -7,13 +7,13 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import React, { Component } from "react";
|
import React, { Component } from "react";
|
||||||
import {Button,Checkbox} from "tinper-bee";
|
import {Checkbox} from "tinper-bee";
|
||||||
import Table from "../../src";
|
import Table from "../../src";
|
||||||
import sum from "../../src/lib/sum.js";
|
import sum from "../../src/lib/sum.js";
|
||||||
import multiSelect from "../../src/lib/multiSelect.js";
|
import multiSelect from "../../src/lib/multiSelect.js";
|
||||||
|
|
||||||
let ComplexTable = multiSelect(sum(Table), Checkbox);
|
let ComplexTable = multiSelect(sum(Table), Checkbox);
|
||||||
|
let _sum = 0;
|
||||||
const columns = [
|
const columns = [
|
||||||
{
|
{
|
||||||
title: "单据编号",
|
title: "单据编号",
|
||||||
|
@ -81,6 +81,8 @@ function getData(){
|
||||||
total: i + Math.floor(Math.random()*10),
|
total: i + Math.floor(Math.random()*10),
|
||||||
money: 20 * Math.floor(Math.random()*10)
|
money: 20 * Math.floor(Math.random()*10)
|
||||||
});
|
});
|
||||||
|
_sum += data[i].total;
|
||||||
|
_sum += data[i].money;
|
||||||
}
|
}
|
||||||
return data;
|
return data;
|
||||||
}
|
}
|
||||||
|
@ -90,32 +92,20 @@ class Demo35 extends Component {
|
||||||
constructor(props) {
|
constructor(props) {
|
||||||
super(props);
|
super(props);
|
||||||
this.state = {
|
this.state = {
|
||||||
data: getData()
|
data: getData(),
|
||||||
|
sum:_sum
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
changeData = ()=>{
|
|
||||||
this.setState({
|
|
||||||
data: getData()
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
const {data} = this.state;
|
const {data} = this.state;
|
||||||
return (
|
return (
|
||||||
<div>
|
<div>
|
||||||
<Button
|
|
||||||
className="editable-add-btn"
|
|
||||||
onClick={this.changeData}
|
|
||||||
>
|
|
||||||
动态设置数据源
|
|
||||||
</Button>
|
|
||||||
|
|
||||||
<ComplexTable
|
<ComplexTable
|
||||||
columns={columns}
|
columns={columns}
|
||||||
data={data}
|
data={data}
|
||||||
bordered
|
bordered
|
||||||
// scroll={{ x: "130%", y: 140 }}
|
footer={currentData => <div>总计: {_sum}</div>}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|
|
@ -60,6 +60,7 @@ class Demo8 extends Component {
|
||||||
onSelect={this.handleSelect.bind(this)}
|
onSelect={this.handleSelect.bind(this)}
|
||||||
onDataNumSelect={this.dataNumSelect}
|
onDataNumSelect={this.dataNumSelect}
|
||||||
showJump={true}
|
showJump={true}
|
||||||
|
noBorder={true}
|
||||||
total={100}
|
total={100}
|
||||||
dataNum={2}
|
dataNum={2}
|
||||||
/>
|
/>
|
||||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -110,7 +110,7 @@ export default function filterColumn(Table, Popover) {
|
||||||
>
|
>
|
||||||
<Checkbox {...paramObj}>
|
<Checkbox {...paramObj}>
|
||||||
|
|
||||||
<span>{da.title}</span>
|
{da.title}
|
||||||
</Checkbox>
|
</Checkbox>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|
Loading…
Reference in New Issue