@riil-frontend/component-topology 11.0.34 → 11.0.35

package/es/core/editor/components/settings/propertyViews/view/BackgroundSize.js

@@ -4,6 +4,8 @@ import React from 'react';
 import NodeSizeInput from "../../common/NodeSizeInput/NodeSizeInput";
 import useBackgroundSizeConfig from "./hooks/useBackgroundSizeConfig";
 export default function BackgroundSize(props) {
+  var _ref;
+
   var topo = props.topo,
       backgroundConfig = props.backgroundConfig,
       settingRuntimeState = props.settingRuntimeState;
@@ -12,31 +14,25 @@ export default function BackgroundSize(props) {
     current: backgroundConfig.current
   });
 
-  var setSize = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(size) {
+  var setSize = function setSize(_x) {
+    return (_ref = _ref || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(size) {
       return _regeneratorRuntime.wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              topo.historyManager.beginTransaction();
-              _context.next = 3;
-              return backgroundSizeConfig.setSize(size);
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            topo.historyManager.beginTransaction();
+            _context.next = 3;
+            return backgroundSizeConfig.setSize(size);
 
-            case 3:
-              topo.historyManager.endTransaction();
+          case 3:
+            topo.historyManager.endTransaction();
 
-            case 4:
-            case "end":
-              return _context.stop();
-          }
+          case 4:
+          case "end":
+            return _context.stop();
         }
       }, _callee);
-    }));
-
-    return function setSize(_x) {
-      return _ref.apply(this, arguments);
-    };
-  }();
+    }))).apply(this, arguments);
+  };
 
   return /*#__PURE__*/React.createElement(NodeSizeInput, {
     nodeId: backgroundSizeConfig.nodeId,

package/es/core/editor/components/titlebar/TopoEditorTitleBar.js

@@ -11,6 +11,8 @@ import styles from "../../../components/titlebar/TitleBar.module.scss";
 import DebugTools from "./widgets/DebugTools";
 import SettingButtonWidget from "../../../viewer/components/titlebar/widgets/SettingButtonWidget";
 export default function TopoEditorTitleBar(props) {
+  var _ref;
+
   var topo = props.topo,
       topoEditApi = props.topoEditApi;
   var store = topo.store;
@@ -25,30 +27,24 @@ export default function TopoEditorTitleBar(props) {
       exitFlag = _useState[0],
       setExitFlag = _useState[1];
 
-  var saveAndExit = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+  var saveAndExit = function saveAndExit() {
+    return (_ref = _ref || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
       return _regeneratorRuntime.wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              _context.next = 2;
-              return topo.save();
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return topo.save();
 
-            case 2:
-              setExitFlag(true);
+          case 2:
+            setExitFlag(true);
 
-            case 3:
-            case "end":
-              return _context.stop();
-          }
+          case 3:
+          case "end":
+            return _context.stop();
         }
       }, _callee);
-    }));
-
-    return function saveAndExit() {
-      return _ref.apply(this, arguments);
-    };
-  }();
+    }))).apply(this, arguments);
+  };
 
   useEffect(function () {
     if (!saving && exitFlag) {
@@ -77,53 +73,39 @@ export default function TopoEditorTitleBar(props) {
   }, "\u4FDD\u5B58"), /*#__PURE__*/React.createElement(_Button, {
     className: styles.button,
     onClick: function onClick() {
+      var _onOk, _onCancel;
+
       _Dialog.confirm({
         title: '提示',
         content: '若直接退出，图上修改的内容将不会保存！',
-        onOk: function () {
-          var _onOk = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+        onOk: function onOk() {
+          return (_onOk = _onOk || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
             return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-              while (1) {
-                switch (_context2.prev = _context2.next) {
-                  case 0:
-                    saveAndExit();
+              while (1) switch (_context2.prev = _context2.next) {
+                case 0:
+                  saveAndExit();
 
-                  case 1:
-                  case "end":
-                    return _context2.stop();
-                }
+                case 1:
+                case "end":
+                  return _context2.stop();
               }
             }, _callee2);
-          }));
-
-          function onOk() {
-            return _onOk.apply(this, arguments);
-          }
-
-          return onOk;
-        }(),
-        onCancel: function () {
-          var _onCancel = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
+          }))).apply(this, arguments);
+        },
+        onCancel: function onCancel() {
+          return (_onCancel = _onCancel || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
             return _regeneratorRuntime.wrap(function _callee3$(_context3) {
-              while (1) {
-                switch (_context3.prev = _context3.next) {
-                  case 0:
-                    topo.exitEditMode();
+              while (1) switch (_context3.prev = _context3.next) {
+                case 0:
+                  topo.exitEditMode();
 
-                  case 1:
-                  case "end":
-                    return _context3.stop();
-                }
+                case 1:
+                case "end":
+                  return _context3.stop();
               }
             }, _callee3);
-          }));
-
-          function onCancel() {
-            return _onCancel.apply(this, arguments);
-          }
-
-          return onCancel;
-        }(),
+          }))).apply(this, arguments);
+        },
         cancelProps: {
           children: '退出'
         },

