|
|
@@ -50,6 +50,10 @@
|
|
|
</div>
|
|
|
</ElTabPane>
|
|
|
<ElTabPane :label="'代码差异'" name="codeDiff">
|
|
|
+ <el-row v-if="codeDiffMsg.length === 0" class="codeDiffHint">
|
|
|
+ <i class="el-icon-info"></i>
|
|
|
+ 源分支与目标分支间的代码无差异，无法进行代码评审以及合并操作。
|
|
|
+ </el-row>
|
|
|
<CodeDifferencePlate :data="codeDiffMsg"/>
|
|
|
</ElTabPane>
|
|
|
</ElTabs>
|
|
|
@@ -153,6 +157,7 @@ export default {
|
|
|
disableMergeButton() {
|
|
|
if (this.codeReviewDetail.status !== 'Opened') return true;
|
|
|
if (this.currentUser.id !== this.codeReviewDetail.reviewerId) return true;
|
|
|
+ if (this.codeDiffMsg.length === 0) return true;
|
|
|
return false;
|
|
|
},
|
|
|
mergeCodeReview() {
|
|
|
@@ -249,4 +254,12 @@ export default {
|
|
|
font-size: 13px;
|
|
|
}
|
|
|
}
|
|
|
+.codeDiffHint {
|
|
|
+ font-size: 16px;
|
|
|
+ color: grey;
|
|
|
+ .el-icon-info {
|
|
|
+ color: #ff4444;
|
|
|
+ margin-right: 4px;
|
|
|
+ }
|
|
|
+}
|
|
|
</style>
|
shanshan