@riil-frontend/component-topology 12.1.0-dev.12 → 12.1.0-dev.14

package/es/core/editor/components/Sidebar/views/ImagePanel/ImagePanel.js

@@ -4,6 +4,7 @@ import _extends from "@babel/runtime/helpers/extends";
 import _Button from "@alifd/next/es/button";
 import _Icon from "@alifd/next/es/icon";
 import React, { useMemo, useState } from 'react';
+import NoDataPage from '@riil-frontend/component-no-data-page';
 import Collapse from "../../../../../../components/collapse/Collapse";
 import CiTypeImagePanel from "./CiTypeImagePanel";
 import CustomImagePanel from "./CustomImagePanel";
@@ -106,12 +107,16 @@ export default function ImagePanel(props) {
     }].filter(function (panel) {
       return !panel.hidden;
     });
+
+    if (!panels.length) {
+      return /*#__PURE__*/React.createElement(NoDataPage, null);
+    }
+
     return /*#__PURE__*/React.createElement(Collapse, {
       accordion: true,
       defaultExpandedKeys: ['资源图片'],
       style: {
-        border: 'none',
-        minWidth: '300px'
+        border: 'none'
       },
       fullheight: true,
       noContentPadding: true
@@ -140,6 +145,9 @@ export default function ImagePanel(props) {
       width: '100%'
     }
   })), /*#__PURE__*/React.createElement(_Box, {
-    flex: 1
+    flex: 1,
+    style: {
+      minWidth: '300px'
+    }
   }, renderImageContent()));
 }

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

@@ -1,7 +1,8 @@
+import Logger from 'loglevel';
+var rlog = Logger.getLogger('topo');
 export default function updateElementProperty(topo, name, value) {
-  // const element = topo.getDataModel().getDataById(selection[0].id);
   var element = topo.getSelectionModel().getFirstData();
-  console.info("updateElementProperty", topo.getSelectionModel().getSelection(), {
+  rlog.debug("updateElementProperty. ", {
     element: element,
     name: name,
     value: value

package/es/core/hooks/useTopoEdit.js

@@ -417,8 +417,7 @@ var useTopoEdit = function useTopoEdit(params) {
             });
             needDeleteHtDatas.forEach(function (htData) {
               return dm.remove(htData);
-            }); // 区域里的子区域及子区域的节点、新增的链路
-            // 区域里的所有节点
+            }); // 区域里的所有子节点子区域、新增的链路
 
             nodeElements = findGroupChildren(elements, group);
             newLinkElements = findUNExistedLinkElements(elements);
@@ -430,17 +429,7 @@ var useTopoEdit = function useTopoEdit(params) {
               if (topo.linkDynamicStyleExecutor) {
                 topo.linkDynamicStyleExecutor.execute();
               }
-            } // const unExistedElements = findUNExistedElements(elements) 
-            // const createElementsData = {
-            //   groups: unExistedElements.filter((item) => item.type === "group"),
-            //   nodes: unExistedElements.filter((item) => item.type === "node"),
-            //   links: unExistedElements.filter((item) => item.type === "link"),
-            //   linkGroups: unExistedElements.filter((item) => item.type === "linkGroup"),
-            // };
-            // const htTopo = topo.getHtTopo()
-            // htTopo.createElements(createElementsData);
-            // rlog.debug('==> ht: createElements ', createElementsData)
-
+            }
 
             topo.historyManager.endTransaction();
 
@@ -773,13 +762,22 @@ var useTopoEdit = function useTopoEdit(params) {
 
             _doBind = function _doBind3() {
               _doBind = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7() {
-                var dm, newLinkElements, createElementsData, groupChildren, newGroupChildren, existedGroupChildren, groupElement, newElement, sm;
+                var dm, needDeleteHtDatas, newLinkElements, createElementsData, groupChildren, newGroupChildren, existedGroupChildren, groupElement, newElement, sm;
                 return _regeneratorRuntime.wrap(function _callee7$(_context7) {
                   while (1) switch (_context7.prev = _context7.next) {
                     case 0:
                       dm = htTopo.getGraphView().dm(); // 移除旧节点。先删除后创建，解决ip节点替换ping资源后链路丢失问题
 
-                      dm.remove(node); // 创建
+                      dm.remove(node); // 先删除多余的元素。解决 区域子节点关联ping，未更新显示链路及删除ip节点
+
+                      needDeleteHtDatas = getElements(dm).filter(function (htData) {
+                        return htData.a('id') && !elements.find(function (ele) {
+                          return ele.id === htData.a('id');
+                        });
+                      });
+                      needDeleteHtDatas.forEach(function (htData) {
+                        return dm.remove(htData);
+                      }); // 创建
 
                       newLinkElements = findUNExistedLinkElements(elements);
                       createElementsData = null;
@@ -843,7 +841,7 @@ var useTopoEdit = function useTopoEdit(params) {
                       sm = htTopo.getGraphView().sm();
                       sm.setSelection([newElement]);
 
-                    case 10:
+                    case 12:
                     case "end":
                       return _context7.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 "12.1.0-dev.12" === 'string' ? "12.1.0-dev.12" : null;
+var version = typeof "12.1.0-dev.14" === 'string' ? "12.1.0-dev.14" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/es/core/models/topoData.js

@@ -41,7 +41,7 @@ export function saveTopo(_x) {
 
 function _saveTopo() {
   _saveTopo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(data) {
-    var topoService, topoId, template, layout, backgroundId, globalConfig, serialize, resources, groups, relateTopoIdList, viewGroupId, groupInfo, viewResources, linkIps;
+    var topoService, topoId, template, layout, backgroundId, globalConfig, serialize, resources, groups, relateTopoIdList, viewGroupId, groupInfo, viewResources;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -72,7 +72,7 @@ function _saveTopo() {
 
         case 8:
           if (!(resources || groups)) {
-            _context.next = 16;
+            _context.next = 15;
             break;
           }
 
@@ -94,30 +94,23 @@ function _saveTopo() {
             });
           }
 
-          linkIps = []; // resources?.static.map((nodeId) => {
-          //   if (nodeId.startsWith("ip_")) {
-          //     linkIps.push(nodeId.replace("ip_", ""));
-          //   }
-          // });
-
           rlog.debug("saveTopo-groupInfo", groupInfo);
-          _context.next = 16;
+          _context.next = 15;
           return topoService.bindResourceToTopo(topoId, {
             groups: groupInfo,
-            linkIps: linkIps,
             relateTopoIdList: relateTopoIdList
           });
 
-        case 16:
+        case 15:
           if (!serialize) {
-            _context.next = 19;
+            _context.next = 18;
             break;
           }
 
-          _context.next = 19;
+          _context.next = 18;
           return topoService.saveSerializeData(topoId, serialize);
 
-        case 19:
+        case 18:
         case "end":
           return _context.stop();
       }

package/es/core/store/models/topoConfig.js

@@ -322,10 +322,11 @@ export default function (topoApp) {
 
                 case 11:
                   data = _context4.sent;
-                  _context4.next = 14;
+                  rlog.debug("getTopoByConditions--------", data, groupInfo);
+                  _context4.next = 15;
                   return Promise.all([addLinkData(data), topoApp.ciTyeCache.load(getCiTypes(data)), dispatch.customIcon.loadCustomIcons()]);
 
-                case 14:
+                case 15:
                   _yield$Promise$all = _context4.sent;
                   dataWithLinkDetail = _yield$Promise$all[0];
                   _combTopoData = combTopoData({
@@ -352,7 +353,7 @@ export default function (topoApp) {
                     topoDataTrans: topoDataTrans
                   });
 
-                case 22:
+                case 23:
                 case "end":
                   return _context4.stop();
               }

package/es/networkTopo/utils/exitLinkUtil.js

@@ -239,9 +239,10 @@ function updateLinkTarget(links, nodes) {
 
 
 export function processByConditionResult(topoData, groupConfigs) {
-  var nodes = topoData.nodes,
+  var groups = topoData.groups,
+      nodes = topoData.nodes,
       links = topoData.links;
-  var ipNodes = getIpNodes(groupConfigs, nodes); // 出口链路目的端设置为IP节点或者ping资源节点id
+  var ipNodes = getIpNodes(groupConfigs, topoData); // 出口链路目的端设置为IP节点或者ping资源节点id
 
   var newLinks = updateLinkTarget(links, nodes);
   return _extends({}, topoData, {
@@ -249,15 +250,26 @@ export function processByConditionResult(topoData, groupConfigs) {
     links: newLinks
   });
 
-  function getIpNodes(groupConfigs, nodes) {
-    var ips = groupConfigs.map(function (g) {
-      return g.condition.linkIps;
-    }).reduce(function (result, groupIps) {
-      return [].concat(result, groupIps);
-    }, []) // 过滤ping资源对应的ip节点
-    .filter(function (ip) {
-      return !findPingNode(nodes, ip);
+  function getIpNodes(groupConfigs, _ref) {
+    var groups = _ref.groups,
+        nodes = _ref.nodes;
+    var ipNodes = [];
+    groupConfigs.forEach(function (g) {
+      g.condition.linkIps // 过滤ping资源对应的ip节点
+      .filter(function (ip) {
+        return !findPingNode(nodes, ip);
+      }).map(function (ip) {
+        var topoGroup = g.topoGroup;
+        var group = groups.find(function (item) {
+          return item.id === topoGroup.id || item.tag === topoGroup.tag;
+        });
+        ipNodes.push(_extends({}, buildIpNode(ip), {
+          // 解决区域里有ip添加资源ip消失的问题
+          'groupId': group === null || group === void 0 ? void 0 : group.id,
+          'groupTag': group === null || group === void 0 ? void 0 : group.tag
+        }));
+      });
     });
-    return ips.map(buildIpNode);
+    return ipNodes;
   }
 }

package/lib/core/editor/components/Sidebar/views/ImagePanel/ImagePanel.js

@@ -17,6 +17,8 @@ var _icon = _interopRequireDefault(require("@alifd/next/lib/icon"));
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _componentNoDataPage = _interopRequireDefault(require("@riil-frontend/component-no-data-page"));
+
 var _Collapse = _interopRequireDefault(require("../../../../../../components/collapse/Collapse"));
 
 var _CiTypeImagePanel = _interopRequireDefault(require("./CiTypeImagePanel"));
@@ -130,12 +132,16 @@ function ImagePanel(props) {
     }].filter(function (panel) {
       return !panel.hidden;
     });
+
+    if (!panels.length) {
+      return /*#__PURE__*/_react["default"].createElement(_componentNoDataPage["default"], null);
+    }
+
     return /*#__PURE__*/_react["default"].createElement(_Collapse["default"], {
       accordion: true,
       defaultExpandedKeys: ['资源图片'],
       style: {
-        border: 'none',
-        minWidth: '300px'
+        border: 'none'
       },
       fullheight: true,
       noContentPadding: true
@@ -164,6 +170,9 @@ function ImagePanel(props) {
       width: '100%'
     }
   })), /*#__PURE__*/_react["default"].createElement(_box["default"], {
-    flex: 1
+    flex: 1,
+    style: {
+      minWidth: '300px'
+    }
   }, renderImageContent()));
 }

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

@@ -1,12 +1,17 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 exports.__esModule = true;
 exports["default"] = updateElementProperty;
 
+var _loglevel = _interopRequireDefault(require("loglevel"));
+
+var rlog = _loglevel["default"].getLogger('topo');
+
 function updateElementProperty(topo, name, value) {
-  // const element = topo.getDataModel().getDataById(selection[0].id);
   var element = topo.getSelectionModel().getFirstData();
-  console.info("updateElementProperty", topo.getSelectionModel().getSelection(), {
+  rlog.debug("updateElementProperty. ", {
     element: element,
     name: name,
     value: value

package/lib/core/hooks/useTopoEdit.js

@@ -446,8 +446,7 @@ var useTopoEdit = function useTopoEdit(params) {
             });
             needDeleteHtDatas.forEach(function (htData) {
               return dm.remove(htData);
-            }); // 区域里的子区域及子区域的节点、新增的链路
-            // 区域里的所有节点
+            }); // 区域里的所有子节点子区域、新增的链路
 
             nodeElements = (0, _topoData.findGroupChildren)(elements, group);
             newLinkElements = findUNExistedLinkElements(elements);
@@ -459,17 +458,7 @@ var useTopoEdit = function useTopoEdit(params) {
               if (topo.linkDynamicStyleExecutor) {
                 topo.linkDynamicStyleExecutor.execute();
               }
-            } // const unExistedElements = findUNExistedElements(elements) 
-            // const createElementsData = {
-            //   groups: unExistedElements.filter((item) => item.type === "group"),
-            //   nodes: unExistedElements.filter((item) => item.type === "node"),
-            //   links: unExistedElements.filter((item) => item.type === "link"),
-            //   linkGroups: unExistedElements.filter((item) => item.type === "linkGroup"),
-            // };
-            // const htTopo = topo.getHtTopo()
-            // htTopo.createElements(createElementsData);
-            // rlog.debug('==> ht: createElements ', createElementsData)
-
+            }
 
             topo.historyManager.endTransaction();
 
@@ -802,13 +791,22 @@ var useTopoEdit = function useTopoEdit(params) {
 
             _doBind = function _doBind3() {
               _doBind = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee7() {
-                var dm, newLinkElements, createElementsData, groupChildren, newGroupChildren, existedGroupChildren, groupElement, newElement, sm;
+                var dm, needDeleteHtDatas, newLinkElements, createElementsData, groupChildren, newGroupChildren, existedGroupChildren, groupElement, newElement, sm;
                 return _regenerator["default"].wrap(function _callee7$(_context7) {
                   while (1) switch (_context7.prev = _context7.next) {
                     case 0:
                       dm = htTopo.getGraphView().dm(); // 移除旧节点。先删除后创建，解决ip节点替换ping资源后链路丢失问题
 
-                      dm.remove(node); // 创建
+                      dm.remove(node); // 先删除多余的元素。解决 区域子节点关联ping，未更新显示链路及删除ip节点
+
+                      needDeleteHtDatas = (0, _htElementUtils.getElements)(dm).filter(function (htData) {
+                        return htData.a('id') && !elements.find(function (ele) {
+                          return ele.id === htData.a('id');
+                        });
+                      });
+                      needDeleteHtDatas.forEach(function (htData) {
+                        return dm.remove(htData);
+                      }); // 创建
 
                       newLinkElements = findUNExistedLinkElements(elements);
                       createElementsData = null;
@@ -872,7 +870,7 @@ var useTopoEdit = function useTopoEdit(params) {
                       sm = htTopo.getGraphView().sm();
                       sm.setSelection([newElement]);
 
-                    case 10:
+                    case 12:
                     case "end":
                       return _context7.stop();
                   }

package/lib/core/models/TopoApp.js

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

package/lib/core/models/topoData.js

@@ -57,7 +57,7 @@ function saveTopo(_x) {
 
 function _saveTopo() {
   _saveTopo = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(data) {
-    var topoService, topoId, template, layout, backgroundId, globalConfig, serialize, resources, groups, relateTopoIdList, viewGroupId, groupInfo, viewResources, linkIps;
+    var topoService, topoId, template, layout, backgroundId, globalConfig, serialize, resources, groups, relateTopoIdList, viewGroupId, groupInfo, viewResources;
     return _regenerator["default"].wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -90,7 +90,7 @@ function _saveTopo() {
 
         case 8:
           if (!(resources || groups)) {
-            _context.next = 16;
+            _context.next = 15;
             break;
           }
 
@@ -112,31 +112,24 @@ function _saveTopo() {
             });
           }
 
-          linkIps = []; // resources?.static.map((nodeId) => {
-          //   if (nodeId.startsWith("ip_")) {
-          //     linkIps.push(nodeId.replace("ip_", ""));
-          //   }
-          // });
-
           _rlog["default"].debug("saveTopo-groupInfo", groupInfo);
 
-          _context.next = 16;
+          _context.next = 15;
           return topoService.bindResourceToTopo(topoId, {
             groups: groupInfo,
-            linkIps: linkIps,
             relateTopoIdList: relateTopoIdList
           });
 
-        case 16:
+        case 15:
           if (!serialize) {
-            _context.next = 19;
+            _context.next = 18;
             break;
           }
 
-          _context.next = 19;
+          _context.next = 18;
           return topoService.saveSerializeData(topoId, serialize);
 
-        case 19:
+        case 18:
         case "end":
           return _context.stop();
       }

package/lib/core/store/models/topoConfig.js

@@ -340,10 +340,11 @@ function _default(topoApp) {
 
                 case 11:
                   data = _context4.sent;
-                  _context4.next = 14;
+                  rlog.debug("getTopoByConditions--------", data, groupInfo);
+                  _context4.next = 15;
                   return Promise.all([(0, _getTopoData.addLinkData)(data), topoApp.ciTyeCache.load((0, _topoData.getCiTypes)(data)), dispatch.customIcon.loadCustomIcons()]);
 
-                case 14:
+                case 15:
                   _yield$Promise$all = _context4.sent;
                   dataWithLinkDetail = _yield$Promise$all[0];
                   _combTopoData = (0, _topoData.combTopoData)({
@@ -370,7 +371,7 @@ function _default(topoApp) {
                     topoDataTrans: topoDataTrans
                   });
 
-                case 22:
+                case 23:
                 case "end":
                   return _context4.stop();
               }

package/lib/networkTopo/utils/exitLinkUtil.js

@@ -251,9 +251,10 @@ function updateLinkTarget(links, nodes) {
 
 
 function processByConditionResult(topoData, groupConfigs) {
-  var nodes = topoData.nodes,
+  var groups = topoData.groups,
+      nodes = topoData.nodes,
       links = topoData.links;
-  var ipNodes = getIpNodes(groupConfigs, nodes); // 出口链路目的端设置为IP节点或者ping资源节点id
+  var ipNodes = getIpNodes(groupConfigs, topoData); // 出口链路目的端设置为IP节点或者ping资源节点id
 
   var newLinks = updateLinkTarget(links, nodes);
   return (0, _extends2["default"])({}, topoData, {
@@ -261,15 +262,26 @@ function processByConditionResult(topoData, groupConfigs) {
     links: newLinks
   });
 
-  function getIpNodes(groupConfigs, nodes) {
-    var ips = groupConfigs.map(function (g) {
-      return g.condition.linkIps;
-    }).reduce(function (result, groupIps) {
-      return [].concat(result, groupIps);
-    }, []) // 过滤ping资源对应的ip节点
-    .filter(function (ip) {
-      return !findPingNode(nodes, ip);
+  function getIpNodes(groupConfigs, _ref) {
+    var groups = _ref.groups,
+        nodes = _ref.nodes;
+    var ipNodes = [];
+    groupConfigs.forEach(function (g) {
+      g.condition.linkIps // 过滤ping资源对应的ip节点
+      .filter(function (ip) {
+        return !findPingNode(nodes, ip);
+      }).map(function (ip) {
+        var topoGroup = g.topoGroup;
+        var group = groups.find(function (item) {
+          return item.id === topoGroup.id || item.tag === topoGroup.tag;
+        });
+        ipNodes.push((0, _extends2["default"])({}, buildIpNode(ip), {
+          // 解决区域里有ip添加资源ip消失的问题
+          'groupId': group === null || group === void 0 ? void 0 : group.id,
+          'groupTag': group === null || group === void 0 ? void 0 : group.tag
+        }));
+      });
     });
-    return ips.map(buildIpNode);
+    return ipNodes;
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "12.1.0-dev.12",
+  "version": "12.1.0-dev.14",
   "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.12/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@12.1.0-dev.14/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }