联调流程定义 流程图

src/views/pqs/process/definition/editor/index.vue

@@ -61,42 +61,38 @@ const initModeler = item => {
 }
 
 /** 添加/修改模型 */
-const save = async bpmnXml => {
+const save = async (bpmnXml: any, form: any) => {
     const data = {
         // name
         // flowableXml
         // category
         ...model.value,
         flowableXml: bpmnXml, // bpmnXml 只是初始化流程图，后续修改无法通过它获得
-        category: '',
-        name: ''
+        category: form.category,
+        name: form.name
     } as unknown as ModelApi.ModelVO
     // 提交
     if (data.id) {
-        await ModelApi.updateModel(data)
         ElMessage.success('修改成功')
     } else {
-        await ModelApi.createModel(data)
+        await ModelApi.save(data)
         ElMessage.success('新增成功')
     }
     // 跳转回去
-    close()
+    emit('quit')
 }
 
-/** 关闭按钮 */
-const close = () => {}
-const randomStr = () => {
-    return Math.random().toString(36).slice(-8)
-}
 /** 初始化 */
 onMounted(async () => {
     const data: any = {}
     if (prop.model?.deploymentId === undefined) {
         if (!data.bpmnXml) {
             // 首次创建的 Model 模型，它是没有 bpmnXml，此时需要给它一个默认的
+            data.key = Math.random().toString(36).slice(-8)
+            console.log('🚀 ~ onMounted ~ data.key:', data.key)
             data.bpmnXml = ` <?xml version="1.0" encoding="UTF-8"?>
   <definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.activiti.org/processdef">
-    <process id="${data.key}" name="${data.name}"  />
+    <process id="flow_${data.key}" name="${data.name || ''}"  />
     <bpmndi:BPMNDiagram id="BPMNDiagram">
       <bpmndi:BPMNPlane id="${data.key}_di" bpmnElement="${data.key}" />
     </bpmndi:BPMNDiagram>
@@ -110,11 +106,13 @@ onMounted(async () => {
     }
     // 查询模型
 
-    model.value = {
-        ...data,
-        bpmnXml: undefined // 清空 bpmnXml 属性
-    }
-    xmlString.value = data.bpmnXml
+    setTimeout(() => {
+        model.value = {
+            ...data,
+            bpmnXml: undefined // 清空 bpmnXml 属性
+        }
+        xmlString.value = data.bpmnXml
+    }, 0)
 })
 </script>
 <style lang="scss">