ronds-metadata 1.2.98 → 1.3.1

package/es/api/index.d.ts

@@ -16,4 +16,14 @@ export default class Api implements IAPI {
     SaveMetadata(data: any, metadataTag: string): Promise<any>;
     GetMetadataObjList(data: any): Promise<any>;
     GetEnumDataByUrl(url: string, method: 'get' | 'post', body?: any): Promise<any>;
+    GetGraphStatus(data: any): Promise<{
+        data: {
+            instStatus: {};
+            execInfo: {};
+            status: string;
+        };
+    }>;
+    StopGraphRun(data: any): Promise<{
+        success: boolean;
+    }>;
 }

package/es/api/index.js

@@ -5,7 +5,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 /*
  * @Author:wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2023-02-09 19:16:42
+ * @LastEditTime: 2023-08-22 17:22:47
  */
 import { guid, md5 } from '../utils';
 import { addInterceptor, HttpHelper } from '../framework/http';
@@ -28,6 +28,7 @@ addInterceptor(function (httpClient) {
     return _config;
   });
 });
+var idx = 0;
 var Api = /*#__PURE__*/function () {
   function Api() {
     _classCallCheck(this, Api);
@@ -194,6 +195,66 @@ var Api = /*#__PURE__*/function () {
         return _GetEnumDataByUrl.apply(this, arguments);
       }
       return GetEnumDataByUrl;
+    }() // 获取元数据的值
+  }, {
+    key: "GetGraphStatus",
+    value: function () {
+      var _GetGraphStatus = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(data) {
+        var nodes, _execInfo, _instStatus, i, obj;
+        return _regeneratorRuntime.wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
+            case 0:
+              idx++;
+              nodes = data.nodes;
+              _execInfo = {};
+              _instStatus = {};
+              for (i = 0; i < nodes.length; i++) {
+                obj = {
+                  jobStatus: idx === 2 ? 'success' : 'running',
+                  id: nodes[i].id
+                };
+                _execInfo[nodes[i].id] = obj;
+                _instStatus[nodes[i].id] = idx === 2 ? 'success' : 'running';
+              }
+              return _context6.abrupt("return", {
+                data: {
+                  instStatus: _instStatus,
+                  execInfo: _execInfo,
+                  status: idx === 2 ? 'default' : 'running'
+                }
+              });
+            case 6:
+            case "end":
+              return _context6.stop();
+          }
+        }, _callee6);
+      }));
+      function GetGraphStatus(_x9) {
+        return _GetGraphStatus.apply(this, arguments);
+      }
+      return GetGraphStatus;
+    }()
+  }, {
+    key: "StopGraphRun",
+    value: function () {
+      var _StopGraphRun = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(data) {
+        return _regeneratorRuntime.wrap(function _callee7$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
+            case 0:
+              idx = 0;
+              return _context7.abrupt("return", {
+                success: true
+              });
+            case 2:
+            case "end":
+              return _context7.stop();
+          }
+        }, _callee7);
+      }));
+      function StopGraphRun(_x10) {
+        return _StopGraphRun.apply(this, arguments);
+      }
+      return StopGraphRun;
     }()
   }]);
   return Api;

package/es/comps/DynamicPorts/comps/NodeElement.js

@@ -1,17 +1,45 @@
-import React from "react";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /*
  * @Author: wangxian
  * @Date: 2022-05-24 08:50:16
- * @LastEditTime: 2023-04-13 15:06:59
+ * @LastEditTime: 2023-08-22 17:15:13
  */
 import { GlobalOutlined } from '@ant-design/icons';
+import { filter, map } from 'rxjs/operators';
 import '../index.less';
 import Icon from '../../../comps/Icons';
+import { NodeStatus } from './NodeStatus';
+import { gDPGraph } from '../graph';
+import React from 'react';
 var NodeElement = function NodeElement(props) {
   var node = props.node;
   var data = (node === null || node === void 0 ? void 0 : node.getData()) || {};
-  var name = data.name,
+  var id = data.id,
+    name = data.name,
     icon = data.icon;
+  var _React$useState = React.useState({}),
+    _React$useState2 = _slicedToArray(_React$useState, 2),
+    nodeStatus = _React$useState2[0],
+    setNodeStatus = _React$useState2[1];
+  React.useEffect(function () {
+    var sub = gDPGraph && gDPGraph.factory$.executionStatus.pipe(filter(function (x) {
+      return !!x;
+    }), map(function (x) {
+      return x.execInfo;
+    })).subscribe(function (v) {
+      setNodeStatus(v);
+    });
+    return function () {
+      sub.unsubscribe();
+    };
+  }, [gDPGraph]);
+  var onStatusClick = function onStatusClick(e) {
+    e.stopPropagation();
+    gDPGraph.factory$.statusClick.next(_objectSpread(_objectSpread({}, data), {}, {
+      status: nodeStatus[id].jobStatus
+    }));
+  };
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "node-element"
   }, /*#__PURE__*/React.createElement("div", {
@@ -23,6 +51,10 @@ var NodeElement = function NodeElement(props) {
   }, /*#__PURE__*/React.createElement("div", {
     className: "name",
     title: name
-  }, name))));
+  }, name), nodeStatus && nodeStatus[id] && nodeStatus[id].jobStatus && /*#__PURE__*/React.createElement(NodeStatus, {
+    onClick: onStatusClick,
+    className: "statusIcon",
+    status: nodeStatus[id].jobStatus
+  }))));
 };
 export default NodeElement;

package/es/comps/DynamicPorts/comps/NodeStatus.d.ts

@@ -0,0 +1,8 @@
+import React from 'react';
+interface Props {
+    className?: string;
+    status: 'success' | 'fail' | 'running' | 'ready' | 'trend';
+    onClick?: (e: any) => void;
+}
+export declare const NodeStatus: React.FC<Props>;
+export {};

package/es/comps/DynamicPorts/comps/NodeStatus.js

@@ -0,0 +1,56 @@
+/*
+ * @Author: wangxian
+ * @Date: 2023-08-22 14:00:47
+ * @LastEditTime: 2023-08-22 17:15:20
+ */
+import React from 'react';
+import { CheckCircleOutlined, CloseCircleOutlined, SyncOutlined, LineChartOutlined } from '@ant-design/icons';
+export var NodeStatus = function NodeStatus(props) {
+  var className = props.className,
+    onClick = props.onClick,
+    status = props.status;
+  switch (status) {
+    case 'fail':
+      return /*#__PURE__*/React.createElement("div", {
+        className: className,
+        onClick: onClick
+      }, /*#__PURE__*/React.createElement(CloseCircleOutlined, {
+        style: {
+          color: '#ff4d4f'
+        }
+      }));
+    case 'trend':
+      return /*#__PURE__*/React.createElement("div", {
+        className: className,
+        onClick: onClick
+      }, /*#__PURE__*/React.createElement(LineChartOutlined, {
+        style: {
+          color: '#1890ff'
+        }
+      }));
+    case 'success':
+      {
+        var color = '#2ecc71';
+        return /*#__PURE__*/React.createElement("div", {
+          className: className,
+          onClick: onClick
+        }, /*#__PURE__*/React.createElement(CheckCircleOutlined, {
+          style: {
+            color: color
+          }
+        }));
+      }
+    case 'running':
+      return /*#__PURE__*/React.createElement("div", {
+        className: className,
+        onClick: onClick
+      }, /*#__PURE__*/React.createElement(SyncOutlined, {
+        spin: true,
+        style: {
+          color: '#1890ff'
+        }
+      }));
+    default:
+      return null;
+  }
+};

package/es/comps/DynamicPorts/graph.d.ts

