Skip to content

Commit 24028c5

Browse files
linyehuilinyehui
committed
update react-native from 0.7.1 to 0.17.0
fix warning: Each child in an array or iterator should have a unique "key" prop.
1 parent 4d92c06 commit 24028c5

File tree

6 files changed

+85
-5
lines changed

6 files changed

+85
-5
lines changed

‎address_book/server/database/message.json‎

Lines changed: 72 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,72 @@
1-
[{"messageid":"DD61CCF3-17B7-464E-8066-FAC7C2B58F27","userid":"591F68A5-87E6-4A6C-810F-5A50953AE747","username":"宋江","time":"2015-9-23","message":"欢迎新同学小康"},{"messageid":"F05D4D47-1A67-4F44-930F-A5B240CAAC92","userid":"591F68A5-87E6-4A6C-810F-5A50953AE747","username":"李逵","time":"2015-9-22","message":"欢迎新同学催明"},{"messageid":"DD61CCF3-17B7-464E-8066-FAC7C2B58F27","userid":"591F68A5-87E6-4A6C-810F-5A50953AE747","username":"敏儿","time":"2015-9-21","message":"欢迎新同学刘明"},{"messageid":"F05D4D47-1A67-4F44-930F-A5B240CAAC92","userid":"591F68A5-87E6-4A6C-810F-5A50953AE747","username":"宋江","time":"2015-9-20","message":"欢迎新同学刘备"},{"messageid":"DD61CCF3-17B7-464E-8066-FAC7C2B58F27","userid":"591F68A5-87E6-4A6C-810F-5A50953AE747","username":"宋江","time":"2015-9-19","message":"欢迎新同学渡边"},{"messageid":"F05D4D47-1A67-4F44-930F-A5B240CAAC92","userid":"591F68A5-87E6-4A6C-810F-5A50953AE747","username":"宋江","time":"2015-9-18","message":"欢迎新同学彩霞"},{"messageid":"F05D4D47-1A67-4F44-930F-A5B240CAAC92","userid":"591F68A5-87E6-4A6C-810F-5A50953AE747","username":"辛弃疾","time":"2015-9-1","message":"西江月·夜行黄沙道中 明月别枝惊鹊，清风半夜鸣蝉。稻花香里说丰年，听取蛙声一片。七八个星天外，两三点雨山前。旧时⑹茅店社林边，路转溪桥忽见"},{"messageid":"74C88D5A-22CC-4588-9B3F-D614A8706D8D","userid":"591F68A5-87E6-4A6C-810F-5A50953AE747","username":"宋江","time":"2015-9-23","message":"ss"},{"messageid":"E50BCF04-88C0-49FE-B779-9E25A2247A95","userid":"3240870A-538F-4A84-B00E-567E910A30ED","username":"吴用","time":"2015-11-7","message":"g"},{"messageid":"57CAA9FF-5AA7-4F31-A2B4-E2EC4428D194","userid":"3240870A-538F-4A84-B00E-567E910A30ED","username":"吴用","time":"2015-11-7","message":"sssff"}]
1+
[
2+
{
3+
"messageid": "DD61CCF3-17B7-464E-8066-FAC7C2B58F27",
4+
"userid": "591F68A5-87E6-4A6C-810F-5A50953AE747",
5+
"username": "宋江",
6+
"time": "2015-9-23",
7+
"message": "欢迎新同学小康"
8+
},
9+
{
10+
"messageid": "F05D4D47-1A67-4F44-930F-A5B240CAAC90",
11+
"userid": "591F68A5-87E6-4A6C-810F-5A50953AE747",
12+
"username": "李逵",
13+
"time": "2015-9-22",
14+
"message": "欢迎新同学催明"
15+
},
16+
{
17+
"messageid": "DD61CCF3-17B7-464E-8066-FAC7C2B58F28",
18+
"userid": "591F68A5-87E6-4A6C-810F-5A50953AE747",
19+
"username": "敏儿",
20+
"time": "2015-9-21",
21+
"message": "欢迎新同学刘明"
22+
},
23+
{
24+
"messageid": "F05D4D47-1A67-4F44-930F-A5B240CAAC91",
25+
"userid": "591F68A5-87E6-4A6C-810F-5A50953AE747",
26+
"username": "宋江",
27+
"time": "2015-9-20",
28+
"message": "欢迎新同学刘备"
29+
},
30+
{
31+
"messageid": "DD61CCF3-17B7-464E-8066-FAC7C2B58F29",
32+
"userid": "591F68A5-87E6-4A6C-810F-5A50953AE747",
33+
"username": "宋江",
34+
"time": "2015-9-19",
35+
"message": "欢迎新同学渡边"
36+
},
37+
{
38+
"messageid": "F05D4D47-1A67-4F44-930F-A5B240CAAC92",
39+
"userid": "591F68A5-87E6-4A6C-810F-5A50953AE747",
40+
"username": "宋江",
41+
"time": "2015-9-18",
42+
"message": "欢迎新同学彩霞"
43+
},
44+
{
45+
"messageid": "F05D4D47-1A67-4F44-930F-A5B240CAAC93",
46+
"userid": "591F68A5-87E6-4A6C-810F-5A50953AE747",
47+
"username": "辛弃疾",
48+
"time": "2015-9-1",
49+
"message": "西江月·夜行黄沙道中 明月别枝惊鹊，清风半夜鸣蝉。稻花香里说丰年，听取蛙声一片。七八个星天外，两三点雨山前。旧时⑹茅店社林边，路转溪桥忽见"
50+
},
51+
{
52+
"messageid": "74C88D5A-22CC-4588-9B3F-D614A8706D8D",
53+
"userid": "591F68A5-87E6-4A6C-810F-5A50953AE747",
54+
"username": "宋江",
55+
"time": "2015-9-23",
56+
"message": "ss"
57+
},
58+
{
59+
"messageid": "E50BCF04-88C0-49FE-B779-9E25A2247A95",
60+
"userid": "3240870A-538F-4A84-B00E-567E910A30ED",
61+
"username": "吴用",
62+
"time": "2015-11-7",
63+
"message": "g"
64+
},
65+
{
66+
"messageid": "57CAA9FF-5AA7-4F31-A2B4-E2EC4428D194",
67+
"userid": "3240870A-538F-4A84-B00E-567E910A30ED",
68+
"username": "吴用",
69+
"time": "2015-11-7",
70+
"message": "sssff"
71+
}
72+
]

