@logicflow/core 2.0.0-beta.5 → 2.0.0-beta.7

package/lib/model/EditConfigModel.js

@@ -8,11 +8,14 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EditConfigModel = void 0;
 var lodash_es_1 = require("lodash-es");
-var mobx_1 = require("../util/mobx");
-var SilentConfig = {
+var mobx_1 = require("mobx");
+var constant_1 = require("../constant");
+var silentModeConfig = {
+    // SilentMode 下允许用户操作画布
     stopZoomGraph: false,
     stopScrollGraph: false,
     stopMoveGraph: false,
+    // 节点 & 边相关配置
     adjustEdge: false,
     adjustEdgeStartAndEnd: false,
     adjustNodePosition: false,
@@ -20,99 +23,123 @@ var SilentConfig = {
     allowRotate: false,
     allowResize: false,
     nodeSelectedOutline: true,
+    // 文本相关配置
+    textEdit: false,
     nodeTextEdit: false,
     edgeTextEdit: false,
+    textDraggable: false,
     nodeTextDraggable: false,
     edgeTextDraggable: false,
 };
-var keys = [
-    'isSilentMode',
-    'stopZoomGraph',
-    'stopScrollGraph',
-    'stopMoveGraph',
-    'adjustEdge',
-    'adjustEdgeMiddle',
-    'adjustEdgeStartAndEnd',
-    'adjustNodePosition',
-    'hideAnchors',
-    'allowRotate',
-    'allowResize',
-    'hoverOutline',
-    'nodeSelectedOutline',
-    'edgeSelectedOutline',
-    'nodeTextEdit',
-    'edgeTextEdit',
-    'nodeTextDraggable',
-    'edgeTextDraggable',
-    'multipleSelectKey',
-    'autoExpand',
+var allKeys = [
+    'isSilentMode', // 是否为静默模式
+    'stopZoomGraph', // 禁止缩放画布
+    'stopScrollGraph', // 禁止鼠标滚动移动画布
+    'stopMoveGraph', // 禁止拖动画布
+    'adjustEdge', // 允许调整边
+    'adjustEdgeMiddle', // 允许调整边中点
+    'adjustEdgeStartAndEnd', // 允许调整边起点和终点
+    'adjustEdgeStart', // 允许调整边起点
+    'adjustEdgeEnd', // 允许调整边终点
+    'adjustNodePosition', // 允许拖动节点
+    'hideAnchors', // 隐藏节点所有锚点
+    'allowRotate', // 是否允许节点旋转
+    'allowResize', // 是否允许节点缩放
+    'autoExpand', // 是否自动展开
+    'hoverOutline', // 显示节点悬浮时的外框
+    'nodeSelectedOutline', // 节点被选中时是否显示 outline
+    'edgeSelectedOutline', // 边被选中时是否显示 outline
+    'textEdit', // 是否允许文本可编辑（全局）
+    'nodeTextEdit', // 允许节点文本可以编辑
+    'edgeTextEdit', // 允许边文本可以编辑
+    'textDraggable', // 是否允许文本可拖拽（全局）
+    'nodeTextDraggable', // 允许节点文本可以拖拽
+    'edgeTextDraggable', // 允许边文本可以拖拽
+    'multipleSelectKey', // 多选按键
+    // 2.0.0 新增配置
+    'textMode', // 文本模式（全局）
+    'nodeTextMode', // 节点文本模式
+    'edgeTextMode', // 边文本模式
+    'nodeTextMultiple', // 是否支持多个节点文本
+    'edgeTextMultiple', // 是否支持多个边文本
+    'nodeTextVertical', // 节点文本是否纵向显示
+    'edgeTextVertical', // 边文本是否纵向显示
 ];
 /**
  * 页面编辑配置
  */
 var EditConfigModel = /** @class */ (function () {
     function EditConfigModel(config) {
+        /*********************************************************
+         * 画布相关配置
+         ********************************************************/
         this.isSilentMode = false;
         this.stopZoomGraph = false;
-        this.stopScrollGraph = false;
         this.stopMoveGraph = false;
-        this.adjustEdge = true;
-        this.adjustEdgeMiddle = false;
-        this.adjustEdgeStartAndEnd = false;
-        this.adjustNodePosition = true;
+        this.stopScrollGraph = false;
+        /*********************************************************
+         * 文本相关配置（全局）
+         ********************************************************/
+        this.textMode = constant_1.TextMode.TEXT; // 全局的 textMode 设置
+        this.textEdit = true;
+        this.textDraggable = false;
+        // 节点
+        this.nodeTextEdit = true;
+        this.nodeTextDraggable = true;
+        this.nodeTextMultiple = false; // 是否支持多个节点文本
+        this.nodeTextVertical = false; // 节点文本朝向是否是纵向
+        this.nodeTextMode = constant_1.TextMode.TEXT; // 节点文本模式
+        // 边
+        this.edgeTextMode = constant_1.TextMode.TEXT; // 边文本模式
+        this.edgeTextEdit = true;
+        this.edgeTextDraggable = false;
+        this.edgeTextMultiple = false; // 是否支持多个边文本
+        this.edgeTextVertical = false; // 边文本朝向是否是纵向
+        /*********************************************************
+         * 节点相关配置
+         ********************************************************/
         this.hideAnchors = false;
         this.allowRotate = false;
         this.allowResize = false;
         this.hoverOutline = true;
         this.nodeSelectedOutline = true;
-        this.edgeSelectedOutline = true;
-        this.nodeTextEdit = true;
-        this.edgeTextEdit = true;
-        this.nodeTextDraggable = false;
-        this.edgeTextDraggable = false;
+        this.adjustNodePosition = true;
         this.autoExpand = false;
+        /*********************************************************
+         * 边相关配置
+         ********************************************************/
+        this.adjustEdge = true;
+        this.adjustEdgeMiddle = false;
+        this.adjustEdgeStartAndEnd = false;
+        this.adjustEdgeStart = false;
+        this.adjustEdgeEnd = false;
+        this.edgeSelectedOutline = true;
+        /*********************************************************
+         * 其他
+         ********************************************************/
         this.multipleSelectKey = '';
-        this.defaultConfig = {}; // 设置为静默模式之前的配置，在取消静默模式后恢复
-        (0, lodash_es_1.assign)(this, this.getConfigDetail(config));
+        (0, lodash_es_1.assign)(this, this.computeConfig(config));
     }
     EditConfigModel.prototype.updateEditConfig = function (config) {
-        var newConfig = this.getConfigDetail(config);
+        var newConfig = this.computeConfig(config);
         (0, lodash_es_1.assign)(this, newConfig);
     };
-    EditConfigModel.prototype.getConfigDetail = function (config) {
-        var isSilentMode = config.isSilentMode, textEdit = config.textEdit;
+    // TODO: 确认一下这个函数的逻辑，是否会有误合并的问题
+    EditConfigModel.prototype.computeConfig = function (config) {
+        var isSilentMode = config.isSilentMode, textDraggable = config.textDraggable, textMode = config.textMode, textEdit = config.textEdit, adjustEdgeStartAndEnd = config.adjustEdgeStartAndEnd;
         var conf = {};
-        // false表示从静默模式恢复
+        // false 表示从静默模式恢复
         if (isSilentMode === false) {
-            (0, lodash_es_1.assign)(conf, this.defaultConfig);
+            (0, lodash_es_1.assign)(conf, this.stagedConfig);
         }
-        // 如果不传，默认undefined表示非静默模式
+        // 如果不传，默认 undefined 表示非静默模式
         if (isSilentMode === true && isSilentMode !== this.isSilentMode) {
             // https://github.com/didi/LogicFlow/issues/1180
-            // 如果重复调用isSilentMode=true多次，会导致this.defaultConfig状态保存错误：保存为修改之后的Config
-            // 因此需要阻止重复赋值为true，使用config.isSilentMode !== this.isSilentMode
-            var silentConfig = (0, lodash_es_1.pick)(SilentConfig, keys);
-            // 在修改之前，
-            this.defaultConfig = {
-                stopZoomGraph: this.stopZoomGraph,
-                stopScrollGraph: this.stopScrollGraph,
-                stopMoveGraph: this.stopMoveGraph,
-                adjustEdge: this.adjustEdge,
-                adjustEdgeMiddle: this.adjustEdgeMiddle,
-                adjustEdgeStartAndEnd: this.adjustEdgeStartAndEnd,
-                adjustNodePosition: this.adjustNodePosition,
-                hideAnchors: this.hideAnchors,
-                allowRotate: this.allowRotate,
-                allowResize: this.allowResize,
-                hoverOutline: this.hoverOutline,
-                nodeSelectedOutline: this.nodeSelectedOutline,
-                edgeSelectedOutline: this.edgeSelectedOutline,
-                nodeTextEdit: this.nodeTextEdit,
-                edgeTextEdit: this.edgeTextEdit,
-                nodeTextDraggable: this.nodeTextDraggable,
-                edgeTextDraggable: this.edgeTextDraggable,
-                autoExpand: this.autoExpand,
-            };
+            // 如果重复调用 isSilentMode=true 多次，会导致 this.stagedConfig 状态保存错误：保存为修改之后的 Config
+            // 因此需要阻止重复赋值为 true，使用 config.isSilentMode !== this.isSilentMode
+            var silentConfig = (0, lodash_es_1.pick)(silentModeConfig, allKeys);
+            // 暂存修改之前的所有配置项
+            this.stagedConfig = (0, lodash_es_1.pick)(this, allKeys);
             (0, lodash_es_1.assign)(conf, silentConfig);
         }
         // 如果不传，默认undefined表示允许文本编辑
@@ -122,11 +149,35 @@ var EditConfigModel = /** @class */ (function () {
                 edgeTextEdit: false,
             });
         }
-        var userConfig = (0, lodash_es_1.pick)(config, keys);
+        if (textMode) {
+            (0, lodash_es_1.assign)(conf, {
+                nodeTextMode: textMode,
+                edgeTextMode: textMode,
+            });
+        }
+        if (textDraggable === false) {
+            (0, lodash_es_1.assign)(conf, {
+                nodeTextDraggable: false,
+                edgeTextDraggable: false,
+            });
+        }
+        if ((0, lodash_es_1.isBoolean)(adjustEdgeStartAndEnd)) {
+            (0, lodash_es_1.assign)(conf, {
+                adjustEdgeStart: adjustEdgeStartAndEnd,
+                adjustEdgeEnd: adjustEdgeStartAndEnd,
+            });
+        }
+        var userConfig = (0, lodash_es_1.pick)(config, allKeys);
         return (0, lodash_es_1.assign)(conf, userConfig);
     };
+    EditConfigModel.prototype.updateTextMode = function (textMode) {
+        // 如果更新全局 textMode，同时更新节点和边的 textMode
+        this.textMode = textMode;
+        this.edgeTextMode = textMode;
+        this.nodeTextMode = textMode;
+    };
     EditConfigModel.prototype.getConfig = function () {
-        return (0, lodash_es_1.pick)(this, keys);
+        return (0, lodash_es_1.pick)(this, allKeys);
     };
     __decorate([
         mobx_1.observable
@@ -134,24 +185,51 @@ var EditConfigModel = /** @class */ (function () {
     __decorate([
         mobx_1.observable
     ], EditConfigModel.prototype, "stopZoomGraph", void 0);
+    __decorate([
+        mobx_1.observable
+    ], EditConfigModel.prototype, "stopMoveGraph", void 0);
     __decorate([
         mobx_1.observable
     ], EditConfigModel.prototype, "stopScrollGraph", void 0);
     __decorate([
         mobx_1.observable
-    ], EditConfigModel.prototype, "stopMoveGraph", void 0);
+    ], EditConfigModel.prototype, "textMode", void 0);
     __decorate([
         mobx_1.observable
-    ], EditConfigModel.prototype, "adjustEdge", void 0);
+    ], EditConfigModel.prototype, "textEdit", void 0);
     __decorate([
         mobx_1.observable
-    ], EditConfigModel.prototype, "adjustEdgeMiddle", void 0);
+    ], EditConfigModel.prototype, "textDraggable", void 0);
     __decorate([
         mobx_1.observable
-    ], EditConfigModel.prototype, "adjustEdgeStartAndEnd", void 0);
+    ], EditConfigModel.prototype, "nodeTextEdit", void 0);
     __decorate([
         mobx_1.observable
-    ], EditConfigModel.prototype, "adjustNodePosition", void 0);
+    ], EditConfigModel.prototype, "nodeTextDraggable", void 0);
+    __decorate([
+        mobx_1.observable
+    ], EditConfigModel.prototype, "nodeTextMultiple", void 0);
+    __decorate([
+        mobx_1.observable
+    ], EditConfigModel.prototype, "nodeTextVertical", void 0);
+    __decorate([
+        mobx_1.observable
+    ], EditConfigModel.prototype, "nodeTextMode", void 0);
+    __decorate([
+        mobx_1.observable
+    ], EditConfigModel.prototype, "edgeTextMode", void 0);
+    __decorate([
+        mobx_1.observable
+    ], EditConfigModel.prototype, "edgeTextEdit", void 0);
+    __decorate([
+        mobx_1.observable
+    ], EditConfigModel.prototype, "edgeTextDraggable", void 0);
+    __decorate([
+        mobx_1.observable
+    ], EditConfigModel.prototype, "edgeTextMultiple", void 0);
+    __decorate([
+        mobx_1.observable
+    ], EditConfigModel.prototype, "edgeTextVertical", void 0);
     __decorate([
         mobx_1.observable
     ], EditConfigModel.prototype, "hideAnchors", void 0);
@@ -169,25 +247,34 @@ var EditConfigModel = /** @class */ (function () {
     ], EditConfigModel.prototype, "nodeSelectedOutline", void 0);
     __decorate([
         mobx_1.observable
-    ], EditConfigModel.prototype, "edgeSelectedOutline", void 0);
+    ], EditConfigModel.prototype, "adjustNodePosition", void 0);
     __decorate([
         mobx_1.observable
-    ], EditConfigModel.prototype, "nodeTextEdit", void 0);
+    ], EditConfigModel.prototype, "autoExpand", void 0);
     __decorate([
         mobx_1.observable
-    ], EditConfigModel.prototype, "edgeTextEdit", void 0);
+    ], EditConfigModel.prototype, "adjustEdge", void 0);
     __decorate([
         mobx_1.observable
-    ], EditConfigModel.prototype, "nodeTextDraggable", void 0);
+    ], EditConfigModel.prototype, "adjustEdgeMiddle", void 0);
     __decorate([
         mobx_1.observable
-    ], EditConfigModel.prototype, "edgeTextDraggable", void 0);
+    ], EditConfigModel.prototype, "adjustEdgeStartAndEnd", void 0);
     __decorate([
         mobx_1.observable
-    ], EditConfigModel.prototype, "autoExpand", void 0);
+    ], EditConfigModel.prototype, "adjustEdgeStart", void 0);
+    __decorate([
+        mobx_1.observable
+    ], EditConfigModel.prototype, "adjustEdgeEnd", void 0);
+    __decorate([
+        mobx_1.observable
+    ], EditConfigModel.prototype, "edgeSelectedOutline", void 0);
     __decorate([
         mobx_1.action
     ], EditConfigModel.prototype, "updateEditConfig", null);
+    __decorate([
+        mobx_1.action
+    ], EditConfigModel.prototype, "updateTextMode", null);
     return EditConfigModel;
 }());
 exports.EditConfigModel = EditConfigModel;

package/lib/model/EditConfigModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"EditConfigModel.js","sourceRoot":"","sources":["../../src/model/EditConfigModel.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"EditConfigModel.js","sourceRoot":"","sources":["../../src/model/EditConfigModel.ts"],"names":[],"mappings":"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"}

package/lib/model/GraphModel.d.ts

@@ -1,5 +1,5 @@
 import { BaseEdgeModel, BaseNodeModel, EditConfigModel, Model, TransformModel } from '.';
-import { ElementState, EventType, OverlapMode } from '../constant';
+import { ElementState, EventType, OverlapMode, TextMode } from '../constant';
 import LogicFlow from '../LogicFlow';
 import { Options as LFOptions } from '../options';
 import EventEmitter from '../event/eventEmitter';
@@ -162,6 +162,17 @@ export declare class GraphModel {
      * @returns 修改后的节点id, 如果传入的oldId不存在，返回空字符串
      */
     changeEdgeId<T extends string>(oldId: string, newId?: string): T | string;
+    /**
+     * 获取元素的文本模式
+     * @param model
+     */
+    getTextModel(model: BaseNodeModel): TextMode | undefined;
+    /**
+     * 更新元素的文本模式
+     * @param mode
+     * @param model
+     */
+    setTextMode(mode: TextMode, model?: BaseNodeModel | BaseEdgeModel): void;
     /**
      * 内部保留方法，请勿直接使用
      */

package/lib/model/GraphModel.js

@@ -557,6 +557,35 @@ var GraphModel = /** @class */ (function () {
         });
         return newId;
     };
+    /**
+     * 获取元素的文本模式
+     * @param model
+     */
+    GraphModel.prototype.getTextModel = function (model) {
+        var _a = this.editConfigModel, textMode = _a.textMode, nodeTextMode = _a.nodeTextMode, edgeTextMode = _a.edgeTextMode;
+        // textMode 的优先级：
+        // 元素自身 model.textMode > editConfigModel.node(edge)TextMode > editConfigModel.textMode
+        if (model.BaseType === constant_1.ElementType.NODE) {
+            return model.textMode || nodeTextMode || textMode || constant_1.TextMode.TEXT;
+        }
+        // 同上
+        if (model.BaseType === constant_1.ElementType.EDGE) {
+            return model.textMode || edgeTextMode || textMode || constant_1.TextMode.TEXT;
+        }
+    };
+    /**
+     * 更新元素的文本模式
+     * @param mode
+     * @param model
+     */
+    GraphModel.prototype.setTextMode = function (mode, model) {
+        // 如果有传入 model，则直接更新 model 的 textMode
+        if (model) {
+            // model.updateTextMode(mode)
+        }
+        // 调用 editConfigModel 的方法更新 textMode
+        this.editConfigModel.updateEditConfig({ textMode: mode });
+    };
     /**
      * 内部保留方法，请勿直接使用
      */
@@ -673,7 +702,7 @@ var GraphModel = /** @class */ (function () {
         if (nodeX && nodeY) {
             node.x = (0, util_1.snapToGrid)(nodeX, this.gridSize);
             node.y = (0, util_1.snapToGrid)(nodeY, this.gridSize);
-            if (typeof node.text === 'object') {
+            if ((0, lodash_es_1.isObject)(node.text)) {
                 // 原来的处理是：node.text.x -= getGridOffset(nodeX, this.gridSize)
                 // 由于snapToGrid()使用了Math.round()四舍五入的做法，因此无法判断需要执行
                 // node.text.x = node.text.x + getGridOffset()
@@ -697,7 +726,7 @@ var GraphModel = /** @class */ (function () {
             data.x += 30;
             data.y += 30;
             data.id = '';
-            if (data.text) {
+            if ((0, lodash_es_1.isObject)(data.text)) {
                 data.text.x += 30;
                 data.text.y += 30;
             }
@@ -816,17 +845,16 @@ var GraphModel = /** @class */ (function () {
         // 如果是自定义边文本位置，则移动节点的时候重新计算其位置
         if (edgeModel.customTextPosition) {
             edgeModel.resetTextPosition();
+            return;
         }
-        else if (edgeModel.modelType === constant_1.ModelType.POLYLINE_EDGE &&
+        if (edgeModel.modelType === constant_1.ModelType.POLYLINE_EDGE &&
             ((_a = edgeModel.text) === null || _a === void 0 ? void 0 : _a.value)) {
             var textPosition = edgeModel.text;
             var newPoint = (0, util_1.getClosestPointOfPolyline)(textPosition, edgeModel.points);
             edgeModel.moveText(newPoint.x - textPosition.x, newPoint.y - textPosition.y);
         }
-        else {
-            var _b = edgeModel.textPosition, x1 = _b.x, y1 = _b.y;
-            edgeModel.moveText(x1 - x, y1 - y);
-        }
+        var _b = edgeModel.textPosition, x1 = _b.x, y1 = _b.y;
+        edgeModel.moveText(x1 - x, y1 - y);
     };
     /**
      * 删除两节点之间的边
@@ -1368,6 +1396,9 @@ var GraphModel = /** @class */ (function () {
     __decorate([
         mobx_1.computed
     ], GraphModel.prototype, "selectNodes", null);
+    __decorate([
+        mobx_1.action
+    ], GraphModel.prototype, "setTextMode", null);
     __decorate([
         mobx_1.action
     ], GraphModel.prototype, "setFakeNode", null);