@riil-frontend/component-topology 2.7.0 → 2.7.4

package/es/utils/template.js

@@ -32,7 +32,7 @@ export var INIT_STATIC_STATE = {
  */
 
 export var DEFAULT_LAYOUT = {
-  id: 'circular'
+  id: 'hierarchical'
 };
 /**
  * 默认容器数据

package/lib/components/ResourceList/ResourceSelect.js

@@ -46,7 +46,7 @@ var getTableData = /*#__PURE__*/function () {
         switch (_context.prev = _context.next) {
           case 0:
             _params$current = params.current, current = _params$current === void 0 ? 1 : _params$current, _params$pageSize = params.pageSize, pageSize = _params$pageSize === void 0 ? 20 : _params$pageSize, _params$sortBy = params.sortBy, sortBy = _params$sortBy === void 0 ? 'displayName' : _params$sortBy, _params$sortOrder = params.sortOrder, sortOrder = _params$sortOrder === void 0 ? 'asc' : _params$sortOrder, like = params.like, typeCode = params.typeCode;
-            condition = 'category(\'resource\')';
+            condition = 'type(\'common_network\',\'switch\',\'switch_cluster\',\'linux\',\'windows\',\'oracle\',\'oracle.asm_disk_group\',\'tomcat\',\'application\',\'service\') && category(\'resource\')';
 
             if (like) {
               condition = {
@@ -90,7 +90,7 @@ var getTableData = /*#__PURE__*/function () {
 
               };
             });
-            return _context.abrupt("return", (0, _format.formatDataForTable)(dataSource, data.total, data.page, data.pageSize));
+            return _context.abrupt("return", (0, _format.formatDataForTable)(dataSource, data.totalRecord, data.pageIndex, data.pageSize));
 
           case 9:
           case "end":
@@ -172,7 +172,7 @@ var ResourceList = function ResourceList(props, ref) {
 
   };
   var defaultColumns = [{
-    title: '设备名称',
+    title: '资源名称',
     dataIndex: 'displayName',
     sortable: true,
     cell: _table.getTitleCell
@@ -184,7 +184,7 @@ var ResourceList = function ResourceList(props, ref) {
       return (0, _table.getTitleCell)((0, _format.getIp)(ip));
     }
   }, {
-    title: '类型',
+    title: '资源类型',
     dataIndex: 'typeCode',
     filters: filters.typeCode,
     cell: function cell(code) {
@@ -194,17 +194,17 @@ var ResourceList = function ResourceList(props, ref) {
       var name = dict && dict.label || code;
       return (0, _table.getTitleCell)(name);
     }
-  }, {
-    title: '厂商',
-    sortable: true,
-    dataIndex: 'company',
-    cell: function cell(code) {
-      var dict = _storage.DICT.get(code);
-
-      var name = dict && dict.name || code;
-      return (0, _table.getTitleCell)(name);
-    }
-  }];
+  } // {
+  //   title: '厂商',
+  //   sortable: true,
+  //   dataIndex: 'company',
+  //   cell: (code) => {
+  //     const dict = DICT.get(code);
+  //     const name = (dict && dict.name) || code;
+  //     return getTitleCell(name);
+  //   },
+  // }
+  ];
   return /*#__PURE__*/_react["default"].createElement(_FormTable["default"], {
     className: className || _ResourceSelectModule["default"].table,
     formProps: formProps,

package/lib/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/lib/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/lib/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/lib/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/lib/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/lib/core/editor/components/settings/text/TextPropertyView.js

@@ -24,9 +24,11 @@ var _TextStyle = _interopRequireDefault(require("../common/text/TextStyle"));
 var _fontStyleUtil = _interopRequireDefault(require("../common/text/fontStyleUtil"));
 
 var CollapsePanel = _collapse["default"].Panel;
+var DEFAULT_TEXT_VALUE = '文本输入';
 
 function parseValues(values) {
   return (0, _extends2["default"])({}, 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',
@@ -62,6 +64,12 @@ function TextPropertyView(props) {
       }
 
       if (values[name] !== value) {
+        if (name === 'styleMap.text' && !value) {
+          _onChange(name, DEFAULT_TEXT_VALUE, newValues);
+
+          return;
+        }
+
         _onChange(name, value, newValues);
       }
     }
@@ -96,7 +104,7 @@ function TextPropertyView(props) {
       minRows: 4,
       maxRows: 4
     },
-    placeholder: "\u8F93\u5165\u6587\u672C"
+    placeholder: "\u6587\u672C\u8F93\u5165"
   })), /*#__PURE__*/_react["default"].createElement(_form["default"].Item, null, /*#__PURE__*/_react["default"].createElement(_TextStyle["default"], {
     name: "styleMap.textObj"
   })))))));

