@riil-frontend/component-topology 6.0.0-alpha.5 → 6.0.0-alpha.50

package/lib/networkTopo/services/link.js

@@ -173,10 +173,10 @@ var _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 = {

package/lib/networkTopo/store/topoTreeMod.js

@@ -13,8 +13,6 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _services = _interopRequireDefault(require("../services"));
-
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
 var _tree = require("../../utils/tree");
@@ -101,7 +99,7 @@ function _default(topoApp) {
                     }
 
                     _context2.next = 4;
-                    return _services["default"].getTopoTree();
+                    return topoApp.serverApi.getTopoTree();
 
                   case 4:
                     resTreeData = _context2.sent;
@@ -110,7 +108,7 @@ function _default(topoApp) {
 
                   case 7:
                     _context2.next = 9;
-                    return _services["default"].getTopoTreeByLoginUser();
+                    return topoApp.serverApi.getTopoTreeByLoginUser();
 
                   case 9:
                     resTreeData = _context2.sent;
@@ -177,7 +175,7 @@ function _default(topoApp) {
                     _rlog["default"].debug('editTopoOnTree', conditions);
 
                     _context4.next = 4;
-                    return _services["default"].editTopoonTree(parseInt(conditions.id, 10), conditions.name, conditions.type);
+                    return topoApp.serverApi.editTopoonTree(parseInt(conditions.id, 10), conditions.name, conditions.type);
 
                   case 4:
                     resTreeData = _context4.sent;
@@ -263,7 +261,7 @@ function _default(topoApp) {
 
                   case 8:
                     _context5.next = 10;
-                    return _services["default"].deleteTopoonTree(parseInt(conditions, 10));
+                    return topoApp.serverApi.deleteTopoonTree(parseInt(conditions, 10));
 
                   case 10:
                     return _context5.abrupt("return", _context5.sent);
@@ -287,7 +285,7 @@ function _default(topoApp) {
 
                   case 18:
                     _context5.next = 20;
-                    return _services["default"].deleteTopoonTree(parseInt(conditions, 10));
+                    return topoApp.serverApi.deleteTopoonTree(parseInt(conditions, 10));
 
                   case 20:
                     return _context5.abrupt("return", _context5.sent);
@@ -316,7 +314,7 @@ function _default(topoApp) {
                     _rlog["default"].debug('setDefTopoOnTree', conditions);
 
                     _context6.next = 4;
-                    return _services["default"].setDefTopo(parseInt(conditions, 10));
+                    return topoApp.serverApi.setDefTopo(parseInt(conditions, 10));
 
                   case 4:
                     resTreeData = _context6.sent;

package/lib/style.js

@@ -38,7 +38,8 @@ require('@alifd/next/lib/menu/style');
 require('@alifd/next/lib/collapse/style');
 require('@alifd/next/lib/select/style');
 require('@alifd/next/lib/number-picker/style');
-
 require('@alifd/next/lib/tag/style');
+
 require('@riil-frontend/component-riil-event-emitter/lib/style');
+require('@alifd/next/lib/range/style');
 require('./index.scss');

package/lib/utils/htElementUtils.js

@@ -31,6 +31,7 @@ exports.isExistedElement = isExistedElement;
 exports.isGroup = isGroup;
 exports.isLayer = isLayer;
 exports.isNode = isNode;
+exports.isText = isText;
 exports.isValidEdge = isValidEdge;
 exports.setElementRuntimeStyle = setElementRuntimeStyle;
 
@@ -95,6 +96,10 @@ function isLayer(element) {
   return element instanceof ht.Grid;
 }
 
+function isText(element) {
+  return element instanceof ht.Text && element.a('isText');
+}
+
 function getElements(dataModel) {
   // console.error(111, dataModel.getDatas().getArray())
   return dataModel.getDatas().getArray();

package/lib/utils/topoData.js

@@ -366,6 +366,7 @@ function buildGlobal(_ref2) {
       showLinkName: false,
       // 是否显示链路名称
       nodeLabelStyle: globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.nodeLabelStyle,
+      defaultEdgeLabelStyle: globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.defaultEdgeLabelStyle,
       edgeFlow: edgeFlow
     }, (globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.topoDisplayConfig) || {}, (result === null || result === void 0 ? void 0 : (_result$customGlobal2 = result.customGlobal) === null || _result$customGlobal2 === void 0 ? void 0 : _result$customGlobal2.topoDisplayConfig) || {}),
     linkTo: linkTo,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "6.0.0-alpha.5",
+  "version": "6.0.0-alpha.50",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -41,6 +41,7 @@
     "@ahooksjs/use-sortable-plugin": "^0.2.1",
     "@ahooksjs/use-tree-plugin": "^0.2.1",
     "@alifd/biz-anchor": "^1.1.7",
+    "color": "^4.2.3",
     "@ice/store": "^1.4.2",
     "@riil-frontend/component-topo-icon-select": "^1.0.17",
     "@riil-frontend/component-topology-utils": "^2.1.0",
@@ -61,7 +62,7 @@
     "@riil-frontend/component-action-tree": "^1.0.13",
     "@riil-frontend/component-common-res-list": "^1.0.13",
     "@riil-frontend/component-condition-res-list": "^1.0.18",
-    "@riil-frontend/component-crucial-link-topo": "0.0.1-alpha.31",
+    "@riil-frontend/component-crucial-link-topo": "0.1.0",
     "@riil-frontend/component-extra-title": "^1.0.3",
     "@riil-frontend/component-more-buttons-menu": "^2.0.1",
     "@riil-frontend/component-no-data-page": "^3.0.4",
@@ -73,7 +74,7 @@
     "@riil-frontend/component-table-filter-tags": "latest",
     "@riil-frontend/component-table-layout": "^2.0.2",
     "@riil-frontend/component-topology-common": "^1.1.2",
-    "@riil-frontend/component-topology-graph": "^2.7.2",
+    "@riil-frontend/component-topology-graph": "^2.8.0",
     "@riil-frontend/css": "^2.0.2",
     "@riil-frontend/hooks": "latest",
     "@riil-frontend/next-collapse": "^1.0.1-a.0",
@@ -115,6 +116,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@6.0.0-alpha.5/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@6.0.0-alpha.50/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }

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

@@ -1,36 +0,0 @@
-import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
-import _extends from "@babel/runtime/helpers/extends";
-import _regeneratorRuntime from "@babel/runtime/regenerator";
-
-/**
- * 拓扑图 Model
- */
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
-export default {
-  // 定义 model 的初始 state
-  state: {},
-  // 定义改变该模型状态的纯函数
-  reducers: {
-    update: function update(prevState, payload) {
-      return _extends({}, prevState, payload);
-    }
-  },
-  // 定义处理该模型副作用的函数
-  effects: function effects(dispatch) {
-    return {
-      init: function init(payload, rootState) {
-        return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-          return _regeneratorRuntime.wrap(function _callee$(_context) {
-            while (1) {
-              switch (_context.prev = _context.next) {
-                case 0:
-                case "end":
-                  return _context.stop();
-              }
-            }
-          }, _callee);
-        }))();
-      }
-    };
-  }
-};

package/lib/core/store/models/topoView.js

@@ -1,47 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-exports.__esModule = true;
-exports["default"] = void 0;
-
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
-
-/**
- * 拓扑图 Model
- */
-var _default = {
-  // 定义 model 的初始 state
-  state: {},
-  // 定义改变该模型状态的纯函数
-  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);
-        }))();
-      }
-    };
-  }
-};
-exports["default"] = _default;