package/es/core/editor/hooks/useKeyboardShortcut.js

@@ -24,8 +24,8 @@ export default function useKeyboardShortcut(props) {
 
       if (e.keyCode === 32 && e.target.nodeName !== 'TEXTAREA') {
         // 空格
-        var _topo$store$getModelS = topo.store.getModelState('topoEdit'),
-            viewMouseMode = _topo$store$getModelS.viewMouseMode;
+        var _topo$store$getModelS2 = topo.store.getModelState('topoEdit'),
+            viewMouseMode = _topo$store$getModelS2.viewMouseMode;
 
         topoEdit.setViewMouseMode(viewMouseMode === 'select' ? 'move' : 'select');
       }

package/es/core/editor/hooks/useNewElementTheme.js

@@ -28,10 +28,10 @@ function useNewElementTheme(props) {
           return item.name === theme;
         });
 
-        var _ThemeUtil = ThemeUtil({
+        var _ThemeUtil2 = ThemeUtil({
           topo: topo
         }),
-            setElementTheme = _ThemeUtil.setElementTheme;
+            setElementTheme = _ThemeUtil2.setElementTheme;
 
         setElementTheme(data, themeConfig); // 临时放这里，新加入节点按配置显示隐藏名称
 

package/es/core/editor/store/background.js

@@ -36,17 +36,15 @@ export default {
 
         return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
           return _regeneratorRuntime.wrap(function _callee$(_context) {
-            while (1) {
-              switch (_context.prev = _context.next) {
-                case 0:
-                  _this.update({
-                    current: extraConfig.background
-                  });
+            while (1) switch (_context.prev = _context.next) {
+              case 0:
+                _this.update({
+                  current: extraConfig.background
+                });
 
-                case 1:
-                case "end":
-                  return _context.stop();
-              }
+              case 1:
+              case "end":
+                return _context.stop();
             }
           }, _callee);
         }))();

package/es/core/editor/store/topoEdit.js

@@ -37,12 +37,10 @@ export default function (topo) {
         init: function init(payload, rootState) {
           return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
             return _regeneratorRuntime.wrap(function _callee$(_context) {
-              while (1) {
-                switch (_context.prev = _context.next) {
-                  case 0:
-                  case "end":
-                    return _context.stop();
-                }
+              while (1) switch (_context.prev = _context.next) {
+                case 0:
+                case "end":
+                  return _context.stop();
               }
             }, _callee);
           }))();

package/es/core/editor/utils/edgeTypeStyleUtil.js

@@ -68,14 +68,12 @@ export function isNodeAllEdges(topo) {
         return nodeLineList[i]._id == edge._id;
       }).length == 0) {
         inEdges = true;
-        return "break";
+        return 1; // break
       }
     };
 
     for (var i = 0; i < nodeLineList.length; i++) {
-      var _ret = _loop(i);
-
-      if (_ret === "break") break;
+      if (_loop(i)) break;
     }
   });
   return inEdges;

package/es/core/hooks/usePolling.js

