@riil-frontend/component-topology 6.0.0-alpha.4 → 6.0.0-alpha.41

package/lib/core/models/utils/linkUtils.js

@@ -54,7 +54,7 @@ function isCrucialLink(link) {
 
 
 function isExitLink(link) {
-  return (link === null || link === void 0 ? void 0 : link.attributes) && !(link !== null && link !== void 0 && link.attributes['network_link.destination_device_id']);
+  return (link === null || link === void 0 ? void 0 : link.attributes) && !(link !== null && link !== void 0 && link.attributes['destination_id']);
 }
 
 function isAggLink(link) {
@@ -204,7 +204,7 @@ function _getLinksDetail() {
 function buildTopoLinkData() {}
 
 var compatibleWith = function compatibleWith(value) {
-  console.log("compatibleWith", value);
+  // console.log("compatibleWith",value);
   var pluralType = value !== null && value !== void 0 ? value : 2;
 
   if (value === false) {
@@ -232,8 +232,8 @@ var showLinkByConfig = function showLinkByConfig(props) {
   var _plurals$compatibleWi;
 
   var topo = props.topo,
-      showType = props.showType;
-  console.log("showLinkByConfig-----------------------------", props, showType); //const displayConfig = topo.store.getModelState("displayConfig");
+      showType = props.showType; // console.log("showLinkByConfig-----------------------------", props, showType);
+  //const displayConfig = topo.store.getModelState("displayConfig");
 
   var types = (_plurals$compatibleWi = plurals[compatibleWith(showType)]) !== null && _plurals$compatibleWi !== void 0 ? _plurals$compatibleWi : []; // 查询所有连线
 
@@ -242,8 +242,7 @@ var showLinkByConfig = function showLinkByConfig(props) {
   var edges = (0, _htElementUtils.getEdges)(dm); // console.log("edges", edges);
 
   var showPhy = types.indexOf("phy") >= 0;
-  var showAgg = types.indexOf("agg") >= 0;
-  console.log("edges----types", showType, types, showPhy, showAgg);
+  var showAgg = types.indexOf("agg") >= 0; // console.log("edges----types",showType, types,showPhy, showAgg);
 
   if (Array.isArray(edges) && edges.length > 0) {
     edges.map(function (edge) {

package/lib/core/store/coreModels.js

@@ -15,15 +15,13 @@ var _topoBizMod = _interopRequireDefault(require("./models/topoBizMod"));
 
 var _topoConfig = _interopRequireDefault(require("./models/topoConfig"));
 
-var _topoEdit = _interopRequireDefault(require("./models/topoEdit"));
+var _topoEdit = _interopRequireDefault(require("../editor/store/topoEdit"));
 
-var _background = _interopRequireDefault(require("./models/background"));
+var _background = _interopRequireDefault(require("../editor/store/background"));
 
-var _selection = _interopRequireDefault(require("./models/selection"));
-
-var _historyManager = _interopRequireDefault(require("./models/historyManager"));
+var _historyManager = _interopRequireDefault(require("../editor/store/historyManager"));
 
-var _topoGraphView = _interopRequireDefault(require("./models/topoGraphView"));
+var _selection = _interopRequireDefault(require("./models/selection"));
 
 var _topoAlarm = _interopRequireDefault(require("./models/topoAlarm"));
 
@@ -33,6 +31,7 @@ var _topoBaseInfoOverview = _interopRequireDefault(require("./models/topoBaseInf
 
 var _lock = _interopRequireDefault(require("./models/viewer/lock"));
 
+// 编辑模式
 // 显示模式
 var _default = {
   topoMod: _topoMod["default"],
@@ -42,7 +41,6 @@ var _default = {
   topoConfig: _topoConfig["default"],
   historyManager: _historyManager["default"],
   background: _background["default"],
-  topoGraphView: _topoGraphView["default"],
   ciModel: _ciModel["default"],
   topoEdit: _topoEdit["default"],
   // 显示模式

package/lib/core/store/models/selection.js

@@ -19,7 +19,8 @@ var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-ut
 var _default = {
   // 定义 model 的初始 state
   state: {
-    selection: []
+    selection: [],
+    selectionIds: []
   },
   // 定义改变该模型状态的纯函数
   reducers: {

package/lib/core/store/models/topoBizMod.js

@@ -25,9 +25,6 @@ function _default(engine) {
       allCiSet: {},
       ciSetDoc: {},
       pollingSwitch: false,
-      // alarmDoc: {},
-      // alarmRecord: [],
-      setConfig: null,
 
       /**
       * 资源和链路的属性、指标，格式见：https://shimo.im/docs/VKt3HCKHYgJ9kvGP#anchor-PFq4

package/lib/core/store/models/topoConfig.js

@@ -336,8 +336,7 @@ function _default(topoApp) {
               while (1) {
                 switch (_context4.prev = _context4.next) {
                   case 0:
-                    _rlog["default"].debug("getTopoByConditions--------", params);
-
+                    // rlog.debug("getTopoByConditions--------", params);
                     topoId = params.id, resources = params.resources, groups = params.groups, exportLinkIdList = params.exportLinkIdList;
                     viewConditions = (0, _topoData2.resToConditions)(resources);
                     groupInfo = (0, _utils.isAvailableArray)(groups) && groups.map(function (group) {
@@ -345,30 +344,22 @@ function _default(topoApp) {
                         layout: (0, _topoData2.getLayoutId)(group.layout),
                         resources: (0, _topoData2.resToConditions)(group.resources)
                       });
-                    });
+                    }); // rlog.debug("getTopoByConditions--------", viewConditions, groupInfo);
 
-                    _rlog["default"].debug("getTopoByConditions--------", viewConditions, groupInfo);
-
-                    _context4.next = 7;
+                    _context4.next = 5;
                     return _topo["default"].getTopoDataByResource(topoId, viewConditions, groupInfo, exportLinkIdList);
 
-                  case 7:
+                  case 5:
                     data = _context4.sent;
-
-                    _rlog["default"].debug("getTopoByConditions--------data", data);
-
-                    _context4.next = 11;
+                    _context4.next = 8;
                     return (0, _getTopoData.buildData)(data);
 
-                  case 11:
+                  case 8:
                     data = _context4.sent;
-
-                    _rlog["default"].debug("getTopoByConditions--------", data, groupInfo);
-
-                    _context4.next = 15;
+                    _context4.next = 11;
                     return Promise.all([topoApp.ciTyeCache.getCiTypeMap((0, _topoData.getCiTypes)(data)), dispatch.customIcon.loadCustomIcons()]);
 
-                  case 15:
+                  case 11:
                     _yield$Promise$all = _context4.sent;
                     ciTypeMap = _yield$Promise$all[0];
                     _combTopoData = (0, _topoData.combTopoData)({
@@ -396,7 +387,7 @@ function _default(topoApp) {
                       topoDataTrans: topoDataTrans
                     });
 
-                  case 23:
+                  case 19:
                   case "end":
                     return _context4.stop();
                 }

package/lib/core/store/models/topoMod.js

@@ -11,10 +11,10 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/services/topo"));
-
 var _moment = _interopRequireDefault(require("moment"));
 
+var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/services/topo"));
+
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
 var _topoData = require("../../../utils/topoData");
@@ -319,7 +319,7 @@ function _default(topoApp) {
           return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6() {
             var _result$config;
 
-            var startTime, topoId, data, linkToData, refresh, clear, linkTo, startState, permission, result, topoConfig, _yield$Promise$all, ciTypeMap, customIcons, xxx, extraConfig, _combTopoData, topoData, resAndMetrics, endTime;
+            var startTime, topoId, data, linkToData, refresh, clear, linkTo, startState, permission, result, graphConfig, topoConfig, _yield$Promise$all, ciTypeMap, customIcons, xxx, extraConfig, _combTopoData, topoData, resAndMetrics, endTime;
 
             return _regenerator["default"].wrap(function _callee6$(_context6) {
               while (1) {
@@ -387,46 +387,44 @@ function _default(topoApp) {
 
                   case 18:
                     if (!data) {
-                      _context6.next = 30;
+                      _context6.next = 29;
                       break;
                     }
 
+                    graphConfig = {};
+
                     if (!topoId) {
-                      _context6.next = 27;
+                      _context6.next = 26;
                       break;
                     }
 
-                    _context6.next = 22;
-                    return topoApp.options.loadData(topoId);
+                    _context6.next = 23;
+                    return _topo["default"].getTopoData(topoId);
 
-                  case 22:
+                  case 23:
                     topoConfig = _context6.sent;
                     if (!topoConfig) _rlog["default"].error("\u672A\u67E5\u8BE2\u5230\u62D3\u6251id " + topoId + " \u7684\u6570\u636E\uFF0C\u8BF7\u68C0\u67E5");
-                    result = (0, _extends2["default"])({}, data, {
+                    graphConfig = {
                       global: topoConfig === null || topoConfig === void 0 ? void 0 : topoConfig.global,
                       customGlobal: data.global,
                       serialize: topoConfig === null || topoConfig === void 0 ? void 0 : topoConfig.serialize
-                    });
-                    _context6.next = 28;
-                    break;
-
-                  case 27:
-                    result = (0, _extends2["default"])({}, data);
+                    };
 
-                  case 28:
-                    _context6.next = 33;
+                  case 26:
+                    result = (0, _extends2["default"])({}, data, graphConfig);
+                    _context6.next = 32;
                     break;
 
-                  case 30:
-                    _context6.next = 32;
+                  case 29:
+                    _context6.next = 31;
                     return topoApp.options.loadData(topoId);
 
-                  case 32:
+                  case 31:
                     result = _context6.sent;
 
-                  case 33:
+                  case 32:
                     if (result) {
-                      _context6.next = 37;
+                      _context6.next = 36;
                       break;
                     }
 
@@ -441,16 +439,16 @@ function _default(topoApp) {
                     topoApp.options.onLoad();
                     return _context6.abrupt("return");
 
-                  case 37:
+                  case 36:
                     result = (0, _topoData.parseTopoData)(result);
 
                     _rlog["default"].debug("topoMod.initTopoData 查询数据完成", topoId, linkTo, result);
 
-                    _context6.next = 41;
+                    _context6.next = 40;
                     return Promise.all([topoApp.ciTyeCache.getCiTypeMap((0, _topoData.getCiTypes)(result)), dispatch.customIcon.loadCustomIcons(), topoApp.elementTagTipConfig.init(result) // 暂停新配置开发
                     ]);
 
-                  case 41:
+                  case 40:
                     _yield$Promise$all = _context6.sent;
                     ciTypeMap = _yield$Promise$all[0];
                     customIcons = _yield$Promise$all[1];
@@ -459,13 +457,13 @@ function _default(topoApp) {
                     _rlog["default"].debug("topoMod.initTopoData Ci属性指标元数据", ciTypeMap);
 
                     extraConfig = result.global.extraConfig;
-                    _context6.next = 49;
+                    _context6.next = 48;
                     return dispatch.displayConfig.setConfig((0, _extends2["default"])({}, extraConfig, {
                       alarmSwitch: result.global.alarmSwitch,
                       alarmListDefaultOpen: result.global.alarmListDefaultOpen
                     }));
 
-                  case 49:
+                  case 48:
                     _combTopoData = (0, _topoData.combTopoData)({
                       engine: topoApp,
                       data: result,
@@ -496,7 +494,7 @@ function _default(topoApp) {
 
                     topoApp.options.onLoad();
 
-                  case 58:
+                  case 57:
                   case "end":
                     return _context6.stop();
                 }
@@ -627,7 +625,7 @@ function _default(topoApp) {
                     id = playload.id, update = playload.update;
                     _context11.prev = 1;
                     _context11.next = 4;
-                    return _topo["default"].auth.getTopoPermission(id);
+                    return topoApp.serverApi.auth.getTopoPermission(id);
 
                   case 4:
                     topoPermission = _context11.sent;

package/lib/core/utils/edgeUtil.js

@@ -15,6 +15,8 @@ var _linkUtils = require("../models/utils/linkUtils");
  * @param {*} topo
  */
 var updateEdgeExpanded = function updateEdgeExpanded(topo) {
+  var _topo$historyManager, _topo$historyManager2;
+
   var _topo$store$getModelS = topo.store.getModelState("topoMod"),
       viewState = _topo$store$getModelS.viewState;
 
@@ -29,6 +31,8 @@ var updateEdgeExpanded = function updateEdgeExpanded(topo) {
       expandAllEdges = _topo$store$getModelS2.expandAllEdges; // console.log("expandAllEdges----------", expandAllEdges);
 
 
+  (_topo$historyManager = topo.historyManager) === null || _topo$historyManager === void 0 ? void 0 : _topo$historyManager.setDisabled(true, '连线展开控制');
+
   if (expandAllEdges === 1) {
     (0, _linkUtils.showLinkByConfig)({
       topo: topo,
@@ -47,6 +51,8 @@ var updateEdgeExpanded = function updateEdgeExpanded(topo) {
     _rlog["default"].debug("updateEdgeExpanded 展开-isEditMode", isEditMode);
   }
 
+  (_topo$historyManager2 = topo.historyManager) === null || _topo$historyManager2 === void 0 ? void 0 : _topo$historyManager2.setDisabled(false, '连线展开控制');
+
   if (topo.linkDynamicStyleExecutor) {
     topo.linkDynamicStyleExecutor.execute();
   }

package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/hooks/useMetricPolling.js

@@ -29,7 +29,8 @@ function useMetricPolling(_ref) {
     sourceMetrics: null,
     destinationMetrics: null,
     // 链路指标列表
-    linkMetrics: []
+    linkMetrics: [],
+    linkMetricsTs: null
   }),
       data = _useState[0],
       setData = _useState[1]; // 轮询hooks
@@ -41,9 +42,7 @@ function useMetricPolling(_ref) {
     debounceInterval: 200,
     manual: true,
     onSuccess: function onSuccess(result) {
-      setData((0, _extends2["default"])({}, data, {
-        linkMetrics: result
-      }));
+      setData((0, _extends2["default"])({}, data, result));
 
       _rlog["default"].info('链路拓扑指标轮询', result);
     }

package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/services/index.js

@@ -86,6 +86,8 @@ function queryLinkLatestMetrics(_x3, _x4) {
 
 function _queryLinkLatestMetrics() {
   _queryLinkLatestMetrics = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(linkCi, linkMetricCodes) {
+    var _linkMetrics$;
+
     var linkMetrics, resultData;
     return _regenerator["default"].wrap(function _callee3$(_context3) {
       while (1) {
@@ -109,6 +111,10 @@ function _queryLinkLatestMetrics() {
 
           case 5:
             linkMetrics = _context3.sent;
+            _context3.next = 8;
+            return _CiTypeCache["default"].load([linkCi.ciType || linkCi.typeCode]);
+
+          case 8:
             // format
             resultData = linkMetricCodes.map(function (code) {
               var _linkMetrics$find;
@@ -117,7 +123,7 @@ function _queryLinkLatestMetrics() {
                 return m.metricCode === code;
               })) === null || _linkMetrics$find === void 0 ? void 0 : _linkMetrics$find.metricValue;
 
-              var metricDef = _CiTypeCache["default"].getMetric(linkCi.ciType, code);
+              var metricDef = _CiTypeCache["default"].getMetric(linkCi.ciType || linkCi.typeCode, code);
 
               return {
                 code: code,
@@ -125,9 +131,12 @@ function _queryLinkLatestMetrics() {
                 value: (0, _attributeFormatter.formatMetric)(value, metricDef) || ''
               };
             });
-            return _context3.abrupt("return", resultData);
+            return _context3.abrupt("return", {
+              linkMetrics: resultData,
+              linkMetricsTs: (_linkMetrics$ = linkMetrics[0]) === null || _linkMetrics$ === void 0 ? void 0 : _linkMetrics$.ts
+            });
 
-          case 8:
+          case 10:
           case "end":
             return _context3.stop();
         }
@@ -150,6 +159,8 @@ function _queryLinkInterfacesLatestMetrics() {
         switch (_context4.prev = _context4.next) {
           case 0:
             parseInterfaceMetrics = function _parseInterfaceMetric(subCiId) {
+              var _metrics$;
+
               var metrics = interfaceMetrics.filter(function (metric) {
                 return metric.subCiId === subCiId;
               });
@@ -160,12 +171,15 @@ function _queryLinkInterfacesLatestMetrics() {
                   return m.metricCode === code;
                 })) === null || _metrics$find === void 0 ? void 0 : _metrics$find.metricValue;
 
-                var metricDef = _CiTypeCache["default"].getMetric(linkCi.ciType, code);
+                var metricDef = _CiTypeCache["default"].getMetric(linkCi.ciType || linkCi.typeCode, code);
 
                 var formatValue = (0, _attributeFormatter.formatMetric)(value, metricDef);
                 res[code] = formatValue === 'undefined' ? '-' : formatValue;
                 return res;
-              }, {});
+              }, {
+                _ts: (_metrics$ = metrics[0]) === null || _metrics$ === void 0 ? void 0 : _metrics$.ts // 指标时间
+
+              });
             };
 
             _linkCi$attributes = linkCi.attributes, sourceType = _linkCi$attributes.source_type, sourceId = _linkCi$attributes.source_id, destinationId = _linkCi$attributes.destination_id, destinationType = _linkCi$attributes.destination_type;

package/lib/core/viewer/components/plugins/ResourceDetail/components/WebConsole/WebConsoleForm/WebConsoleForm.js

@@ -37,46 +37,30 @@ function WebConsoleForm(props) {
       webConsoleUrl = _useWebConsole.webConsoleUrl,
       save = _useWebConsole.save;
 
-  var _useState = (0, _react.useState)(true),
+  var _useState = (0, _react.useState)(false),
       isEdit = _useState[0],
-      handleInput = _useState[1];
-
-  var _useState2 = (0, _react.useState)(false),
-      isSave = _useState2[0],
-      handleSaveBtn = _useState2[1];
-
-  var _useState3 = (0, _react.useState)(false),
-      isShow = _useState3[0],
-      handleEdit = _useState3[1];
+      setIsEdit = _useState[1];
 
   var field = _field["default"].useField({
     autoUnmount: true,
-    values: {},
-    onChange: function onChange(name, value) {
-      field.getValue('url').length > 0 ? handleSaveBtn(false) : handleSaveBtn(true);
-    }
+    values: {
+      url: webConsoleUrl || ''
+    },
+    onChange: function onChange(name, value) {}
   });
 
   (0, _react.useEffect)(function () {
-    field.setValue('url', webConsoleUrl);
+    field.setValue('url', webConsoleUrl || '');
+    field.validate();
   }, [webConsoleUrl]);
-  (0, _react.useEffect)(function () {
-    field.getError('url') == null ? handleSaveBtn(false) : handleSaveBtn(true);
-  }, [field.getError('url')]);
 
   function handleEditLink() {
-    handleInput(false);
-    handleEdit(true);
+    setIsEdit(true);
   }
 
   function saveData() {
     save(field.getValue('url'));
-    handleEdit(function (isShow) {
-      return !isShow;
-    });
-    handleInput(function (isEdit) {
-      return !isEdit;
-    });
+    setIsEdit(false);
   }
 
   return /*#__PURE__*/_react["default"].createElement(_loading["default"], {
@@ -104,10 +88,10 @@ function WebConsoleForm(props) {
     name: "url",
     placeholder: "\u8BF7\u8F93\u5165\u94FE\u63A5\u5730\u5740",
     trim: true,
-    disabled: isEdit
-  })), /*#__PURE__*/_react["default"].createElement(FormItem, null, isShow ? /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_button["default"], {
+    disabled: !isEdit
+  })), /*#__PURE__*/_react["default"].createElement(FormItem, null, isEdit ? /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_button["default"], {
     type: "primary",
-    disabled: isSave,
+    disabled: !!field.getError('url'),
     onClick: saveData,
     name: "baocun"
   }, "\u4FDD\u5B58")) : /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_button["default"], {

package/lib/core/viewer/components/plugins/ResourceDetail/components/WebConsole/WebConsoleForm/hooks/useWebConsole.js

@@ -71,16 +71,17 @@ function useWebConsole(props) {
   var requestWebConsoleUrl = (0, _ahooks.useRequest)(queryWebConsoleUrlById, {
     manual: true,
     onSuccess: function onSuccess(result) {
-      if (ipv4Address != undefined) {
-        result = result === undefined ? "http://" + ipv4Address : result;
-      } else {
-        result = result === undefined ? null : result;
+      var url = result;
+
+      if (!url && ipv4Address) {
+        url = "http://" + ipv4Address;
       }
 
-      setWebConsoleUrl(result);
+      setWebConsoleUrl(url);
     }
   });
   (0, _react.useEffect)(function () {
+    setWebConsoleUrl(null);
     requestWebConsoleUrl.run(ciId);
   }, [ciId]); // 保存Web控制台url
 

package/lib/core/viewer/components/titlebar/widgets/SettingButton.js

@@ -25,7 +25,8 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 function SettingButton(props) {
   var topo = props.topo,
       displaySettingProps = props.displaySettingProps,
-      style = props.style;
+      style = props.style,
+      isEditor = props.isEditor;
 
   var _useState = (0, _react.useState)(false),
       visible = _useState[0],
@@ -54,6 +55,7 @@ function SettingButton(props) {
   })), /*#__PURE__*/_react["default"].createElement(_DisplaySettingDrawer["default"], {
     visible: visible,
     topo: topo,
+    isEditor: isEditor,
     displaySettingProps: displaySettingProps,
     onClose: function onClose() {
       setVisible(false);

package/lib/core/viewer/components/titlebar/widgets/SettingButtonWidget.js

@@ -17,11 +17,13 @@ var _SettingButton = _interopRequireDefault(require("./SettingButton"));
 function SettingButtonWidget(props) {
   var topo = props.topo,
       viewerProps = props.viewerProps,
-      style = props.style;
+      style = props.style,
+      isEditor = props.isEditor;
   return /*#__PURE__*/_react["default"].createElement(_SettingButton["default"], {
     topo: topo,
     displaySettingProps: viewerProps === null || viewerProps === void 0 ? void 0 : viewerProps.displaySettingProps,
-    style: style
+    style: style,
+    isEditor: isEditor
   });
 }
 

package/lib/networkTopo/createTopo.js

@@ -10,8 +10,11 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _TopoCenter = _interopRequireDefault(require("./models/TopoCenter"));
 
+var _services = _interopRequireDefault(require("./services"));
+
 function createTopo(options) {
   var topoApp = new _TopoCenter["default"]((0, _extends2["default"])({}, options));
+  topoApp.serverApi = _services["default"];
   return topoApp;
 }
 

package/lib/networkTopo/services/link.js

@@ -173,10 +173,10 @@ var _default = {
               // const idtxt = `'${ids[0]}','${ids[1]}'`;
               stag = ids[0];
               ttag = ids[1];
-              condition = "type('network_link') && !network_link.destination_device_id && network_link.source_device_id ='" + stag + "'";
+              condition = "type('network_link') && !destination_id && network_link.source_device_id ='" + stag + "'";
 
               if (ttag) {
-                condition = "type('network_link') && !network_link.destination_device_id && network_link.source_device_id ='" + stag + "' && network_link.destination_device_id='" + ttag + "'";
+                condition = "type('network_link') && !destination_id && network_link.source_device_id ='" + stag + "' && network_link.destination_device_id='" + ttag + "'";
               }
 
               parm = {

package/lib/networkTopo/store/topoTreeMod.js

@@ -13,8 +13,6 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _services = _interopRequireDefault(require("../services"));
-
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
 var _tree = require("../../utils/tree");
@@ -101,7 +99,7 @@ function _default(topoApp) {
                     }
 
                     _context2.next = 4;
-                    return _services["default"].getTopoTree();
+                    return topoApp.serverApi.getTopoTree();
 
                   case 4:
                     resTreeData = _context2.sent;
@@ -110,7 +108,7 @@ function _default(topoApp) {
 
                   case 7:
                     _context2.next = 9;
-                    return _services["default"].getTopoTreeByLoginUser();
+                    return topoApp.serverApi.getTopoTreeByLoginUser();
 
                   case 9:
                     resTreeData = _context2.sent;
@@ -177,7 +175,7 @@ function _default(topoApp) {
                     _rlog["default"].debug('editTopoOnTree', conditions);
 
                     _context4.next = 4;
-                    return _services["default"].editTopoonTree(parseInt(conditions.id, 10), conditions.name, conditions.type);
+                    return topoApp.serverApi.editTopoonTree(parseInt(conditions.id, 10), conditions.name, conditions.type);
 
                   case 4:
                     resTreeData = _context4.sent;
@@ -263,7 +261,7 @@ function _default(topoApp) {
 
                   case 8:
                     _context5.next = 10;
-                    return _services["default"].deleteTopoonTree(parseInt(conditions, 10));
+                    return topoApp.serverApi.deleteTopoonTree(parseInt(conditions, 10));
 
                   case 10:
                     return _context5.abrupt("return", _context5.sent);
@@ -287,7 +285,7 @@ function _default(topoApp) {
 
                   case 18:
                     _context5.next = 20;
-                    return _services["default"].deleteTopoonTree(parseInt(conditions, 10));
+                    return topoApp.serverApi.deleteTopoonTree(parseInt(conditions, 10));
 
                   case 20:
                     return _context5.abrupt("return", _context5.sent);
@@ -316,7 +314,7 @@ function _default(topoApp) {
                     _rlog["default"].debug('setDefTopoOnTree', conditions);
 
                     _context6.next = 4;
-                    return _services["default"].setDefTopo(parseInt(conditions, 10));
+                    return topoApp.serverApi.setDefTopo(parseInt(conditions, 10));
 
                   case 4:
                     resTreeData = _context6.sent;

package/lib/style.js

@@ -41,4 +41,5 @@ require('@alifd/next/lib/number-picker/style');
 
 require('@alifd/next/lib/tag/style');
 require('@riil-frontend/component-riil-event-emitter/lib/style');
+require('@alifd/next/lib/range/style');
 require('./index.scss');

package/lib/utils/htElementUtils.js

@@ -31,6 +31,7 @@ exports.isExistedElement = isExistedElement;
 exports.isGroup = isGroup;
 exports.isLayer = isLayer;
 exports.isNode = isNode;
+exports.isText = isText;
 exports.isValidEdge = isValidEdge;
 exports.setElementRuntimeStyle = setElementRuntimeStyle;
 
@@ -95,6 +96,10 @@ function isLayer(element) {
   return element instanceof ht.Grid;
 }
 
+function isText(element) {
+  return element instanceof ht.Text && element.a('isText');
+}
+
 function getElements(dataModel) {
   // console.error(111, dataModel.getDatas().getArray())
   return dataModel.getDatas().getArray();