@riil-frontend/component-topology 9.0.6 → 9.0.7

package/es/core/hooks/useManageStatus.js

@@ -1,24 +1,7 @@
-import _extends from "@babel/runtime/helpers/extends";
 import rlog from '@riil-frontend/component-topology-utils/es/rlog';
 import { useEffect } from 'react';
 import useTopoEventListener from "./useTopoEventListener";
 ht.Default.setImage('resource.subIcon.unMoniter', '/img/topo/alarmStatusIcon/未监控.svg');
-
-function mergeManageStatus(cis, manageStatusDatas) {
-  return cis.map(function (ci) {
-    var manageStatusData = manageStatusDatas.find(function (item) {
-      return item.ciId === ci.id;
-    });
-
-    if (manageStatusData) {
-      return _extends({}, ci, {
-        manageStatus: manageStatusData.manageStatus
-      });
-    }
-
-    return ci;
-  });
-}
 /**
  * 监听监控状态推送
  * 节点、连线监控状态置灰
@@ -26,26 +9,18 @@ function mergeManageStatus(cis, manageStatusDatas) {
  * @param {*} props 
  */
 
-
 export default function useManageStatus(props) {
   var topo = props.topo;
   useTopoEventListener({
     type: 'manageStatus',
     onMessage: function onMessage(manageStatusDatas) {
-      var topoData = topo.store.getModelState('topoMod').data;
-
-      if (topoData) {
-        var newData = _extends({}, topoData, {
-          nodes: mergeManageStatus(topoData.nodes, manageStatusDatas),
-          links: mergeManageStatus(topoData.links, manageStatusDatas),
-          linkGroups: mergeManageStatus(topoData.linkGroups, manageStatusDatas)
-        });
-
-        var topoDispatchers = topo.store.getModelDispatchers('topoMod');
-        topoDispatchers.update({
-          data: newData
-        });
-      }
+      var data = manageStatusDatas.map(function (item) {
+        return {
+          id: item.ciId,
+          manageStatus: item.manageStatus
+        };
+      });
+      topo.dataModel.updateData(data);
     }
   });
 }

package/es/core/models/DataModel.js

