fix: 修复缺陷

ctank · May 22, 2019 · 0f404d5 · 0f404d5
1 parent 2e422c5
commit 0f404d5
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 11 deletions.
diff --git a/dist/extensions.js b/dist/extensions.js
@@ -19,7 +19,7 @@ var Extension = {
       superClass: ['Element'],
       properties: [
         {
-          name: 'attr',
+          name: 'type',
           type: 'String',
           isAttr: true
         },

diff --git a/dist/index.html b/dist/index.html
@@ -198,7 +198,7 @@
               {
                 name: 't:test2',
                 value: '测试2',
-                attr: 'attr2'
+                type: 'attr2'
               }
             ]
           })

diff --git a/dist/js/bpd-core.js b/dist/js/bpd-core.js
diff --git a/dist/js/bpd-core.umd.js b/dist/js/bpd-core.umd.js
diff --git a/src/draw/draw.js b/src/draw/draw.js
@@ -11,7 +11,8 @@ import {
   cloneDeep,
   restoreScale,
   getBpmnNameByType,
-  convertFirstLetter
+  convertFirstLetter,
+  setExportExtensions
 } from '../utils/utils'
 import $ from '../utils/slimJQ'
 
@@ -103,6 +104,11 @@ class Draw extends Operation {
               planeElement.forEach((plane, planeIndex) => {
                 if (plane.id === element.id + '_di') {
                   const data = cloneDeep(element)
+                  if (element.extensionElements) {
+                    data.extensionElements.values = setExportExtensions(
+                      element.extensionElements.values || []
+                    )
+                  }
                   const type = getBpmnNameByType(element.$type)
                   if (type !== 'SequenceFlow') {
                     data.incoming = element.incoming ? element.incoming.id : ''

diff --git a/src/utils/utils.js b/src/utils/utils.js
@@ -259,12 +259,14 @@ export const setExportData = element => {
  *
  * @param {*} values
  */
-const setExportExtensions = values => {
+export const setExportExtensions = values => {
   const extensions = []
   for (let i = 0; i < values.length; i += 1) {
-    const item = cloneDeep(values[i])
-    item.name = item.$type
-    delete item.$type
+    const item = Object.assign({}, cloneDeep(values[i]), values[i].$attrs)
+    if (item.$type) {
+      item.name = item.$type
+      delete item.$type
+    }
     extensions.push(item)
   }
 

diff --git a/static/extensions.js b/static/extensions.js
@@ -19,7 +19,7 @@ var Extension = {
       superClass: ['Element'],
       properties: [
         {
-          name: 'attr',
+          name: 'type',
           type: 'String',
           isAttr: true
         },

diff --git a/static/index.html b/static/index.html
@@ -198,7 +198,7 @@
               {
                 name: 't:test2',
                 value: '测试2',
-                attr: 'attr2'
+                type: 'attr2'
               }
             ]
           })