@riil-frontend/component-topology 11.0.34 → 11.0.36

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

@@ -55,44 +55,42 @@ function List(props) {
     _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);
     }));
@@ -160,20 +158,18 @@ function BackgroundView(props) {
     _getBackground = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
       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();
-          }
+        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();
         }
       }, _callee4);
     }));
@@ -189,37 +185,35 @@ function BackgroundView(props) {
     _removeBg = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5(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);
+        while (1) switch (_context5.prev = _context5.next) {
+          case 0:
+            _context5.next = 2;
+            return _background["default"].deleteBackground(id);
 
-            case 2:
-              res = _context5.sent;
+          case 2:
+            res = _context5.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))) {
+              _context5.next = 9;
+              break;
+            }
 
-              topo.historyManager.setDisabled(true, '删除背景');
-              _context5.next = 7;
-              return reset();
+            topo.historyManager.setDisabled(true, '删除背景');
+            _context5.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 _context5.stop();
         }
       }, _callee5);
     }));
@@ -234,48 +228,46 @@ function BackgroundView(props) {
     var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(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;
+        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;
+            break;
 
-            case 14:
-              _context2.prev = 14;
-              _context2.t0 = _context2["catch"](4);
+          case 14:
+            _context2.prev = 14;
+            _context2.t0 = _context2["catch"](4);
 
-              _rlog["default"].error('设置背景失败', _context2.t0);
+            _rlog["default"].error('设置背景失败', _context2.t0);
 
-            case 17:
-              topo.historyManager.endTransaction();
-              setLoadingBackground(false);
+          case 17:
+            topo.historyManager.endTransaction();
+            setLoadingBackground(false);
 
-            case 19:
-            case "end":
-              return _context2.stop();
-          }
+          case 19:
+          case "end":
+            return _context2.stop();
         }
       }, _callee2, null, [[4, 14]]);
     }));
@@ -288,21 +280,19 @@ function BackgroundView(props) {
   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();
-          }
+        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();
         }
       }, _callee3);
     }));

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

@@ -63,32 +63,30 @@ function RenameDialog(props) {
       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);
     }));

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,

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

@@ -19,27 +19,25 @@ function svgToShape(_x) {
 function _svgToShape() {
   _svgToShape = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(file) {
     return _regenerator["default"].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();
-
-              reader.onload = function () {
-                resolve(ht.Default.svgToShape(this.result).output);
-              };
-
-              reader.onerror = function () {
-                reject();
-              };
-
-              reader.readAsText(file);
-            }));
-
-          case 1:
-          case "end":
-            return _context.stop();
-        }
+      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.onerror = function () {
+              reject();
+            };
+
+            reader.readAsText(file);
+          }));
+
+        case 1:
+        case "end":
+          return _context.stop();
       }
     }, _callee);
   }));

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

@@ -26,16 +26,14 @@ var GroupAddResourceDrawer = function GroupAddResourceDrawer(props) {
   var onOk = /*#__PURE__*/function () {
     var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(selected) {
       return _regenerator["default"].wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              _context.next = 2;
-              return topoEdit.addGroupResources(group, selected);
-
-            case 2:
-            case "end":
-              return _context.stop();
-          }
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return topoEdit.addGroupResources(group, selected);
+
+          case 2:
+          case "end":
+            return _context.stop();
         }
       }, _callee);
     }));

package/lib/core/editor/components/Sidebar/views/CanvasPanel/hooks/useCanvasThemeConfig.js

@@ -32,30 +32,28 @@ function useCanvasThemeConfig(props) {
     var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(themeName) {
       var themeConfig;
       return _regenerator["default"].wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              themeConfig = _themes["default"].find(function (item) {
-                return item.name === themeName;
-              });
-              topo.historyManager.beginTransaction();
-              _context.next = 4;
-              return displayConfigDispatchers.update({
-                canvasTheme: themeName
-              });
-
-            case 4:
-              _context.next = 6;
-              return setGlobalTagTheme(themeConfig);
-
-            case 6:
-              setElementsTheme(themeConfig);
-              topo.historyManager.endTransaction();
-
-            case 8:
-            case "end":
-              return _context.stop();
-          }
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            themeConfig = _themes["default"].find(function (item) {
+              return item.name === themeName;
+            });
+            topo.historyManager.beginTransaction();
+            _context.next = 4;
+            return displayConfigDispatchers.update({
+              canvasTheme: themeName
+            });
+
+          case 4:
+            _context.next = 6;
+            return setGlobalTagTheme(themeConfig);
+
+          case 6:
+            setElementsTheme(themeConfig);
+            topo.historyManager.endTransaction();
+
+          case 8:
+          case "end":
+            return _context.stop();
         }
       }, _callee);
     }));
@@ -75,23 +73,21 @@ function useCanvasThemeConfig(props) {
       var _topo$store$getModelS, nodeLabelStyle, defaultEdgeLabelStyle;
 
       return _regenerator["default"].wrap(function _callee2$(_context2) {
-        while (1) {
-          switch (_context2.prev = _context2.next) {
-            case 0:
-              topo.getHtTopo().setGlobalNodeLabelStyle(themeConfig.globalNodeLabelStyle);
-              topo.getHtTopo().setGlobalEdgeTagStyle(themeConfig.globalEdgeTagStyle); // 更新默认配置
-
-              _topo$store$getModelS = topo.store.getModelState('displayConfig'), nodeLabelStyle = _topo$store$getModelS.nodeLabelStyle, defaultEdgeLabelStyle = _topo$store$getModelS.defaultEdgeLabelStyle;
-              _context2.next = 5;
-              return displayConfigDispatchers.update({
-                nodeLabelStyle: (0, _extends2["default"])({}, nodeLabelStyle, themeConfig.globalNodeLabelStyle),
-                defaultEdgeLabelStyle: (0, _extends2["default"])({}, defaultEdgeLabelStyle, themeConfig.globalEdgeTagStyle)
-              });
-
-            case 5:
-            case "end":
-              return _context2.stop();
-          }
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            topo.getHtTopo().setGlobalNodeLabelStyle(themeConfig.globalNodeLabelStyle);
+            topo.getHtTopo().setGlobalEdgeTagStyle(themeConfig.globalEdgeTagStyle); // 更新默认配置
+
+            _topo$store$getModelS = topo.store.getModelState('displayConfig'), nodeLabelStyle = _topo$store$getModelS.nodeLabelStyle, defaultEdgeLabelStyle = _topo$store$getModelS.defaultEdgeLabelStyle;
+            _context2.next = 5;
+            return displayConfigDispatchers.update({
+              nodeLabelStyle: (0, _extends2["default"])({}, nodeLabelStyle, themeConfig.globalNodeLabelStyle),
+              defaultEdgeLabelStyle: (0, _extends2["default"])({}, defaultEdgeLabelStyle, themeConfig.globalEdgeTagStyle)
+            });
+
+          case 5:
+          case "end":
+            return _context2.stop();
         }
       }, _callee2);
     }));