@luck-design-biz/luckda 1.0.6-13tl → 1.0.7

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

@@ -1,11 +1,13 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React, { createContext } from 'react';
 import { useRequest, useSetState, useAsyncEffect, useMemoizedFn, useCreation, useUnmount } from 'ahooks';
 import { history } from 'umi';
+import { values } from 'lodash';
 import launcher from "../launcher";
 import { LuckDaContext } from "../../../components/Builder";
 import { doAction as doActionUtils } from "../../../helper/action";
@@ -23,12 +25,10 @@ export default (function (_ref) {
   var _usePageDataStore = usePageDataStore(function (state) {
       return {
         initialize: state.initialize,
-        initializeModule: state.initializeModule,
         reset: state.reset
       };
     }),
     initialize = _usePageDataStore.initialize,
-    initializeModule = _usePageDataStore.initializeModule,
     reset = _usePageDataStore.reset;
   var _useTemporalStore = useTemporalStore(function (state) {
       return {
@@ -70,7 +70,6 @@ export default (function (_ref) {
           setRemoteSource({
             module: data
           });
-          initializeModule(data);
         }
       }
     }),
@@ -153,7 +152,7 @@ export default (function (_ref) {
     }),
     runFetchAllBehaviorExport = _useRequest6.run;
   useAsyncEffect( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-    var fetchPageDataRes, data, list, detail, source;
+    var fetchPageDataRes, data, list, detail, source, _pageData;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -173,16 +172,17 @@ export default (function (_ref) {
             break;
           }
           history.replace('/404');
-          _context.next = 20;
+          _context.next = 21;
           break;
         case 9:
-          source = detail[list[0]].source;
           setMetaAttrs(META_TAG_NAME, data);
-          _context.next = 13;
+          source = detail[list[0]].source;
+          _pageData = decompress(source);
+          _context.next = 14;
           return runFetchModlueData(data.dataModelKey, {
-            moduleCode: data.moduleCode
+            moduleCode: [data.moduleCode].concat(_toConsumableArray(values(_pageData.props.proxy))).join(',')
           });
-        case 13:
+        case 14:
           runFetchAllBehaviorImport({
             behaviorMode: 'IMPORT',
             moduleCode: data.moduleCode
@@ -197,11 +197,9 @@ export default (function (_ref) {
           runFetchAllSerials({
             uid: data.moduleId
           });
-          initialize(decompress(source));
+          initialize(_pageData);
           resume();
           eventBus.$publisher(PAGE_LOAD_MOUNT);
-        case 20:
-          ;
         case 21:
         case "end":
           return _context.stop();

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

@@ -1,9 +1,10 @@
 import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _construct from "@babel/runtime/helpers/esm/construct";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _typeof from "@babel/runtime/helpers/esm/typeof";
-import { omit, isNil, isString, isArray, has, get } from 'lodash';
+import { omit, isNil, isString, isArray, has, get, cloneDeep, groupBy, keyBy, each } from 'lodash';
 import postcss from 'postcss';
 import { META_TAG_NAME } from "../../constants";
 export function isPromise(value) {
@@ -166,22 +167,36 @@ export function setMetaAttrs(name, data) {
   meta.content = isString(data) ? data : new URLSearchParams(data).toString().replaceAll('&', ',');
   document.head.appendChild(meta);
 }
+function normalize(val) {
+  if (val === 'null') return null;
+  if (val === 'undefined') return undefined;
+  if (val === 'true') return true;
+  if (val === 'false') return false;
+  if (/^-?\d+(\.\d+)?$/.test(val)) return Number(val);
+  return val;
+}
 export function getMetaAttr(name, _) {
   if (isNil(name)) return void 0;
   var meta = document.querySelector("meta[name=\"".concat(name, "\"]"));
+  if (isNil(meta)) return void 0;
   if (meta.content.includes(',')) {
     var data = new URLSearchParams(meta.content.replaceAll(',', '&'));
     if (isNil(_)) {
-      return Object.fromEntries(data.entries());
+      return Object.fromEntries(Array.from(data.entries()).map(function (_ref) {
+        var _ref2 = _slicedToArray(_ref, 2),
+          k = _ref2[0],
+          v = _ref2[1];
+        return [k, normalize(v)];
+      }));
     }
     if (isArray(_)) {
       return _.map(function (n) {
-        return data.get(n);
+        return normalize(data.get(n));
       });
     }
-    return data.get(_);
+    return normalize(data.get(_));
   }
-  return meta.content;
+  return normalize(meta.content);
 }
 export function getLDMetaAttr(_) {
   return getMetaAttr(META_TAG_NAME, _);
@@ -262,4 +277,28 @@ export function findFirstLeafNode(node) {
     _iterator2.f();
   }
   return null;
+}
+export function dataToTree(data, params) {
+  var _ref3 = params || {},
+    _ref3$parentKey = _ref3.parentKey,
+    parentKey = _ref3$parentKey === void 0 ? 'parentId' : _ref3$parentKey,
+    _ref3$childKey = _ref3.childKey,
+    childKey = _ref3$childKey === void 0 ? 'children' : _ref3$childKey,
+    _ref3$rootId = _ref3.rootId,
+    rootId = _ref3$rootId === void 0 ? '0' : _ref3$rootId,
+    _ref3$id = _ref3.id,
+    id = _ref3$id === void 0 ? 'id' : _ref3$id,
+    _ref3$stain = _ref3.stain,
+    stain = _ref3$stain === void 0 ? false : _ref3$stain;
+  var _data = stain ? data : cloneDeep(data);
+  var groupedByParents = groupBy(_data, parentKey);
+  var itemsById = keyBy(_data, id);
+  try {
+    each(omit(groupedByParents, rootId), function (children, parentId) {
+      itemsById[parentId][childKey] = children;
+    });
+  } catch (e) {
+    console.error('helper.dataToTree error', e);
+  }
+  return groupedByParents[rootId];
 }

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

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

package/es/lowcode/painter/Design.js

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

package/es/lowcode/painter/DesignOperator.js

@@ -1,12 +1,13 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React, { useRef, useEffect, useState } from 'react';
+import { getCreateHistoryOptions } from 'umi';
 import { last, initial } from 'lodash';
-import { useEventListener, useSetState, useMemoizedFn, useCreation, useSize, useLatest, useKeyPress } from 'ahooks';
+import { useEventListener, useSetState, useMemoizedFn, useCreation, useSize, useLatest } from 'ahooks';
 import { Icon, Dropdown, message } from 'luck-design/antd';
-import { reverse, isString, isNil } from 'lodash';
+import { reverse, isString, isNil, omit } from 'lodash';
 import classNames from 'classnames';
 import { suid } from '@luck-design-biz/base/utils';
-import { useContext, addNode, deleteNode } from "../engine/provider/ContextProvider";
+import { useContext, addNode, deleteNode, moveNode, useTemporalStore } from "../engine/provider/ContextProvider";
 import { LC_BUILDIN_UNIT_KEY, LC_COMPONENT_UNIT_KEY, LC_COMPONENT_UNIT, LC_FORMITEM_UNIT, CONTAINER_UNITS } from "../constants";
 import styles from "./style/design.less";
 var _MODAL_COMPONENT_ = ['Dialog', 'Drawer'];
@@ -43,6 +44,18 @@ var DesignOperator = function DesignOperator(_ref) {
     setOperatorId = _useSetState2[1];
   var lastSelectorId = useLatest(operatorId.selector);
   var currentModal = useRef(null);
+  var _useTemporalStore = 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 = useMemoizedFn(function (_target) {
     var _context$componentMap;
     return isString(_target) ? (_context$componentMap = context.componentMap.get(_target)) === null || _context$componentMap === void 0 ? void 0 : _context$componentMap.api.getSelfDom() : _target;
@@ -63,9 +76,109 @@ var DesignOperator = function DesignOperator(_ref) {
       id: id
     });
   });
+  var handleShortcutEmit = 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 = 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 (CONTAINER_UNITS.includes(parent === null || parent === void 0 ? void 0 : parent.props.component)) {
+            addComponent(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) {
+              moveNode(_parent3.children[_index], _parent3.children[_index - 1], 'left');
+            } else if (key === 'alt.rightarrow' && _index < _parent3.children.length - 1) {
+              moveNode(_parent3.children[_index], _parent3.children[_index + 1], 'right');
+            }
+          }
+        }
+        break;
+      default:
+        break;
+    }
+  });
   var addComponent = 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
@@ -126,19 +239,6 @@ var DesignOperator = function DesignOperator(_ref) {
     var _last;
     return operatorId.detector && isString(operatorId.detector) ? (_last = last(context.componentMap.get(operatorId.detector).api.getLevelNodes())) === null || _last === void 0 ? void 0 : _last.name : void 0;
   }, [operatorId.detector]);
-  useKeyPress('backspace', function () {
-    if (operatorId.selector && operatorId.deletable) {
-      handleDelete({
-        id: operatorId.selector
-      });
-    }
-  }, {
-    target: canvas
-  });
-  useKeyPress('ctrl.s', function (e) {
-    e.preventDefault();
-    context.$publisher(context.topics.DESIGN_OPERATE_SAVE);
-  });
   useEventListener('mousemove', function (event) {
     var elem = event.target;
     var targetFormItem = elem.closest("[".concat(LC_COMPONENT_UNIT_KEY, "=\"").concat(LC_FORMITEM_UNIT, "\"]"));
@@ -201,11 +301,11 @@ var DesignOperator = function DesignOperator(_ref) {
     target: canvas
   });
   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
@@ -261,9 +361,9 @@ 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) {
         var _canvas$current2;
         (_canvas$current2 = canvas.current) === null || _canvas$current2 === void 0 || _canvas$current2.style.setProperty('overflow', 'hidden');
@@ -283,19 +383,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();
       }
       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);
     };
   }, []);
   useEffect(function () {