@riil-frontend/component-topology 3.5.0-a.9 → 3.5.2

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

@@ -1,7 +1,7 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import topoService from "@riil-frontend/component-topology-common/es/services/topo";
-import { request } from '@riil-frontend/component-topology-utils';
+import { request } from "@riil-frontend/component-topology-utils";
 import rlog from "@riil-frontend/component-topology-utils/es/rlog";
 export default {
   /**
@@ -75,45 +75,54 @@ export default {
   },
 
   /**
-   * 新建/编辑链路
+   * 查询当前节点关联的链路
    *
-   * @param {array} ciIds
+   * @param {array} ciId
    */
-  editLink: function editLink(parm) {
+  queryLinksByNodeId: function queryLinksByNodeId(ciId) {
     return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
-      var result;
+      var condition, parm, jsonParm, result;
       return _regeneratorRuntime.wrap(function _callee3$(_context3) {
         while (1) {
           switch (_context3.prev = _context3.next) {
             case 0:
-              _context3.prev = 0;
-              _context3.next = 3;
-              return request.put("/topo/v1/api/networkLink", parm);
+              condition = "type('network_link') && (network_link.source_device_id='" + ciId + "' || network_link.destination_device_id='" + ciId + "')";
+              parm = {
+                condition: condition,
+                sort: "name asc",
+                currentPage: 1,
+                pageSize: 9999
+              };
+              jsonParm = JSON.stringify(parm);
+              console.log("查询当前节点关联的链路", parm, jsonParm);
+              _context3.prev = 4;
+              _context3.next = 7;
+              return request.post("/mdc/v1/api/cmdb/commonQueryCiData", jsonParm);
 
-            case 3:
+            case 7:
               result = _context3.sent;
               return _context3.abrupt("return", result);
 
-            case 7:
-              _context3.prev = 7;
-              _context3.t0 = _context3["catch"](0);
-              rlog.error("编辑链路", _context3.t0);
+            case 11:
+              _context3.prev = 11;
+              _context3.t0 = _context3["catch"](4);
+              rlog.error("查询可关联链路", _context3.t0);
 
-            case 10:
+            case 14:
             case "end":
               return _context3.stop();
           }
         }
-      }, _callee3, null, [[0, 7]]);
+      }, _callee3, null, [[4, 11]]);
     }))();
   },
 
   /**
-   * 删除链路
+   * 新建/编辑链路
    *
    * @param {array} ciIds
    */
-  deleteLink: function deleteLink(id) {
+  editLink: function editLink(parm) {
     return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
       var result;
       return _regeneratorRuntime.wrap(function _callee4$(_context4) {
@@ -122,7 +131,7 @@ export default {
             case 0:
               _context4.prev = 0;
               _context4.next = 3;
-              return request["delete"]("/topo/v1/api/networkLink/{" + id + "}");
+              return request.put("/topo/v1/api/networkLink", parm);
 
             case 3:
               result = _context4.sent;
@@ -131,7 +140,7 @@ export default {
             case 7:
               _context4.prev = 7;
               _context4.t0 = _context4["catch"](0);
-              rlog.error("删除链路", _context4.t0);
+              rlog.error("编辑链路", _context4.t0);
 
             case 10:
             case "end":
@@ -140,5 +149,39 @@ export default {
         }
       }, _callee4, null, [[0, 7]]);
     }))();
+  },
+
+  /**
+   * 删除链路
+   *
+   * @param {array} ciIds
+   */
+  deleteLink: function deleteLink(id) {
+    return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
+      var result;
+      return _regeneratorRuntime.wrap(function _callee5$(_context5) {
+        while (1) {
+          switch (_context5.prev = _context5.next) {
+            case 0:
+              _context5.prev = 0;
+              _context5.next = 3;
+              return request["delete"]("/topo/v1/api/networkLink/{" + id + "}");
+
+            case 3:
+              result = _context5.sent;
+              return _context5.abrupt("return", result);
+
+            case 7:
+              _context5.prev = 7;
+              _context5.t0 = _context5["catch"](0);
+              rlog.error("删除链路", _context5.t0);
+
+            case 10:
+            case "end":
+              return _context5.stop();
+          }
+        }
+      }, _callee5, null, [[0, 7]]);
+    }))();
   }
 };

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

