Skip to content

Commit fec741f

Browse files
author
xiaoqing.dongxq
committed
update table
1 parent 839763e commit fec741f

File tree

6 files changed

+82
-23
lines changed

6 files changed

+82
-23
lines changed

.jscsrc

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{
2+
"requireCurlyBraces": ["if", "else", "for", "while", "do", "try", "catch"],
3+
"requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return", "try", "catch"],
4+
"requireSpacesInFunctionExpression": {
5+
"beforeOpeningCurlyBrace": true
6+
},
7+
"disallowSpacesInsideArrayBrackets": true,
8+
"disallowSpacesInsideObjectBrackets": true,
9+
"disallowSpacesInsideParentheses": true,
10+
"disallowQuotedKeysInObjects": "allButReserved",
11+
"disallowSpaceAfterObjectKeys": true,
12+
"requireSpaceBeforeBinaryOperators": ["-", "/", "*", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<=" ],
13+
"requireSpacesInConditionalExpression": {
14+
"afterTest": true,
15+
"beforeConsequent": true,
16+
"afterConsequent": true,
17+
"beforeAlternate": true
18+
},
19+
"requireSpaceAfterBinaryOperators": ["/", "*", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="],
20+
"disallowKeywords": [ "with" ],
21+
"disallowSpaceAfterPrefixUnaryOperators": [ "!" , "++", "--", "+", "-", "~"],
22+
"disallowSpaceBeforePostfixUnaryOperators": ["++", "--", ","],
23+
"disallowMultipleLineBreaks": true,
24+
"disallowKeywordsOnNewLine": ["else"],
25+
"safeContextKeyword": "self",
26+
"excludeFiles": ["lib/**/parser.js"]
27+
}

.jshintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
node_modules

.jshinttrc

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"camelcase": true,
3+
"curly": true,
4+
"eqeqeq": true,
5+
"freeze": true,
6+
"indent": 4,
7+
"latedef": "nofunc",
8+
"quotmark": "false",
9+
"nonew": true,
10+
"newcap": false,
11+
"immed": true,
12+
"noarg": true,
13+
"eqnull": true,
14+
"trailing": true,
15+
"undef": true,
16+
"unused": true,
17+
"browser": true,
18+
"node": true,
19+
"esnext": true,
20+
"globals": {
21+
"describe": false,
22+
"expect": false,
23+
"beforeEach": false,
24+
"afterEach": false,
25+
"modulex": false,
26+
"it": false
27+
}
28+
}

lib/Table.js

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ var React = require('react');
55
//表格列
66
var TableColumn = React.createClass({
77

8-
render : function () {
8+
render: function () {
99
return (<th width={this.props.width}>{this.props.title}</th>);
1010
}
1111
});
@@ -15,17 +15,17 @@ var TableColumn = React.createClass({
1515
*/
1616
var TableRow = React.createClass({
1717

18-
render : function () {
19-
var _self= this,
20-
columns = _self.props.columns,
21-
record = _self.props.record,
22-
index = _self.props.index,
18+
render: function () {
19+
var self = this,
20+
columns = self.props.columns,
21+
record = self.props.record,
22+
index = self.props.index,
2323
cells = [];
2424
for (var i = 0; i < columns.length; i++) {
2525
var col = columns[i],
2626
renderer = col.renderer,
2727
text = record[col.dataIndex];
28-
if(renderer){
28+
if (renderer){
2929
text = renderer(text,record,index);
3030
}
3131
cells.push(<td>{text}</td>);
@@ -35,21 +35,21 @@ var TableRow = React.createClass({
3535
});
3636

3737
var Table = React.createClass({
38-
_getColumns : function () {
38+
_getColumns: function () {
3939

40-
var _self = this,
41-
columns = _self.props.columns,
40+
var self = this,
41+
columns = self.props.columns,
4242
rst = [];
4343
for (var i = 0; i < columns.length; i++) {
4444
var col = columns[i];
4545
rst.push(<TableColumn title={col.title} dataIndex={col.dataIndex} width={col.width}/>);
4646
}
4747
return rst;
4848
},
49-
_getRows : function () {
50-
var _self = this,
51-
data = _self.props.data,
52-
columns = _self.props.columns,
49+
_getRows: function () {
50+
var self = this,
51+
data = self.props.data,
52+
columns = self.props.columns,
5353
rst = [];
5454

5555
for (var i = 0; i < data.length; i++) {
@@ -59,10 +59,10 @@ var Table = React.createClass({
5959
return rst;
6060

6161
},
62-
render : function () {
63-
var _self = this,
64-
columns = _self._getColumns(),
65-
rows = _self._getRows();
62+
render: function () {
63+
var self = this,
64+
columns = self._getColumns(),
65+
rows = self._getRows();
6666

6767
return (
6868
<table className={this.props.className}>

tests/index-spec.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,23 @@ describe('table', function() {
2727
document.getElementById('t1')
2828
);
2929

30+
var node = $('#t1');
3031

3132
it('create', function() {
32-
33+
expect(node.find('table').length).to.be(1);
3334
});
3435

3536
it('init data', function() {
36-
37+
expect(node.find('tbody tr').length).to.be(data.length);
3738
});
3839

3940
it('change data', function() {
4041

4142
});
42-
43+
/*
4344
it('renderer', function() {
44-
45+
expect(node.find('a').first().text()).to.be('操作');
4546
});
47+
48+
*/
4649
});

tests/runner.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=0">
66
<meta http-equiv="X-UA-Compatible" content="IE=edge">
77
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css">
8-
<title>rc-pager Mocha Runner</title>
8+
<title>rc-table Mocha Runner</title>
99
</head>
1010
<body>
1111
<div id="mocha"></div>

0 commit comments

Comments
 (0)