@riil-frontend/component-topology 11.0.34 → 12.0.0-dev.1

package/lib/core/editor/components/Toolbar/widgets/BoxBackgroundButton/BoxBackgroundSetting.js

@@ -54,34 +54,32 @@ function BoxBackgroundSetting(props) {
   var backgroundChang = /*#__PURE__*/function () {
     var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(value, type) {
       return _regenerator["default"].wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              if (!(type === 'select')) {
-                _context.next = 7;
-                break;
-              }
-
-              topo.historyManager.beginTransaction();
-              _context.next = 4;
-              return setStyle({
-                backgroundColor: value
-              });
-
-            case 4:
-              topo.historyManager.endTransaction();
-              _context.next = 8;
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (!(type === 'select')) {
+              _context.next = 7;
               break;
-
-            case 7:
-              setStyle({
-                backgroundColor: value
-              });
-
-            case 8:
-            case "end":
-              return _context.stop();
-          }
+            }
+
+            topo.historyManager.beginTransaction();
+            _context.next = 4;
+            return setStyle({
+              backgroundColor: value
+            });
+
+          case 4:
+            topo.historyManager.endTransaction();
+            _context.next = 8;
+            break;
+
+          case 7:
+            setStyle({
+              backgroundColor: value
+            });
+
+          case 8:
+          case "end":
+            return _context.stop();
         }
       }, _callee);
     }));
@@ -110,34 +108,32 @@ function BoxBackgroundSetting(props) {
   var borderColorChang = /*#__PURE__*/function () {
     var _ref2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(value, type) {
       return _regenerator["default"].wrap(function _callee2$(_context2) {
-        while (1) {
-          switch (_context2.prev = _context2.next) {
-            case 0:
-              if (!(type === 'select')) {
-                _context2.next = 7;
-                break;
-              }
-
-              topo.historyManager.beginTransaction();
-              _context2.next = 4;
-              return setStyle({
-                borderColor: value
-              });
-
-            case 4:
-              topo.historyManager.endTransaction();
-              _context2.next = 8;
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            if (!(type === 'select')) {
+              _context2.next = 7;
               break;
-
-            case 7:
-              setStyle({
-                borderColor: value
-              });
-
-            case 8:
-            case "end":
-              return _context2.stop();
-          }
+            }
+
+            topo.historyManager.beginTransaction();
+            _context2.next = 4;
+            return setStyle({
+              borderColor: value
+            });
+
+          case 4:
+            topo.historyManager.endTransaction();
+            _context2.next = 8;
+            break;
+
+          case 7:
+            setStyle({
+              borderColor: value
+            });
+
+          case 8:
+          case "end":
+            return _context2.stop();
         }
       }, _callee2);
     }));

package/lib/core/editor/components/Toolbar/widgets/FontColorButton.js

@@ -56,34 +56,32 @@ function FontColorDropdown(props) {
   var colorChang = /*#__PURE__*/function () {
     var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(value, type) {
       return _regenerator["default"].wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              if (!(type === 'select')) {
-                _context.next = 7;
-                break;
-              }
-
-              topo.historyManager.beginTransaction();
-              _context.next = 4;
-              return setStyle({
-                color: value
-              });
-
-            case 4:
-              topo.historyManager.endTransaction();
-              _context.next = 8;
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (!(type === 'select')) {
+              _context.next = 7;
               break;
-
-            case 7:
-              setStyle({
-                background: value
-              });
-
-            case 8:
-            case "end":
-              return _context.stop();
-          }
+            }
+
+            topo.historyManager.beginTransaction();
+            _context.next = 4;
+            return setStyle({
+              color: value
+            });
+
+          case 4:
+            topo.historyManager.endTransaction();
+            _context.next = 8;
+            break;
+
+          case 7:
+            setStyle({
+              background: value
+            });
+
+          case 8:
+          case "end":
+            return _context.stop();
         }
       }, _callee);
     }));
