@riil-frontend/component-topology 5.0.5 → 5.0.7

package/es/networkTopo/components/editor/propertyViews/edge/addLinkDrawer/components/editLinkInfo.js

@@ -234,9 +234,8 @@ export default function EditLinkInfo(props) {
           obj['destination_id'] = ''; // 目的端口
 
           obj['destination_type'] = 'ip';
-        }
+        } // console.log('保存数据-obj', obj);
 
-        console.log('保存数据-obj', obj);
 
         if (isAdd) {
           obj['network_link.network_category'] = 'CAN';

package/es/networkTopo/components/editor/propertyViews/edge/addLinkDrawer/server.js

@@ -93,27 +93,27 @@ export default {
                 currentPage: 1,
                 pageSize: 9999
               };
-              jsonParm = JSON.stringify(parm);
-              console.log("查询当前节点关联的链路", parm, jsonParm);
-              _context3.prev = 4;
-              _context3.next = 7;
+              jsonParm = JSON.stringify(parm); // console.log("查询当前节点关联的链路",  parm, jsonParm);
+
+              _context3.prev = 3;
+              _context3.next = 6;
               return request.post("/mdc/v1/api/cmdb/commonQueryCiData", jsonParm);
 
-            case 7:
+            case 6:
               result = _context3.sent;
               return _context3.abrupt("return", result);
 
-            case 11:
-              _context3.prev = 11;
-              _context3.t0 = _context3["catch"](4);
+            case 10:
+              _context3.prev = 10;
+              _context3.t0 = _context3["catch"](3);
               rlog.error("查询可关联链路", _context3.t0);
 
-            case 14:
+            case 13:
             case "end":
               return _context3.stop();
           }
         }
-      }, _callee3, null, [[4, 11]]);
+      }, _callee3, null, [[3, 10]]);
     }))();
   },
 

package/es/networkTopo/components/editor/propertyViews/edge/link/BindExitLinkSelect.js

@@ -67,7 +67,12 @@ export default function BindExitLinkSelect(props) {
   }();
 
   useEffect(function () {
-    console.log("CommonEdgePropertyView-edge", edge, edge.getSource().getTag(), edge.getTarget());
+    // console.log(
+    //   "CommonEdgePropertyView-edge",
+    //   edge,
+    //   edge.getSource().getTag(),
+    //   edge.getTarget()
+    // );
     var ids = [edge.getSource().getTag(), edge.getTarget().getTag()];
     getLinkByNodes(ids);
   }, [edge]);
@@ -123,13 +128,19 @@ export default function BindExitLinkSelect(props) {
 
               aobj = edge.getAttrObject();
               edge.setAttrObject(_extends({}, aobj, exitLink));
-              edge.setTag(data.id);
-              console.log("bindExitLink------------", target, target.getTag(), data["network_link.destination_ipv4"], exitLink);
+              edge.setTag(data.id); // console.log(
+              //   "bindExitLink------------",
+              //   target,
+              //   target.getTag(),
+              //   data["network_link.destination_ipv4"],
+              //   exitLink
+              // );
+
               rlog.debug("fetchDataByConfig", elements);
               setLoading(false);
               topo.historyManager.endTransaction();
 
-            case 24:
+            case 23:
             case "end":
               return _context2.stop();
           }

package/es/networkTopo/models/LinkDynamicStyleExecutor.js

@@ -89,7 +89,7 @@ var LinkDynamicStyleExecutor = /*#__PURE__*/function () {
           edgeGroup.getEdgeGroupAgent().s('edge.width', _this.calcLinkEdgeWidth(link));
         }
       } else {
-        console.warn('未找到聚合链路的ht元素', link);
+        rlog.warn('动态链路样式执行：未找到聚合链路的ht元素', link);
       }
     }); // 3、如果连线组未关联链路并可见，设置线宽。
 

package/es/networkTopo/services/link.js

@@ -168,27 +168,27 @@ export default {
                 currentPage: 1,
                 pageSize: 99
               };
-              jsonParm = JSON.stringify(parm);
-              console.log("queryAssociatedlinks", ids, parm, jsonParm);
-              _context5.prev = 7;
-              _context5.next = 10;
+              jsonParm = JSON.stringify(parm); // console.log("queryAssociatedlinks", ids, parm, jsonParm);
+
+              _context5.prev = 6;
+              _context5.next = 9;
               return request.post("/mdc/v1/api/cmdb/commonQueryCiData", jsonParm);
 
-            case 10:
+            case 9:
               result = _context5.sent;
               return _context5.abrupt("return", result);
 
-            case 14:
-              _context5.prev = 14;
-              _context5.t0 = _context5["catch"](7);
+            case 13:
+              _context5.prev = 13;
+              _context5.t0 = _context5["catch"](6);
               rlog.error("查询可关联链路", _context5.t0);
 
