@riil-frontend/component-topology 9.0.0-a.37 → 9.0.0-a.38

package/es/core/editor/components/settings/propertyViews/layer/DataTab/NodeList.js

@@ -1,7 +1,8 @@
 import React from 'react';
 import { iconFactory } from '@riil-frontend/component-topology-graph';
 import ResourceList from "../../../common/GroupNodeList/ResourceList";
-import { getLayerChildrenResourceElements } from "../../../../../../../utils/htElementDataUtil";
+import { getLayerChildren } from "../../../../../../../utils/htElementUtils";
+import { isResourceElement } from "../../../../../../../utils/htElementDataUtil";
 /**
  * 分层关联资源列表
  */
@@ -9,7 +10,7 @@ import { getLayerChildrenResourceElements } from "../../../../../../../utils/htE
 export default function LayerResourceList(props) {
   var topo = props.topo,
       layer = props.layer;
-  var relateDataNodes = getLayerChildrenResourceElements(layer);
+  var relateDataNodes = getLayerChildren(layer).filter(isResourceElement);
   var data = relateDataNodes.map(function (node) {
     return {
       title: node.a('name'),

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,48 @@ 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)
+        });
+      } else if (node.bindType === "ip") {
+        var _this$getConfig2 = _this.getConfig(),
+            nodeTag = _this$getConfig2.nodeTag,
+            nodeTip = _this$getConfig2.nodeTip;
+
+        console.log("nodeTag------------------------", nodeTag, nodeTip);
+
+        if (!nodeTag.isCustom) {
+          var hasIpv4 = Array.isArray(nodeTag.data) && (nodeTag === null || nodeTag === void 0 ? void 0 : nodeTag.data.find(function (item) {
+            return item.code === "ipv4_address";
+          }));
+          if (hasIpv4) nodeArr.push({
+            type: "node",
+            id: node.id,
+            tags: [{
+              type: "attribute",
+              code: "ipv4_address"
+            }],
+            tips: []
+          });
+        }
+      }
+    }); // console.log("nodeArr", nodeArr);
+
+    return nodeArr;
   } // eslint-disable-next-line class-methods-use-this
   ;
 
@@ -147,7 +172,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
 
     if (!isMonitoring(data)) {
       list = list.filter(function (item) {
-        return item.type !== 'metric';
+        return item.type !== "metric";
       });
     }
 
@@ -156,7 +181,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,15 +189,15 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
   }
   /**
    * 按链路类型获取对应的属性、指标配置
-   * @param {*} link 
-   * @returns 
+   * @param {*} link
+   * @returns
    */
   ;
 
   _proto.getLinkTagTipConfig = function getLinkTagTipConfig(link) {
-    var _this$getConfig2 = this.getConfig(),
-        linkTag = _this$getConfig2.linkTag,
-        linkTip = _this$getConfig2.linkTip;
+    var _this$getConfig3 = this.getConfig(),
+        linkTag = _this$getConfig3.linkTag,
+        linkTip = _this$getConfig3.linkTip;
 
     var ciTypeMeta = this.topo.ciTyeCache.getCiTypeByCi(link);
     var modelType = this.getModelType(link);
@@ -196,9 +221,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 +249,10 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
   }
   /**
    * 获取资源的标注、悬浮框配置，只包含属性和指标字段。无权限的资源无配置
-   * 
+   *
    * @param {?*} data 可选参数
    * @param {?*} config  可选参数
-   * @returns 
+   * @returns
    */
   ;
 
@@ -240,6 +265,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 +283,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 +304,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,18 +317,20 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
   }
   /**
    * 从配置获得节点名称是否显示
-   * @param {*} node 
-   * @returns 
+   * @param {*} node
+   * @returns
    */
   ;
 
   _proto.getNodeNameVisible = function getNodeNameVisible(node) {
+    var _nodeTag$data;
+
     if (!this.topo.isViewMode()) {
-      return true;
+      return trueipv4_address;
     }
 
-    var _this$getConfig3 = this.getConfig(),
-        nodeTag = _this$getConfig3.nodeTag;
+    var _this$getConfig4 = this.getConfig(),
+        nodeTag = _this$getConfig4.nodeTag;
 
     var visible = true;
 
@@ -310,8 +339,17 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
           data = nodeTag.data;
       var items = (isCustom ? data[node.ciType] : data) || [];
       visible = !!items.filter(function (item) {
-        return item.type === 'graph';
+        return item.type === "graph";
       }).length;
+    } // console.log("getNodeNameVisible--xxx", nodeTag);
+
+
+    var hasIpv4 = Array.isArray(nodeTag.data) && (nodeTag === null || nodeTag === void 0 ? void 0 : (_nodeTag$data = nodeTag.data) === null || _nodeTag$data === void 0 ? void 0 : _nodeTag$data.find(function (item) {
+      return item.code === "ipv4_address";
+    }));
+
+    if (node.bindType === "ip" && !hasIpv4) {
+      return true;
     }
 
     return visible;
@@ -322,6 +360,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 +377,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 +417,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 +445,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
   /**
    * 加载标注、悬浮框数据
    * 业务拓扑使用
-   * 
+   *
    * @param {array<{id, attributes: [], attributeMap: {}, metrics: [], metricMap: {}}>} data
    */
   ;
@@ -438,8 +477,8 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
   }()
   /**
    * 临时由前端翻译引用属性名称
-   * @param {array<{id, ciType, attributeMap: {}, ...}>} ciDatas 
-   * @returns 
+   * @param {array<{id, ciType, attributeMap: {}, ...}>} ciDatas
+   * @returns
    */
   ;
 
@@ -499,12 +538,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 +557,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
                 });
               }));
 
-            case 11:
+            case 10:
             case "end":
               return _context3.stop();
           }
@@ -540,7 +573,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
   }()
   /**
    * 推送标注、悬浮框数据 => ht
-   * @returns 
+   * @returns
    */
   ;
 
@@ -553,7 +586,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 +596,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 +609,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 +641,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 +655,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,7 +676,8 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
         tags: tags,
         tips: formatter.formatAttrs(ciConfig.tips, ciData)
       };
-    });
+    }); // console.log("ciTagsAndTips", ciTagsAndTips);
+
     var elementTagsAndTips = [].concat(ciTagsAndTips, this.extElementTagTipBuilder ? this.extElementTagTipBuilder.getExtElementTagsAndTips() : []); // 刷新标注、浮层
     // rlog.debug('AttributeMetricDisplay.buildTagsTips', {tagsAndTips: elementTagsAndTips, ciConfigs});
 

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

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

@@ -54,25 +54,56 @@ var AttributeFormatter = /*#__PURE__*/function () {
 
   _proto.commonTransform = function commonTransform(item, ciData, attrType) {
     var fieldCode = item.code;
-    var fieldMeta = this.topo.ciTyeCache.getCiType(ciData.ciType)[attrType + "Map"][fieldCode];
-    var fieldValue = (ciData[attrType + "Map"] || ciData[attrType + "s"])[fieldCode]; // 引用属性
+    console.log("commonTransform-item, ciData, attrType", item, ciData, attrType);
 
-    if (attrType === 'attribute') {
-      if (ciData[attrType + "Map"][fieldCode + "_object"]) {
-        fieldValue = ciData[attrType + "Map"][fieldCode + "_object"].displayName;
+    if (ciData.ciType) {
+      var fieldMeta = this.topo.ciTyeCache.getCiType(ciData.ciType)[attrType + "Map"][fieldCode];
+      var fieldValue = (ciData[attrType + "Map"] || ciData[attrType + "s"])[fieldCode]; // 引用属性
+
+      if (attrType === "attribute") {
+        if (ciData[attrType + "Map"][fieldCode + "_object"]) {
+          fieldValue = ciData[attrType + "Map"][fieldCode + "_object"].displayName;
+        }
       }
-    }
 
-    return {
-      type: item.type,
-      code: item.code,
-      // 属性code
-      name: (fieldMeta === null || fieldMeta === void 0 ? void 0 : fieldMeta.name) || '',
-      // 属性名称
-      value: formatMetric(fieldValue, fieldMeta),
-      // 属性值
-      originValue: fieldValue
-    };
+      var obj = {
+        type: item.type,
+        code: item.code,
+        // 属性code
+        name: (fieldMeta === null || fieldMeta === void 0 ? void 0 : fieldMeta.name) || "",
+        // 属性名称
+        value: formatMetric(fieldValue, fieldMeta),
+        // 属性值
+        originValue: fieldValue
+      };
+      return obj;
+    } else {
+      if (item.code === "ipv4_address" && ciData.bindType === "ip") {
+        return {
+          type: item.type,
+          code: item.code,
+          // 属性code
+          name: "IPv4地址",
+          // 属性名称
+          value: ciData.bindIp,
+          // 属性值
+          originValue: ciData.bindIp
+        };
+      } else {
+        var _ciData$attributes$di, _ciData$attributes, _ciData$attributes$di2, _ciData$attributes2;
+
+        return {
+          type: item.type,
+          code: item.code,
+          // 属性code
+          name: "显示名称",
+          // 属性名称
+          value: (_ciData$attributes$di = ciData === null || ciData === void 0 ? void 0 : (_ciData$attributes = ciData.attributes) === null || _ciData$attributes === void 0 ? void 0 : _ciData$attributes.display_name) !== null && _ciData$attributes$di !== void 0 ? _ciData$attributes$di : "",
+          // 属性值
+          originValue: (_ciData$attributes$di2 = ciData === null || ciData === void 0 ? void 0 : (_ciData$attributes2 = ciData.attributes) === null || _ciData$attributes2 === void 0 ? void 0 : _ciData$attributes2.display_name) !== null && _ciData$attributes$di2 !== void 0 ? _ciData$attributes$di2 : ""
+        };
+      }
+    }
   };
 
   _proto.attributeTransform = function attributeTransform(item, ciData) {