@riil-frontend/component-topology 7.0.8 → 8.0.0-a.2

package/es/components/BatchAttrMetric/setting.js

@@ -27,8 +27,6 @@ var Setting = function Setting(_ref) {
   var limit = props.limit,
       saveCb = props.saveCb,
       elementType = props.elementType;
-  rlog.debug("Setting-resAndMetrics-allCiSet-elementType", showType, props, elementType);
-  rlog.debug("Setting----allCiSet", allCiSet);
 
   var _useState = useState(Object.keys(allCiSet)[0]),
       ciType = _useState[0],

package/es/core/common/icons/basicIcons.js

@@ -0,0 +1,57 @@
+export default [{
+  'id': 'system.防火墙2.5D',
+  'name': '防火墙',
+  'url': '/img/topo/basicIcon/防火墙2.5D.svg'
+}, {
+  'id': 'system.云2.5D',
+  'name': '云',
+  'url': '/img/topo/basicIcon/云2.5D.svg'
+}, {
+  'id': 'system.五角星2.5D',
+  'name': '五角星',
+  'url': '/img/topo/basicIcon/五角星2.5D.svg'
+}, {
+  'id': 'system.旗帜2.5D',
+  'name': '旗帜',
+  'url': '/img/topo/basicIcon/旗帜2.5D.svg'
+}, {
+  'id': 'system.人员',
+  'name': '人员',
+  'url': '/img/topo/basicIcon/人员平面.svg'
+}, {
+  'id': 'system.楼宇',
+  'name': '楼宇',
+  'url': '/img/topo/basicIcon/楼宇平面.svg'
+}, {
+  'id': 'system.黑客',
+  'name': '黑客',
+  'url': '/img/topo/basicIcon/黑客平面.svg'
+}, {
+  'id': 'system.摄像头',
+  'name': '摄像头',
+  'url': '/img/topo/basicIcon/摄像头平面.svg'
+}, {
+  'id': 'system.蓝色云端',
+  'name': '蓝色云端',
+  'url': '/img/topo/basicIcon/云平面.svg'
+}, {
+  'id': 'system.五角星平面',
+  'name': '五角星',
+  'url': '/img/topo/basicIcon/五角星平面.svg'
+}, {
+  'id': 'system.旗帜平面',
+  'name': '旗帜',
+  'url': '/img/topo/basicIcon/旗帜平面.svg'
+}, {
+  'id': 'system.防火墙平面',
+  'name': '防火墙',
+  'url': '/img/topo/basicIcon/防火墙平面.svg'
+}, {
+  'id': 'system.线路平面',
+  'name': '线路',
+  'url': '/img/topo/basicIcon/线路平面.svg'
+}, {
+  'id': 'system.打印机平面',
+  'name': '打印机',
+  'url': '/img/topo/basicIcon/打印机平面.svg'
+}];

package/es/core/common/icons/icon.js

@@ -1,6 +1,7 @@
 import _extends from "@babel/runtime/helpers/extends";
 import topoManager from '@riil-frontend/component-topology-graph/es/manager';
 import { getCiModels } from "../../../constants/ResourceTypeLimit";
+import basicIcons from "./basicIcons";
 /**
  * 获取默认图标
  * @param {*} topo 
@@ -36,18 +37,15 @@ export function getResourceIcons(topo) {
  */
 
 export function getBasicIcons(topo, containsGroupIcon) {
-  var icons = topoManager.iconLibManager.getIcons();
-  icons = icons.filter(function (icon) {
+  var nodeIcons = topoManager.iconLibManager.getNodeIcons().filter(function (icon) {
     return !icon.ciType;
   });
 
   if (containsGroupIcon === false) {
-    icons = icons.filter(function (icon) {
-      return icon.type !== 'group';
-    });
+    return [].concat(nodeIcons, basicIcons);
   }
 
-  return icons;
+  return [topoManager.iconLibManager.getGroupIcon()].concat(nodeIcons, basicIcons);
 }
 export function getGroupDefaultIcons(topo) {
   return [].concat(topoManager.iconLibManager.getIcons());

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

@@ -2,6 +2,7 @@ import _extends from "@babel/runtime/helpers/extends";
 import React, { useState, useEffect, useRef, useCallback, useImperativeHandle, forwardRef, useMemo } from "react";
 import rlog from "@riil-frontend/component-topology-utils/es/rlog";
 import BatchAttrMetricDrawer from "../../../components/BatchAttrMetric";
+import { getNodeCiModSet } from "./nodeCiTypeAttrUtil";
 /**
  * 资源显示属性、指标配置
  */
@@ -20,22 +21,15 @@ var ResourceDiplayInfoSetting = /*#__PURE__*/forwardRef(function (props, ref) {
       markData = _useState[0],
       setMarkarkData = _useState[1];
 
-  var _topo$store$useModel = topo.store.useModel("topoBizMod"),
-      bizState = _topo$store$useModel[0],
-      bizDispatchers = _topo$store$useModel[1]; // rlog.debug('TopoView---income', topoId, viewState);
-
-
-  var resAndMetrics = bizState.resAndMetrics;
-  var allCiModSet = resAndMetrics.allCiModSet,
-      allLinkModSet = resAndMetrics.allLinkModSet;
-
   var openMarkSetting = function openMarkSetting(parm) {
-    rlog.debug("openMarkSetting", parm, elementType, showType, allCiModSet, allLinkModSet);
+    rlog.debug("openMarkSetting", parm, elementType, showType);
 
     if (queryData) {
       setMarkarkData(queryData());
     } else {
-      setMarkarkData(elementType === "node" ? allCiModSet : allLinkModSet);
+      setMarkarkData(elementType === "node" ? getNodeCiModSet({
+        topo: topo
+      }) : undefined);
     }
 
     batchAttrMetric.current.show({

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

@@ -0,0 +1,121 @@
+import { getCiTypesFromCiElements } from "../../../utils/topoData"; // 资源类型含有属性和指标集合
+
+export function getNodeCiModSet(params) {
+  var topo = params.topo;
+  var data = topo.store.getModelState('topoMod').data;
+  var globalConfig = data.global.extraConfig;
+  var ciTypeMap = topo.ciTyeCache.ciTypes;
+
+  function getNodeModSet() {
+    var ciTypes = getCiTypesFromCiElements(data.nodes);
+    return getModSet(ciTypes);
+  }
+  /**
+   *
+   * @param {array} ciTypeCodes
+   * @returns
+   */
+
+
+  function getModSet(ciTypeCodes) {
+    var modSet = {};
+    Object.keys(ciTypeMap).filter(function (item) {
+      return ciTypeCodes.includes(item);
+    }).forEach(function (key) {
+      var ciTypeObj = ciTypeMap[key];
+      modSet[key] = {
+        name: ciTypeObj.displayName,
+        code: ciTypeObj.code,
+        icon: ciTypeObj.icon,
+        list: ciModfilter(ciTypeObj, globalConfig, 'node', ciTypeObj.code)
+      };
+    }); // console.log("modSet--------------------", modSet);
+
+    return modSet;
+  }
+  /**
+   * 过滤ci元数据中的属性和指标，用于属性和指标显示设置
+   * @param {} ciTypeObj
+   * @returns
+   */
+
+
+  function ciModfilter(ciTypeObj, globalSetting, type, code) {
+    var tips = globalSetting[type + "Tip"];
+    var tags = globalSetting[type + "Tag"];
+    var tipArr = [];
+    var tagArr = [];
+
+    if (tips !== null && tips !== void 0 && tips.isCustom) {
+      var _tips$data$code;
+
+      (_tips$data$code = tips.data[code]) === null || _tips$data$code === void 0 ? void 0 : _tips$data$code.map(function (item) {
+        tipArr.push(item.code + "-" + item.type);
+      });
+    }
+
+    if (tags !== null && tags !== void 0 && tags.isCustom) {
+      var _tags$data$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
+    // );
+
+
+    var custom = [];
+
+    if (type === 'node') {
+      custom.push({
+        id: 'name-graph',
+        code: 'name',
+        name: '图片名称',
+        type: 'custom',
+        tag: tagArr.indexOf('name-graph') >= 0,
+        tip: tipArr.indexOf('name-graph') >= 0
+      });
+      custom.push({
+        id: 'display_name-ciType',
+        code: 'ciType',
+        name: '资源类型',
+        type: 'custom',
+        tag: tagArr.indexOf('display_name-ciType') >= 0,
+        tip: tipArr.indexOf('display_name-ciType') >= 0
+      });
+    }
+
+    var attributes = ciTypeObj.attributes.filter(function (attr) {
+      return !!attr.userVisible;
+    }).map(function (item) {
+      var aid = item.code + "-attribute";
+      return {
+        id: aid,
+        code: item.code,
+        name: item.name,
+        type: 'attribute',
+        tag: tagArr.indexOf(aid) >= 0,
+        tip: tipArr.indexOf(aid) >= 0
+      };
+    });
+    var metrics = ciTypeObj.metrics.map(function (item) {
+      var mid = item.code + "-metric";
+      return {
+        id: mid,
+        code: item.code,
+        name: item.name,
+        type: 'metric',
+        tag: tagArr.indexOf(mid) >= 0,
+        tip: tipArr.indexOf(mid) >= 0
+      };
+    });
+    return [].concat(custom, attributes, metrics);
+  }
+
+  ;
+  return getNodeModSet();
+}

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

@@ -33,7 +33,6 @@ export default function GraphViewPanel(props) {
     style: {
       background: canvasColor
     },
-    onFocus: onFocus,
-    on: true
+    onFocus: onFocus
   }, props.children);
 }

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

@@ -24,6 +24,7 @@ import Sidebar from "../../editor/components/Sidebar/Sidebar";
 import PropertyView from "../../editor/components/settings/PropertyView";
 import HistoryManager from "../../models/HistoryManager";
 import editorStyles from "./editor.module.scss";
+import basicIcons from "../../common/icons/basicIcons";
 
 var Topology = function Topology(props) {
   var _classnames;
@@ -74,7 +75,7 @@ var Topology = function Topology(props) {
     topo: topo,
     topoId: topoId,
     isEditing: isEditMode,
-    onSave: onSave,
+    onSave: editorProps.onSave || onSave,
     nodeDeleteable: nodeDeleteable,
     onNodeDelete: onNodeDelete,
     onLineDelete: onLineDelete,
@@ -236,6 +237,7 @@ var Topology = function Topology(props) {
       }),
       data: tData,
       defaultEnterEditMode: defaultEnterEditMode,
+      icons: [].concat(graphViewProps.icons || [], basicIcons),
       onCreate: onGraphCreated,
       onLoaded: handleGraphLoaded,
       onDataLoaded: handleGraphDataLoaded,

package/es/core/hooks/useTopoEdit.js

@@ -692,58 +692,9 @@ var useTopoEdit = function useTopoEdit(params) {
     };
   }();
 
-  function checkSavePermission(_x13) {
-    return _checkSavePermission.apply(this, arguments);
-  }
-
-  function _checkSavePermission() {
-    _checkSavePermission = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee16(id) {
-      var permission;
-      return _regeneratorRuntime.wrap(function _callee16$(_context16) {
-        while (1) {
-          switch (_context16.prev = _context16.next) {
-            case 0:
-              _context16.next = 2;
-              return topoDispatchers.getTopoPermission({
-                id: id,
-                update: false
-              });
-
-            case 2:
-              permission = _context16.sent;
-
-              if (!topoPermissonUtil.isEditable(permission)) {
-                _context16.next = 5;
-                break;
-              }
-
-              return _context16.abrupt("return", true);
-
-            case 5:
-              _Dialog.alert({
-                title: "没有权限进行此操作",
-                content: "您的权限发生了变化，请联系相关管理员。",
-                okProps: {
-                  children: "确定"
-                },
-                onOk: function onOk() {}
-              });
-
-              return _context16.abrupt("return", false);
-
-            case 7:
-            case "end":
-              return _context16.stop();
-          }
-        }
-      }, _callee16);
-    }));
-    return _checkSavePermission.apply(this, arguments);
-  }
-
   var onSaveTopo = /*#__PURE__*/function () {
     var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8(data) {
-      var id, config, serialize, _config$layout, template, layout, saveConfig, valid, saveData;
+      var id, config, serialize, _config$layout, template, layout, saveConfig;
 
       return _regeneratorRuntime.wrap(function _callee8$(_context8) {
         while (1) {
@@ -752,85 +703,42 @@ var useTopoEdit = function useTopoEdit(params) {
               id = data.id, config = data.config, serialize = data.serialize;
               _config$layout = config === null || config === void 0 ? void 0 : config.layout, template = _config$layout.type, layout = _config$layout.layout;
 
-              if (!onSave) {
-                _context8.next = 6;
-                break;
-              }
+              if (onSave) {
+                // 自定义保存
+                saveConfig = /*#__PURE__*/function () {
+                  var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7() {
+                    return _regeneratorRuntime.wrap(function _callee7$(_context7) {
+                      while (1) {
+                        switch (_context7.prev = _context7.next) {
+                          case 0:
+                            _context7.next = 2;
+                            return editDispatchers.saveTopo({
+                              id: id,
+                              layout: layout,
+                              serialize: serialize
+                            });
 
-              // 自定义保存
-              saveConfig = /*#__PURE__*/function () {
-                var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7() {
-                  return _regeneratorRuntime.wrap(function _callee7$(_context7) {
-                    while (1) {
-                      switch (_context7.prev = _context7.next) {
-                        case 0:
-                          _context7.next = 2;
-                          return editDispatchers.saveTopo({
-                            id: id,
-                            layout: layout,
-                            serialize: serialize
-                          });
-
-                        case 2:
-                        case "end":
-                          return _context7.stop();
+                          case 2:
+                          case "end":
+                            return _context7.stop();
+                        }
                       }
-                    }
-                  }, _callee7);
-                }));
-
-                return function saveConfig() {
-                  return _ref7.apply(this, arguments);
-                };
-              }();
-
-              onSave({
-                data: data,
-                saveConfig: saveConfig
-              });
-              return _context8.abrupt("return");
-
-            case 6:
-              // TODO 以下逻辑移到拓扑中心
-              topoEditDispatchers.update({
-                saving: true
-              }); // 检查权限
-
-              _context8.next = 9;
-              return checkSavePermission(id);
-
-            case 9:
-              valid = _context8.sent;
-
-              if (valid) {
-                _context8.next = 13;
-                break;
+                    }, _callee7);
+                  }));
+
+                  return function saveConfig() {
+                    return _ref7.apply(this, arguments);
+                  };
+                }();
+
+                onSave({
+                  topo: topo,
+                  data: data,
+                  saveConfig: saveConfig
+                });
               }
 
-              topoEditDispatchers.update({
-                saving: false
-              });
-              return _context8.abrupt("return");
-
-            case 13:
-              // 保存
-              saveData = _extends({
-                id: id,
-                layout: layout,
-                serialize: serialize
-              }, resourceConfig.getConfig());
-              rlog.info("保存", saveData);
-              _context8.next = 17;
-              return editDispatchers.saveTopo(saveData);
-
-            case 17:
-              topoEditDispatchers.update({
-                saving: false
-              });
-
-              _Message.success("保存成功！");
-
-            case 19:
+            case 3:
             case "end":
               return _context8.stop();
           }
@@ -838,7 +746,7 @@ var useTopoEdit = function useTopoEdit(params) {
       }, _callee8);
     }));
 
-    return function onSaveTopo(_x14) {
+    return function onSaveTopo(_x13) {
       return _ref6.apply(this, arguments);
     };
   }();
@@ -1048,7 +956,7 @@ var useTopoEdit = function useTopoEdit(params) {
       }, _callee10);
     }));
 
-    return function bindNodeResource(_x15) {
+    return function bindNodeResource(_x14) {
       return _ref8.apply(this, arguments);
     };
   }();

package/es/core/models/AttributeMetricDisplay.js

@@ -356,7 +356,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
   /*#__PURE__*/
   function () {
     var _fetchData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-      var topo, _topo$store$getState$, resIdsList, nodeIdsList, codes, param, transformLinkData, result;
+      var topo, _topo$store$getModelS, resIdsList, nodeIdsList, codes, param, transformLinkData, result;
 
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
@@ -383,7 +383,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
               };
 
               topo = this.topo;
-              _topo$store$getState$ = topo.store.getState().topoBizMod.resAndMetrics, resIdsList = _topo$store$getState$.resIdsList, nodeIdsList = _topo$store$getState$.nodeIdsList; // rlog.debug('根据ci的id获取属性的值-getCiArrByIds', resIdsList, metrics);
+              _topo$store$getModelS = topo.store.getModelState('topoBizMod').resAndMetrics, resIdsList = _topo$store$getModelS.resIdsList, nodeIdsList = _topo$store$getModelS.nodeIdsList; // rlog.debug('根据ci的id获取属性的值-getCiArrByIds', resIdsList, metrics);
               // 无资源，不查询
 
               if (resIdsList.length) {
@@ -636,8 +636,8 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
 
     var elementTagsAndTips = this.buildTagsTips() // 开锁状态下禁用悬停展示悬浮框
     .map(function (item) {
-      var _topo$store$getModelS = topo.store.getModelState('lock'),
-          lock = _topo$store$getModelS.lock;
+      var _topo$store$getModelS2 = topo.store.getModelState('lock'),
+          lock = _topo$store$getModelS2.lock;
 
       return lock ? item : _extends({}, item, {
         tips: []

package/es/core/models/TopoApp.js

@@ -23,7 +23,7 @@ import topoFactory from "./topoFactory";
 import ElementTagTipConfig from "./tagstips/ElementTagTipConfig";
 import SelectionModel from "./SelectionModel"; // eslint-disable-next-line no-undef
 
-var version = typeof "7.0.8" === 'string' ? "7.0.8" : null;
+var version = typeof "8.0.0-a.2" === 'string' ? "8.0.0-a.2" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/es/core/models/tagstips/ElementTagTipConfig.js

@@ -9,7 +9,7 @@ var ElementTagTipConfig = /*#__PURE__*/function () {
   function ElementTagTipConfig(topo) {
     this.topoData = void 0;
     this.mtCodes = void 0;
-    this.mtMetricsMap = void 0;
+    this.mtMetricsMap = {};
     this.mtCiTypeMap = void 0;
     this.topo = topo;
   }
@@ -25,28 +25,36 @@ var ElementTagTipConfig = /*#__PURE__*/function () {
               this.topoData = topoData;
               this.mtCodes = getMonitorTemplateCodesFromTopoData(topoData);
               _context.prev = 2;
-              _context.next = 5;
+
+              if (!this.mtCodes.length) {
+                _context.next = 7;
+                break;
+              }
+
+              _context.next = 6;
               return getMetricsByMonitorTemplateCodes(this.mtCodes);
 
-            case 5:
+            case 6:
               this.mtMetricsMap = _context.sent;
-              _context.next = 11;
+
+            case 7:
+              _context.next = 12;
               break;
 
-            case 8:
-              _context.prev = 8;
+            case 9:
+              _context.prev = 9;
               _context.t0 = _context["catch"](2);
               rlog.error('查询监控模板指标失败', _context.t0);
 
-            case 11:
+            case 12:
               this.mtCiTypeMap = getMtCodeCiTypeMap(topoData);
 
-            case 12:
+            case 13:
             case "end":
               return _context.stop();
           }
         }
-      }, _callee, this, [[2, 8]]);
+      }, _callee, this, [[2, 9]]);
     }));
 
     function init(_x) {