diff --git a/package-lock.json b/package-lock.json index 358d29c8a1c398640352d1965c994c633c402776..4ce7a8dd8f1ded74b7739fb64a240e23e8bde325 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,19 +1,19 @@ { "name": "ingenious-flow-designer", - "version": "1.0.3", + "version": "1.0.4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "ingenious-flow-designer", - "version": "1.0.3", + "version": "1.0.4", "license": "Apache License 2.0", "dependencies": { - "@logicflow/core": "^2.0.9", - "@logicflow/extension": "^2.0.13", + "@logicflow/core": "^2.2.1", + "@logicflow/extension": "^2.2.1", "ant-design-vue": "4.x", "element-plus": "^2.7.8", - "ingenious-flow-designer": "^1.0.3", + "ingenious-flow-designer": "^1.0.4", "vue": "^3.4.30", "vue-json-pretty": "^2.4.0" }, @@ -569,9 +569,9 @@ "license": "MIT" }, "node_modules/@logicflow/core": { - "version": "2.0.10", - "resolved": "https://registry.npmmirror.com/@logicflow/core/-/core-2.0.10.tgz", - "integrity": "sha512-7CeuP9XBMAj5dJYSR6g0cNY28n3AdrV/k85fIj0VxLmB8HNRDQ6906mt1fpesJ4SU+4zSueYw40fKgKcU0mUqQ==", + "version": "2.2.1", + "resolved": "https://registry.npmmirror.com/@logicflow/core/-/core-2.2.1.tgz", + "integrity": "sha512-VzLPrCrT4eXnOLjoGQ5v4GUSay3+6rd3YNZD0qOJw4vME5e4WjQ5fd+hKK2zlIzgdRI4D54dXiEFJrS6xdV6yQ==", "license": "Apache-2.0", "dependencies": { "classnames": "^2.3.2", @@ -585,13 +585,12 @@ } }, "node_modules/@logicflow/extension": { - "version": "2.0.14", - "resolved": "https://registry.npmmirror.com/@logicflow/extension/-/extension-2.0.14.tgz", - "integrity": "sha512-vG0/4yYt0lYeOKlVmDm1rOORROoKd/p8FuQAeKF8b16O13/yz0MEkhpPzCy+/wnZ1HvN6fVXaOumfwB2WfnLpQ==", + "version": "2.2.1", + "resolved": "https://registry.npmmirror.com/@logicflow/extension/-/extension-2.2.1.tgz", + "integrity": "sha512-Qc2n514UzQlbpFtUnU7ggaKwCEMFDNY20fQyAww/MFLevP5y1+IfVKOUXyfbfKg6UITZsazEBEhgivwqV1sasw==", "license": "Apache-2.0", "dependencies": { "@antv/hierarchy": "^0.6.11", - "@logicflow/core": "2.0.10", "classnames": "^2.3.2", "lodash-es": "^4.17.21", "medium-editor": "^5.23.3", @@ -601,7 +600,7 @@ "vanilla-picker": "^2.12.3" }, "peerDependencies": { - "@logicflow/core": "2.0.10" + "@logicflow/core": "2.2.1" } }, "node_modules/@popperjs/core": { @@ -1444,16 +1443,16 @@ "license": "BSD-3-Clause" }, "node_modules/ingenious-flow-designer": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/ingenious-flow-designer/-/ingenious-flow-designer-1.0.3.tgz", - "integrity": "sha512-wXaFcHkFt4DDWTV6jFB+/9W7cAjT6mQs8sN6RTwslGJYwGmPz7nXodXwGrNnmkpiLQZky+sg3JMcY3KqlI2Exw==", + "version": "1.0.4", + "resolved": "https://registry.npmmirror.com/ingenious-flow-designer/-/ingenious-flow-designer-1.0.4.tgz", + "integrity": "sha512-R/X+E3/+ZqRl5qqXblHKI/Lz5C8XqCev/BjEvCIJbQNvthfQ9EWEZo8EV0YfIRm+jmRggSCBpWJO0aGKD4bT3Q==", "license": "Apache License 2.0", "dependencies": { "@logicflow/core": "^2.0.9", "@logicflow/extension": "^2.0.13", "ant-design-vue": "4.x", "element-plus": "^2.7.8", - "ingenious-flow-designer": "^1.0.2", + "ingenious-flow-designer": "^1.0.4", "vue": "^3.4.30", "vue-json-pretty": "^2.4.0" } diff --git a/package.json b/package.json index b7d4be3a4822165a25cd401a1270709d2dde0d04..4c071d2a4d6f76785bfcea54eb3b5e01b47ef2e4 100644 --- a/package.json +++ b/package.json @@ -31,8 +31,8 @@ "packages" ], "dependencies": { - "@logicflow/core": "^2.0.9", - "@logicflow/extension": "^2.0.13", + "@logicflow/core": "^2.2.1", + "@logicflow/extension": "^2.2.1", "ant-design-vue": "4.x", "element-plus": "^2.7.8", "ingenious-flow-designer": "^1.0.4", diff --git a/packages/flow-designer/src/nodes/Custom.ts b/packages/flow-designer/src/nodes/Custom.ts index 49153657587cbadbce9c8e81da5fc4dee1692993..b5bd95667c55e70805b6fdbe637ca23ceb954365 100644 --- a/packages/flow-designer/src/nodes/Custom.ts +++ b/packages/flow-designer/src/nodes/Custom.ts @@ -1,12 +1,10 @@ // Custom.ts -import { h } from "@logicflow/core"; -import { h, type GraphModel } from "@logicflow/core"; -import { RectResize } from "@logicflow/extension"; +import { h, type GraphModel, RectNode, RectNodeModel } from "@logicflow/core"; import customSvgStr from '../assets/images/custom.svg?raw' import { parseSvg } from '../tool' import { ColorEnum, NodeSizeEnum, NodeStateEnum } from "../types/enums"; const paths = parseSvg(customSvgStr) -class CustomModel extends RectResize.model { +class CustomModel extends RectNodeModel { constructor(data: any, graphModel: GraphModel) { super(data, graphModel) @@ -36,7 +34,7 @@ class CustomModel extends RectResize.model { } } -class CustomView extends RectResize.view { +class CustomView extends RectNode { private getLabelShape() { const { model } = this.props; const { x, y, width, height } = model; diff --git a/packages/flow-designer/src/nodes/SubProcess.ts b/packages/flow-designer/src/nodes/SubProcess.ts index bbc2ca72e0c041d43d809fb312e770a37e0959e9..8f574cec5b9d8a61af2255fffd350451c45f22d8 100644 --- a/packages/flow-designer/src/nodes/SubProcess.ts +++ b/packages/flow-designer/src/nodes/SubProcess.ts @@ -1,11 +1,10 @@ // SubProcess.ts -import { GraphModel, h } from "@logicflow/core"; -import { RectResize } from "@logicflow/extension"; +import { GraphModel, h, RectNode, RectNodeModel } from "@logicflow/core"; import subProcessSvgStr from '../assets/images/subProcess.svg?raw' import { parseSvg } from '../tool' import { ColorEnum, NodeSizeEnum, NodeStateEnum } from "../types/enums"; const paths = parseSvg(subProcessSvgStr) -class SubProcessModel extends RectResize.model { +class SubProcessModel extends RectNodeModel { constructor(data: any, graphModel: GraphModel) { super(data, graphModel) if (data.properties) { @@ -34,7 +33,7 @@ class SubProcessModel extends RectResize.model { } } -class SubProcessView extends RectResize.view { +class SubProcessView extends RectNode { private getLabelShape() { const { model } = this.props; const { x, y, width, height } = model; diff --git a/packages/flow-designer/src/nodes/Task.ts b/packages/flow-designer/src/nodes/Task.ts index cea86c2e3c0bdf6c06b49835528ecb3a73b858d7..d0ccc69721c0b6a040328d33976601e53c926eec 100644 --- a/packages/flow-designer/src/nodes/Task.ts +++ b/packages/flow-designer/src/nodes/Task.ts @@ -1,11 +1,10 @@ // Task.ts -import { GraphModel, h } from "@logicflow/core"; -import { RectResize } from "@logicflow/extension"; +import { GraphModel, h, RectNode, RectNodeModel } from "@logicflow/core"; import userTaskSvgStr from '../assets/images/user-task.svg?raw' import { parseSvg } from '../tool' import { ColorEnum, NodeSizeEnum, NodeStateEnum } from "../types/enums"; const paths = parseSvg(userTaskSvgStr) -class TaskModel extends RectResize.model { +class TaskModel extends RectNodeModel { constructor(data: any, graphModel: GraphModel) { super(data, graphModel) if (data.properties) { @@ -34,7 +33,7 @@ class TaskModel extends RectResize.model { } } -class TaskView extends RectResize.view { +class TaskView extends RectNode { private getLabelShape() { const { model } = this.props; const { x, y, width, height } = model;