@@ -132,6 +132,44 @@ var DataModel = /*#__PURE__*/function () {
 
   _proto.getAllEdgesBetweenTwoSelectionNodes = function getAllEdgesBetweenTwoSelectionNodes() {
     return [].concat(this.getEdgesBetweenTwoSelectionNodes(), this.getEdgeGroupsBetweenTwoSelectionNodes());
+  }
+  /**
+   * 更新数据
+   * @param {[{id: '', attributes: {}}]} ciDatas 
+   */
+  ;
+
+  _proto.updateData = function updateData(ciDatas) {
+    var topoData = this.topo.store.getModelState('topoMod').data;
+
+    if (topoData) {
+      var newData = _extends({}, topoData, {
+        nodes: mergeData(topoData.nodes, ciDatas),
+        links: mergeData(topoData.links, ciDatas),
+        linkGroups: mergeData(topoData.linkGroups, ciDatas)
+      });
+
+      var topoDispatchers = this.topo.store.getModelDispatchers('topoMod');
+      topoDispatchers.update({
+        data: newData
+      });
+    }
+
+    function mergeData(cis, arr) {
+      return cis.map(function (ci) {
+        var dataItem = arr.find(function (item) {
+          return item.id === ci.id;
+        });
+
+        if (dataItem) {
+          return _extends({}, ci, dataItem, {
+            attributes: dataItem.attributes ? _extends({}, ci.attributes, dataItem.attributes) : ci.attributes
+          });
+        }
+
+        return ci;
+      });
+    }
   };
 
   return DataModel;

package/es/core/models/TopoApp.js

@@ -24,7 +24,7 @@ import ElementTagTipConfig from "./tagstips/ElementTagTipConfig";
 import SelectionModel from "./SelectionModel";
 import CiCache from "./cache/CiCache"; // eslint-disable-next-line no-undef
 
-var version = typeof "9.0.6" === 'string' ? "9.0.6" : null;
+var version = typeof "9.0.7" === 'string' ? "9.0.7" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/NetworkBaseInfo.js

@@ -3,8 +3,8 @@ import _Switch from "@alifd/next/es/switch";
 import React, { useState } from 'react';
 import BaseInfoBlock from "./BaseInfoBlock";
 import Configurator from "./components/Configurator";
-// import { isExitLink } from '@/core/models/utils/linkUtils';
-// 基本信息
+import { isExitLink } from "../../../../../../models/utils/linkUtils"; // 基本信息
+
 export default function NetworkBaseInfo(props) {
   var loading = props.loading,
       topo = props.topo,
@@ -45,7 +45,7 @@ export default function NetworkBaseInfo(props) {
 
   var crucialBaseInfo = {};
 
-  if (targetNode.permission.writeable && sourceNode.permission.writeable) {
+  if (isExitLink(edge) && sourceNode.permission.writeable || !isExitLink(edge) && targetNode.permission.writeable && sourceNode.permission.writeable) {
     crucialBaseInfo = {
       contentTitle: topo.dataModel.getDataById(data.id).attributes['network_link.is_crucial'] ? '是' : '否',
       dataIndex: 'isCrucial',

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

@@ -5,16 +5,20 @@
 }
 
 .base-info {
-  margin-top: 16px;
+  margin-top: 0px;
   margin-right: -25px;
   overflow: hidden;
+  .item:last-child{
+    margin-bottom: 0px;
+  }
   .item {
     width: 220px;
     max-width: 100%;
     margin-right: 25px;
-    margin-bottom: 8px;
+    margin-bottom: 4px;
     display: flex;
     float: left;
+    line-height: 22px;
     .label {
       white-space: nowrap;
     }

package/lib/core/hooks/useManageStatus.js

@@ -5,8 +5,6 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports["default"] = useManageStatus;
 
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
 var _react = require("react");
@@ -14,22 +12,6 @@ var _react = require("react");
 var _useTopoEventListener = _interopRequireDefault(require("./useTopoEventListener"));
 
 ht.Default.setImage('resource.subIcon.unMoniter', '/img/topo/alarmStatusIcon/未监控.svg');
-
-function mergeManageStatus(cis, manageStatusDatas) {
-  return cis.map(function (ci) {
-    var manageStatusData = manageStatusDatas.find(function (item) {
-      return item.ciId === ci.id;
-    });
-
-    if (manageStatusData) {
-      return (0, _extends2["default"])({}, ci, {
-        manageStatus: manageStatusData.manageStatus
-      });
-    }
-
-    return ci;
-  });
-}
 /**
  * 监听监控状态推送
  * 节点、连线监控状态置灰
@@ -37,25 +19,18 @@ function mergeManageStatus(cis, manageStatusDatas) {
  * @param {*} props 
  */
 
-
 function useManageStatus(props) {
   var topo = props.topo;
   (0, _useTopoEventListener["default"])({
     type: 'manageStatus',
     onMessage: function onMessage(manageStatusDatas) {
-      var topoData = topo.store.getModelState('topoMod').data;
-
-      if (topoData) {
-        var newData = (0, _extends2["default"])({}, topoData, {
-          nodes: mergeManageStatus(topoData.nodes, manageStatusDatas),
-          links: mergeManageStatus(topoData.links, manageStatusDatas),
-          linkGroups: mergeManageStatus(topoData.linkGroups, manageStatusDatas)
-        });
-        var topoDispatchers = topo.store.getModelDispatchers('topoMod');
-        topoDispatchers.update({
-          data: newData
-        });
-      }
+      var data = manageStatusDatas.map(function (item) {
+        return {
+          id: item.ciId,
+          manageStatus: item.manageStatus
+        };
+      });
+      topo.dataModel.updateData(data);
     }
   });
 }

package/lib/core/models/DataModel.js

@@ -140,6 +140,43 @@ var DataModel = /*#__PURE__*/function () {
 
   _proto.getAllEdgesBetweenTwoSelectionNodes = function getAllEdgesBetweenTwoSelectionNodes() {
     return [].concat(this.getEdgesBetweenTwoSelectionNodes(), this.getEdgeGroupsBetweenTwoSelectionNodes());
+  }
+  /**
+   * 更新数据
+   * @param {[{id: '', attributes: {}}]} ciDatas 
+   */
+  ;
+
+  _proto.updateData = function updateData(ciDatas) {
+    var topoData = this.topo.store.getModelState('topoMod').data;
+
+    if (topoData) {
+      var newData = (0, _extends2["default"])({}, topoData, {
+        nodes: mergeData(topoData.nodes, ciDatas),
+        links: mergeData(topoData.links, ciDatas),
+        linkGroups: mergeData(topoData.linkGroups, ciDatas)
+      });
+      var topoDispatchers = this.topo.store.getModelDispatchers('topoMod');
+      topoDispatchers.update({
+        data: newData
+      });
+    }
+
+    function mergeData(cis, arr) {
+      return cis.map(function (ci) {
+        var dataItem = arr.find(function (item) {
+          return item.id === ci.id;
+        });
+
+        if (dataItem) {
+          return (0, _extends2["default"])({}, ci, dataItem, {
+            attributes: dataItem.attributes ? (0, _extends2["default"])({}, ci.attributes, dataItem.attributes) : ci.attributes
+          });
+        }
+
+        return ci;
+      });
+    }
   };
 
   return DataModel;

package/lib/core/models/TopoApp.js

@@ -56,7 +56,7 @@ var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
 var _CiCache = _interopRequireDefault(require("./cache/CiCache"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "9.0.6" === 'string' ? "9.0.6" : null;
+var version = typeof "9.0.7" === 'string' ? "9.0.7" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

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

@@ -15,11 +15,12 @@ var _BaseInfoBlock = _interopRequireDefault(require("./BaseInfoBlock"));
 
 var _Configurator = _interopRequireDefault(require("./components/Configurator"));
 
+var _linkUtils = require("../../../../../../models/utils/linkUtils");
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 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; }
 
-// import { isExitLink } from '@/core/models/utils/linkUtils';
 // 基本信息
 function NetworkBaseInfo(props) {
   var loading = props.loading,
@@ -61,7 +62,7 @@ function NetworkBaseInfo(props) {
 
   var crucialBaseInfo = {};
 
-  if (targetNode.permission.writeable && sourceNode.permission.writeable) {
+  if ((0, _linkUtils.isExitLink)(edge) && sourceNode.permission.writeable || !(0, _linkUtils.isExitLink)(edge) && targetNode.permission.writeable && sourceNode.permission.writeable) {
     crucialBaseInfo = {
       contentTitle: topo.dataModel.getDataById(data.id).attributes['network_link.is_crucial'] ? '是' : '否',
       dataIndex: 'isCrucial',

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

@@ -5,16 +5,20 @@
 }
 
 .base-info {
-  margin-top: 16px;
+  margin-top: 0px;
   margin-right: -25px;
   overflow: hidden;
+  .item:last-child{
+    margin-bottom: 0px;
+  }
   .item {
     width: 220px;
     max-width: 100%;
     margin-right: 25px;
-    margin-bottom: 8px;
+    margin-bottom: 4px;
     display: flex;
     float: left;
+    line-height: 22px;
     .label {
       white-space: nowrap;
     }

package/package.json

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