@luck-design-biz/luckda 0.0.24-2 → 0.0.25-2

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

@@ -1,24 +1,35 @@
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { useRef, useCallback } from 'react';
-import { useSafeState, useDeepCompareEffect } from 'ahooks';
+import { useHistoryTravel, useUpdateLayoutEffect } from 'ahooks';
+import { isEqual } from 'lodash';
 var usePromiseState = function usePromiseState(initialState) {
-  var _useSafeState = useSafeState(initialState),
-    _useSafeState2 = _slicedToArray(_useSafeState, 2),
-    state = _useSafeState2[0],
-    setState = _useSafeState2[1];
+  var _useHistoryTravel = useHistoryTravel(initialState),
+    value = _useHistoryTravel.value,
+    setValue = _useHistoryTravel.setValue,
+    backLength = _useHistoryTravel.backLength,
+    forwardLength = _useHistoryTravel.forwardLength,
+    back = _useHistoryTravel.back,
+    forward = _useHistoryTravel.forward;
   var promiseRef = useRef(null);
-  var setStatePromise = useCallback(function (_state) {
+  var setStatePromise = useCallback(function (_value) {
     return new Promise(function (resolve) {
       promiseRef.current = resolve;
-      setState(_state);
+      var _valStr = JSON.stringify(_value);
+      if (!isEqual(value, _valStr)) {
+        setValue(_valStr);
+      }
     });
   }, []);
-  useDeepCompareEffect(function () {
+  useUpdateLayoutEffect(function () {
     if (promiseRef.current) {
-      promiseRef.current(state);
+      promiseRef.current(JSON.parse(value));
       promiseRef.current = null;
     }
-  }, [state]);
-  return [state, setStatePromise];
+  }, [value]);
+  return [JSON.parse(value), setStatePromise, {
+    backLength: backLength - 1,
+    forwardLength: forwardLength,
+    back: back,
+    forward: forward
+  }];
 };
 export default usePromiseState;

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

@@ -0,0 +1,78 @@
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+var _excluded = ["datasetCode"];
+import { useBoolean, useMemoizedFn } from 'ahooks';
+import { message } from 'luck-design/antd';
+import { keys, isNil } from 'lodash';
+import { executeCode } from "./helper";
+import { fetchCallBehavior } from "../../constants/api-url";
+var useTodo = function useTodo() {
+  var _useBoolean = useBoolean(),
+    _useBoolean2 = _slicedToArray(_useBoolean, 2),
+    loading = _useBoolean2[0],
+    _useBoolean2$ = _useBoolean2[1],
+    setTrue = _useBoolean2$.setTrue,
+    setFalse = _useBoolean2$.setFalse;
+  var callBehavior = useMemoizedFn(function (_ref, params, data) {
+    var moduleCode = _ref.moduleCode,
+      datasetCode = _ref.datasetCode,
+      behaviorKey = _ref.behaviorKey;
+    return fetchCallBehavior(_objectSpread({
+      moduleCode: moduleCode,
+      datasetCode: datasetCode,
+      behaviorKey: behaviorKey
+    }, params), data);
+  });
+  var todo = useMemoizedFn(function (ctx, actionPool) {
+    var argsMap = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+    if (isNil(actionPool)) {
+      return;
+    }
+    var dsCode = argsMap.datasetCode,
+      args = _objectWithoutProperties(argsMap, _excluded);
+    var argsName = keys(args);
+    var _args = argsName.map(function (n) {
+      return args[n];
+    });
+    if (actionPool.length > 0) {
+      setTrue();
+      var tasks = actionPool.map(function (_ref2) {
+        var _ref3 = _slicedToArray(_ref2, 2),
+          actionKey = _ref3[0],
+          info = _ref3[1];
+        switch (info.category) {
+          case 'custom':
+            return Promise.resolve(executeCode.apply(void 0, [ctx, info.code, argsName].concat(_toConsumableArray(_args))));
+          case 'page-action':
+            {
+              var _JSON$parse = JSON.parse(info.code || '{}'),
+                moduleCode = _JSON$parse.moduleCode,
+                datasetCode = _JSON$parse.datasetCode,
+                params = _JSON$parse.params,
+                data = _JSON$parse.data;
+              var _dscode = datasetCode || dsCode;
+              if (!moduleCode || !_dscode) {
+                message.warning('接口重要参数（模块编码或数据集编码）丢失');
+                return;
+              }
+              return callBehavior({
+                datasetCode: _dscode,
+                moduleCode: moduleCode,
+                behaviorKey: actionKey
+              }, params, data);
+            }
+          case 'trigger':
+            return Promise.resolve();
+          default:
+            break;
+        }
+      });
+      return Promise.all(tasks).finally(setFalse);
+    }
+    return Promise.resolve();
+  });
+  return [todo, callBehavior, loading];
+};
+export default useTodo;

package/es/lowcode/index.js

@@ -1,5 +1,6 @@
 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,12 +1,15 @@
+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 { useLDContext } from "../engine/provider/ContextProvider";
+import { useContext } from "../engine/provider/ContextProvider";
+import { useDraggable } from '@dnd-kit/core';
 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) {
@@ -28,7 +31,7 @@ var BaseCom = function BaseCom(_ref) {
     }).filter(function (group) {
       return group.components.length > 0;
     });
-  }, [data]);
+  }, [searchTerm]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: styles['components-search']
   }, /*#__PURE__*/React.createElement(Search, {
@@ -44,30 +47,53 @@ 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("div", {
+      return /*#__PURE__*/React.createElement(CompItem, {
         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)));
+        item: item,
+        onComponentClick: onComponentClick
+      });
     }));
   })));
 };
