Enhance the user experience in the scenario of submitting duplicate keys #3429
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # README.md
Codecov Report
@@ Coverage Diff @@
## master #3429 +/- ##
=========================================
Coverage 51.38% 51.39%
- Complexity 2312 2313 +1
=========================================
Files 441 441
Lines 13821 13823 +2
Branches 1407 1408 +1
=========================================
+ Hits 7102 7104 +2
Misses 6231 6231
Partials 488 488
Continue to review full report at Codecov.
|
nobodyiam
requested changes
Dec 12, 2020
.../src/main/java/com/ctrip/framework/apollo/portal/component/txtresolver/PropertyResolver.java
Outdated
Show resolved
Hide resolved
.../src/main/java/com/ctrip/framework/apollo/portal/component/txtresolver/PropertyResolver.java
Outdated
Show resolved
Hide resolved
.../src/main/java/com/ctrip/framework/apollo/portal/component/txtresolver/PropertyResolver.java
Outdated
Show resolved
Hide resolved
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What's the purpose of this PR
增强重复键冲突场景下的用户体验
Enhance the user experience in the scenario of submitting duplicate keys
这个pr作用于文本编辑模式。我遇到过很多次，复制配置然后修改配置，最后提交的时候因为键值冲突，导致我之前所有的配置修改都没了，这个pr调整了一个键值冲突时的策略，当发生键值冲突时，编辑窗口不关闭，同时，通过异常消息告诉用户，存在哪些重复的键值
This pr acts in text editing mode. I have encountered many times, copying the configuration and then modifying the configuration. At the end of the submission, all my previous configuration changes were lost due to the key-value conflict. This pr adjusted a key-value conflict strategy. When a key-value conflict occurs When the editing window is not closed, at the same time, an exception message is used to inform the user of the duplicate key values
目前的：
current
修改后：
after edited