package/lib/models/linkDynamicStyle.js

@@ -221,13 +221,28 @@ function _default(engine) {
 
                     links = [];
 
-                    if (isEdit && rootState.topoCreateMod.elements.links.length) {
-                      links = rootState.topoCreateMod.elements.links;
-                    } else {
-                      links = rootState.topoMod.topoData.links;
-                    } // 获取属性。无权限的属性为 []
+                    if (!(isEdit && rootState.topoCreateMod.elements.links.length)) {
+                      _context3.next = 9;
+                      break;
+                    }
+
+                    links = rootState.topoCreateMod.elements.links;
+                    _context3.next = 12;
+                    break;
+
+                  case 9:
+                    if (rootState.topoMod.topoData) {
+                      _context3.next = 11;
+                      break;
+                    }
+
+                    return _context3.abrupt("return");
 
+                  case 11:
+                    links = rootState.topoMod.topoData.links;
 
+                  case 12:
+                    // 获取属性。无权限的属性为 []
                     allLinkAttributes = rootState.topoBizMod.attrsAndMetrics; // 告警
 
                     alarmMap = rootState.topoBizMod.alarmDoc; // 如果是显示模式，过滤有告警的链路
@@ -281,7 +296,7 @@ function _default(engine) {
                       engine.view.topoClient.batchSetLineStyle(linkStyleMap);
                     }
 
-                  case 13:
+                  case 19:
                   case "end":
                     return _context3.stop();
                 }

package/lib/models/topoCreateMod.js