+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(_ref2) {
-  var _ref2$dataset = _ref2.dataset,
-    dataset = _ref2$dataset === void 0 ? 'test' : _ref2$dataset;
-  var context = useLDContext();
+var Components = function Components(_ref3) {
+  var _ref3$dataset = _ref3.dataset,
+    dataset = _ref3$dataset === void 0 ? 'test' : _ref3$dataset;
+  var context = useContext();
   var onComponentClick = useMemoizedFn(function (data) {
     context.$publisher(context.topics.COMPONENT_SETTING_CLICK, {
       data: data
@@ -95,10 +121,10 @@ var Components = function Components(_ref2) {
     onComponentClick: onComponentClick
   })), /*#__PURE__*/React.createElement(TabPane, {
     tab: formatMessage({
-      id: 'ccm.dev.page.set.components.dataset',
-      label: '数据集字段'
+      id: 'ccm.dev.page.set.components.custom',
+      label: '自定义组件'
     }),
     key: "dataset"
-  })));
+  }, "\u656C\u8BF7\u671F\u5F85")));
 };
 export default Components;

package/es/lowcode/painter/Design.js

@@ -1,9 +1,11 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import React, { useRef, useState } from 'react';
-import { RawIntlProvider, getLocale, getIntl, localeInfo } from 'umi';
+import React, { useRef, useState, useEffect } from 'react';
+import { RawIntlProvider, getLocale, getIntl, localeInfo, history } 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";
@@ -11,6 +13,7 @@ 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();
     }),
@@ -23,6 +26,35 @@ 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,15 @@ 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 { cloneDeep, reverse } from 'lodash';
+import { reverse } from 'lodash';
 import { suid } from '@luck-design-biz/base/utils';
-import { useLDContext } from "../engine/provider/ContextProvider";
+import { useContext, usePageData } from "../engine/provider/ContextProvider";
 import { add, deleteById } from "../engine/tools/dataProcess";
-import { CELL_KEY, CELL_CLASS_NAME } from "../constants";
+import { LC_BUILDIN_UNIT_KEY, LC_COMPONENT_UNIT_KEY, LC_COMPONENT_UNIT, CONTAINER_UNITS } 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 +28,11 @@ var getOperatorStyle = function getOperatorStyle(page, cellNode) {
 var DesignOperator = function DesignOperator(_ref) {
   var _getDomById, _getDomById2;
   var target = _ref.target;
-  var context = useLDContext();
+  var context = useContext();
+  var _usePageData = usePageData(),
+    _usePageData2 = _slicedToArray(_usePageData, 2),
+    pageData = _usePageData2[0],
+    setPageData = _usePageData2[1].setPageData;
   var size = useSize(target);
   var _useState = useState(suid()),
     _useState2 = _slicedToArray(_useState, 2),
@@ -43,7 +48,8 @@ var DesignOperator = function DesignOperator(_ref) {
   var lastSelectorId = useLatest(operatorId.selector);
   var currentModal = useRef(null);
   var getDomById = useMemoizedFn(function (id) {
-    return context.componentMap.get(id).dom;
+    var _context$componentMap;
+    return (_context$componentMap = context.componentMap.get(id)) === null || _context$componentMap === void 0 ? void 0 : _context$componentMap.api.getSelfDom();
   });
   var handleSelect = useMemoizedFn(function (_key) {
     context.$publisher(context.topics.COMPONENT_ACTIVE, _key ? {
@@ -56,34 +62,29 @@ var DesignOperator = function DesignOperator(_ref) {
     } : null);
   });
   var handleDelete = useMemoizedFn(function (_ref2) {
-    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 id = _ref2.id;
+    context.$publisher(context.topics.COMPONENT_DELETE, {
+      id: id,
+      pageData: pageData
     });
   });
   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);
+    add(pageData, 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,
-          pageData: cloneData
+          pageData: pageData
+        });
+        context.$publisher(context.topics.COMPONENT_ACTIVE, {
+          id: _id
         });
       }
     }).watch();
-    context._setPageData(cloneData);
+    setPageData(pageData);
   });
   var acticeProps = useCreation(function () {
     if (!operatorId.selector) return null;
@@ -114,7 +115,7 @@ var DesignOperator = function DesignOperator(_ref) {
   }, [operatorId.detector]);
   useEventListener('mousemove', function (event) {
     var elem = event.target;
-    var targetCell = elem.closest(".".concat(CELL_CLASS_NAME));
+    var targetCell = elem.closest("[".concat(LC_COMPONENT_UNIT_KEY, "=\"").concat(LC_COMPONENT_UNIT, "\"]"));
     var targetCellId = targetCell === null || targetCell === void 0 ? void 0 : targetCell.id;
     if (targetCellId && targetCellId !== operatorId.detector && targetCellId !== operatorId.selector) {
       setOperatorId({
@@ -144,7 +145,7 @@ var DesignOperator = function DesignOperator(_ref) {
   });
   useEventListener('click', function (event) {
     var elem = event.target;
-    var targetCell = elem.closest(".".concat(CELL_CLASS_NAME));
+    var targetCell = elem.closest("[".concat(LC_COMPONENT_UNIT_KEY, "=\"").concat(LC_COMPONENT_UNIT, "\"]"));
     var targetCellId = targetCell === null || targetCell === void 0 ? void 0 : targetCell.id;
     if (!targetCellId || targetCellId === operatorId.selector) return;
     context.$publisher(context.topics.COMPONENT_HOVER, null);
@@ -168,14 +169,14 @@ var DesignOperator = function DesignOperator(_ref) {
             id: compId
           });
         }).watch();
-        addComponent(data, CELL_KEY.PAGE_ROOT);
+        addComponent(data, LC_BUILDIN_UNIT_KEY.PAGE_ROOT);
         return;
       }
       if (!lastSelectorId.current) {
         message.info('请在右侧画布选择节点');
         return;
       }
-      if (context.componentMap.get(lastSelectorId.current).dom.getAttribute('name') !== 'box') {
+      if (!CONTAINER_UNITS.includes(context.componentMap.get(lastSelectorId.current).meta.component)) {
         message.info('该节点不支持添加子节点');
         return;
       }
@@ -190,8 +191,11 @@ var DesignOperator = function DesignOperator(_ref) {
     }).watch();
     var acid = context.$subscriber(context.topics.COMPONENT_ACTIVE).on(function (payload) {
       if (payload.id) {
+        var _context$componentMap2 = context.componentMap.get(payload.id).api.getSelfAndParentLCData(),
+          node = _context$componentMap2.node;
         setOperatorId({
           selector: payload.id,
+          deletable: node.props.buildIn !== true,
           detector: null
         });
       } else {
@@ -212,16 +216,29 @@ var DesignOperator = function DesignOperator(_ref) {
         currentModal.current = id;
       } else {
         target.current.style.removeProperty('overflow');
-        var _modal2 = context.componentMap.get(id || currentModal.current);
-        _modal2.api.doClose();
-        currentModal.current = void 0;
+        var _id = id || currentModal.current;
+        if (_id) {
+          var _modal2 = context.componentMap.get(_id);
+          _modal2.api.doClose();
+          currentModal.current = void 0;
+        }
       }
     }).watch();
+    var cdid = context.$subscriber(context.topics.COMPONENT_DELETE).on(function (_ref7) {
+      var id = _ref7.id,
+        pageData = _ref7.pageData;
+      if (lastSelectorId.current === id) {
+        context.$publisher(context.topics.COMPONENT_ACTIVE, null);
+      }
+      deleteById(pageData, id);
+      setPageData(pageData);
+    });
     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 () {
@@ -235,7 +252,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))
+    style: getOperatorStyle(target.current, getDomById(operatorId.detector), 'detector', operatorId.detector)
   }, /*#__PURE__*/React.createElement("span", {
     className: styles['lc-painter-design-detector-name'],
     style: {
@@ -245,10 +262,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))
+    style: getOperatorStyle(target.current, getDomById(operatorId.selector), 'selector', operatorId.selector)
   }, acticeProps && /*#__PURE__*/React.createElement("div", {
     className: styles['lc-borders-actions'],
-    style: acticeProps.props.id === CELL_KEY.PAGE_ROOT ? {
+    style: acticeProps.props.id === LC_BUILDIN_UNIT_KEY.PAGE_ROOT ? {
       top: 0
     } : ((_getDomById2 = getDomById(operatorId.selector)) === null || _getDomById2 === void 0 ? void 0 : _getDomById2.offsetTop) < 23 ? {
       bottom: '-23px'
@@ -260,7 +277,7 @@ var DesignOperator = function DesignOperator(_ref) {
     placement: "bottomLeft"
   }, /*#__PURE__*/React.createElement("div", {
     className: "instance-node-selector"
-  }, acticeProps.props.name)), /*#__PURE__*/React.createElement("div", {
+  }, acticeProps.props.name)), operatorId.deletable && /*#__PURE__*/React.createElement("div", {
     onClick: function onClick() {
       return handleDelete(acticeProps.props);
     }