@luck-design-biz/luckda 0.0.25-8 → 0.0.25-af-1

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

@@ -1,11 +1,12 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import { useRef, useState, useCallback } from 'react';
-import { useUpdateLayoutEffect } from 'ahooks';
+import { useRef, useCallback } from 'react';
+import { useResetState, useDeepCompareEffect } from 'ahooks';
 var usePromiseState = function usePromiseState(initialState) {
-  var _useState = useState(initialState),
-    _useState2 = _slicedToArray(_useState, 2),
-    state = _useState2[0],
-    setState = _useState2[1];
+  var _useResetState = useResetState(initialState),
+    _useResetState2 = _slicedToArray(_useResetState, 3),
+    state = _useResetState2[0],
+    setState = _useResetState2[1],
+    resetState = _useResetState2[2];
   var promiseRef = useRef(null);
   var setStatePromise = useCallback(function (_state) {
     return new Promise(function (resolve) {
@@ -13,12 +14,12 @@ var usePromiseState = function usePromiseState(initialState) {
       setState(_state);
     });
   }, []);
-  useUpdateLayoutEffect(function () {
+  useDeepCompareEffect(function () {
     if (promiseRef.current) {
       promiseRef.current(state);
       promiseRef.current = null;
     }
   }, [state]);
-  return [state, setStatePromise];
+  return [state, setStatePromise, resetState];
 };
 export default usePromiseState;

package/es/lowcode/index.js

@@ -1,6 +1,5 @@
 export { default as Painter } from "./painter";
 export { default as View } from "./view";
-export { default as Preview } from "./preview";
 // export * as dataProcess  from './engine/tools/dataProcess';
 
 export default function launcher() {}

package/es/lowcode/painter/Components.js

@@ -1,15 +1,12 @@
-import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React, { useState } from 'react';
 import { Icon, Input, Tabs } from 'luck-design/antd';
 import { useMemoizedFn, useCreation } from 'ahooks';
 import { formatMessage } from '@luck-design-biz/base/utils';
-import { useContext } from "../engine/provider/ContextProvider";
-import { useDraggable } from '@dnd-kit/core';
+import { useLDContext } from "../engine/provider/ContextProvider";
 import styles from "./style/components.less";
 import data from "../engine/meta/components-list.json";
-import { Action } from "./components/DragDrop/DragDropContext";
 var TabPane = Tabs.TabPane;
 var Search = Input.Search;
 var BaseCom = function BaseCom(_ref) {
@@ -31,7 +28,7 @@ var BaseCom = function BaseCom(_ref) {
     }).filter(function (group) {
       return group.components.length > 0;
     });
-  }, [searchTerm]);
+  }, [data]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: styles['components-search']
   }, /*#__PURE__*/React.createElement(Search, {
@@ -47,53 +44,30 @@ var BaseCom = function BaseCom(_ref) {
       key: group.group,
       className: styles['components-wrapper']
     }, /*#__PURE__*/React.createElement("h3", null, group.groupName), group.components.map(function (item) {
-      return /*#__PURE__*/React.createElement(CompItem, {
+      return /*#__PURE__*/React.createElement("div", {
         key: item.component,
-        item: item,
-        onComponentClick: onComponentClick
-      });
+        className: styles['components-item'],
+        onClick: function onClick() {
+          return onComponentClick(item);
+        }
+      }, /*#__PURE__*/React.createElement("div", {
+        className: styles['icon-wrapper']
+      }, /*#__PURE__*/React.createElement(Icon, {
+        type: item.icon || 'home'
+      })), /*#__PURE__*/React.createElement("div", {
+        className: styles['text-content']
+      }, /*#__PURE__*/React.createElement("span", null, item.name)));
     }));
   })));
 };
-var CompItem = function CompItem(_ref2) {
-  var item = _ref2.item,
-    onComponentClick = _ref2.onComponentClick;
-  // console.log('CompItem', item.component);
-  var _useDraggable = useDraggable({
-      id: 'comlist-' + item.component,
-      data: {
-        component: item,
-        action: Action.ADD
-      }
-    }),
-    attributes = _useDraggable.attributes,
-    listeners = _useDraggable.listeners,
-    transform = _useDraggable.transform,
-    setNodeRef = _useDraggable.setNodeRef;
-  return /*#__PURE__*/React.createElement("div", _extends({
-    ref: setNodeRef
-  }, listeners, attributes, {
-    key: item.component,
-    className: styles['components-item'],
-    onClick: function onClick() {
-      return onComponentClick(item);
-    }
-  }), /*#__PURE__*/React.createElement("div", {
-    className: styles['icon-wrapper']
-  }, /*#__PURE__*/React.createElement(Icon, {
-    type: item.icon || 'home'
-  })), /*#__PURE__*/React.createElement("div", {
-    className: styles['text-content']
-  }, /*#__PURE__*/React.createElement("span", null, item.name)));
-};
 
-/**
- * 组件清单
+/**
+ * 组件清单
  */
-var Components = function Components(_ref3) {
-  var _ref3$dataset = _ref3.dataset,
-    dataset = _ref3$dataset === void 0 ? 'test' : _ref3$dataset;
-  var context = useContext();
+var Components = function Components(_ref2) {
+  var _ref2$dataset = _ref2.dataset,
+    dataset = _ref2$dataset === void 0 ? 'test' : _ref2$dataset;
+  var context = useLDContext();
   var onComponentClick = useMemoizedFn(function (data) {
     context.$publisher(context.topics.COMPONENT_SETTING_CLICK, {
       data: data
@@ -121,10 +95,10 @@ var Components = function Components(_ref3) {
     onComponentClick: onComponentClick
   })), /*#__PURE__*/React.createElement(TabPane, {
     tab: formatMessage({
-      id: 'ccm.dev.page.set.components.custom',
-      label: '自定义组件'
+      id: 'ccm.dev.page.set.components.dataset',
+      label: '数据集字段'
     }),
     key: "dataset"
-  }, "\u656C\u8BF7\u671F\u5F85")));
+  })));
 };
 export default Components;

package/es/lowcode/painter/Design.js

@@ -1,11 +1,9 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import React, { useRef, useState, useEffect } from 'react';
-import { RawIntlProvider, getLocale, getIntl, localeInfo, history } from 'umi';
+import React, { useRef, useState } from 'react';
+import { RawIntlProvider, getLocale, getIntl, localeInfo } from 'umi';
 import { useMemoizedFn } from 'ahooks';
 import moment from 'moment';
 import { ConfigProvider } from 'luck-design/antd';
-import { formatMessage } from '@luck-design-biz/base/utils';
-import { useRemoteSource } from "../engine/provider/ContextProvider";
 import DesignToolbar from "./DesignToolbar";
 import DesignOperator from "./DesignOperator";
 import Page from "../view/Page";
@@ -13,7 +11,6 @@ import styles from "./style/design.less";
 var Design = function Design() {
   var _localeInfo$locale;
   var simulatorRef = useRef(null);
-  var remoteSource = useRemoteSource();
   var _useState = useState(function () {
       return getLocale();
     }),
@@ -26,35 +23,6 @@ var Design = function Design() {
     _useState4 = _slicedToArray(_useState3, 2),
     intl = _useState4[0],
     setIntl = _useState4[1];
-  var unblock = useMemoizedFn(function () {
-    if (remoteSource.backLength > 0) return confirm("".concat(formatMessage({
-      id: 'app.base.operate.comfire.leave',
-      label: '离开当前页面？'
-    }), "\n").concat(formatMessage({
-      id: 'app.base.operate.comfire.message.leave',
-      label: '系统可能不会保存您所做的更改。'
-    })));
-    return true;
-  });
-  var handleBeforeUnload = useMemoizedFn(function (event) {
-    if (remoteSource.backLength > 0) {
-      event.preventDefault();
-      event.returnValue = null;
-      return null;
-    }
-  });
-  useEffect(function () {
-    window.addEventListener('beforeunload', handleBeforeUnload);
-    history.block(function () {
-      return unblock();
-    });
-    return function () {
-      window.removeEventListener('beforeunload', handleBeforeUnload);
-      history.block(function () {
-        return true;
-      });
-    };
-  }, []);
   var handleLangChange = useMemoizedFn(function (_locale) {
     if (moment !== null && moment !== void 0 && moment.locale) {
       var _localeInfo$_locale;

package/es/lowcode/painter/DesignOperator.js

@@ -3,14 +3,14 @@ import React, { useRef, useEffect, useState } from 'react';
 import { last, initial } from 'lodash';
 import { useEventListener, useSetState, useMemoizedFn, useCreation, useSize, useLatest } from 'ahooks';
 import { Icon, Dropdown, message } from 'luck-design/antd';
-import { reverse } from 'lodash';
+import { cloneDeep, reverse } from 'lodash';
 import { suid } from '@luck-design-biz/base/utils';
-import { useContext, addNode, deleteNode } from "../engine/provider/ContextProvider";
-import { LC_BUILDIN_UNIT_KEY, LC_COMPONENT_UNIT_KEY, LC_COMPONENT_UNIT, CONTAINER_UNITS } from "../constants";
+import { useLDContext } from "../engine/provider/ContextProvider";
+import { add, deleteById } from "../engine/tools/dataProcess";
+import { CELL_KEY, CELL_CLASS_NAME } from "../constants";
 import styles from "./style/design.less";
 var _MODAL_COMPONENT_ = ['Dialog', 'Drawer'];
 var getOperatorStyle = function getOperatorStyle(page, cellNode) {
-  if (!cellNode) return {};
   var _page$getBoundingClie = page.getBoundingClientRect(),
     pageLeft = _page$getBoundingClie.left,
     pageTop = _page$getBoundingClie.top;
@@ -27,7 +27,7 @@ var getOperatorStyle = function getOperatorStyle(page, cellNode) {
 var DesignOperator = function DesignOperator(_ref) {
   var _getDomById, _getDomById2;
   var target = _ref.target;
-  var context = useContext();
+  var context = useLDContext();
   var size = useSize(target);
   var _useState = useState(suid()),
     _useState2 = _slicedToArray(_useState, 2),
@@ -43,8 +43,7 @@ var DesignOperator = function DesignOperator(_ref) {
   var lastSelectorId = useLatest(operatorId.selector);
   var currentModal = useRef(null);
   var getDomById = useMemoizedFn(function (id) {
-    var _context$componentMap;
-    return (_context$componentMap = context.componentMap.get(id)) === null || _context$componentMap === void 0 ? void 0 : _context$componentMap.api.getSelfDom();
+    return context.componentMap.get(id).dom;
   });
   var handleSelect = useMemoizedFn(function (_key) {
     context.$publisher(context.topics.COMPONENT_ACTIVE, _key ? {
@@ -57,26 +56,34 @@ var DesignOperator = function DesignOperator(_ref) {
     } : null);
   });
   var handleDelete = useMemoizedFn(function (_ref2) {
-    var id = _ref2.id;
-    context.$publisher(context.topics.COMPONENT_DELETE, {
-      id: id
+    var id = _ref2.id,
+      parentId = _ref2.parentId;
+    context.$publisher(context.topics.COMPONENT_ACTIVE, null);
+    var cloneData = cloneDeep(context.pageData);
+    deleteById(cloneData, id);
+    context._setPageData(cloneData).then(function (newData) {
+      context.$publisher(context.topics.COMPONENT_DELETE, {
+        id: id,
+        parentId: parentId,
+        pageData: newData
+      });
     });
   });
   var addComponent = useMemoizedFn(function (data, targetId) {
+    var json = require("../engine/meta/".concat(data.component.toLowerCase(), ".props.default.json"));
+    var _id = "".concat(data.component.toLowerCase(), "_").concat(suid());
+    var cloneData = cloneDeep(context.pageData);
+    add(cloneData, targetId, _id, json);
     context.$subscriber(context.topics.COMPONENT_MOUNT).once(function (_ref3) {
       var mountCompId = _ref3.id;
       if (mountCompId === _id) {
         context.$publisher(context.topics.COMPONENT_APPEND, {
-          id: _id
-        });
-        context.$publisher(context.topics.COMPONENT_ACTIVE, {
-          id: _id
+          id: _id,
+          pageData: cloneData
         });
       }
     }).watch();
-    var json = require("../engine/meta/".concat(data.component.toLowerCase(), ".props.default.json"));
-    var _id = "".concat(data.component.toLowerCase(), "_").concat(suid());
-    addNode(targetId, _id, json);
+    context._setPageData(cloneData);
   });
   var acticeProps = useCreation(function () {
     if (!operatorId.selector) return null;
@@ -107,7 +114,7 @@ var DesignOperator = function DesignOperator(_ref) {
   }, [operatorId.detector]);
   useEventListener('mousemove', function (event) {
     var elem = event.target;
-    var targetCell = elem.closest("[".concat(LC_COMPONENT_UNIT_KEY, "=\"").concat(LC_COMPONENT_UNIT, "\"]"));
+    var targetCell = elem.closest(".".concat(CELL_CLASS_NAME));
     var targetCellId = targetCell === null || targetCell === void 0 ? void 0 : targetCell.id;
     if (targetCellId && targetCellId !== operatorId.detector && targetCellId !== operatorId.selector) {
       setOperatorId({
@@ -137,7 +144,7 @@ var DesignOperator = function DesignOperator(_ref) {
   });
   useEventListener('click', function (event) {
     var elem = event.target;
-    var targetCell = elem.closest("[".concat(LC_COMPONENT_UNIT_KEY, "=\"").concat(LC_COMPONENT_UNIT, "\"]"));
+    var targetCell = elem.closest(".".concat(CELL_CLASS_NAME));
     var targetCellId = targetCell === null || targetCell === void 0 ? void 0 : targetCell.id;
     if (!targetCellId || targetCellId === operatorId.selector) return;
     context.$publisher(context.topics.COMPONENT_HOVER, null);
@@ -161,14 +168,14 @@ var DesignOperator = function DesignOperator(_ref) {
             id: compId
           });
         }).watch();
-        addComponent(data, LC_BUILDIN_UNIT_KEY.PAGE_ROOT);
+        addComponent(data, CELL_KEY.PAGE_ROOT);
         return;
       }
       if (!lastSelectorId.current) {
         message.info('请在右侧画布选择节点');
         return;
       }
-      if (!CONTAINER_UNITS.includes(context.componentMap.get(lastSelectorId.current).meta.component)) {
+      if (context.componentMap.get(lastSelectorId.current).dom.getAttribute('name') !== 'box') {
         message.info('该节点不支持添加子节点');
         return;
       }
@@ -183,10 +190,8 @@ var DesignOperator = function DesignOperator(_ref) {
     }).watch();
     var acid = context.$subscriber(context.topics.COMPONENT_ACTIVE).on(function (payload) {
       if (payload.id) {
-        var node = context.componentMap.get(payload.id).api.getSelfData();
         setOperatorId({
           selector: payload.id,
-          deletable: !node || node.props.buildIn !== true,
           detector: null
         });
       } else {
@@ -198,36 +203,25 @@ var DesignOperator = function DesignOperator(_ref) {
     var cmtid = context.$subscriber(context.topics.COMPONENT_MODAL_TOGGLE).on(function (_ref6) {
       var toggle = _ref6.toggle,
         id = _ref6.id;
-      if (toggle && id !== currentModal.current) {
+      if (toggle) {
         target.current.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) {
+      } else {
         target.current.style.removeProperty('overflow');
-        var _id = id || currentModal.current;
-        if (_id) {
-          var _modal2 = context.componentMap.get(_id);
-          _modal2.api.doClose();
-          currentModal.current = void 0;
-        }
+        var _modal2 = context.componentMap.get(id || currentModal.current);
+        _modal2.api.doClose();
+        currentModal.current = void 0;
       }
     }).watch();
-    var cdid = context.$subscriber(context.topics.COMPONENT_DELETE).on(function (_ref7) {
-      var id = _ref7.id;
-      if (lastSelectorId.current === id) {
-        context.$publisher(context.topics.COMPONENT_ACTIVE, null);
-      }
-      deleteNode(id);
-    });
     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);
     };
   }, []);
   useEffect(function () {
@@ -241,7 +235,7 @@ var DesignOperator = function DesignOperator(_ref) {
   return /*#__PURE__*/React.createElement(React.Fragment, null, operatorId.detector && /*#__PURE__*/React.createElement("div", {
     id: "lc-detector",
     className: styles['lc-painter-design-detector'],
-    style: getOperatorStyle(target.current, getDomById(operatorId.detector), 'detector', operatorId.detector)
+    style: getOperatorStyle(target.current, getDomById(operatorId.detector))
   }, /*#__PURE__*/React.createElement("span", {
     className: styles['lc-painter-design-detector-name'],
     style: {
@@ -251,10 +245,10 @@ var DesignOperator = function DesignOperator(_ref) {
     id: "lc-selector",
     key: "".concat((size === null || size === void 0 ? void 0 : size.width) || 0, "-").concat((size === null || size === void 0 ? void 0 : size.height) || 0, "-").concat(positionKey),
     className: styles['lc-painter-design-selector'],
-    style: getOperatorStyle(target.current, getDomById(operatorId.selector), 'selector', operatorId.selector)
+    style: getOperatorStyle(target.current, getDomById(operatorId.selector))
   }, acticeProps && /*#__PURE__*/React.createElement("div", {
     className: styles['lc-borders-actions'],
-    style: acticeProps.props.id === LC_BUILDIN_UNIT_KEY.PAGE_ROOT ? {
+    style: acticeProps.props.id === CELL_KEY.PAGE_ROOT ? {
       top: 0
     } : ((_getDomById2 = getDomById(operatorId.selector)) === null || _getDomById2 === void 0 ? void 0 : _getDomById2.offsetTop) < 23 ? {
       bottom: '-23px'
@@ -266,7 +260,7 @@ var DesignOperator = function DesignOperator(_ref) {
     placement: "bottomLeft"
   }, /*#__PURE__*/React.createElement("div", {
     className: "instance-node-selector"
-  }, acticeProps.props.name)), operatorId.deletable && /*#__PURE__*/React.createElement("div", {
+  }, acticeProps.props.name)), /*#__PURE__*/React.createElement("div", {
     onClick: function onClick() {
       return handleDelete(acticeProps.props);
     }