@riil-frontend/component-topology 11.0.33 → 11.0.35

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

@@ -27,6 +27,8 @@ var _react = _interopRequireDefault(require("react"));
 
 var _lodash = _interopRequireDefault(require("lodash"));
 
+var _utils = require("@riil-frontend/utils");
+
 var _indexModule = _interopRequireDefault(require("./index.module.scss"));
 
 var config = _configProvider["default"].config;
@@ -161,28 +163,26 @@ var UploadIconDialog = /*#__PURE__*/function (_React$Component) {
     _this.handleSuccess = /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
       var onSuccess;
       return _regenerator["default"].wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              onSuccess = _this.props.onSuccess;
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            onSuccess = _this.props.onSuccess;
 
-              _message["default"].show({
-                type: 'success',
-                title: '背景图上传成功'
-              });
+            _message["default"].show({
+              type: 'success',
+              title: '背景图上传成功'
+            });
 
-              _this.setState({
-                uploading: false
-              });
+            _this.setState({
+              uploading: false
+            });
 
-              _this.resetState();
+            _this.resetState();
 
-              onSuccess();
+            onSuccess();
 
-            case 5:
-            case "end":
-              return _context.stop();
-          }
+          case 5:
+          case "end":
+            return _context.stop();
         }
       }, _callee);
     }));
@@ -238,7 +238,7 @@ var UploadIconDialog = /*#__PURE__*/function (_React$Component) {
       value: files,
       action: "/topo/v1/api/background/upload/" + this.props.type,
       headers: {
-        Authorization: localStorage.getItem('token')
+        Authorization: (0, _utils.getToken)()
       },
       accept: ".png",
       autoUpload: false,

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

@@ -7,13 +7,11 @@ exports["default"] = BackgroundView;
 
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
-var _message = _interopRequireDefault(require("@alifd/next/lib/message"));
-
 var _loading = _interopRequireDefault(require("@alifd/next/lib/loading"));
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _dialog = _interopRequireDefault(require("@alifd/next/lib/dialog"));
+var _message = _interopRequireDefault(require("@alifd/next/lib/message"));
 
 var _tag = _interopRequireDefault(require("@alifd/next/lib/tag"));
 
@@ -21,6 +19,8 @@ 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"));
@@ -42,61 +42,56 @@ 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 List(props) {
+  var _remove;
+
   var selected = props.selected,
       onSelect = props.onSelect,
       dataSource = props.dataSource,
       onRemove = props.onRemove;
 
   function remove(_x, _x2) {
-    return _remove.apply(this, arguments);
-  }
-
-  function _remove() {
-    _remove = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(e, id) {
+    return (_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 5:
-            case "end":
-              return _context.stop();
-          }
+        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 5:
+          case "end":
+            return _context.stop();
         }
       }, _callee);
-    }));
-    return _remove.apply(this, arguments);
+    }))).apply(this, arguments);
   }
 
   return /*#__PURE__*/_react["default"].createElement("div", {
@@ -128,6 +123,8 @@ function List(props) {
 }
 
 function BackgroundView(props) {
+  var _getBackground, _removeBg, _ref, _ref2;
+
   var topo = props.topo;
 
   var _topo$store$useModel = topo.store.useModel('background'),
@@ -153,164 +150,138 @@ function BackgroundView(props) {
   }, []);
 
   function getBackground() {
-    return _getBackground.apply(this, arguments);
-  }
-
-  function _getBackground() {
-    _getBackground = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
+    return (_getBackground = _getBackground || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
       var res;
-      return _regenerator["default"].wrap(function _callee4$(_context4) {
-        while (1) {
-          switch (_context4.prev = _context4.next) {
-            case 0:
-              _context4.next = 2;
-              return _background["default"].getBackgroundList();
-
-            case 2:
-              res = _context4.sent;
-              setBgList(res);
-
-            case 4:
-            case "end":
-              return _context4.stop();
-          }
+      return _regenerator["default"].wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            _context2.next = 2;
+            return _background["default"].getBackgroundList();
+
+          case 2:
+            res = _context2.sent;
+            setBgList(res);
+
+          case 4:
+          case "end":
+            return _context2.stop();
         }
-      }, _callee4);
-    }));
-    return _getBackground.apply(this, arguments);
+      }, _callee2);
+    }))).apply(this, arguments);
   }
 
   function removeBg(_x3) {
-    return _removeBg.apply(this, arguments);
-  } // 同步拓扑图展示
-
-
-  function _removeBg() {
-    _removeBg = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5(id) {
+    return (_removeBg = _removeBg || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(id) {
       var res;
-      return _regenerator["default"].wrap(function _callee5$(_context5) {
-        while (1) {
-          switch (_context5.prev = _context5.next) {
-            case 0:
-              _context5.next = 2;
-              return _background["default"].deleteBackground(id);
+      return _regenerator["default"].wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
+          case 0:
+            _context3.next = 2;
+            return _background["default"].deleteBackground(id);
 
-            case 2:
-              res = _context5.sent;
+          case 2:
+            res = _context3.sent;
 
-              if (!(id === (current === null || current === void 0 ? void 0 : current.id))) {
-                _context5.next = 9;
-                break;
-              }
+            if (!(id === (current === null || current === void 0 ? void 0 : current.id))) {
+              _context3.next = 9;
+              break;
+            }
 
-              topo.historyManager.setDisabled(true, '删除背景');
-              _context5.next = 7;
-              return reset();
+            topo.historyManager.setDisabled(true, '删除背景');
+            _context3.next = 7;
+            return reset();
 
-            case 7:
-              setHtTopoBackground(null);
-              topo.historyManager.setDisabled(false, '删除背景');
+          case 7:
+            setHtTopoBackground(null);
+            topo.historyManager.setDisabled(false, '删除背景');
 
-            case 9:
-              getBackground();
+          case 9:
+            getBackground();
 
-              _message["default"].success('删除成功');
+            _message["default"].success('删除成功');
 
-            case 11:
-            case "end":
-              return _context5.stop();
-          }
+          case 11:
+          case "end":
+            return _context3.stop();
         }
-      }, _callee5);
-    }));
-    return _removeBg.apply(this, arguments);
-  }
+      }, _callee3);
+    }))).apply(this, arguments);
+  } // 同步拓扑图展示
+
 
   function setHtTopoBackground(imgUrl, width, height) {
     topo.getHtTopo().setBackgroundImgUrl(imgUrl, width, height);
   }
 
