版本比对

src/locales/zh-CN.json

@@ -158,7 +158,7 @@
 	"Failed to save project": "保存项目失败",
 	"Save project successfully": "保存项目成功",
 	"There are conflicts in the project": "项目有冲突，请先解决冲突",
-	"Input version remark": "输入版本备注",
+	"Input version remark": "请务必认真输入版本备注",
 	"Input view name": "输入视图名",
 	"Invalid view name": "无效的视图名",
 	"Unsaved version found locally": "本地发现了未保存保本，请选择版本打开",
@@ -238,6 +238,11 @@
 	"Failed to update operator": "更新权限列表失败",
 	"Error delete self": "连自己都删？ 不可以！",
 	"No permission": "没有权限喔！",
+	"Accept Remote": "远程版本",
+	"Accept Local": "本地版本",
+	"Accept Both": "兼并",
+	"Previous Conflict": "上一个冲突",
+	"Next Conflict": "下一个冲突",
 	"eventGroup": {
 		"in": "接收",
 		"out": "派发"

src/themes/light/editor.scss

@@ -544,3 +544,19 @@
 		}
 	}
 }
+
+.remote-change-class {
+	background-color: rgba(64, 200, 174, 0.2);
+}
+
+.remote-change-marker-class {
+	background-color: rgba(64, 200, 174, 0.5);
+}
+
+.local-change-class {
+	background-color: rgba(64, 166, 255, 0.2);
+}
+
+.local-change-marker-class {
+	background-color: rgba(64, 166, 255, 0.5);
+}

src/views/Editor.vue

@@ -200,7 +200,7 @@
 				await this.$prompt(this.$t('Input version remark'), this.$t('Alert'), {
 					confirmButtonText: this.$t('Confirm'),
 					showClose: false,
-					inputPattern: /^.{0,256}$/,
+					inputPattern: /^.{1,256}$/,
 				}).then(
 					({value}) => {
 						remark = this.lastSaveRemark = value;