@riil-frontend/component-topology 2.15.43 → 2.15.46

package/lib/models/topoMod.js

@@ -38,7 +38,6 @@ function _default(topoApp) {
       topoLoadError: false,
       id: undefined,
       topoId: "",
-      topoName: "",
       type: undefined,
       data: null,
       // 后端返回的分组、连线、节点数据
@@ -46,22 +45,6 @@ function _default(topoApp) {
       // ht 拓扑数据，用于首次load
       currentTopo: undefined,
       topoPermission: undefined,
-      currentNode: {
-        id: "",
-        name: "无数据"
-      },
-      topoAlarmIsOpen: false,
-      // 拓扑通道是否打开
-      alarmPanelIsOpen: false,
-      // 告警弹窗是否打开
-      alarmData: null,
-      // 概览抽屉中告警列表相关数据 TODO 抽取
-      currentCiInfo: null,
-      // 概览抽屉当前CI元数据 TODO 抽取
-      addLinkIsOpen: false,
-      // 添加链路抽屉显示
-      ciConnectable: [],
-      // 可创建联系ci列表
       resAndMetrics: {
         res: [],
         metrics: [],
@@ -206,10 +189,19 @@ function _default(topoApp) {
             }, _callee2);
           }))();
         },
+
+        /**
+         * 设置拓扑类型
+         * @param {*} type 
+         */
+        setTopoType: function setTopoType(type) {
+          this.update({
+            type: type
+          });
+        },
         clearData: function clearData() {
           this.update({
             topoId: "",
-            topoName: "",
             topoData: null,
             graphLoaded: false,
             data: null,
@@ -438,7 +430,7 @@ function _default(topoApp) {
                     _rlog["default"].debug("topoMod.initTopoData 查询数据完成", topoId, linkTo, result);
 
                     _context6.next = 40;
-                    return Promise.all([topoApp.ciTyeCache.getCiTypeMap((0, _topoData.getCiTypes)(result)), dispatch.iconManage.loadCustomIcons()]);
+                    return Promise.all([topoApp.ciTyeCache.getCiTypeMap((0, _topoData.getCiTypes)(result)), dispatch.customIcon.loadCustomIcons()]);
 
                   case 40:
                     _yield$Promise$all = _context6.sent;
@@ -463,6 +455,7 @@ function _default(topoApp) {
 
                     _this5.update({
                       type: (_result$config = result.config) === null || _result$config === void 0 ? void 0 : _result$config.showType,
+                      currentTopo: topoData.config,
                       data: result,
                       topoData: topoData,
                       resAndMetrics: resAndMetrics,
@@ -602,97 +595,67 @@ function _default(topoApp) {
             }, _callee10);
           }))();
         },
-        getCiInfo: function getCiInfo(conditions, state) {
+        getTopoPermission: function getTopoPermission(playload, rootState) {
           var _this8 = this;
 
           return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee11() {
-            var result;
+            var id, update, topoPermission, getTopoPermission;
             return _regenerator["default"].wrap(function _callee11$(_context11) {
               while (1) {
                 switch (_context11.prev = _context11.next) {
-                  case 0:
-                    _context11.next = 2;
-                    return (0, _model.getCiMeta)(conditions);
-
-                  case 2:
-                    result = _context11.sent;
-
-                    // rlog.debug("getCiInfo", result);
-                    _this8.update({
-                      // alarmList: result.datas,
-                      currentCiInfo: result // drawerAlarmPageInfo,
-
-                    });
-
-                  case 4:
-                  case "end":
-                    return _context11.stop();
-                }
-              }
-            }, _callee11);
-          }))();
-        },
-        getTopoPermission: function getTopoPermission(playload, rootState) {
-          var _this9 = this;
-
-          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee12() {
-            var id, update, topoPermission, getTopoPermission;
-            return _regenerator["default"].wrap(function _callee12$(_context12) {
-              while (1) {
-                switch (_context12.prev = _context12.next) {
                   case 0:
                     id = playload.id, update = playload.update;
-                    _context12.prev = 1;
+                    _context11.prev = 1;
                     getTopoPermission = topoApp.options.getTopoPermission || _topo["default"].auth.getTopoPermission;
-                    _context12.next = 5;
+                    _context11.next = 5;
                     return getTopoPermission(id);
 
                   case 5:
-                    topoPermission = _context12.sent;
-                    _context12.next = 11;
+                    topoPermission = _context11.sent;
+                    _context11.next = 11;
                     break;
 
                   case 8:
-                    _context12.prev = 8;
-                    _context12.t0 = _context12["catch"](1);
+                    _context11.prev = 8;
+                    _context11.t0 = _context11["catch"](1);
 
-                    _rlog["default"].error("\u67E5\u8BE2\u62D3\u6251" + id + "\u7684\u6743\u9650\u5931\u8D25", _context12.t0); // 尚未区分拓扑图不存在还是接口请求报错
+                    _rlog["default"].error("\u67E5\u8BE2\u62D3\u6251" + id + "\u7684\u6743\u9650\u5931\u8D25", _context11.t0); // 尚未区分拓扑图不存在还是接口请求报错
 
 
                   case 11:
-                    _context12.next = 13;
+                    _context11.next = 13;
                     return dispatch.functionAuth.checkAuth('createTopo');
 
                   case 13:
-                    if (!_context12.sent) {
-                      _context12.next = 17;
+                    if (!_context11.sent) {
+                      _context11.next = 17;
                       break;
                     }
 
-                    _context12.t1 = 'delete';
-                    _context12.next = 18;
+                    _context11.t1 = 'delete';
+                    _context11.next = 18;
                     break;
 
                   case 17:
-                    _context12.t1 = 'read';
+                    _context11.t1 = 'read';
 
                   case 18:
-                    topoPermission = _context12.t1;
+                    topoPermission = _context11.t1;
 
                     if (update !== false) {
-                      _this9.update({
+                      _this8.update({
                         topoPermission: topoPermission
                       });
                     }
 
-                    return _context12.abrupt("return", topoPermission);
+                    return _context11.abrupt("return", topoPermission);
 
                   case 21:
                   case "end":
-                    return _context12.stop();
+                    return _context11.stop();
                 }
               }
-            }, _callee12, null, [[1, 8]]);
+            }, _callee11, null, [[1, 8]]);
           }))();
         }
       };

package/lib/{components → topoCenter/components}/Link/index copy.js

@@ -38,7 +38,7 @@ var LinkDrawer = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       topo = props.topo;
   var store = topo.store;
 
-  var _store$useModel = store.useModel('topoCreateMod'),
+  var _store$useModel = store.useModel('topoConfig'),
       editState = _store$useModel[0],
       editDispatchers = _store$useModel[1];
 

package/lib/{components → topoCenter/components}/Link/index.js

@@ -38,7 +38,7 @@ var LinkDrawer = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       topo = props.topo;
   var store = topo.store;
 
-  var _store$useModel = store.useModel('topoCreateMod'),
+  var _store$useModel = store.useModel('topoConfig'),
       editState = _store$useModel[0],
       editDispatchers = _store$useModel[1];
 

package/lib/topoCenter/components/TopoView.js

@@ -27,6 +27,10 @@ var _indexModule = _interopRequireDefault(require("../../components/index.module
 
 var _AlarmListPanel = _interopRequireDefault(require("../../core/components/AlarmListPanel"));
 
+var _useLinkDynamicStyle = _interopRequireDefault(require("../hooks/useLinkDynamicStyle"));
+
+var _useRelateTopo = _interopRequireDefault(require("../hooks/viewer/useRelateTopo"));
+
 var _excluded = ["topo", "titleBar", "onEnterEdit"];
 
 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); }
@@ -36,7 +40,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 /**
  * 拓扑组件。变化无权限、无数据显示
  */
