@riil-frontend/component-topology 9.0.0-a.31 → 9.0.0-a.33

package/es/core/editor/components/Toolbar/widgets/EdgeTypeButton/EdgeType.js

@@ -3,7 +3,7 @@ import _Field from "@alifd/next/es/field";
 import _Select from "@alifd/next/es/select";
 import _Form from "@alifd/next/es/form";
 import React, { useEffect, useState } from 'react';
-import { getEdgesBySelection, loopEdgesAndChildren } from "../../../../utils/edgeTypeStyleUtil";
+import { getEdgesBySelection, loopEdgesAndChildren, isNodeAllEdges } from "../../../../utils/edgeTypeStyleUtil";
 import styles from "./EdgeType.module.scss";
 import LineType from "./LineType";
 var FormItem = _Form.Item;
@@ -77,12 +77,12 @@ function getValuesByEdges(topo) {
     })[0] || 'nil';
   }
 
-  function getEdgesValues(edges, topo) {
+  function getEdgesValues(edges) {
     var edgeValues = [];
-    var htTopo = topo.getHtTopo();
     edges.forEach(function (edge) {
       edgeValues.push({
-        baseAgreement: htTopo.getEdgeMultarc(edges),
+        baseAgreement: false,
+        //,
         lineButton: edge.s('edge.type'),
         startPoint: getStartPoint(edge),
         endPoint: getEndPoint(edge),
@@ -123,16 +123,12 @@ function EdgeType(props) {
 
   var _useState = useState(false),
       disable = _useState[0],
-      setDisabel = _useState[1];
+      setDisable = _useState[1];
 
   var field = _Field.useField({
     autoUnmount: false,
     values: getValuesByEdges(topo),
     onChange: function onChange(name, value) {
-      if (name == 'baseAgreement') {
-        setDisabel(value);
-      }
-
       if (['startPoint', 'endPoint'].includes(name) && value === 'nil') {
         _onChange(name, null);
       } else {
@@ -143,6 +139,8 @@ function EdgeType(props) {
 
   useEffect(function () {
     field.setValues(getValuesByEdges(topo));
+    field.setValue('baseAgreement', topo.getHtTopo().getEdgeMultarc(getEdgesBySelection(topo)));
+    setDisable(isNodeAllEdges(topo));
   }, [selection]);
   return /*#__PURE__*/React.createElement("div", {
     className: styles.lineBox
@@ -152,10 +150,11 @@ function EdgeType(props) {
     labelAlign: "top"
   }, /*#__PURE__*/React.createElement(FormItem, null, /*#__PURE__*/React.createElement(LineType, {
     name: "lineButton",
-    disable: disable
+    disable: !!field.getValue('baseAgreement')
   })), /*#__PURE__*/React.createElement(FormItem, null, /*#__PURE__*/React.createElement(_Checkbox, {
     name: "baseAgreement",
-    onChange: _onChange
+    onChange: _onChange,
+    disabled: disable
   }, "\u81EA\u52A8\u8C03\u6574")), /*#__PURE__*/React.createElement(FormItem, {
     label: "\u8D77\u70B9"
   }, /*#__PURE__*/React.createElement(_Select, {

package/es/core/editor/components/settings/core/getPropertyViewType.js

@@ -8,6 +8,9 @@ function getPropertyViewType(selection) {
   if (!selectionSize) {
     // 未选
     viewType = 'view';
+  } else if ((selectionElement === null || selectionElement === void 0 ? void 0 : selectionElement.getLayer()) === 'backgroundImage') {
+    // 背景图
+    viewType = 'view';
   } else if (selectionSize >= 2) {
     // 多选
     viewType = 'multiple';

package/es/core/editor/utils/edgeTypeStyleUtil.js

@@ -1,4 +1,5 @@
 import { getEdges } from "../../../utils/htElementUtils";
+import { getEdgesBetweenNodes } from "../../../utils/htElementUtils";
 var ht = window.ht;
 export function getEdgesBySelection(topo) {
   var getChildrenNodeIds = function getChildrenNodeIds(nodes) {
@@ -42,6 +43,43 @@ export function getEdgesBySelection(topo) {
 
   return getSelectedEdges(topo.getGraphView());
 }
+/**
+ * 根据选中的线查找对应节点下所有的线是否都选中
+ * @param {*} topo 
+ * @param {*} edges 
+ * @param {*} operateEdgeFn 
+ */
+
+export function isNodeAllEdges(topo) {
+  var selection = topo.getSelectionModel().getSelection().toArray(); // 选中的连线
+
+  var edges = selection.filter(function (element) {
+    return element instanceof ht.Edge;
+  });
+  var inEdges = false;
+  edges.forEach(function (edge) {
+    //根据两边节点查询到所有节点有关的线，过滤出相同的线（两个节点间的线）
+    var sourceNode = edge.getSource();
+    var targetNode = edge.getTarget();
+    var nodeLineList = getEdgesBetweenNodes(sourceNode, targetNode);
+
+    var _loop = function _loop(i) {
+      if (edges.filter(function (edge) {
+        return nodeLineList[i]._id == edge._id;
+      }).length == 0) {
+        inEdges = true;
+        return "break";
+      }
+    };
+
+    for (var i = 0; i < nodeLineList.length; i++) {
+      var _ret = _loop(i);
+
+      if (_ret === "break") break;
+    }
+  });
+  return inEdges;
+}
 /**
  * 遍历连线及子连线
  * @param {*} topo 

package/es/core/hooks/useTopoEdit.js

@@ -973,7 +973,7 @@ var useTopoEdit = function useTopoEdit(params) {
 
   function _relateNodeIp() {
     _relateNodeIp = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee16(txtValue, nodeElement) {
-      var dm, htTopo, elementNodes, isUnique, ip, configObj, configData, _elements, newLinkElements, newLink, newLinkGroup, createElementsData;
+      var dm, isUnique, ip, configObj, configData, _elements, newLinkElements, newLink, newLinkGroup, createElementsData, _htTopo;
 
       return _regeneratorRuntime.wrap(function _callee16$(_context16) {
         while (1) {
@@ -989,20 +989,24 @@ var useTopoEdit = function useTopoEdit(params) {
               return _context16.abrupt("return");
 
             case 3:
+              // if (txtValue === nodeElement.a('bindIp')) {
+              //   return;
+              // }
               // 根据配置查询拓扑数据
-              dm = topo.getDataModel();
-              htTopo = topo.getHtTopo();
-              elementNodes = getNodes(dm); // 执行唯一性验证
+              dm = topo.getDataModel(); // 执行唯一性验证
 
-              isUnique = isUniqueIp(dm, txtValue, nodeElement);
-              ip = buildIpNode(txtValue); // 获取关联链路
+              isUnique = isUniqueIp(dm, txtValue, nodeElement); // 获取关联链路
 
               if (!isUnique) {
-                _context16.next = 26;
+                _context16.next = 25;
                 break;
               }
 
-              // deleteExLink(nodeElement);
+              ip = buildIpNode(txtValue);
+              _context16.next = 9;
+              return deleteExLink(nodeElement);
+
+            case 9:
               nodeElement.a(ip);
               nodeElement.setName(txtValue);
               nodeElement.setTag("ip:" + txtValue); // 获取配置
@@ -1017,17 +1021,18 @@ var useTopoEdit = function useTopoEdit(params) {
 
             case 17:
               configData = _context16.sent;
-              // console.log("configData", configData);
+              // console.log("configData",configObj, configData);
               _elements = configData.elements;
-              newLinkElements = findUNExistedLinkElements(_elements);
+              newLinkElements = findUNExistedLinkElements(_elements); // console.log("configData", configData, newLinkElements);
+
               newLink = newLinkElements.filter(function (item) {
                 return item.type === "link";
               });
               newLinkGroup = newLinkElements.filter(function (item) {
                 return item.type === "linkGroup";
               }); // const newData = elements.find((item) => item.id === `ip:${txtValue}`);
+              // console.log("newData",newLinkElements, newLink);
 
-              console.log("newData", newLink);
               createElementsData = {
                 groups: [],
                 nodes: [],
@@ -1037,10 +1042,12 @@ var useTopoEdit = function useTopoEdit(params) {
               console.log("createElementsData", createElementsData);
 
               if ([].concat(newLink, newLinkGroup).length > 0) {
-                htTopo.createElements(createElementsData);
+                _htTopo = topo.getHtTopo();
+
+                _htTopo.createElements(createElementsData);
               }
 
-            case 26:
+            case 25:
             case "end":
               return _context16.stop();
           }

package/es/core/models/TopoApp.js

@@ -24,7 +24,7 @@ import ElementTagTipConfig from "./tagstips/ElementTagTipConfig";
 import SelectionModel from "./SelectionModel";
 import CiCache from "./cache/CiCache"; // eslint-disable-next-line no-undef
 
-var version = typeof "9.0.0-a.31" === 'string' ? "9.0.0-a.31" : null;
+var version = typeof "9.0.0-a.33" === 'string' ? "9.0.0-a.33" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/es/networkTopo/utils/exitLinkUtil.js

@@ -50,20 +50,15 @@ function isExitLink(link) {
 
 export function isUniqueIp(dataModel, ip, nodeElement) {
   var nodes = getNodes(dataModel);
-  var isUnique = true;
-  console.log("nodes-nodeElement", nodes, nodeElement);
+  var isUnique = true; // console.log("nodes-nodeElement", nodes, nodeElement);
 
   if (nodeElement) {
-    console.log("nodes-nodeElement---filter", nodes.filter(function (node) {
-      return node.getId() !== (nodeElement === null || nodeElement === void 0 ? void 0 : nodeElement.getId());
-    }));
     var arr = nodes.filter(function (node) {
       return node.getId() !== (nodeElement === null || nodeElement === void 0 ? void 0 : nodeElement.getId());
     }).filter(function (node) {
       return isPingHtNode(node, ip) || isIpHtNode(node, ip);
     });
     isUnique = arr.length === 0;
-    console.log("nodes-nodeElement---filter", arr, isUnique);
   } else {
     isUnique = nodes.filter(function (node) {
       return node.a("ipAddress") === ip;
@@ -98,7 +93,7 @@ export function processExitLink(topoData) {
     return upgradeExitLinkTarget(link, serialize);
   }); // 历史数据适配：同IP节点关联多个不同IP的链路、分级拓扑。target匹配不到元素时，根据序列化匹配
 
-  newLinks = upgradeLinkTargetNotExisted(links); // IP节点构造为node。如果有相同ip的ping资源和图片节点，图片节点消失（不构造）
+  newLinks = upgradeLinkTargetNotExisted(newLinks); // IP节点构造为node。如果有相同ip的ping资源和图片节点，图片节点消失（不构造）
 
   var ipNodes = getIpNodes(serialize, nodes);
   return _extends({}, topoData, {

package/lib/core/editor/components/Toolbar/widgets/EdgeTypeButton/EdgeType.js

@@ -96,12 +96,12 @@ function getValuesByEdges(topo) {
     })[0] || 'nil';
   }
 
-  function getEdgesValues(edges, topo) {
+  function getEdgesValues(edges) {
     var edgeValues = [];
-    var htTopo = topo.getHtTopo();
     edges.forEach(function (edge) {
       edgeValues.push({
-        baseAgreement: htTopo.getEdgeMultarc(edges),
+        baseAgreement: false,
+        //,
         lineButton: edge.s('edge.type'),
         startPoint: getStartPoint(edge),
         endPoint: getEndPoint(edge),
@@ -142,16 +142,12 @@ function EdgeType(props) {
 
   var _useState = (0, _react.useState)(false),
       disable = _useState[0],
-      setDisabel = _useState[1];
+      setDisable = _useState[1];
 
   var field = _field["default"].useField({
     autoUnmount: false,
     values: getValuesByEdges(topo),
     onChange: function onChange(name, value) {
-      if (name == 'baseAgreement') {
-        setDisabel(value);
-      }
-
       if (['startPoint', 'endPoint'].includes(name) && value === 'nil') {
         _onChange(name, null);
       } else {
@@ -162,6 +158,8 @@ function EdgeType(props) {
 
   (0, _react.useEffect)(function () {
     field.setValues(getValuesByEdges(topo));
+    field.setValue('baseAgreement', topo.getHtTopo().getEdgeMultarc((0, _edgeTypeStyleUtil.getEdgesBySelection)(topo)));
+    setDisable((0, _edgeTypeStyleUtil.isNodeAllEdges)(topo));
   }, [selection]);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: _EdgeTypeModule["default"].lineBox
@@ -171,10 +169,11 @@ function EdgeType(props) {
     labelAlign: "top"
   }, /*#__PURE__*/_react["default"].createElement(FormItem, null, /*#__PURE__*/_react["default"].createElement(_LineType["default"], {
     name: "lineButton",
-    disable: disable
+    disable: !!field.getValue('baseAgreement')
   })), /*#__PURE__*/_react["default"].createElement(FormItem, null, /*#__PURE__*/_react["default"].createElement(_checkbox["default"], {
     name: "baseAgreement",
-    onChange: _onChange
+    onChange: _onChange,
+    disabled: disable
   }, "\u81EA\u52A8\u8C03\u6574")), /*#__PURE__*/_react["default"].createElement(FormItem, {
     label: "\u8D77\u70B9"
   }, /*#__PURE__*/_react["default"].createElement(_select["default"], {

package/lib/core/editor/components/settings/core/getPropertyViewType.js

@@ -13,6 +13,9 @@ function getPropertyViewType(selection) {
   if (!selectionSize) {
     // 未选
     viewType = 'view';
+  } else if ((selectionElement === null || selectionElement === void 0 ? void 0 : selectionElement.getLayer()) === 'backgroundImage') {
+    // 背景图
+    viewType = 'view';
   } else if (selectionSize >= 2) {
     // 多选
     viewType = 'multiple';

package/lib/core/editor/utils/edgeTypeStyleUtil.js

@@ -2,6 +2,7 @@
 
 exports.__esModule = true;
 exports.getEdgesBySelection = getEdgesBySelection;
+exports.isNodeAllEdges = isNodeAllEdges;
 exports.loopEdgesAndChildren = loopEdgesAndChildren;
 exports.setEdgesAndChildren = setEdgesAndChildren;
 exports.setEdgesType = setEdgesType;
@@ -52,6 +53,44 @@ function getEdgesBySelection(topo) {
 
   return getSelectedEdges(topo.getGraphView());
 }
+/**
+ * 根据选中的线查找对应节点下所有的线是否都选中
+ * @param {*} topo 
+ * @param {*} edges 
+ * @param {*} operateEdgeFn 
+ */
+
+
+function isNodeAllEdges(topo) {
+  var selection = topo.getSelectionModel().getSelection().toArray(); // 选中的连线
+
+  var edges = selection.filter(function (element) {
+    return element instanceof ht.Edge;
+  });
+  var inEdges = false;
+  edges.forEach(function (edge) {
+    //根据两边节点查询到所有节点有关的线，过滤出相同的线（两个节点间的线）
+    var sourceNode = edge.getSource();
+    var targetNode = edge.getTarget();
+    var nodeLineList = (0, _htElementUtils.getEdgesBetweenNodes)(sourceNode, targetNode);
+
+    var _loop = function _loop(i) {
+      if (edges.filter(function (edge) {
+        return nodeLineList[i]._id == edge._id;
+      }).length == 0) {
+        inEdges = true;
+        return "break";
+      }
+    };
+
+    for (var i = 0; i < nodeLineList.length; i++) {
+      var _ret = _loop(i);
+
+      if (_ret === "break") break;
+    }
+  });
+  return inEdges;
+}
 /**
  * 遍历连线及子连线
  * @param {*} topo 

package/lib/core/hooks/useTopoEdit.js

@@ -1014,7 +1014,7 @@ var useTopoEdit = function useTopoEdit(params) {
 
   function _relateNodeIp() {
     _relateNodeIp = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee16(txtValue, nodeElement) {
-      var dm, htTopo, elementNodes, isUnique, ip, configObj, configData, _elements, newLinkElements, newLink, newLinkGroup, createElementsData;
+      var dm, isUnique, ip, configObj, configData, _elements, newLinkElements, newLink, newLinkGroup, createElementsData, _htTopo;
 
       return _regenerator["default"].wrap(function _callee16$(_context16) {
         while (1) {
@@ -1030,20 +1030,24 @@ var useTopoEdit = function useTopoEdit(params) {
               return _context16.abrupt("return");
 
             case 3:
+              // if (txtValue === nodeElement.a('bindIp')) {
+              //   return;
+              // }
               // 根据配置查询拓扑数据
-              dm = topo.getDataModel();
-              htTopo = topo.getHtTopo();
-              elementNodes = (0, _htElementUtils.getNodes)(dm); // 执行唯一性验证
+              dm = topo.getDataModel(); // 执行唯一性验证
 
-              isUnique = (0, _exitLinkUtil.isUniqueIp)(dm, txtValue, nodeElement);
-              ip = (0, _exitLinkUtil.buildIpNode)(txtValue); // 获取关联链路
+              isUnique = (0, _exitLinkUtil.isUniqueIp)(dm, txtValue, nodeElement); // 获取关联链路
 
               if (!isUnique) {
-                _context16.next = 26;
+                _context16.next = 25;
                 break;
               }
 
-              // deleteExLink(nodeElement);
+              ip = (0, _exitLinkUtil.buildIpNode)(txtValue);
+              _context16.next = 9;
+              return deleteExLink(nodeElement);
+
+            case 9:
               nodeElement.a(ip);
               nodeElement.setName(txtValue);
               nodeElement.setTag("ip:" + txtValue); // 获取配置
@@ -1058,17 +1062,18 @@ var useTopoEdit = function useTopoEdit(params) {
 
             case 17:
               configData = _context16.sent;
-              // console.log("configData", configData);
+              // console.log("configData",configObj, configData);
               _elements = configData.elements;
-              newLinkElements = findUNExistedLinkElements(_elements);
+              newLinkElements = findUNExistedLinkElements(_elements); // console.log("configData", configData, newLinkElements);
+
               newLink = newLinkElements.filter(function (item) {
                 return item.type === "link";
               });
               newLinkGroup = newLinkElements.filter(function (item) {
                 return item.type === "linkGroup";
               }); // const newData = elements.find((item) => item.id === `ip:${txtValue}`);
+              // console.log("newData",newLinkElements, newLink);
 
-              console.log("newData", newLink);
               createElementsData = {
                 groups: [],
                 nodes: [],
@@ -1078,10 +1083,12 @@ var useTopoEdit = function useTopoEdit(params) {
               console.log("createElementsData", createElementsData);
 
               if ([].concat(newLink, newLinkGroup).length > 0) {
-                htTopo.createElements(createElementsData);
+                _htTopo = topo.getHtTopo();
+
+                _htTopo.createElements(createElementsData);
               }
 
-            case 26:
+            case 25:
             case "end":
               return _context16.stop();
           }

package/lib/core/models/TopoApp.js

@@ -56,7 +56,7 @@ var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
 var _CiCache = _interopRequireDefault(require("./cache/CiCache"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "9.0.0-a.31" === 'string' ? "9.0.0-a.31" : null;
+var version = typeof "9.0.0-a.33" === 'string' ? "9.0.0-a.33" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/networkTopo/utils/exitLinkUtil.js

@@ -61,20 +61,15 @@ function isExitLink(link) {
 
 function isUniqueIp(dataModel, ip, nodeElement) {
   var nodes = (0, _htElementUtils.getNodes)(dataModel);
-  var isUnique = true;
-  console.log("nodes-nodeElement", nodes, nodeElement);
+  var isUnique = true; // console.log("nodes-nodeElement", nodes, nodeElement);
 
   if (nodeElement) {
-    console.log("nodes-nodeElement---filter", nodes.filter(function (node) {
-      return node.getId() !== (nodeElement === null || nodeElement === void 0 ? void 0 : nodeElement.getId());
-    }));
     var arr = nodes.filter(function (node) {
       return node.getId() !== (nodeElement === null || nodeElement === void 0 ? void 0 : nodeElement.getId());
     }).filter(function (node) {
       return isPingHtNode(node, ip) || isIpHtNode(node, ip);
     });
     isUnique = arr.length === 0;
-    console.log("nodes-nodeElement---filter", arr, isUnique);
   } else {
     isUnique = nodes.filter(function (node) {
       return node.a("ipAddress") === ip;
@@ -109,7 +104,7 @@ function processExitLink(topoData) {
     return upgradeExitLinkTarget(link, serialize);
   }); // 历史数据适配：同IP节点关联多个不同IP的链路、分级拓扑。target匹配不到元素时，根据序列化匹配
 
-  newLinks = upgradeLinkTargetNotExisted(links); // IP节点构造为node。如果有相同ip的ping资源和图片节点，图片节点消失（不构造）
+  newLinks = upgradeLinkTargetNotExisted(newLinks); // IP节点构造为node。如果有相同ip的ping资源和图片节点，图片节点消失（不构造）
 
   var ipNodes = getIpNodes(serialize, nodes);
   return (0, _extends2["default"])({}, topoData, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "9.0.0-a.31",
+  "version": "9.0.0-a.33",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -116,6 +116,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@9.0.0-a.31/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@9.0.0-a.33/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }