diff --git a/WIKI_ALL.md b/WIKI_ALL.md index f709c55..0dc0b36 100644 --- a/WIKI_ALL.md +++ b/WIKI_ALL.md @@ -435,21 +435,21 @@ fun String?.getZeroAsEmpty(blank: Boolean = true): String? * @param default 为null 时返回 * @param notNull 非null如何处理 */ -fun String?.transformNull(default: String, notNull: (String) -> String): String +fun String?.transformNotNull(default: String, notNull: (String) -> String): String /** * 转换字符串, * @param default 为 empty 时返回 * @param notEmpty 非 empty 如何处理 */ -fun String?.transformEmpty(default: String, notEmpty: (String) -> String): String +fun String?.transformNotEmpty(default: String, notEmpty: (String) -> String): String /** * 转换字符串 * @param default 为 blank 时返回 * @param notBlank 非 blank 如何处理 */ -fun String?.transformBlank(default: String, notBlank: (String) -> String): String +fun String?.transformNotBlank(default: String, notBlank: (String) -> String): String ``` diff --git a/comm/src/main/java/cn/yizems/util/ktx/comm/type/StringEx.kt b/comm/src/main/java/cn/yizems/util/ktx/comm/type/StringEx.kt index c6d828a..c3f70c5 100644 --- a/comm/src/main/java/cn/yizems/util/ktx/comm/type/StringEx.kt +++ b/comm/src/main/java/cn/yizems/util/ktx/comm/type/StringEx.kt @@ -161,7 +161,7 @@ fun String?.getZeroAsEmpty(blank: Boolean = true): String? { * @param default 为null 时返回 * @param notNull 非null如何处理 */ -fun String?.transformNull(default: String, notNull: (String) -> String): String { +fun String?.transformNotNull(default: String, notNull: (String) -> String): String { return if (this == null) { default } else { @@ -174,7 +174,7 @@ fun String?.transformNull(default: String, notNull: (String) -> String): String * @param default 为 empty 时返回 * @param notEmpty 非 empty 如何处理 */ -fun String?.transformEmpty(default: String, notEmpty: (String) -> String): String { +fun String?.transformNotEmpty(default: String, notEmpty: (String) -> String): String { return if (this.isNullOrEmpty()) { default } else { @@ -187,10 +187,12 @@ fun String?.transformEmpty(default: String, notEmpty: (String) -> String): Strin * @param default 为 blank 时返回 * @param notBlank 非 blank 如何处理 */ -fun String?.transformBlank(default: String, notBlank: (String) -> String): String { +fun String?.transformNotBlank(default: String, notBlank: (String) -> String): String { return if (this == null) { default } else { notBlank(this) } } + +