@@ -96,34 +94,32 @@ function FontColorDropdown(props) {
   var backgroundChang = /*#__PURE__*/function () {
     var _ref2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(value, type) {
       return _regenerator["default"].wrap(function _callee2$(_context2) {
-        while (1) {
-          switch (_context2.prev = _context2.next) {
-            case 0:
-              if (!(type === 'select')) {
-                _context2.next = 7;
-                break;
-              }
-
-              topo.historyManager.beginTransaction();
-              _context2.next = 4;
-              return setStyle({
-                background: value
-              });
-
-            case 4:
-              topo.historyManager.endTransaction();
-              _context2.next = 8;
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            if (!(type === 'select')) {
+              _context2.next = 7;
               break;
-
-            case 7:
-              setStyle({
-                background: value
-              });
-
-            case 8:
-            case "end":
-              return _context2.stop();
-          }
+            }
+
+            topo.historyManager.beginTransaction();
+            _context2.next = 4;
+            return setStyle({
+              background: value
+            });
+
+          case 4:
+            topo.historyManager.endTransaction();
+            _context2.next = 8;
+            break;
+
+          case 7:
+            setStyle({
+              background: value
+            });
+
+          case 8:
+          case "end":
+            return _context2.stop();
         }
       }, _callee2);
     }));

package/lib/core/editor/components/settings/propertyViews/layer/DataTab/DefaultLayerAddResourceDrawer.js

@@ -28,20 +28,18 @@ var LayerAddResourceDrawer = function LayerAddResourceDrawer(props) {
     var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(selected) {
       var layerData;
       return _regenerator["default"].wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              layerData = {
-                id: layer.tag,
-                tag: layer.attrObject.tag
-              };
-              _context.next = 3;
-              return topoEdit.addLayerResources(layerData, selected);
-
-            case 3:
-            case "end":
-              return _context.stop();
-          }
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            layerData = {
+              id: layer.tag,
+              tag: layer.attrObject.tag
+            };
+            _context.next = 3;
+            return topoEdit.addLayerResources(layerData, selected);
+
+          case 3:
+          case "end":
+            return _context.stop();
         }
       }, _callee);
     }));

package/lib/core/editor/components/settings/propertyViews/node/data/BindResourceDrawer.js

@@ -36,34 +36,32 @@ var BindResourceDrawer = function BindResourceDrawer(props) {
     var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(selected) {
       var result;
       return _regenerator["default"].wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              if (selected) {
-                _context.next = 3;
-                break;
-              }
-
-              _message["default"].error('请选择一项资源。');
-
-              return _context.abrupt("return", false);
-
-            case 3:
-              _context.next = 5;
-              return topoEditApi.bindNodeResource({
-                id: node.id,
-                newResId: selected,
-                oldResId: currentResId
-              });
-
-            case 5:
-              result = _context.sent;
-              return _context.abrupt("return", result);
-
-            case 7:
-            case "end":
-              return _context.stop();
-          }
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (selected) {
+              _context.next = 3;
+              break;
+            }
+
+            _message["default"].error('请选择一项资源。');
+
+            return _context.abrupt("return", false);
+
+          case 3:
+            _context.next = 5;
+            return topoEditApi.bindNodeResource({
+              id: node.id,
+              newResId: selected,
+              oldResId: currentResId
+            });
+
+          case 5:
+            result = _context.sent;
+            return _context.abrupt("return", result);
+
+          case 7:
+          case "end":
+            return _context.stop();
         }
       }, _callee);
     }));

package/lib/core/editor/components/settings/propertyViews/node/data/Data.js