@@ -15,6 +15,8 @@ import useHtDataPropertyChangeListener from "./ht/useHtDataPropertyChangeListene
  */
 
 var usePolling = function usePolling(props) {
+  var _fetchData, _refresh;
+
   var topo = props.topo;
   var store = topo.store;
   useCiAttributeChange({
@@ -33,167 +35,153 @@ var usePolling = function usePolling(props) {
    */
 
   function fetchData() {
-    return _fetchData.apply(this, arguments);
-  }
-  /**
-   * 
-   * @returns {{id, attributes: object[], metrics: object[]}[]} 属性和指标
-   */
-
-
-  function _fetchData() {
-    _fetchData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+    return (_fetchData = _fetchData || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
       var _topo$store$getModelS, resIdsList, nodeIdsList, codes, param, _yield$Promise$all, ciMetricsResult, mergeData, transformLinkData, adapterIpv6;
 
       return _regeneratorRuntime.wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              adapterIpv6 = function _adapterIpv(data) {
-                var ipv6 = data.attributeMap.ipv6_address;
-
-                if (!ipv6 && data.attributeMap.ipv6_address_list) {
-                  ipv6 = (data.attributeMap.ipv6_address_list || '').split(',')[0];
-                }
-
-                return _extends({}, data, {
-                  attributeMap: _extends({}, data.attributeMap, {
-                    ipv6_address: ipv6
-                  })
-                });
-              };
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            adapterIpv6 = function _adapterIpv(data) {
+              var ipv6 = data.attributeMap.ipv6_address;
 
-              transformLinkData = function _transformLinkData(data) {
-                var _topo$dataModel$getDa2 = topo.dataModel.getData(),
-                    links = _topo$dataModel$getDa2.links,
-                    linkGroups = _topo$dataModel$getDa2.linkGroups;
+              if (!ipv6 && data.attributeMap.ipv6_address_list) {
+                ipv6 = (data.attributeMap.ipv6_address_list || '').split(',')[0];
+              }
 
-                var link = [].concat(links, linkGroups).find(function (item) {
-                  return item.id === data.id;
-                });
+              return _extends({}, data, {
+                attributeMap: _extends({}, data.attributeMap, {
+                  ipv6_address: ipv6
+                })
+              });
+            };
 
-                if (!link) {
-                  return data;
-                }
+            transformLinkData = function _transformLinkData(data) {
+              var _topo$dataModel$getDa2 = topo.dataModel.getData(),
+                  links = _topo$dataModel$getDa2.links,
+                  linkGroups = _topo$dataModel$getDa2.linkGroups;
 
-                return _extends({}, data, {
-                  attributeMap: link.attributes || {}
-                });
-              };
-
-              mergeData = function _mergeData(ciMetricsResult) {
-                // 合并属性、指标
-                var _topo$dataModel$getDa = topo.dataModel.getData(),
-                    nodes = _topo$dataModel$getDa.nodes,
-                    links = _topo$dataModel$getDa.links;
-
-                return [].concat(nodes, links).filter(function (item) {
-                  return !!item.ciType;
-                }).map(function (ciData) {
-                  var resultData = _extends({}, ciData, {
-                    attributeMap: _extends({}, (ciData === null || ciData === void 0 ? void 0 : ciData.attributes) || {})
-                  });
-
-                  resultData = transformLinkData(resultData);
-                  resultData = adapterIpv6(resultData);
-                  return resultData;
-                }).map(function (ciData) {
-                  var ciMetricResult = ciMetricsResult.find(function (item) {
-                    return item.id === (ciData.ciId || ciData.id);
-                  });
-                  return _extends({}, ciData, {
-                    metrics: (ciMetricResult === null || ciMetricResult === void 0 ? void 0 : ciMetricResult.metrics) || {}
-                  });
-                });
-              };
+              var link = [].concat(links, linkGroups).find(function (item) {
+                return item.id === data.id;
+              });
 
-              _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) {
-                _context.next = 6;
-                break;
+              if (!link) {
+                return data;
               }
 
-              return _context.abrupt("return", []);
-
-            case 6:
-              // 需要查询的指标列表
-              codes = topo.attributeMetricDisplay.getResourceMetricCodes();
-              param = {
-                ciId: nodeIdsList,
-                codes: codes,
-                // 过滤掉不需要查询的
-                relationId: topo.attributeMetricDisplay.getEdges().map(function (edge) {
-                  return {
-                    ciId: edge.id,
-                    operation: edge.operation
-                  };
-                })
-              };
-              _context.t0 = Promise;
-              _context.t1 = // 查询指标值
-              topo.serverApi.ciInfo.batchQueryCiInfo(param);
-              _context.next = 12;
-              return DictCache.init();
-
-            case 12:
-              _context.t2 = _context.sent;
-              _context.t3 = [_context.t1, _context.t2];
-              _context.next = 16;
-              return _context.t0.all.call(_context.t0, _context.t3);
-
-            case 16:
-              _yield$Promise$all = _context.sent;
-              ciMetricsResult = _yield$Promise$all[0];
-              return _context.abrupt("return", mergeData(ciMetricsResult));
-
-            case 19:
-            case "end":
-              return _context.stop();
-          }
+              return _extends({}, data, {
+                attributeMap: link.attributes || {}
+              });
+            };
+
+            mergeData = function _mergeData(ciMetricsResult) {
+              // 合并属性、指标
+              var _topo$dataModel$getDa = topo.dataModel.getData(),
+                  nodes = _topo$dataModel$getDa.nodes,
+                  links = _topo$dataModel$getDa.links;
+
+              return [].concat(nodes, links).filter(function (item) {
+                return !!item.ciType;
+              }).map(function (ciData) {
+                var resultData = _extends({}, ciData, {
+                  attributeMap: _extends({}, (ciData === null || ciData === void 0 ? void 0 : ciData.attributes) || {})
+                });
+
+                resultData = transformLinkData(resultData);
+                resultData = adapterIpv6(resultData);
+                return resultData;
+              }).map(function (ciData) {
+                var ciMetricResult = ciMetricsResult.find(function (item) {
+                  return item.id === (ciData.ciId || ciData.id);
+                });
+                return _extends({}, ciData, {
+                  metrics: (ciMetricResult === null || ciMetricResult === void 0 ? void 0 : ciMetricResult.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) {
+              _context.next = 6;
+              break;
+            }
+
+            return _context.abrupt("return", []);
+
+          case 6:
+            // 需要查询的指标列表
+            codes = topo.attributeMetricDisplay.getResourceMetricCodes();
+            param = {
+              ciId: nodeIdsList,
+              codes: codes,
+              // 过滤掉不需要查询的
+              relationId: topo.attributeMetricDisplay.getEdges().map(function (edge) {
+                return {
+                  ciId: edge.id,
+                  operation: edge.operation
+                };
+              })
+            };
+            _context.t0 = Promise;
+            _context.t1 = // 查询指标值
+            topo.serverApi.ciInfo.batchQueryCiInfo(param);
+            _context.next = 12;
+            return DictCache.init();
+
+          case 12:
+            _context.t2 = _context.sent;
+            _context.t3 = [_context.t1, _context.t2];
+            _context.next = 16;
+            return _context.t0.all.call(_context.t0, _context.t3);
+
+          case 16:
+            _yield$Promise$all = _context.sent;
+            ciMetricsResult = _yield$Promise$all[0];
+            return _context.abrupt("return", mergeData(ciMetricsResult));
+
+          case 19:
+          case "end":
+            return _context.stop();
         }
       }, _callee);
-    }));
-    return _fetchData.apply(this, arguments);
+    }))).apply(this, arguments);
   }
