@riil-frontend/component-topology 12.0.0-dev.1 → 12.0.0-dev.11

package/es/components/BatchAttrMetric/setting.js

@@ -7,7 +7,7 @@ import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
 var _excluded = ["value", "defaultSet", "dataSource"];
 import React, { useState, useMemo, useEffect } from 'react';
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 import ActionTree from '@riil-frontend/component-action-tree';
 import NoDataPage from '@riil-frontend/component-topology-common/es/components/NoDataPage';
 import TableLayout from '@riil-frontend/component-table-layout';

package/es/components/ModelAttrSelectDrawer/components/MultipleTypeAttributeSelectDrawer.js

@@ -1,5 +1,5 @@
 import React, { useState, useEffect, useRef, useImperativeHandle, forwardRef } from 'react';
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 import ModelAttrSelectDrawer from "./ModelAttrSelectDrawer";
 
 function parseValue(value) {

package/es/components/ResourceSelectDrawer/ResourceSelectDrawer.js

@@ -2,7 +2,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React, { useState, useEffect, useRef, useCallback } from 'react';
 import PropTypes from 'prop-types';
-import rlog from '@riil-frontend/component-topology-utils/lib/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 import Drawer from "../Drawer";
 import ResourceSelectList from "./ResourceSelectList";
 import styles from "./ResourceSelectDrawer.module.scss";

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

@@ -3,7 +3,7 @@ import _Button from "@alifd/next/es/button";
 import _Card from "@alifd/next/es/card";
 import React, { useState, useEffect } from 'react';
 import NoDataPage from '@riil-frontend/component-no-data-page';
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 import AlarmListItem from "./components/AlarmListItem";
 import styles from "./index.module.scss";
 import { alarmListDemo } from "./mocks";

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

@@ -3,7 +3,7 @@ import _Form from "@alifd/next/es/form";
 import _extends from "@babel/runtime/helpers/extends";
 import _Field from "@alifd/next/es/field";
 import React, { useEffect, useImperativeHandle, useState } from 'react';
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 import NodeTag from "./NodeTag";
 import EdgeFlow from "./EdgeFlow";
 import NodeTip from "./NodeTip";

package/es/core/components/DisplaySettingDrawer/DisplaySettingDrawer.js

@@ -2,8 +2,8 @@ import _Message from "@alifd/next/es/message";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _extends from "@babel/runtime/helpers/extends";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import React, { useEffect, useRef, useState } from 'react';
-import rlog from '@riil-frontend/component-topology-utils/lib/rlog';
+import React, { useRef, useState } from 'react';
+import { rlog } from '@riil-frontend/component-topology-utils';
 import Drawer from "../../../components/Drawer";
 import DisplaySetting from "./DisplaySetting";
 import useDisplaySetting from "./hooks/useDisplaySetting";

package/es/core/components/DisplaySettingDrawer/ResourceDisplay/BasicConfig.js

@@ -2,7 +2,7 @@ import _Button from "@alifd/next/es/button";
 import _Box from "@alifd/next/es/box";
 import _Radio from "@alifd/next/es/radio";
 import React, { useImperativeHandle, useRef } from 'react';
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 import { DEFAULT_CUSTOM_CONFIG } from "../../../../constants/ResourceInfoDisplay";
 import CommonCheckboxGroup from "./CommonCheckboxGroup";
 import ResourceDiplayInfoSetting from "../../ResourceViewAttributeSetting/Setting";

package/es/core/components/DisplaySettingDrawer/components/NodeAttrSettingDrawer.js

@@ -3,7 +3,7 @@ import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutP
 var _excluded = ["topo", "showType", "value"];
 import React, { forwardRef, useEffect, useState } from 'react';
 import PropTypes from 'prop-types';
-import rlog from '@riil-frontend/component-topology-utils/lib/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 import ModelAttrSelectDrawer from "../../../../components/ModelAttrSelectDrawer";
 import { getNodeModels } from "../../ResourceViewAttributeSetting/nodeCiTypeAttrUtil";
 /**

package/es/core/components/ResourceViewAttributeSetting/Setting.js

@@ -2,7 +2,7 @@ import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
 var _excluded = ["topo", "elementType", "showType", "value"];
 import React, { forwardRef, useState } from 'react';
-import rlog from '@riil-frontend/component-topology-utils/lib/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 import { getNodeModels } from "./nodeCiTypeAttrUtil";
 import ModelAttrSelectDrawer from "../../../components/ModelAttrSelectDrawer";
 /**

package/es/core/components/TopoView/topoView.js

@@ -5,7 +5,7 @@ import PropTypes from 'prop-types';
 import classnames from 'classnames';
 import TopoGraph, { TopoEvent } from '@riil-frontend/component-topology-graph';
 import PortalContainer from '@riil-frontend/component-topology-graph/es/components/PortalContainer';
-import rlog from '@riil-frontend/component-topology-utils/es/rlog'; // 通用
+import { rlog } from '@riil-frontend/component-topology-utils'; // 通用
 
 import showMessage from "../../utils/showMessage";
 import { TPL_TREE } from "../../../utils/template";
@@ -161,7 +161,11 @@ var Topology = function Topology(props) {
 
     if (initSelectionId) {
       var ele = topo.getHtTopo().getGraphView().dm().getDataByTag(initSelectionId);
-      topo.getHtTopo().getGraphView().sm().setSelection([ele]);
+
+      if (ele) {
+        topo.getHtTopo().getGraphView().sm().setSelection([ele]);
+      }
+
       var selectionDispatchers = topo.store.getModelDispatchers('selection');
       selectionDispatchers.update({
         initSelectionId: null

package/es/core/editor/components/BackgroundView/index.js

@@ -13,7 +13,7 @@ import UploadDialog from "./UploadDialog";
 import api from "../../../services/background";
 import { getBackgroundImageUrl, getBackgroundThumbnailImageUrl } from "../../../utils/backgroundUtil";
 import { getImageSize } from "../../../utils/imageUtil";
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 
 function List(props) {
   var selected = props.selected,

package/es/core/editor/components/CustomIconPlugin/UploadIconDialog.js

@@ -11,7 +11,7 @@ import React from 'react';
 import topoServer from '@riil-frontend/component-topology-common/es/services/topo/index';
 import _ from 'lodash';
 import { getToken } from '@riil-frontend/utils';
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 import { validateSpecialCharacter } from "../../../../utils/SpecialCharacterValidateUtil";
 import "./UploadIconDialog.scss";
 import styles from "./UploadIconDialog.module.scss";

package/es/core/editor/components/EditorPlugin.js

@@ -1,6 +1,6 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React, { useEffect } from 'react';
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 import CustomIconPlugin from "./CustomIconPlugin";
 import SaveLoading from "./plugins/SaveLoading";
 import GroupAddResourceDrawerPlugin from "./GroupAddResourceDrawerPlugin";

package/es/core/editor/components/Sidebar/views/ComponentPanel.js

@@ -1,5 +1,5 @@
 import React, { useEffect, useRef } from 'react';
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 /**
  * 组件面板
  * @param {*} props 

package/es/core/editor/components/Sidebar/views/ImagePanel/CiTypeImagePanel.js

@@ -1,5 +1,5 @@
 import React, { useMemo } from 'react';
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 import ImagePalette from "./HtImagePalette";
 /**
  * 组件面板

package/es/core/editor/components/Sidebar/views/ImagePanel/CustomImagePanel.js

@@ -1,5 +1,5 @@
 import React, { useEffect, useRef, useMemo } from 'react';
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 import { getUserCustomIconsForHt } from "../../../../../common/icons/icon";
 import HtCustomImagePanel from "./HtCustomImagePanel";
 /**

package/es/core/editor/components/Sidebar/views/ImagePanel/HtCustomImagePanel.js

@@ -1,6 +1,6 @@
 import React, { useEffect, useRef } from 'react';
 import ResizeObserver from 'resize-observer-polyfill';
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 import styles from "./HtImagePalette.module.scss";
 /**
  * 组件面板

package/es/core/editor/components/Sidebar/views/ImagePanel/HtImagePalette.js

@@ -1,5 +1,5 @@
 import React, { useEffect, useRef } from 'react';
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 import ResizeObserver from 'resize-observer-polyfill';
 import styles from "./HtImagePalette.module.scss";
 /**

package/es/core/editor/components/Sidebar/views/ImagePanel/ImagePalette.js

@@ -1,5 +1,5 @@
 import React, { useEffect, useRef } from 'react';
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 /**
  * 组件面板
  * @param {*} props 

package/es/core/editor/components/Sidebar/views/LinkPanel.js

@@ -1,5 +1,5 @@
 import React, { useEffect, useRef } from 'react';
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 /**
  * 链路面板
  * @param {*} props 

package/es/core/editor/components/Toolbar/widgets/EdgeTypeButton/EdgeType.js

@@ -1,3 +1,4 @@
+import _Box from "@alifd/next/es/box";
 import _Field from "@alifd/next/es/field";
 import _Select from "@alifd/next/es/select";
 import _Form from "@alifd/next/es/form";
@@ -142,12 +143,19 @@ function EdgeType(props) {
     className: styles.lineBox
   }, /*#__PURE__*/React.createElement(_Form, {
     field: field,
-    inline: true,
     labelAlign: "top"
   }, /*#__PURE__*/React.createElement(FormItem, null, /*#__PURE__*/React.createElement(LineType, {
     name: "lineButton"
-  })), /*#__PURE__*/React.createElement(FormItem, {
-    label: "\u8D77\u70B9"
+  })), /*#__PURE__*/React.createElement(_Form.Item, null, /*#__PURE__*/React.createElement(_Box, {
+    direction: "row",
+    style: {
+      gap: 8
+    }
+  }, /*#__PURE__*/React.createElement(FormItem, {
+    label: "\u8D77\u70B9",
+    style: {
+      margin: 0
+    }
   }, /*#__PURE__*/React.createElement(_Select, {
     name: "startPoint",
     placeholder: " ",
@@ -155,7 +163,8 @@ function EdgeType(props) {
       container: function container(trigger) {
         return trigger.parentNode;
       }
-    }
+    },
+    className: styles.endPointSelect
   }, START_TYPE_OPTIONS.map(function (item, index) {
     return /*#__PURE__*/React.createElement(Option, {
       value: item.value,
@@ -168,7 +177,10 @@ function EdgeType(props) {
       className: styles.iconImg
     }));
   }))), /*#__PURE__*/React.createElement(FormItem, {
-    label: "\u7EC8\u70B9"
+    label: "\u7EC8\u70B9",
+    style: {
+      margin: 0
+    }
   }, /*#__PURE__*/React.createElement(_Select, {
     name: "endPoint",
     placeholder: " ",
@@ -176,7 +188,8 @@ function EdgeType(props) {
       container: function container(trigger) {
         return trigger.parentNode;
       }
-    }
+    },
+    className: styles.endPointSelect
   }, END_TYPE_OPTIONS.map(function (item, index) {
     return /*#__PURE__*/React.createElement(Option, {
       value: item.value,
@@ -189,7 +202,10 @@ function EdgeType(props) {
       className: styles.iconImg
     }));
   }))), /*#__PURE__*/React.createElement(FormItem, {
-    label: "\u7C7B\u578B"
+    label: "\u7C7B\u578B",
+    style: {
+      margin: 0
+    }
   }, /*#__PURE__*/React.createElement(_Select, {
     name: "lineMold",
     popupProps: {
@@ -197,7 +213,8 @@ function EdgeType(props) {
         return trigger.parentNode;
       }
     },
-    placeholder: " "
+    placeholder: " ",
+    className: styles.lineMoldSelect
   }, LINE_MOLD_OPTIONS.map(function (item, index) {
     return /*#__PURE__*/React.createElement(Option, {
       value: item.value,
@@ -209,7 +226,7 @@ function EdgeType(props) {
       alt: "",
       className: styles.iconImg
     }));
-  })))));
+  })))))));
 }
 
 EdgeType.defaultProps = {

package/es/core/editor/components/Toolbar/widgets/EdgeTypeButton/EdgeType.module.scss

@@ -1,10 +1,30 @@
 @import '~@alifd/next/variables.scss';
 
 .lineBox{
-  width: 236px;
   background: #FFFFFF;
   border-radius: 4px;
   margin-bottom: -7px;
+
+  .endPointSelect {
+    min-width: 0;
+    width: 64px;
+    :global {
+      .#{$css-prefix}select-inner {
+        min-width:0 !important;
+      }
+    }
+  }
+
+  .lineMoldSelect {
+    min-width: 0;
+    width: 88px;
+    :global {
+      .#{$css-prefix}select-inner {
+        min-width:0 !important;
+      }
+    }
+  }
+
   :global {
     .#{$css-prefix}form-item:first-child{
       margin-top: 0;

package/es/core/editor/components/Toolbar/widgets/EdgeTypeButton/LineType.js

@@ -38,6 +38,15 @@ var LINE_TYPE_OPTIONS = [{
 //   icon: 'topo_linear_icon_pointsline',
 // },
 ];
+
+if (localStorage.getItem('topo.test.edge.customType') === 'true') {
+  LINE_TYPE_OPTIONS.push({
+    value: 'points',
+    label: '自由线形',
+    icon: 'topo_linear_icon_pointsline'
+  });
+}
+
 var LineType = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var value = props.value,
       onChange = props.onChange,

package/es/core/editor/components/settings/common/NodeSizeInput/NodeSizeInput.js

@@ -1,7 +1,7 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React, { useState } from 'react';
 import PropTypes from 'prop-types';
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 import SizeInput from "../SizeInput";
 var NODE_SIZE_LOCK = 'NODE_SIZE_LOCK';
 /**

package/es/core/editor/components/settings/common/SizeInput/NodeSizeInput.js

@@ -4,7 +4,7 @@ import _extends from "@babel/runtime/helpers/extends";
 import _Form from "@alifd/next/es/form";
 import React, { useState } from 'react';
 import PropTypes from 'prop-types';
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 import NodeSizeNumberPicker from "./NodeSizeNumberPicker";
 import styles from "./NodeSizeInput.module.scss";
 var FormItem = _Form.Item;

package/es/core/editor/components/settings/propertyViews/layer/BasicSetting.js

@@ -1,7 +1,7 @@
 import _Form from "@alifd/next/es/form";
 import _extends from "@babel/runtime/helpers/extends";
 import _Field from "@alifd/next/es/field";
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 import React, { useEffect } from 'react';
 import { SPECIAL_CHARACTER_FORM_ITEM_VALIDATE_PROPS, validateSpecialCharacter } from "../../../../../../utils/SpecialCharacterValidateUtil";
 import NameInput from "../../common/NameInput";

package/es/core/editor/components/settings/propertyViews/layer/SettingTab/Setting.js

@@ -5,7 +5,7 @@ import _Input from "@alifd/next/es/input";
 import _Field from "@alifd/next/es/field";
 import _Collapse from "@alifd/next/es/collapse";
 import React, { useState, useEffect } from 'react';
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 import AlignSetting from "../../../common/AlignSetting"; // import BatchSetNodeSize from '../../view/BatchSetNodeSize';
 
 import { SPECIAL_CHARACTER_FORM_ITEM_VALIDATE_PROPS, validateSpecialCharacter } from "../../../../../../../utils/SpecialCharacterValidateUtil"; // import LineType from '../../../common/LineType';

package/es/core/editor/components/settings/propertyViews/view/hooks/useBackgroundSizeConfig.js

@@ -1,4 +1,4 @@
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 import { useEffect, useState } from 'react';
 import useDataModelDataPropertyChange from "../../../../../../common/hooks/ht/useDataModelDataPropertyChange";
 export default (function (props) {

package/es/core/editor/hooks/useKeyboardShortcut.js

@@ -1,6 +1,6 @@
 import hotkeys from 'hotkeys-js';
 import { useEffect } from 'react';
-import { handleCopyHotkey, handlePasteHotkey } from "../utils/copyElementUtil";
+import { destroyPasteEventListener, handleCopyHotkey, handlePasteHotkey, initPasteEventListener } from "../utils/copyElementUtil";
 
 function initKeyboardShortcuts(props) {
   var topo = props.topo,
@@ -35,8 +35,10 @@ function unbindKeyboardShortcuts(props) {
 
 export default function useKeyboardShortcut(props) {
   useEffect(function () {
+    initPasteEventListener();
     initKeyboardShortcuts(props);
     return function () {
+      destroyPasteEventListener();
       unbindKeyboardShortcuts(props);
     };
   }, []);

package/es/core/editor/store/background.js

@@ -5,7 +5,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 /**
  * 背景图
  */
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 export default {
   // 定义 model 的初始 state
   state: {

package/es/core/editor/store/historyManager.js

@@ -4,7 +4,7 @@ import _extends from "@babel/runtime/helpers/extends";
  * 动态设置链路样式 Model
  */
 // import _ from 'lodash';
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 var defaultState = {
   undoable: false,
   redoable: false

package/es/core/editor/store/topoEdit.js

@@ -5,7 +5,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 /**
  * 拓扑编辑 Model
  */
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 var initState = {
   // 是否就绪
   ready: false,

package/es/core/editor/utils/copyElementUtil.js

@@ -1,13 +1,26 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
+import { clipboard } from "../../../utils/clipboardUtil";
 export function handleCopyHotkey(event, options) {
   var target = event.target || event.srcElement;
   var tagName = target.tagName;
 
   if (tagName !== 'BODY') {
-    copy(options);
+    copy(options.topo);
   }
 }
+export function initPasteEventListener() {
+  document.addEventListener("paste", handlePasteEventListener);
+}
+export function destroyPasteEventListener() {
+  document.removeEventListener("paste", handlePasteEventListener);
+}
+
+function handlePasteEventListener(e) {
+  var clipdata = e.clipboardData || window.clipboardData;
+  console.log("主动粘贴", clipdata.getData("text/plain"));
+}
+
 export function handlePasteHotkey(event, options) {
   var target = event.target || event.srcElement;
   var tagName = target.tagName;
@@ -17,8 +30,7 @@ export function handlePasteHotkey(event, options) {
   }
 }
 
-function copy(options) {
-  var topo = options.topo;
+function copy(topo) {
   var gv = topo.getHtTopo().getGraphView();
   var dm = gv.dm();
   var sm = dm.sm();
@@ -102,14 +114,14 @@ function doPaste(topo, clipboardText) {
   var parseDm = new ht.DataModel();
   var parseSerializer = new ht.JSONSerializer(parseDm);
   parseSerializer.deserialize(clipboardText);
-  var elements = parseDm.getDatas().toArray(); // 添加到拓扑图
+  var elements = parseDm.getDatas().toArray();
+  parseDm.clear(); // 添加到拓扑图
 
   var gv = topo.getHtTopo().getGraphView();
   var dm = gv.dm();
   elements.forEach(function (d) {
     dm.add(d);
-  });
-  parseDm.clear(); // 粘贴之后进行处理
+  }); // 粘贴之后进行处理
 
   var sm = dm.sm();
   sm.cs();
@@ -123,6 +135,8 @@ function doPaste(topo, clipboardText) {
   // TODO
   // gv.translate(-60, -60)
 
+
+  copy(topo);
 }
 
 function isPasetToOriginTopo() {
@@ -139,9 +153,10 @@ function _writeClipboard() {
     return _regeneratorRuntime.wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          navigator.clipboard.writeText(text);
+          localStorage.setItem('topo.copy.text', text);
+          clipboard.writeText(text);
 
-        case 1:
+        case 2:
         case "end":
           return _context2.stop();
       }
@@ -159,7 +174,7 @@ function _readClipboard() {
     return _regeneratorRuntime.wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
-          return _context3.abrupt("return", navigator.clipboard.readText());
+          return _context3.abrupt("return", localStorage.getItem('topo.copy.text'));
 
         case 1:
         case "end":

package/es/core/hooks/ht/useHtDataPropertyChangeListener.js

@@ -1,4 +1,4 @@
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 import { useEffect } from 'react';
 export default function useHtDataPropertyChangeListener(props) {
   var topo = props.topo,

package/es/core/hooks/useCiAttributeChange.js

@@ -1,25 +1,49 @@
 import _extends from "@babel/runtime/helpers/extends";
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 import CiCache from "../models/cache/CiCache";
 import useTopoEventListener from "./useTopoEventListener";
 
+function ciExistTopo(topoData, ciChangeData) {
+  if (!topoData) {
+    return false;
+  }
+
+  var ciIds = [].concat(topoData.nodes, topoData.links, topoData.linkGroups).map(function (data) {
+    return data.ciId || data.id;
+  });
+  return ciIds.includes(ciChangeData.id);
+}
+
 function mergeData(cis, ciChangeData) {
-  if (!cis.find(function (item) {
-    return item.id === ciChangeData.id || item.ciId === ciChangeData.id;
-  })) {
+  var matchData = function matchData(item) {
+    return (item.ciId || item.id) === ciChangeData.id;
+  };
+
+  if (!cis.find(matchData)) {
     return cis;
   }
 
   return cis.map(function (ci) {
-    if (ci.id === ciChangeData.id) {
-      return _extends({}, ci, {
-        attributes: _extends({}, ci.attributes, ciChangeData.attributes)
-      });
+    if (!matchData(ci)) {
+      return ci;
     }
 
-    return ci;
+    return _extends({}, ci, {
+      id: ci.id,
+      attributes: _extends({}, ci.attributes, ciChangeData.attributes)
+    });
   });
 }
+
+function mergeTopoData(topoData, ciChangeData) {
+  var newData = _extends({}, topoData, {
+    nodes: mergeData(topoData.nodes, ciChangeData),
+    links: mergeData(topoData.links, ciChangeData),
+    linkGroups: mergeData(topoData.linkGroups, ciChangeData)
+  });
+
+  return newData;
+}
 /**
  * 监听ci属性变更
  * 
@@ -35,13 +59,8 @@ export default function useCiAttributeChange(props) {
       // 更新拓扑数据
       var topoData = topo.store.getModelState('topoMod').data;
 
-      if (topoData) {
-        var newData = _extends({}, topoData, {
-          nodes: mergeData(topoData.nodes, ciChangeData),
-          links: mergeData(topoData.links, ciChangeData),
-          linkGroups: mergeData(topoData.linkGroups, ciChangeData)
-        });
-
+      if (ciExistTopo(topoData, ciChangeData)) {
+        var newData = mergeTopoData(topoData, ciChangeData);
         var topoDispatchers = topo.store.getModelDispatchers('topoMod');
         topoDispatchers.update({
           data: newData

package/es/core/hooks/useManageStatus.js

@@ -1,4 +1,4 @@
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 import { useEffect } from 'react';
 import useTopoEventListener from "./useTopoEventListener";
 ht.Default.setImage('resource.subIcon.unMoniter', '/img/topo/alarmStatusIcon/未监控.svg');

package/es/core/hooks/usePolling.js

@@ -4,7 +4,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { useEffect } from 'react';
 import { useRequest } from 'ahooks';
 import _ from 'lodash';
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 import { useCbbEventListener } from '@riil-frontend/component-riil-event-emitter';
 import DictCache from "../models/cache/DictCache";
 import useCiAttributeChange from "./useCiAttributeChange";

package/es/core/hooks/useResourceConfig.js

@@ -42,9 +42,7 @@ export default function (props) {
     return {
       resources: config.resources,
       groups: config.groups,
-      exportLinkIdList: config.exportLinkIdList,
-      relateTopoIdList: config.relateTopoIdList //linkIps: config.linkIps,
-
+      relateTopoIdList: config.relateTopoIdList
     };
   };