@riil-frontend/component-topology 12.0.0-dev.3 → 12.0.0-dev.5

package/es/core/hooks/useCiAttributeChange.js

@@ -3,9 +3,20 @@ import rlog from '@riil-frontend/component-topology-utils/es/rlog';
 import CiCache from "../models/cache/CiCache";
 import useTopoEventListener from "./useTopoEventListener";
 
+function ciExistTopo(topoData, ciChangeData) {
+  if (!topoData) {
+    return false;
+  }
+
+  var ciIds = [].concat(topoData.nodes, topoData.links, topoData.linkGroups).map(function (data) {
+    return data.ciId || data.id;
+  });
+  return ciIds.includes(ciChangeData.id);
+}
+
 function mergeData(cis, ciChangeData) {
   var matchData = function matchData(item) {
-    return item.id === ciChangeData.id || item.ciId === ciChangeData.id;
+    return (item.ciId || item.id) === ciChangeData.id;
   };
 
   if (!cis.find(matchData)) {
@@ -13,16 +24,26 @@ function mergeData(cis, ciChangeData) {
   }
 
   return cis.map(function (ci) {
-    if (matchData(ci)) {
-      return _extends({}, ci, {
-        id: ci.id,
-        attributes: _extends({}, ci.attributes, ciChangeData.attributes)
-      });
+    if (!matchData(ci)) {
+      return ci;
     }
 
-    return ci;
+    return _extends({}, ci, {
+      id: ci.id,
+      attributes: _extends({}, ci.attributes, ciChangeData.attributes)
+    });
   });
 }
+
+function mergeTopoData(topoData, ciChangeData) {
+  var newData = _extends({}, topoData, {
+    nodes: mergeData(topoData.nodes, ciChangeData),
+    links: mergeData(topoData.links, ciChangeData),
+    linkGroups: mergeData(topoData.linkGroups, ciChangeData)
+  });
+
+  return newData;
+}
 /**
  * 监听ci属性变更
  * 
@@ -38,13 +59,8 @@ export default function useCiAttributeChange(props) {
       // 更新拓扑数据
       var topoData = topo.store.getModelState('topoMod').data;
 
-      if (topoData) {
-        var newData = _extends({}, topoData, {
-          nodes: mergeData(topoData.nodes, ciChangeData),
-          links: mergeData(topoData.links, ciChangeData),
-          linkGroups: mergeData(topoData.linkGroups, ciChangeData)
-        });
-
+      if (ciExistTopo(topoData, ciChangeData)) {
+        var newData = mergeTopoData(topoData, ciChangeData);
         var topoDispatchers = topo.store.getModelDispatchers('topoMod');
         topoDispatchers.update({
           data: newData

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 "12.0.0-dev.3" === 'string' ? "12.0.0-dev.3" : null;
+var version = typeof "12.0.0-dev.5" === 'string' ? "12.0.0-dev.5" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

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

@@ -46,6 +46,7 @@ export default function ResourceDetail(props) {
 
   if (tabBodys.length === 1) {
     return /*#__PURE__*/React.createElement(ResourceOverview, _extends({}, props, activeData, {
+      resourceDetailProps: viewerProps === null || viewerProps === void 0 ? void 0 : viewerProps.resourceDetailProps,
       userId: userId,
       style: {
         overflowY: 'auto',

package/lib/core/hooks/__tests__/useCiAttributeChange.test.js

@@ -0,0 +1 @@
+"use strict";

package/lib/core/hooks/useCiAttributeChange.js

@@ -13,9 +13,20 @@ var _CiCache = _interopRequireDefault(require("../models/cache/CiCache"));
 
 var _useTopoEventListener = _interopRequireDefault(require("./useTopoEventListener"));
 
+function ciExistTopo(topoData, ciChangeData) {
+  if (!topoData) {
+    return false;
+  }
+
+  var ciIds = [].concat(topoData.nodes, topoData.links, topoData.linkGroups).map(function (data) {
+    return data.ciId || data.id;
+  });
+  return ciIds.includes(ciChangeData.id);
+}
+
 function mergeData(cis, ciChangeData) {
   var matchData = function matchData(item) {
-    return item.id === ciChangeData.id || item.ciId === ciChangeData.id;
+    return (item.ciId || item.id) === ciChangeData.id;
   };
 
   if (!cis.find(matchData)) {
@@ -23,16 +34,25 @@ function mergeData(cis, ciChangeData) {
   }
 
   return cis.map(function (ci) {
-    if (matchData(ci)) {
-      return (0, _extends2["default"])({}, ci, {
-        id: ci.id,
-        attributes: (0, _extends2["default"])({}, ci.attributes, ciChangeData.attributes)
-      });
+    if (!matchData(ci)) {
+      return ci;
     }
 
-    return ci;
+    return (0, _extends2["default"])({}, ci, {
+      id: ci.id,
+      attributes: (0, _extends2["default"])({}, ci.attributes, ciChangeData.attributes)
+    });
   });
 }
+
+function mergeTopoData(topoData, ciChangeData) {
+  var newData = (0, _extends2["default"])({}, topoData, {
+    nodes: mergeData(topoData.nodes, ciChangeData),
+    links: mergeData(topoData.links, ciChangeData),
+    linkGroups: mergeData(topoData.linkGroups, ciChangeData)
+  });
+  return newData;
+}
 /**
  * 监听ci属性变更
  * 
@@ -48,12 +68,8 @@ function useCiAttributeChange(props) {
       // 更新拓扑数据
       var topoData = topo.store.getModelState('topoMod').data;
 
-      if (topoData) {
-        var newData = (0, _extends2["default"])({}, topoData, {
-          nodes: mergeData(topoData.nodes, ciChangeData),
-          links: mergeData(topoData.links, ciChangeData),
-          linkGroups: mergeData(topoData.linkGroups, ciChangeData)
-        });
+      if (ciExistTopo(topoData, ciChangeData)) {
+        var newData = mergeTopoData(topoData, ciChangeData);
         var topoDispatchers = topo.store.getModelDispatchers('topoMod');
         topoDispatchers.update({
           data: newData

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 "12.0.0-dev.3" === 'string' ? "12.0.0-dev.3" : null;
+var version = typeof "12.0.0-dev.5" === 'string' ? "12.0.0-dev.5" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

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

@@ -60,6 +60,7 @@ function ResourceDetail(props) {
 
   if (tabBodys.length === 1) {
     return /*#__PURE__*/_react["default"].createElement(_ResourceOverview["default"], (0, _extends2["default"])({}, props, activeData, {
+      resourceDetailProps: viewerProps === null || viewerProps === void 0 ? void 0 : viewerProps.resourceDetailProps,
       userId: userId,
       style: {
         overflowY: 'auto',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "12.0.0-dev.3",
+  "version": "12.0.0-dev.5",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -64,7 +64,7 @@
     "@riil-frontend/component-action-tree": "^1.0.13",
     "@riil-frontend/component-common-res-list": "^1.0.26",
     "@riil-frontend/component-condition-res-list": "^1.0.18",
-    "@riil-frontend/component-crucial-link-topo": "0.1.0",
+    "@riil-frontend/component-crucial-link-topo": "*",
     "@riil-frontend/component-extra-title": "^1.0.3",
     "@riil-frontend/component-more-buttons-menu": "^2.0.1",
     "@riil-frontend/component-no-data-page": "^3.0.4",
@@ -123,6 +123,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@12.0.0-dev.3/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@12.0.0-dev.5/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }