From cf10cc34abff105f872c8ba3755a2c9a5be1f670 Mon Sep 17 00:00:00 2001 From: xwenliang Date: Tue, 18 Oct 2016 11:19:55 +0800 Subject: [PATCH] fix #74 --- ios/RCTBEEPickerManager/BzwPicker.m | 17 ++++++++++++----- package.json | 2 +- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ios/RCTBEEPickerManager/BzwPicker.m b/ios/RCTBEEPickerManager/BzwPicker.m index e7358c7..4ac97cc 100755 --- a/ios/RCTBEEPickerManager/BzwPicker.m +++ b/ios/RCTBEEPickerManager/BzwPicker.m @@ -41,7 +41,7 @@ self.leftBtn = [UIButton buttonWithType:UIButtonTypeCustom]; - self.leftBtn.frame = CGRectMake(10, 5, 50, 30); + self.leftBtn.frame = CGRectMake(10, 5, 90, 30); [self.leftBtn setTitle:self.leftStr forState:UIControlStateNormal]; [self.leftBtn setFont:[UIFont systemFontOfSize:16]]; self.leftBtn.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft; @@ -55,7 +55,7 @@ self.rightBtn = [UIButton buttonWithType:UIButtonTypeCustom]; - self.rightBtn.frame = CGRectMake(view.frame.size.width-60,5, 50, 30); + self.rightBtn.frame = CGRectMake(view.frame.size.width-100,5, 90, 30); [self.rightBtn setTitle:self.rightStr forState:UIControlStateNormal]; self.rightBtn.contentHorizontalAlignment=UIControlContentHorizontalAlignmentRight; @@ -67,7 +67,9 @@ [self.rightBtn addTarget:self action:@selector(cfirmAction) forControlEvents:UIControlEventTouchUpInside]; - UILabel *cenLabel=[[UILabel alloc]initWithFrame:CGRectMake(view.frame.size.width/2-25, 5, 50, 30)]; + UILabel *cenLabel=[[UILabel alloc]initWithFrame:CGRectMake(90, 5, SCREEN_WIDTH-180, 30)]; + + cenLabel.textAlignment=NSTextAlignmentCenter; [cenLabel setFont:[UIFont systemFontOfSize:16]]; @@ -183,11 +185,16 @@ - (CGFloat)pickerView:(UIPickerView *)pickerView widthForComponent:(NSInteger)component { if (_Correlation) { - return 110; + if ([_numberCorrela isEqualToString:@"three"]) { + + return SCREEN_WIDTH/3; + }else{ + return SCREEN_WIDTH/2; + } }else{ if (_noArryElementBool) { //表示一个数组 特殊情况 - return 110; + return SCREEN_WIDTH; }else{ return SCREEN_WIDTH/self.dataDry.count; diff --git a/package.json b/package.json index 0d31e11..c638fa2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-native-picker", - "version": "4.0.4", + "version": "4.0.5", "description": "", "main": "index.js", "scripts": { -- 2.26.2