@riil-frontend/component-topology 6.0.0-alpha.6 → 6.0.0-alpha.60

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

@@ -3,7 +3,7 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 exports.__esModule = true;
-exports["default"] = void 0;
+exports["default"] = _default;
 
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
@@ -13,46 +13,52 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
-var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/services/topo"));
-
 /**
  * 拓扑编辑 Model
  */
-var _default = {
-  // 定义 model 的初始 state
-  state: {
-    // 是否就绪
-    ready: false,
-    // 保存状态
-    saving: false,
-    // 选择/拖动模式模式。默认选择模式 select|move
-    viewMouseMode: 'select',
-    // 资源面板展开项
-    resourceTabactiveKey: null
-  },
-  // 定义改变该模型状态的纯函数
-  reducers: {
-    update: function update(prevState, payload) {
-      return (0, _extends2["default"])({}, prevState, payload);
-    }
-  },
-  // 定义处理该模型副作用的函数
-  effects: function effects(dispatch) {
-    return {
-      init: function init(payload, rootState) {
-        return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
-          return _regenerator["default"].wrap(function _callee$(_context) {
-            while (1) {
-              switch (_context.prev = _context.next) {
-                case 0:
-                case "end":
-                  return _context.stop();
-              }
-            }
-          }, _callee);
-        }))();
-      }
-    };
-  }
+var initState = {
+  // 是否就绪
+  ready: false,
+  // 保存状态
+  saving: false,
+  // 选择/拖动模式模式。默认选择模式 select|move
+  viewMouseMode: 'select',
+  // 资源面板展开项
+  resourceTabActiveKey: null,
+  // 属性面板是否显示
+  propertyPanelVisible: false
 };
-exports["default"] = _default;
+
+function _default(topo) {
+  return {
+    // 定义 model 的初始 state
+    state: initState,
+    // 定义改变该模型状态的纯函数
+    reducers: {
+      update: function update(prevState, payload) {
+        return (0, _extends2["default"])({}, prevState, payload);
+      },
+      reset: function reset(prevState, payload) {
+        return (0, _extends2["default"])({}, initState);
+      }
+    },
+    // 定义处理该模型副作用的函数
+    effects: function effects(dispatch) {
+      return {
+        init: function init(payload, rootState) {
+          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+            return _regenerator["default"].wrap(function _callee$(_context) {
+              while (1) {
+                switch (_context.prev = _context.next) {
+                  case 0:
+                  case "end":
+                    return _context.stop();
+                }
+              }
+            }, _callee);
+          }))();
+        }
+      };
+    }
+  };
+}

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

@@ -2,6 +2,8 @@
 
 exports.__esModule = true;
 exports.getEdgesBySelection = getEdgesBySelection;
+exports.loopEdgesAndChildren = loopEdgesAndChildren;
+exports.setEdgesAndChildren = setEdgesAndChildren;
 exports.setEdgesType = setEdgesType;
 
 var _htElementUtils = require("../../../utils/htElementUtils");
@@ -52,31 +54,56 @@ function getEdgesBySelection(topo) {
   return getSelectedEdges(topo);
 }
 /**
- * 批量设置连线线形
- * 
- * @param {*} edges 
- * @param {*} type 
+ * 遍历连线及子连线
  * @param {*} topo 
+ * @param {*} edges 
+ * @param {*} operateEdgeFn 
  */
 
 
-function setEdgesType(edges, type, topo) {
+function loopEdgesAndChildren(topo, edges, operateEdgeFn) {
   var htTopo = topo.getHtTopo();
   edges.forEach(function (edge) {
-    htTopo.setGraphLinear(edge, {
-      type: type
-    });
+    operateEdgeFn(edge);
 
     if (edge.isEdgeGroupAgent()) {
       // 连线组折叠时同时设置子连线
       var edgeChildren = edge.getEdgeGroup().getEdges().toArray();
       htTopo.toggleEdgeGroup(edge.getSource(), edge.getTarget(), true);
       edgeChildren.forEach(function (edgeChild) {
-        htTopo.setGraphLinear(edgeChild, {
-          type: type
-        });
+        operateEdgeFn(edgeChild);
       });
       htTopo.toggleEdgeGroup(edge.getSource(), edge.getTarget(), false);
     }
   });
+}
+/**
+ * 设置连线及子连线。带回退事务控制
+ * @param {*} topo 
+ * @param {*} edges 
+ * @param {*} operateEdgeFn 
+ */
+
+
+function setEdgesAndChildren(topo, edges, operateEdgeFn) {
+  topo.historyManager.beginTransaction();
+  loopEdgesAndChildren(topo, edges, operateEdgeFn);
+  topo.historyManager.endTransaction();
+}
+/**
+ * 批量设置连线线形
+ * 
+ * @param {*} edges 
+ * @param {*} type 
+ * @param {*} topo 
+ */
+
+
+function setEdgesType(edges, type, topo) {
+  var htTopo = topo.getHtTopo();
+  setEdgesAndChildren(topo, edges, function (edge) {
+    htTopo.setGraphLinear(edge, {
+      type: type
+    });
+  });
 }

package/lib/core/editor/utils/textStyleUtil.js

@@ -0,0 +1 @@
+"use strict";

package/lib/core/editor/utils/themeUtil.js

@@ -0,0 +1,39 @@
+"use strict";
+
+exports.__esModule = true;
+exports["default"] = ThemeUtil;
+
+var _clusterUtil = require("../../../utils/clusterUtil");
+
+var _htElementUtils = require("../../../utils/htElementUtils");
+
+function ThemeUtil(props) {
+  var topo = props.topo;
+
+  function setElementsTheme(themeConfig) {
+    var dm = topo.getHtTopo().getGraphView().dm();
+    var elements = (0, _htElementUtils.getElements)(dm);
+    elements.forEach(function (element) {
+      setElementTheme(element, themeConfig);
+    });
+  }
+
+  function setElementTheme(element, themeConfig) {
+    if ((0, _htElementUtils.isText)(element)) {
+      element.s('text.color', themeConfig.text.color);
+    } else if ((0, _htElementUtils.isGroup)(element)) {
+      if ((0, _clusterUtil.isClusterHtElement)(element)) {
+        // 集群
+        element.s(themeConfig.cluster.style);
+      } else {
+        // 区域（非集群）
+        element.s(themeConfig.group.style);
+      }
+    } else if ((0, _htElementUtils.isEdge)(element)) {}
+  }
+
+  return {
+    setElementsTheme: setElementsTheme,
+    setElementTheme: setElementTheme
+  };
+}

package/lib/core/hooks/useCanvasTheme.js

@@ -0,0 +1,75 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = useCanvasTheme;
+
+var _extends3 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _react = _interopRequireWildcard(require("react"));
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+var themeMap = [{
+  name: 'white',
+  label: '白色',
+  color: null,
+  toolsTheme: 'lightgrayblue'
+}, {
+  name: 'lightblue',
+  label: '蓝色',
+  color: '#F9FBFF',
+  toolsTheme: 'white'
+}, {
+  name: 'yellow',
+  label: '黄色',
+  color: '#FFFDE6'
+}, {
+  name: 'green',
+  label: '绿色',
+  color: '#EAFFE8'
+}, {
+  name: 'dark',
+  label: '深色',
+  color: '#031425',
+  toolsTheme: 'black'
+}].reduce(function (map, item) {
+  var _extends2;
+
+  return (0, _extends3["default"])({}, map, (_extends2 = {}, _extends2[item.name] = item, _extends2));
+}, {});
+
+function useCanvasTheme(props) {
+  var topo = props.topo,
+      canvasTheme = props.canvasTheme; // 拓扑图是否加载
+
+  var _topo$store$useModelS = topo.store.useModelState('topoMod'),
+      graphLoaded = _topo$store$useModelS.graphLoaded;
+
+  (0, _react.useEffect)(function () {
+    // 设置
+    var themeConfig = themeMap[canvasTheme || 'white'];
+
+    if (graphLoaded && themeConfig) {
+      var _topo$historyManager2;
+
+      try {
+        var _topo$historyManager;
+
+        (_topo$historyManager = topo.historyManager) === null || _topo$historyManager === void 0 ? void 0 : _topo$historyManager.setDisabled(true, '切换主题');
+        topo.getHtTopo().setToolsTheme(themeConfig.toolsTheme);
+        topo.getHtTopo().setTheme(canvasTheme);
+      } catch (error) {
+        console.error('切换主题失败', error);
+      }
+
+      (_topo$historyManager2 = topo.historyManager) === null || _topo$historyManager2 === void 0 ? void 0 : _topo$historyManager2.setDisabled(false, '切换主题');
+    }
+  }, [canvasTheme, graphLoaded]);
+  return {
+    canvasColor: themeMap[canvasTheme].color
+  };
+}

package/lib/core/hooks/useManageStatus.js

@@ -40,15 +40,6 @@ function mergeManageStatus(cis, manageStatusDatas) {
 
 function useManageStatus(props) {
   var topo = props.topo;
-
-  var _topo$store$useModel = topo.store.useModel('topoMod'),
-      topoState = _topo$store$useModel[0],
-      topoDispatchers = _topo$store$useModel[1];
-
-  var graphLoaded = topoState.graphLoaded,
-      viewState = topoState.viewState;
-  var isEditMode = viewState === 'edit';
-  var resources = topo.dataModel.useCis();
   (0, _useTopoEventListener["default"])({
     type: 'manageStatus',
     onMessage: function onMessage(manageStatusDatas) {
@@ -60,6 +51,7 @@ function useManageStatus(props) {
           links: mergeManageStatus(topoData.links, manageStatusDatas),
           linkGroups: mergeManageStatus(topoData.linkGroups, manageStatusDatas)
         });
+        var topoDispatchers = topo.store.getModelDispatchers('topoMod');
         topoDispatchers.update({
           data: newData
         });

package/lib/core/hooks/usePolling.js

@@ -74,11 +74,8 @@ var usePolling = function usePolling(props) {
 
 
   (0, _react.useEffect)(function () {
-    var isViewer = topoState.viewState === 'view';
-
-    if (topo.options.enableDefaultMetricLoader && isViewer) {
+    if (topo.options.enableDefaultMetricLoader) {
       _rlog["default"].debug('usePolling.useEffect: 开始轮询', {
-        isViewer: isViewer,
         pollingSwitch: pollingSwitch,
         resIdsList: resIdsList,
         resourceOverviewState: resourceOverviewState,
@@ -95,7 +92,7 @@ var usePolling = function usePolling(props) {
         stopPoll();
       }
     };
-  }, [topoState.viewState, pollingSwitch, resIdsList, displayConfig, resourceOverviewState.id, resourceOverviewState.metricCodes]);
+  }, [pollingSwitch, resIdsList, displayConfig, resourceOverviewState.id, resourceOverviewState.metricCodes]);
   /**
    * 
    * @returns {{id, attributes: object[], metrics: object[]}[]} 属性和指标

package/lib/core/hooks/useTopoEdit.js

@@ -95,6 +95,10 @@ var useTopoEdit = function useTopoEdit(params) {
   var onExitEdit = function onExitEdit() {// editDispatchers.switchToViewMode(topoId);
   };
 
+  var reset = function reset() {
+    topoEditDispatchers.reset();
+  };
+
   var onBindData = function onBindData(eventData) {};
   /**
    * 增加资源到视图
@@ -469,14 +473,15 @@ var useTopoEdit = function useTopoEdit(params) {
 
               _rlog["default"].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;
               // 区域里的子区域及子区域的节点、新增的链路
@@ -492,7 +497,9 @@ var useTopoEdit = function useTopoEdit(params) {
                 }
               }
 
-            case 12:
+              topo.historyManager.endTransaction();
+
+            case 14:
             case "end":
               return _context12.stop();
           }
@@ -624,13 +631,14 @@ var useTopoEdit = function useTopoEdit(params) {
                 topo.linkDynamicStyleExecutor.execute();
               }
 
-              topo.historyManager.endTransaction(); // 添加资源后隐藏资源面板
+              topo.historyManager.endTransaction();
+              topo.getHtTopo().fitContent(); // 添加资源后隐藏资源面板
 
               topoEditDispatchers.update({
-                resourceTabactiveKey: null
+                resourceTabActiveKey: null
               });
 
-            case 13:
+            case 14:
             case "end":
               return _context15.stop();
           }
@@ -684,6 +692,12 @@ var useTopoEdit = function useTopoEdit(params) {
   function getAddResourceDrawerMode() {
     return getAddResourceType() === "addToFirstLayer" ? "new" : "all";
   }
+  /**
+   * 未选中元素添加资源
+   * 
+   * @param {*} data 
+   */
+
 
   var onSaveComboRes = /*#__PURE__*/function () {
     var _ref6 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee7(data) {
@@ -713,11 +727,12 @@ var useTopoEdit = function useTopoEdit(params) {
 
             case 9:
               topo.historyManager.endTransaction();
+              topo.getHtTopo().fitContent();
               topoEditDispatchers.update({
-                resourceTabactiveKey: null
+                resourceTabActiveKey: null
               });
 
-            case 11:
+            case 12:
             case "end":
               return _context7.stop();
           }
@@ -1114,12 +1129,15 @@ var useTopoEdit = function useTopoEdit(params) {
    * 设置视图鼠标模式
    */
 
-  var setViewMouseMode = (0, _react.useCallback)(function (mode) {
+  var setViewMouseMode = function setViewMouseMode(mode) {
+    _rlog["default"].debug('设置视图鼠标模式', mode);
+
     topo.getHtTopo().setViewMouseMode(mode);
     topoEditDispatchers.update({
       viewMouseMode: mode
     });
-  }, []);
+  };
+
   return {
     resourceConfig: resourceConfig,
 
@@ -1159,6 +1177,7 @@ var useTopoEdit = function useTopoEdit(params) {
      * 退出编辑模式回调
      */
     onExitEdit: onExitEdit,
+    reset: reset,
     addLayerResources: addLayerResources,
 
     /**

package/lib/core/models/Alarm.js

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

package/lib/core/models/AttributeMetricDisplay.js

@@ -668,7 +668,11 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
     var htTopo = topo.getHtTopo();
 
     if (htTopo) {
+      var _topo$historyManager, _topo$historyManager2;
+
+      (_topo$historyManager = topo.historyManager) === null || _topo$historyManager === void 0 ? void 0 : _topo$historyManager.setDisabled(true, '加载标注');
       htTopo.loadTagAndTip(JSON.parse(JSON.stringify(elementTagsAndTips)));
+      (_topo$historyManager2 = topo.historyManager) === null || _topo$historyManager2 === void 0 ? void 0 : _topo$historyManager2.setDisabled(false, '加载标注');
     }
   }
   /**

package/lib/core/models/HistoryManager.js

@@ -18,6 +18,7 @@ var HistoryManager = /*#__PURE__*/function () {
     this.storeHistory = [];
     this.topo = topo;
     this.htHistoryManager = htHistoryManager;
+    htHistoryManager.clear();
 
     _rlog["default"].info('HistoryManager 初始化', htHistoryManager);
 
@@ -76,6 +77,10 @@ var HistoryManager = /*#__PURE__*/function () {
     var _this = this;
 
     this.htHistoryManager.beginTransaction();
+    var displayConfigProperties = [// 单多链路
+    'expandAllEdges', // 节点标注
+    'nodeLabelStyle', // 画布主题
+    'canvasTheme', 'linkTag', 'linkTip', 'nodeTag', 'nodeTip'];
     var items = [{
       modelName: 'topoMod',
       property: 'data'
@@ -83,16 +88,16 @@ var HistoryManager = /*#__PURE__*/function () {
     {
       modelName: 'topoMod',
       property: 'type'
-    }, {
-      modelName: 'displayConfig',
-      property: 'expandAllEdges'
-    }, {
-      modelName: 'displayConfig',
-      property: 'nodeLabelStyle'
-    }, {
+    }].concat(displayConfigProperties.map(function (property) {
+      return {
+        modelName: 'displayConfig',
+        property: property
+      };
+    }), [// 背景
+    {
       modelName: 'background',
       property: 'current'
-    }];
+    }]);
     this.storeHistory = items.map(function (item) {
       return (0, _extends2["default"])({}, item, {
         oldValue: _this.topo.store.getModelState(item.modelName)[item.property]

package/lib/core/models/{SelectionManager.js → SelectionModel.js}

@@ -9,21 +9,17 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
-var SelectionManager = /*#__PURE__*/function () {
-  function SelectionManager(topo) {
+var _useHtElements = _interopRequireDefault(require("../common/hooks/useHtElements"));
+
+var _ignoreList = _interopRequireDefault(require("./selection/ignoreList"));
+
+var SelectionModel = /*#__PURE__*/function () {
+  function SelectionModel(topo) {
     var _this = this;
 
     this.topo = null;
     this.inited = false;
 
-    this.setSelection = function (selection) {
-      var selectionDispatchers = _this.topo.store.getModelDispatchers('selection');
-
-      selectionDispatchers.update({
-        selection: selection
-      });
-    };
-
     this.updateSelection = function () {
       try {
         var selectionModel = _this.topo.getSelectionModel();
@@ -32,18 +28,30 @@ var SelectionManager = /*#__PURE__*/function () {
 
         var selectionArr = htSelection.map(getElementData); // rlog.info("updateSelection", selectionArr.map((element) => element.id));
 
-        _this.setSelection(selectionArr);
+        _this.updateStoreSelection(selectionArr);
       } catch (e) {
         _rlog["default"].error('updateSelection error', e);
       }
     };
 
+    this.updateStoreSelection = function (selection) {
+      var selectionDispatchers = _this.topo.store.getModelDispatchers('selection');
+
+      _this.selectionIds = selection.map(function (item) {
+        return item.id;
+      });
+      selectionDispatchers.update({
+        selection: selection,
+        selectionIds: _this.selectionIds
+      });
+    };
+
     this.topo = topo;
     this.handleSelectionChange = this.handleSelectionChange.bind(this);
     this.handleDataPropertyChange = this.handleDataPropertyChange.bind(this);
   }
 
-  var _proto = SelectionManager.prototype;
+  var _proto = SelectionModel.prototype;
 
   _proto.init = function init() {
     if (this.inited) {
@@ -56,6 +64,11 @@ var SelectionManager = /*#__PURE__*/function () {
   };
 
   _proto.destroy = function destroy() {
+    var selectionDispatchers = this.topo.store.getModelDispatchers('selection');
+    selectionDispatchers.update({
+      selection: [],
+      selectionIds: []
+    });
     this.removeListener();
   };
 
@@ -66,6 +79,26 @@ 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 = (0, _useHtElements["default"])({
+      topo: this.topo,
+      ids: selectionIds
+    });
+    return elements;
+  };
+
+  _proto.getSelection = function getSelection() {
+    var selectionModel = this.topo.getSelectionModel();
+    return selectionModel.getSelection().getArray();
+  }
+  /**
+   * 同步选中元素到store
+   */
+  ;
+
   _proto.handleSelectionChange = function handleSelectionChange(e) {
     _rlog["default"].info('Selection handleSelectionChange', e);
 
@@ -76,19 +109,21 @@ var SelectionManager = /*#__PURE__*/function () {
     var property = e.property,
         data = e.data;
 
-    if (['position', 'childChange', 'a:scale'].indexOf(property) !== -1) {
+    if (!this.selectionIds.includes(data.getId())) {
       return;
     }
 
-    var selectionModel = this.topo.getSelectionModel();
-    var selectionIds = selectionModel.getSelection().getArray().map(function (item) {
-      return item.getId();
-    });
+    if (_ignoreList["default"].indexOf(property) !== -1) {
+      return;
+    }
 
-    if (selectionIds.indexOf(data.getId()) > -1) {
-      // console.info('PropertyChangeListener', e);
-      this.updateSelection();
+    if (!window.aa) {
+      window.aa = [];
     }
+
+    window.aa.push(e); // console.info('PropertyChangeListener', e);
+
+    this.updateSelection();
   };
 
   _proto.initListener = function initListener() {
@@ -113,10 +148,10 @@ var SelectionManager = /*#__PURE__*/function () {
     dataModel.removeDataPropertyChangeListener(this.handleDataPropertyChange);
   };
 
-  return SelectionManager;
+  return SelectionModel;
 }();
 
-exports["default"] = SelectionManager;
+exports["default"] = SelectionModel;
 ; // 构造元素数据
 
 var map = {