strategy-panel 1.0.1 → 1.0.2

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "strategy-panel",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
     "docs:deploy": "gh-pages -d docs-dist",
-    "build": "father-build",
+    "dev": "father dev",
+    "build": "father build",
     "deploy": "npm run docs:build && npm run docs:deploy",
     "prettier": "prettier --write \"**/*.{js,jsx,tsx,ts,less,md,json}\"",
     "test": "umi-test",
@@ -26,45 +27,45 @@
     ]
   },
   "dependencies": {
-    "@ant-design/icons": "^4.2.1",
-    "@antv/x6": "^1.28.1",
-    "@antv/x6-react-components": "^1.1.14",
-    "@antv/x6-react-shape": "^1.5.2",
-    "@types/lodash-es": "^4.17.5",
-    "@types/marked": "^3.0.2",
-    "@types/node": "^17.0.21",
-    "antd": "^4.4.2",
-    "classnames": "^2.2.6",
-    "dompurify": "^2.1.1",
-    "immer": "^9.0.12",
-    "marked": "^3.0.8",
-    "moment": "^2.29.1",
-    "react": "^16.13.1",
-    "react-dnd": "^11.1.3",
-    "react-dnd-html5-backend": "^11.1.3",
-    "react-dom": "^16.13.1",
-    "react-svg": "^14.1.12"
+    "@ant-design/icons": "4.8.1",
+    "@antv/x6": "1.34.6",
+    "@antv/x6-react-components": "1.1.20",
+    "@antv/x6-react-shape": "1.6.5",
+    "@types/lodash-es": "4.17.6",
+    "@types/marked": "3.0.3",
+    "@types/node": "17.0.45",
+    "antd": "4.24.15",
+    "classnames": "2.3.1",
+    "dompurify": "2.4.1",
+    "immer": "9.0.16",
+    "marked": "3.0.8",
+    "moment": "2.29.4",
+    "react": "16.14.0",
+    "react-dnd": "11.1.3",
+    "react-dnd-html5-backend": "11.1.3",
+    "react-dom": "16.14.0",
+    "react-svg": "14.1.9"
   },
   "devDependencies": {
-    "@testing-library/jest-dom": "^5.15.1",
-    "@testing-library/react": "^12.1.2",
+    "@testing-library/jest-dom": "5.16.5",
+    "@testing-library/react": "12.1.5",
     "@types/jest": "^27.0.3",
     "@umijs/fabric": "^2.8.1",
     "@umijs/test": "^3.0.5",
-    "@umijs/yorkie": "^2.0.3",
-    "babel-plugin-import": "^1.13.3",
-    "babel-plugin-module-resolver": "^4.1.0",
-    "babel-plugin-react-css-modules": "^5.2.6",
-    "babel-plugin-transform-remove-console": "^6.9.4",
-    "dumi": "^1.1.0",
-    "eslint": "^7.1.0",
-    "eslint-plugin-react": "^7.28.0",
-    "father-build": "^1.17.2",
-    "gh-pages": "^3.0.0",
-    "lint-staged": "^10.0.7",
-    "prettier": "^2.2.1",
-    "yorkie": "^2.0.0",
-    "umi-lint": "^2.0.2"
+    "@umijs/yorkie": "2.0.5",
+    "babel-plugin-import": "1.13.5",
+    "babel-plugin-module-resolver": "4.1.0",
+    "babel-plugin-react-css-modules": "5.2.6",
+    "babel-plugin-transform-remove-console": "6.9.4",
+    "dumi": "1.1.54",
+    "eslint": "7.32.0",
+    "eslint-plugin-react": "7.31.10",
+    "father": "4.1.0",
+    "gh-pages": "3.2.3",
+    "lint-staged": "10.5.4",
+    "prettier": "2.7.1",
+    "umi-lint": "2.0.2",
+    "yorkie": "2.0.0"
   },
-  "license" : "MIT"
+  "license": "MIT"
 }

package/tsconfig.json

@@ -14,5 +14,5 @@
       "@tmp/*": ["src/pages/.umi/*"]
     }
   },
-  "include": ["src/**/*"]
+  "include": ["src/**/*", "src/packages/**/*"]
 }

package/es/common/graph-common/category-type.d.ts

@@ -1,16 +0,0 @@
-export declare const componentsData: {
-    id: string;
-    name: string;
-    isDir: boolean;
-    children: ({
-        id: string;
-        name: string;
-        imgUrl: any;
-        number: number;
-    } | {
-        id: string;
-        name: string;
-        imgUrl: any;
-        number?: undefined;
-    })[];
-}[];

package/es/common/graph-common/connector/index.js

@@ -1,14 +0,0 @@
-import { Graph } from '@antv/x6';
-Graph.registerConnector('pai', function (s, t) {
-  var offset = 4;
-  var control = 80;
-  var v1 = {
-    x: s.x,
-    y: s.y + offset + control
-  };
-  var v2 = {
-    x: t.x,
-    y: t.y - offset - control
-  };
-  return "M ".concat(s.x, " ").concat(s.y, "\n       L ").concat(s.x, " ").concat(s.y + offset, "\n       C ").concat(v1.x, " ").concat(v1.y, " ").concat(v2.x, " ").concat(v2.y, " ").concat(t.x, " ").concat(t.y - offset, "\n       L ").concat(t.x, " ").concat(t.y, "\n      ");
-}, true);

package/es/common/graph-common/node-element/node-group.d.ts

@@ -1,8 +0,0 @@
-import React from 'react';
-import GroupNode from '@/common/graph-common/shape/nodes/GroupNode';
-interface Props {
-    experimentId: string;
-    node?: GroupNode;
-}
-export declare const NodeGroup: React.FC<Props>;
-export {};

package/es/common/graph-common/node-element/node-group.js

@@ -1,395 +0,0 @@
-import "antd/es/popover/style";
-import _Popover from "antd/es/popover";
-import "antd/es/config-provider/style";
-import _ConfigProvider from "antd/es/config-provider";
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
-import React, { useCallback } from 'react';
-import { MinusSquareOutlined, PlusSquareOutlined } from '@ant-design/icons';
-import { ANT_PREFIX } from "../../constants/global";
-import { calcNodeScale } from "../../../pages/rx-models/graph-util";
-import { useExperimentGraph } from "../../../pages/rx-models/experiment-graph";
-import GroupNode from "../shape/nodes/GroupNode";
-import { X6DemoGroupEdge } from "../shape/edge";
-import styles from "./node-group.less";
-export var NodeGroup = function NodeGroup(props) {
-  var experimentId = props.experimentId,
-      node = props.node;
-  var data = node.getData();
-  var name = data.name,
-      _data$isCollapsed = data.isCollapsed,
-      isCollapsed = _data$isCollapsed === void 0 ? false : _data$isCollapsed;
-  var experimentGraph = useExperimentGraph(experimentId); // 折叠
-
-  var onCollapseGroup = useCallback(function () {
-    var graph = experimentGraph.graph;
-    var children = node.getDescendants();
-    var childNodes = children.filter(function (child) {
-      return child.isNode();
-    });
-
-    var _calcNodeScale = calcNodeScale({
-      isCollapsed: true
-    }, childNodes.map(function (i) {
-      return i.getData();
-    })),
-        x = _calcNodeScale.x,
-        y = _calcNodeScale.y,
-        width = _calcNodeScale.width,
-        height = _calcNodeScale.height; // 还原尺寸
-
-
-    node.setProp({
-      position: {
-        x: x,
-        y: y
-      },
-      size: {
-        width: width,
-        height: height
-      }
-    }); // 处理 Data
-
-    node === null || node === void 0 ? void 0 : node.updateData({
-      isCollapsed: true
-    }); // 隐藏子元素
-
-    children.forEach(function (child) {
-      child.hide();
-      child.updateData({
-        hide: true
-      });
-    }); // 删除桩和边
-
-    var groupEdges = graph === null || graph === void 0 ? void 0 : graph.getConnectedEdges(node);
-
-    if (groupEdges === null || groupEdges === void 0 ? void 0 : groupEdges.length) {
-      experimentGraph.deleteEdges(groupEdges);
-    }
-
-    var ports = node.getPorts();
-
-    if (ports === null || ports === void 0 ? void 0 : ports.length) {
-      node.removePorts(ports);
-    } // 创建新的连接桩和边
-
-
-    var incomingEdges = childNodes.reduce(function (accu, curr) {
-      var incomingEdgs = graph.getIncomingEdges(curr);
-
-      if (incomingEdgs === null || incomingEdgs === void 0 ? void 0 : incomingEdgs.length) {
-        return [].concat(_toConsumableArray(accu), _toConsumableArray(incomingEdgs));
-      }
-
-      return accu;
-    }, []);
-    var outgoingEdges = childNodes.reduce(function (accu, curr) {
-      var outgoingEdgs = graph.getOutgoingEdges(curr);
-
-      if (outgoingEdgs === null || outgoingEdgs === void 0 ? void 0 : outgoingEdgs.length) {
-        return [].concat(_toConsumableArray(accu), _toConsumableArray(outgoingEdgs));
-      }
-
-      return accu;
-    }, []);
-
-    if (incomingEdges === null || incomingEdges === void 0 ? void 0 : incomingEdges.length) {
-      var inputPortId = Date.now().toString();
-      node.addPort({
-        group: 'in',
-        id: inputPortId,
-        connected: true
-      });
-      incomingEdges.filter(function (edge) {
-        return !childNodes.map(function (i) {
-          return i.id;
-        }).includes(edge.getSourceCellId());
-      }) // 只考虑从外部连接到组里的连线
-      .forEach(function (edge) {
-        var sourceNodeId = edge.getSourceCellId();
-        var sourcePortId = edge.getSourcePortId();
-        var sourceNode = edge.getSourceCell();
-
-        if (sourceNode instanceof GroupNode) {
-          experimentGraph.deleteEdges(edge);
-          return;
-        }
-
-        var sourceParentNode = sourceNode.parent; // 若源节点不可见，且存在父群组节点，则说明源节点的父群组节点已折叠，此时创建一个连接折叠父节点的桩
-
-        if (!sourceNode.visible && sourceParentNode instanceof GroupNode) {
-          sourceNodeId = sourceParentNode.id;
-          var parentNodePorts = sourceParentNode.getPortsByGroup('out');
-          sourcePortId = parentNodePorts[0].id;
-        }
-
-        graph.addEdge(new X6DemoGroupEdge({
-          sourceAnchor: 'bottom',
-          source: {
-            cell: sourceNodeId,
-            port: sourcePortId,
-            anchor: {
-              name: 'bottom'
-            }
-          },
-          target: {
-            cell: node.id,
-            port: inputPortId,
-            anchor: {
-              name: 'center'
-            }
-          },
-          zIndex: 1
-        }));
-      });
-    }
-
-    if (outgoingEdges === null || outgoingEdges === void 0 ? void 0 : outgoingEdges.length) {
-      var outputPortId = Date.now().toString();
-      node.addPort({
-        group: 'out',
-        id: outputPortId,
-        connected: false
-      });
-      outgoingEdges.filter(function (edge) {
-        return !childNodes.map(function (i) {
-          return i.id;
-        }).includes(edge.getTargetCellId());
-      }).forEach(function (edge) {
-        var targetNodeId = edge.getTargetCellId();
-        var targetPortId = edge.getTargetPortId();
-        var targetNode = edge.getTargetCell();
-
-        if (targetNode instanceof GroupNode) {
-          experimentGraph.deleteEdges(edge);
-          return;
-        }
-
-        var targetParentNode = targetNode.parent; // 若源节点不可见，且存在父群组节点，则说明源节点的父群组节点已折叠，此时创建一个连接折叠父节点的桩
-
-        if (!targetNode.visible && targetParentNode instanceof GroupNode) {
-          targetNodeId = targetParentNode.id;
-          var parentNodePorts = targetParentNode.getPortsByGroup('in');
-          targetPortId = parentNodePorts[0].id;
-        }
-
-        graph.addEdge(new X6DemoGroupEdge({
-          sourceAnchor: 'bottom',
-          source: {
-            cell: node.id,
-            port: outputPortId,
-            anchor: {
-              name: 'bottom'
-            }
-          },
-          target: {
-            cell: targetNodeId,
-            port: targetPortId,
-            anchor: {
-              name: 'center'
-            }
-          },
-          zIndex: 1
-        }));
-      });
-    }
-  }, [node, experimentGraph]); // 展开
-
-  var onExpandGroup = useCallback(function () {
-    var graph = experimentGraph.graph;
-    var children = node.getDescendants();
-    var childNodes = children.filter(function (child) {
-      return child.isNode();
-    });
-
-    var _calcNodeScale2 = calcNodeScale({
-      isCollapsed: false
-    }, children.filter(function (i) {
-      return i.isNode();
-    }).map(function (i) {
-      return i.getData();
-    })),
-        x = _calcNodeScale2.x,
-        y = _calcNodeScale2.y,
-        width = _calcNodeScale2.width,
-        height = _calcNodeScale2.height; // 还原尺寸
-
-
-    node.setProp({
-      position: {
-        x: x,
-        y: y
-      },
-      size: {
-        width: width,
-        height: height
-      }
-    }); // 处理 Data
-
-    var prevData = node.getData();
-    node === null || node === void 0 ? void 0 : node.setData(_objectSpread(_objectSpread({}, prevData), {}, {
-      isCollapsed: false
-    })); // 显示子元素
-
-    childNodes.forEach(function (child) {
-      child.show();
-      child.updateData({
-        hide: false
-      });
-    }); // 删除桩和边
-
-    var groupEdges = graph === null || graph === void 0 ? void 0 : graph.getConnectedEdges(node);
-
-    if (groupEdges === null || groupEdges === void 0 ? void 0 : groupEdges.length) {
-      experimentGraph.deleteEdges(groupEdges);
-    }
-
-    var ports = node.getPorts();
-
-    if (ports === null || ports === void 0 ? void 0 : ports.length) {
-      node.removePorts(ports);
-    } // 建立与外部折叠群组的连接
-
-
-    var childIncomingEdges = childNodes.reduce(function (accu, curr) {
-      var incomingEdgs = graph.getIncomingEdges(curr);
-
-      if (incomingEdgs === null || incomingEdgs === void 0 ? void 0 : incomingEdgs.length) {
-        return [].concat(_toConsumableArray(accu), _toConsumableArray(incomingEdgs));
-      }
-
-      return accu;
-    }, []);
-    var childOutgoingEdges = childNodes.reduce(function (accu, curr) {
-      var outgoingEdgs = graph.getOutgoingEdges(curr);
-
-      if (outgoingEdgs === null || outgoingEdgs === void 0 ? void 0 : outgoingEdgs.length) {
-        return [].concat(_toConsumableArray(accu), _toConsumableArray(outgoingEdgs));
-      }
-
-      return accu;
-    }, []);
-
-    if (childIncomingEdges === null || childIncomingEdges === void 0 ? void 0 : childIncomingEdges.length) {
-      childIncomingEdges.filter(function (edge) {
-        return !childNodes.map(function (i) {
-          return i.id;
-        }).includes(edge.getSourceCellId());
-      }) // 只考虑从外部连接到组里的连线
-      .forEach(function (edge) {
-        var sourceNode = edge.getSourceCell();
-
-        if (sourceNode instanceof GroupNode) {
-          experimentGraph.deleteEdges(edge);
-          return;
-        }
-
-        var sourceParentNode = sourceNode.parent; // 若源节点不可见，且存在父群组节点，则说明源节点的父群组节点已折叠，此时创建一个连接折叠父节点的桩
-
-        if (!sourceNode.visible && sourceParentNode instanceof GroupNode) {
-          var sourceNodeId = sourceParentNode.id;
-          var parentNodePorts = sourceParentNode.getPortsByGroup('out');
-          var sourcePortId = parentNodePorts[0].id;
-          var targetNodeId = edge.getTargetCellId();
-          var targetPortId = edge.getTargetPortId();
-          graph.addEdge(new X6DemoGroupEdge({
-            sourceAnchor: 'bottom',
-            source: {
-              cell: sourceNodeId,
-              port: sourcePortId,
-              anchor: {
-                name: 'bottom'
-              }
-            },
-            target: {
-              cell: targetNodeId,
-              port: targetPortId,
-              anchor: {
-                name: 'center'
-              }
-            },
-            zIndex: 1
-          }));
-        }
-      });
-    }
-
-    if (childOutgoingEdges === null || childOutgoingEdges === void 0 ? void 0 : childOutgoingEdges.length) {
-      childOutgoingEdges.filter(function (edge) {
-        return !childNodes.map(function (i) {
-          return i.id;
-        }).includes(edge.getTargetCellId());
-      }).forEach(function (edge) {
-        var targetNode = edge.getTargetCell();
-
-        if (targetNode instanceof GroupNode) {
-          experimentGraph.deleteEdges(edge);
-          return;
-        }
-
-        var targetParentNode = targetNode.parent; // 若源节点不可见，且存在父群组节点，则说明源节点的父群组节点已折叠，此时创建一个连接折叠父节点的桩
-
-        if (!targetNode.visible && targetParentNode instanceof GroupNode) {
-          var targetNodeId = targetParentNode.id;
-          var parentNodePorts = targetParentNode.getPortsByGroup('in');
-          var targetPortId = parentNodePorts[0].id;
-          var sourceNodeId = edge.getSourceCellId();
-          var sourcePortId = edge.getSourcePortId();
-          graph.addEdge(new X6DemoGroupEdge({
-            sourceAnchor: 'bottom',
-            source: {
-              cell: sourceNodeId,
-              port: sourcePortId,
-              anchor: {
-                name: 'bottom'
-              }
-            },
-            target: {
-              cell: targetNodeId,
-              port: targetPortId,
-              anchor: {
-                name: 'center'
-              }
-            },
-            zIndex: 1
-          }));
-        }
-      });
-    }
-  }, [node, experimentGraph]);
-  return /*#__PURE__*/React.createElement(_ConfigProvider, {
-    prefixCls: ANT_PREFIX
-  }, /*#__PURE__*/React.createElement("div", {
-    className: styles.nodeGroup
-  }, /*#__PURE__*/React.createElement("div", {
-    className: styles.row
-  }, /*#__PURE__*/React.createElement(_Popover, {
-    content: name,
-    overlayClassName: styles.namePopover
-  }, /*#__PURE__*/React.createElement("div", {
-    className: styles.name
-  }, name.length > 20 ? "".concat(name.slice(0, 20), "...") : name)), isCollapsed ? /*#__PURE__*/React.createElement(PlusSquareOutlined, {
-    className: styles.collapseButton,
-    onClick: onExpandGroup
-  }) : /*#__PURE__*/React.createElement(MinusSquareOutlined, {
-    className: styles.collapseButton,
-    onClick: onCollapseGroup
-  }))));
-};

