修复代码冲突手动合并的问题

src/config.js

@@ -7,7 +7,7 @@ if (process.env.NODE_ENV === 'development') {
 	//API_HOST = '//10.10.95.74:7777';
 	//API_HOST = '//192.168.1.16:7777';
 	API_HOST = '//0.0.0.0:3000';
-	//API_HOST = '//localhost:8080';
+	//API_HOST = '//0.0.0.0:8080';
 	//API_HOST = window.__data.apiHost;
 	//API_HOST = 'http://beacon.duiba.com.cn';
 	//API_HOST = 'http://beacon.duibadev.com.cn';

src/locales/zh-CN.json

@@ -240,7 +240,7 @@
 	"Merge conflicts": "合并冲突",
 	"There are still unresolved conflicts": "还有冲突未解决，不能保存!",
 	"The format of the JSON document is wrong": "JSON文档格式有误，请先更正!",
-	"The conflict has been resolved": "冲突已解决，确定提交吗?",
+	"The conflict has been resolved": "该文件的冲突已解决，继续吗?",
 	"All conflict has been resolved": "所有冲突已解决，确定保存吗?",
 	"Failed to update operator": "更新权限列表失败",
 	"Error delete self": "连自己都删？ 不可以！",

src/views/Editor/dialogs/CodeConflictResolveDialog.vue

@@ -44,7 +44,7 @@
 			</div>
 			<div>
 				<el-button size="mini" @click="onCancel">{{$t('Cancel')}}</el-button>
-				<el-button size="mini" @click="onSave" type="primary" :disabled="step===0">{{$t('Commit')}}</el-button>
+				<el-button size="mini" @click="onSave" type="primary" :disabled="step===0">{{$t('Confirm')}}</el-button>
 			</div>
 		</div>
 	</el-dialog>

src/views/Editor/dialogs/ProjectConflictResolveDialog.vue

@@ -6,7 +6,7 @@
              custom-class="flex-dialog project-conflict-resolve-editor"
   >
     <div class="wrapper">
-			<span>冲突数：{{conflictCounting}}</span>
+      <span>冲突数：{{ conflictCounting }}</span>
       <el-tabs tab-position="left" class="category-tab">
         <el-tab-pane v-for="(categoryConfig, category) in categories" :key="category"
                      :label="`${categoryConfig.label}(${conflictCountingMap[category]})`">
@@ -20,8 +20,8 @@
 
       </div>
       <div>
-				<el-button size="mini" @click="onCancel">{{$t('Cancel')}}</el-button>
-				<el-button size="mini" @click="onSave" type="primary" :disabled="conflictCounting > 0">{{$t('Save')}}
+        <el-button size="mini" @click="onCancel">{{ $t('Cancel') }}</el-button>
+        <el-button size="mini" @click="onSave" type="primary" :disabled="conflictCounting > 0">{{ $t('Save') }}
         </el-button>
       </div>
     </div>
@@ -30,10 +30,10 @@
 </template>
 
 <script>
-	import ListCompareView from "./ProjectConflictResolveDialog/ListCompareView";
-	import CodeConflictResolveDialog from "./CodeConflictResolveDialog";
+import ListCompareView from "./ProjectConflictResolveDialog/ListCompareView";
+import CodeConflictResolveDialog from "./CodeConflictResolveDialog";
 
-	export default {
+export default {
   name: "ProjectConflictResolveDialog",
   components: {CodeConflictResolveDialog, ListCompareView},
   data() {
@@ -174,7 +174,7 @@
     },
     onCodeConflictResolved(data) {
       if (this.lastConflict) {
-					this.reSaveConflict(this.lastConflict, data, this.lastCategory);
+        this.reSaveConflict(this.lastConflict, {obj: data}, this.lastCategory);
       }
     },
     reSaveConflict(conflict, result, category) {
@@ -219,7 +219,7 @@
       this.conflictCountingMap[category]--;
     }
   }
-	}
+}
 </script>
 
 <style scoped>

yarn.lock

@@ -9053,7 +9053,7 @@ yeast@0.1.2:
     props-compute "http://gitlab2.dui88.com/laoqifeng/props-compute.git"
 
 "zeroing-template-fill@http://gitlab2.dui88.com/laoqifeng/zeroing-template-fill.git":
-  version "1.0.0"
-  resolved "http://gitlab2.dui88.com/laoqifeng/zeroing-template-fill.git#11f5cc42faea5745a36fc73fc8374419031de783"
+  version "1.0.1"
+  resolved "http://gitlab2.dui88.com/laoqifeng/zeroing-template-fill.git#bd9c85b5baf4bf67a6a661b2af0d31e985d3e7bf"
   dependencies:
     camelcase "^5.3.1"