@riil-frontend/component-topology 2.15.18 → 2.15.21

package/lib/core/editor/components/settings/propertyViews/text/TextPropertyView.js

@@ -65,15 +65,13 @@ function TextPropertyView(props) {
         return;
       }
 
-      if (values[name] !== value) {
-        if (name === 'styleMap.text' && !value) {
-          _onChange(name, DEFAULT_TEXT_VALUE, newValues);
+      if (name === 'styleMap.text' && !value) {
+        _onChange(name, DEFAULT_TEXT_VALUE, newValues);
 
-          return;
-        }
-
-        _onChange(name, value, newValues);
+        return;
       }
+
+      _onChange(name, value, newValues);
     }
   });
 

package/lib/core/models/TopoApp.js

@@ -45,14 +45,11 @@ var _edgeUtil = require("../utils/edgeUtil");
 
 var _PluginManager = _interopRequireDefault(require("./PluginManager"));
 
+var _topoFactory = _interopRequireDefault(require("./topoFactory"));
+
 // eslint-disable-next-line no-undef
-var version = typeof "2.15.18" === 'string' ? "2.15.18" : null;
+var version = typeof "2.15.21" === 'string' ? "2.15.21" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
-var topoDebug = {};
-window.topoDebug = topoDebug;
-var htTopo = {};
-window.htTopo = htTopo;
-var n = 0;
 /**
  * 拓扑显示和编辑
  */
@@ -62,7 +59,6 @@ var Topo = /*#__PURE__*/function () {
    * @type TopoGraphView
    */
   function Topo(options) {
-    this.version = version;
     this.options = void 0;
     this.id = void 0;
     this.view = void 0;
@@ -73,6 +69,8 @@ var Topo = /*#__PURE__*/function () {
     this.ciTyeCache = _CiTyeCache["default"];
     this.dictCache = _DictCache["default"];
     this.test = void 0;
+    this.uid = void 0;
+    this.version = version;
     this.options = (0, _extends2["default"])({
       enableDefaultAlarmLoader: true,
       enableDefaultMetricLoader: true,
@@ -85,9 +83,6 @@ var Topo = /*#__PURE__*/function () {
     }
 
     this.initialize(options);
-    this.debugId = options.name || "t" + n++;
-    topoDebug[this.debugId] = this;
-    htTopo[this.debugId] = this.getHtTopo.bind(this);
   }
 
   var _proto = Topo.prototype;
@@ -107,6 +102,7 @@ var Topo = /*#__PURE__*/function () {
     this.alarm.init(this); // 指标
 
     this.test = new _Test["default"](this);
+    this.uid = _topoFactory["default"].add(options.name, this);
   }
   /**
    * TODO 移除
@@ -127,10 +123,9 @@ var Topo = /*#__PURE__*/function () {
               return topoDispatchers.exit();
 
             case 3:
-              delete topoDebug[this.debugId];
-              delete htTopo[this.debugId];
+              _topoFactory["default"].remove(this.uid);
 
-            case 5:
+            case 4:
             case "end":
               return _context.stop();
           }

package/lib/core/models/topoFactory.js

@@ -0,0 +1,30 @@
+"use strict";
+
+exports.__esModule = true;
+exports["default"] = void 0;
+var n = 0;
+
+var TopoFactory = /*#__PURE__*/function () {
+  function TopoFactory() {
+    this.map = {};
+  }
+
+  var _proto = TopoFactory.prototype;
+
+  _proto.add = function add(name, topo) {
+    var uid = name || "" + n++;
+    this.map[uid] = topo;
+    return uid;
+  };
+
+  _proto.remove = function remove(name) {
+    delete this.map[name];
+  };
+
+  return TopoFactory;
+}();
+
+var topoFactory = new TopoFactory();
+window.topoFactory = topoFactory;
+var _default = topoFactory;
+exports["default"] = _default;

package/lib/core/viewer/components/plugins/BaseInfo/components/ResourceOverview/index.js

@@ -51,12 +51,13 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 // 基本信息
 function BaseInfoRender(type, data) {
+  var _itemCols$type;
+
   var itemCols = {
     node: [{
       label: '资源名称：',
       objKey: 'resource',
       render: function render(valueData, key) {
-        console.log('资源名称：', valueData, key);
         var display_name = valueData.display_name,
             link = valueData.link;
         return /*#__PURE__*/_react["default"].createElement("div", {
@@ -111,7 +112,7 @@ function BaseInfoRender(type, data) {
   };
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: _indexModule["default"]['base-info']
-  }, itemCols[type].map(function (_ref, key) {
+  }, (_itemCols$type = itemCols[type]) === null || _itemCols$type === void 0 ? void 0 : _itemCols$type.map(function (_ref, key) {
     var label = _ref.label,
         objKey = _ref.objKey,
         style = _ref.style,

package/lib/core/viewer/components/plugins/BaseInfo/index.js

@@ -123,8 +123,11 @@ function BaseInfo(props) {
       userId = _useState4[0],
       setUserId = _useState4[1];
 
+  var _useState5 = (0, _react.useState)(null),
+      paramData = _useState5[0],
+      setParamData = _useState5[1];
+
   (0, _react.useEffect)(function () {
-    getUser();
     var notifier = topo.view.topoClient.notifier;
     notifier.on(_componentTopologyGraph.TopoEvent.EVENT_DOUBLE_CLICK, openOverview);
     notifier.on('topo_element_click', changeOverview);
@@ -140,12 +143,51 @@ function BaseInfo(props) {
   }, []); // 解决切换拓扑图隐藏概览
 
   (0, _react.useEffect)(function () {
-    setVisible(false); // TODO 其他数据重置
+    setVisible(false);
+    setParamData(null); // TODO 其他数据重置
   }, [topoId]);
 
   function getUser() {
     return _getUser.apply(this, arguments);
-  }
+  } // function changeOverview (node) {
+  //   const data = node.getAttrObject()
+  //   console.log('单击切换基本信息', data);
+  //   setVisible(prev => {
+  //     prev && openOverview(data)
+  //     return prev
+  //   })
+  // }
+  // function openOverview (data) {
+  //   console.log('双击打开基本信息', data);
+  //   const {
+  //     id,
+  //     name,
+  //     type,
+  //     ciType,
+  //     ciName,
+  //     operation,
+  //   } = data
+  //   // 仅展示资源和链路的概览
+  //   if (!['node', 'link', 'linkGroup'].includes(type)) return
+  //   // 应用拓扑中没有链路详情
+  //   if (topo.options.resourceOverviewDrawer?.getData && type === 'link') return
+  //   // 没有权限不显示
+  //   if (!operation) return
+  //   setActiveData({
+  //     id,
+  //     name,
+  //     type: type === 'linkGroup' ? 'link' : type,
+  //     ciType,
+  //     ciName
+  //   })
+  //   const { metrics } = topo.ciTyeCache.getCiType(ciType)
+  //   topoDispatchers.update({
+  //     id,
+  //     metricCodes: metrics.slice(0, 6).map(item => item.code), // 需要展示的关键指标 code
+  //   })
+  //   setVisible(true)
+  // }
+
 
   function _getUser() {
     _getUser = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
@@ -171,25 +213,41 @@ function BaseInfo(props) {
     return _getUser.apply(this, arguments);
   }
 
+  function onChangeActive(activeNode) {
+    console.log('切换基本信息资源', activeNode);
+    activeNode && openOverview((0, _extends2["default"])({}, activeNode, {
+      type: 'node'
+    }));
+  }
+
+  (0, _react.useEffect)(function () {
+    (visible || (paramData === null || paramData === void 0 ? void 0 : paramData.isVisible)) && paramData && init(paramData);
+  }, [paramData, visible]);
+
   function changeOverview(node) {
     var data = node.getAttrObject();
     console.log('单击切换基本信息', data);
-    setVisible(function (prev) {
-      prev && openOverview(data);
-      return prev;
-    });
+    setParamData(data);
   }
 
   function openOverview(data) {
+    console.log('双击打开基本信息', data);
+    setParamData((0, _extends2["default"])({}, data, {
+      isVisible: true
+    }));
+  }
+
+  function init(data) {
     var _topo$options$resourc;
 
-    console.log('双击打开基本信息', data);
+    console.log('初始化基本信息', data);
     var id = data.id,
         name = data.name,
         type = data.type,
         ciType = data.ciType,
         ciName = data.ciName,
-        operation = data.operation; // 仅展示资源和链路的概览
+        operation = data.operation,
+        isVisible = data.isVisible; // 仅展示资源和链路的概览
 
     if (!['node', 'link', 'linkGroup'].includes(type)) return; // 应用拓扑中没有链路详情
 
@@ -213,15 +271,11 @@ function BaseInfo(props) {
         return item.code;
       }) // 需要展示的关键指标 code
 
-    });
-    setVisible(true);
-  }
+    }); // 显示隐藏
 
-  function onChangeActive(activeNode) {
-    console.log('切换基本信息资源', activeNode);
-    activeNode && openOverview((0, _extends2["default"])({}, activeNode, {
-      type: 'node'
-    }));
+    isVisible && setVisible(true); // userId
+
+    userId || getUser();
   }
 
   return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_drawer["default"], {

package/lib/hooks/useTopoEdit.js

@@ -852,7 +852,7 @@ var useTopoEdit = function useTopoEdit(params) {
 
   var bindNodeResource = /*#__PURE__*/function () {
     var _ref6 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee7(params) {
-      var id, oldResId, newResId, node, groupElement, config, groupId, groupTag, _yield$editDispatcher, elements, nodeRelatedData, replaceOrAddRes;
+      var id, oldResId, newResId, node, groupElement, config, groupId, groupTag, _yield$editDispatcher, elements, nodeRelatedDatas, replaceOrAddRes;
 
       return _regenerator["default"].wrap(function _callee7$(_context7) {
         while (1) {
@@ -881,7 +881,7 @@ var useTopoEdit = function useTopoEdit(params) {
 
                 groupTag = groupElement.a('tag'); // 容器临时id
 
-                config.groups = groups.map(function (g) {
+                config.groups = config.groups.map(function (g) {
                   // 匹配到容器，替换资源或增加
                   if (g.id === groupId || g.tag === groupTag) {
                     return (0, _extends2["default"])({}, g, {
@@ -908,15 +908,26 @@ var useTopoEdit = function useTopoEdit(params) {
               _yield$editDispatcher = _context7.sent;
               elements = _yield$editDispatcher.topoDataTrans;
               // 过滤出关联的节点和连线，通知ht更新
-              nodeRelatedData = (0, _format.filterElementsByNodeId)(elements, newResId);
-              saveBind(_componentTopologyGraph.TopoEvent.DATA_TYPE_RESOURCE_SINGLE, nodeRelatedData);
+              nodeRelatedDatas = (0, _format.filterElementsByNodeId)(elements, newResId);
+
+              if (nodeRelatedDatas.length) {
+                _context7.next = 17;
+                break;
+              }
+
+              _message["default"].error('关联资源失败');
+
+              return _context7.abrupt("return", false);
+
+            case 17:
+              saveBind(_componentTopologyGraph.TopoEvent.DATA_TYPE_RESOURCE_SINGLE, nodeRelatedDatas);
               node.a('customName', null); // 临时放这里，仅拓扑中心有
 
               if (topo.linkDynamicStyleExecutor) {
                 topo.linkDynamicStyleExecutor.execute();
               }
 
-            case 17:
+            case 20:
             case "end":
               return _context7.stop();
           }

package/lib/topoCenter/components/Topology.js

@@ -63,7 +63,10 @@ function NetworkTopologyFull(props) {
     graphViewProps: (0, _extends2["default"])({}, props.graphViewProps, {
       onElementsDelete: topoEdit.onElementsDelete,
       createHtTopoProps: {
-        elementChangeLayerByDrag: true
+        elementChangeLayerByDrag: true,
+        editor: {
+          useNewElementsDeleteEvent: true
+        }
       }
     })
   }));

package/lib/topoCenter/components/editor/propertyViews/edge/LinkPropertyView/Setting/index.js

@@ -38,9 +38,7 @@ function LinkSetting(props) {
     onChange: function onChange(name, value) {
       var newValues = field.getValues();
 
-      if (values[name] !== value) {
-        _onChange(name, value, newValues);
-      }
+      _onChange(name, value, newValues);
     }
   });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "2.15.18",
+  "version": "2.15.21",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -110,6 +110,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@2.15.18/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@2.15.21/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }