@riil-frontend/component-topology 6.0.4 → 6.0.6

package/es/core/editor/components/Toolbar/widgets/EdgeTypeButton/index.js

@@ -1,6 +1,6 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
-var _excluded = ["topo", "showLabel"];
+var _excluded = ["topo", "showLabel", "editorProps"];
 import React, { useEffect, useMemo, useState } from 'react';
 import { getEdgesBySelection, setEdgesAndChildren, setEdgesType } from "../../../../utils/edgeTypeStyleUtil";
 import DropdownButton from "../components/DropdownButton";
@@ -16,24 +16,29 @@ import EdgeType from "./EdgeType";
 function EdgeTypeButton(props) {
   var topo = props.topo,
       showLabel = props.showLabel,
+      editorProps = props.editorProps,
       otherProps = _objectWithoutPropertiesLoose(props, _excluded);
 
   var _useState = useState(true),
       disabled = _useState[0],
-      setDisabled = _useState[1]; // 拓扑图是否加载
+      setDisabled = _useState[1]; // FIXME 临时方案支持业务拓扑禁用连线设置
 
 
+  var linkDrawShapeEnabled = editorProps.linkDrawShapeEnabled; // 拓扑图是否加载
+
   var _topo$store$useModelS = topo.store.useModelState('topoMod'),
       graphLoaded = _topo$store$useModelS.graphLoaded; // 选中的元素
 
 
   var selection = topo.selectionModel.useHtSelection();
   useEffect(function () {
-    if (graphLoaded) {
+    if (graphLoaded && linkDrawShapeEnabled !== false) {
       var edges = getEdgesBySelection(topo);
       setDisabled(!edges.length);
+    } else {
+      setDisabled(true);
     }
-  }, [selection, graphLoaded]);
+  }, [selection, graphLoaded, linkDrawShapeEnabled]);
 
   var handleChange = function handleChange(name, value) {
     var edges = getEdgesBySelection(topo);

package/es/core/hooks/useResourceConfig.js

@@ -1,12 +1,10 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import { useMemo, useState, useEffect } from 'react';
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
-import { DEFAULT_GROUP } from "../../utils/template";
-import ResourceConfigUtil from "../../utils/ResourceConfigUtil";
-import { getEdges, getElements, getNodes } from "../../utils/htElementUtils";
 import { getAllEdgeResourceIds as _getAllEdgeResourceIds, isResourceNodeElement } from "../../utils/htElementDataUtil";
+import { getElements } from "../../utils/htElementUtils";
+import ResourceConfigUtil from "../../utils/ResourceConfigUtil";
+import { DEFAULT_GROUP } from "../../utils/template";
 export default function (props) {
   var topo = props.topo;
   var store = topo.store;
@@ -18,9 +16,10 @@ export default function (props) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
-              editDispatchers.getConditions();
+              _context.next = 2;
+              return editDispatchers.getConditions();
 
-            case 1:
+            case 2:
             case "end":
               return _context.stop();
           }

package/es/core/models/TopoApp.js

@@ -23,7 +23,7 @@ import topoFactory from "./topoFactory";
 import ElementTagTipConfig from "./tagstips/ElementTagTipConfig";
 import SelectionModel from "./SelectionModel"; // eslint-disable-next-line no-undef
 
-var version = typeof "6.0.4" === 'string' ? "6.0.4" : null;
+var version = typeof "6.0.6" === 'string' ? "6.0.6" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑
@@ -557,15 +557,20 @@ var Topo = /*#__PURE__*/function () {
             case 8:
               updateEdgeExpanded(this);
 
-              if (this.options.onSwitchToEditMode) {
-                this.options.onSwitchToEditMode(this);
-              } // 加载自定义上传的图标
+              if (!this.options.onSwitchToEditMode) {
+                _context12.next = 12;
+                break;
+              }
 
+              _context12.next = 12;
+              return this.options.onSwitchToEditMode(this);
 
+            case 12:
+              // 加载自定义上传的图标
               iconManageDispatchers = this.store.getModelDispatchers('customIcon');
               iconManageDispatchers.loadEditorIcons();
 
-            case 12:
+            case 14:
             case "end":
               return _context12.stop();
           }
@@ -594,11 +599,15 @@ var Topo = /*#__PURE__*/function () {
               editDispatchers = this.store.getModelDispatchers('topoConfig');
               editDispatchers.switchToViewMode(this.id);
 
-              if (this.options.onSwitchToViewMode) {
-                this.options.onSwitchToViewMode(this);
+              if (!this.options.onSwitchToViewMode) {
+                _context13.next = 7;
+                break;
               }
 
-            case 5:
+              _context13.next = 7;
+              return this.options.onSwitchToViewMode(this);
+
+            case 7:
             case "end":
               return _context13.stop();
           }

package/es/networkTopo/models/TopoCenter.js

@@ -63,9 +63,10 @@ var TopoCenter = /*#__PURE__*/function (_TopoApp) {
             while (1) {
               switch (_context2.prev = _context2.next) {
                 case 0:
-                  topo.resourceConfig.loadConfig();
+                  _context2.next = 2;
+                  return topo.resourceConfig.loadConfig();
 
-                case 1:
+                case 2:
                 case "end":
                   return _context2.stop();
               }
@@ -79,13 +80,37 @@ var TopoCenter = /*#__PURE__*/function (_TopoApp) {
 
         return onSwitchToEditMode;
       }(),
-      onSwitchToViewMode: function onSwitchToViewMode(topo) {
-        var topoModDispatchers = topo.store.getModelDispatchers('topoMod');
-        topoModDispatchers.openTopoPage({
-          id: topo.id
-        });
-        topoModDispatchers.refreshTopoTree();
-      }
+      onSwitchToViewMode: function () {
+        var _onSwitchToViewMode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(topo) {
+          var topoModDispatchers;
+          return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+            while (1) {
+              switch (_context3.prev = _context3.next) {
+                case 0:
+                  topoModDispatchers = topo.store.getModelDispatchers('topoMod');
+                  _context3.next = 3;
+                  return topoModDispatchers.openTopoPage({
+                    id: topo.id
+                  });
+
+                case 3:
+                  _context3.next = 5;
+                  return topoModDispatchers.refreshTopoTree();
+
+                case 5:
+                case "end":
+                  return _context3.stop();
+              }
+            }
+          }, _callee3);
+        }));
+
+        function onSwitchToViewMode(_x3) {
+          return _onSwitchToViewMode.apply(this, arguments);
+        }
+
+        return onSwitchToViewMode;
+      }()
     })) || this;
     _this.resourceConfig = null;
     var menuCommands = createMenuCommands(_assertThisInitialized(_this));