@@ -12,6 +12,11 @@ interface IFactory$ {
      * 实验图加载状态
      */
     loading: BehaviorSubject<boolean>;
+    /**
+     * 实验图加载状态
+     */
+    running: BehaviorSubject<boolean>;
+    executionStatus: BehaviorSubject<NDPGraph.ExecutionStatus>;
     /**
      * 图数据流
      */
@@ -20,6 +25,10 @@ interface IFactory$ {
      * 选中的节点
      */
     selectedNodes: BehaviorSubject<NDPGraph.Node[]>;
+    /**
+     * 选中的节点
+     */
+    statusClick: BehaviorSubject<any>;
     /**
      * 右击菜单
      */
@@ -28,6 +37,7 @@ interface IFactory$ {
 declare class DPGraph extends GraphCore<BaseNode, BaseEdge> {
     factory$: IFactory$;
     dpGraphSub?: Subscription;
+    queryStatusSub?: Subscription;
     constructor(graphData?: NDPGraph.GraphData);
     initialize(graphData?: NDPGraph.GraphData): Promise<void>;
     loadDPGraph(graphData: any): Promise<void>;
@@ -58,6 +68,12 @@ declare class DPGraph extends GraphCore<BaseNode, BaseEdge> {
     clearContextMenuInfo: () => void;
     clearGraphCells: () => void;
     onMoveNodes(movedNodes: any[]): Promise<void>;
+    updateEdgeStatus: () => void;
+    runGraph: () => Promise<{
+        success: boolean;
+    }>;
+    loadExecutionStatus: () => Promise<void>;
+    stopRunGraph: () => Promise<any>;
     dispose(): void;
 }
 export declare let gDPGraph: DPGraph;

package/es/comps/DynamicPorts/graph.js

@@ -13,7 +13,7 @@ import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
 /*
  * @Author: wangxian
  * @Date: 2022-05-24 14:31:01
- * @LastEditTime: 2023-07-28 18:15:11
+ * @LastEditTime: 2023-08-25 16:03:31
  */
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import produce from 'immer';
@@ -21,6 +21,7 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
 import { filter, take } from 'rxjs/operators';
+import { timer } from 'rxjs';
 import { round } from 'lodash-es';
 import { GraphCore } from '../../framework/graph';
 import NodeElement from './comps/NodeElement';
@@ -28,6 +29,7 @@ import { DPEdge } from './comps/shape/edge';
 import { DPNode } from './comps/shape/node';
 import { formatGraphData, formatNodeInfoToNodeMeta } from './utils';
 import { deepClone } from '../../utils';
+import { MetadataService } from '../../framework/metadata/MetadataService';
 var DPGraph = /*#__PURE__*/function (_GraphCore) {
   _inherits(DPGraph, _GraphCore);
   var _super = _createSuper(DPGraph);
@@ -167,12 +169,17 @@ var DPGraph = /*#__PURE__*/function (_GraphCore) {
     });
     _this.factory$ = {
       loading: new BehaviorSubject(false),
+      running: new BehaviorSubject(false),
+      executionStatus: new BehaviorSubject(null),
       dpGraph: new BehaviorSubject(null),
+      statusClick: new BehaviorSubject(null),
       selectedNodes: new BehaviorSubject([]),
       contextMenuInfo: new BehaviorSubject(null)
     };
     // 图数据的订阅
     _this.dpGraphSub = void 0;
+    // 查询执行状态的定时器订阅
+    _this.queryStatusSub = void 0;
     // 渲染画布
     _this.renderGraph = function (wrapper, container) {
       _this.dpGraphSub = _this.factory$.dpGraph.pipe(filter(function (x) {
@@ -201,13 +208,6 @@ var DPGraph = /*#__PURE__*/function (_GraphCore) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               // 清除已有的图谱
-              // const oldGraph = this.factory$.dpGraph.getValue();
-              // console.log('清除已有的图谱', oldGraph);
-              // this.deleteNodes(
-              //   oldGraph.nodes.map((it) => {
-              //     return it.id;
-              //   }),
-              // );
               _this.clearGraphCells();
               _formatGraphData2 = formatGraphData(graphData), nodes = _formatGraphData2.nodes, edges = _formatGraphData2.edges;
               dpNodes = nodes.map(function (it) {
@@ -218,8 +218,7 @@ var DPGraph = /*#__PURE__*/function (_GraphCore) {
               });
               dpEdges = edges.map(function (it) {
                 return new DPEdge(it);
-              }); // nodes!.forEach((nodeMeta) => this.renderNode(nodeMeta));
-              // edges!.forEach((edgeMeta) => this.renderEdge(edgeMeta));
+              });
               _this.graph.addNodes(dpNodes);
               _this.graph.addEdges(dpEdges);
               _this.zoomGraphRealSize();
@@ -269,6 +268,136 @@ var DPGraph = /*#__PURE__*/function (_GraphCore) {
     _this.clearGraphCells = function () {
       _this.graph.clearCells();
     };
+    // 更新边的执行状态
+    _this.updateEdgeStatus = function () {
+      if (_this.graph) {
+        var _assertThisInitialize = _assertThisInitialized(_this),
+          graph = _assertThisInitialize.graph;
+        var executionStatus = _this.factory$.executionStatus.getValue();
+        var instStatus = executionStatus.instStatus;
+        var nodeIds = Object.keys(instStatus);
+        var runningNodeIds = nodeIds.filter(function (id) {
+          return instStatus[id] === 'running';
+        }).map(function (i) {
+          return i.toString();
+        });
+        _this.updateEdges(function (edges) {
+          edges.forEach(function (edge) {
+            var nodeId = edge.target.cell,
+              id = edge.id;
+            var view = graph === null || graph === void 0 ? void 0 : graph.findViewByCell(id);
+            if (!view) {
+              return;
+            }
+            // view!.addClass('edgeProcessing');
+            if (runningNodeIds.includes(nodeId.toString())) {
+              view.addClass('edgeProcessing');
+            } else {
+              view.removeClass('edgeProcessing');
+            }
+          });
+        });
+      }
+    };
+    // 运行画布或节点
+    _this.runGraph = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+      return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            _context2.prev = 0;
+            _this.factory$.running.next(true);
+            _this.loadExecutionStatus(); // 发起执行状态查询
+            return _context2.abrupt("return", {
+              success: true
+            });
+          case 6:
+            _context2.prev = 6;
+            _context2.t0 = _context2["catch"](0);
+            console.error("\u6267\u884C\u5931\u8D25", _context2.t0);
+            return _context2.abrupt("return", {
+              success: false
+            });
+          case 10:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2, null, [[0, 6]]);
+    }));
+    // 获取执行状态
+    _this.loadExecutionStatus = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
+      var _this$queryStatusSub;
+      var server;
+      return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
+          case 0:
+            (_this$queryStatusSub = _this.queryStatusSub) === null || _this$queryStatusSub === void 0 ? void 0 : _this$queryStatusSub.unsubscribe();
+            // 每三秒查询一次执行状态
+            server = new MetadataService();
+            _this.queryStatusSub = timer(0, 5000).subscribe( /*#__PURE__*/function () {
+              var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(resPromise) {
+                var execStatusRes, status, _this$queryStatusSub2;
+                return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+                  while (1) switch (_context3.prev = _context3.next) {
+                    case 0:
+                      _context3.next = 2;
+                      return server.GetGraphStatus(_this.factory$.dpGraph.getValue());
+                    case 2:
+                      execStatusRes = _context3.sent;
+                      _this.factory$.executionStatus.next(execStatusRes.data);
+                      _this.updateEdgeStatus();
+                      // 执行完成时停止查询状态
+                      status = execStatusRes.data.status;
+                      if (status === 'default') {
+                        _this.factory$.running.next(false);
+                        server.StopGraphRun({});
+                        (_this$queryStatusSub2 = _this.queryStatusSub) === null || _this$queryStatusSub2 === void 0 ? void 0 : _this$queryStatusSub2.unsubscribe();
+                      } else {
+                        _this.factory$.running.next(true);
+                      }
+                    case 7:
+                    case "end":
+                      return _context3.stop();
+                  }
+                }, _callee3);
+              }));
+              return function (_x2) {
+                return _ref6.apply(this, arguments);
+              };
+            }());
+          case 3:
+          case "end":
+            return _context4.stop();
+        }
+      }, _callee4);
+    }));
+    // 停止实验的执行
+    _this.stopRunGraph = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
+      var server, stopRes;
+      return _regeneratorRuntime.wrap(function _callee5$(_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
+          case 0:
+            _context5.prev = 0;
+            server = new MetadataService();
+            _context5.next = 4;
+            return server.StopGraphRun({});
+          case 4:
+            stopRes = _context5.sent;
+            _this.factory$.running.next(false);
+            _this.loadExecutionStatus(); // 发起执行状态查询
+            return _context5.abrupt("return", stopRes);
+          case 10:
+            _context5.prev = 10;
+            _context5.t0 = _context5["catch"](0);
+            console.error("\u505C\u6B62\u5931\u8D25", _context5.t0);
+            return _context5.abrupt("return", {
+              success: false
+            });
+          case 14:
+          case "end":
+            return _context5.stop();
+        }
+      }, _callee5, null, [[0, 10]]);
+    }));
     _this.initialize(_graphData);
     return _this;
   }
