@riil-frontend/component-topology 3.3.0 → 3.5.0-a.1

package/es/components/MultiResourceDrawer/index.js

@@ -1,7 +1,7 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React, { useRef } from 'react';
-import ResourceSelectDrawer from "../ResourceSelectDrawer";
+import NetworkTopoResourceSelectDrawer from "../NetworkTopoResourceSelectDrawer";
 
 var MultiResourceDrawer = function MultiResourceDrawer(props) {
   var visible = props.visible,
@@ -42,7 +42,7 @@ var MultiResourceDrawer = function MultiResourceDrawer(props) {
     };
   }();
 
-  return /*#__PURE__*/React.createElement(ResourceSelectDrawer, {
+  return /*#__PURE__*/React.createElement(NetworkTopoResourceSelectDrawer, {
     visible: visible,
     getExcludeIds: getExcludeIds,
     onOk: onDrawerSave,

package/es/components/NetworkTopoResourceSelectDrawer/NetworkTopoResourceSelectDrawer.js

@@ -0,0 +1,9 @@
+import _extends from "@babel/runtime/helpers/extends";
+import React from 'react';
+import { getNetworkTopoCommonResListProps } from "../../constants/ResourceTypeLimit";
+import ResourceSelectDrawer from "../ResourceSelectDrawer/ResourceSelectDrawer";
+export default function NetworkTopoResourceSelectDrawer(props) {
+  return /*#__PURE__*/React.createElement(ResourceSelectDrawer, _extends({
+    commonResListProps: getNetworkTopoCommonResListProps()
+  }, props));
+}

package/es/components/NetworkTopoResourceSelectDrawer/index.js

@@ -0,0 +1,2 @@
+import NetworkTopoResourceSelectDrawer from "./NetworkTopoResourceSelectDrawer";
+export default NetworkTopoResourceSelectDrawer;

package/es/components/ResourceSelectDrawer/ResourceSelectDrawer.js

@@ -15,12 +15,14 @@ import styles from "./ResourceSelectDrawer.module.scss";
 
 function ResourceSelectDrawer(props) {
   var visible = props.visible,
+      title = props.title,
       selectionMode = props.selectionMode,
       limitTypes = props.limitTypes,
       excludeIds = props.excludeIds,
       getExcludeIds = props.getExcludeIds,
       onOk = props.onOk,
-      onClose = props.onClose;
+      onClose = props.onClose,
+      commonResListProps = props.commonResListProps;
   var resourceSelectRef = useRef();
 
   var _useState = useState(false),
@@ -84,7 +86,7 @@ function ResourceSelectDrawer(props) {
   }
 
   return /*#__PURE__*/React.createElement(Drawer, {
-    title: "\u6DFB\u52A0\u8D44\u6E90",
+    title: title,
     visible: visible,
     loading: loading,
     onSave: handleOk,
@@ -98,12 +100,14 @@ function ResourceSelectDrawer(props) {
     ref: resourceSelectRef,
     selectionMode: selectionMode,
     limitTypes: limitTypes,
-    excludeIds: finalExcludeIds
+    excludeIds: finalExcludeIds,
+    commonResListProps: commonResListProps
   }));
 }
 
 ResourceSelectDrawer.propTypes = {
   visible: PropTypes.bool,
+  title: PropTypes.string,
   limitTypes: PropTypes.array,
   excludeIds: PropTypes.array,
   selectionMode: PropTypes.any,
@@ -112,6 +116,7 @@ ResourceSelectDrawer.propTypes = {
 };
 ResourceSelectDrawer.defaultProps = {
   visible: true,
+  title: '添加资源',
   excludeIds: [],
   onOk: function onOk() {},
   onClose: function onClose() {}

package/es/components/ResourceSelectDrawer/ResourceSelectList.js

@@ -1,14 +1,18 @@
 import _extends from "@babel/runtime/helpers/extends";
+import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
+var _excluded = ["selectionMode", "limitTypes", "excludeIds", "commonResListProps"];
 import React, { useState, useEffect, useRef, useCallback } from 'react';
 import { getRequest } from '@riil-frontend/component-topology-common';
 import CommonResList from '@riil-frontend/component-common-res-list';
 import NoDataPage from '@riil-frontend/component-no-data-page';
-import { RESOURCE_LIMIT_TYPES } from "../../constants/ResourceTypeLimit";
+import { filterCiTypes } from "../../constants/ResourceTypeLimit";
 
 function ResourceSelectList(props, ref) {
   var selectionMode = props.selectionMode,
       limitTypes = props.limitTypes,
-      excludeIds = props.excludeIds;
+      excludeIds = props.excludeIds,
+      commonResListProps = props.commonResListProps,
+      otherProps = _objectWithoutPropertiesLoose(props, _excluded);
 
   var tableProps = _extends({}, selectionMode ? {
     rowSelection: {
@@ -18,17 +22,16 @@ function ResourceSelectList(props, ref) {
     emptyContent: /*#__PURE__*/React.createElement(NoDataPage, null)
   });
 
-  return /*#__PURE__*/React.createElement(CommonResList, {
+  return /*#__PURE__*/React.createElement(CommonResList, _extends({
     ref: ref,
-    innerTreeFilters: ['monitorable', 'discoverable'],
-    limitTypes: limitTypes || RESOURCE_LIMIT_TYPES,
+    limitTypes: limitTypes,
     defaultCondition: excludeIds.length ? "!id('" + excludeIds.join('\',\'') + "')" : undefined,
     request: getRequest(),
     tableProps: tableProps,
     paginationProps: {
       type: 'simple'
     }
-  });
+  }, otherProps, commonResListProps || {}));
 }
 
 export default /*#__PURE__*/React.forwardRef(ResourceSelectList);

package/es/components/SingleResourceDrawer/SelectDrawer.js

@@ -2,7 +2,7 @@ import _Message from "@alifd/next/es/message";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React, { useRef } from 'react';
-import ResourceSelectDrawer from "../ResourceSelectDrawer";
+import ResourceSelectDrawer from "../NetworkTopoResourceSelectDrawer";
 
 var SingleSelectDrawer = function SingleSelectDrawer(props) {
   var visible = props.visible,

package/es/constants/ResourceTypeLimit.js

@@ -1,4 +1,41 @@
-// 拓扑中心资源类型限制
+import _extends from "@babel/runtime/helpers/extends";
+var excludeTypes = ['data_center', 'manage_assets', 'network_link', 'access_link']; // 过滤模型树
+
+export function filterModelTree(modelTree) {
+  return modelTree.filter(function (node) {
+    return !excludeTypes.includes(node.code);
+  }).map(function (node) {
+    return _extends({}, node, {
+      childs: filterModelTree(node.childs || []).filter(function (child) {
+        return child.monitorable;
+      })
+    });
+  });
+}
+export function getCiModels(modelTree) {
+  var list = [];
+  filterModelTree(modelTree).forEach(function (domainModel) {
+    list.push.apply(list, domainModel.childs);
+  });
+  return list;
+} // 资源选择组件过滤类型
+
+export var filterCiTypes = function filterCiTypes(tree) {
+  return tree.filter(function (node) {
+    return !excludeTypes.includes(node.value);
+  }).map(function (node) {
+    return _extends({}, node, {
+      children: filterCiTypes(node.children || [])
+    });
+  });
+};
+export var getNetworkTopoCommonResListProps = function getNetworkTopoCommonResListProps() {
+  return {
+    innerTreeFilters: ['monitorable', 'discoverable'],
+    filterCiRes: filterCiTypes
+  };
+}; // 拓扑中心资源类型限制
+
 export var RESOURCE_LIMIT_TYPES = [// 网络设备
 'common_network', 'switch', 'switch_cluster', 'router', // 操作系统
 'linux', 'windows', // 数据库

package/es/core/editor/components/GroupAddResourceDrawerPlugin/GroupAddResourceDrawer.js

@@ -1,7 +1,7 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React, { useState, useEffect } from 'react';
-import ResourceSelectDrawer from "../../../../components/ResourceSelectDrawer";
+import ResourceSelectDrawer from "../../../../components/NetworkTopoResourceSelectDrawer";
 
 var GroupAddResourceDrawer = function GroupAddResourceDrawer(props) {
   var group = props.group,

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

@@ -40,7 +40,7 @@ export default function CommonEdgePropertyView(props) {
 
   var getLinkByNodes = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(id) {
-      var result;
+      var result, hasLinkIds, axlink;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
@@ -50,11 +50,19 @@ export default function CommonEdgePropertyView(props) {
 
             case 2:
               result = _context.sent;
-              rlog.debug("出口链路列表", result.data); //const list = result[id];
-
-              setAssociatedlinks(result.data);
-
-            case 5:
+              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();
           }
@@ -71,6 +79,7 @@ export default function CommonEdgePropertyView(props) {
     autoUnmount: false,
     values: parseValues(values, edge),
     onChange: function onChange(name, value) {
+      rlog.debug("CommonEdgePropertyView", name, value);
       var newValues = field.getValues();
 
       _onChange(name, value, newValues);
@@ -95,14 +104,17 @@ export default function CommonEdgePropertyView(props) {
   };
 
   var bindExitLink = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(data) {
-      var exitLink, aobj, config, exconfig, exportLinkIdList, _yield$editDispatcher, elements;
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(value) {
+      var data, exitLink, aobj, config, exconfig, exportLinkIdList, _yield$editDispatcher, elements;
 
       return _regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
-              rlog.debug("bindExitLink--- v, edge", data, edge, edge.getSource(), edge.getTarget());
+              data = associatedlinks.find(function (link) {
+                return link.id === value;
+              });
+              rlog.debug("bindExitLink--- v, edge", data, edge);
               exitLink = {
                 attributes: [],
                 ciType: "network_link",
@@ -131,15 +143,15 @@ export default function CommonEdgePropertyView(props) {
               topo.resourceConfig.updateConfig(_extends({}, config, {
                 exportLinkIdList: exportLinkIdList
               }));
-              _context2.next = 13;
+              _context2.next = 14;
               return editDispatchers.fetchDataByConfig();
 
-            case 13:
+            case 14:
               _yield$editDispatcher = _context2.sent;
               elements = _yield$editDispatcher.elements;
-              rlog.debug('fetchDataByConfig', elements);
+              rlog.debug("fetchDataByConfig", elements);
 
-            case 16:
+            case 17:
             case "end":
               return _context2.stop();
           }
@@ -212,13 +224,14 @@ export default function CommonEdgePropertyView(props) {
     style: {
       width: 232
     },
+    disabled: associatedlinks.length < 1,
     onChange: function onChange(v) {
       bindExitLink(v);
     }
-  }, associatedlinks.map(function (link, index) {
+  }, associatedlinks.map(function (item, index) {
     return /*#__PURE__*/React.createElement(_Select.Option, {
-      value: link,
+      value: item.id,
       key: index
-    }, link.attributes.display_name);
+    }, item.attributes.display_name);
   }))))))));
 }

package/es/core/editor/components/settings/propertyViews/edge/EdgePropertyView.js

@@ -19,7 +19,6 @@ export default function EdgePropertyViewMatch(props) {
     topo: topo,
     id: values.id
   });
-  console.log("EdgePropertyViewMatch-edge,values, props", edge, values, props);
   var type;
 
   if (edge.isEdgeGroupAgent()) {

package/es/core/editor/components/settings/propertyViews/index.js

@@ -15,10 +15,6 @@ var propertyPanelMap = {
   multiple: MultipleElementPropertyView
 };
 
-if (localStorage.getItem('topo.debug') === 'true') {
-  Object.assign(propertyPanelMap, {
-    view: ViewPropertyView
-  });
-}
+if (localStorage.getItem('topo.debug') === 'true') {}
 
 export default propertyPanelMap;

package/es/core/editor/components/settings/propertyViews/layer/DataTab/LayerAddResourceDrawer.js

@@ -1,7 +1,7 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React, { useState, useEffect } from 'react';
-import ResourceSelectDrawer from "../../../../../../../components/ResourceSelectDrawer";
+import ResourceSelectDrawer from "../../../../../../../components/NetworkTopoResourceSelectDrawer";
 
 var LayerAddResourceDrawer = function LayerAddResourceDrawer(props) {
   var visible = props.visible,

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

@@ -2,7 +2,7 @@ import _Message from "@alifd/next/es/message";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React, { useState, useEffect } from 'react';
-import ResourceSelectDrawer from "../../../../../../../components/ResourceSelectDrawer";
+import ResourceSelectDrawer from "../../../../../../../components/NetworkTopoResourceSelectDrawer";
 /**
  * 关联、重新关联资源
  * @param props
@@ -60,6 +60,7 @@ var BindResourceDrawer = function BindResourceDrawer(props) {
 
   return /*#__PURE__*/React.createElement(ResourceSelectDrawer, {
     visible: visible,
+    title: "\u5173\u8054\u8D44\u6E90",
     getExcludeIds: topoEditApi.getAllNodeResourceIds,
     selectionMode: "single",
     onOk: handleSave,

package/es/core/editor/components/titlebar/TopoEditorTitleBar.js

@@ -1,5 +1,8 @@
 import _Box from "@alifd/next/es/box";
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _Dialog from "@alifd/next/es/dialog";
 import _Button from "@alifd/next/es/button";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React from "react";
 import classnames from "classnames";
 import TitleWidget from "../../../components/titlebar/widgets/TitleWidget";
@@ -32,7 +35,32 @@ export default function TopoEditorTitleBar(props) {
   }, "\u4FDD\u5B58"), /*#__PURE__*/React.createElement(_Button, {
     className: styles.button,
     onClick: function onClick() {
-      topo.exitEditMode();
+      _Dialog.confirm({
+        title: "提示",
+        content: "若现在退出，图上修改的内容将不会保存！",
+        onOk: function () {
+          var _onOk = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+            return _regeneratorRuntime.wrap(function _callee$(_context) {
+              while (1) {
+                switch (_context.prev = _context.next) {
+                  case 0:
+                    topo.exitEditMode();
+
+                  case 1:
+                  case "end":
+                    return _context.stop();
+                }
+              }
+            }, _callee);
+          }));
+
+          function onOk() {
+            return _onOk.apply(this, arguments);
+          }
+
+          return onOk;
+        }()
+      });
     }
   }, "\u9000\u51FA"))));
 }

package/es/core/models/TopoApp.js

@@ -20,7 +20,7 @@ import { updateEdgeExpanded } from "../utils/edgeUtil";
 import PluginManager from "./PluginManager";
 import topoFactory from "./topoFactory"; // eslint-disable-next-line no-undef
 
-var version = typeof "3.3.0" === 'string' ? "3.3.0" : null;
+var version = typeof "3.5.0-a.1" === 'string' ? "3.5.0-a.1" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

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

@@ -1,30 +1,29 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _extends from "@babel/runtime/helpers/extends";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import topoService from '@riil-frontend/component-topology-common/es/services/topo';
-import keyBy from 'lodash/keyBy';
+import topoService from "@riil-frontend/component-topology-common/es/services/topo";
+import keyBy from "lodash/keyBy";
 import { queryCisByIds } from "../../services";
 var interfaceTypeMap = {
-  'network.interface': {
-    displayName: '网络接口'
+  "network.interface": {
+    displayName: "网络接口"
   },
-  'network.agg_interface': {
-    displayName: '聚合接口'
+  "network.agg_interface": {
+    displayName: "聚合接口"
   }
 };
 export function isAggLink(link) {
-  return link.attributes['network_link.connect_type'] === 'agg';
+  return link.attributes["network_link.connect_type"] === "agg";
 }
 export function mergeLinksData(links, linkCis, nodes, interfaceCis) {
-  var linkCiMap = keyBy(linkCis, 'id');
+  var linkCiMap = keyBy(linkCis, "id");
   return links.map(function (link) {
     var _nodes$find, _nodes$find2, _interfaceCis$find, _interfaceCis$find2;
 
     var linkCi = linkCiMap[link.id];
 
-    var attributes = _extends({}, linkCi === null || linkCi === void 0 ? void 0 : linkCi.attributes);
+    var attributes = _extends({}, linkCi === null || linkCi === void 0 ? void 0 : linkCi.attributes); // 翻译
 
-    console.log('mergeLinksData', link, attributes); // 翻译
 
     return _extends({}, link, {
       id: linkCi.id,
@@ -32,14 +31,14 @@ export function mergeLinksData(links, linkCis, nodes, interfaceCis) {
       name: linkCi === null || linkCi === void 0 ? void 0 : linkCi.attributes.name,
       attributes: _extends({}, attributes, {
         // 源/目的设备
-        'network_link.source_device_id_object': {
+        "network_link.source_device_id_object": {
           displayName: (_nodes$find = nodes.find(function (node) {
-            return node.id === attributes['network_link.source_device_id'];
+            return node.id === attributes["network_link.source_device_id"];
           })) === null || _nodes$find === void 0 ? void 0 : _nodes$find.name
         },
-        'network_link.destination_device_id_object': {
+        "network_link.destination_device_id_object": {
           displayName: (_nodes$find2 = nodes.find(function (node) {
-            return node.id === attributes['network_link.destination_device_id'];
+            return node.id === attributes["network_link.destination_device_id"];
           })) === null || _nodes$find2 === void 0 ? void 0 : _nodes$find2.name
         },
         // 源/目的接口类型
@@ -49,12 +48,12 @@ export function mergeLinksData(links, linkCis, nodes, interfaceCis) {
         source_id_object: {
           displayName: (_interfaceCis$find = interfaceCis.find(function (node) {
             return node.id === attributes.source_id;
-          })) === null || _interfaceCis$find === void 0 ? void 0 : _interfaceCis$find.attributes['display_name']
+          })) === null || _interfaceCis$find === void 0 ? void 0 : _interfaceCis$find.attributes["display_name"]
         },
         destination_id_object: {
           displayName: (_interfaceCis$find2 = interfaceCis.find(function (node) {
             return node.id === attributes.destination_id;
-          })) === null || _interfaceCis$find2 === void 0 ? void 0 : _interfaceCis$find2.attributes['display_name']
+          })) === null || _interfaceCis$find2 === void 0 ? void 0 : _interfaceCis$find2.attributes["display_name"]
         }
       })
     });

package/es/hooks/useTopoEdit.js

@@ -335,11 +335,6 @@ var useTopoEdit = function useTopoEdit(params) {
       case 'link':
         if (onLineDelete) {
           onLineDelete(data);
-        } // 临时放这里，仅拓扑中心有
-
-
-        if (topo.linkDynamicStyleExecutor) {
-          topo.linkDynamicStyleExecutor.execute();
         }
 
         break;

package/es/topoCenter/components/editor/propertyViews/edge/LinkPropertyView/Data/index.js

@@ -4,31 +4,33 @@ import LindInfoPreview from "../../link/LinkInfoPreview";
 import styles from "../../link/LinkInfoPreview.module.scss";
 import rlog from "@riil-frontend/component-topology-utils/es/rlog";
 import { getLinkPermission } from "../../../../../../utils/linPermissionUtil";
+import { useState, useEffect } from "react";
 export default function LinkDataTab(props) {
   var topo = props.topo,
-      edge = props.edge,
-      editorProps = props.editorProps; // const operation = props.edge.a("operation");
+      edge = props.edge;
+  var nodes = topo.dataModel.getNodes();
+
+  var _useState = useState(),
+      link = _useState[0],
+      setLink = _useState[1]; // 节点间只有连线组时，显示连线组的数据
 
-  var nodes = topo.dataModel.getNodes(); //rlog.debug("LinkDataTab--edge", edge, nodes);
-  // const disabled = ["delete", "write"].indexOf(operation) < 0;
-  //rlog.debug("LinkDataTab--", permission);
-  // 节点间只有连线组时，显示连线组的数据
 
   var _topo$store$useModelS = topo.store.useModelState("topoMod").data,
       links = _topo$store$useModelS.links,
       linkGroups = _topo$store$useModelS.linkGroups;
-  var link = [].concat(links, linkGroups).find(function (item) {
+  var linkData = [].concat(links, linkGroups).find(function (item) {
     return item.id === edge.getTag();
   });
-  console.log("LindInfoPreview-link", link, edge.getTag(), [].concat(links, linkGroups));
-  var permission = getLinkPermission(edge.getAttrObject(), nodes, link);
+  useEffect(function () {
+    setLink(linkData);
+  }, [edge, linkData]);
+  var permission = getLinkPermission(edge, nodes, link);
 
   var _topo$store$useModel = topo.store.useModel("topoConfig"),
       editState = _topo$store$useModel[0],
       editDispatchers = _topo$store$useModel[1];
 
   var openEditLinkDrawer = function openEditLinkDrawer() {
-    rlog.debug("openEditLinkDrawer-link", link);
     editDispatchers.update({
       addLinkIsOpen: true,
       currentLink: link

package/es/topoCenter/components/editor/propertyViews/edge/LinkPropertyView/LinkPropertyView.js

@@ -6,18 +6,17 @@ import Setting from "./Setting";
 import { getLinkPermission } from "../../../../../../topoCenter/utils/linPermissionUtil.js";
 import { getNodes } from "../../../../../../utils/htElementUtils.js";
 export default function LinkPropertyView(props) {
-  console.log("LinkPropertyView", props);
   var edge = props.edge,
       topo = props.topo; // 无权限不显示数据页签
-  // const operation = props.edge.a('operation');
 
   var _topo$store$useModelS = topo.store.useModelState("topoMod").data,
       links = _topo$store$useModelS.links,
       linkGroups = _topo$store$useModelS.linkGroups;
   var link = [].concat(links, linkGroups).find(function (item) {
     return item.id === edge.getTag();
-  });
-  var operation = getLinkPermission(props.edge, topo.getNodes(topo.dataModel), link);
+  }); // console.log("LinkPropertyView--getLinkPermission", links, link);
+
+  var operation = getLinkPermission(edge, topo.getNodes(topo.dataModel), link);
 
   if (!operation) {
     return /*#__PURE__*/React.createElement(Setting, props);