@@ -0,0 +1,157 @@
+import _Form from "@alifd/next/es/form";
+import _Select from "@alifd/next/es/select";
+import _extends from "@babel/runtime/helpers/extends";
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import rlog from "@riil-frontend/component-topology-utils/es/rlog";
+import React, { useEffect, useState } from "react";
+import service from "../../../../../../topoCenter/services/link";
+export default function BindExitLinkSelect(props) {
+  var topo = props.topo,
+      edge = props.edge,
+      values = props.values,
+      onChange = props.onChange,
+      editorProps = props.editorProps;
+  var store = topo.store;
+
+  var _store$useModel = store.useModel("topoConfig"),
+      editState = _store$useModel[0],
+      editDispatchers = _store$useModel[1]; // 可关联出口链路
+
+
+  var _useState = useState([]),
+      associatedlinks = _useState[0],
+      setAssociatedlinks = _useState[1]; // const [isLine, setIsLine] = useState(false);
+
+
+  var getLinkByNodes = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(id) {
+      var result, hasLinkIds, axlink;
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              _context.next = 2;
+              return service.queryAssociatedlinks(id);
+
+            case 2:
+              result = _context.sent;
+              hasLinkIds = topo.getLines().map(function (line) {
+                return line.id;
+              });
+              axlink = [];
+              result.data.map(function (exLink) {
+                if (hasLinkIds.indexOf(exLink.id) < 0) {
+                  axlink.push(exLink);
+                }
+              });
+              rlog.debug("出口链路列表", result.data, axlink);
+              setAssociatedlinks(axlink);
+
+            case 8:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }));
+
+    return function getLinkByNodes(_x) {
+      return _ref.apply(this, arguments);
+    };
+  }();
+
+  useEffect(function () {
+    console.log("CommonEdgePropertyView-edge", edge, edge.getSource().getTag(), edge.getTarget());
+    var ids = [edge.getSource().getTag(), edge.getTarget().getTag()];
+    getLinkByNodes(ids);
+  }, [edge]);
+
+  var bindExitLink = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(value) {
+      var data, exitLink, config, exconfig, exportLinkIdList, _yield$editDispatcher, elements, target, aobj;
+
+      return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+        while (1) {
+          switch (_context2.prev = _context2.next) {
+            case 0:
+              data = associatedlinks.find(function (link) {
+                return link.id === value;
+              });
+              rlog.debug("bindExitLink--- v, edge", data, edge);
+              exitLink = {
+                attributes: [],
+                ciType: "network_link",
+                dtype: "link",
+                id: data.id,
+                interfaceSource: data["network_link.source_device_id"],
+                interfaceTarget: data.attributes["network_link.destination_device_id"],
+                metrics: [],
+                name: data.attributes.name,
+                "network_link.connect_type": "exit",
+                "network_link.destination_ipv4": data.attributes["network_link.destination_ipv4"],
+                operation: "delete",
+                connect_type: "exit",
+                source: data.attributes.source_id,
+                target: data.attributes.destination_id,
+                type: "link"
+              };
+              config = topo.resourceConfig.getConfigFromHt();
+              rlog.debug("getConfigFromHt", config, topo.resourceConfig);
+              exconfig = _extends({}, config);
+              exportLinkIdList = config.exportLinkIdList;
+              exportLinkIdList.push(data.id);
+              topo.resourceConfig.updateConfig(_extends({}, config, {
+                exportLinkIdList: exportLinkIdList
+              }));
+              _context2.next = 11;
+              return editDispatchers.fetchDataByConfig();
+
+            case 11:
+              _yield$editDispatcher = _context2.sent;
+              elements = _yield$editDispatcher.elements;
+              target = edge.getTarget();
+
+              if (target.getTag() === undefined) {
+                target.a("name", exitLink["network_link.destination_ipv4"]);
+              }
+
+              aobj = edge.getAttrObject();
+              edge.setAttrObject(_extends({}, aobj, exitLink));
+              edge.setTag(data.id);
+              console.log("bindExitLink------------", target, target.getTag(), data["network_link.destination_ipv4"], exitLink);
+              rlog.debug("fetchDataByConfig", elements);
+
+            case 20:
+            case "end":
+              return _context2.stop();
+          }
+        }
+      }, _callee2);
+    }));
+
+    return function bindExitLink(_x2) {
+      return _ref2.apply(this, arguments);
+    };
+  }();
+
+  return /*#__PURE__*/React.createElement(_Form.Item, {
+    label: "\u5173\u8054\u51FA\u53E3\u94FE\u8DEF",
+    style: {
+      marginBottom: 0
+    }
+  }, /*#__PURE__*/React.createElement(_Select, {
+    style: {
+      width: 232
+    },
+    disabled: associatedlinks.length < 1,
+    onChange: function onChange(v) {
+      bindExitLink(v);
+    }
+  }, associatedlinks.map(function (item, index) {
+    return /*#__PURE__*/React.createElement(_Select.Option, {
+      value: item.id,
+      key: index
+    }, item.attributes.display_name);
+  })));
+}

package/es/topoCenter/components/editor/propertyViews/edge/link/LinkInfoPreview.js

@@ -44,8 +44,7 @@ export default function LindInfoPreview(props) {
   }];
 
   var getValue = function getValue(name) {
-    var value;
-    console.log('LindInfoPreview-getValue', data, name);
+    var value; // console.log('LindInfoPreview-getValue',data,name)
 
     if (data) {
       if (data.attributes[name + "_object"]) {

package/es/topoCenter/hooks/editor/useDeleteEdges.js

@@ -6,7 +6,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import rlog from '@riil-frontend/component-topology-utils/es/rlog';
 import { isAggLink } from "../../../core/models/utils/linkUtils";
 import linkService from "../../services/link";
-import { getLinkPermission } from "../../utils/linPermissionUtil";
+import { getLinkPermission } from "../../utils/resourcePermissionUtil";
 /**
  * 删除连线
  */
@@ -29,8 +29,7 @@ export default (function (_ref) {
   };
 
   function checkLinkDeleteable(link) {
-    var _getLinkPermission = getLinkPermission(link, topo.dataModel.getNodes()),
-        deleteable = _getLinkPermission.deleteable;
+    var deleteable = link.permission.deleteable;
 
     if (deleteable) {
       return deleteable;

package/es/topoCenter/utils/resourcePermissionUtil.js

@@ -1,9 +1,12 @@
 import _extends from "@babel/runtime/helpers/extends";
 export function getNodePermission(node) {
+  return parseBasicPermission(node === null || node === void 0 ? void 0 : node.operation);
+}
+export function parseBasicPermission(operation) {
   return {
-    readable: !!(node !== null && node !== void 0 && node.operation),
-    writeable: ['write', 'delete'].includes(node === null || node === void 0 ? void 0 : node.operation),
-    deleteable: ['delete'].includes(node === null || node === void 0 ? void 0 : node.operation)
+    readable: !!operation,
+    writeable: ['write', 'delete'].includes(operation),
+    deleteable: ['delete'].includes(operation)
   };
 }
 /**
@@ -16,16 +19,16 @@ export function getNodePermission(node) {
  */
 
 export function getLinkPermission(link, source, target) {
-  var linkType = link.attributes['network_link.connect_type'];
+  var linkType = link.attributes['network_link.connect_type']; // 出口链路使用权限中心配置
+
+  if (linkType === 'exit') {
+    return parseBasicPermission(link === null || link === void 0 ? void 0 : link.operation);
+  }
 
   var isWriteable = function isWriteable() {
-    if (linkType === 'exit') {
-      return ['write', 'delete'].indexOf(source === null || source === void 0 ? void 0 : source.operation) !== -1;
-    } else {
-      return [source, target].filter(function (node) {
-        return ['write', 'delete'].indexOf(node === null || node === void 0 ? void 0 : node.operation) !== -1;
-      }).length === 2;
-    }
+    return [source, target].filter(function (node) {
+      return ['write', 'delete'].indexOf(node === null || node === void 0 ? void 0 : node.operation) !== -1;
+    }).length === 2;
   };
 
   return {
@@ -66,8 +69,11 @@ export function addTopoDataResourcePermission(data) {
       var target = nodes.find(function (n) {
         return n.id === link.target;
       });
+      var permission = getLinkPermission(link, source, target);
       return _extends({}, link, {
-        permission: getLinkPermission(link, source, target)
+        // 临时适配，待优化
+        operation: link.operation || (permission.readable ? 'read' : null),
+        permission: permission
       });
     });
   };

package/es/utils/topoData.js

@@ -279,9 +279,9 @@ function buildGlobal(_ref2) {
 
   if ((_result$config = result.config) !== null && _result$config !== void 0 && _result$config.enableLineFlow) {
     edgeFlow = {
-      type: 'point',
+      type: "point",
       // 必填，支持传送带drip、光点point、箭头arrow
-      direction: 'from' // 流动方向，可为空，默认源到目的
+      direction: "from" // 流动方向，可为空，默认源到目的
 
     };
   }
@@ -290,7 +290,7 @@ function buildGlobal(_ref2) {
     edgeFlow = {
       type: globalConfig.edgeFlow,
       // 必填，支持传送带drip、光点point、箭头arrow
-      direction: globalConfig.edgeFlowDirection || 'from' // 流动方向，可为空，默认源到目的
+      direction: globalConfig.edgeFlowDirection || "from" // 流动方向，可为空，默认源到目的
 
     };
   }
@@ -350,7 +350,7 @@ export var combTopoData = function combTopoData(_ref3) {
 
   // rlog.debug("combTopoData-接收到数据", result, engine, globalConfig);
   var config = _extends({
-    type: 'auto'
+    type: "auto"
   }, result.config); // global
 
 
@@ -449,9 +449,9 @@ export function getCiModSet(params) {
     return getModSet(ciTypes);
   }
   /**
-   * 
-   * @param {array} ciTypeCodes 
-   * @returns 
+   *
+   * @param {array} ciTypeCodes
+   * @returns
    */
 
 
@@ -461,12 +461,6 @@ export function getCiModSet(params) {
       return ciTypeCodes.includes(item);
     }).forEach(function (key) {
       var ciTypeObj = ciTypeMap[key];
-      modSet[key] = {
-        name: ciTypeObj.displayName,
-        code: ciTypeObj.code,
-        icon: ciTypeObj.icon,
-        list: ciModfilter(ciTypeObj, globalConfig, "node", ciTypeObj.code)
-      };
 
       if (key === "network_link") {
         var linkKeyArr = [{
@@ -496,8 +490,16 @@ export function getCiModSet(params) {
 
           return link.code;
         });
+      } else {
+        modSet[key] = {
+          name: ciTypeObj.displayName,
+          code: ciTypeObj.code,
+          icon: ciTypeObj.icon,
+          list: ciModfilter(ciTypeObj, globalConfig, "node", ciTypeObj.code)
+        };
       }
     });
+    console.log("modSet--------------------", modSet);
     return modSet;
   }
 

package/lib/components/index.module.scss

@@ -27,117 +27,6 @@
   }
 }
 
-.layout-aside-loading {
-  height: 100%;
-
-  :global {
-    .#{$css-prefix}loading-wrap {
-      height: 100%;
-    }
-  }
-
-  .layout-aside {
-    // padding: 12px;
-    height: 100%;
-    position: relative;
-
-    background: #ffffff;
-    box-shadow: 0px 0px 4px 0px rgba(0, 0, 0, 0.08);
-    border-radius: 4px;
-    border: 1px solid #dcdee3;
-    padding: 12px;
-    background: $color-white;
-    box-shadow: $shadow-1;
-
-    overflow: auto;
-    border-radius: 4px;
-
-    .tree-tool {
-      width: 100%;
-      padding-bottom: 12px;
-      display: flex;
-      justify-content: space-between;
-
-      .tree-tool-search {
-        flex: 1;
-
-        :global {
-          .#{$css-prefix}select-trigger {
-            min-width: 70px;
-          }
-
-          .#{$css-prefix}select {
-            margin-right: 4px;
-
-            .#{$css-prefix}input.#{$css-prefix}medium {
-              // width: 100%;
-            }
-
-            .#{$css-prefix}select-inner {
-              min-width: 70px !important;
-            }
-          }
-        }
-      }
-
-      .tree-tool-container {
-        margin-left: 4px;
-      }
-
-      .tree-tool-btn {
-        margin-left: 8px;
-        height: 28px;
-        width: 28px;
-        padding-left: 5px;
-        text-align: right;
-      }
-    }
-
-    .tree {
-      // height: 100%; // min-width: 208px;
-      width: 100%;
-
-      :global {
-        ul {
-          li {
-            :global {
-              .#{$css-prefix}tree-node-inner {
-                height: 28px;
-
-                .#{$css-prefix}tree-node-label-wrapper {
-                  .#{$css-prefix}tree-node-label {
-                    width: 100%;
-
-                    .tree-node-label {
-                      width: 100%;
-                      overflow: hidden;
-                      text-overflow: ellipsis;
-                      white-space: nowrap;
-
-                      span:nth-child(3) {
-                        width: 20px;
-                      }
-                    }
-                  }
-                }
-              }
-
-              .#{$css-prefix}node-block .#{$css-prefix}tree-node-inner {
-
-                .#{$css-prefix}disabled,
-                .#{$css-prefix}disabled:hover {
-                  -webkit-text-fill-color: $color-text1-4;
-                  cursor: not-allowed;
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-
-    .empty {
-      padding-top: 50%;
-    }
-  }
-}
+.empty {
+  background: transparent;
+}

package/lib/core/components/AlarmListPanel/index.js

@@ -27,22 +27,17 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 function AlarmListPanel(props, ref) {
   // 传入参数
-  var topo = props.topo;
+  var topo = props.topo,
+      alarmData = props.alarmData,
+      onClose = props.onClose;
 
   var _useState = (0, _react.useState)([]),
       alarmList = _useState[0],
-      setAlarmList = _useState[1];
+      setAlarmList = _useState[1]; //const { alarmData } = alarmState;
+  // const onClose = () => {/*  */
+  //   topo.alarm.switchAlarmPopPanel(false);
+  // };
 
-  var _topo$store$useModel = topo.store.useModel("topoAlarm"),
-      alarmState = _topo$store$useModel[0],
-      alarmDispatchers = _topo$store$useModel[1];
-
-  var alarmData = alarmState.alarmData;
-
-  var onClose = function onClose() {
-    // console.log("AlarmListPanel-onClose", alarm);
-    topo.alarm.switchAlarmPopPanel(false);
-  };
 
   (0, _react.useEffect)(function () {
     if (alarmData) {

package/lib/core/components/DisplaySettingDrawer/DisplaySetting.js

@@ -9,6 +9,8 @@ var _box = _interopRequireDefault(require("@alifd/next/lib/box"));
 
 var _form = _interopRequireDefault(require("@alifd/next/lib/form"));
 
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
 var _field = _interopRequireDefault(require("@alifd/next/lib/field"));
 
 var _react = _interopRequireWildcard(require("react"));
@@ -45,7 +47,9 @@ function DisplaySetting(props, ref) {
       linkTipConfig = _ref.linkTipConfig,
       showEdgeExpandConfig = _ref.showEdgeExpandConfig,
       extraConfig = _ref.extraConfig,
-      showLinkConfig = _ref.showLinkConfig;
+      showLinkConfig = _ref.showLinkConfig,
+      nodeTagProps = _ref.nodeTagProps,
+      nodeTipProps = _ref.nodeTipProps;
 
   var field = _field["default"].useField({
     autoUnmount: false,
@@ -74,10 +78,10 @@ function DisplaySetting(props, ref) {
       label: "\u8D44\u6E90\u6807\u6CE8",
       helpText: "\u6700\u591A\u652F\u6301\u52FE\u90093\u9879"
     })
-  }, /*#__PURE__*/_react["default"].createElement(_NodeTag["default"], {
+  }, /*#__PURE__*/_react["default"].createElement(_NodeTag["default"], (0, _extends2["default"])({}, nodeTagProps, {
     name: "nodeTag",
     topo: topo
-  })), linkTagConfig && /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
+  }))), linkTagConfig && /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
     label: /*#__PURE__*/_react["default"].createElement(Label, {
       label: "\u94FE\u8DEF\u6807\u6CE8",
       helpText: "\u6700\u591A\u652F\u6301\u52FE\u90092\u9879"
@@ -92,10 +96,10 @@ function DisplaySetting(props, ref) {
       helpText: "\u6700\u591A\u652F\u6301\u52FE\u90094\u9879"
     }),
     patternTrigger: "onChange"
-  }, /*#__PURE__*/_react["default"].createElement(_NodeTip["default"], {
+  }, /*#__PURE__*/_react["default"].createElement(_NodeTip["default"], (0, _extends2["default"])({}, nodeTipProps, {
     name: "nodeTip",
     topo: topo
-  })), linkTipConfig && /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
+  }))), linkTipConfig && /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
     label: /*#__PURE__*/_react["default"].createElement(Label, {
       label: "\u94FE\u8DEF\u60AC\u6D6E\u6846",
       helpText: "\u6700\u591A\u652F\u6301\u52FE\u90094\u9879"