@logicflow/extension 2.0.6 → 2.0.8

package/es/bpmn-adapter/json2xml.d.ts

@@ -1,3 +1,8 @@
 declare function handleAttributes(o: any): any;
+/**
+ * json 转 xml
+ * @param o object
+ * @returns
+ */
 declare function lfJson2Xml(o: Object): string;
 export { lfJson2Xml, handleAttributes };

package/es/bpmn-adapter/json2xml.js

@@ -40,6 +40,10 @@ var tn = '\t\n';
 // @see issue https://github.com/didi/LogicFlow/issues/718, refactoring of function toXml
 function toXml(obj, name, depth) {
     var frontSpace = addSpace(depth);
+    // 假值除 0、false 外 -> 直接返回空元素 <prop />
+    if (obj !== 0 && obj !== false && !obj) {
+        return tn + frontSpace + "<".concat(name, " />");
+    }
     var str = '';
     if (name === '#text') {
         return tn + frontSpace + obj;
@@ -79,6 +83,11 @@ function toXml(obj, name, depth) {
     }
     return str;
 }
+/**
+ * json 转 xml
+ * @param o object
+ * @returns
+ */
 function lfJson2Xml(o) {
     var xmlStr = '';
     for (var m in o) {

package/es/bpmn-adapter/xml2json.d.ts

@@ -1,2 +1,7 @@
+/**
+ * xml 转 json
+ * @param xmlData
+ * @returns
+ */
 declare const lfXml2Json: (xmlData: any) => any;
 export { lfXml2Json };

package/es/bpmn-adapter/xml2json.js

@@ -543,6 +543,11 @@ which I will do instead of keeping this documentation like it is.
 =cut
 // ========================================================================
 */
+/**
+ * xml 转 json
+ * @param xmlData
+ * @returns
+ */
 var lfXml2Json = function (xmlData) {
     return new XML.ObjTree().parseXML(xmlData);
 };

package/es/tools/label/index.js

@@ -237,6 +237,7 @@ var Label = /** @class */ (function () {
             var data = _a.data;
             var element = graphModel.getElement(data.id);
             if (element) {
+                _this.rewriteInnerMethods(element);
                 var formatedLabel = _this.formatConfig(graphModel, data);
                 element.setProperty('_label', formatedLabel);
             }

package/lib/bpmn-adapter/json2xml.d.ts

@@ -1,3 +1,8 @@
 declare function handleAttributes(o: any): any;
+/**
+ * json 转 xml
+ * @param o object
+ * @returns
+ */
 declare function lfJson2Xml(o: Object): string;
 export { lfJson2Xml, handleAttributes };

package/lib/bpmn-adapter/json2xml.js

@@ -44,6 +44,10 @@ var tn = '\t\n';
 // @see issue https://github.com/didi/LogicFlow/issues/718, refactoring of function toXml
 function toXml(obj, name, depth) {
     var frontSpace = addSpace(depth);
+    // 假值除 0、false 外 -> 直接返回空元素 <prop />
+    if (obj !== 0 && obj !== false && !obj) {
+        return tn + frontSpace + "<".concat(name, " />");
+    }
     var str = '';
     if (name === '#text') {
         return tn + frontSpace + obj;
@@ -83,6 +87,11 @@ function toXml(obj, name, depth) {
     }
     return str;
 }
+/**
+ * json 转 xml
+ * @param o object
+ * @returns
+ */
 function lfJson2Xml(o) {
     var xmlStr = '';
     for (var m in o) {

package/lib/bpmn-adapter/xml2json.d.ts

@@ -1,2 +1,7 @@
+/**
+ * xml 转 json
+ * @param xmlData
+ * @returns
+ */
 declare const lfXml2Json: (xmlData: any) => any;
 export { lfXml2Json };

package/lib/bpmn-adapter/xml2json.js

@@ -546,6 +546,11 @@ which I will do instead of keeping this documentation like it is.
 =cut
 // ========================================================================
 */
+/**
+ * xml 转 json
+ * @param xmlData
+ * @returns
+ */
 var lfXml2Json = function (xmlData) {
     return new XML.ObjTree().parseXML(xmlData);
 };

package/lib/tools/label/index.js

@@ -243,6 +243,7 @@ var Label = /** @class */ (function () {
             var data = _a.data;
             var element = graphModel.getElement(data.id);
             if (element) {
+                _this.rewriteInnerMethods(element);
                 var formatedLabel = _this.formatConfig(graphModel, data);
                 element.setProperty('_label', formatedLabel);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@logicflow/extension",
-  "version": "2.0.6",
+  "version": "2.0.8",
   "description": "LogicFlow Extensions",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -20,7 +20,7 @@
   "author": "Logicflow-Team",
   "license": "Apache-2.0",
   "peerDependencies": {
-    "@logicflow/core": "2.0.3"
+    "@logicflow/core": "2.0.4"
   },
   "dependencies": {
     "@antv/hierarchy": "^0.6.11",
@@ -31,7 +31,7 @@
     "preact": "^10.17.1",
     "rangy": "^1.3.1",
     "vanilla-picker": "^2.12.3",
-    "@logicflow/core": "2.0.3"
+    "@logicflow/core": "2.0.4"
   },
   "devDependencies": {
     "less": "^4.1.1",

package/src/bpmn-adapter/json2xml.ts

@@ -43,6 +43,12 @@ const tn = '\t\n'
 // @see issue https://github.com/didi/LogicFlow/issues/718, refactoring of function toXml
 function toXml(obj: string | any[] | Object, name: string, depth: number) {
   const frontSpace = addSpace(depth)
+
+  // 假值除 0、false 外 -> 直接返回空元素 <prop />
+  if (obj !== 0 && obj !== false && !obj) {
+    return tn + frontSpace + `<${name} />`
+  }
+
   let str = ''
   if (name === '#text') {
     return tn + frontSpace + obj
@@ -79,6 +85,11 @@ function toXml(obj: string | any[] | Object, name: string, depth: number) {
   return str
 }
 
+/**
+ * json 转 xml
+ * @param o object
+ * @returns
+ */
 function lfJson2Xml(o: Object) {
   let xmlStr = ''
   for (var m in o) {

package/src/bpmn-adapter/xml2json.ts

@@ -537,6 +537,11 @@ which I will do instead of keeping this documentation like it is.
 // ========================================================================
 */
 
+/**
+ * xml 转 json
+ * @param xmlData
+ * @returns
+ */
 const lfXml2Json = (xmlData) => {
   return new XML.ObjTree().parseXML(xmlData)
 }

package/src/bpmn-elements/presets/Pool/index.ts

@@ -52,18 +52,18 @@ function poolEvent(lf: any) {
       poolModel.addChild(laneId)
     }
   })
-  lf.on('node:resize', ({ oldNodeSize, newNodeSize }: any) => {
-    const { id, type } = oldNodeSize
-    const deltaHeight = newNodeSize.height - oldNodeSize.height
-    // const resizeDir = newNodeSize.y - oldNodeSize.y > 0 ? 'below': 'above'
+  lf.on('node:resize', ({ preData, data }: any) => {
+    const { id, type } = preData
+    const deltaHeight = data.height - preData.height
+    // const resizeDir = data.y - preData.y > 0 ? 'below': 'above'
     // 节点高度变高，y下移， 方向为below
     // 节点高度变高， y上移， 方向为above
     // 节点高度变小， y下移， 方向为above
     // 节点高度变小， y上移，方向为below
     let resizeDir = 'below'
-    if (deltaHeight > 0 && newNodeSize.y - oldNodeSize.y < 0) {
+    if (deltaHeight > 0 && data.y - preData.y < 0) {
       resizeDir = 'above'
-    } else if (deltaHeight < 0 && newNodeSize.y - oldNodeSize.y > 0) {
+    } else if (deltaHeight < 0 && data.y - preData.y > 0) {
       resizeDir = 'above'
     }
     if (type === 'pool') {
@@ -76,7 +76,7 @@ function poolEvent(lf: any) {
       // 泳道缩放， 调整泳池
       const groupId = lf.extension.group.nodeGroupMap.get(id)
       if (groupId) {
-        lf.getNodeModelById(groupId).resize(id, newNodeSize)
+        lf.getNodeModelById(groupId).resize(id, data)
       }
     }
   })

package/src/bpmn-elements/presets/Task/subProcess.ts

@@ -38,9 +38,8 @@ export function SubProcessFactory(): {
           x: x - width / 2 + 5,
           y: y - height / 2 + 5,
           onClick: (e: any) => {
-            e
-              .stopPropagation()(model as GroupNodeModel)
-              .foldGroup?.(!properties.isFolded)
+            e.stopPropagation()
+            ;(model as GroupNodeModel).foldGroup?.(!properties.isFolded)
           },
         }),
         iconIcon,

package/src/tools/label/index.ts

@@ -114,7 +114,7 @@ export class Label implements Extension {
       // 3. 字符串或者为空的话就是 string 类型，基于 text 的数据合成 LabelConfig 信息（主要复用 text 的 x,y 信息）
       const config: LabelConfig = {
         ...text,
-        content: curLabelConfig || text.value,
+        content: curLabelConfig || text?.value,
         draggable:
           element.BaseType === 'edge' ? edgeTextDraggable : nodeTextDraggable,
       }
@@ -331,9 +331,10 @@ export class Label implements Extension {
       model.setProperty('_label', newLabelConfig)
     })
     // 监听元素新增事件，元素label格式化
-    eventCenter.on('node:add,edge:add', ({ data }) => {
+    eventCenter.on('node:dnd-add,node:add,edge:add', ({ data }) => {
       const element = graphModel.getElement(data.id)
       if (element) {
+        this.rewriteInnerMethods(element)
         const formatedLabel = this.formatConfig(graphModel, data)
         element.setProperty('_label', formatedLabel)
       }