-
-  function refresh() {
-    return _refresh.apply(this, arguments);
-  } // 轮询hooks
+  /**
+   * 
+   * @returns {{id, attributes: object[], metrics: object[]}[]} 属性和指标
+   */
 
 
-  function _refresh() {
-    _refresh = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+  function refresh() {
+    return (_refresh = _refresh || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
       var data;
       return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-        while (1) {
-          switch (_context2.prev = _context2.next) {
-            case 0:
-              if (!(!pollingSwitch || !(resAndMetrics !== null && resAndMetrics !== void 0 && resAndMetrics.resIdsList.length))) {
-                _context2.next = 2;
-                break;
-              }
-
-              return _context2.abrupt("return");
-
-            case 2:
-              _context2.next = 4;
-              return fetchData();
-
-            case 4:
-              data = _context2.sent;
-              return _context2.abrupt("return", data);
-
-            case 6:
-            case "end":
-              return _context2.stop();
-          }
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            if (!(!pollingSwitch || !(resAndMetrics !== null && resAndMetrics !== void 0 && resAndMetrics.resIdsList.length))) {
+              _context2.next = 2;
+              break;
+            }
+
+            return _context2.abrupt("return");
+
+          case 2:
+            _context2.next = 4;
+            return fetchData();
+
+          case 4:
+            data = _context2.sent;
+            return _context2.abrupt("return", data);
+
+          case 6:
+          case "end":
+            return _context2.stop();
         }
       }, _callee2);
-    }));
-    return _refresh.apply(this, arguments);
-  }
+    }))).apply(this, arguments);
+  } // 轮询hooks
+
 
   var _useRequest = useRequest(refresh, {
     pollingInterval: 60 * 1000,