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

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

@@ -37,34 +37,32 @@ function BoxBackgroundSetting(props) {
   var backgroundChang = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(value, type) {
       return _regeneratorRuntime.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);
     }));
@@ -93,34 +91,32 @@ function BoxBackgroundSetting(props) {
   var borderColorChang = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(value, type) {
       return _regeneratorRuntime.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/es/core/editor/components/Toolbar/widgets/FontColorButton.js

@@ -38,34 +38,32 @@ function FontColorDropdown(props) {
   var colorChang = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(value, type) {
       return _regeneratorRuntime.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);
     }));
@@ -78,34 +76,32 @@ function FontColorDropdown(props) {
   var backgroundChang = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(value, type) {
       return _regeneratorRuntime.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/es/core/editor/components/settings/propertyViews/layer/DataTab/DefaultLayerAddResourceDrawer.js

@@ -14,20 +14,18 @@ var LayerAddResourceDrawer = function LayerAddResourceDrawer(props) {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(selected) {
       var layerData;
       return _regeneratorRuntime.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);
+        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();
-          }
+          case 3:
+          case "end":
+            return _context.stop();
         }
       }, _callee);
     }));

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

@@ -21,34 +21,32 @@ var BindResourceDrawer = function BindResourceDrawer(props) {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(selected) {
       var result;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              if (selected) {
-                _context.next = 3;
-                break;
-              }
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (selected) {
+              _context.next = 3;
+              break;
+            }
 
-              _Message.error('请选择一项资源。');
+            _Message.error('请选择一项资源。');
 
-              return _context.abrupt("return", false);
+            return _context.abrupt("return", false);
 
-            case 3:
-              _context.next = 5;
-              return topoEditApi.bindNodeResource({
-                id: node.id,
-                newResId: selected,
-                oldResId: currentResId
-              });
+          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 5:
+            result = _context.sent;
+            return _context.abrupt("return", result);
 
-            case 7:
-            case "end":
-              return _context.stop();
-          }
+          case 7:
+          case "end":
+            return _context.stop();
         }
       }, _callee);
     }));

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

@@ -75,23 +75,21 @@ export default function Data(props) {
   var handleBindTopoChange = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(value, data) {
       return _regeneratorRuntime.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/es/core/editor/components/settings/propertyViews/view/BackgroundSize.js

@@ -15,20 +15,18 @@ export default function BackgroundSize(props) {
   var setSize = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(size) {
       return _regeneratorRuntime.wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              topo.historyManager.beginTransaction();
-              _context.next = 3;
-              return backgroundSizeConfig.setSize(size);
+        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 3:
+            topo.historyManager.endTransaction();
 
-            case 4:
-            case "end":
-              return _context.stop();
-          }
+          case 4:
+          case "end":
+            return _context.stop();
         }
       }, _callee);
     }));

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

@@ -28,19 +28,17 @@ export default function TopoEditorTitleBar(props) {
   var saveAndExit = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
       return _regeneratorRuntime.wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              _context.next = 2;
-              return topo.save();
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return topo.save();
 
-            case 2:
-              setExitFlag(true);
+          case 2:
+            setExitFlag(true);
 
-            case 3:
-            case "end":
-              return _context.stop();
-          }
+          case 3:
+          case "end":
+            return _context.stop();
         }
       }, _callee);
     }));
@@ -83,15 +81,13 @@ export default function TopoEditorTitleBar(props) {
         onOk: function () {
           var _onOk = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
             return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-              while (1) {
-                switch (_context2.prev = _context2.next) {
-                  case 0:
-                    saveAndExit();
+              while (1) switch (_context2.prev = _context2.next) {
+                case 0:
+                  saveAndExit();
 
-                  case 1:
-                  case "end":
-                    return _context2.stop();
-                }
+                case 1:
+                case "end":
+                  return _context2.stop();
               }
             }, _callee2);
           }));
@@ -105,15 +101,13 @@ export default function TopoEditorTitleBar(props) {
         onCancel: function () {
           var _onCancel = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
             return _regeneratorRuntime.wrap(function _callee3$(_context3) {
-              while (1) {
-                switch (_context3.prev = _context3.next) {
-                  case 0:
-                    topo.exitEditMode();
+              while (1) switch (_context3.prev = _context3.next) {
+                case 0:
+                  topo.exitEditMode();
 
-                  case 1:
-                  case "end":
-                    return _context3.stop();
-                }
+                case 1:
+                case "end":
+                  return _context3.stop();
               }
             }, _callee3);
           }));

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

@@ -1,39 +1,43 @@
-import React, { useEffect } from 'react';
-var ht = window.ht; // 快捷键
+import hotkeys from 'hotkeys-js';
+import { useEffect } from 'react';
+import { handleCopyHotkey, handlePasteHotkey } from "../utils/copyElementUtil";
 
-export default function useKeyboardShortcut(props) {
+function initKeyboardShortcuts(props) {
   var topo = props.topo,
-      topoEdit = props.topoEdit;
-  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');
-      }
-    };
+      topoEdit = props.topoEdit; // 撤销
+
+  hotkeys('ctrl+z, command+z', function (event) {
+    topo.historyManager.undo();
+  }); // 重做
+
+  hotkeys('ctrl+y, command+y', function (event) {}); // 空格：切换选择/移动
+
+  hotkeys('space', function (event) {
+    var _topo$store$getModelS = topo.store.getModelState('topoEdit'),
+        viewMouseMode = _topo$store$getModelS.viewMouseMode;
+
+    topoEdit.setViewMouseMode(viewMouseMode === 'select' ? 'move' : 'select');
+  }); // 复制
 
-    window.addEventListener('keydown', handleKeyDown);
+  hotkeys('ctrl+c, command+c', function (event) {
+    return handleCopyHotkey(event, props);
+  }); // 粘贴
+
+  hotkeys('ctrl+v, command+v', function (event) {
+    return handlePasteHotkey(event, props);
+  });
+}
+
+function unbindKeyboardShortcuts(props) {
+  hotkeys.unbind();
+} // 快捷键
+
+
+export default function useKeyboardShortcut(props) {
+  useEffect(function () {
+    initKeyboardShortcuts(props);
     return function () {
-      window.removeEventListener('keydown', handleKeyDown);
+      unbindKeyboardShortcuts(props);
     };
   }, []);
 }

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

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

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

@@ -36,17 +36,15 @@ export default {
 
         return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
           return _regeneratorRuntime.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/es/core/editor/store/topoEdit.js

@@ -37,12 +37,10 @@ export default function (topo) {
         init: function init(payload, rootState) {
           return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
             return _regeneratorRuntime.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);
           }))();