@@ -278,68 +278,27 @@ function _default(topoApp) {
     },
     effects: function effects(dispatch) {
       return {
-        getResourceList: function getResourceList(payload) {
+        getConditions: function getConditions() {
           var _this = this;
 
           return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
-            var _payload$index, index, resources, conditions, data;
-
+            var data, groupTopo, resources, groups;
             return _regenerator["default"].wrap(function _callee$(_context) {
               while (1) {
                 switch (_context.prev = _context.next) {
                   case 0:
-                    _payload$index = payload.index, index = _payload$index === void 0 ? -1 : _payload$index, resources = payload.resources;
-                    conditions = resToConditions(resources) || {};
-
-                    if (!(conditions.dynamic || conditions["static"])) {
-                      _context.next = 7;
-                      break;
-                    }
-
-                    _context.next = 5;
-                    return _topo["default"].getResourceList(conditions);
-
-                  case 5:
-                    data = _context.sent;
-
-                    if (index < 0) {
-                      _this.updateResList(data);
-                    } else {
-                      _this.updateGroupResList({
-                        index: index,
-                        data: data
-                      });
-                    }
-
-                  case 7:
-                  case "end":
-                    return _context.stop();
-                }
-              }
-            }, _callee);
-          }))();
-        },
-        getConditions: function getConditions() {
-          var _this2 = this;
-
-          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
-            var data, groupTopo, resources, groups;
-            return _regenerator["default"].wrap(function _callee2$(_context2) {
-              while (1) {
-                switch (_context2.prev = _context2.next) {
-                  case 0:
-                    _context2.next = 2;
+                    _context.next = 2;
                     return _topo["default"].getConditions(topoApp.id);
 
                   case 2:
-                    data = _context2.sent;
+                    data = _context.sent;
 
                     if ((0, _utils.isAvailableArray)(data)) {
-                      _context2.next = 5;
+                      _context.next = 5;
                       break;
                     }
 
-                    return _context2.abrupt("return");
+                    return _context.abrupt("return");
 
                   case 5:
                     // 视图
@@ -372,28 +331,28 @@ function _default(topoApp) {
                       };
                     });
 
-                    _this2.update({
+                    _this.update({
                       resources: resources,
                       groups: groups
                     });
 
                   case 9:
                   case "end":
-                    return _context2.stop();
+                    return _context.stop();
                 }
               }
-            }, _callee2);
+            }, _callee);
           }))();
         },
         fetchData: function fetchData(params, rootState) {
-          var _this3 = this;
+          var _this2 = this;
 
-          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
+          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
             var editState, resources, _editState$groups, groups, query, data;
 
-            return _regenerator["default"].wrap(function _callee3$(_context3) {
+            return _regenerator["default"].wrap(function _callee2$(_context2) {
               while (1) {
-                switch (_context3.prev = _context3.next) {
+                switch (_context2.prev = _context2.next) {
                   case 0:
                     editState = rootState.topoCreateMod;
                     resources = editState.resources, _editState$groups = editState.groups, groups = _editState$groups === void 0 ? [] : _editState$groups;
@@ -402,30 +361,30 @@ function _default(topoApp) {
                       resources: resources,
                       groups: groups
                     };
-                    _context3.next = 5;
-                    return _this3.getTopoByConditions(query);
+                    _context2.next = 5;
+                    return _this2.getTopoByConditions(query);
 
                   case 5:
-                    data = _context3.sent;
-                    return _context3.abrupt("return", data);
+                    data = _context2.sent;
+                    return _context2.abrupt("return", data);
 
                   case 7:
                   case "end":
-                    return _context3.stop();
+                    return _context2.stop();
                 }
               }
-            }, _callee3);
+            }, _callee2);
           }))();
         },
         getTopoByConditions: function getTopoByConditions(params, state) {
-          var _this4 = this;
+          var _this3 = this;
 
-          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
+          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
             var topoId, resources, groups, conditions, groupInfo, data, _yield$Promise$all, ciTypeMap, links, _combTopoData, topoData, resAndMetrics, topoDataTrans;
 
-            return _regenerator["default"].wrap(function _callee4$(_context4) {
+            return _regenerator["default"].wrap(function _callee3$(_context3) {
               while (1) {
-                switch (_context4.prev = _context4.next) {
+                switch (_context3.prev = _context3.next) {
                   case 0:
                     _rlog["default"].debug('getTopoByConditions--------', params);
 
@@ -437,19 +396,19 @@ function _default(topoApp) {
                         resources: resToConditions(group.resources)
                       });
                     });
-                    _context4.next = 6;
+                    _context3.next = 6;
                     return _topo["default"].getTopoDataByResource(topoId, conditions, groupInfo);
 
                   case 6:
-                    data = _context4.sent;
+                    data = _context3.sent;
 
                     _rlog["default"].debug('getTopoByConditions--------', data, groupInfo);
 
-                    _context4.next = 10;
+                    _context3.next = 10;
                     return Promise.all([topoApp.ciTyeCache.getCiTypeMap((0, _topoData.getCiTypes)(data)), (0, _linkUtils.getLinksDetail)(data.links), dispatch.iconManage.getIcons()]);
 
                   case 10:
-                    _yield$Promise$all = _context4.sent;
+                    _yield$Promise$all = _context3.sent;
                     ciTypeMap = _yield$Promise$all[0];
                     links = _yield$Promise$all[1];
                     _combTopoData = (0, _topoData.combTopoData)({
@@ -462,13 +421,13 @@ function _default(topoApp) {
                       ciTypeMap: ciTypeMap
                     }), topoData = _combTopoData.topoData, resAndMetrics = _combTopoData.resAndMetrics;
 
-                    _this4.update({
+                    _this3.update({
                       elements: topoData
                     });
 
                     topoDataTrans = (0, _utils2.transformTopoElements)(topoData);
 
-                    _this4.updateTopo(topoDataTrans); // const allCiSet = state.topoBizMod.allCiSet;
+                    _this3.updateTopo(topoDataTrans); // const allCiSet = state.topoBizMod.allCiSet;
                     // rlog.debug(
                     //   '新添加资源什么情况-topoData-resAndMetrics-allCiSet',
                     //   topoData,
@@ -483,41 +442,41 @@ function _default(topoApp) {
                     // });
                     // 返回查询后的数据，便于外部获取到数据后像HT通知更新
 
-                    return _context4.abrupt("return", topoDataTrans);
+                    return _context3.abrupt("return", topoDataTrans);
 
                   case 19:
                   case "end":
-                    return _context4.stop();
+                    return _context3.stop();
                 }
               }
-            }, _callee4);
+            }, _callee3);
           }))();
         },
         saveTopo: function saveTopo(data, state) {
-          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5() {
+          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
             var topoId, template, layout, global, resources, groups, serialize, layoutId, conditions, groupInfo;
-            return _regenerator["default"].wrap(function _callee5$(_context5) {
+            return _regenerator["default"].wrap(function _callee4$(_context4) {
               while (1) {
-                switch (_context5.prev = _context5.next) {
+                switch (_context4.prev = _context4.next) {
                   case 0:
                     topoId = data.id, template = data.template, layout = data.layout, global = data.global, resources = data.resources, groups = data.groups, serialize = data.serialize; // 保存布局
 
                     if (!(template && layout)) {
-                      _context5.next = 5;
+                      _context4.next = 5;
                       break;
                     }
 
                     layoutId = getLayoutId(layout);
-                    _context5.next = 5;
+                    _context4.next = 5;
                     return _topo["default"].changeLayout(topoId, template, layoutId);
 
                   case 5:
                     if (!global) {
-                      _context5.next = 8;
+                      _context4.next = 8;
                       break;
                     }
 
-                    _context5.next = 8;
+                    _context4.next = 8;
                     return _topo["default"].saveTopoSettings(topoId, (0, _topoData.combSaveTopoData)({
                       global: global,
                       ciSetDoc: state.topoBizMod.ciSetDoc,
@@ -526,16 +485,16 @@ function _default(topoApp) {
 
                   case 8:
                     if (!serialize) {
-                      _context5.next = 11;
+                      _context4.next = 11;
                       break;
                     }
 
-                    _context5.next = 11;
+                    _context4.next = 11;
                     return _topo["default"].saveSerializeData(topoId, serialize);
 
                   case 11:
                     if (!(resources || groups)) {
-                      _context5.next = 16;
+                      _context4.next = 16;
                       break;
                     }
 
@@ -546,34 +505,34 @@ function _default(topoApp) {
                         resources: resToConditions(group.resources, true)
                       });
                     });
-                    _context5.next = 16;
+                    _context4.next = 16;
                     return _topo["default"].bindResourceToTopo(topoId, conditions, groupInfo);
 
                   case 16:
                   case "end":
-                    return _context5.stop();
+                    return _context4.stop();
                 }
               }
-            }, _callee5);
+            }, _callee4);
           }))();
         },
         addToBlockList: function addToBlockList(data) {
-          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6() {
+          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5() {
             var topoId, ciIdList;
-            return _regenerator["default"].wrap(function _callee6$(_context6) {
+            return _regenerator["default"].wrap(function _callee5$(_context5) {
               while (1) {
-                switch (_context6.prev = _context6.next) {
+                switch (_context5.prev = _context5.next) {
                   case 0:
                     topoId = data.id, ciIdList = data.ciIdList;
-                    _context6.next = 3;
+                    _context5.next = 3;
                     return _topo["default"].addToBlocklist(topoId, ciIdList);
 
                   case 3:
                   case "end":
-                    return _context6.stop();
+                    return _context5.stop();
                 }
               }
-            }, _callee6);
+            }, _callee5);
           }))();
         },
         switchToEditMode: function switchToEditMode() {},

package/lib/models/topoMod.js

@@ -38,14 +38,13 @@ function _default(topoApp) {
       urlParams: {},
       topoLoading: true,
       topoLoadError: false,
-      topoId: '',
-      topoName: '',
-      topoPermission: undefined,
       viewState: 'view',
       // view, create, 2种模式
-      // lastRefresh: undefined,
+      topoId: '',
+      topoName: '',
       topoData: null,
       currentTopo: undefined,
+      topoPermission: undefined,
       currentNode: {
         id: '',
         name: '无数据'
@@ -196,7 +195,10 @@ function _default(topoApp) {
         },
         clearData: function clearData() {
           this.update({
-            topoData: null
+            topoId: '',
+            topoName: '',
+            topoData: null,
+            currentTopo: undefined
           });
         },
         switchToViewMode: function switchToViewMode(playload, rootState) {

package/lib/style.js

@@ -27,4 +27,5 @@ require('@alifd/next/lib/list/style');
 require('@alifd/next/lib/tree-select/style');
 
 
+
 require('./index.scss');