@logicflow/extension 2.1.4 → 2.1.5

package/lib/bpmn-adapter/json2xml.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleAttributes = exports.lfJson2Xml = void 0;
+exports.escapeXml = exports.handleAttributes = exports.lfJson2Xml = void 0;
 function type(obj) {
     return Object.prototype.toString.call(obj);
 }
@@ -28,6 +28,30 @@ function handleAttributes(o) {
     return t;
 }
 exports.handleAttributes = handleAttributes;
+/**
+ * 将普通文本中的一些特殊字符进行转移，保障文本安全地嵌入 XML：
+ * - 空值(`null/undefined`)返回空字符串，避免输出非法字面量；
+ * - 按顺序转义 XML 保留字符：`&`, `<`, `>`, `"`, `'`；
+ *   注意优先转义 `&`，避免后续生成的实体被再次转义。
+ * @param text 原始文本
+ * @returns 已完成 XML 转义的字符串
+ */
+function escapeXml(text) {
+    // 空值直接返回空字符串，防止在 XML 中出现 "null"/"undefined"
+    if (text == null)
+        return '';
+    return (text
+        .toString()
+        // & 必须先转义，避免影响后续 < > " ' 的实体
+        .replace(/&/g, '&amp;')
+        // 小于号与大于号，用于标签边界
+        .replace(/</g, '&lt;')
+        .replace(/>/g, '&gt;')
+        // 双引号与单引号，用于属性值的包裹
+        .replace(/"/g, '&quot;')
+        .replace(/'/g, '&apos;'));
+}
+exports.escapeXml = escapeXml;
 function getAttributes(obj) {
     var tmp = obj;
     try {
@@ -38,7 +62,8 @@ function getAttributes(obj) {
     catch (error) {
         tmp = JSON.stringify(handleAttributes(obj)).replace(/"/g, "'");
     }
-    return tmp;
+    // 确保属性值中的特殊字符被正确转义
+    return escapeXml(String(tmp));
 }
 var tn = '\t\n';
 // @see issue https://github.com/didi/LogicFlow/issues/718, refactoring of function toXml
@@ -50,7 +75,7 @@ function toXml(obj, name, depth) {
     }
     var str = '';
     if (name === '#text') {
-        return tn + frontSpace + obj;
+        return tn + frontSpace + escapeXml(String(obj));
     }
     else if (name === '#cdata-section') {
         return tn + frontSpace + '<![CDATA[' + obj + ']]>';
@@ -82,7 +107,7 @@ function toXml(obj, name, depth) {
                     (children_1 !== '' ? ">".concat(children_1).concat(tn + frontSpace, "</").concat(name, ">") : ' />');
         }
         else {
-            str += tn + frontSpace + "<".concat(name, ">").concat(obj.toString(), "</").concat(name, ">");
+            str += tn + frontSpace + "<".concat(name, ">").concat(escapeXml(String(obj)), "</").concat(name, ">");
         }
     }
     return str;

package/lib/bpmn-adapter/xml2json.js

@@ -5,6 +5,7 @@ exports.lfXml2Json = void 0;
 // ========================================================================
 //  XML.ObjTree -- XML source code from/to JavaScript object like E4X
 // ========================================================================
+var json2xml_1 = require("./json2xml");
 var XML = function () { };
 //  constructor
 XML.ObjTree = function () {
@@ -293,13 +294,7 @@ XML.ObjTree.prototype.scalar_to_xml = function (name, text) {
     }
 };
 //  method: xml_escape( text )
-XML.ObjTree.prototype.xml_escape = function (text) {
-    return text
-        .replace(/&/g, '&')
-        .replace(/</g, '<')
-        .replace(/>/g, '>')
-        .replace(/"/g, '"');
-};
+XML.ObjTree.prototype.xml_escape = json2xml_1.escapeXml;
 /*
 // ========================================================================
 

package/lib/components/mini-map/index.js

@@ -98,8 +98,10 @@ var MiniMap = /** @class */ (function () {
          */
         this.show = function (left, top) {
             if (!_this.isShow) {
+                _this.initMiniMap();
+                _this.lf.on('graph:resize', _this.onGraphResize);
                 _this.createMiniMap(left, top);
-                _this.setView();
+                _this.setView(true);
             }
             _this.isShow = true;
         };
@@ -108,6 +110,13 @@ var MiniMap = /** @class */ (function () {
          */
         this.hide = function () {
             if (_this.isShow) {
+                // 隐藏小地图时摧毁实例
+                (0, vue_node_registry_1.destroyTeleportContainer)(_this.lfMap.graphModel.flowId);
+                _this.lf.off('graph:resize', _this.onGraphResize);
+                _this.lfMap.destroy();
+                // 保证重新创建实例时，小地图中内容偏移正确
+                _this.translateX = 0;
+                _this.translateY = 0;
                 _this.removeMiniMap();
                 _this.lf.emit('miniMap:close', {});
             }
@@ -236,8 +245,6 @@ var MiniMap = /** @class */ (function () {
         this.bounds = boundsInit;
         this.elementAreaBounds = boundsInit;
         this.viewPortBounds = boundsInit;
-        this.initMiniMap();
-        lf.on('graph:resize', this.onGraphResize);
     }
     /**
      * 初始化小地图的配置

package/lib/tools/proximity-connect/index.d.ts

@@ -6,10 +6,18 @@ export type ProximityConnectProps = {
     distance: number;
     reverseDirection: boolean;
     virtualEdgeStyle: Record<string, unknown>;
+    /**
+     * proximityConnect 类型:
+     * - 'node': 节点-节点连接
+     * - 'anchor': 锚点-锚点连接
+     * - 'default': 节点-锚点连接
+     */
+    type: 'node' | 'anchor' | 'default';
 };
 export declare class ProximityConnect {
     static pluginName: string;
     enable: boolean;
+    type: 'node' | 'anchor' | 'default';
     lf: LogicFlow;
     closestNode?: BaseNodeModel;
     currentDistance: number;

package/lib/tools/proximity-connect/index.js

@@ -18,6 +18,7 @@ var ProximityConnect = /** @class */ (function () {
     function ProximityConnect(_a) {
         var lf = _a.lf, options = _a.options;
         this.enable = true;
+        this.type = 'default';
         this.currentDistance = Infinity; // 当前间距
         this.thresholdDistance = 100; // 节点-节点连接距离阈值
         this.reverseDirection = false; // 节点-节点连线方向，默认是拖拽节点连向最近节点
@@ -37,6 +38,8 @@ var ProximityConnect = /** @class */ (function () {
         // 节点开始拖拽事件
         this.lf.graphModel.eventCenter.on('node:dragstart', function (_a) {
             var data = _a.data;
+            if (_this.type === 'anchor')
+                return;
             if (!_this.enable)
                 return;
             var graphModel = _this.lf.graphModel;
@@ -45,12 +48,14 @@ var ProximityConnect = /** @class */ (function () {
         });
         // 节点拖拽事件
         this.lf.graphModel.eventCenter.on('node:drag', function () {
+            if (_this.type === 'anchor')
+                return;
             _this.handleNodeDrag();
         });
         // 锚点开始拖拽事件
         this.lf.graphModel.eventCenter.on('anchor:dragstart', function (_a) {
             var data = _a.data, nodeModel = _a.nodeModel;
-            if (!_this.enable)
+            if (!_this.enable || _this.type === 'node')
                 return;
             _this.currentNode = nodeModel;
             _this.currentAnchor = data;
@@ -58,20 +63,20 @@ var ProximityConnect = /** @class */ (function () {
         // 锚点拖拽事件
         this.lf.graphModel.eventCenter.on('anchor:drag', function (_a) {
             var _b = _a.e, clientX = _b.clientX, clientY = _b.clientY;
-            if (!_this.enable)
+            if (!_this.enable || _this.type === 'node')
                 return;
             _this.handleAnchorDrag(clientX, clientY);
         });
         // 节点、锚点拖拽结束事件
         this.lf.graphModel.eventCenter.on('node:drop', function () {
-            if (!_this.enable)
+            if (!_this.enable || _this.type === 'anchor')
                 return;
             _this.handleDrop();
         });
         // 锚点拖拽需要单独判断一下当前拖拽终点是否在某个锚点上，如果是，就不触发插件的连线，以免出现创建了两条连线的问题，表现见 issue 2140
         this.lf.graphModel.eventCenter.on('anchor:dragend', function (_a) {
             var e = _a.e, edgeModel = _a.edgeModel;
-            if (!_this.enable)
+            if (!_this.enable || _this.type === 'node')
                 return;
             var _b = _this.lf.graphModel.getPointByClient({
                 x: e.clientX,

package/lib/tools/snapshot/index.d.ts

@@ -32,6 +32,14 @@ export type ToImageOptions = {
      * - `true`：只导出画面区域内的可见元素
      */
     partial?: boolean;
+    /**
+     * 导出图片时的安全系数，用于确保导出的图片能够容纳所有元素，默认值为 1.1
+     */
+    safetyFactor?: number;
+    /**
+     * 导出图片时的安全边距，用于确保导出的图片能够容纳所有元素，默认值为 40
+     */
+    safetyMargin?: number;
 };
 export type SnapshotResponse = {
     data: Blob | string;

package/lib/tools/snapshot/index.js

@@ -407,7 +407,7 @@ var Snapshot = /** @class */ (function () {
                         graphModel = this.lf.graphModel;
                         transformModel = graphModel.transformModel;
                         SCALE_X = transformModel.SCALE_X, SCALE_Y = transformModel.SCALE_Y, TRANSLATE_X = transformModel.TRANSLATE_X, TRANSLATE_Y = transformModel.TRANSLATE_Y;
-                        safetyFactor = 1.1 // 安全系数，增加20%的空间
+                        safetyFactor = toImageOptions.safetyFactor || 1.1 // 安全系数，增加10%的空间
                         ;
                         actualWidth = (bbox.width / SCALE_X) * safetyFactor;
                         actualHeight = (bbox.height / SCALE_Y) * safetyFactor;
@@ -416,7 +416,7 @@ var Snapshot = /** @class */ (function () {
                         canvas = document.createElement('canvas');
                         canvas.style.width = "".concat(bboxWidth, "px");
                         canvas.style.height = "".concat(bboxHeight, "px");
-                        safetyMargin = 40 // 额外的安全边距
+                        safetyMargin = toImageOptions.safetyMargin || 40 // 额外的安全边距
                         ;
                         _b = this.getCanvasDimensionsByBrowser(), maxCanvasDimension = _b.maxCanvasDimension, otherMaxCanvasDimension = _b.otherMaxCanvasDimension;
                         MAX_CANVAS_DIMENSION = maxCanvasDimension;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@logicflow/extension",
-  "version": "2.1.4",
+  "version": "2.1.5",
   "description": "LogicFlow Extensions",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -20,8 +20,8 @@
   "author": "Logicflow-Team",
   "license": "Apache-2.0",
   "peerDependencies": {
-    "@logicflow/vue-node-registry": "1.1.3",
-    "@logicflow/core": "2.1.2"
+    "@logicflow/vue-node-registry": "1.1.4",
+    "@logicflow/core": "2.1.3"
   },
   "dependencies": {
     "@antv/hierarchy": "^0.6.11",
@@ -32,8 +32,8 @@
     "preact": "^10.17.1",
     "rangy": "^1.3.1",
     "vanilla-picker": "^2.12.3",
-    "@logicflow/core": "2.1.2",
-    "@logicflow/vue-node-registry": "1.1.3"
+    "@logicflow/core": "2.1.3",
+    "@logicflow/vue-node-registry": "1.1.4"
   },
   "devDependencies": {
     "less": "^4.1.1",