@riil-frontend/component-topology 2.15.53 → 3.0.0-a.2

package/lib/models/topoMod.js

@@ -39,18 +39,22 @@ function _default(topoApp) {
       id: undefined,
       topoId: "",
       type: undefined,
+      // 拓扑类型
+      currentTopo: undefined,
+      // 基本信息
       data: null,
       // 后端返回的分组、连线、节点数据
+      globalConfig: null,
+      // 全局配置
       topoData: null,
       // ht 拓扑数据，用于首次load
-      currentTopo: undefined,
       topoPermission: undefined,
       resAndMetrics: {
         res: [],
-        metrics: [],
-        metricsDoc: null
+        metrics: []
       },
-      linkTo: null
+      linkTo: null // 关联拓扑来源
+
     },
     reducers: {
       update: function update(prevState, payload) {
@@ -201,11 +205,13 @@ function _default(topoApp) {
         },
         clearData: function clearData() {
           this.update({
+            graphLoaded: false,
             topoId: "",
             topoData: null,
-            graphLoaded: false,
+            currentTopo: undefined,
             data: null,
-            currentTopo: undefined
+            globalConfig: null // 全局配置
+
           });
         },
         switchToViewMode: function switchToViewMode(playload, rootState) {
@@ -311,7 +317,7 @@ function _default(topoApp) {
           return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6() {
             var _result$config;
 
-            var startTime, topoId, data, linkToData, refresh, clear, linkTo, startState, permission, result, topoConfig, _yield$Promise$all, ciTypeMap, customIcons, globalConfig, _combTopoData, topoData, resAndMetrics, endTime;
+            var startTime, topoId, data, linkToData, refresh, clear, linkTo, startState, permission, result, topoConfig, _yield$Promise$all, ciTypeMap, customIcons, extraConfig, _combTopoData, topoData, resAndMetrics, endTime;
 
             return _regenerator["default"].wrap(function _callee6$(_context6) {
               while (1) {
@@ -335,7 +341,9 @@ function _default(topoApp) {
                     if (clear === true || topoId < 0) {
                       Object.assign(startState, {
                         topoData: null,
-                        data: null
+                        data: null,
+                        globalConfig: null // 全局配置
+
                       });
                     }
 
@@ -364,9 +372,11 @@ function _default(topoApp) {
                     }
 
                     _this5.update({
+                      loading: false,
                       topoData: null,
                       data: null,
-                      loading: false
+                      globalConfig: null // 全局配置
+
                     });
 
                     topoApp.options.onLoad();
@@ -416,9 +426,11 @@ function _default(topoApp) {
                     }
 
                     _this5.update({
-                      topoData: null,
+                      loading: false,
                       data: null,
-                      loading: false
+                      globalConfig: null,
+                      // 全局配置
+                      topoData: null
                     });
 
                     topoApp.options.onLoad();
@@ -439,36 +451,34 @@ function _default(topoApp) {
 
                     _rlog["default"].debug("topoMod.initTopoData Ci属性指标元数据", ciTypeMap);
 
-                    globalConfig = result.global.extraConfig;
+                    extraConfig = result.global.extraConfig;
                     _context6.next = 47;
-                    return dispatch.displayConfig.setConfig(globalConfig);
+                    return dispatch.displayConfig.setConfig(extraConfig);
 
                   case 47:
                     _combTopoData = (0, _topoData.combTopoData)({
                       engine: topoApp,
                       data: result,
                       linkTo: linkTo,
-                      globalConfig: globalConfig,
+                      globalConfig: extraConfig,
                       ciTypeMap: ciTypeMap,
                       permission: permission
                     }), topoData = _combTopoData.topoData, resAndMetrics = _combTopoData.resAndMetrics; // rlog.debug("topoMod.initTopoData combTopoData", { topoData, resAndMetrics, });
 
                     _this5.update({
-                      type: (_result$config = result.config) === null || _result$config === void 0 ? void 0 : _result$config.showType,
+                      loading: false,
                       currentTopo: topoData.config,
                       data: result,
+                      globalConfig: extraConfig,
+                      type: (_result$config = result.config) === null || _result$config === void 0 ? void 0 : _result$config.showType,
                       topoData: topoData,
-                      resAndMetrics: resAndMetrics,
-                      loading: false
+                      resAndMetrics: resAndMetrics
                     });
 
                     dispatch.topoBizMod.combBatchCiInfo(resAndMetrics);
-                    dispatch.background.init(globalConfig); // TODO 优化打开拓扑图显示告警速度：打开拓扑图立即请求告警
-
-                    if ((0, _topoData.getAlarmSwitch)(topoData)) {
-                      topoApp.alarm.open();
-                    }
+                    dispatch.background.init(extraConfig); // TODO 优化打开拓扑图显示告警速度：打开拓扑图立即请求告警
 
+                    topoApp.alarm.open();
                     topoApp.onTopoDataLoaded(topoData);
                     endTime = (0, _moment["default"])();
 

package/lib/topoCenter/models/TopoCenter.js

@@ -25,6 +25,8 @@ var _SortResourcesUtil = _interopRequireDefault(require("../utils/SortResourcesU
 
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
+var _store = _interopRequireDefault(require("../store"));
+
 var TopoCenter = /*#__PURE__*/function (_TopoApp) {
   (0, _inheritsLoose2["default"])(TopoCenter, _TopoApp);
 
@@ -35,6 +37,7 @@ var TopoCenter = /*#__PURE__*/function (_TopoApp) {
       loadData: _getTopoData["default"]
     }, options, {
       usePermission: true,
+      storeModels: (0, _extends2["default"])({}, _store["default"], options.storeModels),
       onSwitchToEditModeBegin: function () {
         var _onSwitchToEditModeBegin = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(topo) {
           var topoDispatchers;

package/lib/topoCenter/store/index.js

@@ -0,0 +1,22 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = void 0;
+
+var _topoCenter = _interopRequireDefault(require("./topoCenter"));
+
+var _functionAuth = _interopRequireDefault(require("./functionAuth"));
+
+var _topoLinkMod = _interopRequireDefault(require("./topoLinkMod"));
+
+var _topoTreeMod = _interopRequireDefault(require("./topoTreeMod"));
+
+var _default = {
+  topoCenter: _topoCenter["default"],
+  topoLinkMod: _topoLinkMod["default"],
+  functionAuth: _functionAuth["default"],
+  topoTreeMod: _topoTreeMod["default"]
+};
+exports["default"] = _default;

package/lib/utils/topoData.js

@@ -303,39 +303,45 @@ function parseTopoData(result) {
 
 function buildTopoGraphData() {// TODO 构造拓扑图数据移到这里
 }
-/**
- * 将从后端接收的数据转化为topo组件中需要的数据
- * 具体格式内容参考
- * https://shimo.im/docs/yphCqyk9yqXWdp3Q/ 《拓扑数据结构》
- */
 
-
-var combTopoData = function combTopoData(_ref2) {
-  var _result$config, _result$global2, _alarmSwitch, _engine$options$viewe, _engine$options$edito, _engine$options$edito2, _result$groups;
+function buildGlobal(_ref2) {
+  var _result$config, _result$global2, _engine$options$viewe, _engine$options$edito, _engine$options$edito2;
 
   var result = _ref2.data,
       permission = _ref2.permission,
       linkTo = _ref2.linkTo,
       globalConfig = _ref2.globalConfig,
-      ciTypeMap = _ref2.ciTypeMap,
       engine = _ref2.engine;
-  // rlog.debug("combTopoData-接收到数据", result, engine, globalConfig);
-  var config = (0, _extends2["default"])({
-    type: "auto"
-  }, result.config); // global
+  var edgeFlow;
+
+  if ((_result$config = result.config) !== null && _result$config !== void 0 && _result$config.enableLineFlow) {
+    edgeFlow = {
+      type: 'point',
+      // 必填，支持传送带drip、光点point、箭头arrow
+      direction: 'from' // 流动方向，可为空，默认源到目的
+
+    };
+  }
+
+  if (globalConfig.edgeFlow) {
+    edgeFlow = {
+      type: globalConfig.edgeFlow,
+      // 必填，支持传送带drip、光点point、箭头arrow
+      direction: globalConfig.edgeFlowDirection || 'from' // 流动方向，可为空，默认源到目的
+
+    };
+  }
 
-  var global = (0, _extends2["default"])({
+  return (0, _extends2["default"])({
     // 背景图
-    backgroundImgUrl: (0, _backgroundUtil.getBackgroundImageUrl)(globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.background),
+    backgroundImgUrl: engine.viewProps.hideBackground ? null : (0, _backgroundUtil.getBackgroundImageUrl)(globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.background),
     control: (0, _extends2["default"])({
       editable: _topoPermissionUtil["default"].isEditable(permission),
       // 是否可编辑----控制[编辑]按钮
-      moveable: true,
-      // 节点是否可移动
-      enableLineFlow: ((_result$config = result.config) === null || _result$config === void 0 ? void 0 : _result$config.enableLineFlow) || (globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.lineFlow) === "1"
+      moveable: true
     }, (result === null || result === void 0 ? void 0 : (_result$global2 = result.global) === null || _result$global2 === void 0 ? void 0 : _result$global2.control) || {}),
     topoDisplayConfig: (0, _extends2["default"])({
-      alarmSwitch: (_alarmSwitch = (result.global || {}).alarmSwitch) !== null && _alarmSwitch !== void 0 ? _alarmSwitch : true,
+      // alarmSwitch: (result.global || {}).alarmSwitch ?? true,
       showLog: false,
       // 是否在控制台显示打印内容
       showTips: true,
@@ -344,7 +350,7 @@ var combTopoData = function combTopoData(_ref2) {
       // 是否显示tags
       showLinkName: false,
       // 是否显示链路名称
-      showLinkIF: false
+      edgeFlow: edgeFlow
     }, (globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.topoDisplayConfig) || {}),
     linkTo: linkTo
   }, result.global || {}, {
@@ -360,6 +366,35 @@ var combTopoData = function combTopoData(_ref2) {
     icons: (0, _icon.getEditorIcons)(engine),
     // 获取默认节点图标，可选参数。如果无返回值则继续使用内部默认
     getDefaultNodeIcon: engine.options.getDefaultNodeIcon
+  });
+}
+/**
+ * 将从后端接收的数据转化为topo组件中需要的数据
+ * 具体格式内容参考
+ * https://shimo.im/docs/yphCqyk9yqXWdp3Q/ 《拓扑数据结构》
+ */
+
+
+var combTopoData = function combTopoData(_ref3) {
+  var _result$groups;
+
+  var result = _ref3.data,
+      permission = _ref3.permission,
+      linkTo = _ref3.linkTo,
+      globalConfig = _ref3.globalConfig,
+      ciTypeMap = _ref3.ciTypeMap,
+      engine = _ref3.engine;
+  // rlog.debug("combTopoData-接收到数据", result, engine, globalConfig);
+  var config = (0, _extends2["default"])({
+    type: 'auto'
+  }, result.config); // global
+
+  var global = buildGlobal({
+    data: result,
+    permission: permission,
+    linkTo: linkTo,
+    globalConfig: globalConfig,
+    engine: engine
   }); // group
 
   var groups = formatGroups((_result$groups = result.groups) !== null && _result$groups !== void 0 ? _result$groups : []); // nodes
@@ -398,12 +433,6 @@ var combTopoData = function combTopoData(_ref2) {
     // ci类型模型map
     metrics: [],
     // 所有指标
-    metricsDoc: {},
-    //
-    attrsDoc: {},
-    allMetrics: Object.values(ciTypeMap),
-    allAttrs: Object.values(ciTypeMap),
-    globalConfig: globalConfig,
     nodeIdsList: result.nodes.map(function (item) {
       return {
         ciId: item.id,
@@ -711,8 +740,8 @@ var updateCiDoc = function updateCiDoc(dataType, doc, ciDoc, allCiSet) {
 
 exports.updateCiDoc = updateCiDoc;
 
-var combSaveTopoData = function combSaveTopoData(_ref3) {
-  var global = _ref3.global;
+var combSaveTopoData = function combSaveTopoData(_ref4) {
+  var global = _ref4.global;
   var topoDisplayConfig = global.topoDisplayConfig;
 
   _rlog["default"].debug("combSaveTopoData", global);
@@ -722,7 +751,6 @@ var combSaveTopoData = function combSaveTopoData(_ref3) {
   });
   return {
     alarmSwitch: global.topoDisplayConfig.alarmSwitch,
-    configDataList: [],
     extraConfig: extraConfig
   };
 };

package/package.json

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

package/lib/core/components/DisplaySettingDrawer/LineFlow.js

@@ -1,38 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-exports.__esModule = true;
-exports["default"] = void 0;
-
-var _radio = _interopRequireDefault(require("@alifd/next/lib/radio"));
-
-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; }
-
-function LineFlow(props) {
-  var value = props.value,
-      onChange = props.onChange;
-
-  var handleTypeChange = function handleTypeChange(newValue) {
-    onChange(newValue);
-  };
-
-  return /*#__PURE__*/_react["default"].createElement(_radio["default"].Group, {
-    value: value || 'none',
-    onChange: handleTypeChange
-  }, /*#__PURE__*/_react["default"].createElement(_radio["default"], {
-    value: "none"
-  }, "\u5173"), /*#__PURE__*/_react["default"].createElement(_radio["default"], {
-    value: "1"
-  }, "\u5F00"));
-}
-
-;
-
-var _default = /*#__PURE__*/_react["default"].forwardRef(LineFlow);
-
-exports["default"] = _default;