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

package/es/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/es/networkTopo/store/topoCenter.js

@@ -99,22 +99,45 @@ export 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(_extends({}, 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/es/style.js

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

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

@@ -21,8 +21,6 @@ var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-ut
 
 var _showMessage = _interopRequireDefault(require("../../utils/showMessage"));
 
-var _TitleBar = _interopRequireDefault(require("../titlebar/TitleBar"));
-
 var _template = require("../../../utils/template");
 
 var _edgeUtil = require("../../utils/edgeUtil");
@@ -187,7 +185,19 @@ var Topology = function Topology(props) {
     topo.selectionModel.init();
     topoDispatchers.update({
       graphLoaded: true
-    });
+    }); // url选中元素
+
+    var _topo$store$getModelS = topo.store.getModelState('selection'),
+        initSelectionId = _topo$store$getModelS.initSelectionId;
+
+    if (initSelectionId) {
+      var ele = topo.getHtTopo().getGraphView().dm().getDataByTag(initSelectionId);
+      topo.getHtTopo().getGraphView().sm().setSelection([ele]);
+      var selectionDispatchers = topo.store.getModelDispatchers('selection');
+      selectionDispatchers.update({
+        initSelectionId: null
+      });
+    }
 
     if (onLoaded) {
       onLoaded(topoData);
@@ -294,12 +304,7 @@ var Topology = function Topology(props) {
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: _TopoViewModule["default"].topoView,
     "data-version": topo.version
-  }, titleBar !== false && (titleBar || /*#__PURE__*/_react["default"].createElement(_TitleBar["default"], {
-    topo: topo,
-    viewerProps: viewerProps,
-    onEnterEdit: onEnterEdit,
-    topoEditApi: topoEdit
-  })), isEditMode && /*#__PURE__*/_react["default"].createElement(_EditorToolbar["default"], {
+  }, titleBar !== false && titleBar, isEditMode && /*#__PURE__*/_react["default"].createElement(_EditorToolbar["default"], {
     topo: topo,
     topoEdit: topoEdit,
     topoContext: {

package/lib/core/components/titlebar/index.js

@@ -30,4 +30,8 @@ exports.TitleWidget = _TitleWidget["default"];
 
 var _ViewerTools = _interopRequireDefault(require("../../viewer/components/titlebar/ViewerTools"));
 
-exports.ViewerTools = _ViewerTools["default"];
+exports.ViewerTools = _ViewerTools["default"];
+
+var _DebugTools = _interopRequireDefault(require("../../editor/components/titlebar/widgets/DebugTools"));
+
+exports.DebugTools = _DebugTools["default"];

package/lib/core/models/TopoApp.js

@@ -54,7 +54,7 @@ var _ElementTagTipConfig = _interopRequireDefault(require("./tagstips/ElementTag
 var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "7.0.0-dev.1" === 'string' ? "7.0.0-dev.1" : null;
+var version = typeof "7.0.0-dev.3" === 'string' ? "7.0.0-dev.3" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/core/store/coreModels.js

@@ -27,6 +27,8 @@ var _topoAlarm = _interopRequireDefault(require("./models/topoAlarm"));
 
 var _displayConfig = _interopRequireDefault(require("./models/displayConfig"));
 
+var _resourceDetail = _interopRequireDefault(require("./models/viewer/resourceDetail"));
+
 var _topoBaseInfoOverview = _interopRequireDefault(require("./models/topoBaseInfoOverview"));
 
 var _lock = _interopRequireDefault(require("./models/viewer/lock"));
@@ -46,6 +48,7 @@ var _default = {
   // 显示模式
   topoAlarm: _topoAlarm["default"],
   displayConfig: _displayConfig["default"],
+  resourceDetail: _resourceDetail["default"],
   topoBaseInfoOverview: _topoBaseInfoOverview["default"],
   lock: _lock["default"]
 };

package/lib/core/store/models/selection.js

@@ -20,7 +20,9 @@ var _default = {
   // 定义 model 的初始 state
   state: {
     selection: [],
-    selectionIds: []
+    selectionIds: [],
+    initSelectionId: null // 初始化选中元素
+
   },
   // 定义改变该模型状态的纯函数
   reducers: {

package/lib/core/store/models/viewer/resourceDetail.js

@@ -0,0 +1,40 @@
+"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 _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+
+/**
+ * 资源概览
+ */
+var _default = {
+  // 定义 model 的初始 state
+  state: {
+    visible: false,
+    id: null // 资源id
+
+  },
+  // 定义改变该模型状态的纯函数
+  reducers: {
+    update: function update(prevState, payload) {
+      return (0, _extends2["default"])({}, prevState, payload);
+    },
+    reset: function reset(prevState, payload) {
+      return {
+        visible: false,
+        id: null // 资源id
+
+      };
+    }
+  },
+  // 定义处理该模型副作用的函数
+  effects: function effects(dispatch) {
+    return {};
+  }
+};
+exports["default"] = _default;

package/lib/core/viewer/components/plugins/ResourceDetail/ResourceDetail.js

@@ -25,10 +25,7 @@ function ResourceDetail(props) {
   var topo = props.topo,
       userId = props.userId,
       activeData = props.activeData,
-      resourceData = props.resourceData; // {/* <Tab.Item title="操作" key="2">操作</Tab.Item>
-  //     <Tab.Item title="网络信息表" key="3">网络信息表</Tab.Item>
-  //     <Tab.Item title="Web工作台" key="4">Web工作台</Tab.Item> */}
-
+      resourceData = props.resourceData;
   var tabBodys = [{
     title: '资源概览',
     content: /*#__PURE__*/_react["default"].createElement(_ResourceOverview["default"], (0, _extends2["default"])({}, props, activeData, {
@@ -47,7 +44,7 @@ function ResourceDetail(props) {
       data: resourceData,
       topo: topo
     }),
-    visible: activeData.type === 'node' && !!((_topo$viewProps = topo.viewProps) !== null && _topo$viewProps !== void 0 && (_topo$viewProps$topoC = _topo$viewProps.topoContext) !== null && _topo$viewProps$topoC !== void 0 && _topo$viewProps$topoC.isNetworkTopo)
+    visible: resourceData.type === 'node' && !!((_topo$viewProps = topo.viewProps) !== null && _topo$viewProps !== void 0 && (_topo$viewProps$topoC = _topo$viewProps.topoContext) !== null && _topo$viewProps$topoC !== void 0 && _topo$viewProps$topoC.isNetworkTopo)
   }].filter(function (item) {
     return item.visible !== false;
   });