@riil-frontend/component-topology 2.5.7 → 2.7.2

package/es/components/BatchAttrMetric/setting.js

@@ -6,9 +6,9 @@ import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
 var _excluded = ["defaultSet", "dataType"];
 import React, { useState } from 'react';
-import rlog from '@riil-frontend/component-topology-utils/es/utils/rlog';
+import rlog from '@riil-frontend/component-topology-utils/es/rlog';
 import ActionTree from '@riil-frontend/component-action-tree';
-import NoDataPage from '@riil-frontend/component-topology-utils/es/components/NoDataPage';
+import NoDataPage from '@riil-frontend/component-topology-common/es/components/NoDataPage';
 import TableLayout from '@riil-frontend/component-table-layout';
 import RiilHooks from '@riil-frontend/hooks';
 import * as utils from "./utils";

package/es/components/FormTable/index.js

@@ -8,7 +8,7 @@ import Pagination from '@riil-frontend/component-pager';
 import MoreButtonsMenu from '@riil-frontend/component-more-buttons-menu';
 import TableFilterTags from '@riil-frontend/component-table-filter-tags';
 import TableLayout from '@riil-frontend/component-table-layout';
-import NoDataPage from '@riil-frontend/component-topology-utils/es/components/NoDataPage';
+import NoDataPage from '@riil-frontend/component-topology-common/es/components/NoDataPage';
 
 var FormTable = function FormTable(props) {
   var _tableProps$filterPar;

package/es/components/IndexSettingDrawer/IndexList.js

@@ -1,8 +1,8 @@
 import _Table from "@alifd/next/lib/table";
 import _extends from "@babel/runtime/helpers/extends";
 import React, { useMemo, useState } from 'react';
-import NoDataPage from '@riil-frontend/component-topology-utils/es/components/NoDataPage';
-import { getTitleCell } from '@riil-frontend/component-topology-utils/es/utils/table'; // import styles from './index.module.scss';
+import NoDataPage from '@riil-frontend/component-topology-common/es/components/NoDataPage';
+import { getTitleCell } from '@riil-frontend/component-topology-common/es/utils/table'; // import styles from './index.module.scss';
 
 var TYPES_NAME = {
   attributes: '属性',

package/es/components/Link/hook.js

@@ -5,7 +5,7 @@ var _excluded = ["run"];
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { useEffect, useState } from 'react';
 import { useRequest } from 'ahooks';
-import * as cmdbService from '@riil-frontend/component-topology-utils/es/services/cmdb';
+import * as cmdbService from '@riil-frontend/component-topology-common/es/services/cmdb';
 import { isAvailableArray } from '@riil-frontend/utils';
 
 function queryCiWithComponents(ids) {

package/es/components/Link/index.js

@@ -4,7 +4,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React, { forwardRef, useCallback, useEffect, useImperativeHandle, useState } from 'react';
 import { useBoolean } from 'ahooks';
-import rlog from '@riil-frontend/component-topology-utils/es/utils/rlog';
+import rlog from '@riil-frontend/component-topology-utils/es/rlog';
 import { TopoEvent } from '@riil-frontend/component-topology-graph';
 import styles from "./index.module.scss";
 import LinkSetting from "./setting";

package/es/components/MultiResourceDrawer/Dynamic.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { getRequest } from '@riil-frontend/component-topology-utils/es/request';
+import { getRequest } from '@riil-frontend/component-topology-common/es/utils/request';
 import ResSearch from '@riil-frontend/component-res-advanced-search';
 import ResourceCard from "./ResourceCard";
 

package/es/components/MultiResourceDrawer/index.js

@@ -1,5 +1,5 @@
 import React, { useRef } from 'react';
-import rlog from '@riil-frontend/component-topology-utils/es/utils/rlog';
+import rlog from '@riil-frontend/component-topology-utils/es/rlog';
 import Drawer from "../Drawer";
 import Content from "./Content";
 import ResourceSelect from "./ResourceSelect"; // import styles from './index.module.scss';

package/es/components/ResourceList/ResourceSelect.js

@@ -6,9 +6,9 @@ import useNextFormTable from '@ahooksjs/next-form-table';
 import useFilterPlugin from '@ahooksjs/use-filter-plugin';
 import useSortablePlugin from '@ahooksjs/use-sortable-plugin';
 import useSelectionPlugin from "../../common/plugins/useSelectionPlugin";
-import { fetchCommonQuery } from '@riil-frontend/component-topology-utils/es/services/cmdb';
-import { getTitleCell } from '@riil-frontend/component-topology-utils/es/utils/table';
-import { DICT } from '@riil-frontend/component-topology-utils/es/utils/storage';
+import { fetchCommonQuery } from '@riil-frontend/component-topology-common/es/services/cmdb';
+import { getTitleCell } from '@riil-frontend/component-topology-common/es/utils/table';
+import { DICT } from '@riil-frontend/component-topology-common/es/utils/storage';
 import { formatDataForTable, getIp } from "../../utils/format";
 import RiilTable from "../FormTable";
 import styles from "./ResourceSelect.module.scss";

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

@@ -1,5 +1,5 @@
 import React, { useState, useEffect, useRef, useCallback } from 'react';
-import NodataPage from '@riil-frontend/component-topology-utils/es/components/NoDataPage/index';
+import NodataPage from '@riil-frontend/component-topology-common/es/components/NoDataPage/index';
 import styles from "../../../components/index.module.scss";
 export default function Topo404(props) {
   return /*#__PURE__*/React.createElement(NodataPage, {

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

@@ -3,7 +3,7 @@ import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
 var _excluded = ["engine", "topo", "topoState", "titleBar", "onEnterEdit"];
 import React, { useState, useEffect, useRef, useCallback } from 'react';
-import NodataPage from '@riil-frontend/component-topology-utils/es/components/NoDataPage/index';
+import NodataPage from '@riil-frontend/component-topology-common/es/components/NoDataPage/index';
 import TopoView from "./topoView";
 import topoPermissonUtil from "../../../utils/topoPermissionUtil";
 import Topo404 from "./Topo404";

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

@@ -1,5 +1,5 @@
 import React, { useState, useEffect, useRef, useCallback } from 'react';
-import NodataPage from '@riil-frontend/component-topology-utils/es/components/NoDataPage/index';
+import NodataPage from '@riil-frontend/component-topology-common/es/components/NoDataPage/index';
 import styles from "../../../components/index.module.scss";
 export default function TopoNoPermission(props) {
   return /*#__PURE__*/React.createElement(NodataPage, {

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

@@ -2,7 +2,7 @@ import React, { useState, useEffect, useRef, useCallback } from 'react';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
 import TopoContainer, { TopoEvent } from '@riil-frontend/component-topology-graph';
-import rlog from '@riil-frontend/component-topology-utils/es/utils/rlog';
+import rlog from '@riil-frontend/component-topology-utils/es/rlog';
 import useTopoEdit from "../../../hooks/useTopoEdit";
 import usePolling from "../../../hooks/usePolling";
 import useAlarm from "../../../hooks/useAlarm";

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

@@ -1,5 +1,5 @@
 import React, { useEffect, useRef } from 'react';
-import rlog from '@riil-frontend/component-topology-utils/es/utils/rlog';
+import rlog from '@riil-frontend/component-topology-utils/es/rlog';
 import RuleSetting from "./RuleSetting";
 import Drawer from "../../../../components/Drawer";
 export default function LinkDynamicStyleSettingDrawer(props) {

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

@@ -1,7 +1,7 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React, { useState, useEffect, useRef, useCallback, useImperativeHandle, forwardRef } from 'react';
 import { TopoEvent } from '@riil-frontend/component-topology-graph';
-import rlog from '@riil-frontend/component-topology-utils/es/utils/rlog';
+import rlog from '@riil-frontend/component-topology-utils/es/rlog';
 import BatchAttrMetricDrawer from "../../../../components/BatchAttrMetric";
 import { updateAllCiDoc, updateCiDoc } from "../../../../utils/topoData";
 /**

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

@@ -5,7 +5,7 @@ import _extends from "@babel/runtime/helpers/extends";
 import _Message from "@alifd/next/lib/message";
 import _inheritsLoose from "@babel/runtime/helpers/inheritsLoose";
 import React from 'react';
-import topoServer from '@riil-frontend/component-topology-utils/es/services/topo/index';
+import topoServer from '@riil-frontend/component-topology-common/es/services/topo/index';
 import _ from 'lodash';
 import _svgToShape from "./utils/svgToShape";
 import styles from "./UploadIconDialog.module.scss";

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

@@ -5,7 +5,7 @@ import React, { useState } from 'react';
 import PropTypes from 'prop-types';
 import NodeSizeNumberPicker from "./NodeSizeNumberPicker";
 import styles from "./NodeSizeInput.module.scss";
-import rlog from "@riil-frontend/component-topology-utils/es/utils/rlog";
+import rlog from "@riil-frontend/component-topology-utils/es/rlog";
 var FormItem = _Form.Item;
 var Row = _Grid.Row,
     Col = _Grid.Col;
@@ -101,7 +101,7 @@ function NodeSizeInput(props) {
   };
 
   function parseValue(val) {
-    return val ? parseInt(val) : val;
+    return val ? Math.round(val) : val;
   }
 
   return /*#__PURE__*/React.createElement(_Form, {

package/es/core/editor/components/settings/common/NodeSizeInput/img/icon_/350/247/243/351/224/201.svg

@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 63.1 (92452) - https://sketch.com -->
-    <title>topo/source/Icon/解锁</title>
-    <desc>Created with Sketch.</desc>
-    <g id="topo/source/Icon/解锁" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Icon-HTSCIT_lianjieduankai" fill-rule="nonzero">
-            <g id="编组">
-                <rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="16" height="16"></rect>
-                <path d="M12.16836,11.80814 L4.69432,4.33403 L5.41203,3.61632 L12.88607,11.09043 L12.16836,11.80814 Z M6.20072,10.5109 L5.48301,9.79326 L6.9976,8.27867 L7.71531,8.99638 L6.20072,10.5109 Z" id="形状" fill="#4D6277"></path>
-                <polygon id="路径" fill="#4D6277" points="9.79536 5.48126 10.51307 6.19897 8.99848 7.71363 8.28077 6.99592"></polygon>
-                <path d="M9.729,3.303 L12.704,6.271 L10.128,8.847 L10.842,9.554 L13.775,6.621 L14.132,6.264 L13.775,5.907 L10.086,2.225 L9.729,1.868 L9.379,2.225 L6.439,5.158 L7.16,5.872 L9.729,3.303 Z M6.264,12.711 L3.296,9.743 L5.879,7.16 L5.158,6.439 L2.225,9.372 L1.868,9.729 L2.225,10.086 L5.914,13.775 L6.271,14.132 L6.621,13.775 L9.561,10.842 L8.847,10.128 L6.264,12.711 Z" id="形状" fill="#4D6277"></path>
-            </g>
-        </g>
-    </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 63.1 (92452) - https://sketch.com -->
+    <title>topo/source/Icon/解锁</title>
+    <desc>Created with Sketch.</desc>
+    <g id="topo/source/Icon/解锁" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Icon-HTSCIT_lianjieduankai" fill-rule="nonzero">
+            <g id="编组">
+                <rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="16" height="16"></rect>
+                <path d="M12.16836,11.80814 L4.69432,4.33403 L5.41203,3.61632 L12.88607,11.09043 L12.16836,11.80814 Z M6.20072,10.5109 L5.48301,9.79326 L6.9976,8.27867 L7.71531,8.99638 L6.20072,10.5109 Z" id="形状" fill="#4D6277"></path>
+                <polygon id="路径" fill="#4D6277" points="9.79536 5.48126 10.51307 6.19897 8.99848 7.71363 8.28077 6.99592"></polygon>
+                <path d="M9.729,3.303 L12.704,6.271 L10.128,8.847 L10.842,9.554 L13.775,6.621 L14.132,6.264 L13.775,5.907 L10.086,2.225 L9.729,1.868 L9.379,2.225 L6.439,5.158 L7.16,5.872 L9.729,3.303 Z M6.264,12.711 L3.296,9.743 L5.879,7.16 L5.158,6.439 L2.225,9.372 L1.868,9.729 L2.225,10.086 L5.914,13.775 L6.271,14.132 L6.621,13.775 L9.561,10.842 L8.847,10.128 L6.264,12.711 Z" id="形状" fill="#4D6277"></path>
+            </g>
+        </g>
+    </g>
 </svg>

package/es/core/editor/components/settings/common/NodeSizeInput/img/icon_/351/224/201.svg

@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 63.1 (92452) - https://sketch.com -->
-    <title>topo/source/Icon/锁</title>
-    <desc>Created with Sketch.</desc>
-    <g id="topo/source/Icon/锁" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Icon-HTSCIT_lianjie" fill-rule="nonzero">
-            <g id="编组">
-                <rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="16" height="16"></rect>
-                <path d="M6.264,12.711 L3.296,9.743 L5.879,7.16 L5.158,6.439 L2.225,9.372 L1.868,9.729 L2.225,10.086 L5.914,13.775 L6.271,14.132 L6.621,13.775 L9.561,10.842 L8.847,10.128 L6.264,12.711 Z M9.729,3.303 L12.704,6.271 L10.128,8.847 L10.842,9.554 L13.775,6.621 L14.132,6.264 L13.775,5.907 L10.086,2.225 L9.729,1.868 L9.379,2.225 L6.439,5.158 L7.16,5.872 L9.729,3.303 Z" id="形状" fill="#4D6277"></path>
-                <polygon id="路径" fill="#4D6277" points="10.51846 6.20114 6.20226 10.51727 5.48462 9.79956 9.80075 5.48336"></polygon>
-            </g>
-        </g>
-    </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 63.1 (92452) - https://sketch.com -->
+    <title>topo/source/Icon/锁</title>
+    <desc>Created with Sketch.</desc>
+    <g id="topo/source/Icon/锁" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Icon-HTSCIT_lianjie" fill-rule="nonzero">
+            <g id="编组">
+                <rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="16" height="16"></rect>
+                <path d="M6.264,12.711 L3.296,9.743 L5.879,7.16 L5.158,6.439 L2.225,9.372 L1.868,9.729 L2.225,10.086 L5.914,13.775 L6.271,14.132 L6.621,13.775 L9.561,10.842 L8.847,10.128 L6.264,12.711 Z M9.729,3.303 L12.704,6.271 L10.128,8.847 L10.842,9.554 L13.775,6.621 L14.132,6.264 L13.775,5.907 L10.086,2.225 L9.729,1.868 L9.379,2.225 L6.439,5.158 L7.16,5.872 L9.729,3.303 Z" id="形状" fill="#4D6277"></path>
+                <polygon id="路径" fill="#4D6277" points="10.51846 6.20114 6.20226 10.51727 5.48462 9.79956 9.80075 5.48336"></polygon>
+            </g>
+        </g>
+    </g>
 </svg>

package/es/core/editor/components/settings/common/text/img/bold.svg

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 63.1 (92452) - https://sketch.com -->
-    <title>topo/source/Icon/bold</title>
-    <desc>Created with Sketch.</desc>
-    <g id="topo/source/Icon/bold" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <rect id="矩形" fill="#000000" fill-rule="nonzero" opacity="0" x="0" y="0" width="16" height="16"></rect>
-        <g id="Icon-zitijiacu" transform="translate(4.000000, 3.000000)" fill="#4D6277" fill-rule="nonzero">
-            <path d="M7.01125,5.739125 C6.75175,5.339375 6.368875,5.0735 5.863,4.941875 L5.863,4.916375 C6.131125,4.788875 6.3565,4.646375 6.539125,4.488875 C6.722125,4.34 6.862375,4.1825 6.96025,4.01675 C7.1515,3.668 7.243,3.302375 7.234375,2.9195 C7.234375,2.171 7.002625,1.569125 6.539125,1.113875 C6.07975,0.663125 5.39275,0.433625 4.4785,0.425 L0.52225,0.425 L0.52225,9.7265 L4.79125,9.7265 C5.522875,9.7265 6.133,9.482 6.622375,8.992625 C7.115875,8.524625 7.36675,7.889 7.375,7.085375 C7.375,6.6005 7.253875,6.151625 7.01125,5.739125 Z M2.035,1.681625 L4.319125,1.681625 C4.833625,1.69025 5.212375,1.8155 5.454625,2.058125 C5.701375,2.317625 5.82475,2.6345 5.82475,3.00875 C5.82475,3.383 5.701375,3.6935 5.454625,3.94025 C5.212375,4.208 4.833625,4.34225 4.319125,4.34225 L2.035,4.34225 L2.035,1.681625 Z M5.601625,7.965875 C5.359375,8.24225 4.9765,8.38475 4.453375,8.393375 L2.035,8.393375 L2.035,5.59925 L4.453,5.59925 C4.976125,5.6075 5.359,5.745875 5.60125,6.014 C5.8435,6.28625 5.965,6.613625 5.965,6.9965 C5.965,7.370375 5.843875,7.693625 5.601625,7.965875 L5.601625,7.965875 Z" id="形状"></path>
-        </g>
-    </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 63.1 (92452) - https://sketch.com -->
+    <title>topo/source/Icon/bold</title>
+    <desc>Created with Sketch.</desc>
+    <g id="topo/source/Icon/bold" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <rect id="矩形" fill="#000000" fill-rule="nonzero" opacity="0" x="0" y="0" width="16" height="16"></rect>
+        <g id="Icon-zitijiacu" transform="translate(4.000000, 3.000000)" fill="#4D6277" fill-rule="nonzero">
+            <path d="M7.01125,5.739125 C6.75175,5.339375 6.368875,5.0735 5.863,4.941875 L5.863,4.916375 C6.131125,4.788875 6.3565,4.646375 6.539125,4.488875 C6.722125,4.34 6.862375,4.1825 6.96025,4.01675 C7.1515,3.668 7.243,3.302375 7.234375,2.9195 C7.234375,2.171 7.002625,1.569125 6.539125,1.113875 C6.07975,0.663125 5.39275,0.433625 4.4785,0.425 L0.52225,0.425 L0.52225,9.7265 L4.79125,9.7265 C5.522875,9.7265 6.133,9.482 6.622375,8.992625 C7.115875,8.524625 7.36675,7.889 7.375,7.085375 C7.375,6.6005 7.253875,6.151625 7.01125,5.739125 Z M2.035,1.681625 L4.319125,1.681625 C4.833625,1.69025 5.212375,1.8155 5.454625,2.058125 C5.701375,2.317625 5.82475,2.6345 5.82475,3.00875 C5.82475,3.383 5.701375,3.6935 5.454625,3.94025 C5.212375,4.208 4.833625,4.34225 4.319125,4.34225 L2.035,4.34225 L2.035,1.681625 Z M5.601625,7.965875 C5.359375,8.24225 4.9765,8.38475 4.453375,8.393375 L2.035,8.393375 L2.035,5.59925 L4.453,5.59925 C4.976125,5.6075 5.359,5.745875 5.60125,6.014 C5.8435,6.28625 5.965,6.613625 5.965,6.9965 C5.965,7.370375 5.843875,7.693625 5.601625,7.965875 L5.601625,7.965875 Z" id="形状"></path>
+        </g>
+    </g>
 </svg>

package/es/core/editor/components/settings/common/text/img/italics.svg

@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 63.1 (92452) - https://sketch.com -->
-    <title>topo/source/Icon/italics</title>
-    <desc>Created with Sketch.</desc>
-    <g id="topo/source/Icon/italics" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <rect id="矩形" fill="#000000" fill-rule="nonzero" opacity="0" x="2" y="2" width="12" height="12"></rect>
-        <polygon id="路径" fill="#4D6277" fill-rule="nonzero" points="8.77666667 4.29166666 7.19333333 12.2083333 8.77666667 12.2083333 8.77666667 13 4.02666667 13 4.02666667 12.2083333 5.60999999 12.2083333 7.19333333 4.29166666 5.60999999 4.29166666 5.60999999 3.5 10.36 3.5 10.36 4.29166666"></polygon>
-    </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 63.1 (92452) - https://sketch.com -->
+    <title>topo/source/Icon/italics</title>
+    <desc>Created with Sketch.</desc>
+    <g id="topo/source/Icon/italics" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <rect id="矩形" fill="#000000" fill-rule="nonzero" opacity="0" x="2" y="2" width="12" height="12"></rect>
+        <polygon id="路径" fill="#4D6277" fill-rule="nonzero" points="8.77666667 4.29166666 7.19333333 12.2083333 8.77666667 12.2083333 8.77666667 13 4.02666667 13 4.02666667 12.2083333 5.60999999 12.2083333 7.19333333 4.29166666 5.60999999 4.29166666 5.60999999 3.5 10.36 3.5 10.36 4.29166666"></polygon>
+    </g>
 </svg>

package/es/core/editor/components/settings/common/text/img/underline.svg

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 63.1 (92452) - https://sketch.com -->
-    <title>topo/source/Icon/underline</title>
-    <desc>Created with Sketch.</desc>
-    <g id="topo/source/Icon/underline" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <rect id="矩形" fill="#000000" fill-rule="nonzero" opacity="0" x="0" y="0" width="16" height="16"></rect>
-        <g id="Icon-zitixiahuaxian" transform="translate(3.000000, 3.000000)" fill="#4D6277" fill-rule="nonzero">
-            <path d="M5,8.507375 C7.01929112,8.507375 8.65625,6.87041612 8.65625,4.851125 L8.65625,0.05 L7.34375,0.05 L7.34375,4.851125 C7.34375,6.14554238 6.29441738,7.194875 5,7.194875 C3.70558262,7.194875 2.65625,6.14554238 2.65625,4.851125 L2.65625,0.05 L1.34375,0.05 L1.34375,4.851125 C1.34375,6.87041612 2.98070888,8.507375 5,8.507375 Z M9.125,9.380375 L0.875,9.380375 C0.667893219,9.380375 0.5,9.54826822 0.5,9.755375 C0.5,9.96248178 0.667893219,10.130375 0.875,10.130375 L9.125,10.130375 C9.33210678,10.130375 9.5,9.96248178 9.5,9.755375 C9.5,9.54826822 9.33210678,9.380375 9.125,9.380375 Z" id="形状"></path>
-        </g>
-    </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 63.1 (92452) - https://sketch.com -->
+    <title>topo/source/Icon/underline</title>
+    <desc>Created with Sketch.</desc>
+    <g id="topo/source/Icon/underline" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <rect id="矩形" fill="#000000" fill-rule="nonzero" opacity="0" x="0" y="0" width="16" height="16"></rect>
+        <g id="Icon-zitixiahuaxian" transform="translate(3.000000, 3.000000)" fill="#4D6277" fill-rule="nonzero">
+            <path d="M5,8.507375 C7.01929112,8.507375 8.65625,6.87041612 8.65625,4.851125 L8.65625,0.05 L7.34375,0.05 L7.34375,4.851125 C7.34375,6.14554238 6.29441738,7.194875 5,7.194875 C3.70558262,7.194875 2.65625,6.14554238 2.65625,4.851125 L2.65625,0.05 L1.34375,0.05 L1.34375,4.851125 C1.34375,6.87041612 2.98070888,8.507375 5,8.507375 Z M9.125,9.380375 L0.875,9.380375 C0.667893219,9.380375 0.5,9.54826822 0.5,9.755375 C0.5,9.96248178 0.667893219,10.130375 0.875,10.130375 L9.125,10.130375 C9.33210678,10.130375 9.5,9.96248178 9.5,9.755375 C9.5,9.54826822 9.33210678,9.380375 9.125,9.380375 Z" id="形状"></path>
+        </g>
+    </g>
 </svg>

package/es/core/editor/components/settings/text/TextPropertyView.js

@@ -7,9 +7,11 @@ import React, { useEffect } from 'react';
 import TextStyle from "../common/text/TextStyle";
 import fontStyleUtil from "../common/text/fontStyleUtil";
 var CollapsePanel = _Collapse.Panel;
+var DEFAULT_TEXT_VALUE = '文本输入';
 
 function parseValues(values) {
   return _extends({}, values, {
+    'styleMap.text': values['styleMap.text'] === DEFAULT_TEXT_VALUE ? '' : values['styleMap.text'],
     'styleMap.textObj': {
       color: values.styleMap['text.color'],
       underline: values.styleMap['text.decoration'] === 'underline',
@@ -45,6 +47,12 @@ export default function TextPropertyView(props) {
       }
 
       if (values[name] !== value) {
+        if (name === 'styleMap.text' && !value) {
+          _onChange(name, DEFAULT_TEXT_VALUE, newValues);
+
+          return;
+        }
+
         _onChange(name, value, newValues);
       }
     }
@@ -79,7 +87,7 @@ export default function TextPropertyView(props) {
       minRows: 4,
       maxRows: 4
     },
-    placeholder: "\u8F93\u5165\u6587\u672C"
+    placeholder: "\u6587\u672C\u8F93\u5165"
   })), /*#__PURE__*/React.createElement(_Form.Item, null, /*#__PURE__*/React.createElement(TextStyle, {
     name: "styleMap.textObj"
   })))))));

package/es/core/models/TopoApp.js

@@ -1,9 +1,9 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _extends from "@babel/runtime/helpers/extends";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import topoService from '@riil-frontend/component-topology-utils/es/services/topo';
-import { setRequest } from '@riil-frontend/component-topology-utils';
-import rlog from '@riil-frontend/component-topology-utils/es/utils/rlog';
+import topoService from '@riil-frontend/component-topology-common/es/services/topo';
+import { setRequest } from '@riil-frontend/component-topology-common';
+import rlog from '@riil-frontend/component-topology-utils/es/rlog';
 import CiTyeCache from "./cache/CiTyeCache";
 import Alarm from "./common/Alarm";
 import TopoGraphView from "./TopoGraphView";

package/es/core/models/attrAndMetric.js

@@ -1,4 +1,4 @@
-import rlog from "@riil-frontend/component-topology-utils/es/utils/rlog";
+import rlog from "@riil-frontend/component-topology-utils/es/rlog";
 import { findItem } from "../../utils/topoData";
 import { TopoEvent } from "@riil-frontend/component-topology-graph";
 import { metricValueFormat } from "@riil-frontend/utils";

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

@@ -1,7 +1,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-utils/es/services/topo';
+import topoService from '@riil-frontend/component-topology-common/es/services/topo';
 /**
  * Ci类型属性、指标缓存
  */

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

@@ -1,7 +1,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-utils/es/services/model';
+import * as modelService from '@riil-frontend/component-topology-common/es/services/model';
 /**
  * 数据字典缓存
  */

package/es/core/models/common/Alarm.js

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

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

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

package/es/core/models/utils/linkUtils.js

@@ -1,7 +1,7 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _extends from "@babel/runtime/helpers/extends";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import topoService from '@riil-frontend/component-topology-utils/es/services/topo';
+import topoService from '@riil-frontend/component-topology-common/es/services/topo';
 import { findItem } from "../../../utils/topoData";
 export function mergeLinksData(links, relationDetails) {
   return links.map(function (link) {

package/es/core/utils/showMessage.js

@@ -1,5 +1,5 @@
 import _Message from "@alifd/next/lib/message";
-import rlog from '@riil-frontend/component-topology-utils/es/utils/rlog';
+import rlog from '@riil-frontend/component-topology-utils/es/rlog';
 var MSG_TYPES = {
   info: 'notice',
   success: 'success',

package/es/core/viewer/components/plugins/ResourceDetail/topoDrawer.js

@@ -4,8 +4,8 @@ import _Button from "@alifd/next/lib/button";
 import _extends from "@babel/runtime/helpers/extends";
 import React, { useState, useEffect } from 'react';
 import { Link } from 'react-router-dom';
-import AlarmSimple from '@riil-frontend/component-topology-utils/es/components/AlarmSimple/index';
-import ResMetricsChartPool from '@riil-frontend/component-topology-utils/es/components/ResMetricsChartPool/index';
+import AlarmSimple from '@riil-frontend/component-topology-common/es/components/AlarmSimple/index';
+import ResMetricsChartPool from '@riil-frontend/component-topology-common/es/components/ResMetricsChartPool/index';
 import styles from "./index.module.scss";
 /**
  * 前台资源详情路由地址

package/es/hooks/useAlarm.js

@@ -1,7 +1,7 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { useEffect } from 'react';
-import rlog from '@riil-frontend/component-topology-utils/es/utils/rlog';
+import rlog from '@riil-frontend/component-topology-utils/es/rlog';
 import { EE } from '@riil-frontend/component-riil-event-emitter';
 import { isAvailableArray } from '@riil-frontend/utils';
 export default function useAlarm(options) {

package/es/hooks/useContainerLinkTopo.js

@@ -1,5 +1,5 @@
 import { TopoEvent } from '@riil-frontend/component-topology-graph';
-import rlog from '@riil-frontend/component-topology-utils/es/utils/rlog';
+import rlog from '@riil-frontend/component-topology-utils/es/rlog';
 import { loopTreeFun } from "../utils/tree";
 /**
  * 关联拓扑

package/es/hooks/usePolling.js

@@ -3,7 +3,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { useState, useEffect, useMemo } from 'react';
 import { useRequest } from 'ahooks';
 import _ from 'lodash';
-import rlog from '@riil-frontend/component-topology-utils/es/utils/rlog';
+import rlog from '@riil-frontend/component-topology-utils/es/rlog';
 import { TopoEvent } from '@riil-frontend/component-topology-graph';
 import { metricValueFormat } from '@riil-frontend/utils';
 import { findItem } from "../utils/topoData";

package/es/hooks/useTopoEdit.js

@@ -6,8 +6,8 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { useUpdateEffect, useDynamicList } from 'ahooks';
 import { isAvailableArray, isNull } from '@riil-frontend/utils';
-import rlog from '@riil-frontend/component-topology-utils/es/utils/rlog';
-import * as cmdbService from '@riil-frontend/component-topology-utils/es/services/cmdb';
+import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import * as cmdbService from '@riil-frontend/component-topology-common/es/services/cmdb';
 import { TopoEvent } from '@riil-frontend/component-topology-graph';
 import { filterNode, filterGroupById, filterGroupByTag, formatTreeDataSelect } from "../utils/format";
 import { DEFAULT_GROUP } from "../utils/template";

package/es/models/ciModel.js

@@ -1,7 +1,7 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _extends from "@babel/runtime/helpers/extends";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import { queryAllModel, getCiMetric, getCi } from '@riil-frontend/component-topology-utils/es/services/model';
+import { queryAllModel, getCiMetric, getCi } from '@riil-frontend/component-topology-common/es/services/model';
 import { getAllCiTypes } from "../utils/ciType";
 export default {
   state: {

package/es/models/iconManage.js

@@ -7,8 +7,8 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 /**
  * 图标管理 Model
  */
-import rlog from '@riil-frontend/component-topology-utils/es/utils/rlog';
-import topoService from '@riil-frontend/component-topology-utils/es/services/topo';
+import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import topoService from '@riil-frontend/component-topology-common/es/services/topo';
 import { buildIcons } from "../utils/topoIconUtil";
 export default function (engine) {
   return {

package/es/models/linkDynamicStyle.js

@@ -6,7 +6,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
  * 动态设置链路样式 Model
  */
 import _ from 'lodash';
-import rlog from '@riil-frontend/component-topology-utils/es/utils/rlog';
+import rlog from '@riil-frontend/component-topology-utils/es/rlog';
 var defaultConfig = {
   networkLink: {
     // 网络链路

package/es/models/linkManager.js

@@ -5,8 +5,8 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 /**
  * 链路新增、编辑 Model
  */
-import rlog from '@riil-frontend/component-topology-utils/es/utils/rlog';
-import topoService from '@riil-frontend/component-topology-utils/es/services/topo';
+import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import topoService from '@riil-frontend/component-topology-common/es/services/topo';
 export default function (topoApp) {
   return {
     // 定义 model 的初始 state

package/es/models/resourceWebControllUrlSetting.js

@@ -3,8 +3,8 @@ import _extends from "@babel/runtime/helpers/extends";
 /**
  * 资源web控制台url配置 Model
  */
-import rlog from '@riil-frontend/component-topology-utils/es/utils/rlog';
-import topoService from '@riil-frontend/component-topology-utils/es/services/topo';
+import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import topoService from '@riil-frontend/component-topology-common/es/services/topo';
 export default {
   // 定义 model 的初始 state
   state: {

package/es/models/topoAlarm.js

@@ -5,8 +5,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 /**
  * 告警
  */
-import rlog from '@riil-frontend/component-topology-utils/es/utils/rlog';
-import topoService from '@riil-frontend/component-topology-utils/es/services/topo';
+import topoService from '@riil-frontend/component-topology-common/es/services/topo';
 export default {
   // 定义 model 的初始 state
   state: {

package/es/models/topoBizMod.js

@@ -1,10 +1,10 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _extends from "@babel/runtime/helpers/extends";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import topoServer from '@riil-frontend/component-topology-utils/es/services/topo';
-import { getLatestMetrics } from '@riil-frontend/component-topology-utils/es/services/metric';
-import { getCiMeta } from '@riil-frontend/component-topology-utils/es/services/model';
-import rlog from '@riil-frontend/component-topology-utils/es/utils/rlog';
+import topoServer from '@riil-frontend/component-topology-common/es/services/topo';
+import { getLatestMetrics } from '@riil-frontend/component-topology-common/es/services/metric';
+import { getCiMeta } from '@riil-frontend/component-topology-common/es/services/model';
+import rlog from '@riil-frontend/component-topology-utils/es/rlog';
 import _ from 'lodash';
 import { findItem, findItemIndex, sortList } from "../utils/topoData";
 export default function (engine) {