-            case 17:
+            case 16:
             case "end":
               return _context5.stop();
           }
         }
-      }, _callee5, null, [[7, 14]]);
+      }, _callee5, null, [[6, 13]]);
     }))();
   }
 };

package/es/utils/topoData.js

@@ -501,8 +501,8 @@ export function getCiModSet(params) {
         icon: ciTypeObj.icon,
         list: ciModfilter(ciTypeObj, globalConfig, "node", ciTypeObj.code)
       };
-    });
-    console.log("modSet--------------------", modSet);
+    }); // console.log("modSet--------------------", modSet);
+
     return modSet;
   }
 

package/lib/components/BatchAttrMetric/setting.js

@@ -121,7 +121,7 @@ var Setting = function Setting(_ref) {
   var tableData = (0, _react.useMemo)(function () {
     var _allCiSet$ciType;
 
-    console.log('allCiSet,ciType,search', allCiSet, ciType, search);
+    // console.log('allCiSet,ciType,search', allCiSet, ciType, search);
     var list = ((_allCiSet$ciType = allCiSet[ciType]) === null || _allCiSet$ciType === void 0 ? void 0 : _allCiSet$ciType.list) || [];
 
     if (search) {
@@ -136,7 +136,7 @@ var Setting = function Setting(_ref) {
   }, [allCiSet, ciType, search]);
 
   function onSearch(value) {
-    console.log('search', search);
+    // console.log('search', search);
     setSearch(value);
   }
 

package/lib/core/components/DisplaySettingDrawer/demo/Demo.js

@@ -59,11 +59,9 @@ function Demo() {
     ,
     limit: 3 // 单个模板最大可选择选项数量
     ,
-    onChange: function onChange(value) {
-      console.log('onChange');
+    onChange: function onChange(value) {// console.log('onChange');
     },
-    onCancel: function onCancel() {
-      console.log('onCancel');
+    onCancel: function onCancel() {// console.log('onCancel');
     },
     showType: "tip" // 数据类型。
 

package/lib/core/components/DisplaySettingDrawer/hooks/useDisplaySetting.js

@@ -47,19 +47,19 @@ var _default = function _default(props) {
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
-              values = settingRef.current.getValues();
-              console.info('保存显示配置', values); // 保存配置
+              values = settingRef.current.getValues(); // console.info('保存显示配置', values)
+              // 保存配置
 
               prevDisplayConfig = topo.store.getModelState('displayConfig');
               displayConfig = (0, _extends2["default"])({}, prevDisplayConfig, values);
-              _context2.next = 6;
+              _context2.next = 5;
               return _topo["default"].saveTopoSettings(topo.id, {
                 alarmSwitch: displayConfig.alarmSwitch,
                 alarmListDefaultOpen: displayConfig.alarmListDefaultOpen,
                 extraConfig: JSON.stringify((0, _extends2["default"])({}, displayConfig))
               });
 
-            case 6:
+            case 5:
               // 刷新指标配置
               displayConfigDispatchers = topo.store.getModelDispatchers('displayConfig');
               displayConfigDispatchers.update(displayConfig); // 按配置执行
@@ -71,7 +71,7 @@ var _default = function _default(props) {
                 extraOnOk(displayConfig);
               }
 
-            case 11:
+            case 10:
             case "end":
               return _context2.stop();
           }

package/lib/core/editor/components/BackgroundView/index.js

@@ -64,8 +64,8 @@ function List(props) {
 
             case 3:
               canDelete = _context.sent;
-              console.log('canDelete', canDelete);
 
+              // console.log('canDelete', canDelete);
               if (canDelete) {
                 _dialog["default"].confirm({
                   title: '删除',
@@ -89,7 +89,7 @@ function List(props) {
                 });
               }
 
-            case 6:
+            case 5:
             case "end":
               return _context.stop();
           }

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

@@ -64,13 +64,7 @@ function Settings(props) {
   var updateElementProperty = function updateElementProperty(name, value) {
     // const element = topo.getDataModel().getDataById(selection[0].id);
     var gv = topo.view.topoClient.getGraphView();
-    var element = topo.getSelectionModel().getFirstData();
-    console.info("updateElementProperty", topo.getSelectionModel().getSelection(), {
-      selection: selection,
-      element: element,
-      name: name,
-      value: value
-    });
+    var element = topo.getSelectionModel().getFirstData(); // console.info("updateElementProperty",topo.getSelectionModel().getSelection(), { selection, element, name, value });
 
     if (name.startsWith("attrObject.")) {
       element.setAttr(name.replace("attrObject.", ""), value);
@@ -87,9 +81,13 @@ function Settings(props) {
     } else if (name === "image") {
       element.setImage(value);
     } else if (name === "layout") {
-      console.info("element----layout", element, value);
-      var layouType = value.id === "toward" ? "" + value.id + value.options.subId : value.id;
-      console.info("element----layout", topo.view.topoClient.htTopoClient, layouType);
+      // console.info("element----layout", element, value);
+      var layouType = value.id === "toward" ? "" + value.id + value.options.subId : value.id; // console.info(
+      //   "element----layout",
+      //   topo.view.topoClient.htTopoClient,
+      //   layouType
+      // );
+
       topo.getHtTopo().layoutInContainer(layouType); // let autoLayout = new ht.layout.AutoLayout(gv);
       // const layouType=value.id==='toward'?`${value.id}${value.options.subId}`:value.id;
       // gv.dm().sm().ss(element.getChildren());
@@ -115,9 +113,9 @@ function Settings(props) {
         }
       } else {
         selectList = topo.getSelectionModel().getSelection().toArray();
-      }
+      } // console.info("element--selectList", element, selectList);
+
 
-      console.info("element--selectList", element, selectList);
       topo.view.topoClient.htTopoClient.setAlignmentBySelectionNodes(value, selectList);
     }
   };

package/lib/core/editor/components/settings/common/AlignSetting/index.js

@@ -65,7 +65,7 @@ var AlignSetting = function AlignSetting(props) {
       setValue = _useState[1];
 
   var handleChange = function handleChange(data) {
-    console.log("handleChange", data);
+    // console.log("handleChange", data);
     onChange && onChange(data.value);
     setValue(data.value); // setValue(data)
   };

package/lib/core/editor/components/settings/common/LineType/index.js

@@ -102,7 +102,7 @@ var LineType = function LineType(props) {
   };
 
   var handleChange = function handleChange(data) {
-    console.log("handleChange", data);
+    // console.log("handleChange", data);
     topo.historyManager.beginTransaction();
 
     if (onChange) {

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

@@ -132,7 +132,7 @@ function Setting(props) {
   }, [values]);
 
   var alignOnChange = function alignOnChange(v) {
-    console.log("setAlignmentBySelectionNodes", v);
+    // console.log("setAlignmentBySelectionNodes", v);
     topo.view.topoClient.htTopoClient.setAlignmentBySelectionNodes(v);
 
     _onChange("groupAlign", v); // topoEditApi.setAlignmentBySelectionNodes(v);

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

@@ -12,16 +12,20 @@ var _htElementUtils = require("../../../../../../utils/htElementUtils");
 var _NodeIconSelect = _interopRequireDefault(require("../node/NodeIconSelect"));
 
 function BatchSetNodeIcon(props) {
-  var topo = props.topo;
+  var topo = props.topo; // 节点及折叠的区域可设置图标
 
   var setNodeIcon = function setNodeIcon(iconId) {
     topo.historyManager.beginTransaction();
     var selection = topo.getSelectionModel().getSelection().toArray();
     var nodes = selection.filter(function (element) {
-      return (0, _htElementUtils.isNode)(element) && !(0, _htElementUtils.isGroup)(element);
+      return (0, _htElementUtils.isNode)(element);
     });
     nodes.forEach(function (node) {
-      node.setImage(iconId);
+      if ((0, _htElementUtils.isGroup)(node) && !node.isExpanded()) {
+        node.setImage(iconId);
+      } else if (!(0, _htElementUtils.isGroup)(node)) {
+        node.setImage(iconId);
+      }
     });
     topo.historyManager.endTransaction();
   };

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

@@ -58,7 +58,7 @@ function MultipleElementPropertyView(props) {
   }, [values]);
 
   var alignOnChange = function alignOnChange(v) {
-    console.log('setAlignmentBySelectionNodes', v);
+    // console.log('setAlignmentBySelectionNodes', v);
     topo.historyManager.beginTransaction();
     topo.getHtTopo().setAlignmentBySelectionNodes(v);
 

package/lib/core/editor/components/settings/propertyViews/view/GlobalLayout.js

@@ -24,7 +24,7 @@ function GlobalLayout(props) {
       setLayout = _useState[1];
 
   var onChange = function onChange(data) {
-    console.log("handleChange", data);
+    // console.log("handleChange", data);
     topo.historyManager.beginTransaction();
     setLayout(data);
     var layouType = data.id === "toward" ? "" + data.id + data.options.subId : data.id;

package/lib/core/hooks/useTopoEdit.js

@@ -596,17 +596,17 @@ var useTopoEdit = function useTopoEdit(params) {
         while (1) {
           switch (_context14.prev = _context14.next) {
             case 0:
-              console.log("关联视图的资源", data);
+              // console.log("关联视图的资源", data);
               config = resourceConfig.getConfig();
               config.resources = data;
-              _context14.next = 5;
+              _context14.next = 4;
               return resourceConfig.updateConfig(config);
 
-            case 5:
-              _context14.next = 7;
+            case 4:
+              _context14.next = 6;
               return editDispatchers.fetchDataByConfig();
 
-            case 7:
+            case 6:
               _yield$editDispatcher3 = _context14.sent;
               elements = _yield$editDispatcher3.elements;
               saveBind(_componentTopologyGraph.TopoEvent.DATA_TYPE_RESOURCE_COMBO, elements); // 临时放这里，仅拓扑中心有
@@ -615,7 +615,7 @@ var useTopoEdit = function useTopoEdit(params) {
                 topo.linkDynamicStyleExecutor.execute();
               }
 
-            case 11:
+            case 10:
             case "end":
               return _context14.stop();
           }

package/lib/core/models/Alarm.js

@@ -375,13 +375,13 @@ var Alarm = /*#__PURE__*/function () {
         while (1) {
           switch (_context5.prev = _context5.next) {
             case 0:
-              console.log("switchAlarmPopPanel", flag);
+              // console.log("switchAlarmPopPanel", flag);
               topoDispatchers = this.topo.store.getModelDispatchers("topoAlarm");
               topoDispatchers.update({
                 alarmPanelIsOpen: flag
               });
 
-            case 3:
+            case 2:
             case "end":
               return _context5.stop();
           }
@@ -584,11 +584,10 @@ var Alarm = /*#__PURE__*/function () {
               resAndMetrics = this.topo.store.getState().topoMod.resAndMetrics;
               resIdsList = resAndMetrics.resIdsList, nodeIdsList = resAndMetrics.nodeIdsList, linkIdsList = resAndMetrics.linkIdsList;
               alarmDispatchers = this.topo.store.getModelDispatchers("topoAlarm"); // 添加事件
-
-              console.log("handleAlarmEvent-接收到推送的原始告警信息", alertData);
+              // console.log("handleAlarmEvent-接收到推送的原始告警信息", alertData);
 
               if (!((0, _utils.isAvailableArray)(alertData) && (0, _utils.isAvailableArray)(resIdsList))) {
-                _context9.next = 25;
+                _context9.next = 24;
                 break;
               }
 
@@ -623,19 +622,19 @@ var Alarm = /*#__PURE__*/function () {
               }); // rlog.debug("before-combAlarmData", al, bizState);
 
               if (!(sendAl.length > 0)) {
-                _context9.next = 25;
+                _context9.next = 24;
                 break;
               }
 
               _rlog["default"].debug("过滤掉非本拓扑的告警信息 告警开关-推送告警到ht-alarmIsOpened-sendAl", alarmIsOpened, sendAl);
 
-              _context9.prev = 13;
-              _context9.next = 16;
+              _context9.prev = 12;
+              _context9.next = 15;
               return alarmDispatchers.combAlarmData({
                 alarmdata: sendAl
               });
 
-            case 16:
+            case 15:
               _yield$alarmDispatche = _context9.sent;
               eqFlag = _yield$alarmDispatche.eqFlag;
               alarmlist = _yield$alarmDispatche.alarmlist;
@@ -654,21 +653,21 @@ var Alarm = /*#__PURE__*/function () {
                 }
               }
 
-              _context9.next = 25;
+              _context9.next = 24;
               break;
 
-            case 22:
-              _context9.prev = 22;
-              _context9.t0 = _context9["catch"](13);
+            case 21:
+              _context9.prev = 21;
+              _context9.t0 = _context9["catch"](12);
 
               _rlog["default"].error("告警发送异常", _context9.t0);
 
-            case 25:
+            case 24:
             case "end":
               return _context9.stop();
           }
         }
-      }, _callee9, this, [[13, 22]]);
+      }, _callee9, this, [[12, 21]]);
     }));
 
     function handleAlarmEvent(_x7) {

package/lib/core/models/TopoApp.js

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

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

@@ -29,7 +29,7 @@ var _default = {
   // 定义改变该模型状态的纯函数
   reducers: {
     update: function update(prevState, payload) {
-      console.log('payload', payload);
+      // console.log('payload', payload);
       return (0, _extends2["default"])({}, prevState, payload);
     }
   },

package/lib/core/viewer/components/plugins/ResourceDetail/ResourceDetailDrawer.js

@@ -106,8 +106,8 @@ function ResourceDetailDrawer(props) {
           switch (_context2.prev = _context2.next) {
             case 0:
               setUserId(function (prev) {
-                console.log('获取用户id', prev); // 如果已经获取过，就不再重新获取
-
+                // console.log('获取用户id', prev);
+                // 如果已经获取过，就不再重新获取
                 if (!prev) {
                   (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
                     var res;
@@ -168,7 +168,7 @@ function ResourceDetailDrawer(props) {
   }
 
   function init(data, targetType) {
-    console.log('初始化基本信息', data, targetType);
+    // console.log('初始化基本信息', data, targetType);
     var id = data.id,
         name = data.name,
         type = data.type,