@riil-frontend/component-topology 2.15.43 → 2.15.46

package/es/models/{topoCreateMod.js → topoConfig.js}

@@ -1,6 +1,10 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _extends from "@babel/runtime/helpers/extends";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
+
+/**
+ * 拓扑配置
+ */
 import { getUUID, isAvailableArray } from "@riil-frontend/utils";
 import { transformTopoElements } from "@riil-frontend/component-topology-graph/es/utils";
 import topoService, { TOPO_PARENT_ID } from "@riil-frontend/component-topology-common/es/services/topo";
@@ -245,7 +249,7 @@ export default function (topoApp) {
               while (1) {
                 switch (_context2.prev = _context2.next) {
                   case 0:
-                    editState = rootState.topoCreateMod;
+                    editState = rootState.topoConfig;
                     resources = editState.resources, _editState$groups = editState.groups, groups = _editState$groups === void 0 ? [] : _editState$groups;
                     query = {
                       id: rootState.topoMod.topoId,
@@ -329,7 +333,7 @@ export default function (topoApp) {
                     data = _context4.sent;
                     rlog.debug("getTopoByConditions--------", data, groupInfo);
                     _context4.next = 13;
-                    return Promise.all([topoApp.ciTyeCache.getCiTypeMap(getCiTypes(data)), dispatch.iconManage.loadCustomIcons()]);
+                    return Promise.all([topoApp.ciTyeCache.getCiTypeMap(getCiTypes(data)), dispatch.customIcon.loadCustomIcons()]);
 
                   case 13:
                     _yield$Promise$all = _context4.sent;
@@ -397,7 +401,7 @@ export default function (topoApp) {
           var _this5 = this;
 
           return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6() {
-            var _state$topoCreateMod$;
+            var _state$topoConfig$vie;
 
             var currentBackground;
             return _regeneratorRuntime.wrap(function _callee6$(_context6) {
@@ -407,7 +411,7 @@ export default function (topoApp) {
                     currentBackground = topoApp.store.getModelState('background').current;
                     _context6.next = 3;
                     return _saveTopo(_extends({}, data, {
-                      viewGroupId: (_state$topoCreateMod$ = state.topoCreateMod.viewGroup) === null || _state$topoCreateMod$ === void 0 ? void 0 : _state$topoCreateMod$.id,
+                      viewGroupId: (_state$topoConfig$vie = state.topoConfig.viewGroup) === null || _state$topoConfig$vie === void 0 ? void 0 : _state$topoConfig$vie.id,
                       template: state.topoMod.type,
                       // 背景图
                       backgroundId: currentBackground ? currentBackground.id : null

package/es/models/topoMod.js

@@ -21,7 +21,6 @@ export default function (topoApp) {
       topoLoadError: false,
       id: undefined,
       topoId: "",
-      topoName: "",
       type: undefined,
       data: null,
       // 后端返回的分组、连线、节点数据
@@ -29,22 +28,6 @@ export default function (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: [],
@@ -187,10 +170,19 @@ export default function (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,
@@ -417,7 +409,7 @@ export default function (topoApp) {
                     result = parseTopoData(result);
                     rlog.debug("topoMod.initTopoData 查询数据完成", topoId, linkTo, result);
                     _context6.next = 40;
-                    return Promise.all([topoApp.ciTyeCache.getCiTypeMap(getCiTypes(result)), dispatch.iconManage.loadCustomIcons()]);
+                    return Promise.all([topoApp.ciTyeCache.getCiTypeMap(getCiTypes(result)), dispatch.customIcon.loadCustomIcons()]);
 
                   case 40:
                     _yield$Promise$all = _context6.sent;
@@ -440,6 +432,7 @@ export default function (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,
@@ -577,95 +570,65 @@ export default function (topoApp) {
             }, _callee10);
           }))();
         },
-        getCiInfo: function getCiInfo(conditions, state) {
+        getTopoPermission: function getTopoPermission(playload, rootState) {
           var _this8 = this;
 
           return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee11() {
-            var result;
+            var id, update, topoPermission, getTopoPermission;
             return _regeneratorRuntime.wrap(function _callee11$(_context11) {
               while (1) {
                 switch (_context11.prev = _context11.next) {
-                  case 0:
-                    _context11.next = 2;
-                    return 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 _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee12() {
-            var id, update, topoPermission, getTopoPermission;
-            return _regeneratorRuntime.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 || topoService.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);
-                    rlog.error("\u67E5\u8BE2\u62D3\u6251" + id + "\u7684\u6743\u9650\u5931\u8D25", _context12.t0); // 尚未区分拓扑图不存在还是接口请求报错
+                    _context11.prev = 8;
+                    _context11.t0 = _context11["catch"](1);
+                    rlog.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/es/{components → topoCenter/components}/Link/index copy.js

@@ -18,7 +18,7 @@ var LinkDrawer = /*#__PURE__*/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/es/{components → topoCenter/components}/Link/index.js

@@ -18,7 +18,7 @@ var LinkDrawer = /*#__PURE__*/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/es/topoCenter/components/TopoView.js

@@ -10,11 +10,13 @@ import Topo404 from "./Topo404";
 import TopoNoPermission from "./TopoNoPermission";
 import styles from "../../components/index.module.scss";
 import AlarmListPanel from "../../core/components/AlarmListPanel";
+import useLinkDynamicStyle from "../hooks/useLinkDynamicStyle";
+import useRelateTopo from "../hooks/viewer/useRelateTopo";
 /**
  * 拓扑组件。变化无权限、无数据显示
  */
 
-function NetworkTopology(props) {
+function NetworkTopologyCore(props) {
   var topo = props.topo,
       titleBar = props.titleBar,
       onEnterEdit = props.onEnterEdit,
@@ -25,6 +27,12 @@ function NetworkTopology(props) {
       topoId = topoState.topoId,
       topoData = topoState.topoData,
       topoPermission = topoState.topoPermission;
+  useLinkDynamicStyle({
+    topo: topo
+  });
+  var relateTopo = useRelateTopo({
+    topo: topo
+  });
 
   var renderTopoView = function renderTopoView() {
     var viewerProps = _extends({}, props.viewerProps, {
@@ -34,11 +42,16 @@ function NetworkTopology(props) {
       plugins: []
     });
 
+    var handleEvent = function handleEvent(event) {
+      relateTopo.onEvent(event);
+    };
+
     return /*#__PURE__*/React.createElement(BasicTopoView, _extends({}, otherProps, {
       topo: topo,
       viewerProps: viewerProps,
       titleBar: titleBar,
-      onEnterEdit: onEnterEdit
+      onEnterEdit: onEnterEdit,
+      onEvent: handleEvent
     }));
   };
 
@@ -77,4 +90,4 @@ function NetworkTopology(props) {
   }, renderContent()));
 }
 
-export default NetworkTopology;
+export default NetworkTopologyCore;

package/es/topoCenter/components/Topology.js

@@ -1,20 +1,15 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React, { useState, useEffect, useRef, useCallback } from "react";
-import { TopoEvent } from "@riil-frontend/component-topology-graph";
 import TopoView from "./TopoView";
 import LayerRelatedResourceList from "./editor/propertyViews/LayerRelatedResourceList";
 import LayerConfigPlugin from "./editor/plugins/LayerConfigPlugin";
 import EdgeGroupPropertyView from "./editor/propertyViews/edge/EdgeGroupPropertyView";
 import LinkPropertyView from "./editor/propertyViews/edge/LinkPropertyView";
-import useLinkDynamicStyle from "../hooks/useLinkDynamicStyle";
 import AddLinkDrawer from "./editor/propertyViews/edge/addLinkDrawer/AddLinkDrawer";
 import useTopoEdit from "../hooks/useTopoEdit";
 export default function NetworkTopologyFull(props) {
   var topo = props.topo,
       customEditorProps = props.editorProps;
-  useLinkDynamicStyle({
-    topo: topo
-  });
   var topoEdit = useTopoEdit({
     topo: topo
   });

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

@@ -2,7 +2,7 @@ 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/LindInfoPreview";
+import LindInfoPreview from "./link/LinkInfoPreview";
 export default function EdgeGroupPropertyView(props) {
   var topo = props.topo,
       edge = props.edge,

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

@@ -1,7 +1,7 @@
 import _Button from "@alifd/next/es/button";
 import React from "react";
-import LindInfoPreview from "../../link/LindInfoPreview";
-import styles from "../../link/LindInfoPreview.module.scss";
+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";
 export default function LinkDataTab(props) {
@@ -22,7 +22,7 @@ export default 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];
 

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

@@ -22,7 +22,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/es/topoCenter/components/editor/propertyViews/edge/addLinkDrawer/components/editLinkInfo.js

@@ -74,7 +74,7 @@ export default 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/es/topoCenter/components/editor/propertyViews/edge/link/{LindInfoPreview.js → LinkInfoPreview.js}

@@ -1,7 +1,7 @@
 import _Box from "@alifd/next/es/box";
 import _Collapse from "@alifd/next/es/collapse";
 import React, { useEffect } from "react";
-import styles from "./LindInfoPreview.module.scss";
+import styles from "./LinkInfoPreview.module.scss";
 import { formatMetric } from "../../../../../../core/models/attributeFormatter";
 var CollapsePanel = _Collapse.Panel;
 export default function LindInfoPreview(props) {

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

@@ -2,9 +2,9 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { TopoEvent } from '@riil-frontend/component-topology-graph';
 import rlog from '@riil-frontend/component-topology-utils/es/rlog';
-import { loopTreeFun } from "../utils/tree";
+import { loopTreeFun } from "../../../utils/tree";
 /**
- * 关联拓扑
+ * 关联拓扑：FIXME 移到拓扑中心
  *
  * 双击容器打开关联拓扑图
  * 双击缩略图返回原拓扑图

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

@@ -3,7 +3,7 @@ import _extends from "@babel/runtime/helpers/extends";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 
 /**
- * 动态设置链路样式 Model
+ * 动态设置链路样式 Model。-- 功能已废弃
  */
 import _ from 'lodash';
 import rlog from '@riil-frontend/component-topology-utils/es/rlog';
@@ -209,12 +209,12 @@ export default function (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/es/{models → topoCenter/store}/linkDynamicStyleConfig.js

@@ -3,7 +3,8 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _extends from "@babel/runtime/helpers/extends";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import clone from 'lodash/cloneDeep';
-var ruleKey = 0;
+var ruleKey = 0; // -- 功能已废弃
+
 export default {
   // 定义 model 的初始 state
   state: {

package/lib/components/Drawer/index.js

@@ -11,12 +11,15 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _button = _interopRequireDefault(require("@alifd/next/lib/button"));
 
+var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
+
 var _react = _interopRequireDefault(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
 var _indexModule = _interopRequireDefault(require("./index.module.scss"));
 
+var _excluded = ["bodyClassName"];
 var headerStyle = {
   zIndex: 1000
 };
@@ -37,6 +40,8 @@ var Drawer = function Drawer(props) {
       onSave = props.onSave,
       drawerProps = props.drawerProps,
       children = props.children;
+  var bodyClassName = drawerProps.bodyClassName,
+      otherDrawerProps = (0, _objectWithoutPropertiesLoose2["default"])(drawerProps, _excluded);
   return /*#__PURE__*/_react["default"].createElement(_drawer["default"], (0, _extends2["default"])({
     title: title,
     placement: "right",
@@ -44,12 +49,12 @@ var Drawer = function Drawer(props) {
     headerStyle: headerStyle,
     bodyStyle: bodyStyle,
     closeMode: ['close', 'esc']
-  }, drawerProps, {
+  }, otherDrawerProps, {
     className: (0, _classnames["default"])(_indexModule["default"].drawer, drawerProps.className),
     visible: visible,
     onClose: onClose
   }), /*#__PURE__*/_react["default"].createElement("div", {
-    className: (0, _classnames["default"])(_indexModule["default"].content, drawerProps.bodyClassName)
+    className: (0, _classnames["default"])(_indexModule["default"].content, bodyClassName)
   }, children), footer && /*#__PURE__*/_react["default"].createElement("div", {
     className: _indexModule["default"].footer
   }, /*#__PURE__*/_react["default"].createElement(_button["default"], {

package/lib/components/TagImageSelect/index.js

@@ -17,7 +17,7 @@ var _TagSelect = _interopRequireDefault(require("../TagSelect"));
 
 var _indexModule = _interopRequireDefault(require("./index.module.scss"));
 
-var _excluded = ["dataSource", "onChange", "size", "boxProps", "tagProps", "itemProps", "ItemComponent"];
+var _excluded = ["dataSource", "onChange", "size", "boxProps", "tagProps", "itemProps", "ItemComponent", "value"];
 
 var TagImageSelect = function TagImageSelect(props) {
   var dataSource = props.dataSource,
@@ -27,11 +27,13 @@ var TagImageSelect = function TagImageSelect(props) {
       tagProps = props.tagProps,
       itemProps = props.itemProps,
       ItemComponent = props.ItemComponent,
+      value = props.value,
       otherProps = (0, _objectWithoutPropertiesLoose2["default"])(props, _excluded);
   var Item = ItemComponent || _TemplateButton["default"];
   return /*#__PURE__*/_react["default"].createElement(_TagSelect["default"], (0, _extends2["default"])({}, otherProps, {
     onChange: onChange,
     className: _indexModule["default"].tagSelect,
+    value: value,
     dataSource: dataSource.map(function (item) {
       return {
         key: item.id,

package/lib/components/TagSelect/index.js

@@ -37,9 +37,9 @@ var TagSelect = function TagSelect(props) {
       setCurrent = _useState[1];
 
   (0, _react.useEffect)(function () {
-    if (value) {
-      setCurrent(value);
-    }
+    // if (value) {
+    // }
+    setCurrent(value);
   }, [value]);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: "tag-select-wrap"

package/lib/components/TemplateButton/index.module.scss

@@ -14,6 +14,7 @@
   display: flex;
   justify-content: center;
   align-items: center;
+  user-select: none;
 }
 
 .icon {

package/lib/core/common/hooks/ht/useDataModelDataPropertyChange.js

@@ -6,13 +6,22 @@ exports["default"] = void 0;
 var _react = require("react");
 
 var _default = function _default(topo, fn) {
+  var topoModState = topo.store.useModelState('topoMod');
+  var graphLoaded = topoModState.graphLoaded;
   (0, _react.useEffect)(function () {
-    var dataModel = topo.getDataModel();
-    dataModel.addDataPropertyChangeListener(fn);
+    var dataModel;
+
+    if (graphLoaded) {
+      dataModel = topo.getDataModel();
+      dataModel.addDataPropertyChangeListener(fn);
+    }
+
     return function () {
-      dataModel.removeDataPropertyChangeListener(fn);
+      if (dataModel) {
+        dataModel.removeDataPropertyChangeListener(fn);
+      }
     };
-  }, [fn]);
+  }, [topo, graphLoaded, fn]);
 };
 
 exports["default"] = _default;

package/lib/core/common/icons/icon.js

@@ -93,7 +93,7 @@ function transformCustomIcons2HtIcons(icons) {
 
 
 function getUserCustomIcons(topo) {
-  var uploadIcons = topo.store.getModelState('iconManage').icons;
+  var uploadIcons = topo.store.getModelState('customIcon').icons;
   return [].concat(transformCustomIcons2HtIcons(uploadIcons.node));
 } // 获得节点图标列表
 

package/lib/core/common/icons/useIcons.js

@@ -7,7 +7,7 @@ exports.useNodeIcons = useNodeIcons;
 var _icon = require("./icon");
 
 function useCustomIcons(topo) {
-  var _topo$store$useModelS = topo.store.useModelState('iconManage'),
+  var _topo$store$useModelS = topo.store.useModelState('customIcon'),
       icons = _topo$store$useModelS.icons;
 
   var customIcons = icons.node.map(_icon.transformCustomIcon2HtIcon);