diff --git a/LEEAlert.podspec b/LEEAlert.podspec index 716dbf5..8925673 100644 --- a/LEEAlert.podspec +++ b/LEEAlert.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = "LEEAlert" -s.version = "1.6.2" +s.version = "1.6.3" s.summary = "优雅的Alert ActionSheet" s.homepage = "https://github.com/lixiang1994/LEEAlert" diff --git a/LEEAlert/LEEAlert.h b/LEEAlert/LEEAlert.h index 7d8bcb1..7f52c90 100644 --- a/LEEAlert/LEEAlert.h +++ b/LEEAlert/LEEAlert.h @@ -12,7 +12,7 @@ * * @author LEE * @copyright Copyright © 2016 - 2020年 lee. All rights reserved. - * @version V1.6.2 + * @version V1.6.3 */ #import @@ -188,6 +188,9 @@ NS_ASSUME_NONNULL_BEGIN /** 设置 是否可滑动 -> 格式: .LeeIsScrollEnabled(YES) */ @property (nonatomic, copy, readonly) LEEConfigToBool LeeIsScrollEnabled; +/** 设置 是否显示滑动指示器 -> 格式: .LeeIsShowsScrollIndicator(YES) */ +@property (nonatomic, copy, readonly) LEEConfigToBool LeeIsShowsScrollIndicator; + /** 设置 Action是否跟随Item滑动 -> 格式: .LeeIsActionFollowScrollEnabled(YES) */ @property (nonatomic, copy, readonly) LEEConfigToBool LeeIsActionFollowScrollEnabled; diff --git a/LEEAlert/LEEAlert.m b/LEEAlert/LEEAlert.m index 9d1c0f8..1ef014c 100644 --- a/LEEAlert/LEEAlert.m +++ b/LEEAlert/LEEAlert.m @@ -12,7 +12,7 @@ * * @author LEE * @copyright Copyright © 2016 - 2020年 lee. All rights reserved. - * @version V1.6.2 + * @version V1.6.3 */ #import "LEEAlert.h" @@ -62,6 +62,7 @@ @interface LEEBaseConfigModel () @property (nonatomic, assign) BOOL modelIsContinueQueueDisplay; @property (nonatomic, assign) BOOL modelIsAvoidKeyboard; @property (nonatomic, assign) BOOL modelIsScrollEnabled; +@property (nonatomic, assign) BOOL modelIsShowsScrollIndicator; @property (nonatomic, assign) BOOL modelIsActionFollowScrollEnabled; @@ -148,6 +149,7 @@ - (instancetype)init _modelIsContinueQueueDisplay = YES; //默认继续队列显示 _modelIsAvoidKeyboard = YES; //默认闪避键盘 _modelIsScrollEnabled = YES; //默认可以滑动 + _modelIsShowsScrollIndicator = YES; //默认显示滑动指示器 _modelIsActionFollowScrollEnabled = YES; //默认 Action 跟随 Item 滚动 @@ -592,6 +594,17 @@ - (LEEConfigToBool)LeeIsScrollEnabled{ } +- (LEEConfigToBool)LeeIsShowsScrollIndicator{ + + return ^(BOOL is){ + + self.modelIsShowsScrollIndicator = is; + + return self; + }; + +} + - (LEEConfigToBool)LeeIsActionFollowScrollEnabled{ return ^(BOOL is){ @@ -2577,6 +2590,12 @@ - (void)configAlert{ self.itemsScrollView.scrollEnabled = self.config.modelIsScrollEnabled; + self.itemsScrollView.showsVerticalScrollIndicator = self.config.modelIsShowsScrollIndicator; + + self.actionsScrollView.scrollEnabled = self.config.modelIsScrollEnabled; + + self.actionsScrollView.showsVerticalScrollIndicator = self.config.modelIsShowsScrollIndicator; + [self.config.modelItemArray enumerateObjectsUsingBlock:^(id _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { void (^itemBlock)(LEEItem *) = obj; @@ -3457,6 +3476,12 @@ - (void)configActionSheet{ self.itemsScrollView.scrollEnabled = self.config.modelIsScrollEnabled; + self.itemsScrollView.showsVerticalScrollIndicator = self.config.modelIsShowsScrollIndicator; + + self.actionsScrollView.scrollEnabled = self.config.modelIsScrollEnabled; + + self.actionsScrollView.showsVerticalScrollIndicator = self.config.modelIsShowsScrollIndicator; + [self.config.modelItemArray enumerateObjectsUsingBlock:^(id _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { void (^itemBlock)(LEEItem *) = obj; diff --git a/LEEAlert/LEEAlertHelper.h b/LEEAlert/LEEAlertHelper.h index 4faed50..db7225b 100644 --- a/LEEAlert/LEEAlertHelper.h +++ b/LEEAlert/LEEAlertHelper.h @@ -13,7 +13,7 @@ * * @author LEE * @copyright Copyright © 2016 - 2020年 lee. All rights reserved. - * @version V1.6.2 + * @version V1.6.3 */ #ifndef LEEAlertHelper_h diff --git a/UPDATELOG.md b/UPDATELOG.md index c9e5129..c61f06e 100644 --- a/UPDATELOG.md +++ b/UPDATELOG.md @@ -1,6 +1,10 @@ # LEEAlert - 更新日志 +V1.6.3 +============== +增加 `.LeeIsShowsScrollIndicator(YES)` 设置是否显示滑动指示器 + V1.6.2 ============== `leeShouldActionClickClose` 返回False时 Action的点击事件回调也会被调用