@riil-frontend/component-topology 10.0.58 → 10.0.59

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

@@ -1,10 +1,10 @@
-import _Message from "@alifd/next/es/message";
 import _Loading from "@alifd/next/es/loading";
 import _extends from "@babel/runtime/helpers/extends";
-import _Dialog from "@alifd/next/es/dialog";
+import _Message from "@alifd/next/es/message";
 import _Tag from "@alifd/next/es/tag";
 import _Button from "@alifd/next/es/button";
 import _Icon from "@alifd/next/es/icon";
+import _Dialog from "@alifd/next/es/dialog";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React, { useEffect, useState } from 'react';
@@ -16,61 +16,56 @@ import { getImageSize } from "../../../utils/imageUtil";
 import rlog from '@riil-frontend/component-topology-utils/es/rlog';
 
 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 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(e, id) {
+    return (_remove = _remove || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(e, id) {
       var canDelete;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              e.stopPropagation();
-              _context.next = 3;
-              return api.canDeleteBackground(id);
-
-            case 3:
-              canDelete = _context.sent;
-
-              // console.log('canDelete', canDelete);
-              if (canDelete) {
-                _Dialog.confirm({
-                  title: '删除',
-                  messageProps: {
-                    type: 'warning'
-                  },
-                  content: '若执行相关操作，此背景将会从背景库删除，确定删除吗？',
-                  onOk: function onOk() {
-                    return onRemove(id);
-                  }
-                });
-              } else {
-                _Dialog.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 api.canDeleteBackground(id);
+
+          case 3:
+            canDelete = _context.sent;
+
+            // console.log('canDelete', canDelete);
+            if (canDelete) {
+              _Dialog.confirm({
+                title: '删除',
+                messageProps: {
+                  type: 'warning'
+                },
+                content: '若执行相关操作，此背景将会从背景库删除，确定删除吗？',
+                onOk: function onOk() {
+                  return onRemove(id);
+                }
+              });
+            } else {
+              _Dialog.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.createElement("div", {
@@ -102,6 +97,8 @@ function List(props) {
 }
 
 export default function BackgroundView(props) {
+  var _getBackground, _removeBg, _ref, _ref2;
+
   var topo = props.topo;
 
   var _topo$store$useModel = topo.store.useModel('background'),
@@ -127,161 +124,135 @@ export default function BackgroundView(props) {
   }, []);
 
   function getBackground() {
-    return _getBackground.apply(this, arguments);
-  }
-
-  function _getBackground() {
-    _getBackground = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
+    return (_getBackground = _getBackground || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
       var res;
-      return _regeneratorRuntime.wrap(function _callee4$(_context4) {
-        while (1) {
-          switch (_context4.prev = _context4.next) {
-            case 0:
-              _context4.next = 2;
-              return api.getBackgroundList();
-
-            case 2:
-              res = _context4.sent;
-              setBgList(res);
-
-            case 4:
-            case "end":
-              return _context4.stop();
-          }
+      return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            _context2.next = 2;
+            return api.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 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(id) {
+    return (_removeBg = _removeBg || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(id) {
       var res;
-      return _regeneratorRuntime.wrap(function _callee5$(_context5) {
-        while (1) {
-          switch (_context5.prev = _context5.next) {
-            case 0:
-              _context5.next = 2;
-              return api.deleteBackground(id);
+      return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
+          case 0:
+            _context3.next = 2;
+            return api.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.success('删除成功');
+            _Message.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 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(currentBg) {
+  var handleSelect = function handleSelect(_x4) {
+    return (_ref = _ref || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(currentBg) {
       var imgUrl, size;
-      return _regeneratorRuntime.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 = getBackgroundImageUrl(currentBg);
-              _context2.prev = 4;
-              _context2.next = 7;
-              return getImageSize(imgUrl);
-
-            case 7:
-              size = _context2.sent;
-              rlog.debug('获取图片大小', size);
-              _context2.next = 11;
-              return setBackground(_extends({}, currentBg, size));
-
-            case 11:
-              topo.getHtTopo().setBackgroundImgUrl(imgUrl, size.width, size.height);
-              _context2.next = 17;
+      return _regeneratorRuntime.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);
-              rlog.error('设置背景失败', _context2.t0);
-
-            case 17:
-              topo.historyManager.endTransaction();
-              setLoadingBackground(false);
-
-            case 19:
-            case "end":
-              return _context2.stop();
-          }
+            }
+
+            setLoadingBackground(true);
+            topo.historyManager.beginTransaction();
+            imgUrl = getBackgroundImageUrl(currentBg);
+            _context4.prev = 4;
+            _context4.next = 7;
+            return getImageSize(imgUrl);
+
+          case 7:
+            size = _context4.sent;
+            rlog.debug('获取图片大小', size);
+            _context4.next = 11;
+            return setBackground(_extends({}, currentBg, size));
+
+          case 11:
+            topo.getHtTopo().setBackgroundImgUrl(imgUrl, size.width, size.height);
+            _context4.next = 17;
+            break;
+
+          case 14:
+            _context4.prev = 14;
+            _context4.t0 = _context4["catch"](4);
+            rlog.error('设置背景失败', _context4.t0);
+
+          case 17:
+            topo.historyManager.endTransaction();
+            setLoadingBackground(false);
+
+          case 19:
+          case "end":
+            return _context4.stop();
         }
-      }, _callee2, null, [[4, 14]]);
-    }));
+      }, _callee4, null, [[4, 14]]);
+    }))).apply(this, arguments);
+  };
 
-    return function handleSelect(_x4) {
-      return _ref.apply(this, arguments);
-    };
-  }();
-
-  var resetDefault = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
-      return _regeneratorRuntime.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();
-          }
+  var resetDefault = function resetDefault() {
+    return (_ref2 = _ref2 || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
+      return _regeneratorRuntime.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();
         }
-      }, _callee3);
-    }));
-
-    return function resetDefault() {
-      return _ref2.apply(this, arguments);
-    };
-  }();
+      }, _callee5);
+    }))).apply(this, arguments);
+  };
 
   return /*#__PURE__*/React.createElement("div", {
     className: styles['background-view']

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

@@ -10,6 +10,8 @@ import _ from 'lodash';
 import { SPECIAL_CHARACTER_FORM_ITEM_VALIDATE_PROPS } from "../../../../utils/SpecialCharacterValidateUtil";
 var FormItem = _Form.Item;
 export default function RenameDialog(props) {
+  var _ref;
+
   var topo = props.topo;
   var store = topo.store;
 
@@ -36,45 +38,39 @@ export default function RenameDialog(props) {
     });
   }, [name]);
 
