@@ -395,7 +395,7 @@ -(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *
395395{
396396 if (self.selectEnable ) {
397397 if (!self.multiSelect && self.lastSelected ) {
398- [tableView deselectRowAtIndexPath: self .lastSelected animated: YES ];
398+ [tableView deselectRowAtIndexPath: self .lastSelected animated: NO ];
399399 }
400400 self.lastSelected = indexPath;
401401 return ;
@@ -414,12 +414,12 @@ -(void)tableView:(UITableView *)tableView didDeselectRowAtIndexPath:(NSIndexPath
414414
415415// /editing
416416- (UITableViewCellEditingStyle)tableView : (UITableView *)tableView editingStyleForRowAtIndexPath : (NSIndexPath *)indexPath {
417- if (DWRespond) {
418- return [DWDelegate dw_TableView: tableView editingStyleForRowAtIndexPath: indexPath];
419- }
420417 if (self.selectEnable ) {
421418 return UITableViewCellEditingStyleInsert | UITableViewCellEditingStyleDelete;
422419 }
420+ if (DWRespond) {
421+ return [DWDelegate dw_TableView: tableView editingStyleForRowAtIndexPath: indexPath];
422+ }
423423 return UITableViewCellEditingStyleNone;
424424}
425425
@@ -551,14 +551,13 @@ -(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)
551551-(UITableViewCell *)tableView : (UITableView *)tableView cellForRowAtIndexPath : (NSIndexPath *)indexPath
552552{
553553 DWTableViewHelperCell * cell = nil ;
554- DWTableViewHelperModel * model = nil ;
554+ DWTableViewHelperModel * model = [ self modelFromIndexPath: indexPath] ;
555555 if (DWRespond) {
556556 cell = [DWDelegate dw_TableView: tableView cellForRowAtIndexPath: indexPath];
557557 if (!cell) {
558558 NSAssert (NO , @" you have implemetation the dw_TableView:cellForRowAtIndexPath delegate but pass a nil cell at indexPath of S%ld R%ld "
559559 }
560560 } else {
561- model = [self modelFromIndexPath: indexPath];
562561 cell = [self createCellFromModel: model useReuse: YES ];
563562 }
564563 if (self.loadDataMode == DWTableViewHelperLoadDataIgnoreHighSpeedMode) {
@@ -1251,6 +1250,9 @@ @interface DWTableViewHelperModel ()
12511250// /计算的横屏行高
12521251@property (nonatomic ,assign ) CGFloat calRowHeightH;
12531252
1253+ // /原始cell选择样式
1254+ @property (nonatomic ,assign ) NSInteger originalSelectionStyle;
1255+
12541256@end
12551257
12561258@implementation DWTableViewHelperModel
@@ -1264,6 +1266,7 @@ -(instancetype)init{
12641266 if (!ImageNull) {
12651267 ImageNull = [UIImage new ];
12661268 }
1269+ self.originalSelectionStyle = -1 ;
12671270 NSString * cellClass = NSStringFromClass ([self class ]);
12681271 NSArray * arr = [cellClass componentsSeparatedByString: @" Model"
12691272 if (arr.count ) {
@@ -1369,8 +1372,10 @@ -(void)layoutSubviews
13691372// /适配第一次图片为空的情况
13701373- (void )setEditing : (BOOL )editing animated : (BOOL )animated {
13711374 [super setEditing: editing animated: animated];
1372- if (self.selectionStyle == UITableViewCellSelectionStyleNone ) {
1375+ if (editing && self.selectionStyle != UITableViewCellSelectionStyleDefault ) {// 编辑状态下保证非无选择样式
13731376 self.selectionStyle = UITableViewCellSelectionStyleDefault;
1377+ } else if (!editing && self.selectionStyle != self.model .originalSelectionStyle ) {// 退出编辑状态是恢复原始选择样式
1378+ self.selectionStyle = self.model .originalSelectionStyle ;
13741379 }
13751380 BOOL toSetUnselectIcon = self.model .cellEditUnselectedIcon != ImageNull && self.model .cellEditUnselectedIcon != nil ;
13761381 for (UIControl *control in self.subviews ){
@@ -1400,6 +1405,7 @@ -(void)setupUI {
14001405 self.backgroundColor = [UIColor whiteColor ];
14011406 self.multipleSelectionBackgroundView = [UIView new ];
14021407 self.selectedBackgroundView = [UIView new ];
1408+ self.selectionStyle = UITableViewCellSelectionStyleNone;
14031409 self.loadDataImageView = [UIImageView new ];
14041410 self.loadDataImageView .backgroundColor = [UIColor whiteColor ];
14051411}
@@ -1411,6 +1417,9 @@ -(void)setupConstraints {
14111417-(void )setModel : (__kindof DWTableViewHelperModel *)model
14121418{
14131419 _model = model;
1420+ if (model.originalSelectionStyle == -1 ) {// 仅在初次生成cell的时候同步cell的选择样式
1421+ model.originalSelectionStyle = self.selectionStyle ;
1422+ }
14141423}
14151424
14161425-(void )showLoadDataPlaceHolder : (UIImage *)image height : (CGFloat)height {
0 commit comments