@riil-frontend/component-topology 2.15.42 → 2.15.45

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

@@ -13,7 +13,7 @@ var _loading = _interopRequireDefault(require("@alifd/next/lib/loading"));
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _dialog = _interopRequireDefault(require("@alifd/next/lib/dialog"));
 
 var _tag = _interopRequireDefault(require("@alifd/next/lib/tag"));
 
@@ -21,7 +21,7 @@ var _button = _interopRequireDefault(require("@alifd/next/lib/button"));
 
 var _icon = _interopRequireDefault(require("@alifd/next/lib/icon"));
 
-var _dialog = _interopRequireDefault(require("@alifd/next/lib/dialog"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
 var _react = _interopRequireWildcard(require("react"));
 
@@ -47,20 +47,56 @@ function List(props) {
       dataSource = props.dataSource,
       onRemove = props.onRemove;
 
-  function remove(e, id) {
-    e.stopPropagation();
-
-    _dialog["default"].confirm({
-      title: '删除',
-      messageProps: {
-        type: 'warning'
-      },
-      content: '若执行相关操作，此背景将会从背景库删除，确定删除吗？',
-      onOk: function onOk() {
-        return onRemove(id);
-      },
-      onCancel: function onCancel() {}
-    });
+  function remove(_x, _x2) {
+    return _remove.apply(this, arguments);
+  }
+
+  function _remove() {
+    _remove = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(e, id) {
+      var canDelete;
+      return _regenerator["default"].wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              e.stopPropagation();
+              _context.next = 3;
+              return _background["default"].canDeleteBackground(id);
+
+            case 3:
+              canDelete = _context.sent;
+              console.log('canDelete', canDelete);
+
+              if (canDelete) {
+                _dialog["default"].confirm({
+                  title: '删除',
+                  messageProps: {
+                    type: 'warning'
+                  },
+                  content: '若执行相关操作，此背景将会从背景库删除，确定删除吗？',
+                  onOk: function onOk() {
+                    return onRemove(id);
+                  }
+                });
+              } else {
+                _dialog["default"].confirm({
+                  title: '提示',
+                  messageProps: {
+                    type: 'warning'
+                  },
+                  content: '此背景被占用，不能删除。',
+                  footerActions: ['ok'],
+                  onOk: function onOk() {}
+                });
+              }
+
+            case 6:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }));
+    return _remove.apply(this, arguments);
   }
 
   return /*#__PURE__*/_react["default"].createElement("div", {
@@ -121,46 +157,46 @@ function BackgroundView(props) {
   }
 
   function _getBackground() {
-    _getBackground = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+    _getBackground = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
       var res;
-      return _regenerator["default"].wrap(function _callee2$(_context2) {
+      return _regenerator["default"].wrap(function _callee3$(_context3) {
         while (1) {
-          switch (_context2.prev = _context2.next) {
+          switch (_context3.prev = _context3.next) {
             case 0:
-              _context2.next = 2;
+              _context3.next = 2;
               return _background["default"].getBackgroundList();
 
             case 2:
-              res = _context2.sent;
+              res = _context3.sent;
               setBgList(res);
 
             case 4:
             case "end":
-              return _context2.stop();
+              return _context3.stop();
           }
         }
-      }, _callee2);
+      }, _callee3);
     }));
     return _getBackground.apply(this, arguments);
   }
 
-  function removeBg(_x) {
+  function removeBg(_x3) {
     return _removeBg.apply(this, arguments);
   } // 同步拓扑图展示
 
 
   function _removeBg() {
-    _removeBg = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(id) {
+    _removeBg = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(id) {
       var res;
-      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:
-              _context3.next = 2;
+              _context4.next = 2;
               return _background["default"].deleteBackground(id);
 
             case 2:
-              res = _context3.sent;
+              res = _context4.sent;
 
               // 删除当前选中
               if (id === (current === null || current === void 0 ? void 0 : current.id)) {
@@ -174,10 +210,10 @@ function BackgroundView(props) {
 
             case 6:
             case "end":
-              return _context3.stop();
+              return _context4.stop();
           }
         }
-      }, _callee3);
+      }, _callee4);
     }));
     return _removeBg.apply(this, arguments);
   }
@@ -187,48 +223,48 @@ function BackgroundView(props) {
   }
 
   var handleSelect = /*#__PURE__*/function () {
-    var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(currentBg) {
+    var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(currentBg) {
       var imgUrl, size;
-      return _regenerator["default"].wrap(function _callee$(_context) {
+      return _regenerator["default"].wrap(function _callee2$(_context2) {
         while (1) {
-          switch (_context.prev = _context.next) {
+          switch (_context2.prev = _context2.next) {
             case 0:
               if (!(currentBg !== null && currentBg !== void 0 && currentBg.id && currentBg.id !== (current === null || current === void 0 ? void 0 : current.id))) {
-                _context.next = 16;
+                _context2.next = 16;
                 break;
               }
 
               setLoadingBackground(true);
               imgUrl = (0, _backgroundUtil.getBackgroundImageUrl)(currentBg);
-              _context.prev = 3;
-              _context.next = 6;
+              _context2.prev = 3;
+              _context2.next = 6;
               return (0, _imageUtil.getImageSize)(imgUrl);
 
             case 6:
-              size = _context.sent;
+              size = _context2.sent;
 
               _rlog["default"].debug('获取图片大小', size);
 
               setBackground((0, _extends2["default"])({}, currentBg, size));
               topo.getHtTopo().setBackgroundImgUrl(imgUrl, size.width, size.height);
               setLoadingBackground(false);
-              _context.next = 16;
+              _context2.next = 16;
               break;
 
             case 13:
-              _context.prev = 13;
-              _context.t0 = _context["catch"](3);
+              _context2.prev = 13;
+              _context2.t0 = _context2["catch"](3);
               setLoadingBackground(false);
 
             case 16:
             case "end":
-              return _context.stop();
+              return _context2.stop();
           }
         }
-      }, _callee, null, [[3, 13]]);
+      }, _callee2, null, [[3, 13]]);
     }));
 
-    return function handleSelect(_x2) {
+    return function handleSelect(_x4) {
       return _ref.apply(this, arguments);
     };
   }();

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/editor/components/settings/propertyViews/node/NodePropertyView.js

@@ -99,7 +99,7 @@ function NodePropertyView(props) {
   };
 
   var handleBindTopoChange = function handleBindTopoChange(value, data) {
-    // 设置名称为拓扑名称
+    // 设置名称为拓扑名称，清空自定义名称
     node.a('name', data.label);
     node.a('customName', null);
   };

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.42" === 'string' ? "2.15.42" : 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/services/background.js

@@ -117,6 +117,31 @@ var _default = {
   /**
    * 背景图导出
    */
-  EXPORT_BG_ZIP: EXPORT_BG_ZIP
+  EXPORT_BG_ZIP: EXPORT_BG_ZIP,
+
+  /**
+   * 校验背景图是否被占用
+   * @param {*} params id
+   */
+  canDeleteBackground: function canDeleteBackground(id) {
+    return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
+      return _regenerator["default"].wrap(function _callee4$(_context4) {
+        while (1) {
+          switch (_context4.prev = _context4.next) {
+            case 0:
+              _context4.next = 2;
+              return (0, _request.getRequest)()("/topo/v1/api/background/" + id);
+
+            case 2:
+              return _context4.abrupt("return", _context4.sent);
+
+            case 3:
+            case "end":
+              return _context4.stop();
+          }
+        }
+      }, _callee4);
+    }))();
+  }
 };
 exports["default"] = _default;

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'
         });
       }