‎address_book/views/home.js‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,31 +20,37 @@ var Home = React.createClass({
2020
var width = Math.floor(((Util.size.width - 20) - 50) / 4);
2121
var items = [
2222
{
23+
id:1,
2324
title: '研发',
2425
partment: '框架研发',
2526
color: '#126AFF',
2627
},
2728
{
29+
id:2,
2830
title: '研发',
2931
partment: 'BU研发',
3032
color: '#FFD600',
3133
},
3234
{
35+
id:3,
3336
title: '产品',
3437
partment: '公共产品',
3538
color: '#F80728',
3639
},
3740
{
41+
id:4,
3842
title: '产品',
3943
partment: 'BU产品',
4044
color: '#05C147',
4145
},
4246
{
47+
id:5,
4348
title: '产品',
4449
partment: '启明星',
4550
color: '#FF4EB9',
4651
},
4752
{
53+
id:6,
4854
title: '项目',
4955
partment: '项目管理',
5056
color: '#EE810D',
@@ -65,6 +71,7 @@ var Home = React.createClass({
6571
for(var i = 0; i < 4; i++){
6672
Items1.push(
6773
<ItemBlock
74+
key={items[i].id}
6875
title={items[i].title}
6976
partment={items[i].partment}
7077
width={this.state.width}
@@ -77,6 +84,7 @@ var Home = React.createClass({
7784
for(var i = 4; i < items.length; i++){
7885
Items2.push(
7986
<ItemBlock
87+
key={items[i].id}
8088
title={items[i].title}
8189
partment={items[i].partment}
8290
width={this.state.width}

‎address_book/views/home/address.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ var Address = React.createClass({
2727
};
2828
for(var i in items){
2929
view.push(
30-
<View style={styles.row}>
30+
<View key={'addressItem' + i} style={styles.row}>
3131
<View style={[styles.text, color]}>
3232
<Text style={{fontSize:25, color:'#fff', fontWeight:'bold'}}>
3333
{items[i].username.substr(0, 1) || '未'}

‎address_book/views/manager.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ var Manager = React.createClass({
2626
var JSXDOM = [];
2727
for(var i in items){
2828
JSXDOM.push(
29-
<TouchableOpacity onPress={this._loadPage.bind(this, components[i], items[i])}>
29+
<TouchableOpacity key={items[i]} onPress={this._loadPage.bind(this, components[i], items[i])}>
3030
<View style={[styles.item, {flexDirection:'row'}]}>
3131
<Text style={[styles.tag, {color: colors[i]}]}>{tags[i]}</Text>
3232
<Text style={[styles.font,{flex:1}]}>{items[i]}</Text>

‎address_book/views/manager/addUser.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ var AddUser = React.createClass({
4545
var tagOne = [];
4646
for(var i = 0; i <3; i++){
4747
tagOne.push(
48-
<TouchableOpacity onPress={this._select.bind(this, this.state.items[i])}>
48+
<TouchableOpacity key={this.state.items[i]} onPress={this._select.bind(this, this.state.items[i])}>
4949
<View style={[styles.part, this.state['select' + this.state.items[i]]]}>
5050
<Text style={this.state['select_' + this.state.items[i]]}>{this.state.tags[i]}</Text>
5151
</View>
@@ -56,7 +56,7 @@ var AddUser = React.createClass({
5656
var tagTwo = [];
5757
for(var i = 3; i <6; i++){
5858
tagTwo.push(
59-
<TouchableOpacity onPress={this._select.bind(this, this.state.items[i])}>
59+
<TouchableOpacity key={this.state.items[i]} onPress={this._select.bind(this, this.state.items[i])}>
6060
<View style={[styles.part, this.state['select' + this.state.items[i]]]}>
6161
<Text style={this.state['select_' + this.state.items[i]]}>{this.state.tags[i]}</Text>
6262
</View>

‎address_book/views/message.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ var Message = React.createClass({
3131
data={contents[i]}
3232
nav={this.props.navigator}
3333
component={Detail}
34+
key={contents[i].messageid}
3435
text={contents[i].message}
3536
name={contents[i].username}
3637
date={contents[i].time}/>

0 commit comments

Comments
 (0)