@riil-frontend/component-topology 2.15.18 → 2.15.21

package/es/components/ResourceSelectDrawer/ResourceSelectDrawer.js

@@ -51,6 +51,8 @@ function ResourceSelectDrawer(props) {
 
               if (shouldClose !== false) {
                 onClose();
+              } else {
+                setLoading(false);
               }
 
               _context.next = 13;

package/es/components/ResourceSelectDrawer/ResourceSelectList.js

@@ -23,7 +23,10 @@ function ResourceSelectList(props, ref) {
     limitTypes: limitTypes || RESOURCE_LIMIT_TYPES,
     defaultCondition: excludeIds.length ? "!id('" + excludeIds.join('\',\'') + "')" : undefined,
     request: getRequest(),
-    tableProps: tableProps
+    tableProps: tableProps,
+    paginationProps: {
+      type: 'simple'
+    }
   });
 }
 

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

@@ -122,6 +122,7 @@ var TopoView = function TopoView(props) {
   useEffect(function () {
     return function () {
       topoDispatchers.reset();
+      clearSelection();
     };
   }, []);
   var onGraphCreated = useCallback(function (topoClient) {
@@ -240,9 +241,7 @@ var TopoView = function TopoView(props) {
     className: classnames(styles.viewPanel, (_classnames = {}, _classnames[styles.viewPanelEditMode] = isEditMode, _classnames))
   }, /*#__PURE__*/React.createElement(TopoGraph, _extends({}, graphViewProps, {
     createHtTopoProps: _extends({}, graphViewProps.createHtTopoProps, {
-      editor: _extends({}, ((_graphViewProps$creat = graphViewProps.createHtTopoProps) === null || _graphViewProps$creat === void 0 ? void 0 : _graphViewProps$creat.editor) || {}, {
-        useNewElementsDeleteEvent: true
-      })
+      editor: _extends({}, ((_graphViewProps$creat = graphViewProps.createHtTopoProps) === null || _graphViewProps$creat === void 0 ? void 0 : _graphViewProps$creat.editor) || {})
     }),
     data: tData,
     defaultEnterEditMode: defaultEnterEditMode,

package/es/core/editor/components/settings/propertyViews/edge/CommonEdgePropertyView.js

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

package/es/core/editor/components/settings/propertyViews/edge/edgeGroup/EdgeGroupSetting.js

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

package/es/core/editor/components/settings/propertyViews/group/SettingTab/Setting.js

@@ -30,9 +30,7 @@ export default function GroupSetting(props) {
 
       var newValues = field.getValues();
 
-      if (values[name] !== value) {
-        _onChange(name, value, newValues);
-      }
+      _onChange(name, value, newValues);
     }
   });
 
@@ -92,7 +90,8 @@ export default function GroupSetting(props) {
     }
   }), /*#__PURE__*/React.createElement(_Input, {
     name: "attrObject.name",
-    maxLength: 30
+    maxLength: 30,
+    placeholder: "\u8BF7\u8F93\u5165"
   })), expanded ? /*#__PURE__*/React.createElement(GroupExpandSetting, {
     group: group,
     expanded: expanded,

package/es/core/editor/components/settings/propertyViews/layer/SettingTab/Setting.js

@@ -23,11 +23,10 @@ export default function LayerSettingTab(props) {
         return;
       }
 
+      console.error(values[name], value);
       var newValues = field.getValues();
 
-      if (values[name] !== value) {
-        _onChange(name, value, newValues);
-      }
+      _onChange(name, value, newValues);
     }
   });
 