-function NetworkTopology(props) {
+function NetworkTopologyCore(props) {
   var topo = props.topo,
       titleBar = props.titleBar,
       onEnterEdit = props.onEnterEdit,
@@ -46,6 +50,12 @@ function NetworkTopology(props) {
       topoId = topoState.topoId,
       topoData = topoState.topoData,
       topoPermission = topoState.topoPermission;
+  (0, _useLinkDynamicStyle["default"])({
+    topo: topo
+  });
+  var relateTopo = (0, _useRelateTopo["default"])({
+    topo: topo
+  });
 
   var renderTopoView = function renderTopoView() {
     var viewerProps = (0, _extends2["default"])({}, props.viewerProps, {
@@ -54,11 +64,17 @@ function NetworkTopology(props) {
       AlarmListPanel: _AlarmListPanel["default"],
       plugins: []
     });
+
+    var handleEvent = function handleEvent(event) {
+      relateTopo.onEvent(event);
+    };
+
     return /*#__PURE__*/_react["default"].createElement(_TopoView["default"], (0, _extends2["default"])({}, otherProps, {
       topo: topo,
       viewerProps: viewerProps,
       titleBar: titleBar,
-      onEnterEdit: onEnterEdit
+      onEnterEdit: onEnterEdit,
+      onEvent: handleEvent
     }));
   };
 
@@ -97,5 +113,5 @@ function NetworkTopology(props) {
   }, renderContent()));
 }
 
-var _default = NetworkTopology;
+var _default = NetworkTopologyCore;
 exports["default"] = _default;

package/lib/topoCenter/components/Topology.js

@@ -9,8 +9,6 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _componentTopologyGraph = require("@riil-frontend/component-topology-graph");
-
 var _TopoView = _interopRequireDefault(require("./TopoView"));
 
 var _LayerRelatedResourceList = _interopRequireDefault(require("./editor/propertyViews/LayerRelatedResourceList"));
@@ -21,8 +19,6 @@ var _EdgeGroupPropertyView = _interopRequireDefault(require("./editor/propertyVi
 
 var _LinkPropertyView = _interopRequireDefault(require("./editor/propertyViews/edge/LinkPropertyView"));
 
-var _useLinkDynamicStyle = _interopRequireDefault(require("../hooks/useLinkDynamicStyle"));
-
 var _AddLinkDrawer = _interopRequireDefault(require("./editor/propertyViews/edge/addLinkDrawer/AddLinkDrawer"));
 
 var _useTopoEdit = _interopRequireDefault(require("../hooks/useTopoEdit"));
@@ -34,9 +30,6 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 function NetworkTopologyFull(props) {
   var topo = props.topo,
       customEditorProps = props.editorProps;
-  (0, _useLinkDynamicStyle["default"])({
-    topo: topo
-  });
   var topoEdit = (0, _useTopoEdit["default"])({
     topo: topo
   });

package/lib/topoCenter/components/editor/propertyViews/edge/EdgeGroupPropertyView.js

@@ -13,7 +13,7 @@ var _TabView = _interopRequireDefault(require("../../../../../core/editor/compon
 
 var _EdgeGroupSetting = _interopRequireDefault(require("../../../../../core/editor/components/settings/propertyViews/edge/edgeGroup/EdgeGroupSetting"));
 
-var _LindInfoPreview = _interopRequireDefault(require("./link/LindInfoPreview"));
+var _LinkInfoPreview = _interopRequireDefault(require("./link/LinkInfoPreview"));
 
 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); }
 
@@ -37,7 +37,7 @@ function EdgeGroupPropertyView(props) {
     return /*#__PURE__*/_react["default"].createElement(_TabView["default"], null, /*#__PURE__*/_react["default"].createElement(_tab["default"].Item, {
       title: "\u6570\u636E",
       key: "1"
-    }, /*#__PURE__*/_react["default"].createElement(_LindInfoPreview["default"], {
+    }, /*#__PURE__*/_react["default"].createElement(_LinkInfoPreview["default"], {
       data: aggLink,
       topo: topo
     })), /*#__PURE__*/_react["default"].createElement(_tab["default"].Item, {

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

@@ -9,9 +9,9 @@ var _button = _interopRequireDefault(require("@alifd/next/lib/button"));
 
 var _react = _interopRequireDefault(require("react"));
 
-var _LindInfoPreview = _interopRequireDefault(require("../../link/LindInfoPreview"));
+var _LinkInfoPreview = _interopRequireDefault(require("../../link/LinkInfoPreview"));
 
-var _LindInfoPreviewModule = _interopRequireDefault(require("../../link/LindInfoPreview.module.scss"));
+var _LinkInfoPreviewModule = _interopRequireDefault(require("../../link/LinkInfoPreview.module.scss"));
 
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
@@ -35,7 +35,7 @@ function LinkDataTab(props) {
     return item.id === edge.getTag();
   });
 
-  var _topo$store$useModel = topo.store.useModel("topoCreateMod"),
+  var _topo$store$useModel = topo.store.useModel("topoConfig"),
       editState = _topo$store$useModel[0],
       editDispatchers = _topo$store$useModel[1];
 
@@ -47,15 +47,15 @@ function LinkDataTab(props) {
   };
 
   return /*#__PURE__*/_react["default"].createElement("div", {
-    className: _LindInfoPreviewModule["default"].panelFullHeight
-  }, /*#__PURE__*/_react["default"].createElement(_LindInfoPreview["default"], {
-    className: _LindInfoPreviewModule["default"].lindInfoPreview,
+    className: _LinkInfoPreviewModule["default"].panelFullHeight
+  }, /*#__PURE__*/_react["default"].createElement(_LinkInfoPreview["default"], {
+    className: _LinkInfoPreviewModule["default"].lindInfoPreview,
     data: link,
     topo: topo
   }), /*#__PURE__*/_react["default"].createElement("div", {
-    className: _LindInfoPreviewModule["default"].footer
+    className: _LinkInfoPreviewModule["default"].footer
   }, /*#__PURE__*/_react["default"].createElement(_button["default"], {
-    className: _LindInfoPreviewModule["default"].button,
+    className: _LinkInfoPreviewModule["default"].button,
     type: "primary",
     disabled: !permission.writeable,
     onClick: openEditLinkDrawer

package/lib/topoCenter/components/editor/propertyViews/edge/addLinkDrawer/AddLinkDrawer.js

@@ -49,7 +49,7 @@ function AddLinkDrawer(props) {
       lineData = props.lineData;
   var store = topo.store;
 
-  var _store$useModel = store.useModel("topoCreateMod"),
+  var _store$useModel = store.useModel("topoConfig"),
       editState = _store$useModel[0],
       editDispatchers = _store$useModel[1];
 

package/lib/topoCenter/components/editor/propertyViews/edge/addLinkDrawer/components/editLinkInfo.js

@@ -102,7 +102,7 @@ function EditLinkInfo(props) {
     setSource(source);
     setTarget(target);
     field.setValues(attributes);
-  }, [source, target, field, attributes]); // const [editState, editDispatchers] = store.useModel("topoCreateMod");
+  }, [source, target, field, attributes]); // const [editState, editDispatchers] = store.useModel("topoConfig");
 
   var labelAlign = "top";
   var formItemLayout = {

package/lib/topoCenter/components/editor/propertyViews/edge/link/{LindInfoPreview.js → LinkInfoPreview.js}

@@ -11,7 +11,7 @@ var _collapse = _interopRequireDefault(require("@alifd/next/lib/collapse"));
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _LindInfoPreviewModule = _interopRequireDefault(require("./LindInfoPreview.module.scss"));
+var _LinkInfoPreviewModule = _interopRequireDefault(require("./LinkInfoPreview.module.scss"));
 
 var _attributeFormatter = require("../../../../../../core/models/attributeFormatter");
 
@@ -73,11 +73,11 @@ function LindInfoPreview(props) {
       key: field.name,
       direction: "row",
       spacing: 8,
-      className: _LindInfoPreviewModule["default"].row
+      className: _LinkInfoPreviewModule["default"].row
     }, /*#__PURE__*/_react["default"].createElement(_box["default"], {
-      className: _LindInfoPreviewModule["default"].label
+      className: _LinkInfoPreviewModule["default"].label
     }, field.label), /*#__PURE__*/_react["default"].createElement(_box["default"], {
-      className: field.name === "use" ? _LindInfoPreviewModule["default"].uselabelValue : _LindInfoPreviewModule["default"].labelValue,
+      className: field.name === "use" ? _LinkInfoPreviewModule["default"].uselabelValue : _LinkInfoPreviewModule["default"].labelValue,
       flex: 1
     }, getValue(field.name)));
   }); // <Collapse

package/lib/{hooks → topoCenter/hooks/viewer}/useRelateTopo.js

@@ -13,10 +13,10 @@ var _componentTopologyGraph = require("@riil-frontend/component-topology-graph")
 
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
-var _tree = require("../utils/tree");
+var _tree = require("../../../utils/tree");
 
 /**
- * 关联拓扑
+ * 关联拓扑：FIXME 移到拓扑中心
  *
  * 双击容器打开关联拓扑图
  * 双击缩略图返回原拓扑图

package/lib/{models → topoCenter/store}/linkDynamicStyle.js

@@ -16,7 +16,7 @@ var _lodash = _interopRequireDefault(require("lodash"));
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
 /**
- * 动态设置链路样式 Model
+ * 动态设置链路样式 Model。-- 功能已废弃
  */
 var defaultConfig = {
   networkLink: {
@@ -220,12 +220,12 @@ function _default(engine) {
 
                     links = [];
 
-                    if (!(isEdit && rootState.topoCreateMod.topoData.links.length)) {
+                    if (!(isEdit && rootState.topoConfig.topoData.links.length)) {
                       _context3.next = 10;
                       break;
                     }
 
-                    links = rootState.topoCreateMod.topoData.links;
+                    links = rootState.topoConfig.topoData.links;
                     _context3.next = 13;
                     break;
 

package/lib/{models → topoCenter/store}/linkDynamicStyleConfig.js

@@ -15,7 +15,8 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
 
-var ruleKey = 0;
+var ruleKey = 0; // -- 功能已废弃
+
 var _default = {
   // 定义 model 的初始 state
   state: {

package/package.json

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

package/es/core/editor/LinkDynamicStyleConfig.js

@@ -1,16 +0,0 @@
-var LinkDynamicStyleConfig = /*#__PURE__*/function () {
-  function LinkDynamicStyleConfig(topo) {
-    this.topo = void 0;
-    this.topo = topo;
-  }
-
-  var _proto = LinkDynamicStyleConfig.prototype;
-
-  _proto.getDispatchers = function getDispatchers() {
-    this.topo.store.getModelDispatchers('linkDynamicStyle');
-  };
-
-  return LinkDynamicStyleConfig;
-}();
-
-export { LinkDynamicStyleConfig as default };

package/es/core/store/getStoreModels.js

@@ -1,40 +0,0 @@
-import topoMod from "../../models/topoMod";
-import iconManage from "../../models/iconManage";
-import ciModel from "../../models/ciModel";
-import functionAuth from "../../topoCenter/store/functionAuth";
-import selection from "../../models/selection";
-import topoBizMod from "../../models/topoBizMod";
-import topoCreateMod from "../../models/topoCreateMod";
-import topoEdit from "../../models/topoEdit";
-import topoView from "../../models/topoView";
-import topoAlarm from "../../models/topoAlarm";
-import topoGraphView from "../../models/topoGraphView";
-import background from "../../models/background";
-import displayConfig from "../../models/displayConfig";
-import resourceWebControllUrlSetting from "../../models/resourceWebControllUrlSetting";
-import topoBaseInfoOverview from "../../models/topoBaseInfoOverview";
-import linkManager from "../../models/linkManager";
-import topoLinkMod from "../../topoCenter/store/topoLinkMod";
-import topoCenter from "../../topoCenter/store/topoCenter";
-import topoTreeMod from "../../topoCenter/store/topoTreeMod";
-export default {
-  topoMod: topoMod,
-  iconManage: iconManage,
-  ciModel: ciModel,
-  functionAuth: functionAuth,
-  selection: selection,
-  resourceWebControllUrlSetting: resourceWebControllUrlSetting,
-  topoBizMod: topoBizMod,
-  topoCreateMod: topoCreateMod,
-  topoLinkMod: topoLinkMod,
-  topoView: topoView,
-  background: background,
-  topoGraphView: topoGraphView,
-  topoAlarm: topoAlarm,
-  displayConfig: displayConfig,
-  topoBaseInfoOverview: topoBaseInfoOverview,
-  topoEdit: topoEdit,
-  topoCenter: topoCenter,
-  topoTreeMod: topoTreeMod,
-  linkManager: linkManager
-};

package/lib/core/editor/LinkDynamicStyleConfig.js

@@ -1,21 +0,0 @@
-"use strict";
-
-exports.__esModule = true;
-exports["default"] = void 0;
-
-var LinkDynamicStyleConfig = /*#__PURE__*/function () {
-  function LinkDynamicStyleConfig(topo) {
-    this.topo = void 0;
-    this.topo = topo;
-  }
-
-  var _proto = LinkDynamicStyleConfig.prototype;
-
-  _proto.getDispatchers = function getDispatchers() {
-    this.topo.store.getModelDispatchers('linkDynamicStyle');
-  };
-
-  return LinkDynamicStyleConfig;
-}();
-
-exports["default"] = LinkDynamicStyleConfig;