@riil-frontend/component-topology 6.0.0-alpha.3 → 6.0.0-alpha.30

package/es/core/hooks/useTopoEdit.js

@@ -43,8 +43,6 @@ var useTopoEdit = function useTopoEdit(params) {
       editDispatchers = _store$useModel[1];
 
   var topoDispatchers = store.useModelDispatchers("topoMod");
-  var _editState$groups = editState.groups,
-      groups = _editState$groups === void 0 ? [] : _editState$groups;
 
   var _useState = useState(false),
       showComboResDrawer = _useState[0],
@@ -288,55 +286,6 @@ var useTopoEdit = function useTopoEdit(params) {
   var deleteNode = function deleteNode(node) {
     emitEvent(TopoEvent.EVENT_TRIGGER_DELETE, node);
   };
-  /**
-   * 删除视图内的资源
-   */
-
-
-  var deleteViewNode = function deleteViewNode(node) {
-    var nodeId = node.id;
-    var viewResources = resourceConfig.getViewResources();
-    var index = viewResources["static"].indexOf(nodeId);
-
-    if (index > -1) {
-      editDispatchers.updateResources({
-        "static": viewResources["static"].filter(function (item) {
-          return item !== nodeId;
-        })
-      });
-    }
-  };
-  /**
-   * 删除容器内的单个资源
-   *
-   * @param allGroups
-   * @param node 资源
-   */
-
-
-  var deleteGroupNode = function deleteGroupNode(allGroups, node) {
-    var nodeId = node.id; // 更新容器内的资源
-
-    var newGroups = allGroups.map(function (g) {
-      var newGroup = g;
-
-      if (resourceConfig.isGroupContainsNode(g, node)) {
-        newGroup = _extends({}, g, {
-          resources: resourceConfig.removeStaticResource(g.resources, nodeId)
-        });
-      }
-
-      return newGroup;
-    });
-    rlog.info("删除容器内的单个资源", {
-      groups: groups,
-      node: node,
-      newGroups: newGroups
-    });
-    editDispatchers.update({
-      groups: newGroups
-    });
-  };
 
   var handleDeleteNode = function handleDeleteNode(element) {
     var _topo$options$editor;
@@ -490,14 +439,15 @@ var useTopoEdit = function useTopoEdit(params) {
             case 0:
               id = group.id, tag = group.tag;
               rlog.debug("bindGroupResources--id, tag", id, tag);
-              _context12.next = 4;
+              topo.historyManager.beginTransaction();
+              _context12.next = 5;
               return resourceConfig.updateGroupResources(group, resources);
 
-            case 4:
-              _context12.next = 6;
+            case 5:
+              _context12.next = 7;
               return editDispatchers.fetchDataByConfig();
 
-            case 6:
+            case 7:
               _yield$editDispatcher2 = _context12.sent;
               elements = _yield$editDispatcher2.elements;
               // 区域里的子区域及子区域的节点、新增的链路
@@ -513,7 +463,9 @@ var useTopoEdit = function useTopoEdit(params) {
                 }
               }
 
-            case 12:
+              topo.historyManager.endTransaction();
+
+            case 14:
             case "end":
               return _context12.stop();
           }
@@ -644,8 +596,13 @@ var useTopoEdit = function useTopoEdit(params) {
               }
 
               topo.historyManager.endTransaction();
+              topo.getHtTopo().fitContent(); // 添加资源后隐藏资源面板
 
-            case 12:
+              topoEditDispatchers.update({
+                resourceTabActiveKey: null
+              });
+
+            case 14:
             case "end":
               return _context15.stop();
           }
@@ -699,6 +656,12 @@ var useTopoEdit = function useTopoEdit(params) {
   function getAddResourceDrawerMode() {
     return getAddResourceType() === "addToFirstLayer" ? "new" : "all";
   }
+  /**
+   * 未选中元素添加资源
+   * 
+   * @param {*} data 
+   */
+
 
   var onSaveComboRes = /*#__PURE__*/function () {
     var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(data) {
@@ -727,8 +690,12 @@ var useTopoEdit = function useTopoEdit(params) {
 
             case 9:
               topo.historyManager.endTransaction();
+              topo.getHtTopo().fitContent();
+              topoEditDispatchers.update({
+                resourceTabActiveKey: null
+              });
 
-            case 10:
+            case 12:
             case "end":
               return _context7.stop();
           }
@@ -1113,6 +1080,18 @@ var useTopoEdit = function useTopoEdit(params) {
 
   var effectsState = store.useModelEffectsState("topoConfig");
   var topoLoading = effectsState.getTopoByConditions.isLoading;
+  /**
+   * 设置视图鼠标模式
+   */
+
+  var setViewMouseMode = function setViewMouseMode(mode) {
+    rlog.debug('设置视图鼠标模式', mode);
+    topo.getHtTopo().setViewMouseMode(mode);
+    topoEditDispatchers.update({
+      viewMouseMode: mode
+    });
+  };
+
   return {
     resourceConfig: resourceConfig,
 
@@ -1120,6 +1099,7 @@ var useTopoEdit = function useTopoEdit(params) {
      * 拓扑结构加载中状态
      */
     topoLoading: topoLoading,
+    setViewMouseMode: setViewMouseMode,
 
     /**
      * 资源绑定（多选）抽屉显示状态

package/es/core/models/Alarm.js

@@ -416,7 +416,7 @@ var Alarm = /*#__PURE__*/function () {
 
             case 8:
               _context6.next = 10;
-              return topoService.openTopoAlarm(id);
+              return this.topo.serverApi.openTopoAlarm(id);
 
             case 10:
               this.secretKey = _context6.sent;
@@ -482,7 +482,7 @@ var Alarm = /*#__PURE__*/function () {
                 alarmPanelIsOpen: false
               });
               _context7.next = 9;
-              return topoService.closeTopoAlarm(id, this.secretKey);
+              return this.topo.serverApi.closeTopoAlarm(id, this.secretKey);
 
             case 9:
             case "end":

package/es/core/models/HistoryManager.js

@@ -71,13 +71,20 @@ var HistoryManager = /*#__PURE__*/function () {
     {
       modelName: 'topoMod',
       property: 'type'
-    }, {
+    }, // 单多链路
+    {
       modelName: 'displayConfig',
       property: 'expandAllEdges'
-    }, {
+    }, // 节点标注
+    {
       modelName: 'displayConfig',
       property: 'nodeLabelStyle'
-    }, {
+    }, // 画布主题
+    {
+      modelName: 'displayConfig',
+      property: 'canvasTheme'
+    }, // 背景
+    {
       modelName: 'background',
       property: 'current'
     }];

package/es/core/models/SelectionManager.js

@@ -1,5 +1,6 @@
 import _extends from "@babel/runtime/helpers/extends";
 import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import useHtElements from "../common/hooks/useHtElements";
 
 var SelectionManager = /*#__PURE__*/function () {
   function SelectionManager(topo) {
@@ -12,7 +13,10 @@ var SelectionManager = /*#__PURE__*/function () {
       var selectionDispatchers = _this.topo.store.getModelDispatchers('selection');
 
       selectionDispatchers.update({
-        selection: selection
+        selection: selection,
+        selectionIds: selection.map(function (item) {
+          return item.id;
+        })
       });
     };
 
@@ -58,6 +62,17 @@ var SelectionManager = /*#__PURE__*/function () {
     return selection;
   };
 
+  _proto.useHtSelection = function useHtSelection() {
+    var _this$topo$store$useM2 = this.topo.store.useModelState('selection'),
+        selectionIds = _this$topo$store$useM2.selectionIds;
+
+    var elements = useHtElements({
+      topo: this.topo,
+      ids: selectionIds
+    });
+    return elements;
+  };
+
   _proto.handleSelectionChange = function handleSelectionChange(e) {
     rlog.info('Selection handleSelectionChange', e);
     this.updateSelection();

package/es/core/models/TopoApp.js

@@ -22,7 +22,7 @@ import topoFactory from "./topoFactory";
 import ElementTagTipConfig from "./tagstips/ElementTagTipConfig";
 import SelectionManager from "./SelectionManager"; // eslint-disable-next-line no-undef
 
-var version = typeof "6.0.0-alpha.3" === 'string' ? "6.0.0-alpha.3" : null;
+var version = typeof "6.0.0-alpha.30" === 'string' ? "6.0.0-alpha.30" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/es/core/models/TopoGraphView.js

@@ -26,10 +26,16 @@ var TopoGraphView = /*#__PURE__*/function () {
     this.contextMenu = new ContextMenu();
   };
 
-  _proto.getHtDataModel = function getHtDataModel() {
+  _proto.getHtGraphView = function getHtGraphView() {
     var _this$topoClient;
 
-    return (_this$topoClient = this.topoClient) === null || _this$topoClient === void 0 ? void 0 : _this$topoClient.getDataModel();
+    return (_this$topoClient = this.topoClient) === null || _this$topoClient === void 0 ? void 0 : _this$topoClient.getGraphView();
+  };
+
+  _proto.getHtDataModel = function getHtDataModel() {
+    var _this$topoClient2;
+
+    return (_this$topoClient2 = this.topoClient) === null || _this$topoClient2 === void 0 ? void 0 : _this$topoClient2.getDataModel();
   }
   /**
    * 缩放平移整个拓扑以展示所有的图元

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

@@ -31,7 +31,7 @@ export function isCrucialLink(link) {
  */
 
 export 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']);
 }
 export function isAggLink(link) {
   return link.attributes["network_link.connect_type"] === "agg";

package/es/core/store/coreModels.js

@@ -2,12 +2,12 @@ import topoMod from "./models/topoMod";
 import customIcon from "./models/customIcon";
 import ciModel from "./models/ciModel";
 import topoBizMod from "./models/topoBizMod";
-import topoConfig from "./models/topoConfig";
-import topoEdit from "./models/topoEdit";
-import background from "./models/background";
-import selection from "./models/selection";
-import historyManager from "./models/historyManager";
-import topoGraphView from "./models/topoGraphView"; // 显示模式
+import topoConfig from "./models/topoConfig"; // 编辑模式
+
+import topoEdit from "../editor/store/topoEdit";
+import background from "../editor/store/background";
+import historyManager from "../editor/store/historyManager";
+import selection from "./models/selection"; // 显示模式
 
 import topoAlarm from "./models/topoAlarm";
 import displayConfig from "./models/displayConfig";
@@ -21,7 +21,6 @@ export default {
   topoConfig: topoConfig,
   historyManager: historyManager,
   background: background,
-  topoGraphView: topoGraphView,
   ciModel: ciModel,
   topoEdit: topoEdit,
   // 显示模式

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

@@ -9,7 +9,8 @@ import rlog from '@riil-frontend/component-topology-utils/es/rlog';
 export default {
   // 定义 model 的初始 state
   state: {
-    selection: []
+    selection: [],
+    selectionIds: []
   },
   // 定义改变该模型状态的纯函数
   reducers: {

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

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

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

@@ -1,8 +1,8 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _extends from "@babel/runtime/helpers/extends";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import topoService from "@riil-frontend/component-topology-common/es/services/topo";
 import moment from "moment";
+import topoService from "@riil-frontend/component-topology-common/es/services/topo";
 import rlog from "@riil-frontend/component-topology-utils/es/rlog";
 import { combTopoData, getCiTypes, parseTopoData } from "../../../utils/topoData";
 import { loopTreeByKey } from "../../../utils/tree";
@@ -302,7 +302,7 @@ export default function (topoApp) {
           return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.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 _regeneratorRuntime.wrap(function _callee6$(_context6) {
               while (1) {
@@ -370,46 +370,44 @@ export default function (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 topoService.getTopoData(topoId);
 
-                  case 22:
+                  case 23:
                     topoConfig = _context6.sent;
                     if (!topoConfig) rlog.error("\u672A\u67E5\u8BE2\u5230\u62D3\u6251id " + topoId + " \u7684\u6570\u636E\uFF0C\u8BF7\u68C0\u67E5");
-                    result = _extends({}, 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 = _extends({}, data);
+                    };
 
-                  case 28:
-                    _context6.next = 33;
+                  case 26:
+                    result = _extends({}, 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;
                     }
 
@@ -424,27 +422,27 @@ export default function (topoApp) {
                     topoApp.options.onLoad();
                     return _context6.abrupt("return");
 
-                  case 37:
+                  case 36:
                     result = parseTopoData(result);
                     rlog.debug("topoMod.initTopoData 查询数据完成", topoId, linkTo, result);
-                    _context6.next = 41;
+                    _context6.next = 40;
                     return Promise.all([topoApp.ciTyeCache.getCiTypeMap(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];
                     xxx = _yield$Promise$all[2];
                     rlog.debug("topoMod.initTopoData Ci属性指标元数据", ciTypeMap);
                     extraConfig = result.global.extraConfig;
-                    _context6.next = 49;
+                    _context6.next = 48;
                     return dispatch.displayConfig.setConfig(_extends({}, extraConfig, {
                       alarmSwitch: result.global.alarmSwitch,
                       alarmListDefaultOpen: result.global.alarmListDefaultOpen
                     }));
 
-                  case 49:
+                  case 48:
                     _combTopoData = combTopoData({
                       engine: topoApp,
                       data: result,
@@ -473,7 +471,7 @@ export default function (topoApp) {
                     rlog.info("topoMod.initTopoData 初始化拓扑图数据完成. 耗时: ", endTime.diff(startTime, "seconds", true));
                     topoApp.options.onLoad();
 
-                  case 58:
+                  case 57:
                   case "end":
                     return _context6.stop();
                 }
@@ -604,7 +602,7 @@ export default function (topoApp) {
                     id = playload.id, update = playload.update;
                     _context11.prev = 1;
                     _context11.next = 4;
-                    return topoService.auth.getTopoPermission(id);
+                    return topoApp.serverApi.auth.getTopoPermission(id);
 
                   case 4:
                     topoPermission = _context11.sent;

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

@@ -18,46 +18,30 @@ export default function WebConsoleForm(props) {
       webConsoleUrl = _useWebConsole.webConsoleUrl,
       save = _useWebConsole.save;
 
-  var _useState = useState(true),
+  var _useState = useState(false),
       isEdit = _useState[0],
-      handleInput = _useState[1];
-
-  var _useState2 = useState(false),
-      isSave = _useState2[0],
-      handleSaveBtn = _useState2[1];
-
-  var _useState3 = useState(false),
-      isShow = _useState3[0],
-      handleEdit = _useState3[1];
+      setIsEdit = _useState[1];
 
   var field = _Field.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) {}
   });
 
   useEffect(function () {
-    field.setValue('url', webConsoleUrl);
+    field.setValue('url', webConsoleUrl || '');
+    field.validate();
   }, [webConsoleUrl]);
-  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.createElement(_Loading, {
@@ -85,10 +69,10 @@ export default function WebConsoleForm(props) {
     name: "url",
     placeholder: "\u8BF7\u8F93\u5165\u94FE\u63A5\u5730\u5740",
     trim: true,
-    disabled: isEdit
-  })), /*#__PURE__*/React.createElement(FormItem, null, isShow ? /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(_Button, {
+    disabled: !isEdit
+  })), /*#__PURE__*/React.createElement(FormItem, null, isEdit ? /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(_Button, {
     type: "primary",
-    disabled: isSave,
+    disabled: !!field.getError('url'),
     onClick: saveData,
     name: "baocun"
   }, "\u4FDD\u5B58")) : /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(_Button, {

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

@@ -57,16 +57,17 @@ export default function useWebConsole(props) {
   var requestWebConsoleUrl = 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);
     }
   });
   useEffect(function () {
+    setWebConsoleUrl(null);
     requestWebConsoleUrl.run(ciId);
   }, [ciId]); // 保存Web控制台url
 

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

@@ -11,7 +11,8 @@ import DisplaySettingDrawer from "../../../../components/DisplaySettingDrawer";
 export default function SettingButton(props) {
   var topo = props.topo,
       displaySettingProps = props.displaySettingProps,
-      style = props.style;
+      style = props.style,
+      isEditor = props.isEditor;
 
   var _useState = useState(false),
       visible = _useState[0],
@@ -40,6 +41,7 @@ export default function SettingButton(props) {
   })), /*#__PURE__*/React.createElement(DisplaySettingDrawer, {
     visible: visible,
     topo: topo,
+    isEditor: isEditor,
     displaySettingProps: displaySettingProps,
     onClose: function onClose() {
       setVisible(false);

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

@@ -9,11 +9,13 @@ import SettingButton from "./SettingButton";
 export default function SettingButtonWidget(props) {
   var topo = props.topo,
       viewerProps = props.viewerProps,
-      style = props.style;
+      style = props.style,
+      isEditor = props.isEditor;
   return /*#__PURE__*/React.createElement(SettingButton, {
     topo: topo,
     displaySettingProps: viewerProps === null || viewerProps === void 0 ? void 0 : viewerProps.displaySettingProps,
-    style: style
+    style: style,
+    isEditor: isEditor
   });
 }
 ;

package/es/networkTopo/createTopo.js

@@ -1,7 +1,9 @@
 import _extends from "@babel/runtime/helpers/extends";
 import TopoCenter from "./models/TopoCenter";
+import services from "./services";
 export function createTopo(options) {
   var topoApp = new TopoCenter(_extends({}, options));
+  topoApp.serverApi = services;
   return topoApp;
 }
 export default createTopo;

package/es/networkTopo/services/link.js

@@ -156,10 +156,10 @@ export 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 = {