@riil-frontend/component-topology 2.15.44 → 2.15.45

package/lib/components/Drawer/index.js

@@ -11,12 +11,15 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _button = _interopRequireDefault(require("@alifd/next/lib/button"));
 
+var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
+
 var _react = _interopRequireDefault(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
 var _indexModule = _interopRequireDefault(require("./index.module.scss"));
 
+var _excluded = ["bodyClassName"];
 var headerStyle = {
   zIndex: 1000
 };
@@ -37,6 +40,8 @@ var Drawer = function Drawer(props) {
       onSave = props.onSave,
       drawerProps = props.drawerProps,
       children = props.children;
+  var bodyClassName = drawerProps.bodyClassName,
+      otherDrawerProps = (0, _objectWithoutPropertiesLoose2["default"])(drawerProps, _excluded);
   return /*#__PURE__*/_react["default"].createElement(_drawer["default"], (0, _extends2["default"])({
     title: title,
     placement: "right",
@@ -44,12 +49,12 @@ var Drawer = function Drawer(props) {
     headerStyle: headerStyle,
     bodyStyle: bodyStyle,
     closeMode: ['close', 'esc']
-  }, drawerProps, {
+  }, otherDrawerProps, {
     className: (0, _classnames["default"])(_indexModule["default"].drawer, drawerProps.className),
     visible: visible,
     onClose: onClose
   }), /*#__PURE__*/_react["default"].createElement("div", {
-    className: (0, _classnames["default"])(_indexModule["default"].content, drawerProps.bodyClassName)
+    className: (0, _classnames["default"])(_indexModule["default"].content, bodyClassName)
   }, children), footer && /*#__PURE__*/_react["default"].createElement("div", {
     className: _indexModule["default"].footer
   }, /*#__PURE__*/_react["default"].createElement(_button["default"], {

package/lib/components/TemplateButton/index.module.scss

@@ -14,6 +14,7 @@
   display: flex;
   justify-content: center;
   align-items: center;
+  user-select: none;
 }
 
 .icon {

package/lib/core/common/hooks/ht/useDataModelDataPropertyChange.js

@@ -6,13 +6,22 @@ exports["default"] = void 0;
 var _react = require("react");
 
 var _default = function _default(topo, fn) {
+  var topoModState = topo.store.useModelState('topoMod');
+  var graphLoaded = topoModState.graphLoaded;
   (0, _react.useEffect)(function () {
-    var dataModel = topo.getDataModel();
-    dataModel.addDataPropertyChangeListener(fn);
+    var dataModel;
+
+    if (graphLoaded) {
+      dataModel = topo.getDataModel();
+      dataModel.addDataPropertyChangeListener(fn);
+    }
+
     return function () {
-      dataModel.removeDataPropertyChangeListener(fn);
+      if (dataModel) {
+        dataModel.removeDataPropertyChangeListener(fn);
+      }
     };
-  }, [fn]);
+  }, [topo, graphLoaded, fn]);
 };
 
 exports["default"] = _default;

package/lib/core/common/icons/icon.js

@@ -93,7 +93,7 @@ function transformCustomIcons2HtIcons(icons) {
 
 
 function getUserCustomIcons(topo) {
-  var uploadIcons = topo.store.getModelState('iconManage').icons;
+  var uploadIcons = topo.store.getModelState('customIcon').icons;
   return [].concat(transformCustomIcons2HtIcons(uploadIcons.node));
 } // 获得节点图标列表
 

package/lib/core/common/icons/useIcons.js

@@ -7,7 +7,7 @@ exports.useNodeIcons = useNodeIcons;
 var _icon = require("./icon");
 
 function useCustomIcons(topo) {
-  var _topo$store$useModelS = topo.store.useModelState('iconManage'),
+  var _topo$store$useModelS = topo.store.useModelState('customIcon'),
       icons = _topo$store$useModelS.icons;
 
   var customIcons = icons.node.map(_icon.transformCustomIcon2HtIcon);

package/lib/core/components/TopoView/topoView.js

@@ -23,8 +23,6 @@ var _useTopoEdit = _interopRequireDefault(require("../../../hooks/useTopoEdit"))
 
 var _useSelection2 = _interopRequireDefault(require("../../../hooks/useSelection"));
 
-var _useRelateTopo = _interopRequireDefault(require("../../../hooks/useRelateTopo"));
-
 var _showMessage = _interopRequireDefault(require("../../utils/showMessage"));
 
 var _EditorPlugin = _interopRequireDefault(require("../../editor/components/EditorPlugin"));
@@ -39,15 +37,15 @@ var _PropertyView = _interopRequireDefault(require("../../editor/components/sett
 
 var _BackgroundView = _interopRequireDefault(require("../../editor/components/BackgroundView"));
 
-var _TopoViewModule = _interopRequireDefault(require("./TopoView.module.scss"));
-
 var _edgeUtil = require("../../utils/edgeUtil");
 
+var _TopoViewModule = _interopRequireDefault(require("./TopoView.module.scss"));
+
 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; }
 
-var TopoView = function TopoView(props) {
+var Topology = function Topology(props) {
   var _classnames, _graphViewProps$creat;
 
   var topo = props.topo,
@@ -63,6 +61,7 @@ var TopoView = function TopoView(props) {
       nodeDeleteable = props.nodeDeleteable,
       onNodeDelete = props.onNodeDelete,
       onLineDelete = props.onLineDelete,
+      onEvent = props.onEvent,
       _props$graphViewProps = props.graphViewProps,
       graphViewProps = _props$graphViewProps === void 0 ? {} : _props$graphViewProps,
       viewerProps = props.viewerProps,
@@ -109,10 +108,7 @@ var TopoView = function TopoView(props) {
   var onExitEdit = topoEdit.onExitEdit,
       onBindData = topoEdit.onBindData,
       onDeleteElement = topoEdit.onDeleteElement,
-      onSaveTopo = topoEdit.onSaveTopo;
-  var relateTopo = (0, _useRelateTopo["default"])({
-    topo: topo
-  }); // useAlarm({
+      onSaveTopo = topoEdit.onSaveTopo; // useAlarm({
   //   topo,
   // });
 
@@ -141,13 +137,6 @@ var TopoView = function TopoView(props) {
   (0, _react.useEffect)(function () {
     // rlog.debug("TopoView.useEffect topoData", topoData);
     setTData(buildLoadOptions ? buildLoadOptions(topoData) : topoData);
-
-    if (topoData) {
-      // TODO 移到模型中
-      topoDispatchers.update({
-        currentTopo: topoData.config
-      });
-    }
   }, [topoData]);
   (0, _react.useEffect)(function () {
     return function () {
@@ -207,7 +196,7 @@ var TopoView = function TopoView(props) {
   var handleEvent = function handleEvent(event) {
     _rlog["default"].debug("TopoView:onEvent", event);
 
-    relateTopo.onEvent(event);
+    onEvent(event);
     topoEdit.onEvent(event);
 
     switch (event.name) {
@@ -310,7 +299,7 @@ var TopoView = function TopoView(props) {
   }));
 };
 
-TopoView.propTypes = {
+Topology.propTypes = {
   // 拓扑模型
   topo: _propTypes["default"].any.isRequired,
   defaultEnterEditMode: _propTypes["default"].bool,
@@ -330,11 +319,11 @@ TopoView.propTypes = {
    */
   titleBar: _propTypes["default"].oneOf([_react["default"].ReactNode, false])
 };
-TopoView.defaultProps = {
+Topology.defaultProps = {
   defaultEnterEditMode: false,
   viewerProps: {},
   editorProps: {} // titleBar: false,
 
 };
-var _default = TopoView;
+var _default = Topology;
 exports["default"] = _default;

package/lib/core/{models/createTopoApp.js → createTopoApp.js}

@@ -8,7 +8,7 @@ exports.createTopology = void 0;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _TopoApp = _interopRequireDefault(require("./TopoApp"));
+var _TopoApp = _interopRequireDefault(require("./models/TopoApp"));
 
 /**
  *

package/lib/core/editor/components/BackgroundView/index.module.scss

@@ -25,6 +25,7 @@
       .box {
         position: relative;
         height: 100%;
+        user-select: none;
         .img {
           max-width: 100%;
           max-height: 100%;

package/lib/core/editor/components/{iconManage/IconManage.js → CustomIconPlugin/CustomIconPlugin.js}

@@ -3,7 +3,7 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 exports.__esModule = true;
-exports["default"] = IconManage;
+exports["default"] = CustomIconPlugin;
 
 var _react = _interopRequireWildcard(require("react"));
 
@@ -15,10 +15,10 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 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 IconManage(props) {
+function CustomIconPlugin(props) {
   var topo = props.topo;
   var store = topo.store;
-  var dispatchers = store.getModelDispatchers('iconManage'); // 初始化时注册事件
+  var dispatchers = store.getModelDispatchers('customIcon'); // 初始化时注册事件
 
   (0, _react.useEffect)(function () {
     var notifier = topo.view.topoClient.notifier; // 测试代码

package/lib/core/editor/components/{iconManage → CustomIconPlugin}/RenameDialog.js

@@ -31,7 +31,7 @@ function RenameDialog(props) {
   var topo = props.topo;
   var store = topo.store;
 
-  var _store$useModel = store.useModel('iconManage'),
+  var _store$useModel = store.useModel('customIcon'),
       state = _store$useModel[0],
       dispatchers = _store$useModel[1];
 

package/lib/core/editor/components/{iconManage → CustomIconPlugin}/UploadIconDialog.js

@@ -35,6 +35,8 @@ var _UploadIconDialogModule = _interopRequireDefault(require("./UploadIconDialog
 
 require("./UploadIconDialog.scss");
 
+var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+
 var config = _configProvider["default"].config;
 
 function getFileName(file) {
@@ -120,7 +122,18 @@ var UploadIconDialog = /*#__PURE__*/function (_React$Component) {
 
       _this.setState({
         files: validFiles
-      });
+      }); // 上传接口报错后只会通知该回调，移除上传loading
+
+
+      if (_this.state.uploading && files.filter(function (file) {
+        return file.state === 'error';
+      }).length && !files.filter(function (file) {
+        return file.state === 'uploading';
+      }).length) {
+        _this.setState({
+          uploading: false
+        });
+      }
     };
 
     _this.submit = function () {
@@ -220,7 +233,9 @@ var UploadIconDialog = /*#__PURE__*/function (_React$Component) {
       });
     };
 
-    _this.handleUploadError = function () {};
+    _this.handleUploadError = function () {
+      _rlog["default"].error('上传失败');
+    };
 
     _this.onClose = function () {
       var dispatchers = _this.props.dispatchers;

package/lib/core/editor/components/{iconManage → CustomIconPlugin}/UploadIconDialogWrapper.js

@@ -17,7 +17,7 @@ function UploadIconDialogWrapper(props) {
   var topo = props.topo;
   var store = topo.store;
 
-  var _store$useModel = store.useModel('iconManage'),
+  var _store$useModel = store.useModel('customIcon'),
       state = _store$useModel[0],
       dispatchers = _store$useModel[1];
 

package/lib/core/editor/components/CustomIconPlugin/index.js

@@ -0,0 +1,11 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = void 0;
+
+var _CustomIconPlugin = _interopRequireDefault(require("./CustomIconPlugin"));
+
+var _default = _CustomIconPlugin["default"];
+exports["default"] = _default;

package/lib/core/editor/components/EditorPlugin.js

@@ -9,7 +9,7 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _react = _interopRequireDefault(require("react"));
 
-var _IconManage = _interopRequireDefault(require("./iconManage/IconManage"));
+var _CustomIconPlugin = _interopRequireDefault(require("./CustomIconPlugin"));
 
 var _SaveLoading = _interopRequireDefault(require("./plugins/SaveLoading"));
 
@@ -23,7 +23,7 @@ function TopoEditorPlugin(props) {
       topoEdit = props.topoEdit,
       editorProps = props.editorProps;
   var store = topo.store;
-  var plugins = [_SaveLoading["default"], _GroupAddResourceDrawerPlugin["default"], _MultipleResourceSelectPlugin["default"], _IconManage["default"]].concat((editorProps === null || editorProps === void 0 ? void 0 : editorProps.plugins) || []);
+  var plugins = [_SaveLoading["default"], _GroupAddResourceDrawerPlugin["default"], _MultipleResourceSelectPlugin["default"], _CustomIconPlugin["default"]].concat((editorProps === null || editorProps === void 0 ? void 0 : editorProps.plugins) || []);
   return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, plugins.map(function (Plugin, index) {
     return /*#__PURE__*/_react["default"].createElement(Plugin, (0, _extends2["default"])({
       key: index,

package/lib/core/editor/components/settings/propertyViews/group/SettingTab/Setting.js

@@ -42,6 +42,7 @@ function GroupSetting(props) {
       editorProps = props.editorProps,
       group = props.group;
   var expanded = values.expanded;
+  var id = values.id;
 
   var field = _field["default"].useField({
     autoUnmount: false,
@@ -116,6 +117,7 @@ function GroupSetting(props) {
     maxLength: 30,
     placeholder: "\u8BF7\u8F93\u5165"
   })), expanded ? /*#__PURE__*/_react["default"].createElement(_GroupExpandSetting["default"], {
+    id: id,
     group: group,
     expanded: expanded,
     topo: topo,

package/lib/core/models/TopoApp.js

@@ -48,7 +48,7 @@ var _PluginManager = _interopRequireDefault(require("./PluginManager"));
 var _topoFactory = _interopRequireDefault(require("./topoFactory"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "2.15.44" === 'string' ? "2.15.44" : null;
+var version = typeof "2.15.45" === 'string' ? "2.15.45" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑
@@ -103,6 +103,10 @@ var Topo = /*#__PURE__*/function () {
 
     this.test = new _Test["default"](this);
     this.uid = _topoFactory["default"].add(options.name, this);
+  };
+
+  _proto.destroy = function destroy() {
+    _topoFactory["default"].remove(this.uid);
   }
   /**
    * TODO 移除
@@ -123,7 +127,7 @@ var Topo = /*#__PURE__*/function () {
               return topoDispatchers.exit();
 
             case 3:
-              _topoFactory["default"].remove(this.uid);
+              this.destroy();
 
             case 4:
             case "end":
@@ -572,7 +576,7 @@ var Topo = /*#__PURE__*/function () {
 
             case 7:
               (0, _edgeUtil.updateEdgeExpanded)(this);
-              editDispatchers = this.store.getModelDispatchers('topoCreateMod');
+              editDispatchers = this.store.getModelDispatchers('topoConfig');
               editDispatchers.switchToEditMode();
 
               if (this.options.onSwitchToEditMode) {
@@ -580,7 +584,7 @@ var Topo = /*#__PURE__*/function () {
               } // 加载自定义上传的图标
 
 
-              iconManageDispatchers = this.store.getModelDispatchers('iconManage');
+              iconManageDispatchers = this.store.getModelDispatchers('customIcon');
               iconManageDispatchers.loadEditorIcons();
 
             case 13:
@@ -609,7 +613,7 @@ var Topo = /*#__PURE__*/function () {
               return this.view.switchToViewMode();
 
             case 2:
-              editDispatchers = this.store.getModelDispatchers('topoCreateMod');
+              editDispatchers = this.store.getModelDispatchers('topoConfig');
               editDispatchers.switchToViewMode(this.id);
 
               if (this.options.onSwitchToViewMode) {

package/lib/core/store/coreModels.js

@@ -5,51 +5,60 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports["default"] = void 0;
 
-var _topoMod = _interopRequireDefault(require("./models/topoMod"));
+var _topoMod = _interopRequireDefault(require("../../models/topoMod"));
 
-var _iconManage = _interopRequireDefault(require("./models/iconManage"));
+var _customIcon = _interopRequireDefault(require("../../models/customIcon"));
 
-var _ciModel = _interopRequireDefault(require("./models/ciModel"));
+var _ciModel = _interopRequireDefault(require("../../models/ciModel"));
 
-var _functionAuth = _interopRequireDefault(require("./models/functionAuth"));
+var _selection = _interopRequireDefault(require("../../models/selection"));
 
-var _linkDynamicStyle = _interopRequireDefault(require("./models/linkDynamicStyle"));
+var _topoBizMod = _interopRequireDefault(require("../../models/topoBizMod"));
 
-var _linkDynamicStyleConfig = _interopRequireDefault(require("./models/linkDynamicStyleConfig"));
+var _topoConfig = _interopRequireDefault(require("../../models/topoConfig"));
 
-var _permissionSetting = _interopRequireDefault(require("./models/permissionSetting"));
+var _topoEdit = _interopRequireDefault(require("../../models/topoEdit"));
 
-var _resourceWebControllUrlSetting = _interopRequireDefault(require("./models/resourceWebControllUrlSetting"));
+var _topoView = _interopRequireDefault(require("../../models/topoView"));
 
-var _topoBizMod = _interopRequireDefault(require("./models/topoBizMod"));
+var _topoAlarm = _interopRequireDefault(require("../../models/topoAlarm"));
 
-var _topoCenter = _interopRequireDefault(require("./models/topoCenter"));
+var _topoGraphView = _interopRequireDefault(require("../../models/topoGraphView"));
 
-var _topoCreate = _interopRequireDefault(require("./models/topoCreate"));
+var _background = _interopRequireDefault(require("../../models/background"));
 
-var _topoCreateMod = _interopRequireDefault(require("./models/topoCreateMod"));
+var _displayConfig = _interopRequireDefault(require("../../models/displayConfig"));
 
-var _topoEdit = _interopRequireDefault(require("./models/topoEdit"));
+var _resourceWebControllUrlSetting = _interopRequireDefault(require("../../models/resourceWebControllUrlSetting"));
 
-var _topoTreeMod = _interopRequireDefault(require("./models/topoTreeMod"));
+var _topoBaseInfoOverview = _interopRequireDefault(require("../../models/topoBaseInfoOverview"));
 
-var _topoView = _interopRequireDefault(require("./models/topoView"));
+var _topoCenter = _interopRequireDefault(require("../../topoCenter/store/topoCenter"));
+
+var _functionAuth = _interopRequireDefault(require("../../topoCenter/store/functionAuth"));
+
+var _topoLinkMod = _interopRequireDefault(require("../../topoCenter/store/topoLinkMod"));
+
+var _topoTreeMod = _interopRequireDefault(require("../../topoCenter/store/topoTreeMod"));
 
 var _default = {
   topoMod: _topoMod["default"],
-  iconManage: _iconManage["default"],
-  ciModel: _ciModel["default"],
-  functionAuth: _functionAuth["default"],
-  linkDynamicStyle: _linkDynamicStyle["default"],
-  linkDynamicStyleConfig: _linkDynamicStyleConfig["default"],
-  permissionSetting: _permissionSetting["default"],
+  customIcon: _customIcon["default"],
+  selection: _selection["default"],
   resourceWebControllUrlSetting: _resourceWebControllUrlSetting["default"],
   topoBizMod: _topoBizMod["default"],
-  topoCenter: _topoCenter["default"],
-  topoCreate: _topoCreate["default"],
-  topoCreateMod: _topoCreateMod["default"],
+  topoConfig: _topoConfig["default"],
+  topoLinkMod: _topoLinkMod["default"],
+  topoView: _topoView["default"],
+  background: _background["default"],
+  topoGraphView: _topoGraphView["default"],
+  topoAlarm: _topoAlarm["default"],
+  displayConfig: _displayConfig["default"],
+  topoBaseInfoOverview: _topoBaseInfoOverview["default"],
+  ciModel: _ciModel["default"],
+  functionAuth: _functionAuth["default"],
   topoEdit: _topoEdit["default"],
-  topoTreeMod: _topoTreeMod["default"],
-  topoView: _topoView["default"]
+  topoCenter: _topoCenter["default"],
+  topoTreeMod: _topoTreeMod["default"]
 };
 exports["default"] = _default;

package/lib/core/store/createStore.js

@@ -9,14 +9,14 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _store = require("@ice/store");
 
-var _getStoreModels = _interopRequireDefault(require("./getStoreModels"));
+var _coreModels = _interopRequireDefault(require("./coreModels"));
 
 function _default(engine, extModels) {
   if (extModels === void 0) {
     extModels = {};
   }
 
-  var models = (0, _extends2["default"])({}, _getStoreModels["default"], extModels);
+  var models = (0, _extends2["default"])({}, _coreModels["default"], extModels);
   Object.keys(models).forEach(function (name) {
     var model = models[name];
 

package/lib/core/test/Test.js

@@ -13,9 +13,11 @@ var Test = /*#__PURE__*/function () {
   var _proto = Test.prototype;
 
   _proto.init = function init() {
+    var _this = this;
+
     this.iconManage = {
       openUpload: function openUpload(type) {
-        topo.store.getModelDispatchers('iconManage').open({
+        _this.topo.store.getModelDispatchers('customIcon').open({
           type: type || 'node'
         });
       }