Merge remote-tracking branch 'origin/master'

src/views/flow/create/components/FlowDesign.vue

@@ -67,6 +67,11 @@ const openDrawerEv = () => {
 	drawer.value = !drawer.value
 }
 
+const sureImportJson = () => {
+	form.value.processConfig = JSON.parse(jsonFormat.value || {})
+	drawer.value = !drawer.value
+}
+
 onMounted(() => {
 	updateCompInfo()
 })
@@ -82,7 +87,7 @@ defineExpose({
 <template>
 	<div>
 		<div style="z-index: 999" class="fixed top-44 right-48">
-			<el-button type="primary" @click="openDrawerEv"> 查看 JSON </el-button>
+			<el-button type="primary" @click="openDrawerEv"> 查看/导入 JSON </el-button>
 		</div>
 
 		<ScWorkflow v-model="form.processConfig"></ScWorkflow>
@@ -91,7 +96,11 @@ defineExpose({
 			<code-mirror-editor v-model="jsonFormat"></code-mirror-editor>
 			<template #footer>
 				<el-button type="primary" @click="copyJson">复制 JSON</el-button>
-				<el-button @click="() => (drawer = false)">关 闭</el-button>
+				<el-popconfirm title="确定应用JSON模型吗？" @confirm="sureImportJson">
+					<template #reference>
+						<el-button>导入JSON</el-button>
+					</template>
+				</el-popconfirm>
 			</template>
 		</el-dialog>
 	</div>