@riil-frontend/component-topology 2.15.19 → 2.15.22

package/lib/core/common/icons/defaultIcons.js

@@ -3,22 +3,17 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 exports.__esModule = true;
-exports["default"] = exports.DEFAULT_NODE_ICONS = void 0;
+exports.DEFAULT_NODE_ICONS = void 0;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _ciTypeIcons = require("@riil-frontend/component-topology-graph/es/icons/ciTypeIcons");
+var _componentTopologyGraph = require("@riil-frontend/component-topology-graph");
 
-function getIconImgUrlById(id) {
-  return (0, _ciTypeIcons.getIconMap)()[id];
-}
 /**
  * 资源面板图片-默认节点图标
  *
  * @type {(*|{url: *})[]}
  */
-
-
 var DEFAULT_NODE_ICONS = [{
   id: 'ciType.switch',
   name: '交换机'
@@ -52,11 +47,7 @@ var DEFAULT_NODE_ICONS = [{
   name: '互联网'
 }].map(function (item) {
   return (0, _extends2["default"])({}, item, {
-    url: getIconImgUrlById(item.id)
+    url: _componentTopologyGraph.iconFactory.getIconImageUrl(item.id)
   });
 });
-exports.DEFAULT_NODE_ICONS = DEFAULT_NODE_ICONS;
-
-var _default = (0, _extends2["default"])({}, (0, _ciTypeIcons.getIconMap)());
-
-exports["default"] = _default;
+exports.DEFAULT_NODE_ICONS = DEFAULT_NODE_ICONS;

package/lib/core/common/icons/icon.js

@@ -8,8 +8,6 @@ exports.getCustomIconIdFromHtId = getCustomIconIdFromHtId;
 exports.getEditorIcons = getEditorIcons;
 exports.getGroupDefaultIcons = getGroupDefaultIcons;
 exports.getGroupIconGroups = getGroupIconGroups;
-exports.getIconById = getIconById;
-exports.getIconMap = getIconMap;
 exports.getNodeDefaultIcons = getNodeDefaultIcons;
 exports.getNodeIconGroups = getNodeIconGroups;
 exports.getUserCustomIcons = getUserCustomIcons;
@@ -18,14 +16,10 @@ exports.transformCustomIcons2HtIcons = transformCustomIcons2HtIcons;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _defaultIcons = _interopRequireWildcard(require("./defaultIcons"));
+var _defaultIcons = require("./defaultIcons");
 
 var _networkTopoCiTypeIcons = _interopRequireDefault(require("./networkTopoCiTypeIcons"));
 
-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; }
-
 var groupDefaultIcons = [{
   id: 'editor.icon.cloud.medium',
   name: '区域',
@@ -101,14 +95,6 @@ function transformCustomIcons2HtIcons(icons) {
 function getUserCustomIcons(topo) {
   var uploadIcons = topo.store.getModelState('iconManage').icons;
   return [].concat(transformCustomIcons2HtIcons(uploadIcons.node));
-}
-
-function getIconMap(topo) {
-  var bizIconMap = {};
-  [].concat(groupDefaultIcons, getNodeDefaultIcons(topo), getUserCustomIcons(topo)).forEach(function (icon) {
-    bizIconMap[icon.id] = icon;
-  });
-  return (0, _extends2["default"])({}, _defaultIcons["default"], bizIconMap);
 } // 获得节点图标列表
 
 
@@ -130,19 +116,4 @@ function getGroupIconGroups(topo) {
     name: '自定义',
     icons: getUserCustomIcons(topo)
   }];
-}
-
-function getIconById(id, topo) {
-  var iconMap = getIconMap(topo);
-  var icon = iconMap[id];
-
-  if (typeof icon === 'string') {
-    return icon.replace('.json', '.png');
-  }
-
-  if (!icon) {
-    console.warn('图标不存在', id, iconMap);
-  }
-
-  return icon === null || icon === void 0 ? void 0 : icon.url;
 }

package/lib/core/components/TopoView/topoView.js

@@ -151,6 +151,7 @@ var TopoView = function TopoView(props) {
   (0, _react.useEffect)(function () {
     return function () {
       topoDispatchers.reset();
+      clearSelection();
     };
   }, []);
   var onGraphCreated = (0, _react.useCallback)(function (topoClient) {

package/lib/core/editor/components/settings/propertyViews/edge/CommonEdgePropertyView.js

@@ -47,9 +47,7 @@ function CommonEdgePropertyView(props) {
     onChange: function onChange(name, value) {
       var newValues = field.getValues();
 
-      if (values[name] !== value) {
-        _onChange(name, value, newValues);
-      }
+      _onChange(name, value, newValues);
     }
   });
 

package/lib/core/editor/components/settings/propertyViews/edge/edgeGroup/EdgeGroupSetting.js

@@ -38,9 +38,7 @@ function EdgeGroupSetting(props) {
     onChange: function onChange(name, value) {
       var newValues = field.getValues();
 
-      if (values[name] !== value) {
-        _onChange(name, value, newValues);
-      }
+      _onChange(name, value, newValues);
     }
   });
 

package/lib/core/editor/components/settings/propertyViews/group/DataTab/hoooks/useGroupRelateResource.js

@@ -11,12 +11,12 @@ var _react = require("react");
 
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
+var _componentTopologyGraph = require("@riil-frontend/component-topology-graph");
+
 var _sortBy = _interopRequireDefault(require("lodash/sortBy"));
 
 var _htElementUtils = require("../../../../../../../../utils/htElementUtils");
 
-var _icon = require("../../../../../../../common/icons/icon");
-
 function sortResourcesByName(resources) {
   return (0, _sortBy["default"])(resources, 'name');
 }
@@ -41,7 +41,7 @@ function useGroupRelateResource(props) {
   })).map(function (item) {
     return {
       title: item.name,
-      img: (0, _icon.getIconById)(item.image, topo),
+      img: _componentTopologyGraph.iconFactory.getIconImageUrl(item.image),
       data: item,
       node: item.node
     };

package/lib/core/editor/components/settings/propertyViews/group/SettingTab/Setting.js

@@ -53,9 +53,7 @@ function GroupSetting(props) {
 
       var newValues = field.getValues();
 
-      if (values[name] !== value) {
-        _onChange(name, value, newValues);
-      }
+      _onChange(name, value, newValues);
     }
   });
 
@@ -115,7 +113,8 @@ function GroupSetting(props) {
     }
   }), /*#__PURE__*/_react["default"].createElement(_input["default"], {
     name: "attrObject.name",
-    maxLength: 30
+    maxLength: 30,
+    placeholder: "\u8BF7\u8F93\u5165"
   })), expanded ? /*#__PURE__*/_react["default"].createElement(_GroupExpandSetting["default"], {
     group: group,
     expanded: expanded,

package/lib/core/editor/components/settings/propertyViews/layer/DataTab/NodeList.js

@@ -5,18 +5,14 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports["default"] = LayerResourceList;
 
-var _react = _interopRequireWildcard(require("react"));
+var _react = _interopRequireDefault(require("react"));
+
+var _componentTopologyGraph = require("@riil-frontend/component-topology-graph");
 
 var _ResourceList = _interopRequireDefault(require("../../../common/GroupNodeList/ResourceList"));
 
 var _htElementUtils = require("../../../../../../../utils/htElementUtils");
 
-var _icon = require("../../../../../../common/icons/icon");
-
-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; }
-
 /**
  * 分层关联资源列表
  */
@@ -30,7 +26,7 @@ function LayerResourceList(props) {
   var data = relateDataNodes.map(function (node) {
     return {
       title: node.a('name'),
-      img: (0, _icon.getIconById)(node.getImage(), topo)
+      img: _componentTopologyGraph.iconFactory.getIconImageUrl(node.getImage())
     };
   });
   return /*#__PURE__*/_react["default"].createElement(_ResourceList["default"], {

package/lib/core/editor/components/settings/propertyViews/layer/SettingTab/Setting.js

@@ -43,11 +43,10 @@ function LayerSettingTab(props) {
         return;
       }
 
+      console.error(values[name], value);
       var newValues = field.getValues();
 
-      if (values[name] !== value) {
-        _onChange(name, value, newValues);
-      }
+      _onChange(name, value, newValues);
     }
   });
 
@@ -76,7 +75,8 @@ function LayerSettingTab(props) {
     }
   }), /*#__PURE__*/_react["default"].createElement(_input["default"], {
     name: "styleMap.label",
-    maxLength: 30
+    maxLength: 30,
+    placeholder: "\u8BF7\u8F93\u5165"
   })), /*#__PURE__*/_react["default"].createElement(_form["default"].Item, null, /*#__PURE__*/_react["default"].createElement(_collapse["default"], {
     defaultExpandedKeys: ['图片', '对齐方式', '线形'],
     style: {

package/lib/core/editor/components/settings/propertyViews/multipleElements/MultipleElementPropertyView.js

@@ -47,9 +47,7 @@ function MultipleElementPropertyView(props) {
     onChange: function onChange(name, value) {
       var newValues = field.getValues();
 
-      if (values[name] !== value) {
-        _onChange(name, value, newValues);
-      }
+      _onChange(name, value, newValues);
     }
   });
 

package/lib/core/editor/components/settings/propertyViews/node/NodePropertyView.js

@@ -83,9 +83,7 @@ function NodePropertyView(props) {
     onChange: function onChange(name, value) {
       var newValues = field.getValues();
 
-      if (values[name] !== value) {
-        _onChange(name, value, newValues);
-      }
+      _onChange(name, value, newValues);
     }
   });
 

package/lib/core/editor/components/settings/propertyViews/node/data/BindResourceDrawer.js

@@ -34,6 +34,7 @@ var BindResourceDrawer = function BindResourceDrawer(props) {
 
   var handleSave = /*#__PURE__*/function () {
     var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(selected) {
+      var result;
       return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
@@ -56,6 +57,10 @@ var BindResourceDrawer = function BindResourceDrawer(props) {
               });
 
             case 5:
+              result = _context.sent;
+              return _context.abrupt("return", result);
+
+            case 7:
             case "end":
               return _context.stop();
           }

package/lib/core/editor/components/settings/propertyViews/text/TextPropertyView.js

@@ -65,15 +65,13 @@ function TextPropertyView(props) {
         return;
       }
 
-      if (values[name] !== value) {
-        if (name === 'styleMap.text' && !value) {
-          _onChange(name, DEFAULT_TEXT_VALUE, newValues);
+      if (name === 'styleMap.text' && !value) {
+        _onChange(name, DEFAULT_TEXT_VALUE, newValues);
 
-          return;
-        }
-
-        _onChange(name, value, newValues);
+        return;
       }
+
+      _onChange(name, value, newValues);
     }
   });
 

package/lib/core/models/TopoApp.js

@@ -48,7 +48,7 @@ var _PluginManager = _interopRequireDefault(require("./PluginManager"));
 var _topoFactory = _interopRequireDefault(require("./topoFactory"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "2.15.19" === 'string' ? "2.15.19" : null;
+var version = typeof "2.15.22" === 'string' ? "2.15.22" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/core/models/utils/linkUtils.js

@@ -5,6 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports.buildTopoLinkData = buildTopoLinkData;
 exports.getLinksDetail = getLinksDetail;
+exports.isAggLink = isAggLink;
 exports.mergeLinksData = mergeLinksData;
 
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
@@ -28,6 +29,10 @@ var interfaceTypeMap = {
   }
 };
 
+function isAggLink(link) {
+  return link.attributes['network_link.connect_type'] === 'agg';
+}
+
 function mergeLinksData(links, linkCis, nodes, interfaceCis) {
   var linkCiMap = (0, _keyBy["default"])(linkCis, 'id');
   return links.map(function (link) {

package/lib/core/viewer/components/plugins/BaseInfo/components/ResourceOverview/index.js

@@ -51,12 +51,13 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 // 基本信息
 function BaseInfoRender(type, data) {
+  var _itemCols$type;
+
   var itemCols = {
     node: [{
       label: '资源名称：',
       objKey: 'resource',
       render: function render(valueData, key) {
-        console.log('资源名称：', valueData, key);
         var display_name = valueData.display_name,
             link = valueData.link;
         return /*#__PURE__*/_react["default"].createElement("div", {
@@ -111,7 +112,7 @@ function BaseInfoRender(type, data) {
   };
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: _indexModule["default"]['base-info']
-  }, itemCols[type].map(function (_ref, key) {
+  }, (_itemCols$type = itemCols[type]) === null || _itemCols$type === void 0 ? void 0 : _itemCols$type.map(function (_ref, key) {
     var label = _ref.label,
         objKey = _ref.objKey,
         style = _ref.style,

package/lib/core/viewer/components/plugins/BaseInfo/index.js

@@ -123,8 +123,11 @@ function BaseInfo(props) {
       userId = _useState4[0],
       setUserId = _useState4[1];
 
+  var _useState5 = (0, _react.useState)(null),
+      paramData = _useState5[0],
+      setParamData = _useState5[1];
+
   (0, _react.useEffect)(function () {
-    getUser();
     var notifier = topo.view.topoClient.notifier;
     notifier.on(_componentTopologyGraph.TopoEvent.EVENT_DOUBLE_CLICK, openOverview);
     notifier.on('topo_element_click', changeOverview);
@@ -140,12 +143,51 @@ function BaseInfo(props) {
   }, []); // 解决切换拓扑图隐藏概览
 
   (0, _react.useEffect)(function () {
-    setVisible(false); // TODO 其他数据重置
+    setVisible(false);
+    setParamData(null); // TODO 其他数据重置
   }, [topoId]);
 
   function getUser() {
     return _getUser.apply(this, arguments);
-  }
+  } // function changeOverview (node) {
+  //   const data = node.getAttrObject()
+  //   console.log('单击切换基本信息', data);
+  //   setVisible(prev => {
+  //     prev && openOverview(data)
+  //     return prev
+  //   })
+  // }
+  // function openOverview (data) {
+  //   console.log('双击打开基本信息', data);
+  //   const {
+  //     id,
+  //     name,
+  //     type,
+  //     ciType,
+  //     ciName,
+  //     operation,
+  //   } = data
+  //   // 仅展示资源和链路的概览
+  //   if (!['node', 'link', 'linkGroup'].includes(type)) return
+  //   // 应用拓扑中没有链路详情
+  //   if (topo.options.resourceOverviewDrawer?.getData && type === 'link') return
+  //   // 没有权限不显示
+  //   if (!operation) return
+  //   setActiveData({
+  //     id,
+  //     name,
+  //     type: type === 'linkGroup' ? 'link' : type,
+  //     ciType,
+  //     ciName
+  //   })
+  //   const { metrics } = topo.ciTyeCache.getCiType(ciType)
+  //   topoDispatchers.update({
+  //     id,
+  //     metricCodes: metrics.slice(0, 6).map(item => item.code), // 需要展示的关键指标 code
+  //   })
+  //   setVisible(true)
+  // }
+
 
   function _getUser() {
     _getUser = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
@@ -171,25 +213,41 @@ function BaseInfo(props) {
     return _getUser.apply(this, arguments);
   }
 
+  function onChangeActive(activeNode) {
+    console.log('切换基本信息资源', activeNode);
+    activeNode && openOverview((0, _extends2["default"])({}, activeNode, {
+      type: 'node'
+    }));
+  }
+
+  (0, _react.useEffect)(function () {
+    (visible || (paramData === null || paramData === void 0 ? void 0 : paramData.isVisible)) && paramData && init(paramData);
+  }, [paramData, visible]);
+
   function changeOverview(node) {
     var data = node.getAttrObject();
     console.log('单击切换基本信息', data);
-    setVisible(function (prev) {
-      prev && openOverview(data);
-      return prev;
-    });
+    setParamData(data);
   }
 
   function openOverview(data) {
+    console.log('双击打开基本信息', data);
+    setParamData((0, _extends2["default"])({}, data, {
+      isVisible: true
+    }));
+  }
+
+  function init(data) {
     var _topo$options$resourc;
 
-    console.log('双击打开基本信息', data);
+    console.log('初始化基本信息', data);
     var id = data.id,
         name = data.name,
         type = data.type,
         ciType = data.ciType,
         ciName = data.ciName,
-        operation = data.operation; // 仅展示资源和链路的概览
+        operation = data.operation,
+        isVisible = data.isVisible; // 仅展示资源和链路的概览
 
     if (!['node', 'link', 'linkGroup'].includes(type)) return; // 应用拓扑中没有链路详情
 
@@ -213,15 +271,11 @@ function BaseInfo(props) {
         return item.code;
       }) // 需要展示的关键指标 code
 
-    });
-    setVisible(true);
-  }
+    }); // 显示隐藏
 
-  function onChangeActive(activeNode) {
-    console.log('切换基本信息资源', activeNode);
-    activeNode && openOverview((0, _extends2["default"])({}, activeNode, {
-      type: 'node'
-    }));
+    isVisible && setVisible(true); // userId
+
+    userId || getUser();
   }
 
   return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_drawer["default"], {

package/lib/hooks/useTopoEdit.js

@@ -852,7 +852,7 @@ var useTopoEdit = function useTopoEdit(params) {
 
   var bindNodeResource = /*#__PURE__*/function () {
     var _ref6 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee7(params) {
-      var id, oldResId, newResId, node, groupElement, config, groupId, groupTag, _yield$editDispatcher, elements, nodeRelatedData, replaceOrAddRes;
+      var id, oldResId, newResId, node, groupElement, config, groupId, groupTag, _yield$editDispatcher, elements, nodeRelatedDatas, replaceOrAddRes;
 
       return _regenerator["default"].wrap(function _callee7$(_context7) {
         while (1) {
@@ -881,7 +881,7 @@ var useTopoEdit = function useTopoEdit(params) {
 
                 groupTag = groupElement.a('tag'); // 容器临时id
 
-                config.groups = groups.map(function (g) {
+                config.groups = config.groups.map(function (g) {
                   // 匹配到容器，替换资源或增加
                   if (g.id === groupId || g.tag === groupTag) {
                     return (0, _extends2["default"])({}, g, {
@@ -908,15 +908,26 @@ var useTopoEdit = function useTopoEdit(params) {
               _yield$editDispatcher = _context7.sent;
               elements = _yield$editDispatcher.topoDataTrans;
               // 过滤出关联的节点和连线，通知ht更新
-              nodeRelatedData = (0, _format.filterElementsByNodeId)(elements, newResId);
-              saveBind(_componentTopologyGraph.TopoEvent.DATA_TYPE_RESOURCE_SINGLE, nodeRelatedData);
+              nodeRelatedDatas = (0, _format.filterElementsByNodeId)(elements, newResId);
+
+              if (nodeRelatedDatas.length) {
+                _context7.next = 17;
+                break;
+              }
+
+              _message["default"].error('关联资源失败');
+
+              return _context7.abrupt("return", false);
+
+            case 17:
+              saveBind(_componentTopologyGraph.TopoEvent.DATA_TYPE_RESOURCE_SINGLE, nodeRelatedDatas);
               node.a('customName', null); // 临时放这里，仅拓扑中心有
 
               if (topo.linkDynamicStyleExecutor) {
                 topo.linkDynamicStyleExecutor.execute();
               }
 
-            case 17:
+            case 20:
             case "end":
               return _context7.stop();
           }

package/lib/index.js

@@ -4,13 +4,24 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 
 exports.__esModule = true;
 var _exportNames = {
-  Topology: true
+  iconFactory: true,
+  Topology: true,
+  htElementUtils: true
 };
+exports.htElementUtils = void 0;
+
+var _componentTopologyGraph = require("@riil-frontend/component-topology-graph");
+
+exports.iconFactory = _componentTopologyGraph.iconFactory;
 
 var _TopoView = _interopRequireDefault(require("./core/components/TopoView"));
 
 exports.Topology = _TopoView["default"];
 
+var htElementUtils = _interopRequireWildcard(require("./utils/htElementUtils"));
+
+exports.htElementUtils = htElementUtils;
+
 var _createTopo = require("./createTopo");
 
 Object.keys(_createTopo).forEach(function (key) {
@@ -27,4 +38,8 @@ Object.keys(_titlebar).forEach(function (key) {
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _titlebar[key]) return;
   exports[key] = _titlebar[key];
-});
+});
+
+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; }

package/lib/topoCenter/components/editor/propertyViews/LayerRelatedResourceList.js

@@ -7,14 +7,12 @@ exports["default"] = LayerResourceList;
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyGraph = require("@riil-frontend/component-topology-graph");
 
 var _ResourceList = _interopRequireDefault(require("../../../../core/editor/components/settings/common/GroupNodeList/ResourceList"));
 
 var _htElementUtils = require("../../../../utils/htElementUtils");
 
-var _icon = require("../../../../core/common/icons/icon");
-
 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; }
@@ -53,7 +51,7 @@ function LayerResourceList(props) {
         resource = _ref.resource;
     return {
       title: resource.name,
-      img: (0, _icon.getIconById)(node.getImage(), topo)
+      img: _componentTopologyGraph.iconFactory.getIconImageUrl(node.getImage())
     };
   }); // rlog.debug('LayerResourceList', {nodes, resourceNodes, data});
 

package/lib/topoCenter/components/editor/propertyViews/edge/LinkPropertyView/Setting/index.js

@@ -38,9 +38,7 @@ function LinkSetting(props) {
     onChange: function onChange(name, value) {
       var newValues = field.getValues();
 
-      if (values[name] !== value) {
-        _onChange(name, value, newValues);
-      }
+      _onChange(name, value, newValues);
     }
   });