@@ -56,7 +55,8 @@ export default function LayerSettingTab(props) {
     }
   }), /*#__PURE__*/React.createElement(_Input, {
     name: "styleMap.label",
-    maxLength: 30
+    maxLength: 30,
+    placeholder: "\u8BF7\u8F93\u5165"
   })), /*#__PURE__*/React.createElement(_Form.Item, null, /*#__PURE__*/React.createElement(_Collapse, {
     defaultExpandedKeys: ['图片', '对齐方式', '线形'],
     style: {

package/es/core/editor/components/settings/propertyViews/multipleElements/MultipleElementPropertyView.js

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

package/es/core/editor/components/settings/propertyViews/node/NodePropertyView.js

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

package/es/core/editor/components/settings/propertyViews/node/data/BindResourceDrawer.js

@@ -19,6 +19,7 @@ var BindResourceDrawer = function BindResourceDrawer(props) {
 
   var handleSave = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(selected) {
+      var result;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
@@ -41,6 +42,10 @@ var BindResourceDrawer = function BindResourceDrawer(props) {
               });
 
             case 5:
+              result = _context.sent;
+              return _context.abrupt("return", result);
+
+            case 7:
             case "end":
               return _context.stop();
           }

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

@@ -46,15 +46,13 @@ export default 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/es/core/models/TopoApp.js

@@ -17,15 +17,11 @@ import AttributeMetricDisplay from "./AttributeMetricDisplay";
 import DataModel from "./DataModel";
 import GraphDataModel from "./GraphDataModel";
 import { updateEdgeExpanded } from "../utils/edgeUtil";
-import PluginManager from "./PluginManager"; // eslint-disable-next-line no-undef
+import PluginManager from "./PluginManager";
+import topoFactory from "./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;
 /**
  * 拓扑显示和编辑
  */
@@ -35,7 +31,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;
@@ -46,6 +41,8 @@ var Topo = /*#__PURE__*/function () {
     this.ciTyeCache = CiTyeCache;
     this.dictCache = DictCache;
     this.test = void 0;
+    this.uid = void 0;
+    this.version = version;
     this.options = _extends({
       enableDefaultAlarmLoader: true,
       enableDefaultMetricLoader: true,
@@ -58,9 +55,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;
@@ -80,6 +74,7 @@ var Topo = /*#__PURE__*/function () {
     this.alarm.init(this); // 指标
 
     this.test = new Test(this);
+    this.uid = topoFactory.add(options.name, this);
   }
   /**
    * TODO 移除
@@ -100,10 +95,9 @@ var Topo = /*#__PURE__*/function () {
               return topoDispatchers.exit();
 
             case 3:
-              delete topoDebug[this.debugId];
-              delete htTopo[this.debugId];
+              topoFactory.remove(this.uid);
 
-            case 5:
+            case 4:
             case "end":
               return _context.stop();
           }

package/es/core/models/topoFactory.js

@@ -0,0 +1,25 @@
+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;
+export default topoFactory;

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

@@ -20,12 +20,13 @@ import { queryCisByIds } from "../../../../../../services";
 import styles from "./index.module.scss"; // 基本信息
 
 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.createElement("div", {
@@ -80,7 +81,7 @@ function BaseInfoRender(type, data) {
   };
   return /*#__PURE__*/React.createElement("div", {
     className: styles['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/es/core/viewer/components/plugins/BaseInfo/index.js

@@ -100,8 +100,11 @@ function BaseInfo(props) {
       userId = _useState4[0],
       setUserId = _useState4[1];
 
+  var _useState5 = useState(null),
+      paramData = _useState5[0],
+      setParamData = _useState5[1];
+
   useEffect(function () {
-    getUser();
     var notifier = topo.view.topoClient.notifier;
     notifier.on(TopoEvent.EVENT_DOUBLE_CLICK, openOverview);
     notifier.on('topo_element_click', changeOverview);
@@ -117,12 +120,51 @@ function BaseInfo(props) {
   }, []); // 解决切换拓扑图隐藏概览
 
   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 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
@@ -148,25 +190,41 @@ function BaseInfo(props) {
     return _getUser.apply(this, arguments);
   }
 
+  function onChangeActive(activeNode) {
+    console.log('切换基本信息资源', activeNode);
+    activeNode && openOverview(_extends({}, activeNode, {
+      type: 'node'
+    }));
+  }
+
+  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(_extends({}, 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; // 应用拓扑中没有链路详情
 
@@ -190,15 +248,11 @@ function BaseInfo(props) {
         return item.code;
       }) // 需要展示的关键指标 code
 
-    });
-    setVisible(true);
-  }
+    }); // 显示隐藏
 
-  function onChangeActive(activeNode) {
-    console.log('切换基本信息资源', activeNode);
-    activeNode && openOverview(_extends({}, activeNode, {
-      type: 'node'
-    }));
+    isVisible && setVisible(true); // userId
+
+    userId || getUser();
   }
 
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Drawer, {

package/es/hooks/useTopoEdit.js

@@ -818,7 +818,7 @@ var useTopoEdit = function useTopoEdit(params) {
 
   var bindNodeResource = /*#__PURE__*/function () {
     var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.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 _regeneratorRuntime.wrap(function _callee7$(_context7) {
         while (1) {
@@ -845,7 +845,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 _extends({}, g, {
@@ -872,15 +872,26 @@ var useTopoEdit = function useTopoEdit(params) {
               _yield$editDispatcher = _context7.sent;
               elements = _yield$editDispatcher.topoDataTrans;
               // 过滤出关联的节点和连线，通知ht更新
-              nodeRelatedData = filterElementsByNodeId(elements, newResId);
-              saveBind(TopoEvent.DATA_TYPE_RESOURCE_SINGLE, nodeRelatedData);
+              nodeRelatedDatas = filterElementsByNodeId(elements, newResId);
+
+              if (nodeRelatedDatas.length) {
+                _context7.next = 17;
+                break;
+              }
+
+              _Message.error('关联资源失败');
+
+              return _context7.abrupt("return", false);
+
+            case 17:
+              saveBind(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/es/topoCenter/components/Topology.js

@@ -43,7 +43,10 @@ export default function NetworkTopologyFull(props) {
     graphViewProps: _extends({}, props.graphViewProps, {
       onElementsDelete: topoEdit.onElementsDelete,
       createHtTopoProps: {
-        elementChangeLayerByDrag: true
+        elementChangeLayerByDrag: true,
+        editor: {
+          useNewElementsDeleteEvent: true
+        }
       }
     })
   }));

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

@@ -22,9 +22,7 @@ export default 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/lib/components/ResourceSelectDrawer/ResourceSelectDrawer.js

@@ -68,6 +68,8 @@ function ResourceSelectDrawer(props) {
 
               if (shouldClose !== false) {
                 onClose();
+              } else {
+                setLoading(false);
               }
 
               _context.next = 13;

package/lib/components/ResourceSelectDrawer/ResourceSelectList.js

@@ -37,7 +37,10 @@ function ResourceSelectList(props, ref) {
     limitTypes: limitTypes || _ResourceTypeLimit.RESOURCE_LIMIT_TYPES,
     defaultCondition: excludeIds.length ? "!id('" + excludeIds.join('\',\'') + "')" : undefined,
     request: (0, _componentTopologyCommon.getRequest)(),
-    tableProps: tableProps
+    tableProps: tableProps,
+    paginationProps: {
+      type: 'simple'
+    }
   });
 }
 

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

@@ -151,6 +151,7 @@ var TopoView = function TopoView(props) {
   (0, _react.useEffect)(function () {
     return function () {
       topoDispatchers.reset();
+      clearSelection();
     };
   }, []);
   var onGraphCreated = (0, _react.useCallback)(function (topoClient) {
@@ -276,9 +277,7 @@ var TopoView = function TopoView(props) {
     className: (0, _classnames2["default"])(_TopoViewModule["default"].viewPanel, (_classnames = {}, _classnames[_TopoViewModule["default"].viewPanelEditMode] = isEditMode, _classnames))
   }, /*#__PURE__*/_react["default"].createElement(_componentTopologyGraph["default"], (0, _extends2["default"])({}, graphViewProps, {
     createHtTopoProps: (0, _extends2["default"])({}, graphViewProps.createHtTopoProps, {
-      editor: (0, _extends2["default"])({}, ((_graphViewProps$creat = graphViewProps.createHtTopoProps) === null || _graphViewProps$creat === void 0 ? void 0 : _graphViewProps$creat.editor) || {}, {
-        useNewElementsDeleteEvent: true
-      })
+      editor: (0, _extends2["default"])({}, ((_graphViewProps$creat = graphViewProps.createHtTopoProps) === null || _graphViewProps$creat === void 0 ? void 0 : _graphViewProps$creat.editor) || {})
     }),
     data: tData,
     defaultEnterEditMode: defaultEnterEditMode,

package/lib/core/editor/components/settings/propertyViews/edge/CommonEdgePropertyView.js

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

package/lib/core/editor/components/settings/propertyViews/edge/edgeGroup/EdgeGroupSetting.js

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

package/lib/core/editor/components/settings/propertyViews/group/SettingTab/Setting.js

@@ -53,9 +53,7 @@ function GroupSetting(props) {
 
       var newValues = field.getValues();
 
-      if (values[name] !== value) {
-        _onChange(name, value, newValues);
-      }
+      _onChange(name, value, newValues);
     }
   });
 
@@ -115,7 +113,8 @@ function GroupSetting(props) {
     }
   }), /*#__PURE__*/_react["default"].createElement(_input["default"], {
     name: "attrObject.name",
-    maxLength: 30
+    maxLength: 30,
+    placeholder: "\u8BF7\u8F93\u5165"
   })), expanded ? /*#__PURE__*/_react["default"].createElement(_GroupExpandSetting["default"], {
     group: group,
     expanded: expanded,

package/lib/core/editor/components/settings/propertyViews/layer/SettingTab/Setting.js

@@ -43,11 +43,10 @@ function LayerSettingTab(props) {
         return;
       }
 
+      console.error(values[name], value);
       var newValues = field.getValues();
 
-      if (values[name] !== value) {
-        _onChange(name, value, newValues);
-      }
+      _onChange(name, value, newValues);
     }
   });
 
@@ -76,7 +75,8 @@ function LayerSettingTab(props) {
     }
   }), /*#__PURE__*/_react["default"].createElement(_input["default"], {
     name: "styleMap.label",
-    maxLength: 30
+    maxLength: 30,
+    placeholder: "\u8BF7\u8F93\u5165"
   })), /*#__PURE__*/_react["default"].createElement(_form["default"].Item, null, /*#__PURE__*/_react["default"].createElement(_collapse["default"], {
     defaultExpandedKeys: ['图片', '对齐方式', '线形'],
     style: {

package/lib/core/editor/components/settings/propertyViews/multipleElements/MultipleElementPropertyView.js

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

package/lib/core/editor/components/settings/propertyViews/node/NodePropertyView.js

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

package/lib/core/editor/components/settings/propertyViews/node/data/BindResourceDrawer.js

@@ -34,6 +34,7 @@ var BindResourceDrawer = function BindResourceDrawer(props) {
 
   var handleSave = /*#__PURE__*/function () {
     var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(selected) {
+      var result;
       return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
@@ -56,6 +57,10 @@ var BindResourceDrawer = function BindResourceDrawer(props) {
               });
 
             case 5:
+              result = _context.sent;
+              return _context.abrupt("return", result);
+
+            case 7:
             case "end":
               return _context.stop();
           }