@riil-frontend/component-topology 2.12.4 → 2.12.6-alpha.0

package/lib/models/topoMod.js

@@ -36,7 +36,6 @@ function _default(topoApp) {
       loading: true,
       // 额外参数
       urlParams: {},
-      topoLoading: true,
       topoLoadError: false,
       viewState: 'view',
       // view, create, 2种模式
@@ -296,61 +295,56 @@ function _default(topoApp) {
          * @param props {{topoId}}
          * @param props.linkTo {?} 关联拓扑
          * @param props.refresh {?boolean} 是否刷新
+         * @param props.clear {?boolean} 是否清空
          * @return {Promise<void>}
          */
         initTopoData: function initTopoData(props, state) {
           var _this5 = this;
 
           return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6() {
-            var startTime, topoId, data, linkToData, refresh, linkTo, permission, result, topoConfig, _yield$Promise$all, ciTypeMap, customIcons, _combTopoData, topoData, resAndMetrics, endTime;
+            var startTime, topoId, data, linkToData, refresh, clear, linkTo, startState, permission, result, topoConfig, _yield$Promise$all, ciTypeMap, customIcons, _combTopoData, topoData, resAndMetrics, endTime;
 
             return _regenerator["default"].wrap(function _callee6$(_context6) {
               while (1) {
                 switch (_context6.prev = _context6.next) {
                   case 0:
                     startTime = (0, _moment["default"])();
-                    topoId = props.topoId, data = props.data, linkToData = props.linkTo, refresh = props.refresh; // 关联拓扑图
+                    topoId = props.topoId, data = props.data, linkToData = props.linkTo, refresh = props.refresh, clear = props.clear; // 关联拓扑图
 
-                    if (refresh !== true) {
-                      linkTo = linkToData || null;
-
-                      _this5.update({
-                        linkTo: linkTo
-                      });
-                    } else {
-                      linkTo = state.topoMod.linkTo;
-                    }
+                    linkTo = refresh === true ? state.topoMod.linkTo : linkToData || null;
+                    startState = {
+                      loading: true,
+                      topoLoadError: false,
+                      linkTo: linkTo
+                    };
 
-                    if (topoId < 0) {
-                      _this5.update({
+                    if (clear === true || topoId < 0) {
+                      Object.assign(startState, {
                         topoData: null
                       });
                     }
 
-                    _this5.update({
-                      loading: true,
-                      topoLoadError: false
-                    });
+                    _this5.update(startState);
 
                     topoApp.options.onLoadStart(); // TODO 待移走
 
                     permission = 'write';
 
                     if (!topoApp.options.usePermission) {
-                      _context6.next = 15;
+                      _context6.next = 16;
                       break;
                     }
 
-                    _context6.next = 10;
+                    _context6.next = 11;
                     return _this5.getTopoPermission({
                       id: topoId
                     });
 
-                  case 10:
+                  case 11:
                     permission = _context6.sent;
 
                     if (_topoPermissionUtil["default"].isReadable(permission)) {
-                      _context6.next = 15;
+                      _context6.next = 16;
                       break;
                     }
 
@@ -363,46 +357,46 @@ function _default(topoApp) {
                     topoApp.options.onLoad();
                     return _context6.abrupt("return");
 
-                  case 15:
+                  case 16:
                     if (!data) {
-                      _context6.next = 26;
+                      _context6.next = 27;
                       break;
                     }
 
                     if (!topoId) {
-                      _context6.next = 23;
+                      _context6.next = 24;
                       break;
                     }
 
-                    _context6.next = 19;
+                    _context6.next = 20;
                     return topoApp.options.loadData(topoId);
 
-                  case 19:
+                  case 20:
                     topoConfig = _context6.sent;
                     result = (0, _extends2["default"])({}, data, {
                       global: topoConfig.global,
                       serialize: topoConfig.serialize
                     });
-                    _context6.next = 24;
+                    _context6.next = 25;
                     break;
 
-                  case 23:
+                  case 24:
                     result = (0, _extends2["default"])({}, data);
 
-                  case 24:
-                    _context6.next = 29;
+                  case 25:
+                    _context6.next = 30;
                     break;
 
-                  case 26:
-                    _context6.next = 28;
+                  case 27:
+                    _context6.next = 29;
                     return topoApp.options.loadData(topoId);
 
-                  case 28:
+                  case 29:
                     result = _context6.sent;
 
-                  case 29:
+                  case 30:
                     if (result) {
-                      _context6.next = 33;
+                      _context6.next = 34;
                       break;
                     }
 
@@ -414,13 +408,13 @@ function _default(topoApp) {
                     topoApp.options.onLoad();
                     return _context6.abrupt("return");
 
-                  case 33:
+                  case 34:
                     _rlog["default"].debug('topoMod.initTopoData 获取拓扑数据', topoId, linkTo, result);
 
-                    _context6.next = 36;
+                    _context6.next = 37;
                     return Promise.all([topoApp.ciTyeCache.getCiTypeMap((0, _topoData.getCiTypes)(result)), dispatch.iconManage.getIcons()]);
 
-                  case 36:
+                  case 37:
                     _yield$Promise$all = _context6.sent;
                     ciTypeMap = _yield$Promise$all[0];
                     customIcons = _yield$Promise$all[1];
@@ -462,7 +456,7 @@ function _default(topoApp) {
 
                     topoApp.options.onLoad();
 
-                  case 50:
+                  case 51:
                   case "end":
                     return _context6.stop();
                 }
@@ -478,17 +472,25 @@ function _default(topoApp) {
           var _this6 = this;
 
           return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee7() {
+            var _payload, clear;
+
             return _regenerator["default"].wrap(function _callee7$(_context7) {
               while (1) {
                 switch (_context7.prev = _context7.next) {
                   case 0:
-                    _context7.next = 2;
+                    if (payload === void 0) {
+                      payload = {};
+                    }
+
+                    _payload = payload, clear = _payload.clear;
+                    _context7.next = 4;
                     return _this6.initTopoData({
                       topoId: rootState.topoMod.topoId,
-                      refresh: true
+                      refresh: true,
+                      clear: clear
                     });
 
-                  case 2:
+                  case 4:
                   case "end":
                     return _context7.stop();
                 }

package/lib/style.js

@@ -1,11 +1,7 @@
-
 require('@alifd/next/lib/message/style');
 require('@alifd/next/lib/dialog/style');
 require('@alifd/next/lib/drawer/style');
 require('@alifd/next/lib/button/style');
-require('@alifd/next/lib/table/style');
-require('@alifd/next/lib/search/style');
-
 require('@alifd/next/lib/loading/style');
 require('@alifd/next/lib/upload/style');
 require('@alifd/next/lib/icon/style');
@@ -15,16 +11,17 @@ require('@alifd/next/lib/form/style');
 require('@alifd/next/lib/number-picker/style');
 require('@alifd/next/lib/select/style');
 require('@alifd/next/lib/balloon/style');
+require('@alifd/next/lib/table/style');
 require('@alifd/next/lib/grid/style');
 require('@alifd/next/lib/box/style');
 require('@alifd/next/lib/dropdown/style');
 require('@alifd/next/lib/menu/style');
+require('@alifd/next/lib/search/style');
 require('@alifd/next/lib/tab/style');
 require('@alifd/next/lib/collapse/style');
 require('@alifd/next/lib/tree-select/style');
-
 require('@alifd/next/lib/radio/style');
 require('@alifd/next/lib/list/style');
 require('@alifd/next/lib/tag/style');
-
+require('@riil-frontend/component-topology-utils/lib/style');
 require('./index.scss');

package/lib/utils/htElementUtils.js

@@ -5,6 +5,7 @@ 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;
@@ -112,7 +113,32 @@ function getGroupNodes(dataModel, groupIdOrTag) {
     return element.groupId === groupIdOrTag || element.groupTag === groupIdOrTag;
   });
 }
+/**
+ * 获取容器里的节点列表
+ *
+ * @param group
+ * @return {*}
+ */
+
+
+function getGroupChildren(group) {
+  if (!group) {
+    return [];
+  } // HT为了支持区域内无节点可展开增加了站位节点，因此 节点的layer等于container_blank的过滤掉就可以了
+
+
+  return group.getChildren().getArray().filter(function (node) {
+    return node._layer !== 'container_blank';
+  });
+}
+/**
+ * 获取容器里的节点数据列表
+ *
+ * @param group
+ * @return {*}
+ */
+
 
 function getGroupChildrenData(group) {
-  return group.getChildren().getArray().map(getNodeData);
+  return getGroupChildren(group).map(getNodeData);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "2.12.4",
+  "version": "2.12.6-alpha.0",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -44,26 +44,26 @@
     "@ice/store": "^1.4.2",
     "@riil-frontend/component-topo-icon-select": "^1.0.4",
     "@riil-frontend/component-topology-common": "^1.0.2",
-    "@riil-frontend/component-topology-utils": "^2.0.19",
+    "@riil-frontend/component-topology-utils": "^2.0.20-alpha.0",
     "classnames": "^2.2.3",
     "prop-types": "^15.5.8",
     "react-color": "^2.19.3",
     "styled-components": "^4.4.1"
   },
   "devDependencies": {
-    "@alifd/next": "^1.21.16",
-    "@alifd/theme-19926": "^0.20.0",
+    "@alifd/next": "1.21.16",
+    "@alifd/theme-19926": "^0.25.1",
     "@formily/next": "1.3.13",
     "@formily/next-components": "1.3.13",
     "@iceworks/spec": "^1.0.0",
-    "@riil-frontend/component-action-tree": "^1.0.8",
-    "@riil-frontend/component-common-res-list": "^1.0.5",
-    "@riil-frontend/component-condition-res-list": "^1.0.5",
+    "@riil-frontend/component-action-tree": "^1.0.13",
+    "@riil-frontend/component-common-res-list": "^1.0.7",
+    "@riil-frontend/component-condition-res-list": "^1.0.8",
     "@riil-frontend/component-extra-title": "^1.0.3",
-    "@riil-frontend/component-more-buttons-menu": "^1.0.1-a.15",
-    "@riil-frontend/component-no-data-page": "^2.0.1",
+    "@riil-frontend/component-more-buttons-menu": "^2.0.1",
+    "@riil-frontend/component-no-data-page": "^2.0.2",
     "@riil-frontend/component-pager": "^1.0.1",
-    "@riil-frontend/component-res-advanced-search": "^2.0.0-a.1",
+    "@riil-frontend/component-res-advanced-search": "^2.0.7",
     "@riil-frontend/component-riil-event-emitter": "^1.0.29",
     "@riil-frontend/component-riil-rule-tree": "^1.0.4",
     "@riil-frontend/component-row-delete-ballon": "^1.0.2",
@@ -75,14 +75,14 @@
     "@riil-frontend/next-collapse": "^1.0.1-a.0",
     "@riil-frontend/utils": "^1.0.20",
     "axios": "^0.21.1",
-    "build-plugin-component": "^1.0.0",
+    "build-plugin-component": "^1.9.2",
     "build-plugin-fusion": "^0.1.0",
     "build-plugin-moment-locales": "^0.1.0",
     "build-scripts": "^1.1.1",
     "echarts": "^5.1.2",
     "echarts-for-react": "^3.0.1",
-    "enzyme": "^3.10.0",
-    "enzyme-adapter-react-16": "^1.14.0",
+    "enzyme": "^3.11.0",
+    "enzyme-adapter-react-16": "^1.15.4",
     "eslint": "^6.0.1",
     "html2canvas": "^1.3.2",
     "jspdf": "^2.3.1",
@@ -105,6 +105,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@2.12.4/build/index.html",
-  "gitHead": "e53aaebbab89c4155be21b26a1cbac09542ad400"
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@2.12.6-alpha.0/build/index.html",
+  "gitHead": "5c15057d6fb3505d1d688eb3a8a9bdf5231e1c8c"
 }

package/CHANGELOG.md

@@ -1,26 +0,0 @@
-## v2.1.8
-
-- 支持自定义分层添加资源组件
-- 支持添加节点、连线接口 `addElements(data)`
-
-## v2.1.4
-
-- ht 新旧版本共存
-
-## v2.1.3
-
-- 自定义图标
-
-
-## v2.0.2
-
-- 支持编辑模式右键菜单
-
-## v2.0.1
-
-新增功能
-- 拓扑图全量更新数据接口，更新时保留元素样式
-- 编辑模式右键菜单
-
-阻断变更
-- 暂时恢复页面加载ht topo-client.js

package/es/core/editor/components/settings/node/NodeRelateResourceButton.js

@@ -1,22 +0,0 @@
-import _Button from "@alifd/next/lib/button";
-import React from 'react';
-
-/**
- * @return {React.ReactNode | null}
- */
-export default function NodeRelateResourceButton(props) {
-  var _node$attr$data;
-
-  var topo = props.topo,
-      topoEditApi = props.topoEditApi,
-      node = props.node;
-  var hide = ((_node$attr$data = node.attr.data) === null || _node$attr$data === void 0 ? void 0 : _node$attr$data.relateResource) === false;
-  return !hide ? /*#__PURE__*/React.createElement(_Button, {
-    type: "primary",
-    text: true,
-    onClick: function onClick() {
-      topoEditApi.bindNodeResource({});
-    }
-  }, "\u9009\u62E9\u8D44\u6E90") : null;
-}
-;

package/lib/core/editor/components/settings/node/NodeRelateResourceButton.js

@@ -1,31 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-exports.__esModule = true;
-exports["default"] = NodeRelateResourceButton;
-
-var _button = _interopRequireDefault(require("@alifd/next/lib/button"));
-
-var _react = _interopRequireDefault(require("react"));
-
-/**
- * @return {React.ReactNode | null}
- */
-function NodeRelateResourceButton(props) {
-  var _node$attr$data;
-
-  var topo = props.topo,
-      topoEditApi = props.topoEditApi,
-      node = props.node;
-  var hide = ((_node$attr$data = node.attr.data) === null || _node$attr$data === void 0 ? void 0 : _node$attr$data.relateResource) === false;
-  return !hide ? /*#__PURE__*/_react["default"].createElement(_button["default"], {
-    type: "primary",
-    text: true,
-    onClick: function onClick() {
-      topoEditApi.bindNodeResource({});
-    }
-  }, "\u9009\u62E9\u8D44\u6E90") : null;
-}
-
-;