@@ -106,25 +131,25 @@ var TopoCenter = /*#__PURE__*/function (_TopoApp) {
   _proto.initData =
   /*#__PURE__*/
   function () {
-    var _initData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(params) {
+    var _initData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(params) {
       var topoDispatchers;
-      return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+      return _regeneratorRuntime.wrap(function _callee4$(_context4) {
         while (1) {
-          switch (_context3.prev = _context3.next) {
+          switch (_context4.prev = _context4.next) {
             case 0:
               topoDispatchers = this.store.getModelDispatchers('topoCenter');
-              _context3.next = 3;
+              _context4.next = 3;
               return topoDispatchers.initData(params);
 
             case 3:
             case "end":
-              return _context3.stop();
+              return _context4.stop();
           }
         }
-      }, _callee3, this);
+      }, _callee4, this);
     }));
 
-    function initData(_x3) {
+    function initData(_x4) {
       return _initData.apply(this, arguments);
     }
 
@@ -143,22 +168,22 @@ var TopoCenter = /*#__PURE__*/function (_TopoApp) {
   _proto.exit =
   /*#__PURE__*/
   function () {
-    var _exit = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
+    var _exit = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
       var topoDispatchers;
-      return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+      return _regeneratorRuntime.wrap(function _callee5$(_context5) {
         while (1) {
-          switch (_context4.prev = _context4.next) {
+          switch (_context5.prev = _context5.next) {
             case 0:
               topoDispatchers = this.store.getModelDispatchers('topoCenter');
-              _context4.next = 3;
+              _context5.next = 3;
               return topoDispatchers.exit();
 
             case 3:
             case "end":
-              return _context4.stop();
+              return _context5.stop();
           }
         }
-      }, _callee4, this);
+      }, _callee5, this);
     }));
 
     function exit() {

package/lib/core/editor/components/Toolbar/widgets/EdgeTypeButton/index.js

@@ -21,7 +21,7 @@ var _constants = require("./constants");
 
 var _EdgeType = _interopRequireDefault(require("./EdgeType"));
 
-var _excluded = ["topo", "showLabel"];
+var _excluded = ["topo", "showLabel", "editorProps"];
 
 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); }
 
