Merge remote-tracking branch 'origin/master'

src/components/scWorkflow/nodes/addNode.vue

@@ -86,13 +86,15 @@ export default {
 					childNode: this.modelValue
 				}
 			} else if (type === 4) {
+				const _key = getNodeKey()
 				node = {
 					nodeName: '条件路由',
+					nodeKey: _key,
 					type: 4,
 					conditionNodes: [
 						{
 							nodeName: '条件1',
-							nodeKey: getNodeKey(),
+							nodeKey: _key + 1,
 							type: 3,
 							priorityLevel: 1,
 							conditionMode: 1,
@@ -100,7 +102,7 @@ export default {
 						},
 						{
 							nodeName: '条件2',
-							nodeKey: getNodeKey(),
+							nodeKey: _key + 2,
 							type: 3,
 							priorityLevel: 2,
 							conditionMode: 1,
@@ -141,7 +143,7 @@ export default {
 					nodeName: '子流程',
 					nodeKey: getNodeKey(),
 					type: 8,
-          callProcess: undefined, // 设置 id:name  格式
+					callProcess: undefined, // 设置 id:name  格式
 					childNode: this.modelValue
 				}
 			}