@riil-frontend/component-topology 2.15.35 → 2.15.38

package/es/core/models/AttributeMetricDisplay.js

@@ -718,8 +718,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
     }, // 带宽利用率
     {
       code: 'bandwidth_utilization',
-      calcType: 'avg',
-      showWhenSameSource: true
+      calcType: 'avg'
     }, // 发送带宽利用率
     {
       code: 'out_bandwidth_utilization',

package/es/core/models/TopoApp.js

@@ -20,7 +20,7 @@ import { updateEdgeExpanded } from "../utils/edgeUtil";
 import PluginManager from "./PluginManager";
 import topoFactory from "./topoFactory"; // eslint-disable-next-line no-undef
 
-var version = typeof "2.15.35" === 'string' ? "2.15.35" : null;
+var version = typeof "2.15.38" === 'string' ? "2.15.38" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/es/topoCenter/components/editor/propertyViews/edge/addLinkDrawer/AddLinkDrawer.js

@@ -70,13 +70,14 @@ function AddLinkDrawer(props) {
 
               portsDoc = {};
               ports = result.map(function (item) {
-                portsDoc[item.id] = item;
-                return {
+                var obj = {
                   value: item.id,
                   label: item.name,
-                  type: item.typa,
-                  ratedBandwidth: item.ratedBandwidth
+                  type: item.type,
+                  ratedBandwidth: parseInt(item.ratedBandwidth, 10)
                 };
+                portsDoc[item.id] = obj;
+                return obj;
               });
               return _context.abrupt("return", {
                 ports: ports,
@@ -221,6 +222,8 @@ function AddLinkDrawer(props) {
   }();
 
   useEffect(function () {
+    rlog.debug("useEffect-----currentLink", currentLink);
+
     if (currentLink) {
       setIsAddMode(false);
       initEditLineData();

package/es/topoCenter/components/editor/propertyViews/edge/addLinkDrawer/components/editLinkInfo.js

@@ -57,27 +57,9 @@ export default function EditLinkInfo(props) {
       setTarget = _useState3[1];
 
   var fieldOnChange = function fieldOnChange(name, value) {
-    if (name === "source_id" || name === "destination_id") {
-      var _parseInt, _sourceValue$portsDoc, _parseInt2, _targetValue$portsDoc;
-
-      var nowValues = field.getValues();
-      var sourceId = nowValues["source_id"];
-      var targetId = nowValues["destination_id"];
-      var sourceRb = (_parseInt = parseInt((_sourceValue$portsDoc = sourceValue.portsDoc[sourceId]) === null || _sourceValue$portsDoc === void 0 ? void 0 : _sourceValue$portsDoc.ratedBandwidth, 10)) !== null && _parseInt !== void 0 ? _parseInt : 0;
-      var targetRb = (_parseInt2 = parseInt((_targetValue$portsDoc = targetValue.portsDoc[targetId]) === null || _targetValue$portsDoc === void 0 ? void 0 : _targetValue$portsDoc.ratedBandwidth, 10)) !== null && _parseInt2 !== void 0 ? _parseInt2 : null;
-
-      if (sourceRb && targetRb) {
-        field.setValue("network_link.actual_bandwidth", Math.min(sourceRb, targetRb));
-      } else {
-        field.setValue("network_link.actual_bandwidth", sourceRb || targetRb);
-      }
-    }
-
     var newValues = field.getValues();
     rlog.debug("Field-onChange", newValues, name, value);
-    setValus(newValues); //  if (values[name] !== value) {
-    //    onChange(name, value, newValues);
-    //  }
+    setValus(newValues);
   };
 
   var field = _Field.useField({
@@ -88,11 +70,11 @@ export default function EditLinkInfo(props) {
 
   useEffect(function () {
     setValus(attributes);
-    rlog.debug("useEffect", source, target);
+    rlog.debug("useEffect", source, target, attributes);
     setSource(source);
     setTarget(target);
     field.setValues(attributes);
-  }, [addLinkIsOpen]); // const [editState, editDispatchers] = store.useModel("topoCreateMod");
+  }, [source, target, field, attributes]); // const [editState, editDispatchers] = store.useModel("topoCreateMod");
 
   var labelAlign = "top";
   var formItemLayout = {
@@ -120,20 +102,38 @@ export default function EditLinkInfo(props) {
     };
   };
 
-  var portsHandleChange = function portsHandleChange() {};
+  var portsHandleChange = function portsHandleChange(type, value) {
+    var _sourceValue$portsDoc, _sourceValue$portsDoc2, _targetValue$portsDoc, _targetValue$portsDoc2;
+
+    var nowValues = field.getValues();
+    var sourceId = nowValues["source_id"];
+    var targetId = nowValues["destination_id"];
+    var sourceRb = (_sourceValue$portsDoc = (_sourceValue$portsDoc2 = sourceValue.portsDoc[sourceId]) === null || _sourceValue$portsDoc2 === void 0 ? void 0 : _sourceValue$portsDoc2.ratedBandwidth) !== null && _sourceValue$portsDoc !== void 0 ? _sourceValue$portsDoc : 0;
+    var targetRb = (_targetValue$portsDoc = (_targetValue$portsDoc2 = targetValue.portsDoc[targetId]) === null || _targetValue$portsDoc2 === void 0 ? void 0 : _targetValue$portsDoc2.ratedBandwidth) !== null && _targetValue$portsDoc !== void 0 ? _targetValue$portsDoc : 0;
+    var actualBandwidth = 0;
+
+    if (sourceRb && targetRb) {
+      actualBandwidth = Math.min(sourceRb, targetRb);
+    } else {
+      actualBandwidth = sourceRb || targetRb;
+    }
+
+    rlog.debug("network_link.actual_bandwidth", actualBandwidth);
+    field.setValue("network_link.actual_bandwidth", actualBandwidth);
+  };
 
   var saveHandleChange = function saveHandleChange() {
     field.validate(function (errors, values) {
       if (errors) {
         rlog.debug("saveHandleChange-error", errors, values);
       } else {
-        var _sourceValue$portsDoc2, _sourceValue$portsDoc3, _targetValue$portsDoc2, _targetValue$portsDoc3, _sourceValue$ipAddres, _targetValue$ipAddres;
+        var _sourceValue$portsDoc3, _sourceValue$portsDoc4, _targetValue$portsDoc3, _targetValue$portsDoc4, _sourceValue$ipAddres, _targetValue$ipAddres;
 
         rlog.debug("saveHandleChange", valus, source, target);
         var sourceId = valus["source_id"];
         var destinationId = valus["destination_id"];
-        var sourceType = (_sourceValue$portsDoc2 = (_sourceValue$portsDoc3 = sourceValue.portsDoc[sourceId]) === null || _sourceValue$portsDoc3 === void 0 ? void 0 : _sourceValue$portsDoc3.type) !== null && _sourceValue$portsDoc2 !== void 0 ? _sourceValue$portsDoc2 : "";
-        var destinationType = (_targetValue$portsDoc2 = (_targetValue$portsDoc3 = targetValue.portsDoc[destinationId]) === null || _targetValue$portsDoc3 === void 0 ? void 0 : _targetValue$portsDoc3.type) !== null && _targetValue$portsDoc2 !== void 0 ? _targetValue$portsDoc2 : "";
+        var sourceType = (_sourceValue$portsDoc3 = (_sourceValue$portsDoc4 = sourceValue.portsDoc[sourceId]) === null || _sourceValue$portsDoc4 === void 0 ? void 0 : _sourceValue$portsDoc4.type) !== null && _sourceValue$portsDoc3 !== void 0 ? _sourceValue$portsDoc3 : "";
+        var destinationType = (_targetValue$portsDoc3 = (_targetValue$portsDoc4 = targetValue.portsDoc[destinationId]) === null || _targetValue$portsDoc4 === void 0 ? void 0 : _targetValue$portsDoc4.type) !== null && _targetValue$portsDoc3 !== void 0 ? _targetValue$portsDoc3 : "";
         var typeJudge = linkTypeJudge(sourceType, destinationType);
         var obj = {
           display_name: valus["display_name"],
@@ -264,7 +264,9 @@ export default function EditLinkInfo(props) {
     name: "source_id",
     disabled: sourceValue.ports.length === 0,
     className: styles.selectList,
-    onChange: portsHandleChange,
+    onChange: function onChange(v) {
+      portsHandleChange("source_id", v);
+    },
     dataSource: sourceValue.ports
   }) : "-")), /*#__PURE__*/React.createElement(Col, {
     span: "12"
@@ -277,7 +279,9 @@ export default function EditLinkInfo(props) {
     name: "destination_id",
     disabled: targetValue.ports.length === 0,
     className: styles.selectList,
-    onChange: portsHandleChange,
+    onChange: function onChange(v) {
+      portsHandleChange("destination_id", v);
+    },
     dataSource: targetValue.ports
   }) : "-"))), /*#__PURE__*/React.createElement(Row, {
     gutter: "4"

package/es/utils/topoData.js

@@ -180,9 +180,14 @@ var ciModfilter = function ciModfilter(ciTypeObj, globalSetting, type, code) {
     (_tags$data$code = tags.data[code]) === null || _tags$data$code === void 0 ? void 0 : _tags$data$code.map(function (item) {
       tagArr.push(item.code + "-" + item.type);
     });
-  }
+  } // rlog.debug(
+  //   "过滤ci元数据中的属性和指标，用于属性和指标显示设置",
+  //   globalSetting,
+  //   tipArr,
+  //   tagArr
+  // );
+
 
-  rlog.debug("过滤ci元数据中的属性和指标，用于属性和指标显示设置", globalSetting, tipArr, tagArr);
   var custom = [];
 
   if (type === "node") {

package/lib/core/models/AttributeMetricDisplay.js

@@ -737,8 +737,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
     }, // 带宽利用率
     {
       code: 'bandwidth_utilization',
-      calcType: 'avg',
-      showWhenSameSource: true
+      calcType: 'avg'
     }, // 发送带宽利用率
     {
       code: 'out_bandwidth_utilization',

package/lib/core/models/TopoApp.js

@@ -48,7 +48,7 @@ var _PluginManager = _interopRequireDefault(require("./PluginManager"));
 var _topoFactory = _interopRequireDefault(require("./topoFactory"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "2.15.35" === 'string' ? "2.15.35" : null;
+var version = typeof "2.15.38" === 'string' ? "2.15.38" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/topoCenter/components/editor/propertyViews/edge/addLinkDrawer/AddLinkDrawer.js

@@ -99,13 +99,14 @@ function AddLinkDrawer(props) {
 
               portsDoc = {};
               ports = result.map(function (item) {
-                portsDoc[item.id] = item;
-                return {
+                var obj = {
                   value: item.id,
                   label: item.name,
-                  type: item.typa,
-                  ratedBandwidth: item.ratedBandwidth
+                  type: item.type,
+                  ratedBandwidth: parseInt(item.ratedBandwidth, 10)
                 };
+                portsDoc[item.id] = obj;
+                return obj;
               });
               return _context.abrupt("return", {
                 ports: ports,
@@ -253,6 +254,8 @@ function AddLinkDrawer(props) {
   }();
 
   (0, _react.useEffect)(function () {
+    _rlog["default"].debug("useEffect-----currentLink", currentLink);
+
     if (currentLink) {
       setIsAddMode(false);
       initEditLineData();

package/lib/topoCenter/components/editor/propertyViews/edge/addLinkDrawer/components/editLinkInfo.js

@@ -81,29 +81,11 @@ function EditLinkInfo(props) {
       setTarget = _useState3[1];
 
   var fieldOnChange = function fieldOnChange(name, value) {
-    if (name === "source_id" || name === "destination_id") {
-      var _parseInt, _sourceValue$portsDoc, _parseInt2, _targetValue$portsDoc;
-
-      var nowValues = field.getValues();
-      var sourceId = nowValues["source_id"];
-      var targetId = nowValues["destination_id"];
-      var sourceRb = (_parseInt = parseInt((_sourceValue$portsDoc = sourceValue.portsDoc[sourceId]) === null || _sourceValue$portsDoc === void 0 ? void 0 : _sourceValue$portsDoc.ratedBandwidth, 10)) !== null && _parseInt !== void 0 ? _parseInt : 0;
-      var targetRb = (_parseInt2 = parseInt((_targetValue$portsDoc = targetValue.portsDoc[targetId]) === null || _targetValue$portsDoc === void 0 ? void 0 : _targetValue$portsDoc.ratedBandwidth, 10)) !== null && _parseInt2 !== void 0 ? _parseInt2 : null;
-
-      if (sourceRb && targetRb) {
-        field.setValue("network_link.actual_bandwidth", Math.min(sourceRb, targetRb));
-      } else {
-        field.setValue("network_link.actual_bandwidth", sourceRb || targetRb);
-      }
-    }
-
     var newValues = field.getValues();
 
     _rlog["default"].debug("Field-onChange", newValues, name, value);
 
-    setValus(newValues); //  if (values[name] !== value) {
-    //    onChange(name, value, newValues);
-    //  }
+    setValus(newValues);
   };
 
   var field = _field["default"].useField({
@@ -115,12 +97,12 @@ function EditLinkInfo(props) {
   (0, _react.useEffect)(function () {
     setValus(attributes);
 
-    _rlog["default"].debug("useEffect", source, target);
+    _rlog["default"].debug("useEffect", source, target, attributes);
 
     setSource(source);
     setTarget(target);
     field.setValues(attributes);
-  }, [addLinkIsOpen]); // const [editState, editDispatchers] = store.useModel("topoCreateMod");
+  }, [source, target, field, attributes]); // const [editState, editDispatchers] = store.useModel("topoCreateMod");
 
   var labelAlign = "top";
   var formItemLayout = {
@@ -148,21 +130,40 @@ function EditLinkInfo(props) {
     };
   };
 
-  var portsHandleChange = function portsHandleChange() {};
+  var portsHandleChange = function portsHandleChange(type, value) {
+    var _sourceValue$portsDoc, _sourceValue$portsDoc2, _targetValue$portsDoc, _targetValue$portsDoc2;
+
+    var nowValues = field.getValues();
+    var sourceId = nowValues["source_id"];
+    var targetId = nowValues["destination_id"];
+    var sourceRb = (_sourceValue$portsDoc = (_sourceValue$portsDoc2 = sourceValue.portsDoc[sourceId]) === null || _sourceValue$portsDoc2 === void 0 ? void 0 : _sourceValue$portsDoc2.ratedBandwidth) !== null && _sourceValue$portsDoc !== void 0 ? _sourceValue$portsDoc : 0;
+    var targetRb = (_targetValue$portsDoc = (_targetValue$portsDoc2 = targetValue.portsDoc[targetId]) === null || _targetValue$portsDoc2 === void 0 ? void 0 : _targetValue$portsDoc2.ratedBandwidth) !== null && _targetValue$portsDoc !== void 0 ? _targetValue$portsDoc : 0;
+    var actualBandwidth = 0;
+
+    if (sourceRb && targetRb) {
+      actualBandwidth = Math.min(sourceRb, targetRb);
+    } else {
+      actualBandwidth = sourceRb || targetRb;
+    }
+
+    _rlog["default"].debug("network_link.actual_bandwidth", actualBandwidth);
+
+    field.setValue("network_link.actual_bandwidth", actualBandwidth);
+  };
 
   var saveHandleChange = function saveHandleChange() {
     field.validate(function (errors, values) {
       if (errors) {
         _rlog["default"].debug("saveHandleChange-error", errors, values);
       } else {
-        var _sourceValue$portsDoc2, _sourceValue$portsDoc3, _targetValue$portsDoc2, _targetValue$portsDoc3, _sourceValue$ipAddres, _targetValue$ipAddres;
+        var _sourceValue$portsDoc3, _sourceValue$portsDoc4, _targetValue$portsDoc3, _targetValue$portsDoc4, _sourceValue$ipAddres, _targetValue$ipAddres;
 
         _rlog["default"].debug("saveHandleChange", valus, source, target);
 
         var sourceId = valus["source_id"];
         var destinationId = valus["destination_id"];
-        var sourceType = (_sourceValue$portsDoc2 = (_sourceValue$portsDoc3 = sourceValue.portsDoc[sourceId]) === null || _sourceValue$portsDoc3 === void 0 ? void 0 : _sourceValue$portsDoc3.type) !== null && _sourceValue$portsDoc2 !== void 0 ? _sourceValue$portsDoc2 : "";
-        var destinationType = (_targetValue$portsDoc2 = (_targetValue$portsDoc3 = targetValue.portsDoc[destinationId]) === null || _targetValue$portsDoc3 === void 0 ? void 0 : _targetValue$portsDoc3.type) !== null && _targetValue$portsDoc2 !== void 0 ? _targetValue$portsDoc2 : "";
+        var sourceType = (_sourceValue$portsDoc3 = (_sourceValue$portsDoc4 = sourceValue.portsDoc[sourceId]) === null || _sourceValue$portsDoc4 === void 0 ? void 0 : _sourceValue$portsDoc4.type) !== null && _sourceValue$portsDoc3 !== void 0 ? _sourceValue$portsDoc3 : "";
+        var destinationType = (_targetValue$portsDoc3 = (_targetValue$portsDoc4 = targetValue.portsDoc[destinationId]) === null || _targetValue$portsDoc4 === void 0 ? void 0 : _targetValue$portsDoc4.type) !== null && _targetValue$portsDoc3 !== void 0 ? _targetValue$portsDoc3 : "";
         var typeJudge = linkTypeJudge(sourceType, destinationType);
         var obj = {
           display_name: valus["display_name"],
@@ -293,7 +294,9 @@ function EditLinkInfo(props) {
     name: "source_id",
     disabled: sourceValue.ports.length === 0,
     className: _indexModule["default"].selectList,
-    onChange: portsHandleChange,
+    onChange: function onChange(v) {
+      portsHandleChange("source_id", v);
+    },
     dataSource: sourceValue.ports
   }) : "-")), /*#__PURE__*/_react["default"].createElement(Col, {
     span: "12"
@@ -306,7 +309,9 @@ function EditLinkInfo(props) {
     name: "destination_id",
     disabled: targetValue.ports.length === 0,
     className: _indexModule["default"].selectList,
-    onChange: portsHandleChange,
+    onChange: function onChange(v) {
+      portsHandleChange("destination_id", v);
+    },
     dataSource: targetValue.ports
   }) : "-"))), /*#__PURE__*/_react["default"].createElement(Row, {
     gutter: "4"

package/lib/utils/topoData.js

@@ -219,9 +219,13 @@ var ciModfilter = function ciModfilter(ciTypeObj, globalSetting, type, code) {
     (_tags$data$code = tags.data[code]) === null || _tags$data$code === void 0 ? void 0 : _tags$data$code.map(function (item) {
       tagArr.push(item.code + "-" + item.type);
     });
-  }
+  } // rlog.debug(
+  //   "过滤ci元数据中的属性和指标，用于属性和指标显示设置",
+  //   globalSetting,
+  //   tipArr,
+  //   tagArr
+  // );
 
-  _rlog["default"].debug("过滤ci元数据中的属性和指标，用于属性和指标显示设置", globalSetting, tipArr, tagArr);
 
   var custom = [];
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "2.15.35",
+  "version": "2.15.38",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -41,7 +41,7 @@
     "@ahooksjs/use-tree-plugin": "^0.2.1",
     "@alifd/biz-anchor": "^1.1.7",
     "@ice/store": "^1.4.2",
-    "@riil-frontend/component-topo-icon-select": "^1.0.10",
+    "@riil-frontend/component-topo-icon-select": "^1.0.11",
     "@riil-frontend/component-topology-utils": "^2.0.20-alpha.0",
     "classnames": "^2.2.3",
     "prop-types": "^15.5.8",
@@ -110,6 +110,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@2.15.35/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@2.15.38/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }