@riil-frontend/component-topology 9.0.0-a.9 → 9.0.2

package/es/core/models/AttributeMetricDisplay.js

@@ -1,9 +1,9 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _extends from "@babel/runtime/helpers/extends";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import topoServer from '@riil-frontend/component-topology-common/es/services/topo';
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
-import { keyBy } from 'lodash';
+import topoServer from "@riil-frontend/component-topology-common/es/services/topo";
+import rlog from "@riil-frontend/component-topology-utils/es/rlog";
+import { keyBy } from "lodash";
 import { DEFAULT_NODE_TAG_COMMON_CONFIG, DEFAULT_TIP_COMMON_CONFIG } from "../../constants/ResourceInfoDisplay";
 import { findItem } from "../../utils/topoData";
 import { queryCisByIds } from "../services";
@@ -12,12 +12,12 @@ import AttributeFormatter from "./attributeFormatter";
 import DictCache from "./cache/DictCache";
 
 function isGraphField(item) {
-  return item.type === 'graph';
+  return item.type === "graph";
 }
 
 function filterUnExistedFields(fields, ciTypeMeta) {
   function isFieldExisted(item, ciTypeMeta) {
-    return item.type === 'attribute' && ciTypeMeta.attributeMap[item.code] || item.type === 'metric' && ciTypeMeta.metricMap[item.code] || item.type !== 'attribute' && item.type !== 'metric';
+    return item.type === "attribute" && ciTypeMeta.attributeMap[item.code] || item.type === "metric" && ciTypeMeta.metricMap[item.code] || item.type !== "attribute" && item.type !== "metric";
   }
 
   return fields.filter(function (item) {
@@ -44,7 +44,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
   var _proto = AttributeMetricDisplay.prototype;
 
   _proto.getConfig = function getConfig() {
-    var _this$topo$store$getM = this.topo.store.getModelState('displayConfig'),
+    var _this$topo$store$getM = this.topo.store.getModelState("displayConfig"),
         nodeTag = _this$topo$store$getM.nodeTag,
         nodeTip = _this$topo$store$getM.nodeTip,
         linkTag = _this$topo$store$getM.linkTag,
@@ -59,10 +59,10 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
   }
   /**
    * 获得节点资源类型的配置，只包含属性和指标字段
-   * 
-   * @param {*} ciType 
-   * @param {*} config 
-   * @returns 
+   *
+   * @param {*} ciType
+   * @param {*} config
+   * @returns
    */
   ;
 
@@ -94,9 +94,9 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
   }
   /**
    * 查询需要查询数据的连线
-   * 
-   * @param {*} data 
-   * @returns 
+   *
+   * @param {*} data
+   * @returns
    */
   ;
 
@@ -108,7 +108,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
 
     return [].concat(links.map(function (link) {
       return _extends({}, link, {
-        type: 'edge'
+        type: "edge"
       });
     }));
   };
@@ -117,23 +117,27 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
     var _this = this;
 
     var _this$topo$dataModel$2 = this.topo.dataModel.getData(),
-        nodes = _this$topo$dataModel$2.nodes;
+        nodes = _this$topo$dataModel$2.nodes; // console.log("getNodesTagTipConfig", nodes);
 
-    return nodes.filter(function (node) {
-      return !!node.ciType;
-    }).map(function (node) {
-      var ciType = node.ciType;
 
-      var ciTypeConfig = _this.getNodeCiTypeConfig(ciType);
+    var nodeArr = [];
+    nodes.map(function (node) {
+      if (!!node.ciType) {
+        var ciType = node.ciType;
 
-      return {
-        type: 'node',
-        id: node.id,
-        ciType: ciType,
-        tags: _this.filterCiFiledConfigItems(node, ciTypeConfig.tags),
-        tips: _this.filterCiFiledConfigItems(node, ciTypeConfig.tips)
-      };
-    });
+        var ciTypeConfig = _this.getNodeCiTypeConfig(ciType);
+
+        nodeArr.push({
+          type: "node",
+          id: node.id,
+          ciType: ciType,
+          tags: _this.filterCiFiledConfigItems(node, ciTypeConfig.tags),
+          tips: _this.filterCiFiledConfigItems(node, ciTypeConfig.tips)
+        });
+      }
+    }); // console.log("nodeArr", nodeArr);
+
+    return nodeArr;
   } // eslint-disable-next-line class-methods-use-this
   ;
 
@@ -147,7 +151,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
 
     if (!isMonitoring(data)) {
       list = list.filter(function (item) {
-        return item.type !== 'metric';
+        return item.type !== "metric";
       });
     }
 
@@ -156,7 +160,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
   ;
 
   _proto.getModelType = function getModelType(ci) {
-    if (ci.ciType === 'network_link') {
+    if (ci.ciType === "network_link") {
       return ci.attributes.support_templates;
     }
 
@@ -164,8 +168,8 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
   }
   /**
    * 按链路类型获取对应的属性、指标配置
-   * @param {*} link 
-   * @returns 
+   * @param {*} link
+   * @returns
    */
   ;
 
@@ -196,9 +200,9 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
     return {
       tags: getItems(linkTagConfig),
       tagLinkArrow: {
-        1: 'both',
-        2: 'from',
-        3: 'to'
+        1: "both",
+        2: "from",
+        3: "to"
       }[linkTagConfig === null || linkTagConfig === void 0 ? void 0 : linkTagConfig.type] || undefined,
       tips: getItems(linkTip || defaultLinkTipConfig)
     };
@@ -224,10 +228,10 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
   }
   /**
    * 获取资源的标注、悬浮框配置，只包含属性和指标字段。无权限的资源无配置
-   * 
+   *
    * @param {?*} data 可选参数
    * @param {?*} config  可选参数
-   * @returns 
+   * @returns
    */
   ;
 
@@ -240,6 +244,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
     var _this3 = this;
 
     return this.getResourceTagTipConfig().map(function (ciConfig) {
+      // console.log("ciConfig-----------", ciConfig);
       var fields = {
         ciType: ciConfig.ciType,
         type: ciConfig.type,
@@ -257,7 +262,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
         }
       }); // 增加概览需要的指标字段
 
-      var overviewState = _this3.topo.store.getModelState('topoBaseInfoOverview');
+      var overviewState = _this3.topo.store.getModelState("topoBaseInfoOverview");
 
       if (overviewState.id === fields.id) {
         overviewState.metricCodes.forEach(function (code) {
@@ -278,7 +283,8 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
 
   _proto.getResourceMetricCodes = function getResourceMetricCodes() {
     var metricCodes = [];
-    var resourceFields = this.getResourceFields();
+    var resourceFields = this.getResourceFields(); // console.log("getResourceMetricCodes", resourceFields);
+
     resourceFields.forEach(function (resource) {
       resource.metrics.forEach(function (metric) {
         if (metricCodes.indexOf(metric) === -1) {
@@ -290,16 +296,15 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
   }
   /**
    * 从配置获得节点名称是否显示
-   * @param {*} node 
-   * @returns 
+   * @param {*} node
+   * @returns
    */
   ;
 
   _proto.getNodeNameVisible = function getNodeNameVisible(node) {
-    if (!this.topo.isViewMode()) {
-      return true;
-    }
-
+    // if (!this.topo.isViewMode()) {
+    //   return true;
+    // }
     var _this$getConfig3 = this.getConfig(),
         nodeTag = _this$getConfig3.nodeTag;
 
@@ -310,8 +315,16 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
           data = nodeTag.data;
       var items = (isCustom ? data[node.ciType] : data) || [];
       visible = !!items.filter(function (item) {
-        return item.type === 'graph';
-      }).length;
+        return item.type === "graph";
+      }).length; // ipNode逻辑
+
+      if (isCustom) {
+        return true;
+      } else {
+        return !!(data || []).filter(function (item) {
+          return item.type === "graph";
+        }).length;
+      }
     }
 
     return visible;
@@ -322,6 +335,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
 
     var nodes = this.topo.dataModel.getNodes();
     return nodes.map(function (node) {
+      // console.log("getNodesNameVisible", node);
       return {
         id: node.id,
         visible: _this4.getNodeNameVisible(node)
@@ -338,16 +352,16 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
     this.getNodesNameVisible().forEach(function (_ref) {
       var id = _ref.id,
           visible = _ref.visible;
-      var ele = dm.getDataByTag(id); // 
+      var ele = dm.getDataByTag(id); //
 
       if (ele) {
-        ele.a('isShowName', visible);
+        ele.a("isShowName", visible);
       }
     });
   }
   /**
    * 加载标注、悬浮框数据
-   * 
+   *
    * @param {array<{id, attributeMap: {}, metricMap: {}}>} data
    */
   ;
@@ -378,7 +392,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
 
             case 4:
               ciDatas = _context.sent;
-              bizDispatchers = topo.store.getModelDispatchers('topoBizMod');
+              bizDispatchers = topo.store.getModelDispatchers("topoBizMod");
               _context.next = 8;
               return bizDispatchers.setAttrsAndMetrics(ciDatas);
 
@@ -406,7 +420,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
   /**
    * 加载标注、悬浮框数据
    * 业务拓扑使用
-   * 
+   *
    * @param {array<{id, attributes: [], attributeMap: {}, metrics: [], metricMap: {}}>} data
    */
   ;
@@ -438,8 +452,8 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
   }()
   /**
    * 临时由前端翻译引用属性名称
-   * @param {array<{id, ciType, attributeMap: {}, ...}>} ciDatas 
-   * @returns 
+   * @param {array<{id, ciType, attributeMap: {}, ...}>} ciDatas
+   * @returns
    */
   ;
 
@@ -499,12 +513,6 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
 
             case 8:
               refCiMap = _context3.sent;
-              rlog.debug('translateRefAttribute', {
-                ciRefAttributeMap: ciRefAttributeMap,
-                refIds: refIds,
-                refCiMap: refCiMap
-              }); // 引用对象设置到数据
-
               return _context3.abrupt("return", ciDatas.map(function (ciData) {
                 var id = ciData.id;
 
@@ -524,7 +532,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
                 });
               }));
 
-            case 11:
+            case 10:
             case "end":
               return _context3.stop();
           }
@@ -540,7 +548,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
   }()
   /**
    * 推送标注、悬浮框数据 => ht
-   * @returns 
+   * @returns
    */
   ;
 
@@ -553,7 +561,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
 
     var elementTagsAndTips = this.buildTagsTips() // 开锁状态下禁用悬停展示悬浮框
     .map(function (item) {
-      var _topo$store$getModelS = topo.store.getModelState('lock'),
+      var _topo$store$getModelS = topo.store.getModelState("lock"),
           lock = _topo$store$getModelS.lock;
 
       return lock ? item : _extends({}, item, {
@@ -563,9 +571,9 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
     .map(function (item) {
       var tags = item.tags;
 
-      if (item.type === 'edge') {
+      if (item.type === "edge") {
         var allNoValue = tags.data.filter(function (tItem) {
-          return tItem.value === '- ';
+          return tItem.value === "- ";
         }).length === tags.data.length;
 
         if (allNoValue) {
@@ -576,30 +584,30 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
       return _extends({}, item, {
         tags: tags
       });
-    });
-    rlog.debug("AttributeMetricDisplay.updateTagsTips " + new Date().toLocaleString(), elementTagsAndTips);
+    }); // rlog.debug(`AttributeMetricDisplay.updateTagsTips ${new Date().toLocaleString()}`, elementTagsAndTips);
+
     var htTopo = topo.getHtTopo();
 
     if (htTopo) {
       var _topo$historyManager, _topo$historyManager2;
 
-      (_topo$historyManager = topo.historyManager) === null || _topo$historyManager === void 0 ? void 0 : _topo$historyManager.setDisabled(true, '加载标注');
+      (_topo$historyManager = topo.historyManager) === null || _topo$historyManager === void 0 ? void 0 : _topo$historyManager.setDisabled(true, "加载标注");
       htTopo.loadTagAndTip(JSON.parse(JSON.stringify(elementTagsAndTips)));
-      (_topo$historyManager2 = topo.historyManager) === null || _topo$historyManager2 === void 0 ? void 0 : _topo$historyManager2.setDisabled(false, '加载标注');
+      (_topo$historyManager2 = topo.historyManager) === null || _topo$historyManager2 === void 0 ? void 0 : _topo$historyManager2.setDisabled(false, "加载标注");
     }
   }
   /**
    * 从store获取属性、指标数据
-   * @returns 
+   * @returns
    */
   ;
 
   _proto.getData = function getData() {
-    return this.topo.store.getModelState('topoBizMod').attrsAndMetrics;
+    return this.topo.store.getModelState("topoBizMod").attrsAndMetrics;
   }
   /**
    * 构造标注、悬浮框数据
-   * @returns 
+   * @returns
    */
   ;
 
@@ -608,9 +616,10 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
 
     var data = this.getData(); // 获取标注、悬浮框配置
 
-    var ciConfigs = this.getResourceTagTipConfig();
+    var ciConfigs = this.getResourceTagTipConfig(); // console.log("buildTagsTips---ciConfigs", ciConfigs);
+
     var ciTagsAndTips = ciConfigs.map(function (ciConfig) {
-      var ciDataItem = findItem(data, 'id', ciConfig.id);
+      var ciDataItem = findItem(data, "id", ciConfig.id); // console.log("buildTagsTips-ciDataItem", ciDataItem);
 
       if (!ciDataItem) {
         return {
@@ -621,14 +630,15 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
       } // 获取ci数据
 
 
-      var ciData = _extends({}, findItem(data, 'id', ciConfig.id), {
+      var ciData = _extends({}, findItem(data, "id", ciConfig.id), {
         ciType: ciConfig.ciType
       });
 
-      var formatter = new AttributeFormatter(_this6.topo);
+      var formatter = new AttributeFormatter(_this6.topo); // console.log("AttributeFormatter-----", ciData, ciConfig);
+
       var tags = formatter.formatAttrs(ciConfig.tags, ciData); // 链路标注箭头
 
-      if (ciConfig.type === 'edge') {
+      if (ciConfig.type === "edge") {
         tags = {
           data: tags,
           linkArrow: ciConfig.tagLinkArrow
@@ -641,8 +651,10 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
         tags: tags,
         tips: formatter.formatAttrs(ciConfig.tips, ciData)
       };
-    });
-    var elementTagsAndTips = [].concat(ciTagsAndTips, this.extElementTagTipBuilder ? this.extElementTagTipBuilder.getExtElementTagsAndTips() : []); // 刷新标注、浮层
+    }); // console.log("ciTagsAndTips", ciTagsAndTips);
+
+    var elementTagsAndTips = [].concat(ciTagsAndTips, this.extElementTagTipBuilder ? this.extElementTagTipBuilder.getExtElementTagsAndTips() : []);
+    console.log("ciTagsAndTips", elementTagsAndTips); // 刷新标注、浮层
     // rlog.debug('AttributeMetricDisplay.buildTagsTips', {tagsAndTips: elementTagsAndTips, ciConfigs});
 
     return elementTagsAndTips;

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

package/es/core/models/attributeFormatter/index.js

@@ -1,12 +1,12 @@
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
-import { metricValueFormat } from '@riil-frontend/utils';
+import rlog from "@riil-frontend/component-topology-utils/es/rlog";
+import { metricValueFormat } from "@riil-frontend/utils";
 import DictCache from "../cache/DictCache";
 /**
-   * 格式化指标
-   * @param {*} val 
-   * @param {*} metricInfo 
-   * @returns 
-   */
+ * 格式化指标
+ * @param {*} val
+ * @param {*} metricInfo
+ * @returns
+ */
 
 export function formatMetric(val, metricInfo) {
   // rlog.debug('formatMetric', item, metricInfo);
@@ -18,7 +18,7 @@ export function formatMetric(val, metricInfo) {
       unit: metricInfo.unit,
       code: metricInfo.code
     });
-    return result.value + " " + (result.value === '-' ? '' : result.unit);
+    return result.value + " " + (result.value === "-" ? "" : result.unit);
   } else {
     return "" + val;
   }
@@ -57,7 +57,7 @@ var AttributeFormatter = /*#__PURE__*/function () {
     var fieldMeta = this.topo.ciTyeCache.getCiType(ciData.ciType)[attrType + "Map"][fieldCode];
     var fieldValue = (ciData[attrType + "Map"] || ciData[attrType + "s"])[fieldCode]; // 引用属性
 
-    if (attrType === 'attribute') {
+    if (attrType === "attribute") {
       if (ciData[attrType + "Map"][fieldCode + "_object"]) {
         fieldValue = ciData[attrType + "Map"][fieldCode + "_object"].displayName;
       }
@@ -67,7 +67,7 @@ var AttributeFormatter = /*#__PURE__*/function () {
       type: item.type,
       code: item.code,
       // 属性code
-      name: (fieldMeta === null || fieldMeta === void 0 ? void 0 : fieldMeta.name) || '',
+      name: (fieldMeta === null || fieldMeta === void 0 ? void 0 : fieldMeta.name) || "",
       // 属性名称
       value: formatMetric(fieldValue, fieldMeta),
       // 属性值
@@ -76,11 +76,11 @@ var AttributeFormatter = /*#__PURE__*/function () {
   };
 
   _proto.attributeTransform = function attributeTransform(item, ciData) {
-    return this.commonTransform(item, ciData, 'attribute');
+    return this.commonTransform(item, ciData, "attribute");
   };
 
   _proto.metricTransform = function metricTransform(item, ciData) {
-    return this.commonTransform(item, ciData, 'metric');
+    return this.commonTransform(item, ciData, "metric");
   };
 
   _proto.ciTypeAttrTransform = function ciTypeAttrTransform(item, ciData) {
@@ -89,7 +89,7 @@ var AttributeFormatter = /*#__PURE__*/function () {
       type: item.type,
       code: item.code,
       // 属性code
-      name: '资源类型',
+      name: "资源类型",
       // 属性名称
       value: ciTypeMeta.name // 属性数值
 
@@ -97,11 +97,11 @@ var AttributeFormatter = /*#__PURE__*/function () {
   };
 
   _proto.graphTransform = function graphTransform(item, ciData) {
-    var value = '-';
+    var value = "-";
 
     try {
       var node = this.topo.getDataModel().getDataByTag(ciData.id);
-      value = (node === null || node === void 0 ? void 0 : node.a('customName')) || (node === null || node === void 0 ? void 0 : node.a('name')) || '-';
+      value = (node === null || node === void 0 ? void 0 : node.a("customName")) || (node === null || node === void 0 ? void 0 : node.a("name")) || "-";
     } catch (error) {
       rlog.error(error);
     }
@@ -110,7 +110,7 @@ var AttributeFormatter = /*#__PURE__*/function () {
       type: item.type,
       code: item.code,
       // 属性code
-      name: '图片名称',
+      name: "图片名称",
       // 属性名称
       value: value // 属性值
 

package/es/core/models/topoData.js

@@ -11,8 +11,8 @@ export function getLayoutId(layout) {
 
   if (typeof layout === "string") {
     return {
-      v: 'towardeast',
-      h: 'towardsouth'
+      v: "towardeast",
+      h: "towardsouth"
     }[layout] || layout;
   }
 
@@ -41,7 +41,7 @@ export function saveTopo(_x) {
 
 function _saveTopo() {
   _saveTopo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(data) {
-    var topoService, topoId, template, layout, backgroundId, globalConfig, serialize, resources, groups, exportLinkIdList, relateTopoIdList, viewGroupId, groupInfo, viewResources;
+    var topoService, topoId, template, layout, backgroundId, globalConfig, serialize, resources, groups, exportLinkIdList, relateTopoIdList, viewGroupId, groupInfo, viewResources, linkIps;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
@@ -73,7 +73,7 @@ function _saveTopo() {
 
           case 8:
             if (!(resources || groups)) {
-              _context.next = 15;
+              _context.next = 16;
               break;
             }
 
@@ -95,24 +95,31 @@ function _saveTopo() {
               });
             }
 
+            linkIps = []; // resources?.static.map((nodeId) => {
+            //   if (nodeId.startsWith("ip_")) {
+            //     linkIps.push(nodeId.replace("ip_", ""));
+            //   }
+            // });
+
             rlog.debug("saveTopo-groupInfo", groupInfo);
-            _context.next = 15;
+            _context.next = 16;
             return topoService.bindResourceToTopo(topoId, {
               groups: groupInfo,
+              linkIps: linkIps,
               exportLinkIdList: exportLinkIdList,
               relateTopoIdList: relateTopoIdList
             });
 
-          case 15:
+          case 16:
             if (!serialize) {
-              _context.next = 18;
+              _context.next = 19;
               break;
             }
 
-            _context.next = 18;
+            _context.next = 19;
             return topoService.saveSerializeData(topoId, serialize);
 
-          case 18:
+          case 19:
           case "end":
             return _context.stop();
         }