@logicflow/core 2.0.0-beta.1 → 2.0.0-beta.11

package/es/view/text/LineText.js

@@ -24,21 +24,37 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
 import { jsx as _jsx, jsxs as _jsxs } from "preact/jsx-runtime";
-import Text from '../shape/Text';
-import Rect from '../shape/Rect';
-import BaseText from './BaseText';
-import { getBytesLength, getHtmlTextHeight, getSvgTextWidthHeight, } from '../../util';
+import { Text, Rect } from '..';
+import { BaseText } from '.';
+import { getHtmlTextHeight, getSvgTextSize } from '../../util';
 var LineText = /** @class */ (function (_super) {
     __extends(LineText, _super);
-    function LineText(config) {
-        var _this = _super.call(this, config) || this;
-        _this.setHoverON = function () {
+    function LineText(props) {
+        var _this = _super.call(this, props) || this;
+        // Hover 状态相关
+        _this.setHoverOn = function () {
             _this.setState({
                 isHovered: true,
             });
         };
-        _this.setHoverOFF = function () {
+        _this.setHoverOff = function () {
             _this.setState({
                 isHovered: false,
             });
@@ -49,23 +65,22 @@ var LineText = /** @class */ (function (_super) {
         return _this;
     }
     LineText.prototype.getBackground = function () {
+        var isHovered = this.state.isHovered;
         var model = this.props.model;
+        var text = model.text;
         var style = model.getTextStyle();
-        var text = model.text, modelWidth = model.width;
         var backgroundStyle = style.background || {};
-        var isHovered = this.state.isHovered;
-        if (isHovered && (style === null || style === void 0 ? void 0 : style.hover) && (style === null || style === void 0 ? void 0 : style.hover.background)) {
-            backgroundStyle = __assign(__assign({}, backgroundStyle), style === null || style === void 0 ? void 0 : style.hover.background);
+        if (isHovered && style.hover && style.hover.background) {
+            backgroundStyle = __assign(__assign({}, backgroundStyle), style.hover.background);
         }
-        // 存在文本并且文本背景不为透明时计算背景框
-        if (text && text.value && backgroundStyle.fill !== 'transparent') {
-            var _a = style !== null && style !== void 0 ? style : {}, fontSize = _a.fontSize, overflowMode = _a.overflowMode, lineHeight = _a.lineHeight, wrapPadding = _a.wrapPadding, textWidth = _a.textWidth;
-            var value = text.value;
-            var x = text.x, y = text.y;
-            var rows = String(value).split(/[\r\n]/g);
-            // 计算行数
+        // 当存在文本并且文本背景不为透明时，计算背景框
+        if ((text === null || text === void 0 ? void 0 : text.value) && (backgroundStyle === null || backgroundStyle === void 0 ? void 0 : backgroundStyle.fill) !== 'transparent') {
+            var fontSize = style.fontSize, textWidth = style.textWidth, lineHeight = style.lineHeight, overflowMode = style.overflowMode;
+            var wrapPadding = backgroundStyle.wrapPadding;
+            var rows = text === null || text === void 0 ? void 0 : text.value.split(/[\r\n]/g);
             var rowsLength = rows.length;
-            var rectAttr = void 0;
+            var x = text.x, y = text.y;
+            var rectAttr = {};
             if (overflowMode === 'autoWrap' && textWidth) {
                 var textHeight = getHtmlTextHeight({
                     rows: rows,
@@ -78,69 +93,62 @@ var LineText = /** @class */ (function (_super) {
                     rowsLength: rowsLength,
                     className: 'lf-get-text-height',
                 });
-                rectAttr = __assign(__assign({}, backgroundStyle), { x: x - 1, y: y - 1, width: textWidth, height: textHeight });
+                rectAttr = __assign(__assign({}, backgroundStyle), { x: x, y: y, width: textWidth, height: textHeight });
             }
             else {
-                // 计算文本中最长的一行的字节数
-                var longestBytes_1 = 0;
-                rows &&
-                    rows.forEach(function (item) {
-                        var rowByteLength = getBytesLength(item);
-                        longestBytes_1 =
-                            rowByteLength > longestBytes_1 ? rowByteLength : longestBytes_1;
-                    });
-                // 背景框宽度，最长一行字节数/2 * fontsize + 2
-                // 背景框宽度， 行数 * fontsize + 2
-                var _b = getSvgTextWidthHeight({
-                    rows: rows,
-                    fontSize: fontSize,
-                    rowsLength: rowsLength,
-                }), width = _b.width, height = _b.height;
+                // 背景框宽度，最长一行字节数 / 2 * fontSize + 2
+                // 背景框宽度，行数 * fontSize + 2
+                var _a = getSvgTextSize({ rows: rows, rowsLength: rowsLength, fontSize: fontSize }), width = _a.width, height = _a.height;
                 if (overflowMode === 'ellipsis') {
                     // https://github.com/didi/LogicFlow/issues/1151
                     // 边上的文字过长（使用"ellipsis"模式）出现省略号，背景也需要进行宽度的重新计算
                     // 跟Text.tsx保持同样的计算逻辑(overflowMode === 'ellipsis')
                     // Text.tsx使用textRealWidth=textWidth || width
                     // Text.tsx使用foreignObjectHeight = fontSize + 2;
-                    width = textWidth || modelWidth;
+                    width = textWidth;
                     height = fontSize + 2;
                 }
-                // 根据设置的padding调整width, height, x, y的值
+                // 根据设置的 padding 调整 width, height, x, y 的值
+                // TODO: 下面方法感觉可以提取成工具方法
                 if (typeof backgroundStyle.wrapPadding === 'string') {
-                    var paddings = backgroundStyle.wrapPadding
+                    var padding = backgroundStyle.wrapPadding
                         .split(',')
                         .filter(function (padding) { return padding.trim(); })
                         .map(function (padding) { return parseFloat(padding.trim()); });
-                    if (paddings.length > 0 && paddings.length <= 4) {
-                        if (paddings.length === 1) {
-                            paddings = [paddings[0], paddings[0], paddings[0], paddings[0]];
+                    if (padding.length > 0 && padding.length <= 4) {
+                        if (padding.length === 1) {
+                            var _b = __read(padding, 1), allSides = _b[0];
+                            padding = [allSides, allSides, allSides, allSides];
                         }
-                        else if (paddings.length === 2) {
-                            paddings = [paddings[0], paddings[1], paddings[0], paddings[1]];
+                        else if (padding.length === 2) {
+                            var _c = __read(padding, 2), vertical = _c[0], horizontal = _c[1];
+                            padding = [vertical, horizontal, vertical, horizontal];
                         }
-                        else if (paddings.length === 3) {
-                            paddings = [paddings[0], paddings[1], paddings[2], paddings[1]];
+                        else if (padding.length === 3) {
+                            var _d = __read(padding, 3), top_1 = _d[0], horizontal = _d[1], bottom_1 = _d[2];
+                            padding = [top_1, horizontal, bottom_1, horizontal];
                         }
-                        width += paddings[1] + paddings[3];
-                        height += paddings[0] + paddings[2];
-                        x = x + (paddings[1] - paddings[3]) / 2;
-                        y = y + (paddings[2] - paddings[0]) / 2;
+                        var _e = __read(padding, 4), top_2 = _e[0], right = _e[1], bottom = _e[2], left = _e[3];
+                        width += right + left;
+                        height += top_2 + bottom;
+                        x = x + (right - left) / 2;
+                        y = y + (bottom - top_2) / 2;
                     }
                 }
                 rectAttr = __assign(__assign({}, backgroundStyle), { x: x - 1, y: y - 1, width: width, height: height });
             }
             return _jsx(Rect, __assign({}, rectAttr));
         }
+        return null;
     };
     LineText.prototype.getShape = function () {
         var model = this.props.model;
-        var text = model.text;
-        var value = text.value, x = text.x, y = text.y;
+        var _a = model.text, x = _a.x, y = _a.y, value = _a.value;
         if (!value)
             return null;
         var style = model.getTextStyle();
-        var attr = __assign({ x: x, y: y, className: 'lf-element-text', value: value }, style);
-        return (_jsxs("g", { className: "lf-line-text", onMouseEnter: this.setHoverON, onMouseLeave: this.setHoverOFF, children: [this.getBackground(), _jsx(Text, __assign({}, attr, { model: model }))] }));
+        var attrs = __assign({ x: x, y: y, value: value, model: model, className: 'lf-element-text' }, style);
+        return (_jsxs("g", { className: "lf-line-text", onMouseEnter: this.setHoverOn, onMouseLeave: this.setHoverOff, children: [this.getBackground(), _jsx(Text, __assign({}, attrs))] }));
     };
     return LineText;
 }(BaseText));

package/es/view/text/LineText.js.map

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

package/lib/LogicFlow.d.ts

@@ -1,15 +1,15 @@
 import { ComponentType, createElement as h } from 'preact/compat';
 import { Options as LFOptions } from './options';
 import * as _Model from './model';
-import { BaseEdgeModel, BaseNodeModel, EditConfigInterface, GraphModel, SnaplineModel, ZoomParamType } from './model';
-import Dnd from './view/behavior/dnd';
-import Tool from './tool/tool';
-import Keyboard from './keyboard';
+import { BaseEdgeModel, BaseNodeModel, IEditConfigType, GraphModel, SnaplineModel, ZoomParamType } from './model';
+import { Dnd } from './view/behavior';
+import Tool from './tool';
 import History from './history';
+import Keyboard from './keyboard';
 import { EventCallback, CallbackArgs, EventArgs } from './event/eventEmitter';
 import { EventType, SegmentDirection } from './constant';
 import Extension = LogicFlow.Extension;
-import RegisteredExtension = LogicFlow.RegisteredExtension;
+import ExtensionConfig = LogicFlow.ExtensionConfig;
 import ExtensionConstructor = LogicFlow.ExtensionConstructor;
 import GraphConfigData = LogicFlow.GraphConfigData;
 import NodeConfig = LogicFlow.NodeConfig;
@@ -21,10 +21,12 @@ import RegisterConfig = LogicFlow.RegisterConfig;
 import GraphElements = LogicFlow.GraphElements;
 import Position = LogicFlow.Position;
 import PointTuple = LogicFlow.PointTuple;
-import ExtensionRender = LogicFlow.ExtensionRender;
+import ExtensionRenderFunc = LogicFlow.ExtensionRenderFunc;
 import RegisterElementFunc = LogicFlow.RegisterElementFunc;
 import PropertiesType = LogicFlow.PropertiesType;
 import ClientPosition = LogicFlow.ClientPosition;
+import ExtensionDefinition = LogicFlow.ExtensionDefinition;
+import ExtensionType = LogicFlow.ExtensionType;
 declare const pluginFlag: unique symbol;
 export declare class LogicFlow {
     readonly container: HTMLElement;
@@ -36,10 +38,10 @@ export declare class LogicFlow {
     dnd: Dnd;
     tool: Tool;
     snaplineModel?: SnaplineModel;
-    components: ExtensionRender[];
-    readonly plugins: ExtensionConstructor[];
-    static extensions: Map<string, RegisteredExtension>;
-    extension: Record<string, Extension>;
+    components: ExtensionRenderFunc[];
+    readonly plugins: ExtensionType[];
+    static extensions: Map<string, ExtensionConfig>;
+    extension: Record<string, Extension | ExtensionDefinition>;
     readonly width?: number;
     readonly height?: number;
     /**
@@ -48,8 +50,8 @@ export declare class LogicFlow {
      * 详情请参考 adapter docs
      * 包括 adapterIn 和 adapterOut 两个方法
      */
-    private adapterIn?;
-    private adapterOut?;
+    adapterIn?: (data: unknown) => GraphData;
+    adapterOut?: (data: GraphData, ...rest: any) => unknown;
     [propName: string]: any;
     private initContainer;
     protected get [Symbol.toStringTag](): string;
@@ -120,27 +122,27 @@ export declare class LogicFlow {
      * 获取所有以此节点为终点的边
      * @param { string } nodeId
      */
-    getNodeIncomingEdge(nodeId: string): _Model.BaseEdgeModel[];
+    getNodeIncomingEdge(nodeId: string): _Model.BaseEdgeModel<PropertiesType>[];
     /**
      * 获取所有以此节点为起点的边
      * @param {string} nodeId
      */
-    getNodeOutgoingEdge(nodeId: string): _Model.BaseEdgeModel[];
+    getNodeOutgoingEdge(nodeId: string): _Model.BaseEdgeModel<PropertiesType>[];
     /**
      * 获取节点连接到的所有起始节点
      * @param {string} nodeId
      */
-    getNodeIncomingNode(nodeId: string): _Model.BaseNodeModel[];
+    getNodeIncomingNode(nodeId: string): _Model.BaseNodeModel<PropertiesType>[];
     /**
      * 获取节点连接到的所有目标节点
      * @param {string} nodeId
      */
-    getNodeOutgoingNode(nodeId: string): _Model.BaseNodeModel[];
+    getNodeOutgoingNode(nodeId: string): _Model.BaseNodeModel<PropertiesType>[];
     /**
      * 内部保留方法
      * 创建一个fakeNode，用于dnd插件拖动节点进画布的时候使用。
      */
-    createFakeNode(nodeConfig: NodeConfig): _Model.BaseNodeModel | null;
+    createFakeNode(nodeConfig: NodeConfig): _Model.BaseNodeModel<PropertiesType> | null;
     /**
      * 内部保留方法
      * 移除fakeNode
@@ -253,7 +255,7 @@ export declare class LogicFlow {
      * @param edges
      * @param distance
      */
-    addElements({ nodes, edges }: GraphConfigData, distance?: number): GraphElements | undefined;
+    addElements({ nodes, edges }: GraphConfigData, distance?: number): GraphElements;
     /**
      * 将图形选中
      * @param id 选择元素ID
@@ -351,12 +353,12 @@ export declare class LogicFlow {
      * @param {object} config 编辑配置
      * @see todo docs link
      */
-    updateEditConfig(config: EditConfigInterface): void;
+    updateEditConfig(config: Partial<IEditConfigType>): void;
     /**
      * 获取流程图当前编辑相关设置
      * @see todo docs link
      */
-    getEditConfig(): Partial<_Model.EditConfigModel>;
+    getEditConfig(): _Model.IEditConfigType;
     /*********************************************************
      * Graph 相关方法
      ********************************************************/
@@ -560,7 +562,7 @@ export declare class LogicFlow {
      * @param extension
      * @param props
      */
-    static use(extension: ExtensionConstructor, props?: Record<string, unknown>): void;
+    static use(extension: ExtensionConstructor | ExtensionDefinition, props?: Record<string, unknown>): void;
     private installPlugins;
     /**
      * 加载插件-内部方法
@@ -568,18 +570,24 @@ export declare class LogicFlow {
     private installPlugin;
 }
 export declare namespace LogicFlow {
+    /**
+     * LogicFlow init Options
+     */
     interface Options extends LFOptions.Common {
     }
     type DomAttributes = {
         className?: string;
         [key: string]: string | undefined;
     };
-    type PropertiesType = {
+    interface PropertiesType {
         width?: number;
         height?: number;
         rx?: number;
         ry?: number;
-    } & Record<string, any>;
+        style?: LogicFlow.CommonTheme;
+        textStyle?: LogicFlow.CommonTheme;
+        [key: string]: any;
+    }
     type AttributesType = Record<string, any>;
     type VectorData = {
         deltaX: number;
@@ -623,9 +631,37 @@ export declare namespace LogicFlow {
     };
     type TextConfig = {
         value: string;
+        x: number;
+        y: number;
+        editable?: boolean;
+        draggable?: boolean;
+    };
+    type LabelConfig = {
+        id?: string;
+        x: number;
+        y: number;
+        content?: string;
+        value: string;
+        rotate?: number;
+        style?: h.JSX.CSSProperties;
         editable?: boolean;
         draggable?: boolean;
-    } & Point;
+        labelWidth?: number;
+        textOverflowMode?: 'ellipsis' | 'wrap' | 'clip' | 'nowrap' | 'default';
+        vertical?: boolean;
+    };
+    type LabelOption = {
+        isVertical: boolean;
+        isMultiple: boolean;
+        maxCount?: number;
+    };
+    interface LabelData extends LabelConfig {
+        id: string;
+        x: number;
+        y: number;
+        content: string;
+        value: string;
+    }
     type AppendConfig = {
         startIndex: number;
         endIndex: number;
@@ -662,16 +698,18 @@ export declare namespace LogicFlow {
         properties?: Record<string, unknown>;
         [key: string]: any;
     };
-    interface NodeConfig {
+    interface NodeConfig<P extends PropertiesType = PropertiesType> {
         id?: string;
         type: string;
         x: number;
         y: number;
         text?: TextConfig | string;
         zIndex?: number;
-        properties?: PropertiesType;
+        properties?: P;
         virtual?: boolean;
         rotate?: number;
+        rotatable?: boolean;
+        resizable?: boolean;
         [key: string]: any;
     }
     interface NodeData extends NodeConfig {
@@ -679,7 +717,7 @@ export declare namespace LogicFlow {
         text?: TextConfig;
         [key: string]: unknown;
     }
-    interface EdgeConfig {
+    interface EdgeConfig<P extends PropertiesType = PropertiesType> {
         id?: string;
         type?: string;
         sourceNodeId: string;
@@ -691,7 +729,7 @@ export declare namespace LogicFlow {
         text?: TextConfig | string;
         pointsList?: Point[];
         zIndex?: number;
-        properties?: PropertiesType;
+        properties?: P;
     }
     interface EdgeData extends EdgeConfig {
         id: string;
@@ -735,6 +773,8 @@ export declare namespace LogicFlow {
         radius?: number;
         rx?: number;
         ry?: number;
+        width?: number;
+        height?: number;
         path?: string;
         [key: string]: unknown;
     };
@@ -799,6 +839,7 @@ export declare namespace LogicFlow {
          * ellipsis: 超出省略
          */
         overflowMode?: 'default' | 'autoWrap' | 'ellipsis';
+        textWidth?: number;
         background?: RectTheme;
         /**
          * 背景区域 padding
@@ -908,8 +949,8 @@ export declare namespace LogicFlow {
         coordinate: Position;
     };
     export type FocusOnArgsType = FocusOnById | FocusOnByCoordinate;
-    export type BaseNodeModelCtor = typeof BaseNodeModel;
-    export type BaseEdgeModelCtor = typeof BaseEdgeModel;
+    export type BaseNodeModelCtor = typeof BaseNodeModel<PropertiesType>;
+    export type BaseEdgeModelCtor = typeof BaseEdgeModel<PropertiesType>;
     export type GraphElementCtor = BaseNodeModelCtor | BaseEdgeModelCtor;
     export type GraphElement = BaseNodeModel | BaseEdgeModel;
     export type GraphElements = {
@@ -936,26 +977,33 @@ export declare namespace LogicFlow {
     export interface LogicFlowConstructor {
         new (options: LFOptions.Definition): LogicFlow;
     }
-    export type RegisteredExtension = {
+    /**
+     * Extension 插件类型
+     */
+    export type ExtensionType = ExtensionConstructor | ExtensionDefinition;
+    export type ExtensionConfig = {
         [pluginFlag]: symbol;
-        extension: ExtensionConstructor;
-        props?: Record<string, unknown>;
+        extension: ExtensionType;
+        props?: Record<string, any>;
     };
-    export type ExtensionProps = {
+    export type IExtensionProps = {
         lf: LogicFlow;
         LogicFlow: LogicFlowConstructor;
-        options: Record<string, unknown>;
         props?: Record<string, unknown>;
+        options: Record<string, unknown>;
     };
     export interface ExtensionConstructor {
         pluginName: string;
-        new (props: ExtensionProps): Extension;
+        new (props: IExtensionProps): Extension;
     }
-    export type ExtensionRender = (lf: LogicFlow, container: HTMLElement) => void;
+    export type ExtensionRenderFunc = (lf: LogicFlow, container: HTMLElement) => void;
+    export type ExtensionDefinition = {
+        pluginName: string;
+        install?: (lf: LogicFlow, LFCtor: LogicFlowConstructor) => void;
+        render?: ExtensionRenderFunc;
+    };
     export interface Extension {
-        readonly pluginName?: string;
-        install?: (lf: LogicFlow, logicFlow: LogicFlowConstructor) => void;
-        render?: ExtensionRender;
+        render: ExtensionRenderFunc;
         destroy?: () => void;
     }
     export {};