-  var submit = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+  var submit = function submit() {
+    return (_ref = _ref || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
       var _yield$field$validate, errors, values;
 
       return _regeneratorRuntime.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;
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return field.validatePromise();
 
-              if (errors) {
-                _context.next = 8;
-                break;
-              }
+          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
-              });
+              break;
+            }
 
-            case 8:
-            case "end":
-              return _context.stop();
-          }
+            _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.createElement(_Form, {
     field: field

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

@@ -10,6 +10,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React from 'react';
 import topoServer from '@riil-frontend/component-topology-common/es/services/topo/index';
 import _ from 'lodash';
+import { getToken } from '@riil-frontend/utils';
 import rlog from '@riil-frontend/component-topology-utils/es/rlog';
 import { validateSpecialCharacter } from "../../../../utils/SpecialCharacterValidateUtil";
 import "./UploadIconDialog.scss";
@@ -178,39 +179,37 @@ var UploadIconDialog = /*#__PURE__*/function (_React$Component) {
     _this.handleSuccess = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
       var files, dispatchers;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              files = _this.state.files;
-
-              _Message.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.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);
     }));
@@ -288,7 +287,7 @@ var UploadIconDialog = /*#__PURE__*/function (_React$Component) {
       disabled: uploading,
       action: UPLOAD_ICON_URL,
       headers: {
-        Authorization: localStorage.getItem('token')
+        Authorization: getToken()
       },
       accept: ".jpg,.jpeg,.png,.svg",
       autoUpload: false,

package/es/core/editor/components/CustomIconPlugin/utils/svgToShape.js

@@ -1,37 +1,33 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+
+var _svgToShape;
+
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 var ht = window.ht;
 var FileReader = window.FileReader;
 export default function svgToShape(_x) {
-  return _svgToShape.apply(this, arguments);
-}
-
-function _svgToShape() {
-  _svgToShape = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(file) {
+  return (_svgToShape = _svgToShape || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(file) {
     return _regeneratorRuntime.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            return _context.abrupt("return", new Promise(function (resolve, reject) {
-              var reader = new FileReader();
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          return _context.abrupt("return", new Promise(function (resolve, reject) {
+            var reader = new FileReader();
 
-              reader.onload = function () {
-                resolve(ht.Default.svgToShape(this.result).output);
-              };
+            reader.onload = function () {
+              resolve(ht.Default.svgToShape(this.result).output);
+            };
 
-              reader.onerror = function () {
-                reject();
-              };
+            reader.onerror = function () {
+              reject();
+            };
 
-              reader.readAsText(file);
-            }));
+            reader.readAsText(file);
+          }));
 
-          case 1:
-          case "end":
-            return _context.stop();
-        }
+        case 1:
+        case "end":
+          return _context.stop();
       }
     }, _callee);
-  }));
-  return _svgToShape.apply(this, arguments);
+  }))).apply(this, arguments);
 }

package/es/core/editor/components/GroupAddResourceDrawerPlugin/GroupAddResourceDrawer.js

@@ -4,32 +4,28 @@ import React, { useState, useEffect } from 'react';
 import ResourceSelectDrawer from "../../../../components/NetworkTopoResourceSelectDrawer";
 
 var GroupAddResourceDrawer = function GroupAddResourceDrawer(props) {
+  var _ref;
+
   var group = props.group,
       topoEdit = props.topoEdit,
       visible = props.visible,
       onClose = props.onClose;
 
-  var onOk = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(selected) {
+  var onOk = function onOk(_x) {
+    return (_ref = _ref || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(selected) {
       return _regeneratorRuntime.wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              _context.next = 2;
-              return topoEdit.addGroupResources(group, selected);
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return topoEdit.addGroupResources(group, selected);
 
-            case 2:
-            case "end":
-              return _context.stop();
-          }
+          case 2:
+          case "end":
+            return _context.stop();
         }
       }, _callee);
-    }));
-
-    return function onOk(_x) {
-      return _ref.apply(this, arguments);
-    };
-  }();
+    }))).apply(this, arguments);
+  };
 
   return /*#__PURE__*/React.createElement(ResourceSelectDrawer, {
     visible: visible,