@riil-frontend/component-topology 9.0.0-a.21 → 9.0.0-a.23

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

@@ -15,7 +15,7 @@ function FontSizeSelect(props) {
         style: {
           width: 18
         }
-      }, val || 12);
+      }, val || 20);
     },
     disabled: disabled,
     onSelect: function onSelect(val) {

package/es/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/groupTitle.js

@@ -15,7 +15,7 @@ export function getTextStyle(element) {
     color: parseColor(element.s('group.title.color')),
     underline: underline
   }, fontStyleUtil.toMap(element.s('group.title.font')), {
-    fontSize: font.fontSize || 12,
+    fontSize: font.fontSize || 24,
     fontFamily: font.fontFamily || '微软雅黑'
   }, parseBackground(element.s('group.title.background')));
 }

package/es/core/hooks/useCanvasTheme.js

@@ -4,7 +4,7 @@ var themeMap = [{
   name: 'white',
   label: '白色',
   color: null,
-  toolsTheme: 'lightgrayblue'
+  toolsTheme: 'white'
 }, {
   name: 'lightblue',
   label: '蓝色',
@@ -22,11 +22,11 @@ var themeMap = [{
   name: 'dark',
   label: '深色',
   color: '#031425',
-  toolsTheme: 'black'
+  toolsTheme: 'dark'
 }, {
   name: 'poly',
   label: 'Poly',
-  toolsTheme: 'black',
+  toolsTheme: 'dark',
   backgroundImage: '/img/topo/themes/poly.png'
 }].reduce(function (map, item) {
   var _extends2;
@@ -49,7 +49,7 @@ export default function useCanvasTheme(props) {
     if (graphLoaded && themeConfig) {
       try {
         topo.getHtTopo().setTheme(themeName);
-        topo.getHtTopo().setToolsTheme(themeName);
+        topo.getHtTopo().setToolsTheme(themeConfig.toolsTheme);
       } catch (error) {
         console.error('切换主题失败', error);
       }

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.21" === 'string' ? "9.0.0-a.21" : null;
+var version = typeof "9.0.0-a.23" === 'string' ? "9.0.0-a.23" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/es/networkTopo/services/topo/basic.js

@@ -408,17 +408,17 @@ export default _extends({
   */
   getTopoData: function getTopoData(id) {
     return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee12() {
-      var _result$nodes, _result$links, result;
+      var _result$nodes, _result$links;
 
+      var result;
       return _regeneratorRuntime.wrap(function _callee12$(_context12) {
         while (1) {
           switch (_context12.prev = _context12.next) {
             case 0:
-              _context12.prev = 0;
-              _context12.next = 3;
+              _context12.next = 2;
               return request.get(API_ROOT + "/structure/both/" + id);
 
-            case 3:
+            case 2:
               result = _context12.sent;
               return _context12.abrupt("return", processExitLink(_extends({}, result, {
                 nodes: (_result$nodes = result.nodes) !== null && _result$nodes !== void 0 ? _result$nodes : [],
@@ -429,18 +429,12 @@ export default _extends({
                 })
               })));
 
-            case 7:
-              _context12.prev = 7;
-              _context12.t0 = _context12["catch"](0);
-              rlog.debug('getTopoData-error', _context12.t0);
-              return _context12.abrupt("return", null);
-
-            case 11:
+            case 4:
             case "end":
               return _context12.stop();
           }
         }
-      }, _callee12, null, [[0, 7]]);
+      }, _callee12);
     }))();
   },
 

package/es/networkTopo/utils/exitLinkUtil.js

@@ -64,56 +64,70 @@ export function isUniqueIp(dataModel, ip, nodeElement) {
 
 export function processExitLink(topoData) {
   var nodes = topoData.nodes,
-      links = topoData.links;
+      links = topoData.links; // 出口链路目的端设置为IP节点或者ping资源节点id
 
-  var serialize = _extends({}, getHtSerialize(topoData.serialize));
+  var newLinks = updateLinkTarget(links, nodes);
 
-  if (!serialize) {
-    return topoData;
-  } // 历史数据升级
+  if (!topoData.serialize) {
+    return _extends({}, topoData, {
+      links: newLinks
+    });
+  }
+
+  var serialize = _extends({}, getHtSerialize(topoData.serialize)); // 历史数据升级
 
 
   links.filter(isExitLink) // 升级V1.4前配置的出口链路目的端节点为IP节点
   .forEach(function (link) {
     return upgradeExitLinkTarget(link);
-  }); // 出口链路目的端设置为IP节点或者ping资源节点id
+  }); // 历史数据适配：同IP节点关联多个不同IP的链路、分级拓扑。target匹配不到元素时，根据序列化匹配
 
-  var newLinks = links.map(function (link) {
-    if (!isExitLink(link) || link.target && nodes.find(function (node) {
-      return node.id === link.target;
-    })) {
-      return link;
-    }
+  newLinks = upgradeLinkTargetNotExisted(links); // IP节点构造为node。如果有相同ip的ping资源和图片节点，图片节点消失（不构造）
 
-    var destinationIp = link.attributes['network_link.destination_ipv4'];
-    var pingNode = findPingNode(nodes, destinationIp); // 出口链路目的端设置为IP节点或者ping资源节点id
+  var ipNodes = getIpNodes();
+  return _extends({}, topoData, {
+    nodes: [].concat(nodes, ipNodes),
+    links: newLinks,
+    serialize: serialize
+  }); // 历史数据适配：同IP节点关联多个不同IP的链路、分级拓扑。target匹配不到元素时，根据序列化匹配
+
+  function upgradeLinkTargetNotExisted(links) {
+    newLinks = links.map(function (link) {
+      if (!isExitLink(link) || link.target && nodes.find(function (node) {
+        return node.id === link.target;
+      })) {
+        return link;
+      }
 
-    var target = pingNode ? pingNode.id : "ip:" + destinationIp; // 历史数据适配：同IP节点关联多个不同IP的链路、分级拓扑。target匹配不到元素时，根据序列化匹配
+      var destinationIp = link.attributes['network_link.destination_ipv4'];
+      var pingNode = findPingNode(nodes, destinationIp); // 出口链路目的端设置为IP节点或者ping资源节点id
 
-    var targetSerialize = findElementSerializeById(serialize, target);
+      var target = link.target; // 历史数据适配：同IP节点关联多个不同IP的链路、分级拓扑。target匹配不到元素时，根据序列化匹配
 
-    if (!targetSerialize) {
-      var linkSerialize = findElementSerializeById(serialize, link.id);
+      var targetSerialize = findElementSerializeById(serialize, target);
 
-      if (linkSerialize) {
-        // 根据链路序列化数据找目的端节点
-        // eslint-disable-next-line no-underscore-dangle
-        var targetNodeSerialize = serialize.d.find(function (item) {
-          return item.i === linkSerialize.p.target.__i;
-        });
+      if (!targetSerialize) {
+        var linkSerialize = findElementSerializeById(serialize, link.id);
 
-        if (targetNodeSerialize) {
-          target = targetNodeSerialize.p.tag;
+        if (linkSerialize) {
+          // 根据链路序列化数据找目的端节点
+          // eslint-disable-next-line no-underscore-dangle
+          var targetNodeSerialize = serialize.d.find(function (item) {
+            return item.i === linkSerialize.p.target.__i;
+          });
+
+          if (targetNodeSerialize) {
+            target = targetNodeSerialize.p.tag;
+          }
         }
       }
-    }
 
-    return _extends({}, link, {
-      target: target
+      return _extends({}, link, {
+        target: target
+      });
     });
-  }); // IP节点构造为node。如果有相同ip的ping资源和图片节点，图片节点消失（不构造）
-
-  var ipNodes = getIpNodes();
+    return newLinks;
+  }
 
   function getIpNodes() {
     // 从序列化获取关联的IP
@@ -166,18 +180,32 @@ export function processExitLink(topoData) {
       }
     }
   }
-
-  return _extends({}, topoData, {
-    nodes: [].concat(nodes, ipNodes),
-    links: newLinks,
-    serialize: serialize
-  });
 } // 从拓扑数据查找
 
 function findPingNode(nodes, ip) {
   return nodes.find(function (node) {
     return node.ciType === "ping" && (node.ipAddress || node.attributes.ipv4_address) === ip;
   });
+} // 出口链路目的端设置为IP节点或者ping资源节点id
+
+
+function updateLinkTarget(links, nodes) {
+  var newLinks = links.map(function (link) {
+    if (!isExitLink(link) || link.target && nodes.find(function (node) {
+      return node.id === link.target;
+    })) {
+      return link;
+    }
+
+    var destinationIp = link.attributes['network_link.destination_ipv4'];
+    var pingNode = findPingNode(nodes, destinationIp); // 出口链路目的端设置为IP节点或者ping资源节点id
+
+    var target = pingNode ? pingNode.id : "ip:" + destinationIp;
+    return _extends({}, link, {
+      target: target
+    });
+  });
+  return newLinks;
 }
 /**
  * 编辑模式按资源查询拓扑数据处理出口链路target
@@ -202,21 +230,7 @@ export function processByConditionResult(topoData) {
   } // 出口链路目的端设置为IP节点或者ping资源节点id
 
 
-  var newLinks = links.map(function (link) {
-    if (!isExitLink(link) || link.target && nodes.find(function (node) {
-      return node.id === link.target;
-    })) {
-      return link;
-    }
-
-    var destinationIp = link.attributes['network_link.destination_ipv4'];
-    var pingNode = findPingNode(nodes, destinationIp); // 出口链路目的端设置为IP节点或者ping资源节点id
-
-    var target = pingNode ? pingNode.id : "ip:" + destinationIp;
-    return _extends({}, link, {
-      target: target
-    });
-  });
+  var newLinks = updateLinkTarget(links, nodes);
   return _extends({}, topoData, {
     nodes: [].concat(nodes, ipNodes),
     links: newLinks

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

@@ -29,7 +29,7 @@ function FontSizeSelect(props) {
         style: {
           width: 18
         }
-      }, val || 12);
+      }, val || 20);
     },
     disabled: disabled,
     onSelect: function onSelect(val) {

package/lib/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/groupTitle.js

@@ -33,7 +33,7 @@ function getTextStyle(element) {
     color: (0, _colorUtil.parseColor)(element.s('group.title.color')),
     underline: underline
   }, _fontStyleUtil["default"].toMap(element.s('group.title.font')), {
-    fontSize: font.fontSize || 12,
+    fontSize: font.fontSize || 24,
     fontFamily: font.fontFamily || '微软雅黑'
   }, (0, _colorUtil.parseBackground)(element.s('group.title.background')));
 }

package/lib/core/hooks/useCanvasTheme.js

@@ -17,7 +17,7 @@ var themeMap = [{
   name: 'white',
   label: '白色',
   color: null,
-  toolsTheme: 'lightgrayblue'
+  toolsTheme: 'white'
 }, {
   name: 'lightblue',
   label: '蓝色',
@@ -35,11 +35,11 @@ var themeMap = [{
   name: 'dark',
   label: '深色',
   color: '#031425',
-  toolsTheme: 'black'
+  toolsTheme: 'dark'
 }, {
   name: 'poly',
   label: 'Poly',
-  toolsTheme: 'black',
+  toolsTheme: 'dark',
   backgroundImage: '/img/topo/themes/poly.png'
 }].reduce(function (map, item) {
   var _extends2;
@@ -63,7 +63,7 @@ function useCanvasTheme(props) {
     if (graphLoaded && themeConfig) {
       try {
         topo.getHtTopo().setTheme(themeName);
-        topo.getHtTopo().setToolsTheme(themeName);
+        topo.getHtTopo().setToolsTheme(themeConfig.toolsTheme);
       } catch (error) {
         console.error('切换主题失败', error);
       }

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.21" === 'string' ? "9.0.0-a.21" : null;
+var version = typeof "9.0.0-a.23" === 'string' ? "9.0.0-a.23" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/networkTopo/services/topo/basic.js

@@ -428,17 +428,17 @@ var _default = (0, _extends2["default"])({
   */
   getTopoData: function getTopoData(id) {
     return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee12() {
-      var _result$nodes, _result$links, result;
+      var _result$nodes, _result$links;
 
+      var result;
       return _regenerator["default"].wrap(function _callee12$(_context12) {
         while (1) {
           switch (_context12.prev = _context12.next) {
             case 0:
-              _context12.prev = 0;
-              _context12.next = 3;
+              _context12.next = 2;
               return _componentTopologyUtils.request.get(API_ROOT + "/structure/both/" + id);
 
-            case 3:
+            case 2:
               result = _context12.sent;
               return _context12.abrupt("return", (0, _exitLinkUtil.processExitLink)((0, _extends2["default"])({}, result, {
                 nodes: (_result$nodes = result.nodes) !== null && _result$nodes !== void 0 ? _result$nodes : [],
@@ -449,20 +449,12 @@ var _default = (0, _extends2["default"])({
                 })
               })));
 
-            case 7:
-              _context12.prev = 7;
-              _context12.t0 = _context12["catch"](0);
-
-              _rlog["default"].debug('getTopoData-error', _context12.t0);
-
-              return _context12.abrupt("return", null);
-
-            case 11:
+            case 4:
             case "end":
               return _context12.stop();
           }
         }
-      }, _callee12, null, [[0, 7]]);
+      }, _callee12);
     }))();
   },
 

package/lib/networkTopo/utils/exitLinkUtil.js

@@ -75,55 +75,69 @@ function isUniqueIp(dataModel, ip, nodeElement) {
 
 function processExitLink(topoData) {
   var nodes = topoData.nodes,
-      links = topoData.links;
-  var serialize = (0, _extends2["default"])({}, getHtSerialize(topoData.serialize));
+      links = topoData.links; // 出口链路目的端设置为IP节点或者ping资源节点id
 
-  if (!serialize) {
-    return topoData;
-  } // 历史数据升级
+  var newLinks = updateLinkTarget(links, nodes);
 
+  if (!topoData.serialize) {
+    return (0, _extends2["default"])({}, topoData, {
+      links: newLinks
+    });
+  }
+
+  var serialize = (0, _extends2["default"])({}, getHtSerialize(topoData.serialize)); // 历史数据升级
 
   links.filter(isExitLink) // 升级V1.4前配置的出口链路目的端节点为IP节点
   .forEach(function (link) {
     return upgradeExitLinkTarget(link);
-  }); // 出口链路目的端设置为IP节点或者ping资源节点id
+  }); // 历史数据适配：同IP节点关联多个不同IP的链路、分级拓扑。target匹配不到元素时，根据序列化匹配
 
-  var newLinks = links.map(function (link) {
-    if (!isExitLink(link) || link.target && nodes.find(function (node) {
-      return node.id === link.target;
-    })) {
-      return link;
-    }
+  newLinks = upgradeLinkTargetNotExisted(links); // IP节点构造为node。如果有相同ip的ping资源和图片节点，图片节点消失（不构造）
 
-    var destinationIp = link.attributes['network_link.destination_ipv4'];
-    var pingNode = findPingNode(nodes, destinationIp); // 出口链路目的端设置为IP节点或者ping资源节点id
+  var ipNodes = getIpNodes();
+  return (0, _extends2["default"])({}, topoData, {
+    nodes: [].concat(nodes, ipNodes),
+    links: newLinks,
+    serialize: serialize
+  }); // 历史数据适配：同IP节点关联多个不同IP的链路、分级拓扑。target匹配不到元素时，根据序列化匹配
+
+  function upgradeLinkTargetNotExisted(links) {
+    newLinks = links.map(function (link) {
+      if (!isExitLink(link) || link.target && nodes.find(function (node) {
+        return node.id === link.target;
+      })) {
+        return link;
+      }
 
-    var target = pingNode ? pingNode.id : "ip:" + destinationIp; // 历史数据适配：同IP节点关联多个不同IP的链路、分级拓扑。target匹配不到元素时，根据序列化匹配
+      var destinationIp = link.attributes['network_link.destination_ipv4'];
+      var pingNode = findPingNode(nodes, destinationIp); // 出口链路目的端设置为IP节点或者ping资源节点id
 
-    var targetSerialize = findElementSerializeById(serialize, target);
+      var target = link.target; // 历史数据适配：同IP节点关联多个不同IP的链路、分级拓扑。target匹配不到元素时，根据序列化匹配
 
-    if (!targetSerialize) {
-      var linkSerialize = findElementSerializeById(serialize, link.id);
+      var targetSerialize = findElementSerializeById(serialize, target);
 
-      if (linkSerialize) {
-        // 根据链路序列化数据找目的端节点
-        // eslint-disable-next-line no-underscore-dangle
-        var targetNodeSerialize = serialize.d.find(function (item) {
-          return item.i === linkSerialize.p.target.__i;
-        });
+      if (!targetSerialize) {
+        var linkSerialize = findElementSerializeById(serialize, link.id);
 
-        if (targetNodeSerialize) {
-          target = targetNodeSerialize.p.tag;
+        if (linkSerialize) {
+          // 根据链路序列化数据找目的端节点
+          // eslint-disable-next-line no-underscore-dangle
+          var targetNodeSerialize = serialize.d.find(function (item) {
+            return item.i === linkSerialize.p.target.__i;
+          });
+
+          if (targetNodeSerialize) {
+            target = targetNodeSerialize.p.tag;
+          }
         }
       }
-    }
 
-    return (0, _extends2["default"])({}, link, {
-      target: target
+      return (0, _extends2["default"])({}, link, {
+        target: target
+      });
     });
-  }); // IP节点构造为node。如果有相同ip的ping资源和图片节点，图片节点消失（不构造）
-
-  var ipNodes = getIpNodes();
+    return newLinks;
+  }
 
   function getIpNodes() {
     // 从序列化获取关联的IP
@@ -176,12 +190,6 @@ function processExitLink(topoData) {
       }
     }
   }
-
-  return (0, _extends2["default"])({}, topoData, {
-    nodes: [].concat(nodes, ipNodes),
-    links: newLinks,
-    serialize: serialize
-  });
 } // 从拓扑数据查找
 
 
@@ -189,6 +197,26 @@ function findPingNode(nodes, ip) {
   return nodes.find(function (node) {
     return node.ciType === "ping" && (node.ipAddress || node.attributes.ipv4_address) === ip;
   });
+} // 出口链路目的端设置为IP节点或者ping资源节点id
+
+
+function updateLinkTarget(links, nodes) {
+  var newLinks = links.map(function (link) {
+    if (!isExitLink(link) || link.target && nodes.find(function (node) {
+      return node.id === link.target;
+    })) {
+      return link;
+    }
+
+    var destinationIp = link.attributes['network_link.destination_ipv4'];
+    var pingNode = findPingNode(nodes, destinationIp); // 出口链路目的端设置为IP节点或者ping资源节点id
+
+    var target = pingNode ? pingNode.id : "ip:" + destinationIp;
+    return (0, _extends2["default"])({}, link, {
+      target: target
+    });
+  });
+  return newLinks;
 }
 /**
  * 编辑模式按资源查询拓扑数据处理出口链路target
@@ -213,21 +241,7 @@ function processByConditionResult(topoData) {
   } // 出口链路目的端设置为IP节点或者ping资源节点id
 
 
-  var newLinks = links.map(function (link) {
-    if (!isExitLink(link) || link.target && nodes.find(function (node) {
-      return node.id === link.target;
-    })) {
-      return link;
-    }
-
-    var destinationIp = link.attributes['network_link.destination_ipv4'];
-    var pingNode = findPingNode(nodes, destinationIp); // 出口链路目的端设置为IP节点或者ping资源节点id
-
-    var target = pingNode ? pingNode.id : "ip:" + destinationIp;
-    return (0, _extends2["default"])({}, link, {
-      target: target
-    });
-  });
+  var newLinks = updateLinkTarget(links, nodes);
   return (0, _extends2["default"])({}, topoData, {
     nodes: [].concat(nodes, ipNodes),
     links: newLinks

package/package.json

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