@riil-frontend/component-topology 7.0.0-dev.20 → 7.0.0-dev.21

package/es/core/models/TopoApp.js

@@ -23,7 +23,7 @@ import topoFactory from "./topoFactory";
 import ElementTagTipConfig from "./tagstips/ElementTagTipConfig";
 import SelectionModel from "./SelectionModel"; // eslint-disable-next-line no-undef
 
-var version = typeof "7.0.0-dev.20" === 'string' ? "7.0.0-dev.20" : null;
+var version = typeof "7.0.0-dev.21" === 'string' ? "7.0.0-dev.21" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/es/networkTopo/index.js

@@ -1,4 +1,3 @@
 import TopoCenter from "./models/TopoCenter";
 import createTopo from "./createTopo";
-import Topology from "./components/Topology";
-export { TopoCenter, createTopo, Topology };
+export { TopoCenter, createTopo };

package/es/networkTopo/store/topoTreeMod.js

@@ -162,7 +162,11 @@ export default function (topoApp) {
 
                     rlog.debug('editTopoOnTree', conditions);
                     _context4.next = 4;
-                    return topoApp.serverApi.editTopoonTree(parseInt(conditions.id, 10), conditions.name, conditions.type);
+                    return topoApp.serverApi.editTopo({
+                      id: parseInt(conditions.id, 10),
+                      name: conditions.name,
+                      type: conditions.type
+                    });
 
                   case 4:
                     resTreeData = _context4.sent;

package/lib/core/models/TopoApp.js

@@ -54,7 +54,7 @@ var _ElementTagTipConfig = _interopRequireDefault(require("./tagstips/ElementTag
 var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "7.0.0-dev.20" === 'string' ? "7.0.0-dev.20" : null;
+var version = typeof "7.0.0-dev.21" === 'string' ? "7.0.0-dev.21" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/networkTopo/index.js

@@ -10,8 +10,4 @@ exports.TopoCenter = _TopoCenter["default"];
 
 var _createTopo = _interopRequireDefault(require("./createTopo"));
 
-exports.createTopo = _createTopo["default"];
-
-var _Topology = _interopRequireDefault(require("./components/Topology"));
-
-exports.Topology = _Topology["default"];
+exports.createTopo = _createTopo["default"];

package/lib/networkTopo/store/topoTreeMod.js

@@ -175,7 +175,11 @@ function _default(topoApp) {
                     _rlog["default"].debug('editTopoOnTree', conditions);
 
                     _context4.next = 4;
-                    return topoApp.serverApi.editTopoonTree(parseInt(conditions.id, 10), conditions.name, conditions.type);
+                    return topoApp.serverApi.editTopo({
+                      id: parseInt(conditions.id, 10),
+                      name: conditions.name,
+                      type: conditions.type
+                    });
 
                   case 4:
                     resTreeData = _context4.sent;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "7.0.0-dev.20",
+  "version": "7.0.0-dev.21",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -116,6 +116,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@7.0.0-dev.20/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@7.0.0-dev.21/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }

package/es/networkTopo/components/Topology.js

@@ -1,28 +0,0 @@
-import _extends from "@babel/runtime/helpers/extends";
-import React from "react";
-import TopoView from "./TopoView";
-import useTopoEdit from "../hooks/useTopoEdit";
-import useEditorProps from "./editor/useEditorProps";
-export default function NetworkTopologyFull(props) {
-  var topo = props.topo,
-      showTools = props.showTools;
-  var topoEdit = useTopoEdit({
-    topo: topo
-  });
-  var editorProps = useEditorProps(props);
-  return /*#__PURE__*/React.createElement(TopoView, _extends({}, props, {
-    editorProps: editorProps,
-    graphViewProps: _extends({}, props.graphViewProps, {
-      onElementsDelete: topoEdit.onElementsDelete,
-      createHtTopoProps: {
-        showTools: showTools,
-        elementChangeLayerByDrag: true,
-        editor: {
-          useNewElementsDeleteEvent: true,
-          // 通过数仓【添加资源】权限控制 是否启用新建链路功能，
-          enableRelateResource: topoEdit.canAddLink
-        }
-      }
-    })
-  }));
-}

package/es/networkTopo/components/editor/plugins/LayerConfigPlugin.js

@@ -1,22 +0,0 @@
-import React, { useState, useEffect, useRef, useCallback } from 'react';
-/**
- * 分层拓扑：横向分层、纵向分层
- * @param {*} props 
- * @returns 
- */
-
-export default function LayerConfigPlugin(props) {
-  var topo = props.topo,
-      topoContext = props.topoContext,
-      topoEdit = props.topoEdit,
-      editorProps = props.editorProps;
-  useEffect(function () {
-    var notifier = topo.view.topoClient.notifier;
-    notifier.on('topo_layer_add', topoEdit.onLayerAdded);
-    return function () {
-      notifier.off('topo_layer_add', topoEdit.onLayerAdded);
-    };
-  }, []);
-  return null;
-}
-;

package/es/networkTopo/components/editor/propertyViews/LayerRelatedResourceList.js

@@ -1,48 +0,0 @@
-import React, { useState, useEffect, useRef, useCallback } from 'react';
-import { iconFactory } from '@riil-frontend/component-topology-graph';
-import ResourceList from "../../../../core/editor/components/settings/common/GroupNodeList/ResourceList";
-import { getLayerChildren } from "../../../../utils/htElementUtils";
-
-function getResourceNodes(store, htNodes) {
-  var _store$getModelState = store.getModelState('topoMod'),
-      data = _store$getModelState.data;
-
-  var list = [];
-  ((data === null || data === void 0 ? void 0 : data.nodes) || []).forEach(function (resource) {
-    var htNode = htNodes.filter(function (node) {
-      return node.getTag() === resource.id;
-    })[0];
-
-    if (htNode) {
-      list.push({
-        resource: resource,
-        node: htNode
-      });
-    }
-  });
-  return list;
-}
-/**
- * 分层关联资源列表
- */
-
-
-export default function LayerResourceList(props) {
-  var topo = props.topo,
-      layer = props.layer;
-  var nodes = getLayerChildren(layer);
-  var resourceNodes = getResourceNodes(topo.store, nodes);
-  var data = resourceNodes.map(function (_ref) {
-    var node = _ref.node,
-        resource = _ref.resource;
-    return {
-      title: resource.name,
-      img: iconFactory.getIconImageUrl(node.getImage())
-    };
-  }); // rlog.debug('LayerResourceList', {nodes, resourceNodes, data});
-
-  return /*#__PURE__*/React.createElement(ResourceList, {
-    data: data
-  });
-}
-;

package/es/networkTopo/components/editor/propertyViews/edge/EdgeGroupPropertyView.js

@@ -1,35 +0,0 @@
-import _Tab from "@alifd/next/es/tab";
-import React, { useState, useEffect } from 'react';
-import TabView from "../../../../../core/editor/components/settings/common/tab/TabView";
-import EdgeGroupSetting from "../../../../../core/editor/components/settings/propertyViews/edge/edgeGroup/EdgeGroupSetting";
-import LindInfoPreview from "./link/LinkInfoPreview"; // V1.2 废弃
-
-export default function EdgeGroupPropertyView(props) {
-  var topo = props.topo,
-      edge = props.edge,
-      values = props.values,
-      onChange = props.onChange,
-      editorProps = props.editorProps; // 查询是否有聚合链路
-
-  var source = edge.getSource().getTag();
-  var target = edge.getTarget().getTag();
-  var linkGroups = topo.store.useModelState('topoMod').data.linkGroups;
-  var aggLink = linkGroups.find(function (link) {
-    return link.source === source && link.target === target || link.target === source && link.source === target;
-  });
-
-  if (aggLink) {
-    return /*#__PURE__*/React.createElement(TabView, null, /*#__PURE__*/React.createElement(_Tab.Item, {
-      title: "\u6570\u636E",
-      key: "1"
-    }, /*#__PURE__*/React.createElement(LindInfoPreview, {
-      data: aggLink,
-      topo: topo
-    })), /*#__PURE__*/React.createElement(_Tab.Item, {
-      title: "\u8BBE\u7F6E",
-      key: "2"
-    }, /*#__PURE__*/React.createElement(EdgeGroupSetting, props)));
-  }
-
-  return /*#__PURE__*/React.createElement(EdgeGroupSetting, props);
-}

package/es/networkTopo/components/editor/propertyViews/edge/EdgePropertyView.js

@@ -1,43 +0,0 @@
-import _Form from "@alifd/next/es/form";
-import _Field from "@alifd/next/es/field";
-import _extends from "@babel/runtime/helpers/extends";
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
-import React, { useEffect } from 'react';
-import BindExitLinkSelect from "./link/BindExitLinkSelect";
-
-function parseValues(values, edge) {
-  return _extends({}, values);
-}
-
-export default function EdgePropertyView(props) {
-  var topo = props.topo,
-      edge = props.edge,
-      values = props.values,
-      _onChange = props.onChange,
-      editorProps = props.editorProps,
-      extraDisplaySetting = props.extraDisplaySetting;
-  var store = topo.store;
-
-  var field = _Field.useField({
-    autoUnmount: false,
-    values: parseValues(values, edge),
-    onChange: function onChange(name, value) {
-      rlog.debug('CommonEdgePropertyView', name, value);
-      var newValues = field.getValues();
-
-      _onChange(name, value, newValues);
-    }
-  });
-
-  useEffect(function () {
-    field.setValues(parseValues(values, edge));
-  }, [values]);
-  return /*#__PURE__*/React.createElement("div", {
-    style: {
-      margin: '12px 0 0 32px'
-    }
-  }, /*#__PURE__*/React.createElement(_Form, {
-    field: field,
-    labelAlign: "top"
-  }, /*#__PURE__*/React.createElement(_Form.Item, null, /*#__PURE__*/React.createElement(BindExitLinkSelect, props))));
-}

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

@@ -1,45 +0,0 @@
-import _Button from "@alifd/next/es/button";
-import React from "react";
-import LindInfoPreview from "../../link/LinkInfoPreview";
-import styles from "../../link/LinkInfoPreview.module.scss";
-import rlog from "@riil-frontend/component-topology-utils/es/rlog";
-import { useState, useEffect } from "react";
-export default function LinkDataTab(props) {
-  var _link$permission;
-
-  var topo = props.topo,
-      edge = props.edge,
-      link = props.link,
-      source = props.source,
-      target = props.target,
-      editorProps = props.editorProps;
-
-  var _topo$store$useModel = topo.store.useModel("topoConfig"),
-      editState = _topo$store$useModel[0],
-      editDispatchers = _topo$store$useModel[1];
-
-  var openEditLinkDrawer = function openEditLinkDrawer() {
-    editDispatchers.update({
-      addLinkIsOpen: true,
-      currentLink: link
-    });
-  };
-
-  return /*#__PURE__*/React.createElement("div", {
-    className: styles.panelFullHeight
-  }, /*#__PURE__*/React.createElement(LindInfoPreview, {
-    className: styles.lindInfoPreview,
-    topo: topo,
-    data: link,
-    source: source,
-    target: target,
-    isCmpTopo: (editorProps === null || editorProps === void 0 ? void 0 : editorProps.topoType) === 'cmpTopo'
-  }), /*#__PURE__*/React.createElement("div", {
-    className: styles.footer
-  }, /*#__PURE__*/React.createElement(_Button, {
-    className: styles.button,
-    type: "primary",
-    disabled: !(link !== null && link !== void 0 && (_link$permission = link.permission) !== null && _link$permission !== void 0 && _link$permission.writeable),
-    onClick: openEditLinkDrawer
-  }, "\u7F16\u8F91")));
-}

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

@@ -1,29 +0,0 @@
-import _extends from "@babel/runtime/helpers/extends";
-import NoDataPage from '@riil-frontend/component-no-data-page';
-import React from 'react';
-import Data from "./Data";
-export default function LinkPropertyView(props) {
-  var edge = props.edge,
-      topo = props.topo;
-  var link = topo.dataModel.useDataById(edge.getTag());
-  var source = topo.dataModel.useDataById(link.source);
-  var target = topo.dataModel.useDataById(link.target); // 无权限不显示数据页签
-
-  if (link) {
-    var readable = link.permission.readable;
-
-    if (!readable) {
-      return /*#__PURE__*/React.createElement(NoDataPage, {
-        statusCode: "\u6CA1\u6709\u67E5\u770B\u6743\u9650"
-      });
-    }
-  } else {
-    return null;
-  }
-
-  return /*#__PURE__*/React.createElement(Data, _extends({}, props, {
-    link: link,
-    source: source,
-    target: target
-  }));
-}

package/es/networkTopo/components/editor/propertyViews/edge/LinkPropertyView/LinkPropertyViewV1.js

@@ -1,37 +0,0 @@
-import _Tab from "@alifd/next/es/tab";
-import _extends from "@babel/runtime/helpers/extends";
-import React from 'react';
-import TabView from "../../../../../../core/editor/components/settings/common/tab/TabView";
-import Data from "./Data";
-import Setting from "./Setting";
-export default function LinkPropertyView(props) {
-  var edge = props.edge,
-      topo = props.topo; // 无权限不显示数据页签
-
-  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();
-  }); // console.log('LinkPropertyView',link)
-
-  if (link) {
-    var readable = link.permission.readable;
-
-    if (!readable) {
-      return /*#__PURE__*/React.createElement(Setting, props);
-    }
-  } else {
-    return /*#__PURE__*/React.createElement(Setting, props);
-  }
-
-  return /*#__PURE__*/React.createElement(TabView, null, /*#__PURE__*/React.createElement(_Tab.Item, {
-    title: "\u6570\u636E",
-    key: "1"
-  }, /*#__PURE__*/React.createElement(Data, _extends({}, props, {
-    link: link
-  }))), /*#__PURE__*/React.createElement(_Tab.Item, {
-    title: "\u8BBE\u7F6E",
-    key: "2"
-  }, /*#__PURE__*/React.createElement(Setting, props)));
-}

package/es/networkTopo/components/editor/propertyViews/edge/LinkPropertyView/Setting/index.js

@@ -1,49 +0,0 @@
-import _Form from "@alifd/next/es/form";
-import _Field from "@alifd/next/es/field";
-import _extends from "@babel/runtime/helpers/extends";
-import _Collapse from "@alifd/next/es/collapse";
-import React, { useEffect } from "react";
-import LineType from "../../../../../../../core/editor/components/settings/common/LineType";
-var CollapsePanel = _Collapse.Panel;
-
-function parseValues(values) {
-  return _extends({}, values);
-}
-
-export default function LinkSetting(props) {
-  var topo = props.topo,
-      values = props.values,
-      _onChange = props.onChange,
-      edge = props.edge;
-
-  var field = _Field.useField({
-    autoUnmount: false,
-    values: parseValues(values),
-    onChange: function onChange(name, value) {
-      var newValues = field.getValues();
-
-      _onChange(name, value, newValues);
-    }
-  });
-
-  useEffect(function () {
-    field.setValues(parseValues(values));
-  }, [values]);
-  return /*#__PURE__*/React.createElement(_Form, {
-    field: field,
-    labelAlign: "top"
-  }, /*#__PURE__*/React.createElement(_Form.Item, null, /*#__PURE__*/React.createElement(_Collapse, {
-    defaultExpandedKeys: ["线形"],
-    style: {
-      border: "none"
-    }
-  }, /*#__PURE__*/React.createElement(CollapsePanel, {
-    key: "\u7EBF\u5F62",
-    title: "\u7EBF\u5F62"
-  }, /*#__PURE__*/React.createElement(LineType, {
-    topo: topo,
-    getEdges: function getEdges() {
-      return [edge];
-    }
-  })))));
-}

package/es/networkTopo/components/editor/propertyViews/edge/LinkPropertyView/index.js

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

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

@@ -1,178 +0,0 @@
-import _Form from "@alifd/next/es/form";
-import _Select from "@alifd/next/es/select";
-import _Loading from "@alifd/next/es/loading";
-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 "../../../../../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];
-
-  var _useState2 = useState(false),
-      loading = _useState2[0],
-      setLoading = _useState2[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:
-              topo.historyManager.beginTransaction();
-              setLoading(true);
-              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.destination_ipv4": data.attributes["network_link.destination_ipv4"],
-                operation: "delete",
-                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 = 13;
-              return editDispatchers.fetchDataByConfig();
-
-            case 13:
-              _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);
-              setLoading(false);
-              topo.historyManager.endTransaction();
-
-            case 23:
-            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(_Loading, {
-    visible: loading,
-    fullScreen: true
-  }), /*#__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);
-  })));
-}