@@ -276,33 +405,33 @@ var DPGraph = /*#__PURE__*/function (_GraphCore) {
   _createClass(DPGraph, [{
     key: "initialize",
     value: function () {
-      var _initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(graphData) {
-        return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
+      var _initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(graphData) {
+        return _regeneratorRuntime.wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
             case 0:
               this.factory$.loading.next(true);
-              _context2.prev = 1;
-              _context2.next = 4;
+              _context6.prev = 1;
+              _context6.next = 4;
               return this.loadDPGraph(graphData || {
                 nodes: [],
                 edges: []
               });
             case 4:
               this.factory$.loading.next(false);
-              _context2.next = 11;
+              _context6.next = 11;
               break;
             case 7:
-              _context2.prev = 7;
-              _context2.t0 = _context2["catch"](1);
+              _context6.prev = 7;
+              _context6.t0 = _context6["catch"](1);
               this.factory$.loading.next(false);
-              console.error('加载实验错误', _context2.t0);
+              console.error('加载实验错误', _context6.t0);
             case 11:
             case "end":
-              return _context2.stop();
+              return _context6.stop();
           }
-        }, _callee2, this, [[1, 7]]);
+        }, _callee6, this, [[1, 7]]);
       }));
-      function initialize(_x2) {
+      function initialize(_x3) {
         return _initialize.apply(this, arguments);
       }
       return initialize;
@@ -310,18 +439,18 @@ var DPGraph = /*#__PURE__*/function (_GraphCore) {
   }, {
     key: "loadDPGraph",
     value: function () {
-      var _loadDPGraph = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(graphData) {
-        return _regeneratorRuntime.wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
+      var _loadDPGraph = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(graphData) {
+        return _regeneratorRuntime.wrap(function _callee7$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
             case 0:
               this.factory$.dpGraph.next(graphData);
             case 1:
             case "end":
-              return _context3.stop();
+              return _context7.stop();
           }
-        }, _callee3, this);
+        }, _callee7, this);
       }));
