@riil-frontend/component-topology 12.1.0-dev.9 → 13.0.0-dev.1

package/lib/core/viewer/components/plugins/ElementDetailDrawer/hooks/useElementDetailManager.js

@@ -9,8 +9,6 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _DefaultDetailContent = _interopRequireDefault(require("../../ResourceDetail/DefaultDetailContent"));
 
-var _htElementUtils = require("../../../../../../utils/htElementUtils");
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -76,8 +74,9 @@ function useElementDetailManager(props) {
   }
 
   function openByHtElement(htElement) {
+    var isEdgeGroupAgent = htElement instanceof ht.Edge && htElement.isEdgeGroupAgent() && !htElement.s('edge.expanded');
     open({
-      id: (0, _htElementUtils.isEdgeGroupAgent)(htElement) || !htElement.getTag() ? "ht:" + htElement.getId() : htElement.getTag(),
+      id: isEdgeGroupAgent || !htElement.getTag() ? "ht:" + htElement.getId() : htElement.getTag(),
       htElement: htElement
     });
   }

package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/EventsCard.js

@@ -51,7 +51,7 @@ function EventsCard(props) {
     closeDetailDrawer();
 
     if (topo.viewProps.jumpto) {
-      topo.viewProps.jumpto(url);
+      topo.viewProps.jumpto(formatUrl(url));
     } else {
       (0, _componentTopologyUtils.getHistory)().push(formatUrl(url));
     }

package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/LinkTopo.module.scss

@@ -1,7 +1,7 @@
 .container {
   width: 100%;
   height: 100%;
-  min-height: 250px;
+  min-height: 260px;
   position: relative;
   .floatBox{
     position: absolute;

package/lib/networkTopo/models/EdgeGroupTagTipBuilder.js

@@ -22,11 +22,11 @@ var EdgeGroupTagTipBuilder = /*#__PURE__*/function () {
 
     var topo = this.topo;
     var dm = this.topo.getDataModel();
-    var edgeGroupAgents = (0, _htElementUtils.getEdgeGroupAgents)(dm);
-    var edgeGroupsTagsTips = edgeGroupAgents.map(function (edgeGroupAgent) {
-      // 获取配置的链路
-      var linkId = (0, _edgeGroupTagUtil.getEdgeGroupLinkIdConfig)(edgeGroupAgent, topo);
-      var edgeGroupId = [edgeGroupAgent.getSource().getId(), edgeGroupAgent.getTarget().getId()];
+    var edgeGroupsTagsTips = (0, _htElementUtils.getEdgeGroups)(dm).map(function (edgeGroup) {
+      var edge = edgeGroup.getEdges().getArray()[0]; // 获取配置的链路
+
+      var linkId = (0, _edgeGroupTagUtil.getEdgeGroupLinkIdConfig)(edge, topo);
+      var edgeGroupId = [edge.getSourceAgent().getId(), edge.getTargetAgent().getId()];
       var data = {
         tags: [],
         tips: []
@@ -37,7 +37,7 @@ var EdgeGroupTagTipBuilder = /*#__PURE__*/function () {
       }
 
       return {
-        htId: edgeGroupAgent.getId(),
+        htId: edge.getId(),
         edgeGroupId: edgeGroupId,
         tags: data.tags,
         tips: data.tips,

package/lib/networkTopo/utils/edgeGroupTagUtil.js

@@ -65,8 +65,8 @@ function getEdgeGroupLinkIdConfig(edgeGroup, topo) {
 }
 
 function getEdgeGroupConfigId(edgeGroup) {
-  var sourceNode = edgeGroup.getSource();
-  var targetNode = edgeGroup.getTarget();
+  var sourceNode = edgeGroup.getSourceAgent();
+  var targetNode = edgeGroup.getTargetAgent();
   var sourceId = sourceNode.a('uuid');
   var targetId = targetNode.a('uuid');
   return [sourceId, targetId].sort().join(',');

package/lib/utils/htElementUtils.js

@@ -26,10 +26,8 @@ exports.getNodeDatas = getNodeDatas;
 exports.getNodes = getNodes;
 exports.getNodesByGroupIdOrTag = getNodesByGroupIdOrTag;
 exports.isEdge = isEdge;
-exports.isEdgeGroup = isEdgeGroup;
 exports.isEdgeGroupAgent = isEdgeGroupAgent;
 exports.isEdgeGroupExpanded = isEdgeGroupExpanded;
-exports.isEdgeVisible = isEdgeVisible;
 exports.isExistedElement = isExistedElement;
 exports.isGroup = isGroup;
 exports.isLayer = isLayer;
@@ -174,15 +172,9 @@ function getNodeData(element) {
 function getEdges(dataModel) {
   return getElements(dataModel).filter(isValidEdge);
 }
-/**
- * 是否连线组
- * @param {ht.Edge} edge
- * @returns
- */
 
-
-function isEdgeGroup(edge) {
-  return isEdge(edge) && edge.a('x.edgegroup.isEdgeGroup');
+function isEdgeGroupExpanded(edge) {
+  return isEdge(edge) && edge.getEdgeGroup() && !!edge.s("edge.expanded");
 }
 /**
  * 是否连线组代理
@@ -192,21 +184,7 @@ function isEdgeGroup(edge) {
 
 
 function isEdgeGroupAgent(edge) {
-  return isEdgeGroup(edge);
-}
-/**
- * TODO
- * @param {*} edge 
- * @returns 
- */
-
-
-function isEdgeGroupExpanded(edge) {
-  return isEdge(edge) && edge.getEdgeGroup() && !!edge.s("edge.expanded");
-}
-
-function isEdgeVisible(edge) {
-  return edge.s('2d.visible') || edge.s('2d.visible') === undefined;
+  return isEdge(edge) && edge.getEdgeGroup() && edge.isEdgeGroupAgent();
 }
 /**
  * 获得两个节点间的连线列表
@@ -275,12 +253,6 @@ function getEdgeGroupByNodeTags(dataModel, nodeTag1, nodeTag2) {
 
   return getEdgeGroupByNodes(node1, node2);
 }
-/**
- * 获得连线组连线列表
- * @param {*} dataModel 
- * @returns 
- */
-
 
 function getEdgeGroups(dataModel) {
   var edgeGroups = [];
@@ -293,21 +265,13 @@ function getEdgeGroups(dataModel) {
   });
   return edgeGroups;
 }
-/**
- * 获得连线组连线列表
- * @param {*} dataModel 
- * @returns 
- */
-
 
 function getEdgeGroupAgents(dataModel) {
   return getEdges(dataModel).filter(isEdgeGroupAgent);
 }
 
 function getEdgeDatas(dataModel) {
-  return getEdges(dataModel).filter(function (edge) {
-    return !isEdgeGroup(edge);
-  }).map(function (element) {
+  return getEdges(dataModel).map(function (element) {
     var _element$getSource, _element$getTarget;
 
     return (0, _extends3["default"])({}, element.getAttrObject(), {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "12.1.0-dev.9",
+  "version": "13.0.0-dev.1",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -123,6 +123,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@12.1.0-dev.9/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@13.0.0-dev.1/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }

package/es/core/editor/components/Toolbar/widgets/components/FontFamilySelect.js

@@ -1,29 +0,0 @@
-import React from 'react';
-import DropdownMenu from "./DropdownMenu";
-
-function FontFamilySelect(props) {
-  var value = props.value,
-      onChange = props.onChange;
-  var items = ['宋体', '微软雅黑', '黑体', 'Arial'];
-  return /*#__PURE__*/React.createElement(DropdownMenu, {
-    value: (items.includes(value) ? value : null) || '',
-    valueRender: function valueRender(val) {
-      return /*#__PURE__*/React.createElement("div", {
-        style: {
-          width: 48
-        }
-      }, val || '微软雅黑');
-    },
-    onSelect: onChange
-  }, items.map(function (item) {
-    return /*#__PURE__*/React.createElement(DropdownMenu.Item, {
-      key: item
-    }, /*#__PURE__*/React.createElement("div", {
-      style: {
-        fontFamily: item
-      }
-    }, item));
-  }));
-}
-
-export default FontFamilySelect;

package/es/core/editor/components/Toolbar/widgets/components/FontSizeSelect.js

@@ -1,29 +0,0 @@
-import React from 'react';
-import DropdownMenu from "./DropdownMenu";
-
-function FontSizeSelect(props) {
-  var value = props.value,
-      disabled = props.disabled,
-      onChange = props.onChange;
-  var items = [12, 14, 16, 18, 20, 24, 30, 36, 48, 60, 80];
-  return /*#__PURE__*/React.createElement(DropdownMenu, {
-    value: "" + (value || ''),
-    valueRender: function valueRender(val) {
-      return /*#__PURE__*/React.createElement("div", {
-        style: {
-          width: 18
-        }
-      }, val || 20);
-    },
-    disabled: disabled,
-    onSelect: function onSelect(val) {
-      return onChange(parseInt(val, 10));
-    }
-  }, items.map(function (item) {
-    return /*#__PURE__*/React.createElement(DropdownMenu.Item, {
-      key: item
-    }, item);
-  }));
-}
-
-export default FontSizeSelect;

package/es/core/editor/components/Toolbar/widgets/components/FontStyleSelect.js

@@ -1,71 +0,0 @@
-import React from 'react';
-import variables from '@alifd/theme-19926/variables.js';
-import DropdownMenu from "./DropdownMenu";
-import Tooltip from "../../components/Tooltip";
-var items = [{
-  key: 'bold',
-  label: '加粗',
-  icon: 'bold',
-  tooltip: '加粗'
-}, {
-  key: 'italic',
-  label: '斜体',
-  icon: 'Italics',
-  tooltip: '斜体'
-}, {
-  key: 'underline',
-  label: '下划线',
-  icon: 'Underline',
-  tooltip: '下划线'
-}];
-
-function buildValue(obj) {
-  return Object.keys(obj).filter(function (key) {
-    return !!obj[key];
-  });
-}
-
-var fields = ['bold', 'italic', 'underline'];
-
-function FontStyleSelect(props) {
-  var value = props.value,
-      disabled = props.disabled,
-      onChange = props.onChange,
-      _props$fieldDisabled = props.fieldDisabled,
-      fieldDisabled = _props$fieldDisabled === void 0 ? {} : _props$fieldDisabled;
-  return /*#__PURE__*/React.createElement(DropdownMenu, {
-    value: value,
-    valueRender: function valueRender() {
-      return /*#__PURE__*/React.createElement("img", {
-        src: "/img/topo/editor/toolbar/bold/" + (disabled ? 'Disable' : 'Normal') + ".svg",
-        alt: ""
-      });
-    },
-    multiple: true,
-    disabled: disabled,
-    onSelect: onChange
-  }, items.map(function (item) {
-    return /*#__PURE__*/React.createElement(DropdownMenu.Item, {
-      key: item.key,
-      disabled: !!fieldDisabled[item.key]
-    }, /*#__PURE__*/React.createElement(Tooltip, {
-      trigger: /*#__PURE__*/React.createElement("div", {
-        style: {
-          display: 'flex',
-          alignItems: 'center'
-        }
-      }, /*#__PURE__*/React.createElement("img", {
-        src: "/img/topo/editor/toolbar/" + item.icon + "/" + (fieldDisabled[item.key] ? 'Disable' : 'Normal') + ".svg",
-        alt: ""
-      }), /*#__PURE__*/React.createElement("span", {
-        style: fieldDisabled[item.key] ? {} : {
-          color: variables['$color-text1-4']
-        }
-      }, item.label)),
-      align: "r",
-      popupStyle: {}
-    }, item.tooltip));
-  }));
-}
-
-export default FontStyleSelect;

package/lib/core/editor/components/Toolbar/widgets/components/FontFamilySelect.js

@@ -1,38 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-exports.__esModule = true;
-exports["default"] = void 0;
-
-var _react = _interopRequireDefault(require("react"));
-
-var _DropdownMenu = _interopRequireDefault(require("./DropdownMenu"));
-
-function FontFamilySelect(props) {
-  var value = props.value,
-      onChange = props.onChange;
-  var items = ['宋体', '微软雅黑', '黑体', 'Arial'];
-  return /*#__PURE__*/_react["default"].createElement(_DropdownMenu["default"], {
-    value: (items.includes(value) ? value : null) || '',
-    valueRender: function valueRender(val) {
-      return /*#__PURE__*/_react["default"].createElement("div", {
-        style: {
-          width: 48
-        }
-      }, val || '微软雅黑');
-    },
-    onSelect: onChange
-  }, items.map(function (item) {
-    return /*#__PURE__*/_react["default"].createElement(_DropdownMenu["default"].Item, {
-      key: item
-    }, /*#__PURE__*/_react["default"].createElement("div", {
-      style: {
-        fontFamily: item
-      }
-    }, item));
-  }));
-}
-
-var _default = FontFamilySelect;
-exports["default"] = _default;

package/lib/core/editor/components/Toolbar/widgets/components/FontSizeSelect.js

@@ -1,38 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-exports.__esModule = true;
-exports["default"] = void 0;
-
-var _react = _interopRequireDefault(require("react"));
-
-var _DropdownMenu = _interopRequireDefault(require("./DropdownMenu"));
-
-function FontSizeSelect(props) {
-  var value = props.value,
-      disabled = props.disabled,
-      onChange = props.onChange;
-  var items = [12, 14, 16, 18, 20, 24, 30, 36, 48, 60, 80];
-  return /*#__PURE__*/_react["default"].createElement(_DropdownMenu["default"], {
-    value: "" + (value || ''),
-    valueRender: function valueRender(val) {
-      return /*#__PURE__*/_react["default"].createElement("div", {
-        style: {
-          width: 18
-        }
-      }, val || 20);
-    },
-    disabled: disabled,
-    onSelect: function onSelect(val) {
-      return onChange(parseInt(val, 10));
-    }
-  }, items.map(function (item) {
-    return /*#__PURE__*/_react["default"].createElement(_DropdownMenu["default"].Item, {
-      key: item
-    }, item);
-  }));
-}
-
-var _default = FontSizeSelect;
-exports["default"] = _default;

package/lib/core/editor/components/Toolbar/widgets/components/FontStyleSelect.js

@@ -1,83 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-exports.__esModule = true;
-exports["default"] = void 0;
-
-var _react = _interopRequireDefault(require("react"));
-
-var _variables = _interopRequireDefault(require("@alifd/theme-19926/variables.js"));
-
-var _DropdownMenu = _interopRequireDefault(require("./DropdownMenu"));
-
-var _Tooltip = _interopRequireDefault(require("../../components/Tooltip"));
-
-var items = [{
-  key: 'bold',
-  label: '加粗',
-  icon: 'bold',
-  tooltip: '加粗'
-}, {
-  key: 'italic',
-  label: '斜体',
-  icon: 'Italics',
-  tooltip: '斜体'
-}, {
-  key: 'underline',
-  label: '下划线',
-  icon: 'Underline',
-  tooltip: '下划线'
-}];
-
-function buildValue(obj) {
-  return Object.keys(obj).filter(function (key) {
-    return !!obj[key];
-  });
-}
-
-var fields = ['bold', 'italic', 'underline'];
-
-function FontStyleSelect(props) {
-  var value = props.value,
-      disabled = props.disabled,
-      onChange = props.onChange,
-      _props$fieldDisabled = props.fieldDisabled,
-      fieldDisabled = _props$fieldDisabled === void 0 ? {} : _props$fieldDisabled;
-  return /*#__PURE__*/_react["default"].createElement(_DropdownMenu["default"], {
-    value: value,
-    valueRender: function valueRender() {
-      return /*#__PURE__*/_react["default"].createElement("img", {
-        src: "/img/topo/editor/toolbar/bold/" + (disabled ? 'Disable' : 'Normal') + ".svg",
-        alt: ""
-      });
-    },
-    multiple: true,
-    disabled: disabled,
-    onSelect: onChange
-  }, items.map(function (item) {
-    return /*#__PURE__*/_react["default"].createElement(_DropdownMenu["default"].Item, {
-      key: item.key,
-      disabled: !!fieldDisabled[item.key]
-    }, /*#__PURE__*/_react["default"].createElement(_Tooltip["default"], {
-      trigger: /*#__PURE__*/_react["default"].createElement("div", {
-        style: {
-          display: 'flex',
-          alignItems: 'center'
-        }
-      }, /*#__PURE__*/_react["default"].createElement("img", {
-        src: "/img/topo/editor/toolbar/" + item.icon + "/" + (fieldDisabled[item.key] ? 'Disable' : 'Normal') + ".svg",
-        alt: ""
-      }), /*#__PURE__*/_react["default"].createElement("span", {
-        style: fieldDisabled[item.key] ? {} : {
-          color: _variables["default"]['$color-text1-4']
-        }
-      }, item.label)),
-      align: "r",
-      popupStyle: {}
-    }, item.tooltip));
-  }));
-}
-
-var _default = FontStyleSelect;
-exports["default"] = _default;