ronds-metadata 1.1.19 → 1.1.22

package/es/comps/DynamicPorts/comps/DragNode.js

@@ -3,7 +3,7 @@ import React from "react";
 /*
  * @Author: wangxian
  * @Date: 2022-05-26 08:50:06
- * @LastEditTime: 2022-06-25 10:32:57
+ * @LastEditTime: 2022-06-25 10:46:48
  */
 import { DragSource } from 'react-dnd';
 import { GlobalOutlined } from '@ant-design/icons';
@@ -18,7 +18,7 @@ var InnerNodeTitle = function InnerNodeTitle(props) {
   return /*#__PURE__*/React.createElement("div", null, connectDragPreview(connectDragSource( /*#__PURE__*/React.createElement("div", {
     className: "node-element",
     style: {
-      width: '100% !important'
+      width: '100%'
     }
   }, /*#__PURE__*/React.createElement("div", {
     className: "icon"

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

@@ -29,10 +29,11 @@ declare class DPGraph extends GraphCore<BaseNode, BaseEdge> {
     factory$: IFactory$;
     dpGraphSub?: Subscription;
     constructor(graphData?: NDPGraph.GraphData);
-    initialize(graphData: NDPGraph.GraphData): Promise<void>;
+    initialize(graphData?: NDPGraph.GraphData): Promise<void>;
     loadDPGraph(graphData: any): Promise<void>;
     isGraphReady(): boolean;
     renderGraph: (wrapper: HTMLElement, container: HTMLElement) => void;
+    renderGraphData: (graphData: NDPGraph.GraphData) => Promise<void>;
     renderNode(nodeMeta: NodeMeta): BaseNode | undefined;
     renderEdge(edgeMeta: EdgeMeta): BaseEdge | undefined;
     addDragNode(data: NDPGraph.Node): void;
@@ -58,6 +59,6 @@ declare class DPGraph extends GraphCore<BaseNode, BaseEdge> {
     dispose(): void;
 }
 export declare let gDPGraph: DPGraph;
-export declare const useDPGraph: (graphData: NDPGraph.GraphData) => DPGraph;
+export default DPGraph;
+export declare const useDPGraph: (graphData?: NDPGraph.GraphData) => DPGraph;
 export declare const useUnmountDPGraph: () => void;
-export {};

package/es/comps/DynamicPorts/graph.js

@@ -186,6 +186,44 @@ var DPGraph = /*#__PURE__*/function (_GraphCore) {
       });
     };
 
+    _this.renderGraphData = /*#__PURE__*/function () {
+      var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(graphData) {
+        var oldGraph, _formatGraphData2, nodes, edges;
+
+        return _regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                // 清除已有的图谱
+                oldGraph = _this.factory$.dpGraph.getValue();
+
+                _this.deleteNodes(oldGraph.nodes.map(function (it) {
+                  return it.id;
+                }));
+
+                _formatGraphData2 = formatGraphData(graphData), nodes = _formatGraphData2.nodes, edges = _formatGraphData2.edges;
+                nodes.forEach(function (nodeMeta) {
+                  return _this.renderNode(nodeMeta);
+                });
+                edges.forEach(function (edgeMeta) {
+                  return _this.renderEdge(edgeMeta);
+                });
+
+                _this.loadDPGraph(graphData);
+
+              case 6:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee);
+      }));
+
+      return function (_x) {
+        return _ref3.apply(this, arguments);
+      };
+    }();
+
     _this.zoomGraph = function (factor) {
       _this.zoom(factor);
     };
@@ -231,36 +269,39 @@ var DPGraph = /*#__PURE__*/function (_GraphCore) {
   _createClass(DPGraph, [{
     key: "initialize",
     value: function () {
-      var _initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(graphData) {
-        return _regeneratorRuntime.wrap(function _callee$(_context) {
+      var _initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(graphData) {
+        return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) {
-            switch (_context.prev = _context.next) {
+            switch (_context2.prev = _context2.next) {
               case 0:
                 this.factory$.loading.next(true);
-                _context.prev = 1;
-                _context.next = 4;
-                return this.loadDPGraph(graphData);
+                _context2.prev = 1;
+                _context2.next = 4;
+                return this.loadDPGraph(graphData || {
+                  nodes: [],
+                  edges: []
+                });
 
               case 4:
                 this.factory$.loading.next(false);
-                _context.next = 11;
+                _context2.next = 11;
                 break;
 
               case 7:
-                _context.prev = 7;
-                _context.t0 = _context["catch"](1);
+                _context2.prev = 7;
+                _context2.t0 = _context2["catch"](1);
                 this.factory$.loading.next(false);
-                console.error('加载实验错误', _context.t0);
+                console.error('加载实验错误', _context2.t0);
 
               case 11:
               case "end":
-                return _context.stop();
+                return _context2.stop();
             }
           }
-        }, _callee, this, [[1, 7]]);
+        }, _callee2, this, [[1, 7]]);
       }));
 
-      function initialize(_x) {
+      function initialize(_x2) {
         return _initialize.apply(this, arguments);
       }
 
@@ -270,27 +311,28 @@ var DPGraph = /*#__PURE__*/function (_GraphCore) {
   }, {
     key: "loadDPGraph",
     value: function () {
-      var _loadDPGraph = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(graphData) {
-        return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+      var _loadDPGraph = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(graphData) {
+        return _regeneratorRuntime.wrap(function _callee3$(_context3) {
           while (1) {
-            switch (_context2.prev = _context2.next) {
+            switch (_context3.prev = _context3.next) {
               case 0:
                 this.factory$.dpGraph.next(graphData);
 
               case 1:
               case "end":
-                return _context2.stop();
+                return _context3.stop();
             }
           }
-        }, _callee2, this);
+        }, _callee3, this);
       }));
 
-      function loadDPGraph(_x2) {
+      function loadDPGraph(_x3) {
         return _loadDPGraph.apply(this, arguments);
       }
 
       return loadDPGraph;
-    }() // 判断画布是否准备完成
+    }() //
+    // 判断画布是否准备完成
 
   }, {
     key: "isGraphReady",
@@ -341,18 +383,18 @@ var DPGraph = /*#__PURE__*/function (_GraphCore) {
   }, {
     key: "updateDPGraph",
     value: function () {
-      var _updateDPGraph = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
+      var _updateDPGraph = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
         var nodes,
             edges,
             oldGraph,
             newGraph,
-            _args3 = arguments;
-        return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+            _args4 = arguments;
+        return _regeneratorRuntime.wrap(function _callee4$(_context4) {
           while (1) {
-            switch (_context3.prev = _context3.next) {
+            switch (_context4.prev = _context4.next) {
               case 0:
-                nodes = _args3.length > 0 && _args3[0] !== undefined ? _args3[0] : [];
-                edges = _args3.length > 1 && _args3[1] !== undefined ? _args3[1] : [];
+                nodes = _args4.length > 0 && _args4[0] !== undefined ? _args4[0] : [];
+                edges = _args4.length > 1 && _args4[1] !== undefined ? _args4[1] : [];
                 oldGraph = this.factory$.dpGraph.getValue();
                 newGraph = produce(oldGraph, function (nextGraph) {
                   if (nodes.length) {
@@ -371,10 +413,10 @@ var DPGraph = /*#__PURE__*/function (_GraphCore) {
 
               case 5:
               case "end":
-                return _context3.stop();
+                return _context4.stop();
             }
           }
-        }, _callee3, this);
+        }, _callee4, this);
       }));
 
       function updateDPGraph() {
@@ -387,18 +429,18 @@ var DPGraph = /*#__PURE__*/function (_GraphCore) {
   }, {
     key: "delDPGraphElement",
     value: function () {
-      var _delDPGraphElement = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
+      var _delDPGraphElement = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
         var nodes,
             edges,
             oldGraph,
             newGraph,
-            _args4 = arguments;
-        return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+            _args5 = arguments;
+        return _regeneratorRuntime.wrap(function _callee5$(_context5) {
           while (1) {
-            switch (_context4.prev = _context4.next) {
+            switch (_context5.prev = _context5.next) {
               case 0:
-                nodes = _args4.length > 0 && _args4[0] !== undefined ? _args4[0] : [];
-                edges = _args4.length > 1 && _args4[1] !== undefined ? _args4[1] : [];
+                nodes = _args5.length > 0 && _args5[0] !== undefined ? _args5[0] : [];
+                edges = _args5.length > 1 && _args5[1] !== undefined ? _args5[1] : [];
                 oldGraph = this.factory$.dpGraph.getValue();
                 newGraph = produce(oldGraph, function (nextGraph) {
                   if (nodes.length) {
@@ -422,10 +464,10 @@ var DPGraph = /*#__PURE__*/function (_GraphCore) {
 
               case 5:
               case "end":
-                return _context4.stop();
+                return _context5.stop();
             }
           }
-        }, _callee4, this);
+        }, _callee5, this);
       }));
 
       function delDPGraphElement() {
@@ -439,12 +481,12 @@ var DPGraph = /*#__PURE__*/function (_GraphCore) {
     key: "onConnectNode",
     value: // 处理连线事件
     function () {
-      var _onConnectNode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(args) {
+      var _onConnectNode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(args) {
         var _args$edge, edge, isNew, source, target, node, portId, data;
 
-        return _regeneratorRuntime.wrap(function _callee5$(_context5) {
+        return _regeneratorRuntime.wrap(function _callee6$(_context6) {
           while (1) {
-            switch (_context5.prev = _context5.next) {
+            switch (_context6.prev = _context6.next) {
               case 0:
                 _args$edge = args.edge, edge = _args$edge === void 0 ? {} : _args$edge, isNew = args.isNew;
                 source = edge.source, target = edge.target;
@@ -476,19 +518,19 @@ var DPGraph = /*#__PURE__*/function (_GraphCore) {
                   }
                 }
 
-                return _context5.abrupt("return", {
+                return _context6.abrupt("return", {
                   success: true
                 });
 
               case 4:
               case "end":
-                return _context5.stop();
+                return _context6.stop();
             }
           }
-        }, _callee5, this);
+        }, _callee6, this);
       }));
 
-      function onConnectNode(_x3) {
+      function onConnectNode(_x4) {
         return _onConnectNode.apply(this, arguments);
       }
 
@@ -563,13 +605,13 @@ var DPGraph = /*#__PURE__*/function (_GraphCore) {
   }, {
     key: "onMoveNodes",
     value: function () {
-      var _onMoveNodes = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(movedNodes) {
+      var _onMoveNodes = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(movedNodes) {
         var _this2 = this;
 
         var targetNodes, newPos, oldGraph, newGraph;
-        return _regeneratorRuntime.wrap(function _callee6$(_context6) {
+        return _regeneratorRuntime.wrap(function _callee7$(_context7) {
           while (1) {
-            switch (_context6.prev = _context6.next) {
+            switch (_context7.prev = _context7.next) {
               case 0:
                 targetNodes = movedNodes.filter(function (arg) {
                   var node = arg.node;
@@ -618,13 +660,13 @@ var DPGraph = /*#__PURE__*/function (_GraphCore) {
 
               case 2:
               case "end":
-                return _context6.stop();
+                return _context7.stop();
             }
           }
-        }, _callee6, this);
+        }, _callee7, this);
       }));
 
-      function onMoveNodes(_x4) {
+      function onMoveNodes(_x5) {
         return _onMoveNodes.apply(this, arguments);
       }
 
@@ -640,7 +682,8 @@ var DPGraph = /*#__PURE__*/function (_GraphCore) {
   return DPGraph;
 }(GraphCore);
 
-export var gDPGraph; // 获取图的实例
+export var gDPGraph;
+export default DPGraph; // 获取图的实例
 
 export var useDPGraph = function useDPGraph(graphData) {
   gDPGraph = new DPGraph(graphData);

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

@@ -1,5 +1,6 @@
 import './index.less';
 import './comps/shape/connector';
+import DPGraph from './graph';
 import { NDPGraph } from './interface';
 interface IDynamicPortsProps {
     /**
@@ -14,6 +15,10 @@ interface IDynamicPortsProps {
      * 节点选中事件
      */
     onNodeSelect?: (data: NDPGraph.Node) => void;
+    /**
+     * 获取实例
+     */
+    getDPGraphInstance?: (data: DPGraph) => void;
 }
 declare const DynamicPorts: (props: IDynamicPortsProps) => JSX.Element;
 export default DynamicPorts;

package/es/comps/DynamicPorts/index.js

@@ -4,7 +4,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /*
  * @Author: wangxian
  * @Date: 2022-05-16 18:53:31
- * @LastEditTime: 2022-05-27 14:24:06
+ * @LastEditTime: 2022-06-28 14:58:00
  */
 import React from 'react';
 import { filter } from 'rxjs';
@@ -20,7 +20,8 @@ import { GraphHandler } from './comps/GraphHandler';
 var DynamicPorts = function DynamicPorts(props) {
   var defaultValue = props.defaultValue,
       onChange = props.onChange,
-      onNodeSelect = props.onNodeSelect;
+      onNodeSelect = props.onNodeSelect,
+      getDPGraphInstance = props.getDPGraphInstance;
   var divRef = React.useRef(null);
   var containerRef = React.useRef(null);
 
@@ -55,9 +56,10 @@ var DynamicPorts = function DynamicPorts(props) {
         onNodeSelect && onNodeSelect(v[0]);
       });
 
+      getDPGraphInstance && getDPGraphInstance(_dpGraph);
       firstLoadRef.current = false;
     }
-  }, []); // 处理组件拖拽落下事件
+  }, [defaultValue]); // 处理组件拖拽落下事件
 
   var _useDrop = useDrop({
     accept: [DRAGGABLE_COMPONENT, DRAGGABLE_MODEL],

package/es/config.d.ts

@@ -1,4 +1,4 @@
-import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
+import { BehaviorSubject } from 'rxjs';
 export interface IConfig {
     /** 多语言 */
     locale: 'zh-CN' | 'en-US';

package/es/config.js

@@ -3,11 +3,9 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 /*
  * @Author: wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2022-05-30 08:43:00
+ * @LastEditTime: 2022-06-28 15:09:29
  */
-import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
-import { distinctUntilChanged } from 'rxjs/internal/operators/distinctUntilChanged';
-import { map } from 'rxjs/internal/operators/map';
+import { BehaviorSubject, map, distinctUntilChanged } from 'rxjs';
 import { setLocale } from './comps/locales/index';
 import * as jq from './framework/libs/jquery.min.js';
 import { localeKey } from './framework/locale';

package/package.json

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