@riil-frontend/component-topology 2.12.2 → 2.12.5-alpha.2

package/lib/topoCenter/models/TopoCenter.js

@@ -31,6 +31,34 @@ var TopoCenter = /*#__PURE__*/function (_TopoApp) {
       loadData: _getTopoData["default"]
     }, options, {
       usePermission: true,
+      beforeSwitchToEditMode: function () {
+        var _beforeSwitchToEditMode = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+          var topoDispatchers;
+          return _regenerator["default"].wrap(function _callee$(_context) {
+            while (1) {
+              switch (_context.prev = _context.next) {
+                case 0:
+                  topoDispatchers = _this.store.getModelDispatchers('topoMod');
+                  topoDispatchers.update({
+                    topoData: null
+                  });
+                  _context.next = 4;
+                  return topoDispatchers.refreshTopo();
+
+                case 4:
+                case "end":
+                  return _context.stop();
+              }
+            }
+          }, _callee);
+        }));
+
+        function beforeSwitchToEditMode() {
+          return _beforeSwitchToEditMode.apply(this, arguments);
+        }
+
+        return beforeSwitchToEditMode;
+      }(),
       onSwitchToEditMode: function onSwitchToEditMode() {
         var editDispatchers = _this.store.getModelDispatchers('topoCreateMod');
 
@@ -63,22 +91,22 @@ var TopoCenter = /*#__PURE__*/function (_TopoApp) {
   _proto.initData =
   /*#__PURE__*/
   function () {
-    var _initData = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(params) {
+    var _initData = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(params) {
       var topoDispatchers;
-      return _regenerator["default"].wrap(function _callee$(_context) {
+      return _regenerator["default"].wrap(function _callee2$(_context2) {
         while (1) {
-          switch (_context.prev = _context.next) {
+          switch (_context2.prev = _context2.next) {
             case 0:
               topoDispatchers = this.store.getModelDispatchers('topoCenter');
-              _context.next = 3;
+              _context2.next = 3;
               return topoDispatchers.initData(params);
 
             case 3:
             case "end":
-              return _context.stop();
+              return _context2.stop();
           }
         }
-      }, _callee, this);
+      }, _callee2, this);
     }));
 
     function initData(_x) {
@@ -100,22 +128,22 @@ var TopoCenter = /*#__PURE__*/function (_TopoApp) {
   _proto.exit =
   /*#__PURE__*/
   function () {
-    var _exit = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+    var _exit = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
       var topoDispatchers;
-      return _regenerator["default"].wrap(function _callee2$(_context2) {
+      return _regenerator["default"].wrap(function _callee3$(_context3) {
         while (1) {
-          switch (_context2.prev = _context2.next) {
+          switch (_context3.prev = _context3.next) {
             case 0:
               topoDispatchers = this.store.getModelDispatchers('topoCenter');
-              _context2.next = 3;
+              _context3.next = 3;
               return topoDispatchers.exit();
 
             case 3:
             case "end":
-              return _context2.stop();
+              return _context3.stop();
           }
         }
-      }, _callee2, this);
+      }, _callee3, this);
     }));
 
     function exit() {

package/lib/utils/htElementUtils.js

@@ -5,9 +5,13 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports.getEdges = getEdges;
 exports.getElements = getElements;
+exports.getGroupChildren = getGroupChildren;
+exports.getGroupChildrenData = getGroupChildrenData;
 exports.getGroupData = getGroupData;
+exports.getGroupElementByTag = getGroupElementByTag;
 exports.getGroupNodes = getGroupNodes;
 exports.getGroups = getGroups;
+exports.getNodeData = getNodeData;
 exports.getNodes = getNodes;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
@@ -52,6 +56,12 @@ function getGroups(dataModel) {
   });
 }
 
+function getGroupElementByTag(dataModel, tag) {
+  return dataModel.getDataByTag(tag) || dataModel.getDatas().toArray().filter(function (item) {
+    return item.a('tag') === tag;
+  })[0];
+}
+
 function getGroupData(element) {
   if (!element) {
     return null;
@@ -72,13 +82,15 @@ function getGroupData(element) {
 function getNodes(dataModel) {
   return getElements(dataModel).filter(function (element) {
     return element.getClassName() === 'ht.Node';
-  }).map(function (element) {
-    var parentGroup = getGroupData(element.getParent());
-    return (0, _extends2["default"])({}, element.getAttrObject(), {
-      tag: element.getId(),
-      image: element.getImage(),
-      groupTag: parentGroup ? parentGroup.id : undefined
-    });
+  }).map(getNodeData);
+}
+
+function getNodeData(element) {
+  var parentGroup = getGroupData(element.getParent());
+  return (0, _extends2["default"])({}, element.getAttrObject(), {
+    tag: element.getId(),
+    image: element.getImage(),
+    groupTag: parentGroup ? parentGroup.id : undefined
   });
 }
 
@@ -100,4 +112,29 @@ function getGroupNodes(dataModel, groupIdOrTag) {
   return getNodes(dataModel).filter(function (element) {
     return element.groupId === groupIdOrTag || element.groupTag === groupIdOrTag;
   });
+}
+/**
+ * 获取容器里的节点列表
+ *
+ * @param group
+ * @return {*}
+ */
+
+
+function getGroupChildren(group) {
+  // HT为了支持区域内无节点可展开增加了站位节点，因此 节点的layer等于container_blank的过滤掉就可以了
+  return group.getChildren().getArray().filter(function (node) {
+    return node._layer !== 'container_blank';
+  });
+}
+/**
+ * 获取容器里的节点数据列表
+ *
+ * @param group
+ * @return {*}
+ */
+
+
+function getGroupChildrenData(group) {
+  return getGroupChildren(group).map(getNodeData);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "2.12.2",
+  "version": "2.12.5-alpha.2",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -43,8 +43,8 @@
     "@alifd/biz-anchor": "^1.1.7",
     "@ice/store": "^1.4.2",
     "@riil-frontend/component-topo-icon-select": "^1.0.4",
-    "@riil-frontend/component-topology-common": "^1.0.1",
-    "@riil-frontend/component-topology-utils": "^2.0.18",
+    "@riil-frontend/component-topology-common": "^1.0.2",
+    "@riil-frontend/component-topology-utils": "^2.0.19",
     "classnames": "^2.2.3",
     "prop-types": "^15.5.8",
     "react-color": "^2.19.3",
@@ -52,7 +52,7 @@
   },
   "devDependencies": {
     "@alifd/next": "^1.21.16",
-    "@alifd/theme-19926": "^0.20.0",
+    "@alifd/theme-19926": "^0.25.0",
     "@formily/next": "1.3.13",
     "@formily/next-components": "1.3.13",
     "@iceworks/spec": "^1.0.0",
@@ -69,7 +69,7 @@
     "@riil-frontend/component-row-delete-ballon": "^1.0.2",
     "@riil-frontend/component-table-filter-tags": "latest",
     "@riil-frontend/component-table-layout": "^2.0.2",
-    "@riil-frontend/component-topology-graph": "^2.3.0",
+    "@riil-frontend/component-topology-graph": "^2.3.4",
     "@riil-frontend/css": "^2.0.2",
     "@riil-frontend/hooks": "latest",
     "@riil-frontend/next-collapse": "^1.0.1-a.0",
@@ -85,16 +85,16 @@
     "enzyme-adapter-react-16": "^1.14.0",
     "eslint": "^6.0.1",
     "html2canvas": "^1.3.2",
-    "lnk-cli": "^1.0.1",
     "jspdf": "^2.3.1",
+    "lnk-cli": "^1.0.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "stylelint": "^13.7.2"
   },
   "peerDependencies": {
     "@alifd/next": "1.x",
-    "react": "^16 || ^17",
-    "@riil-frontend/component-topology-graph": "^2.x"
+    "@riil-frontend/component-topology-graph": "^2.x",
+    "react": "^16 || ^17"
   },
   "componentConfig": {
     "name": "Topology",
@@ -105,6 +105,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@2.12.2/build/index.html",
-  "gitHead": "62eadeca07c85ed047f2e933676f62015eff98cc"
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@2.12.5-alpha.2/build/index.html",
+  "gitHead": "e53aaebbab89c4155be21b26a1cbac09542ad400"
 }