package/es/common/graph-common/node-element/node-group.less

@@ -1,53 +0,0 @@
-@borderColor: #d9d9d9;
-
-.nodeGroup {
-  width: 100%;
-  height: 100%;
-  font-size: 12px;
-  background-color: #fff;
-  border: 1px dashed @borderColor;
-  border-radius: 4px;
-  cursor: default; // TODO: 暂时还不支持群组移动，先把鼠标变成不可拖动的类型
-
-  .row {
-    display: flex;
-    flex-direction: row-reverse;
-    align-items: center;
-    justify-content: space-between;
-    height: 32px;
-    padding: 0 8px;
-
-    .name {
-      z-index: 11;
-    }
-
-    .collapseButton {
-      z-index: 11;
-      order: -1;
-      cursor: pointer;
-    }
-
-    .toolbar {
-      z-index: 11;
-      margin-top: 2px;
-      cursor: pointer;
-    }
-  }
-}
-
-.x6-node-selected {
-  :local {
-    .nodeGroup {
-      background-color: rgba(243, 249, 255, 0.92);
-      border: 1px solid #1890ff;
-      box-shadow: 0 0 3px 3px rgba(64, 169, 255, 0.2);
-    }
-  }
-}
-
-.namePopover {
-  .ant-popover-inner-content {
-    padding: 8px 12px !important;
-    font-size: 12px;
-  }
-}