@@ -97,23 +97,21 @@ function Data(props) {
   var handleBindTopoChange = /*#__PURE__*/function () {
     var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(value, data) {
       return _regenerator["default"].wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              topo.historyManager.beginTransaction(); // 设置名称为拓扑名称，清空自定义名称
-
-              node.a('name', data.label);
-              node.a('customName', null);
-              _context.next = 5;
-              return topoEditApi.deleteExLink(node);
-
-            case 5:
-              topo.historyManager.endTransaction();
-
-            case 6:
-            case "end":
-              return _context.stop();
-          }
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            topo.historyManager.beginTransaction(); // 设置名称为拓扑名称，清空自定义名称
+
+            node.a('name', data.label);
+            node.a('customName', null);
+            _context.next = 5;
+            return topoEditApi.deleteExLink(node);
+
+          case 5:
+            topo.historyManager.endTransaction();
+
+          case 6:
+          case "end":
+            return _context.stop();
         }
       }, _callee);
     }));

package/lib/core/editor/components/settings/propertyViews/view/BackgroundSize.js

@@ -27,20 +27,18 @@ function BackgroundSize(props) {
   var setSize = /*#__PURE__*/function () {
     var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(size) {
       return _regenerator["default"].wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              topo.historyManager.beginTransaction();
-              _context.next = 3;
-              return backgroundSizeConfig.setSize(size);
-
-            case 3:
-              topo.historyManager.endTransaction();
-
-            case 4:
-            case "end":
-              return _context.stop();
-          }
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            topo.historyManager.beginTransaction();
+            _context.next = 3;
+            return backgroundSizeConfig.setSize(size);
+
+          case 3:
+            topo.historyManager.endTransaction();
+
+          case 4:
+          case "end":
+            return _context.stop();
         }
       }, _callee);
     }));

package/lib/core/editor/components/titlebar/TopoEditorTitleBar.js

@@ -51,19 +51,17 @@ function TopoEditorTitleBar(props) {
   var saveAndExit = /*#__PURE__*/function () {
     var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
       return _regenerator["default"].wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              _context.next = 2;
-              return topo.save();
-
-            case 2:
-              setExitFlag(true);
-
-            case 3:
-            case "end":
-              return _context.stop();
-          }
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return topo.save();
+
+          case 2:
+            setExitFlag(true);
+
+          case 3:
+          case "end":
+            return _context.stop();
         }
       }, _callee);
     }));
@@ -106,15 +104,13 @@ function TopoEditorTitleBar(props) {
         onOk: function () {
           var _onOk = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
             return _regenerator["default"].wrap(function _callee2$(_context2) {
-              while (1) {
-                switch (_context2.prev = _context2.next) {
-                  case 0:
-                    saveAndExit();
-
-                  case 1:
-                  case "end":
-                    return _context2.stop();
-                }
+              while (1) switch (_context2.prev = _context2.next) {
+                case 0:
+                  saveAndExit();
+
+                case 1:
+                case "end":
+                  return _context2.stop();
               }
             }, _callee2);
           }));
@@ -128,15 +124,13 @@ function TopoEditorTitleBar(props) {
         onCancel: function () {
           var _onCancel = (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.exitEditMode();
-
-                  case 1:
-                  case "end":
-                    return _context3.stop();
-                }
+              while (1) switch (_context3.prev = _context3.next) {
+                case 0:
+                  topo.exitEditMode();
+
+                case 1:
+                case "end":
+                  return _context3.stop();
               }
             }, _callee3);
           }));

package/lib/core/editor/hooks/useKeyboardShortcut.js

@@ -1,49 +1,52 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 exports.__esModule = true;
 exports["default"] = useKeyboardShortcut;
 