-      function loadDPGraph(_x3) {
+      function loadDPGraph(_x4) {
         return _loadDPGraph.apply(this, arguments);
       }
       return loadDPGraph;
@@ -370,17 +499,17 @@ var DPGraph = /*#__PURE__*/function (_GraphCore) {
   }, {
     key: "updateDPGraph",
     value: function () {
-      var _updateDPGraph = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
+      var _updateDPGraph = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8() {
         var nodes,
           edges,
           oldGraph,
           newGraph,
-          _args4 = arguments;
-        return _regeneratorRuntime.wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+          _args8 = arguments;
+        return _regeneratorRuntime.wrap(function _callee8$(_context8) {
+          while (1) switch (_context8.prev = _context8.next) {
             case 0:
-              nodes = _args4.length > 0 && _args4[0] !== undefined ? _args4[0] : [];
-              edges = _args4.length > 1 && _args4[1] !== undefined ? _args4[1] : [];
+              nodes = _args8.length > 0 && _args8[0] !== undefined ? _args8[0] : [];
+              edges = _args8.length > 1 && _args8[1] !== undefined ? _args8[1] : [];
               oldGraph = this.factory$.dpGraph.getValue();
               newGraph = produce(oldGraph, function (nextGraph) {
                 if (nodes.length) {
@@ -395,9 +524,9 @@ var DPGraph = /*#__PURE__*/function (_GraphCore) {
               this.factory$.dpGraph.next(newGraph);
             case 5:
             case "end":
-              return _context4.stop();
+              return _context8.stop();
           }
-        }, _callee4, this);
+        }, _callee8, this);
       }));
       function updateDPGraph() {
         return _updateDPGraph.apply(this, arguments);
@@ -407,17 +536,17 @@ var DPGraph = /*#__PURE__*/function (_GraphCore) {
   }, {
     key: "delDPGraphElement",
     value: function () {
-      var _delDPGraphElement = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
+      var _delDPGraphElement = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9() {
         var nodes,
           edges,
           oldGraph,
           newGraph,
-          _args5 = arguments;
-        return _regeneratorRuntime.wrap(function _callee5$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
+          _args9 = arguments;
+        return _regeneratorRuntime.wrap(function _callee9$(_context9) {
+          while (1) switch (_context9.prev = _context9.next) {
             case 0:
-              nodes = _args5.length > 0 && _args5[0] !== undefined ? _args5[0] : [];
-              edges = _args5.length > 1 && _args5[1] !== undefined ? _args5[1] : [];
+              nodes = _args9.length > 0 && _args9[0] !== undefined ? _args9[0] : [];
+              edges = _args9.length > 1 && _args9[1] !== undefined ? _args9[1] : [];
               oldGraph = this.factory$.dpGraph.getValue();
               newGraph = produce(oldGraph, function (nextGraph) {
                 if (nodes.length) {
@@ -432,7 +561,7 @@ var DPGraph = /*#__PURE__*/function (_GraphCore) {
                 } else {
                   nextGraph.edges = oldGraph.edges.filter(function (edge) {
                     return !edges.find(function (delEdge) {
-                      return delEdge.inPortId.toString() === edge.inPortId.toString() && delEdge.outPortId.toString() === edge.outPortId.toString();
+                      return delEdge.inPortId.toString() === edge.inPortId.toString() && delEdge.outPortId.toString() === edge.outPortId.toString() && delEdge.source.toString() === edge.source.toString() && delEdge.target.toString() === edge.target.toString();
                     });
                   });
                 }
@@ -440,9 +569,9 @@ var DPGraph = /*#__PURE__*/function (_GraphCore) {
               this.factory$.dpGraph.next(newGraph);
             case 5:
             case "end":
-              return _context5.stop();
+              return _context9.stop();
           }
-        }, _callee5, this);
+        }, _callee9, this);
       }));
       function delDPGraphElement() {
         return _delDPGraphElement.apply(this, arguments);
@@ -453,10 +582,10 @@ var DPGraph = /*#__PURE__*/function (_GraphCore) {
     key: "onConnectNode",
     value: // 处理连线事件
     function () {
-      var _onConnectNode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(args) {
+      var _onConnectNode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee10(args) {
         var _args$edge, edge, isNew, source, target, _edge$getTargetCell, _edge$getTargetCell$p, _ports$find, node, portId, ports, color, data;
-        return _regeneratorRuntime.wrap(function _callee6$(_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
+        return _regeneratorRuntime.wrap(function _callee10$(_context10) {
+          while (1) switch (_context10.prev = _context10.next) {
             case 0:
               _args$edge = args.edge, edge = _args$edge === void 0 ? {} : _args$edge, isNew = args.isNew;
               source = edge.source, target = edge.target;
@@ -492,16 +621,16 @@ var DPGraph = /*#__PURE__*/function (_GraphCore) {
                   this.updateDPGraph([], [data]);
                 }
               }
-              return _context6.abrupt("return", {
+              return _context10.abrupt("return", {
                 success: true
               });
             case 4:
             case "end":
-              return _context6.stop();
+              return _context10.stop();
           }
-        }, _callee6, this);
+        }, _callee10, this);
       }));
-      function onConnectNode(_x4) {
+      function onConnectNode(_x5) {
         return _onConnectNode.apply(this, arguments);
       }
       return onConnectNode;
@@ -596,11 +725,11 @@ var DPGraph = /*#__PURE__*/function (_GraphCore) {
   }, {
     key: "onMoveNodes",
     value: function () {
-      var _onMoveNodes = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(movedNodes) {
+      var _onMoveNodes = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee11(movedNodes) {
         var _this2 = this;
         var targetNodes, newPos, oldGraph, newGraph;
-        return _regeneratorRuntime.wrap(function _callee7$(_context7) {
-          while (1) switch (_context7.prev = _context7.next) {
+        return _regeneratorRuntime.wrap(function _callee11$(_context11) {
+          while (1) switch (_context11.prev = _context11.next) {
             case 0:
               targetNodes = movedNodes.filter(function (arg) {
                 var node = arg.node;
@@ -644,11 +773,11 @@ var DPGraph = /*#__PURE__*/function (_GraphCore) {
               }
             case 2:
             case "end":
-              return _context7.stop();
+              return _context11.stop();
           }
-        }, _callee7, this);
+        }, _callee11, this);
       }));
-      function onMoveNodes(_x5) {
+      function onMoveNodes(_x6) {
         return _onMoveNodes.apply(this, arguments);
       }
       return onMoveNodes;

package/es/comps/DynamicPorts/index.d.ts

@@ -15,6 +15,10 @@ interface IDynamicPortsProps {
      * 节点选中事件
      */
     onNodeSelect?: (data: NDPGraph.Node) => void;
+    /**
+     * 节点选中事件
+     */
+    onStatusClick?: (data: any) => void;
     /**
      * 获取实例
      */

package/es/comps/DynamicPorts/index.js

@@ -3,7 +3,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /*
  * @Author: wangxian
  * @Date: 2022-05-16 18:53:31
- * @LastEditTime: 2023-03-16 08:46:09
+ * @LastEditTime: 2023-08-22 17:06:28
  */
 import React from 'react';
 import { filter } from 'rxjs';
@@ -20,6 +20,7 @@ var DynamicPorts = function DynamicPorts(props) {
   var defaultValue = props.defaultValue,
     onChange = props.onChange,
     onNodeSelect = props.onNodeSelect,
+    onStatusClick = props.onStatusClick,
     getDPGraphInstance = props.getDPGraphInstance;
   var divRef = React.useRef(null);
   var containerRef = React.useRef(null);
@@ -63,6 +64,10 @@ var DynamicPorts = function DynamicPorts(props) {
       _dpGraph.factory$.selectedNodes.subscribe(function (v) {
         onNodeSelect && onNodeSelect(v[0]);
       });
+      // 获取选中节点的订阅
+      _dpGraph.factory$.statusClick.subscribe(function (v) {
+        onStatusClick && onStatusClick(v);
+      });
       getDPGraphInstance && getDPGraphInstance(_dpGraph);
       firstLoadRef.current = false;
     }

package/es/comps/DynamicPorts/index.less

@@ -64,6 +64,7 @@
       flex-grow: 0;
       align-items: center;
       font-size: 14px;
+      cursor: pointer;
       transform: translateZ(0);
     }
   }
@@ -205,12 +206,16 @@
   }
   .edgeProcessing {
     path:nth-child(2) {
-      stroke: rgba(57, 202, 116, 0.8);
+      // stroke: rgba(57, 202, 116, 0.8);
       stroke-width: 2px;
       stroke-dasharray: 8px, 2px;
-      &:local {
-        animation: processing-line 30s infinite linear;
-      }
+      animation: processing-line 30s infinite linear;
+    }
+  }
+
+  @keyframes processing-line {
+    to {
+      stroke-dashoffset: -1000;
     }
   }
 }

package/es/comps/DynamicPorts/interface.d.ts

@@ -62,4 +62,15 @@ export declare namespace NDPGraph {
     interface Param {
         [key: string]: any;
     }
+    interface ExecutionStatus {
+        instStatus: InstStatus;
+        execInfo: ExecInfo;
+        status: string;
+    }
+    interface InstStatus {
+        [k: string]: string;
+    }
+    interface ExecInfo {
+        [k: string]: any;
+    }
 }

package/es/comps/DynamicPorts/interface.js

@@ -1,6 +1,6 @@
 /*
  * @Author: wangxian
  * @Date: 2022-05-24 16:10:46
- * @LastEditTime: 2023-07-03 16:30:28
+ * @LastEditTime: 2023-08-22 15:25:07
  */
 export {};

package/es/framework/graph/index.js

@@ -6,7 +6,7 @@ var _excluded = ["wrapper", "container", "nodes", "edges"];
 /*
  * @Author: wangxian
  * @Date: 2022-05-24 13:55:44
- * @LastEditTime: 2023-07-28 16:52:22
+ * @LastEditTime: 2023-08-25 16:03:45
  */
 import { Graph } from '@antv/x6';
 import { debounceTime, fromEventPattern, map, merge, scan, tap } from 'rxjs';

package/es/framework/metadata/MetadataService.d.ts

@@ -17,4 +17,8 @@ export declare class MetadataService {
     GetMetadataObjList(data: any): Promise<any[]>;
     /** 通过扩展规则获取枚举类型的值 */
     GetEnumDataByUrl(url: string, method?: 'get' | 'post', body?: any): Promise<any>;
+    /** 获取执行状态 */
+    GetGraphStatus(data: any): Promise<any>;
+    /** 获取执行状态 */
+    StopGraphRun(data: any): Promise<any>;
 }

package/es/framework/metadata/MetadataService.js

@@ -5,7 +5,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 /*
  * @Author: wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2023-02-09 18:36:47
+ * @LastEditTime: 2023-08-22 15:40:30
  */
 import Api from '../../api';
 var globalAPI = new Api();
@@ -124,6 +124,44 @@ export var MetadataService = /*#__PURE__*/function () {
         return _GetEnumDataByUrl.apply(this, arguments);
       }
       return GetEnumDataByUrl;
+    }() /** 获取执行状态 */
+  }, {
+    key: "GetGraphStatus",
+    value: function () {
+      var _GetGraphStatus = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(data) {
+        return _regeneratorRuntime.wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
+            case 0:
+              return _context6.abrupt("return", this.api.GetGraphStatus(data));
+            case 1:
+            case "end":
+              return _context6.stop();
+          }
+        }, _callee6, this);
+      }));
+      function GetGraphStatus(_x7) {
+        return _GetGraphStatus.apply(this, arguments);
+      }
+      return GetGraphStatus;
+    }() /** 获取执行状态 */
+  }, {
+    key: "StopGraphRun",
+    value: function () {
+      var _StopGraphRun = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(data) {
+        return _regeneratorRuntime.wrap(function _callee7$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
+            case 0:
+              return _context7.abrupt("return", this.api.StopGraphRun(data));
+            case 1:
+            case "end":
+              return _context7.stop();
+          }
+        }, _callee7, this);
+      }));
+      function StopGraphRun(_x8) {
+        return _StopGraphRun.apply(this, arguments);
+      }
+      return StopGraphRun;
     }()
   }]);
   return MetadataService;

package/es/framework/metadata/types.d.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2023-02-09 18:37:15
+ * @LastEditTime: 2023-08-22 16:30:28
  */
 export type IMetaType = 'object' | 'ref' | 'bool' | 'number' | 'text' | 'enum' | 'array' | string;
 
@@ -95,4 +95,9 @@ export interface IAPI {
   GetMetadataObjList(data: any): Promise<any[]>;
   /** 通过扩展规则获取枚举类型的值 */
   GetEnumDataByUrl(url: string, method: 'get' | 'post', body: any): Promise<any>;
+  // 获取执行状态
+
+  GetGraphStatus(data: any): Promise<any>;
+  // 获取执行状态
+  StopGraphRun(data: any): Promise<any>;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "public": true,
   "name": "ronds-metadata",
-  "version": "1.2.98",
+  "version": "1.3.1",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",