@luck-design-biz/luckda 1.0.2-2 → 1.0.2-20temp

package/lib/lowcode/engine/provider/RemoteSourceProvider.js

@@ -8,12 +8,14 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = exports.RemoteSourceContext = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _ahooks = require("ahooks");
 var _umi = require("umi");
+var _lodash = require("lodash");
 var _launcher = _interopRequireDefault(require("../launcher"));
 var _Builder = require("../../../components/Builder");
 var _action2 = require("../../../helper/action");
@@ -31,12 +33,10 @@ var _default = exports.default = function _default(_ref) {
   var _usePageDataStore = (0, _usePageDataStore2.default)(function (state) {
       return {
         initialize: state.initialize,
-        initializeModule: state.initializeModule,
         reset: state.reset
       };
     }),
     initialize = _usePageDataStore.initialize,
-    initializeModule = _usePageDataStore.initializeModule,
     reset = _usePageDataStore.reset;
   var _useTemporalStore = (0, _usePageDataStore2.useTemporalStore)(function (state) {
       return {
@@ -78,7 +78,6 @@ var _default = exports.default = function _default(_ref) {
           setRemoteSource({
             module: data
           });
-          initializeModule(data);
         }
       }
     }),
@@ -161,7 +160,7 @@ var _default = exports.default = function _default(_ref) {
     }),
     runFetchAllBehaviorExport = _useRequest6.run;
   (0, _ahooks.useAsyncEffect)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
-    var fetchPageDataRes, data, list, detail, source;
+    var fetchPageDataRes, data, list, detail, source, _pageData;
     return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -181,16 +180,17 @@ var _default = exports.default = function _default(_ref) {
             break;
           }
           _umi.history.replace('/404');
-          _context.next = 20;
+          _context.next = 21;
           break;
         case 9:
-          source = detail[list[0]].source;
           (0, _helper.setMetaAttrs)(_constants.META_TAG_NAME, data);
-          _context.next = 13;
+          source = detail[list[0]].source;
+          _pageData = (0, _dataProcess.decompress)(source);
+          _context.next = 14;
           return runFetchModlueData(data.dataModelKey, {
-            moduleCode: data.moduleCode
+            moduleCode: [data.moduleCode].concat((0, _toConsumableArray2.default)((0, _lodash.values)(_pageData.props.proxy))).join(',')
           });
-        case 13:
+        case 14:
           runFetchAllBehaviorImport({
             behaviorMode: 'IMPORT',
             moduleCode: data.moduleCode
@@ -205,11 +205,9 @@ var _default = exports.default = function _default(_ref) {
           runFetchAllSerials({
             uid: data.moduleId
           });
-          initialize((0, _dataProcess.decompress)(source));
+          initialize(_pageData);
           resume();
           eventBus.$publisher(_eventTopics.PAGE_LOAD_MOUNT);
-        case 20:
-          ;
         case 21:
         case "end":
           return _context.stop();

package/lib/lowcode/engine/tools/helper.js

@@ -4,6 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.dataToTree = dataToTree;
 exports.executeCode = executeCode;
 exports.extractKeywords = extractKeywords;
 exports.findFirstLeafNode = findFirstLeafNode;
@@ -282,4 +283,28 @@ function findFirstLeafNode(node) {
     _iterator2.f();
   }
   return null;
+}
+function dataToTree(data, params) {
+  var _ref = params || {},
+    _ref$parentKey = _ref.parentKey,
+    parentKey = _ref$parentKey === void 0 ? 'parentId' : _ref$parentKey,
+    _ref$childKey = _ref.childKey,
+    childKey = _ref$childKey === void 0 ? 'children' : _ref$childKey,
+    _ref$rootId = _ref.rootId,
+    rootId = _ref$rootId === void 0 ? '0' : _ref$rootId,
+    _ref$id = _ref.id,
+    id = _ref$id === void 0 ? 'id' : _ref$id,
+    _ref$stain = _ref.stain,
+    stain = _ref$stain === void 0 ? false : _ref$stain;
+  var _data = stain ? data : (0, _lodash.cloneDeep)(data);
+  var groupedByParents = (0, _lodash.groupBy)(_data, parentKey);
+  var itemsById = (0, _lodash.keyBy)(_data, id);
+  try {
+    (0, _lodash.each)((0, _lodash.omit)(groupedByParents, rootId), function (children, parentId) {
+      itemsById[parentId][childKey] = children;
+    });
+  } catch (e) {
+    console.error('helper.dataToTree error', e);
+  }
+  return groupedByParents[rootId];
 }

package/lib/lowcode/engine/tools/initDS.js

@@ -147,8 +147,8 @@ var wrapPromise = function wrapPromise(promise) {
     }
   };
 };
-function initialize(ctx) {
-  var pageVars = _usePageDataStore.default.getState().pageData.props.vars;
+function initialize(ctx, proxyCode) {
+  var pageVars = _usePageDataStore.default.getState()[proxyCode || 'pageData'].props.vars;
   if ((0, _lodash.isNil)(pageVars)) return null;
   var remoteApis = new Map();
   var _reduce = (0, _lodash.reduce)(pageVars, function (ret, val) {
@@ -177,8 +177,8 @@ function initialize(ctx) {
     _reduce2 = (0, _toArray2.default)(_reduce),
     variables = _reduce2[0],
     autoTasks = _reduce2.slice(1);
-  _usePageVar.useStateStore.getState().initialize(variables);
-  ctx._initRemoteApiMap(remoteApis);
+  _usePageVar.useStateStore.getState().initialize(variables, !!proxyCode);
+  ctx._initRemoteApiMap(remoteApis, !!proxyCode);
   function run() {
     return _run2.apply(this, arguments);
   }

package/lib/lowcode/painter/Design.js

@@ -73,6 +73,7 @@ var Design = function Design() {
   return /*#__PURE__*/_react.default.createElement("div", {
     className: _design.default['lc-painter-design']
   }, /*#__PURE__*/_react.default.createElement(_DesignToolbar.default, {
+    canvas: simulatorRef,
     locale: locale,
     onLangChange: handleLangChange
   }), /*#__PURE__*/_react.default.createElement("div", {

package/lib/lowcode/painter/DesignOperator.js

@@ -8,6 +8,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
+var _umi = require("umi");
 var _lodash = require("lodash");
 var _ahooks = require("ahooks");
 var _antd = require("luck-design/antd");
@@ -50,6 +51,18 @@ var DesignOperator = function DesignOperator(_ref) {
     setOperatorId = _useSetState2[1];
   var lastSelectorId = (0, _ahooks.useLatest)(operatorId.selector);
   var currentModal = (0, _react.useRef)(null);
+  var _useTemporalStore = (0, _ContextProvider.useTemporalStore)(function (state) {
+      return {
+        undo: state.undo,
+        redo: state.redo,
+        pastStates: state.pastStates,
+        futureStates: state.futureStates
+      };
+    }),
+    canUndo = _useTemporalStore.canUndo,
+    canRedo = _useTemporalStore.canRedo,
+    undo = _useTemporalStore.undo,
+    redo = _useTemporalStore.redo;
   var getElement = (0, _ahooks.useMemoizedFn)(function (_target) {
     var _context$componentMap;
     return (0, _lodash.isString)(_target) ? (_context$componentMap = context.componentMap.get(_target)) === null || _context$componentMap === void 0 ? void 0 : _context$componentMap.api.getSelfDom() : _target;
@@ -70,9 +83,109 @@ var DesignOperator = function DesignOperator(_ref) {
       id: id
     });
   });
+  var handleShortcutEmit = (0, _ahooks.useMemoizedFn)(function (_ref3) {
+    var key = _ref3.key;
+    switch (key) {
+      case 'meta.s':
+      case 'ctrl.s':
+        context.$publisher(context.topics.DESIGN_OPERATE_SAVE);
+        break;
+      case 'meta.p':
+      case 'ctrl.p':
+        {
+          var _getCreateHistoryOpti = (0, _umi.getCreateHistoryOptions)(),
+            basename = _getCreateHistoryOpti.basename;
+          var previewUrl = "".concat(basename === '/' ? '' : basename, "/byteman/preview/").concat(context.router.getQuery('code'));
+          window.open(previewUrl, '_blank');
+        }
+        break;
+      case 'meta.z':
+      case 'ctrl.z':
+        canUndo && undo();
+        break;
+      case 'meta.shift.z':
+      case 'ctrl.shift.z':
+        canRedo && redo();
+        break;
+      case 'meta.c':
+      case 'ctrl.c':
+        if (operatorId.selector) {
+          var _context$$$api$getSel = context.$(operatorId.selector).api.getSelfAndParentData(),
+            node = _context$$$api$getSel.node,
+            parent = _context$$$api$getSel.parent;
+          if (_constants.CONTAINER_UNITS.includes(parent === null || parent === void 0 ? void 0 : parent.props.component)) {
+            addComponent((0, _lodash.omit)(node.props), parent.props.id);
+          }
+        }
+        break;
+      case 'backspace':
+        if (operatorId.selector && operatorId.deletable) {
+          handleDelete({
+            id: operatorId.selector
+          });
+        }
+        break;
+      case 'uparrow':
+        if (operatorId.selector) {
+          var _context$$$api$getSel2 = context.$(operatorId.selector).api.getSelfAndParentData(),
+            _parent = _context$$$api$getSel2.parent;
+          if (_parent) {
+            handleSelect(_parent.props.id);
+          }
+        }
+        break;
+      case 'downarrow':
+        if (operatorId.selector) {
+          var _node$children;
+          var _node = context.$(operatorId.selector).api.getSelfData();
+          if (_node !== null && _node !== void 0 && (_node$children = _node.children) !== null && _node$children !== void 0 && _node$children.length) {
+            handleSelect(_node.children[0]);
+          }
+        }
+        break;
+      case 'leftarrow':
+      case 'rightarrow':
+        if (operatorId.selector) {
+          var _parent2$children;
+          var _context$$$api$getSel3 = context.$(operatorId.selector).api.getSelfAndParentData(),
+            _parent2 = _context$$$api$getSel3.parent;
+          if (_parent2 !== null && _parent2 !== void 0 && (_parent2$children = _parent2.children) !== null && _parent2$children !== void 0 && _parent2$children.length) {
+            var index = _parent2.children.findIndex(function (c) {
+              return c === operatorId.selector;
+            });
+            if (key === 'leftarrow' && index > 0) {
+              handleSelect(_parent2.children[index - 1]);
+            } else if (key === 'rightarrow' && index < _parent2.children.length - 1) {
+              handleSelect(_parent2.children[index + 1]);
+            }
+          }
+        }
+        break;
+      case 'alt.leftarrow':
+      case 'alt.rightarrow':
+        if (operatorId.selector) {
+          var _parent3$children;
+          var _context$$$api$getSel4 = context.$(operatorId.selector).api.getSelfAndParentData(),
+            _parent3 = _context$$$api$getSel4.parent;
+          if (_parent3 !== null && _parent3 !== void 0 && (_parent3$children = _parent3.children) !== null && _parent3$children !== void 0 && _parent3$children.length) {
+            var _index = _parent3.children.findIndex(function (c) {
+              return c === operatorId.selector;
+            });
+            if (key === 'alt.leftarrow' && _index > 0) {
+              (0, _ContextProvider.moveNode)(_parent3.children[_index], _parent3.children[_index - 1], 'left');
+            } else if (key === 'alt.rightarrow' && _index < _parent3.children.length - 1) {
+              (0, _ContextProvider.moveNode)(_parent3.children[_index], _parent3.children[_index + 1], 'right');
+            }
+          }
+        }
+        break;
+      default:
+        break;
+    }
+  });
   var addComponent = (0, _ahooks.useMemoizedFn)(function (data, targetId) {
-    context.$subscriber(context.topics.COMPONENT_MOUNT).once(function (_ref3) {
-      var mountCompId = _ref3.id;
+    context.$subscriber(context.topics.COMPONENT_MOUNT).once(function (_ref4) {
+      var mountCompId = _ref4.id;
       if (mountCompId === _id) {
         context.$publisher(context.topics.COMPONENT_APPEND, {
           id: _id
@@ -121,10 +234,10 @@ var DesignOperator = function DesignOperator(_ref) {
     };
   }, [operatorId.selector]);
   var activeDomPosition = (0, _ahooks.useCreation)(function () {
-    var _getElement;
+    var _getElement, _canvas$current;
     if (!operatorId.selector && !operatorId.selectorTarget) return null;
     var targetTop = (_getElement = getElement((0, _lodash.isNil)(operatorId.selectorTarget) ? operatorId.selector : operatorId.selectorTarget.element)) === null || _getElement === void 0 ? void 0 : _getElement.getBoundingClientRect().top;
-    var delat = targetTop - canvas.current.getBoundingClientRect().top;
+    var delat = targetTop - (((_canvas$current = canvas.current) === null || _canvas$current === void 0 ? void 0 : _canvas$current.getBoundingClientRect().top) || 0);
     return {
       top: delat > 24 ? -24 : 0
     };
@@ -133,15 +246,6 @@ var DesignOperator = function DesignOperator(_ref) {
     var _last;
     return operatorId.detector && (0, _lodash.isString)(operatorId.detector) ? (_last = (0, _lodash.last)(context.componentMap.get(operatorId.detector).api.getLevelNodes())) === null || _last === void 0 ? void 0 : _last.name : void 0;
   }, [operatorId.detector]);
-  (0, _ahooks.useKeyPress)('backspace', function () {
-    if (operatorId.selector && operatorId.deletable) {
-      handleDelete({
-        id: operatorId.selector
-      });
-    }
-  }, {
-    target: canvas
-  });
   (0, _ahooks.useEventListener)('mousemove', function (event) {
     var elem = event.target;
     var targetFormItem = elem.closest("[".concat(_constants.LC_COMPONENT_UNIT_KEY, "=\"").concat(_constants.LC_FORMITEM_UNIT, "\"]"));
@@ -204,11 +308,11 @@ var DesignOperator = function DesignOperator(_ref) {
     target: canvas
   });
   (0, _react.useEffect)(function () {
-    var csid = context.$subscriber(context.topics.COMPONENT_SETTING_CLICK).on(function (_ref4) {
-      var data = _ref4.data;
+    var csid = context.$subscriber(context.topics.COMPONENT_SETTING_CLICK).on(function (_ref5) {
+      var data = _ref5.data;
       if (_MODAL_COMPONENT_.includes(data.component)) {
-        context.$subscriber(context.topics.COMPONENT_APPEND).once(function (_ref5) {
-          var compId = _ref5.id;
+        context.$subscriber(context.topics.COMPONENT_APPEND).once(function (_ref6) {
+          var compId = _ref6.id;
           context.$publisher(context.topics.COMPONENT_MODAL_TOGGLE, {
             toggle: true,
             id: compId
@@ -264,18 +368,20 @@ var DesignOperator = function DesignOperator(_ref) {
         });
       }
     }).watch();
-    var cmtid = context.$subscriber(context.topics.COMPONENT_MODAL_TOGGLE).on(function (_ref6) {
-      var toggle = _ref6.toggle,
-        id = _ref6.id;
+    var cmtid = context.$subscriber(context.topics.COMPONENT_MODAL_TOGGLE).on(function (_ref7) {
+      var toggle = _ref7.toggle,
+        id = _ref7.id;
       if (toggle && id !== currentModal.current) {
-        canvas.current.style.setProperty('overflow', 'hidden');
+        var _canvas$current2;
+        (_canvas$current2 = canvas.current) === null || _canvas$current2 === void 0 || _canvas$current2.style.setProperty('overflow', 'hidden');
         var _modal = context.componentMap.get(id);
         var _prevModal = currentModal.current ? context.componentMap.get(currentModal.current) : null;
         _prevModal === null || _prevModal === void 0 || _prevModal.api.doClose();
         _modal.api.doOpen();
         currentModal.current = id;
       } else if (!toggle) {
-        canvas.current.style.removeProperty('overflow');
+        var _canvas$current3;
+        (_canvas$current3 = canvas.current) === null || _canvas$current3 === void 0 || _canvas$current3.style.removeProperty('overflow');
         var _id = id || currentModal.current;
         if (_id) {
           var _modal2 = context.componentMap.get(_id);
@@ -284,19 +390,21 @@ var DesignOperator = function DesignOperator(_ref) {
         }
       }
     }).watch();
-    var cdid = context.$subscriber(context.topics.COMPONENT_DELETE).on(function (_ref7) {
-      var id = _ref7.id;
+    var cdid = context.$subscriber(context.topics.COMPONENT_DELETE).on(function (_ref8) {
+      var id = _ref8.id;
       if (lastSelectorId.current === id) {
         handleSelect();
       }
       (0, _ContextProvider.deleteNode)(id);
     });
+    var dseid = context.$subscriber(context.topics.DESIGN_SHORTCUT_EMIT).on(handleShortcutEmit);
     return function () {
       context.$unsubscriber(context.topics.COMPONENT_SETTING_CLICK, csid);
       context.$unsubscriber(context.topics.COMPONENT_HOVER, hcid);
       context.$unsubscriber(context.topics.COMPONENT_ACTIVE, acid);
       context.$unsubscriber(context.topics.MODAL_OPEN, cmtid);
       context.$unsubscriber(context.topics.COMPONENT_DELETE, cdid);
+      context.$unsubscriber(context.topics.COMPONENT_DELETE, dseid);
     };
   }, []);
   (0, _react.useEffect)(function () {