@riil-frontend/component-topology 5.0.16 → 5.0.18

package/lib/core/models/SelectionManager.js

@@ -0,0 +1,149 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = void 0;
+
+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 _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();
+
+        var htSelection = selectionModel.getSelection().getArray(); // TODO 对比变更更新
+
+        var selectionArr = htSelection.map(getElementData); // rlog.info("updateSelection", selectionArr.map((element) => element.id));
+
+        _this.setSelection(selectionArr);
+      } catch (e) {
+        _rlog["default"].error('updateSelection error', e);
+      }
+    };
+
+    this.topo = topo;
+    this.handleSelectionChange = this.handleSelectionChange.bind(this);
+    this.handleDataPropertyChange = this.handleDataPropertyChange.bind(this);
+  }
+
+  var _proto = SelectionManager.prototype;
+
+  _proto.init = function init() {
+    if (this.inited) {
+      this.removeListener();
+    }
+
+    this.updateSelection();
+    this.initListener();
+    this.inited = true;
+  };
+
+  _proto.destroy = function destroy() {
+    this.removeListener();
+  };
+
+  _proto.handleSelectionChange = function handleSelectionChange(e) {
+    _rlog["default"].info('Selection handleSelectionChange', e);
+
+    this.updateSelection();
+  };
+
+  _proto.handleDataPropertyChange = function handleDataPropertyChange(e) {
+    var property = e.property,
+        data = e.data;
+
+    if (['position', 'childChange', 'a:scale'].indexOf(property) !== -1) {
+      return;
+    }
+
+    var selectionModel = this.topo.getSelectionModel();
+    var selectionIds = selectionModel.getSelection().getArray().map(function (item) {
+      return item.getId();
+    });
+
+    if (selectionIds.indexOf(data.getId()) > -1) {
+      // console.info('PropertyChangeListener', e);
+      this.updateSelection();
+    }
+  };
+
+  _proto.initListener = function initListener() {
+    _rlog["default"].info('Selection initListener');
+
+    var dataModel = this.topo.getDataModel();
+    var selectionModel = this.topo.getSelectionModel();
+    selectionModel.addSelectionChangeListener(this.handleSelectionChange);
+    dataModel.addDataPropertyChangeListener(this.handleDataPropertyChange);
+  };
+
+  _proto.removeListener = function removeListener() {
+    if (!this.inited) {
+      return;
+    }
+
+    _rlog["default"].info('Selection removeListener');
+
+    var dataModel = this.topo.getDataModel();
+    var selectionModel = this.topo.getSelectionModel();
+    selectionModel.removeSelectionChangeListener(this.handleSelectionChange);
+    dataModel.removeDataPropertyChangeListener(this.handleDataPropertyChange);
+  };
+
+  return SelectionManager;
+}();
+
+exports["default"] = SelectionManager;
+; // 构造元素数据
+
+var map = {
+  common: function common(element) {
+    var className = element.getClassName();
+    return {
+      className: className,
+      id: element.getId(),
+      tag: element.getTag(),
+      // 业务id
+      name: element.getName(),
+      attrObject: JSON.parse(JSON.stringify(element.getAttrObject() || {})),
+      styleMap: JSON.parse(JSON.stringify(element.getStyleMap() || {}))
+    };
+  },
+  'ht.Edge': function htEdge(element) {
+    return (0, _extends2["default"])({}, map.common(element));
+  },
+  'ht.Group': function htGroup(element) {
+    return (0, _extends2["default"])({}, map['ht.Node'](element), {
+      expanded: element.isExpanded()
+    });
+  },
+  'ht.Node': function htNode(element) {
+    return (0, _extends2["default"])({}, map.common(element), {
+      image: element.getImage(),
+      width: element.getWidth(),
+      height: element.getHeight(),
+      position: element.getPosition()
+    });
+  }
+};
+
+function getElementData(element) {
+  var className = element.getClassName();
+  return (map[className] || map.common)(element);
+}

package/lib/core/models/TopoApp.js

@@ -50,7 +50,7 @@ var _topoFactory = _interopRequireDefault(require("./topoFactory"));
 var _ElementTagTipConfig = _interopRequireDefault(require("./tagstips/ElementTagTipConfig"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "5.0.16" === 'string' ? "5.0.16" : null;
+var version = typeof "5.0.18" === 'string' ? "5.0.18" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "5.0.16",
+  "version": "5.0.18",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -115,6 +115,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@5.0.16/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@5.0.18/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }

package/es/core/hooks/useSelectionListener.js

@@ -1,35 +0,0 @@
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
-import { useEffect } from 'react';
-import useSelection from "./useSelection";
-export default function useSelectionListener(props) {
-  var topo = props.topo;
-
-  var _topo$store$useModelS = topo.store.useModelState('topoMod'),
-      graphLoaded = _topo$store$useModelS.graphLoaded,
-      graphLoaded2 = _topo$store$useModelS.graphLoaded2,
-      viewState = _topo$store$useModelS.viewState;
-
-  var isEditMode = viewState === 'edit'; // TODO 临时放这里，当前监听内容较多
-
-  var _useSelection = useSelection({
-    topo: topo
-  }),
-      initSelection = _useSelection.initSelection,
-      destroySelection = _useSelection.destroySelection;
-
-  useEffect(function () {
-    var inited = false;
-    var loaded = graphLoaded || graphLoaded2;
-
-    if (isEditMode && loaded) {
-      initSelection();
-      inited = true;
-    }
-
-    return function () {
-      if (inited) {
-        destroySelection();
-      }
-    };
-  }, [graphLoaded, graphLoaded2, isEditMode]);
-}

package/lib/core/hooks/useSelectionListener.js

@@ -1,45 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-exports.__esModule = true;
-exports["default"] = useSelectionListener;
-
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
-
-var _react = require("react");
-
-var _useSelection2 = _interopRequireDefault(require("./useSelection"));
-
-function useSelectionListener(props) {
-  var topo = props.topo;
-
-  var _topo$store$useModelS = topo.store.useModelState('topoMod'),
-      graphLoaded = _topo$store$useModelS.graphLoaded,
-      graphLoaded2 = _topo$store$useModelS.graphLoaded2,
-      viewState = _topo$store$useModelS.viewState;
-
-  var isEditMode = viewState === 'edit'; // TODO 临时放这里，当前监听内容较多
-
-  var _useSelection = (0, _useSelection2["default"])({
-    topo: topo
-  }),
-      initSelection = _useSelection.initSelection,
-      destroySelection = _useSelection.destroySelection;
-
-  (0, _react.useEffect)(function () {
-    var inited = false;
-    var loaded = graphLoaded || graphLoaded2;
-
-    if (isEditMode && loaded) {
-      initSelection();
-      inited = true;
-    }
-
-    return function () {
-      if (inited) {
-        destroySelection();
-      }
-    };
-  }, [graphLoaded, graphLoaded2, isEditMode]);
-}