-  var handleSelect = /*#__PURE__*/function () {
-    var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(currentBg) {
+  var handleSelect = function handleSelect(_x4) {
+    return (_ref = _ref || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(currentBg) {
       var imgUrl, size;
-      return _regenerator["default"].wrap(function _callee2$(_context2) {
-        while (1) {
-          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))) {
-                _context2.next = 19;
-                break;
-              }
-
-              setLoadingBackground(true);
-              topo.historyManager.beginTransaction();
-              imgUrl = (0, _backgroundUtil.getBackgroundImageUrl)(currentBg);
-              _context2.prev = 4;
-              _context2.next = 7;
-              return (0, _imageUtil.getImageSize)(imgUrl);
-
-            case 7:
-              size = _context2.sent;
-
-              _rlog["default"].debug('获取图片大小', size);
-
-              _context2.next = 11;
-              return setBackground((0, _extends2["default"])({}, currentBg, size));
-
-            case 11:
-              topo.getHtTopo().setBackgroundImgUrl(imgUrl, size.width, size.height);
-              _context2.next = 17;
+      return _regenerator["default"].wrap(function _callee4$(_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
+          case 0:
+            if (!(currentBg !== null && currentBg !== void 0 && currentBg.id && currentBg.id !== (current === null || current === void 0 ? void 0 : current.id))) {
+              _context4.next = 19;
               break;
+            }
 
-            case 14:
-              _context2.prev = 14;
-              _context2.t0 = _context2["catch"](4);
+            setLoadingBackground(true);
+            topo.historyManager.beginTransaction();
+            imgUrl = (0, _backgroundUtil.getBackgroundImageUrl)(currentBg);
+            _context4.prev = 4;
+            _context4.next = 7;
+            return (0, _imageUtil.getImageSize)(imgUrl);
 
-              _rlog["default"].error('设置背景失败', _context2.t0);
+          case 7:
+            size = _context4.sent;
 
-            case 17:
-              topo.historyManager.endTransaction();
-              setLoadingBackground(false);
+            _rlog["default"].debug('获取图片大小', size);
 
-            case 19:
-            case "end":
-              return _context2.stop();
-          }
-        }
-      }, _callee2, null, [[4, 14]]);
-    }));
+            _context4.next = 11;
+            return setBackground((0, _extends2["default"])({}, currentBg, size));
 
-    return function handleSelect(_x4) {
-      return _ref.apply(this, arguments);
-    };
-  }();
+          case 11:
+            topo.getHtTopo().setBackgroundImgUrl(imgUrl, size.width, size.height);
+            _context4.next = 17;
+            break;
 
-  var resetDefault = /*#__PURE__*/function () {
-    var _ref2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
-      return _regenerator["default"].wrap(function _callee3$(_context3) {
-        while (1) {
-          switch (_context3.prev = _context3.next) {
-            case 0:
-              topo.historyManager.beginTransaction();
-              _context3.next = 3;
-              return reset();
-
-            case 3:
-              setHtTopoBackground(null);
-              topo.historyManager.endTransaction();
-
-            case 5:
-            case "end":
-              return _context3.stop();
-          }
+          case 14:
+            _context4.prev = 14;
+            _context4.t0 = _context4["catch"](4);
+
+            _rlog["default"].error('设置背景失败', _context4.t0);
+
+          case 17:
+            topo.historyManager.endTransaction();
+            setLoadingBackground(false);
+
+          case 19:
+          case "end":
+            return _context4.stop();
         }
-      }, _callee3);
-    }));
+      }, _callee4, null, [[4, 14]]);
+    }))).apply(this, arguments);
+  };
 
-    return function resetDefault() {
-      return _ref2.apply(this, arguments);
-    };
-  }();
+  var resetDefault = function resetDefault() {
+    return (_ref2 = _ref2 || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5() {
+      return _regenerator["default"].wrap(function _callee5$(_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
+          case 0:
+            topo.historyManager.beginTransaction();
+            _context5.next = 3;
+            return reset();
+
+          case 3:
+            setHtTopoBackground(null);
+            topo.historyManager.endTransaction();
+
+          case 5:
+          case "end":
+            return _context5.stop();
+        }
+      }, _callee5);
+    }))).apply(this, arguments);
+  };
 
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: _indexModule["default"]['background-view']

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

@@ -80,10 +80,11 @@
   .upload-btn {
     // margin-top: 12px;
     width: 100%;
-    height: 130px;
+    height: 130px !important;
     display: flex;
     flex-direction: column;
     text-align: center;
+
     .content {
       position: absolute;
       top: 0;

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

@@ -32,6 +32,8 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 var FormItem = _form["default"].Item;
 
 function RenameDialog(props) {
+  var _ref;
+
   var topo = props.topo;
   var store = topo.store;
 
@@ -58,45 +60,39 @@ function RenameDialog(props) {
     });
   }, [name]);
 
-  var submit = /*#__PURE__*/function () {
-    var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+  var submit = function submit() {
+    return (_ref = _ref || (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
       var _yield$field$validate, errors, values;
 
       return _regenerator["default"].wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              _context.next = 2;
-              return field.validatePromise();
-
-            case 2:
-              _yield$field$validate = _context.sent;
-              errors = _yield$field$validate.errors;
-              values = _yield$field$validate.values;
-
-              if (errors) {
-                _context.next = 8;
-                break;
-              }
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return field.validatePromise();
+
+          case 2:
+            _yield$field$validate = _context.sent;
+            errors = _yield$field$validate.errors;
+            values = _yield$field$validate.values;
 
+            if (errors) {
               _context.next = 8;
-              return dispatchers.renameIcon({
-                id: icon.id,
-                name: values.name
-              });
-
-            case 8:
-            case "end":
-              return _context.stop();
-          }
+              break;
+            }
+
+            _context.next = 8;
+            return dispatchers.renameIcon({
+              id: icon.id,
+              name: values.name
+            });
+
+          case 8:
+          case "end":
+            return _context.stop();
         }
       }, _callee);
-    }));
-
-    return function submit() {
-      return _ref.apply(this, arguments);
-    };
-  }();
+    }))).apply(this, arguments);
+  };
 
   var renameIconForm = visible && /*#__PURE__*/_react["default"].createElement(_form["default"], {
     field: field

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

@@ -29,6 +29,8 @@ var _index = _interopRequireDefault(require("@riil-frontend/component-topology-c
 
 var _lodash = _interopRequireDefault(require("lodash"));
 
+var _utils = require("@riil-frontend/utils");
+
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
 var _SpecialCharacterValidateUtil = require("../../../../utils/SpecialCharacterValidateUtil");
@@ -201,39 +203,37 @@ var UploadIconDialog = /*#__PURE__*/function (_React$Component) {
     _this.handleSuccess = /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
       var files, dispatchers;
       return _regenerator["default"].wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              files = _this.state.files;
-
-              _message["default"].show({
-                type: 'success',
-                title: '图片上传成功'
-              });
-
-              _this.setState({
-                uploading: false
-              });
-
-              dispatchers = _this.props.dispatchers;
-              _context.next = 6;
-              return dispatchers.uploadSuccess({
-                type: _this.props.type,
-                data: files.map(function (file) {
-                  return {
-                    id: file.response.result,
-                    name: getFileName(file)
-                  };
-                })
-              });
-
-            case 6:
-              _this.resetState();
-
-            case 7:
-            case "end":
-              return _context.stop();
-          }
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            files = _this.state.files;
+
+            _message["default"].show({
+              type: 'success',
+              title: '图片上传成功'
+            });
+
+            _this.setState({
+              uploading: false
+            });
+
+            dispatchers = _this.props.dispatchers;
+            _context.next = 6;
+            return dispatchers.uploadSuccess({
+              type: _this.props.type,
+              data: files.map(function (file) {
+                return {
+                  id: file.response.result,
+                  name: getFileName(file)
+                };
+              })
+            });
+
+          case 6:
+            _this.resetState();
+
+          case 7:
+          case "end":
+            return _context.stop();
         }
       }, _callee);
     }));
@@ -311,7 +311,7 @@ var UploadIconDialog = /*#__PURE__*/function (_React$Component) {
       disabled: uploading,
       action: UPLOAD_ICON_URL,
       headers: {
-        Authorization: localStorage.getItem('token')
+        Authorization: (0, _utils.getToken)()
       },
       accept: ".jpg,.jpeg,.png,.svg",
       autoUpload: false,