@riil-frontend/component-topology 9.0.9 → 9.0.11

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

package/es/core/upgrade/v140UpgradeSerializeNodeImageSize.js

@@ -0,0 +1,39 @@
+/**
+ * v1.4.0 升级历史保存的拓扑图图标大小为48。
+ * 序列化中节点（除自定义上传图片节点）未设置大小时，设置成48
+ * @param {*} serializeStr 
+ * @returns 
+ */
+function v140UpgradeSerializeNodeImageSize(serializeStr) {
+  var serialize = parseSerialize(serializeStr);
+
+  if (!serialize) {
+    return serialize;
+  }
+
+  serialize.d.filter(function (item) {
+    return ['ht.Group', 'ht.Node'].includes(item.c);
+  }).filter(function (item) {
+    return ['point', 'container'].includes(item.p.layer);
+  }).filter(function (item) {
+    return !!item.p.image;
+  }).filter(function (item) {
+    return item.p.image === 'editor.icon.cloud.medium' || item.p.image.startsWith('ciType.');
+  }).filter(function (item) {
+    return item.p.width === undefined;
+  }).forEach(function (node) {
+    node.p.width = 48;
+    node.p.height = 48;
+  });
+  return serialize;
+}
+
+function parseSerialize(serialize) {
+  if (serialize && typeof serialize === 'string') {
+    return JSON.parse(serialize);
+  }
+
+  return serialize;
+}
+
+export default v140UpgradeSerializeNodeImageSize;

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

@@ -47,13 +47,12 @@ export default function NetworkBaseInfo(props) {
 
   useEffect(function () {
     setDefaultChecked(!!topo.dataModel.getDataById(data.id).attributes['network_link.is_crucial']);
-  }, [id]);
+  }, [id, topo.dataModel.getDataById(data.id).attributes['network_link.is_crucial']]);
   var crucialLinkField = null;
 
   if (edge) {
     var targetNode = topo.dataModel.getDataById(edge.target);
     var sourceNode = topo.dataModel.getDataById(edge.source);
-    rlog.debug(isExitLink(edge), sourceNode, targetNode, '111111111111111111111');
     var updateCrucialPermission = sourceNode.permission.writeable && (isExitLink(edge) ? true : targetNode.permission.writeable);
 
     if (updateCrucialPermission) {

package/es/utils/topoData.js

@@ -10,6 +10,7 @@ import { getEditorIcons } from "../core/common/icons/icon";
 import { getBackgroundImageUrl } from "../core/utils/backgroundUtil";
 import { isClusterHtElement, processCluster } from "./clusterUtil";
 import { isGroup } from "./htElementUtils";
+import v140UpgradeSerializeNodeImageSize from "../core/upgrade/v140UpgradeSerializeNodeImageSize";
 /**
  * 查找数组中对应key的值为value的元素并返回,只查找第一个符合的元素
  * @param {Array} arr 数组
@@ -278,7 +279,7 @@ export var combTopoData = function combTopoData(_ref3) {
     nodes: nodes,
     linkGroups: linkGroups,
     links: links,
-    serialize: result.serialize
+    serialize: v140UpgradeSerializeNodeImageSize(result.serialize)
   }; // 所有资源
 
   var allCis = [].concat(data.nodes, data.links, data.linkGroups);

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

package/lib/core/upgrade/v140UpgradeSerializeNodeImageSize.js

@@ -0,0 +1,45 @@
+"use strict";
+
+exports.__esModule = true;
+exports["default"] = void 0;
+
+/**
+ * v1.4.0 升级历史保存的拓扑图图标大小为48。
+ * 序列化中节点（除自定义上传图片节点）未设置大小时，设置成48
+ * @param {*} serializeStr 
+ * @returns 
+ */
+function v140UpgradeSerializeNodeImageSize(serializeStr) {
+  var serialize = parseSerialize(serializeStr);
+
+  if (!serialize) {
+    return serialize;
+  }
+
+  serialize.d.filter(function (item) {
+    return ['ht.Group', 'ht.Node'].includes(item.c);
+  }).filter(function (item) {
+    return ['point', 'container'].includes(item.p.layer);
+  }).filter(function (item) {
+    return !!item.p.image;
+  }).filter(function (item) {
+    return item.p.image === 'editor.icon.cloud.medium' || item.p.image.startsWith('ciType.');
+  }).filter(function (item) {
+    return item.p.width === undefined;
+  }).forEach(function (node) {
+    node.p.width = 48;
+    node.p.height = 48;
+  });
+  return serialize;
+}
+
+function parseSerialize(serialize) {
+  if (serialize && typeof serialize === 'string') {
+    return JSON.parse(serialize);
+  }
+
+  return serialize;
+}
+
+var _default = v140UpgradeSerializeNodeImageSize;
+exports["default"] = _default;

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

@@ -64,15 +64,12 @@ function NetworkBaseInfo(props) {
 
   (0, _react.useEffect)(function () {
     setDefaultChecked(!!topo.dataModel.getDataById(data.id).attributes['network_link.is_crucial']);
-  }, [id]);
+  }, [id, topo.dataModel.getDataById(data.id).attributes['network_link.is_crucial']]);
   var crucialLinkField = null;
 
   if (edge) {
     var targetNode = topo.dataModel.getDataById(edge.target);
     var sourceNode = topo.dataModel.getDataById(edge.source);
-
-    _rlog.rlog.debug(isExitLink(edge), sourceNode, targetNode, '111111111111111111111');
-
     var updateCrucialPermission = sourceNode.permission.writeable && (isExitLink(edge) ? true : targetNode.permission.writeable);
 
     if (updateCrucialPermission) {

package/lib/utils/topoData.js

@@ -38,6 +38,8 @@ var _clusterUtil = require("./clusterUtil");
 
 var _htElementUtils = require("./htElementUtils");
 
+var _v140UpgradeSerializeNodeImageSize = _interopRequireDefault(require("../core/upgrade/v140UpgradeSerializeNodeImageSize"));
+
 var _excluded = ["extraConfig"];
 
 /**
@@ -319,7 +321,7 @@ var combTopoData = function combTopoData(_ref3) {
     nodes: nodes,
     linkGroups: linkGroups,
     links: links,
-    serialize: result.serialize
+    serialize: (0, _v140UpgradeSerializeNodeImageSize["default"])(result.serialize)
   }; // 所有资源
 
   var allCis = [].concat(data.nodes, data.links, data.linkGroups);

package/package.json

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