-var _react = _interopRequireWildcard(require("react"));
+var _hotkeysJs = _interopRequireDefault(require("hotkeys-js"));
+
+var _react = require("react");
+
+var _copyElementUtil = require("../utils/copyElementUtil");
+
+function initKeyboardShortcuts(props) {
+  var topo = props.topo,
+      topoEdit = props.topoEdit; // 撤销
+
+  (0, _hotkeysJs["default"])('ctrl+z, command+z', function (event) {
+    topo.historyManager.undo();
+  }); // 重做
+
+  (0, _hotkeysJs["default"])('ctrl+y, command+y', function (event) {}); // 空格：切换选择/移动
 
-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); }
+  (0, _hotkeysJs["default"])('space', function (event) {
+    var _topo$store$getModelS = topo.store.getModelState('topoEdit'),
+        viewMouseMode = _topo$store$getModelS.viewMouseMode;
 
-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; }
+    topoEdit.setViewMouseMode(viewMouseMode === 'select' ? 'move' : 'select');
+  }); // 复制
+
+  (0, _hotkeysJs["default"])('ctrl+c, command+c', function (event) {
+    return (0, _copyElementUtil.handleCopyHotkey)(event, props);
+  }); // 粘贴
+
+  (0, _hotkeysJs["default"])('ctrl+v, command+v', function (event) {
+    return (0, _copyElementUtil.handlePasteHotkey)(event, props);
+  });
+}
+
+function unbindKeyboardShortcuts(props) {
+  _hotkeysJs["default"].unbind();
+} // 快捷键
 
-var ht = window.ht; // 快捷键
 
 function useKeyboardShortcut(props) {
-  var topo = props.topo,
-      topoEdit = props.topoEdit;
   (0, _react.useEffect)(function () {
-    var handleKeyDown = function handleKeyDown(e) {
-      if (e.target.tagName === 'INPUT') {
-        return;
-      }
-
-      var isCtrlDown = ht.Default.isCtrlDown;
-
-      if (isCtrlDown(e)) {
-        if (e.keyCode === 90) {
-          // ctrl+z 撤销
-          topo.historyManager.undo();
-        } //  else if (e.keyCode == 89) {//ctrl+y 重做
-        //   this.redo();
-        // }
-
-      }
-
-      if (e.keyCode === 32 && e.target.nodeName !== 'TEXTAREA') {
-        // 空格
-        var _topo$store$getModelS = topo.store.getModelState('topoEdit'),
-            viewMouseMode = _topo$store$getModelS.viewMouseMode;
-
-        topoEdit.setViewMouseMode(viewMouseMode === 'select' ? 'move' : 'select');
-      }
-    };
-
-    window.addEventListener('keydown', handleKeyDown);
+    initKeyboardShortcuts(props);
     return function () {
-      window.removeEventListener('keydown', handleKeyDown);
+      unbindKeyboardShortcuts(props);
     };
   }, []);
 }

package/lib/core/editor/hooks/useNewElementTheme.js

@@ -39,10 +39,10 @@ function useNewElementTheme(props) {
           return item.name === theme;
         });
 
-        var _ThemeUtil = (0, _themeUtil["default"])({
+        var _ThemeUtil2 = (0, _themeUtil["default"])({
           topo: topo
         }),
-            setElementTheme = _ThemeUtil.setElementTheme;
+            setElementTheme = _ThemeUtil2.setElementTheme;
 
         setElementTheme(data, themeConfig); // 临时放这里，新加入节点按配置显示隐藏名称
 

package/lib/core/editor/store/background.js

@@ -46,17 +46,15 @@ var _default = {
 
         return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
           return _regenerator["default"].wrap(function _callee$(_context) {
-            while (1) {
-              switch (_context.prev = _context.next) {
-                case 0:
-                  _this.update({
-                    current: extraConfig.background
-                  });
+            while (1) switch (_context.prev = _context.next) {
+              case 0:
+                _this.update({
+                  current: extraConfig.background
+                });
 
-                case 1:
-                case "end":
-                  return _context.stop();
-              }
+              case 1:
+              case "end":
+                return _context.stop();
             }
           }, _callee);
         }))();

package/lib/core/editor/store/topoEdit.js

@@ -48,12 +48,10 @@ function _default(topo) {
         init: function init(payload, rootState) {
           return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
             return _regenerator["default"].wrap(function _callee$(_context) {
-              while (1) {
-                switch (_context.prev = _context.next) {
-                  case 0:
-                  case "end":
-                    return _context.stop();
-                }
+              while (1) switch (_context.prev = _context.next) {
+                case 0:
+                case "end":
+                  return _context.stop();
               }
             }, _callee);
           }))();