@@ -35,24 +35,29 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 function EdgeTypeButton(props) {
   var topo = props.topo,
       showLabel = props.showLabel,
+      editorProps = props.editorProps,
       otherProps = (0, _objectWithoutPropertiesLoose2["default"])(props, _excluded);
 
   var _useState = (0, _react.useState)(true),
       disabled = _useState[0],
-      setDisabled = _useState[1]; // 拓扑图是否加载
+      setDisabled = _useState[1]; // FIXME 临时方案支持业务拓扑禁用连线设置
 
 
+  var linkDrawShapeEnabled = editorProps.linkDrawShapeEnabled; // 拓扑图是否加载
+
   var _topo$store$useModelS = topo.store.useModelState('topoMod'),
       graphLoaded = _topo$store$useModelS.graphLoaded; // 选中的元素
 
 
   var selection = topo.selectionModel.useHtSelection();
   (0, _react.useEffect)(function () {
-    if (graphLoaded) {
+    if (graphLoaded && linkDrawShapeEnabled !== false) {
       var edges = (0, _edgeTypeStyleUtil.getEdgesBySelection)(topo);
       setDisabled(!edges.length);
+    } else {
+      setDisabled(true);
     }
-  }, [selection, graphLoaded]);
+  }, [selection, graphLoaded, linkDrawShapeEnabled]);
 
   var handleChange = function handleChange(name, value) {
     var edges = (0, _edgeTypeStyleUtil.getEdgesBySelection)(topo);

package/lib/core/hooks/useResourceConfig.js

@@ -11,17 +11,13 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
-var _react = require("react");
-
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _htElementDataUtil = require("../../utils/htElementDataUtil");
 
-var _template = require("../../utils/template");
+var _htElementUtils = require("../../utils/htElementUtils");
 
 var _ResourceConfigUtil = _interopRequireDefault(require("../../utils/ResourceConfigUtil"));
 
-var _htElementUtils = require("../../utils/htElementUtils");
-
-var _htElementDataUtil = require("../../utils/htElementDataUtil");
+var _template = require("../../utils/template");
 
 function _default(props) {
   var topo = props.topo;
@@ -34,9 +30,10 @@ function _default(props) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
-              editDispatchers.getConditions();
+              _context.next = 2;
+              return editDispatchers.getConditions();
 
-            case 1:
+            case 2:
             case "end":
               return _context.stop();
           }

package/lib/core/models/TopoApp.js

@@ -54,7 +54,7 @@ var _ElementTagTipConfig = _interopRequireDefault(require("./tagstips/ElementTag
 var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "6.0.4" === 'string' ? "6.0.4" : null;
+var version = typeof "6.0.6" === 'string' ? "6.0.6" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑
@@ -588,15 +588,20 @@ var Topo = /*#__PURE__*/function () {
             case 8:
               (0, _edgeUtil.updateEdgeExpanded)(this);
 
-              if (this.options.onSwitchToEditMode) {
-                this.options.onSwitchToEditMode(this);
-              } // 加载自定义上传的图标
+              if (!this.options.onSwitchToEditMode) {
+                _context12.next = 12;
+                break;
+              }
 
+              _context12.next = 12;
+              return this.options.onSwitchToEditMode(this);
 
+            case 12:
+              // 加载自定义上传的图标
               iconManageDispatchers = this.store.getModelDispatchers('customIcon');
               iconManageDispatchers.loadEditorIcons();
 
-            case 12:
+            case 14:
             case "end":
               return _context12.stop();
           }
@@ -625,11 +630,15 @@ var Topo = /*#__PURE__*/function () {
               editDispatchers = this.store.getModelDispatchers('topoConfig');
               editDispatchers.switchToViewMode(this.id);
 
-              if (this.options.onSwitchToViewMode) {
-                this.options.onSwitchToViewMode(this);
+              if (!this.options.onSwitchToViewMode) {
+                _context13.next = 7;
+                break;
               }
 
-            case 5:
+              _context13.next = 7;
+              return this.options.onSwitchToViewMode(this);
+
+            case 7:
             case "end":
               return _context13.stop();
           }

package/lib/networkTopo/models/TopoCenter.js

@@ -81,9 +81,10 @@ var TopoCenter = /*#__PURE__*/function (_TopoApp) {
             while (1) {
               switch (_context2.prev = _context2.next) {
                 case 0:
-                  topo.resourceConfig.loadConfig();
+                  _context2.next = 2;
+                  return topo.resourceConfig.loadConfig();
 
-                case 1:
+                case 2:
                 case "end":
                   return _context2.stop();
               }
@@ -97,13 +98,37 @@ var TopoCenter = /*#__PURE__*/function (_TopoApp) {
 
         return onSwitchToEditMode;
       }(),
-      onSwitchToViewMode: function onSwitchToViewMode(topo) {
-        var topoModDispatchers = topo.store.getModelDispatchers('topoMod');
-        topoModDispatchers.openTopoPage({
-          id: topo.id
-        });
-        topoModDispatchers.refreshTopoTree();
-      }
+      onSwitchToViewMode: function () {
+        var _onSwitchToViewMode = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(topo) {
+          var topoModDispatchers;
+          return _regenerator["default"].wrap(function _callee3$(_context3) {
+            while (1) {
+              switch (_context3.prev = _context3.next) {
+                case 0:
+                  topoModDispatchers = topo.store.getModelDispatchers('topoMod');
+                  _context3.next = 3;
+                  return topoModDispatchers.openTopoPage({
+                    id: topo.id
+                  });
+
+                case 3:
+                  _context3.next = 5;
+                  return topoModDispatchers.refreshTopoTree();
+
+                case 5:
+                case "end":
+                  return _context3.stop();
+              }
+            }
+          }, _callee3);
+        }));
+
+        function onSwitchToViewMode(_x3) {
+          return _onSwitchToViewMode.apply(this, arguments);
+        }
+
+        return onSwitchToViewMode;
+      }()
     })) || this;
     _this.resourceConfig = null;
     var menuCommands = (0, _createMenuCommands["default"])((0, _assertThisInitialized2["default"])(_this));
@@ -124,25 +149,25 @@ var TopoCenter = /*#__PURE__*/function (_TopoApp) {
   _proto.initData =
   /*#__PURE__*/
   function () {
-    var _initData = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(params) {
+    var _initData = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(params) {
       var topoDispatchers;
-      return _regenerator["default"].wrap(function _callee3$(_context3) {
+      return _regenerator["default"].wrap(function _callee4$(_context4) {
         while (1) {
-          switch (_context3.prev = _context3.next) {
+          switch (_context4.prev = _context4.next) {
             case 0:
               topoDispatchers = this.store.getModelDispatchers('topoCenter');
-              _context3.next = 3;
+              _context4.next = 3;
               return topoDispatchers.initData(params);
 
             case 3:
             case "end":
-              return _context3.stop();
+              return _context4.stop();
           }
         }
-      }, _callee3, this);
+      }, _callee4, this);
     }));
 
-    function initData(_x3) {
+    function initData(_x4) {
       return _initData.apply(this, arguments);
     }
 
@@ -161,22 +186,22 @@ var TopoCenter = /*#__PURE__*/function (_TopoApp) {
   _proto.exit =
   /*#__PURE__*/
   function () {
-    var _exit = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
+    var _exit = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5() {
       var topoDispatchers;
-      return _regenerator["default"].wrap(function _callee4$(_context4) {
+      return _regenerator["default"].wrap(function _callee5$(_context5) {
         while (1) {
-          switch (_context4.prev = _context4.next) {
+          switch (_context5.prev = _context5.next) {
             case 0:
               topoDispatchers = this.store.getModelDispatchers('topoCenter');
-              _context4.next = 3;
+              _context5.next = 3;
               return topoDispatchers.exit();
 
             case 3:
             case "end":
-              return _context4.stop();
+              return _context5.stop();
           }
         }
-      }, _callee4, this);
+      }, _callee5, this);
     }));
 
     function exit() {

package/package.json

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