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

package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/index.module.scss

@@ -1,135 +1,137 @@
 @import "~@alifd/next/variables.scss";
 
 .resource-overview {
-  .base-info {
-    margin-top: 16px;
-    margin-right: -25px;
-    overflow: hidden;
-    .item {
-      width: 220px;
-      max-width: 100%;
-      margin-right: 25px;
-      margin-bottom: 8px;
-      display: flex;
-      float: left;
-      .label {
-        white-space: nowrap;
-      }
-      .content {
-        flex: 1;
+
+}
+
+.base-info {
+  margin-top: 16px;
+  margin-right: -25px;
+  overflow: hidden;
+  .item {
+    width: 220px;
+    max-width: 100%;
+    margin-right: 25px;
+    margin-bottom: 8px;
+    display: flex;
+    float: left;
+    .label {
+      white-space: nowrap;
+    }
+    .content {
+      flex: 1;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      color: #4d6277;
+      .link {
+        width: 100%;
+        display: block;
         overflow: hidden;
         text-overflow: ellipsis;
         white-space: nowrap;
-        color: #4d6277;
-        .link {
-          width: 100%;
-          display: block;
-          overflow: hidden;
-          text-overflow: ellipsis;
-          white-space: nowrap;
-        }
       }
     }
   }
-  .indicator {
-    width: 525px;
-    margin: 20px 0 12px;
-    display: flex;
-    flex-wrap: wrap;
-    .no-data{
-      width: 100%;
-      height: 120px;
-      line-height: 120px;
-      text-align: center;
+}
+.indicator {
+  width: 525px;
+  margin: 20px 0 12px;
+  display: flex;
+  flex-wrap: wrap;
+  .no-data{
+    width: 100%;
+    height: 120px;
+    line-height: 120px;
+    text-align: center;
+  }
+  .item {
+    width: 240px;
+    margin-bottom: 24px;
+    &:nth-child(2n + 1) {
+      margin-right: 24px;
     }
-    .item {
-      width: 240px;
-      margin-bottom: 24px;
-      &:nth-child(2n + 1) {
-        margin-right: 24px;
-      }
-      .title {
-        font-size: 13px;
-        color: #78849c;
-      }
-      .content {
-        margin-top: 10px;
-        font-size: 26px;
-        color: #4d6277;
-      }
-      .chart {
-        margin-top: 16px;
-      }
+    .title {
+      font-size: 13px;
+      color: #78849c;
     }
-    // .row {
-    //   display: flex;
-    //   border-bottom: 1px solid #f2f5fa;
-    //   &:last-child {
-    //     border: none;
-    //   }
-    //   .item {
-    //     width: 175px;
-    //     height: 100px;
-    //     box-sizing: border-box;
-    //     display: flex;
-    //     flex-direction: column;
-    //     text-align: center;
-    //     border-right: 1px solid #f2f5fa;
-    //     &:last-child {
-    //       border: none;
-    //     }
-    //     .content {
-    //       margin-top: 19px;
-    //       height: 32px;
-    //       line-height: 32px;
-    //       font-size: 32px;
-    //       color: #4d6277;
-    //     }
-    //     .label {
-    //       margin-top: 12px;
-    //       height: 20px;
-    //       font-size: 14px;
-    //       font-weight: 400;
-    //       color: #78849c;
-    //       line-height: 20px;
-    //     }
-    //   }
-    // }
-  }
-  .alarm {
-    margin-top: 12px;
-    .alarm-title {
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
+    .content {
+      margin-top: 10px;
+      font-size: 26px;
+      color: #4d6277;
     }
-    .alarm-color-icon {
-      width: 12px;
-      height: 12px;
-      font-size: 12px;
-      margin-right: 4px;
+    .chart {
+      margin-top: 16px;
     }
-    .no-data {
-      font-size: 14px;
-      text-align: center;
-      color: var(--color-text1-4);
-      height: 120px;
-      line-height: 120px;
+  }
+  // .row {
+  //   display: flex;
+  //   border-bottom: 1px solid #f2f5fa;
+  //   &:last-child {
+  //     border: none;
+  //   }
+  //   .item {
+  //     width: 175px;
+  //     height: 100px;
+  //     box-sizing: border-box;
+  //     display: flex;
+  //     flex-direction: column;
+  //     text-align: center;
+  //     border-right: 1px solid #f2f5fa;
+  //     &:last-child {
+  //       border: none;
+  //     }
+  //     .content {
+  //       margin-top: 19px;
+  //       height: 32px;
+  //       line-height: 32px;
+  //       font-size: 32px;
+  //       color: #4d6277;
+  //     }
+  //     .label {
+  //       margin-top: 12px;
+  //       height: 20px;
+  //       font-size: 14px;
+  //       font-weight: 400;
+  //       color: #78849c;
+  //       line-height: 20px;
+  //     }
+  //   }
+  // }
+}
+.alarm {
+  margin-top: 12px;
+  .alarm-title {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+  .alarm-color-icon {
+    width: 12px;
+    height: 12px;
+    font-size: 12px;
+    margin-right: 4px;
+  }
+  .no-data {
+    font-size: 14px;
+    text-align: center;
+    color: var(--color-text1-4);
+    height: 120px;
+    line-height: 120px;
+  }
+  :global {
+    .#{$css-prefix}btn-helper {
+      vertical-align: baseline;
     }
-    :global {
-      .#{$css-prefix}btn-helper {
-        vertical-align: baseline;
-      }
-      .risk-icon {
-        color: #ff7843;
-      }
-      .#{$css-prefix}table .#{$css-prefix}table-body tr:last-child td {
-        border-bottom: none;
-      }
-      // .#{$css-prefix}btn{
-      //   height: 28px !important;
-      // }
+    .risk-icon {
+      color: #ff7843;
     }
+    .#{$css-prefix}table .#{$css-prefix}table-body tr:last-child td {
+      border-bottom: none;
+    }
+    // .#{$css-prefix}btn{
+    //   height: 28px !important;
+    // }
   }
 }
 

package/lib/core/viewer/components/titlebar/BasicTools.js

@@ -15,37 +15,23 @@ var _EditButton = _interopRequireDefault(require("./widgets/EditButton"));
 
 var _NodesDragSwitchWrapper = _interopRequireDefault(require("./widgets/NodesDragSwitchWrapper"));
 
-var _AlarmListShowButton = _interopRequireDefault(require("./widgets/AlarmListShowButton"));
-
 var _SettingButtonWidget = _interopRequireDefault(require("./widgets/SettingButtonWidget"));
 
-var _useEventData = _interopRequireDefault(require("../../../hooks/useEventData"));
+var _AlarmButton = _interopRequireDefault(require("./widgets/AlarmButton"));
 
 function BasicTools(props) {
   var topo = props.topo,
       _props$showEditButton = props.showEditButton,
       showEditButton = _props$showEditButton === void 0 ? true : _props$showEditButton,
       children = props.children;
-
-  var _topo$store$useModel = topo.store.useModel("topoAlarm"),
-      alarmState = _topo$store$useModel[0],
-      alarmDispatchers = _topo$store$useModel[1];
-
-  var alarmPanelIsOpen = alarmState.alarmPanelIsOpen;
-  var alarmData = (0, _useEventData["default"])({
-    topo: topo
-  });
   return /*#__PURE__*/_react["default"].createElement(_box["default"], {
     direction: "row",
     spacing: 8
   }, showEditButton && /*#__PURE__*/_react["default"].createElement(_EditButton["default"], (0, _extends2["default"])({
     topo: topo
-  }, props)), /*#__PURE__*/_react["default"].createElement(_AlarmListShowButton["default"], (0, _extends2["default"])({
+  }, props)), /*#__PURE__*/_react["default"].createElement(_AlarmButton["default"], (0, _extends2["default"])({
     topo: topo
-  }, props, {
-    alarmPanelIsOpen: alarmPanelIsOpen,
-    alarmData: alarmData
-  })), /*#__PURE__*/_react["default"].createElement(_SettingButtonWidget["default"], props), /*#__PURE__*/_react["default"].createElement(_NodesDragSwitchWrapper["default"], (0, _extends2["default"])({
+  }, props)), /*#__PURE__*/_react["default"].createElement(_SettingButtonWidget["default"], props), /*#__PURE__*/_react["default"].createElement(_NodesDragSwitchWrapper["default"], (0, _extends2["default"])({
     topo: topo
   }, props)), children);
 }

package/lib/core/viewer/components/titlebar/widgets/AlarmButton.js

@@ -0,0 +1,36 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = void 0;
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _react = _interopRequireDefault(require("react"));
+
+var _AlarmListShowButton = _interopRequireDefault(require("./AlarmListShowButton"));
+
+var _useEventData = _interopRequireDefault(require("../../../../hooks/useEventData"));
+
+function AlarmButton(props) {
+  var topo = props.topo;
+
+  var _topo$store$useModel = topo.store.useModel("topoAlarm"),
+      alarmState = _topo$store$useModel[0],
+      alarmDispatchers = _topo$store$useModel[1];
+
+  var alarmPanelIsOpen = alarmState.alarmPanelIsOpen;
+  var alarmData = (0, _useEventData["default"])({
+    topo: topo
+  });
+  return /*#__PURE__*/_react["default"].createElement(_AlarmListShowButton["default"], (0, _extends2["default"])({
+    topo: topo
+  }, props, {
+    alarmPanelIsOpen: alarmPanelIsOpen,
+    alarmData: alarmData
+  }));
+}
+
+var _default = AlarmButton;
+exports["default"] = _default;

package/lib/networkTopo/components/editor/useEditorProps.js

@@ -39,8 +39,8 @@ function useEditorProps(props) {
       var edge = _ref.edge;
       return edge.getTag() ? 'link' : null;
     },
-    showLinkConfig: true,
-    // 是否显示链路相关配置
-    plugins: [_LayerConfigPlugin["default"], _AddLinkDrawer["default"]]
-  }, customEditorProps);
+    showLinkConfig: true
+  }, customEditorProps, {
+    plugins: [_LayerConfigPlugin["default"], _AddLinkDrawer["default"]].concat((customEditorProps === null || customEditorProps === void 0 ? void 0 : customEditorProps.plugins) || [])
+  });
 }

package/lib/networkTopo/getTopoData.js

@@ -13,8 +13,6 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
-var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/services/topo"));
-
 var _linkUtils = require("../core/models/utils/linkUtils");
 
 var _services = require("../core/services");
@@ -144,19 +142,19 @@ function _buildData() {
   return _buildData.apply(this, arguments);
 }
 
-function getTopoData(_x4) {
+function getTopoData(_x4, _x5) {
   return _getTopoData.apply(this, arguments);
 }
 
 function _getTopoData() {
-  _getTopoData = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(id) {
+  _getTopoData = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(id, topoService) {
     var data;
     return _regenerator["default"].wrap(function _callee3$(_context3) {
       while (1) {
         switch (_context3.prev = _context3.next) {
           case 0:
             _context3.next = 2;
-            return _topo["default"].getTopoData(id);
+            return topoService.getTopoData(id);
 
           case 2:
             data = _context3.sent;

package/lib/networkTopo/store/topoCenter.js

@@ -110,22 +110,45 @@ var _default = {
                   });
 
                 case 22:
-                  _context.next = 26;
+                  _context.next = 29;
                   break;
 
                 case 24:
-                  _context.next = 26;
+                  if (!params.selectedElementTag) {
+                    _context.next = 27;
+                    break;
+                  }
+
+                  _context.next = 27;
+                  return dispatch.selection.update({
+                    initSelectionId: params.selectedElementTag
+                  });
+
+                case 27:
+                  _context.next = 29;
                   return dispatch.topoMod.initData((0, _extends2["default"])({}, params, {
                     type: params.type,
                     id: id
                   }));
 
-                case 26:
+                case 29:
                   _this.update({
                     loading: false
+                  }); // 是否打开概览
+
+
+                  if (!params.openResourceOverview) {
+                    _context.next = 33;
+                    break;
+                  }
+
+                  _context.next = 33;
+                  return dispatch.resourceDetail.update({
+                    visible: true,
+                    id: params.openResourceOverview
                   });
 
-                case 27:
+                case 33:
                 case "end":
                   return _context.stop();
               }

package/lib/style.js

@@ -1,45 +1,45 @@
 require('@riil-frontend/component-topology-graph/lib/style');
 require('@alifd/next/lib/box/style');
 require('@alifd/next/lib/message/style');
-require('@alifd/next/lib/button/style');
-require('@alifd/next/lib/icon/style');
-require('@alifd/next/lib/overlay/style');
-require('@alifd/next/lib/list/style');
-require('@alifd/next/lib/card/style');
-require('@riil-frontend/component-no-data-page/lib/style');
-require('@alifd/next/lib/drawer/style');
-require('@alifd/next/lib/form/style');
-require('@alifd/next/lib/field/style');
-require('@alifd/next/lib/radio/style');
-require('@alifd/next/lib/checkbox/style');
-require('@alifd/next/lib/table/style');
-require('@alifd/next/lib/search/style');
-require('@alifd/next/lib/grid/style');
-require('@riil-frontend/component-action-tree/lib/style');
-require('@riil-frontend/component-table-layout/lib/style');
-require('@riil-frontend/hooks/lib/style');
-require('@alifd/next/lib/balloon/style');
 require('@riil-frontend/component-topology-utils/lib/style');
-require('@alifd/next/lib/dropdown/style');
-require('@alifd/next/lib/menu/style');
-require('@alifd/next/lib/dialog/style');
 require('@riil-frontend/utils/lib/style');
 require('@riil-frontend/component-riil-event-emitter/lib/style');
+require('@alifd/next/lib/drawer/style');
+require('@alifd/next/lib/menu-button/style');
+require('@alifd/next/lib/search/style');
 require('@alifd/next/lib/tab/style');
+require('@alifd/next/lib/table/style');
+require('@riil-frontend/component-table-layout/lib/style');
 require('@riil-frontend/component-pager/lib/style');
-require('@alifd/next/lib/menu-button/style');
+require('@alifd/next/lib/button/style');
+require('@alifd/next/lib/icon/style');
 require('@alifd/next/lib/loading/style');
 require('@alifd/next/lib/divider/style');
+require('@riil-frontend/component-no-data-page/lib/style');
 
+require('@alifd/next/lib/overlay/style');
+require('@alifd/next/lib/checkbox/style');
 require('@riil-frontend/component-crucial-link-topo/lib/style');
 require('@alifd/next/lib/input/style');
+require('@alifd/next/lib/field/style');
+require('@alifd/next/lib/form/style');
+require('@alifd/next/lib/dialog/style');
 require('@alifd/next/lib/upload/style');
 require('@alifd/next/lib/config-provider/style');
 require('@riil-frontend/component-common-res-list/lib/style');
+require('@alifd/next/lib/balloon/style');
+require('@alifd/next/lib/menu/style');
+require('@alifd/next/lib/dropdown/style');
 require('@alifd/next/lib/range/style');
+require('@alifd/next/lib/radio/style');
 require('@alifd/next/lib/tag/style');
 require('@alifd/next/lib/number-picker/style');
 require('@alifd/next/lib/select/style');
 require('@alifd/next/lib/collapse/style');
+require('@alifd/next/lib/list/style');
 
+require('@alifd/next/lib/grid/style');
+require('@riil-frontend/component-action-tree/lib/style');
+require('@riil-frontend/hooks/lib/style');
+require('@alifd/next/lib/card/style');
 require('./index.scss');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "7.0.0-dev.1",
+  "version": "7.0.0-dev.11",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -116,6 +116,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@7.0.0-dev.1/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@7.0.0-dev.11/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }

package/es/core/editor/components/plugins/MultipleResourceSelectPlugin.js

@@ -1,15 +0,0 @@
-import React from 'react';
-import ComboResDrawer from "../../../../components/MultiResourceDrawer";
-export default function MultipleResourceSelectPlugin(props) {
-  var topoEdit = props.topoEdit;
-  return /*#__PURE__*/React.createElement(ComboResDrawer, {
-    visible: topoEdit.showComboResDrawer,
-    loading: topoEdit.topoLoading,
-    initialData: topoEdit.initialComboRes,
-    getExcludeIds: topoEdit.getAllNodeResourceIds,
-    mode: topoEdit.getAddResourceDrawerMode(),
-    onSave: topoEdit.onSaveComboRes,
-    onClose: topoEdit.onCloseComboResDrawer
-  });
-}
-;

package/lib/core/editor/components/plugins/MultipleResourceSelectPlugin.js

@@ -1,25 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-exports.__esModule = true;
-exports["default"] = MultipleResourceSelectPlugin;
-
-var _react = _interopRequireDefault(require("react"));
-
-var _MultiResourceDrawer = _interopRequireDefault(require("../../../../components/MultiResourceDrawer"));
-
-function MultipleResourceSelectPlugin(props) {
-  var topoEdit = props.topoEdit;
-  return /*#__PURE__*/_react["default"].createElement(_MultiResourceDrawer["default"], {
-    visible: topoEdit.showComboResDrawer,
-    loading: topoEdit.topoLoading,
-    initialData: topoEdit.initialComboRes,
-    getExcludeIds: topoEdit.getAllNodeResourceIds,
-    mode: topoEdit.getAddResourceDrawerMode(),
-    onSave: topoEdit.onSaveComboRes,
-    onClose: topoEdit.onCloseComboResDrawer
-  });
-}
-
-;