package/es/common/graph-common/node-popover/index.d.ts

@@ -1,7 +0,0 @@
-import React from 'react';
-import './index.less';
-interface TooltipProps {
-    children: React.ReactElement;
-}
-export declare const NodePopover: ({ children }: TooltipProps) => JSX.Element;
-export {};

package/es/common/graph-common/node-popover/index.js

@@ -1,11 +0,0 @@
-import React from 'react';
-import "./index.less";
-export var NodePopover = function NodePopover(_ref) {
-  var children = _ref.children;
-  return /*#__PURE__*/React.createElement("div", {
-    style: {
-      width: '100%',
-      height: '100%'
-    }
-  }, children);
-};

package/es/common/graph-common/node-popover/index.less

@@ -1,5 +0,0 @@
-.node-popover-content {
-  .aicontent-popover-inner-content{
-    padding: 12px 8px 8px 8px;
-  }
-}

package/es/common/graph-common/node-types.d.ts

@@ -1,28 +0,0 @@
-export declare const SCENE_DISPLAY: {
-    EQUIPMENT: string;
-    TIME: string;
-    MANUAL: string;
-};
-export declare const COMPONENTS_TYPE: {
-    COMMONLY_USED: string;
-    SCENE_DISPLAY: string;
-    SIGN_OPERATION: string;
-    MOTION_OPERATION: string;
-    APPLICATION: string;
-};
-export declare const COMMONLY_USED: {
-    VARIATE: string;
-};
-export declare const SIGN_OPERATION: {
-    RELATION: string;
-    LOGICAL: string;
-    CONDITION: string;
-};
-export declare const MOTION_OPERATION: {
-    ALARM: string;
-    NOTICE: string;
-    ORDER: string;
-    CONTROL: string;
-};
-export declare const ALL_NODE_TYPE: string[];
-export declare const nodeTypeMeta: any;