@riil-frontend/component-topology 12.0.0-dev.7 → 12.0.0-dev.9

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

@@ -3,7 +3,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _extends from "@babel/runtime/helpers/extends";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React, { useRef, useState } from 'react';
-import { rlog } from '@riil-frontend/component-topology-utils/lib/rlog';
+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";

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/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/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/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,5 +1,5 @@
 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";
 

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/useTopoEdit.js

@@ -554,7 +554,7 @@ var useTopoEdit = function useTopoEdit(params) {
 
   function _bindViewResources() {
     _bindViewResources = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee12(data) {
-      var config, _yield$editDispatcher3, elements;
+      var config, result, _elements;
 
       return _regeneratorRuntime.wrap(function _callee12$(_context12) {
         while (1) switch (_context12.prev = _context12.next) {
@@ -570,15 +570,19 @@ var useTopoEdit = function useTopoEdit(params) {
             return editDispatchers.fetchDataByConfig();
 
           case 6:
-            _yield$editDispatcher3 = _context12.sent;
-            elements = _yield$editDispatcher3.elements;
-            saveBind(TopoEvent.DATA_TYPE_RESOURCE_COMBO, elements); // 临时放这里，仅拓扑中心有
+            result = _context12.sent;
+            console.log("fetchDataByConfig", result);
 
-            if (topo.linkDynamicStyleExecutor) {
-              topo.linkDynamicStyleExecutor.execute();
+            if (result) {
+              _elements = result.elements;
+              saveBind(TopoEvent.DATA_TYPE_RESOURCE_COMBO, _elements); // 临时放这里，仅拓扑中心有
+
+              if (topo.linkDynamicStyleExecutor) {
+                topo.linkDynamicStyleExecutor.execute();
+              }
             }
 
-          case 10:
+          case 9:
           case "end":
             return _context12.stop();
         }
@@ -593,7 +597,7 @@ var useTopoEdit = function useTopoEdit(params) {
 
   function _addLayerResources() {
     _addLayerResources = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee13(group, newResourceIds) {
-      var _yield$editDispatcher4, elements, newElements;
+      var _yield$editDispatcher3, elements, newElements;
 
       return _regeneratorRuntime.wrap(function _callee13$(_context13) {
         while (1) switch (_context13.prev = _context13.next) {
@@ -608,8 +612,8 @@ var useTopoEdit = function useTopoEdit(params) {
             return editDispatchers.fetchDataByConfig();
 
           case 5:
-            _yield$editDispatcher4 = _context13.sent;
-            elements = _yield$editDispatcher4.elements;
+            _yield$editDispatcher3 = _context13.sent;
+            elements = _yield$editDispatcher3.elements;
             // 2022-11-10 修复 添加资源后分层重新布局问题，仅布局新增资源。替换api topo.updateElements(data)
             newElements = findUNExistedElements(elements);
             rlog.debug("添加分层资源", {
@@ -1001,7 +1005,7 @@ var useTopoEdit = function useTopoEdit(params) {
 
   function _relateNodeIp() {
     _relateNodeIp = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee15(txtValue, nodeElement) {
-      var dm, isUnique, ip, configObj, configData, _elements, newLinkElements, newLink, newLinkGroup, createElementsData, _htTopo;
+      var dm, isUnique, ip, configObj, configData, _elements2, newLinkElements, newLink, newLinkGroup, createElementsData, _htTopo;
 
       return _regeneratorRuntime.wrap(function _callee15$(_context15) {
         while (1) switch (_context15.prev = _context15.next) {
@@ -1023,7 +1027,7 @@ var useTopoEdit = function useTopoEdit(params) {
             isUnique = isUniqueIp(dm, txtValue, nodeElement); // 获取关联链路
 
             if (!isUnique) {
-              _context15.next = 23;
+              _context15.next = 24;
               break;
             }
 
@@ -1047,8 +1051,8 @@ var useTopoEdit = function useTopoEdit(params) {
           case 16:
             configData = _context15.sent;
             // console.log("configData",configObj, configData);
-            _elements = configData.elements;
-            newLinkElements = findUNExistedLinkElements(_elements); // console.log("configData", configData, newLinkElements);
+            _elements2 = configData.elements;
+            newLinkElements = findUNExistedLinkElements(_elements2); // console.log("configData", configData, newLinkElements);
 
             newLink = newLinkElements.filter(function (item) {
               return item.type === "link";
@@ -1063,7 +1067,8 @@ var useTopoEdit = function useTopoEdit(params) {
               nodes: [],
               links: newLink,
               linkGroups: newLinkGroup
-            }; // console.log("createElementsData", createElementsData);
+            };
+            console.log("createElementsData", createElementsData);
 
             if ([].concat(newLink, newLinkGroup).length > 0) {
               _htTopo = topo.getHtTopo();
@@ -1071,7 +1076,7 @@ var useTopoEdit = function useTopoEdit(params) {
               _htTopo.createElements(createElementsData);
             }
 
-          case 23:
+          case 24:
           case "end":
             return _context15.stop();
         }

package/es/core/models/Alarm.js

@@ -2,7 +2,7 @@ import _Dialog from "@alifd/next/es/dialog";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import topoService from '@riil-frontend/component-topology-common/es/services/topo';
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 import { isAvailableArray } from '@riil-frontend/utils';
 
 var Alarm = /*#__PURE__*/function () {

package/es/core/models/AttributeMetricDisplay.js

@@ -1,12 +1,13 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _extends from "@babel/runtime/helpers/extends";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 import { DEFAULT_NODE_TAG_COMMON_CONFIG, DEFAULT_TIP_COMMON_CONFIG } from "../../constants/ResourceInfoDisplay";
 import { isMonitoring } from "../utils/manageStatusUtil";
 import AttributeFormatter from "./attributeFormatter";
 import DictCache from "./cache/DictCache";
 import { getNodesNameVisible as _getNodesNameVisible, updateNodesNameVisible as _updateNodesNameVisible } from "./utils/nodeNameVisibleUtil";
+import { translateCisRefAttributeName } from "../../utils/ciRefAttributeTranslateUtil";
 
 function isGraphField(item) {
   return item.type === 'graph';
@@ -331,7 +332,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
             }); // 翻译引用属性
 
             _context.next = 4;
-            return this.translateRefAttribute(ciDatas);
+            return translateCisRefAttributeName(ciDatas);
 
           case 4:
             ciDatas = _context.sent;
@@ -461,8 +462,10 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
                 var refCi = refCiMap[refAttrs.id];
 
                 if (refCi) {
+                  // 引用ci名称获取规则：如果ci是树形结构（例如区域），取 tree_name_path；非树形，取display_name
+                  var displayName = refCi.attributes.tree_name_path || refCi.attributes.display_name;
                   attributeMap[refAttrs.attrCode + "_object"] = {
-                    displayName: refCi.attributes.display_name
+                    displayName: displayName
                   };
                 }
               });

package/es/core/models/HistoryManager.js

@@ -1,5 +1,5 @@
 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';
 var ht = window.ht;
 
 var HistoryManager = /*#__PURE__*/function () {

package/es/core/models/SelectionModel.js

@@ -1,5 +1,5 @@
 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 useHtElements from "../common/hooks/useHtElements";
 import ignoreList from "./selection/ignoreList";
 

package/es/core/models/TopoApp.js

@@ -2,7 +2,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _extends from "@babel/runtime/helpers/extends";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { setRequest } from '@riil-frontend/component-topology-utils';
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 import { cloneDeep } from 'lodash';
 import topoService from "../services/topo";
 import CiTypeCache from "./cache/CiTypeCache";
@@ -24,7 +24,7 @@ import ElementTagTipConfig from "./tagstips/ElementTagTipConfig";
 import SelectionModel from "./SelectionModel";
 import CiCache from "./cache/CiCache"; // eslint-disable-next-line no-undef
 
-var version = typeof "12.0.0-dev.7" === 'string' ? "12.0.0-dev.7" : null;
+var version = typeof "12.0.0-dev.9" === 'string' ? "12.0.0-dev.9" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/es/core/models/attributeFormatter/formatter/graphTransform.js

@@ -1,4 +1,4 @@
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 export default function graphTransform(options) {
   var item = options.item,
       ciData = options.ciData,

package/es/core/models/attributeFormatter/index.js

@@ -1,4 +1,4 @@
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 import attributeTransform from "./formatter/attributeTransform";
 import metricTransform from "./formatter/metricTransform";
 import ciTypeAttrTransform from "./formatter/ciTypeAttrTransform";

package/es/core/models/cache/CiTypeCache.js

@@ -3,7 +3,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import topoService from '@riil-frontend/component-topology-common/es/services/topo';
-import rlog from '@riil-frontend/component-topology-utils/lib/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 import keyBy from 'lodash/keyBy';
 /**
  * Ci类型属性、指标缓存
@@ -106,6 +106,10 @@ var CiTypeCache = /*#__PURE__*/function () {
     this.ciTypeMap = cache;
   };
 
+  _proto.getCiTypeMap = function getCiTypeMap() {
+    return this.ciTypeMap;
+  };
+
   _proto.getCiType = function getCiType(typeCode) {
     return this.ciTypeMap[typeCode];
   };

package/es/core/models/cache/DictCache.js

@@ -2,7 +2,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { dictFormat } from '@riil-frontend/utils';
 import * as modelService from '@riil-frontend/component-topology-common/es/services/model';
-import rlog from '@riil-frontend/component-topology-utils/lib/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 /**
  * 数据字典缓存
  */

package/es/core/models/plugins/resourceWebControllUrl.js

@@ -2,7 +2,7 @@ import _Message from "@alifd/next/es/message";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import topoService from '@riil-frontend/component-topology-common/es/services/topo';
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 export default function (topo) {
   var resourceUrlMap = {};
   var currentId = null;

package/es/core/models/tagstips/ElementTagTipConfig.js

@@ -2,7 +2,7 @@ import _extends from "@babel/runtime/helpers/extends";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import keyBy from 'lodash/keyBy';
-import rlog from '@riil-frontend/component-topology-utils/lib/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 import { getLinkMtCodes, getMtCodeCiTypeMap, getNodeMtCodes } from "./utils";
 import { getMetricsByMonitorTemplateCodes } from "../../services/topo/tagtip";
 /**

package/es/core/services/alarm.js

@@ -2,7 +2,7 @@ import _extends from "@babel/runtime/helpers/extends";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import topoService from '@riil-frontend/component-topology-common/es/services/topo';
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 export default {
   /**
    * 查询告警列表，包含主资源和子组件告警

package/es/core/services/index.js

@@ -16,7 +16,7 @@ function _queryCisByIds() {
           return commonQueryCiDataByIds(ids, {
             orders: [],
             pageIndex: 1,
-            pageSize: 100000
+            pageSize: 10000
           });
 
         case 2:

package/es/core/store/models/customIcon.js

@@ -7,7 +7,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';
 import topoService from '@riil-frontend/component-topology-common/es/services/topo';
 import { iconFactory } from '@riil-frontend/component-topology-graph';
 import { getCustomIconHtId, getCustomIconIdFromHtId, getEditorIcons, transformCustomIcon2HtIcon, transformCustomIcons2HtIcons } from "../../common/icons/icon";

package/es/core/store/models/displayConfig.js

@@ -6,7 +6,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
  * 动态设置链路样式 Model
  */
 // import _ from 'lodash';
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { rlog } from '@riil-frontend/component-topology-utils';
 export default function (topo) {
   return {
     // 定义 model 的初始 state

package/es/core/store/models/selection.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';
 export default {
   // 定义 model 的初始 state
   state: {

package/es/core/store/models/topoBaseInfoOverview.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';
 import topoService from '@riil-frontend/component-topology-common/es/services/topo';
 export default {
   // 定义 model 的初始 state