@riil-frontend/component-topology 11.0.13 → 11.0.14

package/es/core/components/DisplaySettingDrawer/hooks/useDisplaySetting.js

@@ -1,7 +1,6 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import topoService from '@riil-frontend/component-topology-common/es/services/topo';
 export default (function (props) {
   var topo = props.topo,
       displaySettingProps = props.displaySettingProps,
@@ -21,7 +20,7 @@ export default (function (props) {
               prevDisplayConfig = topo.store.getModelState('displayConfig');
               displayConfig = _extends({}, prevDisplayConfig, values);
               _context.next = 5;
-              return topoService.saveTopoSettings(topo.id, {
+              return topo.serverApi.saveTopoSettings(topo.id, {
                 alarmSwitch: displayConfig.alarmSwitch,
                 alarmListDefaultOpen: displayConfig.alarmListDefaultOpen,
                 extraConfig: JSON.stringify(_extends({}, displayConfig))

package/es/core/components/ResourceViewAttributeSetting/nodeCiTypeAttrUtil.js

@@ -69,7 +69,7 @@ export function getNodeModels(topo) {
 
       if (topo.isCMPTopo) {
         custom.push.apply(custom, [{
-          id: 'p:source',
+          id: 'cmpNode:source',
           code: 'name',
           name: '所属平台',
           type: 'custom'

package/es/core/components/TopoView/topoView.js

@@ -266,7 +266,10 @@ var Topology = function Topology(props) {
 
   return /*#__PURE__*/React.createElement("div", {
     className: styles.topoView,
-    "data-version": topo.version
+    "data-version": topo.version,
+    onFocus: function onFocus() {
+      window.topo = topo;
+    }
   }, titleBar !== false && titleBar, isEditMode && /*#__PURE__*/React.createElement(EditorToolbar, {
     topo: topo,
     topoEdit: topoEdit,

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

package/es/core/models/attributeFormatter/formatter/attributeTransform.js

@@ -0,0 +1,4 @@
+import commonTransform from "./commonTransform";
+export default function attributeTransform(options) {
+  return commonTransform(options);
+}

package/es/core/models/attributeFormatter/formatter/ciTypeAttrTransform.js

@@ -0,0 +1,15 @@
+export default function ciTypeAttrTransform(options) {
+  var item = options.item,
+      ciData = options.ciData,
+      topo = options.topo;
+  var ciTypeMeta = topo.ciTyeCache.getCiType(ciData.ciType);
+  return {
+    type: item.type,
+    code: item.code,
+    // 属性code
+    name: "资源类型",
+    // 属性名称
+    value: ciTypeMeta.name // 属性数值
+
+  };
+}

package/es/core/models/attributeFormatter/formatter/commonTransform.js

@@ -0,0 +1,51 @@
+import { metricValueFormat } from '@riil-frontend/utils';
+import DictCache from "../../cache/DictCache";
+/**
+ * 格式化指标
+ * @param {*} val
+ * @param {*} metricInfo
+ * @returns
+ */
+
+export function formatMetric(val, metricInfo) {
+  // rlog.debug('formatMetric', item, metricInfo);
+  if (metricInfo) {
+    var result = metricValueFormat({
+      value: val,
+      dataType: metricInfo.dataType,
+      dict: DictCache.getDictObject(),
+      unit: metricInfo.unit,
+      code: metricInfo.code
+    });
+    return result.value + " " + (result.value === '-' ? '' : result.unit);
+  } else {
+    return "" + val;
+  }
+}
+export default function commonTransform(options) {
+  var item = options.item,
+      ciData = options.ciData,
+      topo = options.topo;
+  var fieldCode = item.code;
+  var attrType = item.type;
+  var ciTypeModel = topo.ciTyeCache.getCiType(ciData.ciType);
+  var fieldMeta = ciTypeModel[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
+  };
+}

package/es/core/models/attributeFormatter/formatter/graphTransform.js

@@ -0,0 +1,24 @@
+import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+export default function graphTransform(options) {
+  var item = options.item,
+      ciData = options.ciData,
+      topo = options.topo;
+  var value = '-';
+
+  try {
+    var node = 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')) || '-';
+  } catch (error) {
+    rlog.error(error);
+  }
+
+  return {
+    type: item.type,
+    code: item.code,
+    // 属性code
+    name: '图片名称',
+    // 属性名称
+    value: value // 属性值
+
+  };
+}

package/es/core/models/attributeFormatter/formatter/metricTransform.js

@@ -0,0 +1,4 @@
+import commonTransform from "./commonTransform";
+export default function metricTransform(options) {
+  return commonTransform(options);
+}

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

@@ -1,28 +1,8 @@
-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
- */
-
-export function formatMetric(val, metricInfo) {
-  // rlog.debug('formatMetric', item, metricInfo);
-  if (metricInfo) {
-    var result = metricValueFormat({
-      value: val,
-      dataType: metricInfo.dataType,
-      dict: DictCache.getDictObject(),
-      unit: metricInfo.unit,
-      code: metricInfo.code
-    });
-    return result.value + " " + (result.value === "-" ? "" : result.unit);
-  } else {
-    return "" + val;
-  }
-}
+import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import attributeTransform from "./formatter/attributeTransform";
+import metricTransform from "./formatter/metricTransform";
+import ciTypeAttrTransform from "./formatter/ciTypeAttrTransform";
+import graphTransform from "./formatter/graphTransform";
 /**
  * 标注值格式化
  */
@@ -31,10 +11,10 @@ var AttributeFormatter = /*#__PURE__*/function () {
   function AttributeFormatter(topo) {
     this.topo = topo;
     this.transformMap = {
-      attribute: this.attributeTransform.bind(this),
-      metric: this.metricTransform.bind(this),
-      ciType: this.ciTypeAttrTransform.bind(this),
-      graph: this.graphTransform.bind(this)
+      attribute: attributeTransform,
+      metric: metricTransform,
+      ciType: ciTypeAttrTransform,
+      graph: graphTransform
     };
   }
 
@@ -45,76 +25,23 @@ var AttributeFormatter = /*#__PURE__*/function () {
 
     return items.map(function (item) {
       return _this.transformAttr(item, ciData);
+    }).filter(function (item) {
+      return !!item;
     });
   };
 
   _proto.transformAttr = function transformAttr(item, ciData) {
-    return this.transformMap[item.type](item, ciData);
-  };
-
-  _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]; // 引用属性
-
-    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 options = {
+      item: item,
+      ciData: ciData,
+      topo: this.topo
     };
+    var transform = this.transformMap[item.type];
+    return transform(options);
   };
 
-  _proto.attributeTransform = function attributeTransform(item, ciData) {
-    return this.commonTransform(item, ciData, "attribute");
-  };
-
-  _proto.metricTransform = function metricTransform(item, ciData) {
-    return this.commonTransform(item, ciData, "metric");
-  };
-
-  _proto.ciTypeAttrTransform = function ciTypeAttrTransform(item, ciData) {
-    var ciTypeMeta = this.topo.ciTyeCache.getCiType(ciData.ciType);
-    return {
-      type: item.type,
-      code: item.code,
-      // 属性code
-      name: "资源类型",
-      // 属性名称
-      value: ciTypeMeta.name // 属性数值
-
-    };
-  };
-
-  _proto.graphTransform = function graphTransform(item, ciData) {
-    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")) || "-";
-    } catch (error) {
-      rlog.error(error);
-    }
-
-    return {
-      type: item.type,
-      code: item.code,
-      // 属性code
-      name: "图片名称",
-      // 属性名称
-      value: value // 属性值
-
-    };
+  _proto.addTransform = function addTransform(name, transform) {
+    this.transformMap[name] = transform;
   };
 
   return AttributeFormatter;

package/es/networkTopo/getTopoData.js

@@ -56,13 +56,17 @@ function fixNodeGroupId(data) {
   });
 }
 
+function isNetworkLink(link) {
+  return link.ciType === 'network_link' || link.typeCode === 'network_link';
+}
+
 export function addLinkData(_x) {
   return _addLinkData.apply(this, arguments);
 } // FIXME 业务拓扑不需要链路相关逻辑
 
 function _addLinkData() {
   _addLinkData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(data) {
-    var links, nodes, networkLinks, otherLinks;
+    var links, nodes, prevNetworkLinks, networkLinks, otherLinks;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
@@ -70,23 +74,23 @@ function _addLinkData() {
             links = data.links || [];
             nodes = data.nodes || []; // 如果是网络链路，补充详情信息
 
-            _context.next = 4;
-            return getLinksDetail(links.filter(function (link) {
-              return link.ciType === 'network_link';
-            }), nodes);
+            prevNetworkLinks = links.filter(function (link) {
+              return isNetworkLink(link);
+            });
+            _context.next = 5;
+            return getLinksDetail(prevNetworkLinks, nodes);
 
-          case 4:
+          case 5:
             networkLinks = _context.sent;
-            // console.log("如果是网络链路，补充详情信息", networkLinks);
             otherLinks = links.filter(function (link) {
-              return link.ciType !== 'network_link';
+              return !isNetworkLink(link);
             });
             return _context.abrupt("return", _extends({}, data, {
               links: [].concat(networkLinks, otherLinks),
               linkGroups: []
             }));
 
-          case 7:
+          case 8:
           case "end":
             return _context.stop();
         }

package/lib/core/components/DisplaySettingDrawer/hooks/useDisplaySetting.js

@@ -11,8 +11,6 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
-var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/services/topo"));
-
 var _default = function _default(props) {
   var topo = props.topo,
       displaySettingProps = props.displaySettingProps,
@@ -32,7 +30,7 @@ var _default = function _default(props) {
               prevDisplayConfig = topo.store.getModelState('displayConfig');
               displayConfig = (0, _extends2["default"])({}, prevDisplayConfig, values);
               _context.next = 5;
-              return _topo["default"].saveTopoSettings(topo.id, {
+              return topo.serverApi.saveTopoSettings(topo.id, {
                 alarmSwitch: displayConfig.alarmSwitch,
                 alarmListDefaultOpen: displayConfig.alarmListDefaultOpen,
                 extraConfig: JSON.stringify((0, _extends2["default"])({}, displayConfig))

package/lib/core/components/ResourceViewAttributeSetting/nodeCiTypeAttrUtil.js

@@ -75,7 +75,7 @@ function getNodeModels(topo) {
 
       if (topo.isCMPTopo) {
         custom.push.apply(custom, [{
-          id: 'p:source',
+          id: 'cmpNode:source',
           code: 'name',
           name: '所属平台',
           type: 'custom'

package/lib/core/components/TopoView/topoView.js

@@ -311,7 +311,10 @@ var Topology = function Topology(props) {
 
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: _TopoViewModule["default"].topoView,
-    "data-version": topo.version
+    "data-version": topo.version,
+    onFocus: function onFocus() {
+      window.topo = topo;
+    }
   }, titleBar !== false && titleBar, isEditMode && /*#__PURE__*/_react["default"].createElement(_EditorToolbar["default"], {
     topo: topo,
     topoEdit: topoEdit,

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

package/lib/core/models/attributeFormatter/formatter/attributeTransform.js

@@ -0,0 +1,12 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = attributeTransform;
+
+var _commonTransform = _interopRequireDefault(require("./commonTransform"));
+
+function attributeTransform(options) {
+  return (0, _commonTransform["default"])(options);
+}

package/lib/core/models/attributeFormatter/formatter/ciTypeAttrTransform.js

@@ -0,0 +1,20 @@
+"use strict";
+
+exports.__esModule = true;
+exports["default"] = ciTypeAttrTransform;
+
+function ciTypeAttrTransform(options) {
+  var item = options.item,
+      ciData = options.ciData,
+      topo = options.topo;
+  var ciTypeMeta = topo.ciTyeCache.getCiType(ciData.ciType);
+  return {
+    type: item.type,
+    code: item.code,
+    // 属性code
+    name: "资源类型",
+    // 属性名称
+    value: ciTypeMeta.name // 属性数值
+
+  };
+}

package/lib/core/models/attributeFormatter/formatter/commonTransform.js

@@ -0,0 +1,61 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = commonTransform;
+exports.formatMetric = formatMetric;
+
+var _utils = require("@riil-frontend/utils");
+
+var _DictCache = _interopRequireDefault(require("../../cache/DictCache"));
+
+/**
+ * 格式化指标
+ * @param {*} val
+ * @param {*} metricInfo
+ * @returns
+ */
+function formatMetric(val, metricInfo) {
+  // rlog.debug('formatMetric', item, metricInfo);
+  if (metricInfo) {
+    var result = (0, _utils.metricValueFormat)({
+      value: val,
+      dataType: metricInfo.dataType,
+      dict: _DictCache["default"].getDictObject(),
+      unit: metricInfo.unit,
+      code: metricInfo.code
+    });
+    return result.value + " " + (result.value === '-' ? '' : result.unit);
+  } else {
+    return "" + val;
+  }
+}
+
+function commonTransform(options) {
+  var item = options.item,
+      ciData = options.ciData,
+      topo = options.topo;
+  var fieldCode = item.code;
+  var attrType = item.type;
+  var ciTypeModel = topo.ciTyeCache.getCiType(ciData.ciType);
+  var fieldMeta = ciTypeModel[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
+  };
+}

package/lib/core/models/attributeFormatter/formatter/graphTransform.js

@@ -0,0 +1,32 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = graphTransform;
+
+var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+
+function graphTransform(options) {
+  var item = options.item,
+      ciData = options.ciData,
+      topo = options.topo;
+  var value = '-';
+
+  try {
+    var node = 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')) || '-';
+  } catch (error) {
+    _rlog["default"].error(error);
+  }
+
+  return {
+    type: item.type,
+    code: item.code,
+    // 属性code
+    name: '图片名称',
+    // 属性名称
+    value: value // 属性值
+
+  };
+}

package/lib/core/models/attributeFormatter/formatter/metricTransform.js

@@ -0,0 +1,12 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = metricTransform;
+
+var _commonTransform = _interopRequireDefault(require("./commonTransform"));
+
+function metricTransform(options) {
+  return (0, _commonTransform["default"])(options);
+}