@riil-frontend/component-topology 6.0.20 → 7.0.0-dev.2

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

@@ -25,9 +25,9 @@ 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/menu-button/style';
 import '@alifd/next/es/tab/style';
 import '@riil-frontend/component-pager/es/style';
-import '@alifd/next/es/menu-button/style';
 import '@alifd/next/es/loading/style';
 import '@alifd/next/es/divider/style';
 

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

@@ -187,7 +187,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);

package/lib/core/editor/components/Toolbar/widgets/FontStyleButton.js

@@ -68,16 +68,8 @@ function FontStyleButton(props) {
     underline: underline
   })),
       value = _useState2[0],
-      setValue = _useState2[1]; // 选中的元素
+      setValue = _useState2[1];
 
-
-  var selection = topo.selectionModel.useHtSelection();
-  (0, _react.useEffect)(function () {
-    var containText = selection.filter(function (ele) {
-      return (0, _htElementUtils.isText)(ele);
-    }).length;
-    setDisabled(!containText);
-  }, [selection]);
   (0, _react.useEffect)(function () {
     setValue(buildValue({
       bold: bold,

package/lib/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/edgeTag.js

@@ -20,23 +20,21 @@ var _colorUtil = require("../colorUtil");
 var _excluded = ["color", "background", "opacity", "bold", "italic"];
 
 function getTextStyle(element) {
-  var underline = null;
   return (0, _extends2["default"])({
     color: (0, _colorUtil.parseColor)(element.a('edge.tag.color')),
     fontFamily: element.a('edge.tag.fontFamily') || '微软雅黑',
-    underline: underline
+    bold: !!element.a('edge.tag.fontBold'),
+    itatic: !!element.a('edge.tag.fontItalic')
   }, (0, _colorUtil.parseBackground)(element.a('edge.tag.background')));
 }
 
 function setTextStyle(element, style, topo) {
-  var _fontStyleUtil$remove = _fontStyleUtil["default"].removeBoldItalic(style),
-      color = _fontStyleUtil$remove.color,
-      background = _fontStyleUtil$remove.background,
-      opacity = _fontStyleUtil$remove.opacity,
-      bold = _fontStyleUtil$remove.bold,
-      italic = _fontStyleUtil$remove.italic,
-      otherStyle = (0, _objectWithoutPropertiesLoose2["default"])(_fontStyleUtil$remove, _excluded);
-
+  var color = style.color,
+      background = style.background,
+      opacity = style.opacity,
+      bold = style.bold,
+      italic = style.italic,
+      otherStyle = (0, _objectWithoutPropertiesLoose2["default"])(style, _excluded);
   var tagStyle = (0, _extends2["default"])({}, otherStyle);
 
   if ('color' in style) {
@@ -73,12 +71,12 @@ function setTextStyle(element, style, topo) {
 
 
 function getEnabledFields(element) {
-  return ['fontFamily', 'color', 'background', 'opacity'];
+  return ['fontFamily', 'color', 'background', 'opacity', 'fontSize', 'bold', 'italic'];
 }
 
 function getFieldDisabled(element) {
   return {
-    fontSize: true
+    fontSize: false
   };
 }
 

package/lib/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/nodeTag.js

@@ -20,7 +20,7 @@ var _colorUtil = require("../colorUtil");
 var _excluded = ["color", "background", "opacity", "bold", "italic"];
 
 function getTextStyle(element) {
-  var underline = null;
+  var underline = !!element.a('node.tag.fontUnderline');
   return (0, _extends2["default"])({
     color: (0, _colorUtil.parseColor)(element.a('ht.color')),
     underline: underline
@@ -28,14 +28,12 @@ function getTextStyle(element) {
 }
 
 function setTextStyle(element, style, topo) {
-  var _fontStyleUtil$remove = _fontStyleUtil["default"].removeBoldItalic(style),
-      color = _fontStyleUtil$remove.color,
-      background = _fontStyleUtil$remove.background,
-      opacity = _fontStyleUtil$remove.opacity,
-      bold = _fontStyleUtil$remove.bold,
-      italic = _fontStyleUtil$remove.italic,
-      otherStyle = (0, _objectWithoutPropertiesLoose2["default"])(_fontStyleUtil$remove, _excluded);
-
+  var color = style.color,
+      background = style.background,
+      opacity = style.opacity,
+      bold = style.bold,
+      italic = style.italic,
+      otherStyle = (0, _objectWithoutPropertiesLoose2["default"])(style, _excluded);
   var tagStyle = (0, _extends2["default"])({}, otherStyle);
 
   if ('color' in style) {
@@ -66,7 +64,7 @@ function setTextStyle(element, style, topo) {
 }
 
 function getEnabledFields(element) {
-  return ['fontFamily', 'color', 'background', 'opacity'];
+  return ['fontFamily', 'color', 'background', 'opacity', 'fontSize', 'bold', 'italic', 'underline'];
 }
 /**
  * 获得字段是否禁用
@@ -78,10 +76,10 @@ function getEnabledFields(element) {
 
 function getFieldDisabled(element) {
   return {
-    fontSize: true,
-    bold: true,
-    italic: true,
-    underline: true
+    fontSize: false,
+    bold: false,
+    italic: false,
+    underline: false
   };
 }
 

package/lib/core/editor/components/Toolbar/widgets/components/textStyleSetting/GlobalTagStyleSetting/GlobalTagStyleSetting.js

@@ -20,10 +20,10 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 var fieldDisabled = {
-  fontSize: true,
-  bold: true,
-  italic: true,
-  underline: true
+  fontSize: false,
+  bold: false,
+  italic: false,
+  underline: false
 };
 
 function GlobalTagStyleSetting(props) {

package/lib/core/editor/components/Toolbar/widgets/components/textStyleSetting/GlobalTagStyleSetting/globalTag.js

@@ -16,7 +16,7 @@ var _fontStyleUtil = _interopRequireDefault(require("../../../../../settings/com
 var _colorUtil = require("../ElementTextStyleSetting/colorUtil");
 
 var _excluded = ["color", "background", "opacity"],
-    _excluded2 = ["color", "background", "opacity", "bold", "italic"];
+    _excluded2 = ["color", "background", "opacity", "bold", "italic", "underline"];
 var defaultStyle = {
   color: '#AFB9C2',
   fontFamily: '微软雅黑'
@@ -29,7 +29,10 @@ function useValues(topo) {
   return (0, _extends2["default"])({
     color: (nodeLabelStyle === null || nodeLabelStyle === void 0 ? void 0 : nodeLabelStyle.color) || defaultStyle.color,
     fontFamily: (nodeLabelStyle === null || nodeLabelStyle === void 0 ? void 0 : nodeLabelStyle.fontFamily) || defaultStyle.fontFamily,
-    fontSize: nodeLabelStyle === null || nodeLabelStyle === void 0 ? void 0 : nodeLabelStyle.fontSize
+    fontSize: nodeLabelStyle === null || nodeLabelStyle === void 0 ? void 0 : nodeLabelStyle.fontSize,
+    bold: nodeLabelStyle === null || nodeLabelStyle === void 0 ? void 0 : nodeLabelStyle.bold,
+    italic: nodeLabelStyle === null || nodeLabelStyle === void 0 ? void 0 : nodeLabelStyle.italic,
+    underline: nodeLabelStyle === null || nodeLabelStyle === void 0 ? void 0 : nodeLabelStyle.underline
   }, (0, _colorUtil.parseBackground)(nodeLabelStyle === null || nodeLabelStyle === void 0 ? void 0 : nodeLabelStyle.background));
 }
 
@@ -74,14 +77,13 @@ function buildStyle(styleData, prevTagStyle) {
 }
 
 function buildGlobalStyle(styleData) {
-  var _fontStyleUtil$remove = _fontStyleUtil["default"].removeBoldItalic(styleData),
-      color = _fontStyleUtil$remove.color,
-      background = _fontStyleUtil$remove.background,
-      opacity = _fontStyleUtil$remove.opacity,
-      bold = _fontStyleUtil$remove.bold,
-      italic = _fontStyleUtil$remove.italic,
-      otherStyle = (0, _objectWithoutPropertiesLoose2["default"])(_fontStyleUtil$remove, _excluded2);
-
+  var color = styleData.color,
+      background = styleData.background,
+      opacity = styleData.opacity,
+      bold = styleData.bold,
+      italic = styleData.italic,
+      underline = styleData.underline,
+      otherStyle = (0, _objectWithoutPropertiesLoose2["default"])(styleData, _excluded2);
   var tagStyle = (0, _extends2["default"])({}, otherStyle);
 
   if ('color' in styleData) {
@@ -96,6 +98,10 @@ function buildGlobalStyle(styleData) {
     tagStyle.fontItalic = italic;
   }
 
+  if ('underline' in styleData) {
+    tagStyle.fontUnderline = underline;
+  }
+
   if ('background' in styleData) {
     // 背景颜色
     tagStyle.background = (0, _colorUtil.formatRgbaColor)(background);

package/lib/core/editor/hooks/useUpdateHtTopoDefaultTagStyle.js

@@ -22,12 +22,12 @@ function useUpdateHtTopoDefaultTagStyle(props) {
   var nodeLabelStyle = displayConfig.nodeLabelStyle,
       defaultEdgeLabelStyle = displayConfig.defaultEdgeLabelStyle;
   (0, _react.useEffect)(function () {
-    if (nodeLabelStyle) {
+    if (nodeLabelStyle && topo.getHtTopo().setDefaultNodeLabelStyle) {
       topo.getHtTopo().setDefaultNodeLabelStyle(nodeLabelStyle);
     }
   }, [nodeLabelStyle]);
   (0, _react.useEffect)(function () {
-    if (defaultEdgeLabelStyle) {
+    if (defaultEdgeLabelStyle && topo.getHtTopo().setDefaultEdgeTagStyle) {
       topo.getHtTopo().setDefaultEdgeTagStyle(defaultEdgeLabelStyle);
     }
   }, [defaultEdgeLabelStyle]);

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 "6.0.20" === 'string' ? "6.0.20" : null;
+var version = typeof "7.0.0-dev.2" === 'string' ? "7.0.0-dev.2" : 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;
   });