@luck-design-biz/luckda 1.0.0-alpha → 1.0.1-10

package/es/lowcode/preview/index.js

@@ -19,6 +19,7 @@ var Preview = function Preview(_ref) {
     });
   }, [userId]);
   return code && currentKey ? /*#__PURE__*/React.createElement(EventBusProvider, {
+    key: code,
     runtime: RUNTIME.PREVIEW
   }, /*#__PURE__*/React.createElement(ContextProvider, {
     code: code

package/es/lowcode/view/Canvas.js

@@ -1,15 +1,16 @@
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React, { useEffect } from 'react';
-import { useMemoizedFn } from 'ahooks';
 import styled from 'styled-components';
 import classNames from 'classnames';
 import { useContext, useGet } from "../engine/provider/ContextProvider";
+import { useStateStore } from "../engine/provider/ContextProvider/usePageVar";
 import PageHeader from "./lc-components/PageHeader";
 import PageContent from "./lc-components/PageContent";
 import PageFooter from "./lc-components/PageFooter";
 import PageModal from "./lc-components/PageModal";
 import { LC_BUILDIN_UNIT_KEY } from "../constants";
+import diff from "../engine/tools/diff";
 import styles from "./style/canvas.less";
 var PageRoot = styled.div.withConfig({
   displayName: "PageRoot",
@@ -18,35 +19,36 @@ var PageRoot = styled.div.withConfig({
   return props.$css;
 });
 var Canvas = function Canvas(_ref) {
-  var className = _ref.className;
-  var _useGet = useGet(['props.css', 'props.advance', 'props.enableHeader', 'props.enableFooter']),
-    _useGet2 = _slicedToArray(_useGet, 4),
+  var _dsRef$current;
+  var className = _ref.className,
+    dsRef = _ref.dsRef;
+  (_dsRef$current = dsRef.current) === null || _dsRef$current === void 0 || _dsRef$current.read();
+  var _useGet = useGet(['props.css', 'props.advance', 'props.enableHeader', 'props.enableFooter', 'props.vars']),
+    _useGet2 = _slicedToArray(_useGet, 5),
     pagerootCss = _useGet2[0],
     advance = _useGet2[1],
     enableHeader = _useGet2[2],
-    enableFooter = _useGet2[3];
+    enableFooter = _useGet2[3],
+    pageVars = _useGet2[4];
   var ctx = useContext();
-  var handleMount = useMemoizedFn(function () {
-    var _advance$events;
-    ctx.doAction(advance === null || advance === void 0 || (_advance$events = advance.events) === null || _advance$events === void 0 ? void 0 : _advance$events.onPageMount);
-  });
-  var handleStateChanged = useMemoizedFn(function (_ref2) {
+  useEffect(function () {
     var _advance$events2;
-    var state = _ref2.state,
-      prevState = _ref2.prevState,
-      diff = _ref2.diff;
-    ctx.doAction(advance === null || advance === void 0 || (_advance$events2 = advance.events) === null || _advance$events2 === void 0 ? void 0 : _advance$events2.onStateChanged, {
-      state: state,
-      prevState: prevState,
-      diff: diff
+    var unsub = useStateStore.subscribe(function (store) {
+      return store.state;
+    }, function (state, prevState) {
+      var _advance$events;
+      var _diff = diff(prevState, state);
+      ctx.doAction(advance === null || advance === void 0 || (_advance$events = advance.events) === null || _advance$events === void 0 ? void 0 : _advance$events.onStateChanged, {
+        state: state,
+        prevState: prevState,
+        diff: _diff
+      });
     });
-  });
-  useEffect(function () {
-    ctx.$subscriber(ctx.topics.PAGE_LOAD_MOUNT).once(handleMount).watch();
-    var tid = ctx.$subscriber(ctx.topics.PAGE_STATE_CHANGED).on(handleStateChanged);
+    ctx.doAction(advance === null || advance === void 0 || (_advance$events2 = advance.events) === null || _advance$events2 === void 0 ? void 0 : _advance$events2.onPageMount);
     return function () {
       var _advance$events3;
-      ctx.$unsubscriber(ctx.topics.PAGE_STATE_CHANGED, tid);
+      unsub();
+      useStateStore.getState().clear();
       ctx.doAction(advance === null || advance === void 0 || (_advance$events3 = advance.events) === null || _advance$events3 === void 0 ? void 0 : _advance$events3.onPageUnmount);
     };
   }, []);

package/es/lowcode/view/Loading.js

@@ -1,13 +1,11 @@
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import React from 'react';
 import classNames from 'classnames';
 import styles from "./style/loading.less";
-var Loading = function Loading(_ref) {
-  var className = _ref.className,
-    style = _ref.style;
+var Loading = function Loading() {
   return /*#__PURE__*/React.createElement("div", {
-    className: classNames(styles['lc-painter-loading'], _defineProperty({}, className, !!className)),
-    style: style
+    className: styles.masker
+  }, /*#__PURE__*/React.createElement("div", {
+    className: styles['lc-painter-loading']
   }, /*#__PURE__*/React.createElement("div", {
     className: styles['cube']
   }, /*#__PURE__*/React.createElement("div", {
@@ -22,6 +20,6 @@ var Loading = function Loading(_ref) {
     className: classNames(styles['side'], styles['side5'])
   }), /*#__PURE__*/React.createElement("div", {
     className: classNames(styles['side'], styles['side6'])
-  })));
+  }))));
 };
 export default Loading;

package/es/lowcode/view/Page.js

@@ -1,35 +1,45 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["className"];
-import React, { useRef, forwardRef } from 'react';
-import { useMemoizedFn } from 'ahooks';
+import React, { forwardRef, useRef, Suspense } from 'react';
+import { useMemoizedFn, useCreation, useBoolean } from 'ahooks';
+import { Skeleton } from 'luck-design/antd';
 import classNames from 'classnames';
-import styled from 'styled-components';
 import { useRemoteSource, useContext } from "../engine/provider/ContextProvider";
+import initDS from "../engine/tools/initDS";
 import Loading from "./Loading";
 import Wrapper from "./lc-components/Wrapper";
 import Canvas from "./Canvas";
 import { LC_BUILDIN_UNIT_KEY } from "../constants";
+import useCombinedRefs from "../engine/tools/useCombinedRefs";
 import ErrorBoundary from "./errorBoundary";
 import styles from "./style/page.less";
-var Masker = styled.div.withConfig({
-  displayName: "Masker",
-  componentId: "luckda-6530__sc-yswm45-0"
-})(["position:absolute;top:0;left:0;width:100%;height:100%;z-index:2400;background:rgba(0,0,0,0.45);cursor:none;"]);
-var LCPage = /*#__PURE__*/forwardRef(function (_ref2, ref) {
-  var className = _ref2.className,
-    props = _objectWithoutProperties(_ref2, _excluded);
-  var _ref = useRef(null);
-  var _rootRef = ref || _ref;
+var LCPage = /*#__PURE__*/forwardRef(function (_ref, ref) {
+  var className = _ref.className,
+    props = _objectWithoutProperties(_ref, _excluded);
+  var _rootRef = useCombinedRefs(ref);
+  var _dsRef = useRef();
   var _useRemoteSource = useRemoteSource(),
     loading = _useRemoteSource.loading;
-  var context = useContext();
+  var _useBoolean = useBoolean(false),
+    _useBoolean2 = _slicedToArray(_useBoolean, 2),
+    loadMount = _useBoolean2[0],
+    setTrue = _useBoolean2[1].setTrue;
+  var ctx = useContext();
+  var handlePageLoadMount = useMemoizedFn(function () {
+    _dsRef.current = initDS(ctx);
+    setTrue();
+  });
+  useCreation(function () {
+    ctx.$subscriber(ctx.topics.PAGE_LOAD_MOUNT).once(handlePageLoadMount).watch();
+  }, []);
   var getTargetDom = useMemoizedFn(function () {
     return _rootRef.current;
   });
   var handleClear = useMemoizedFn(function () {
-    context.$publisher(context.topics.COMPONENT_ACTIVE, null);
+    ctx.$publisher(ctx.topics.COMPONENT_ACTIVE, null);
   });
   return /*#__PURE__*/React.createElement(ErrorBoundary, {
     onClear: handleClear
@@ -39,6 +49,18 @@ var LCPage = /*#__PURE__*/forwardRef(function (_ref2, ref) {
   }, /*#__PURE__*/React.createElement("div", _extends({
     ref: _rootRef,
     className: classNames(styles['lc-view-page'], _defineProperty(_defineProperty({}, styles.isloading, loading), className, !!className))
-  }, props), /*#__PURE__*/React.createElement(Canvas, null), loading ? /*#__PURE__*/React.createElement(Masker, null, /*#__PURE__*/React.createElement(Loading, null)) : null)));
+  }, props), /*#__PURE__*/React.createElement(Suspense, {
+    fallback: /*#__PURE__*/React.createElement(Skeleton, {
+      active: true,
+      title: {
+        width: '70%'
+      },
+      paragraph: {
+        rows: 9
+      }
+    })
+  }, loadMount ? /*#__PURE__*/React.createElement(Canvas, {
+    dsRef: _dsRef
+  }) : null))), loading ? /*#__PURE__*/React.createElement(Loading, null) : null);
 });
 export default LCPage;

package/es/lowcode/view/index.js

@@ -9,6 +9,7 @@ var View = function View(_ref) {
   var code = _ref.code,
     props = _objectWithoutProperties(_ref, _excluded);
   return /*#__PURE__*/React.createElement(EventBusProvider, {
+    key: code,
     runtime: RUNTIME.LIVE
   }, /*#__PURE__*/React.createElement(ContextProvider, {
     code: code

package/es/lowcode/view/lc-components/Box/index.js

@@ -1,9 +1,10 @@
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import React, { useRef } from 'react';
+import React, { useRef, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import { useMemoizedFn } from 'ahooks';
 import classNames from 'classnames';
 import styled from 'styled-components';
+import { useContext } from "../../../engine/provider/ContextProvider";
 import Wrapper from "../Wrapper";
 import styles from "./index.less";
 import { omitBadProps } from "../../../engine/tools/helper";
@@ -19,8 +20,21 @@ var LCBox = function LCBox(_ref) {
     children = _ref.children,
     className = _ref.className,
     css = _ref.css,
-    style = _ref.style;
+    style = _ref.style,
+    advance = _ref.advance;
   var ref = useRef();
+  var ctx = useContext();
+  useEffect(function () {
+    ctx.doAction(advance.events.onMount);
+    return function () {
+      return ctx.doAction(advance.events.onUnmount);
+    };
+  }, []);
+  var handleClick = useMemoizedFn(function (e) {
+    ctx.doAction(advance.events.onClick, {
+      e: e
+    });
+  });
   var getTargetDom = useMemoizedFn(function () {
     return ref.current;
   });
@@ -32,14 +46,15 @@ var LCBox = function LCBox(_ref) {
     ref: ref,
     className: classNames(styles['lc-component-box'], _defineProperty({}, className, !!className)),
     style: style,
-    $css: css
+    $css: css,
+    onClick: handleClick
   }, children));
 };
 LCBox.propTypes = {
-  /**
-   * @name 唯一标识
-   * @type string
-   * @disabled true
+  /**
+   * @name 唯一标识
+   * @type string
+   * @disabled true
    */
   id: PropTypes.string.isRequired
 };

package/es/lowcode/view/lc-components/Box/index.less

@@ -1,14 +1,14 @@
-.lc-component-box {
-  &-design.placeholder {
-    width: 100%;
-    height: 100%;
-    min-height: 60px;
-    background-color: #f0f0f0;
-    border: 1px dotted;
-    color: #a7b1bd;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    font-size: 14px;
-  }
-}
+.lc-component-box {
+  &-design.placeholder {
+    width: 100%;
+    height: 100%;
+    min-height: 60px;
+    background-color: #f0f0f0;
+    border: 1px dotted;
+    color: #a7b1bd;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 14px;
+  }
+}

package/es/lowcode/view/lc-components/Box/meta.json

@@ -1,40 +1,40 @@
-{
-  "component": "Box",
-  "name": "盒子",
-  "desc": "盒子是一个用于包裹其他组件的包装器，是一个单纯的容器组件，可以对其设置样式达到想要的效果。",
-  "icon": "icon-box",
-  "group": "container",
-  "groupName": "布局",
-  "order": 3,
-  "props": [
-    {
-      "key": "id",
-      "name": "唯一标识",
-      "type": "string",
-      "disabled": true
-    }
-  ],
-  "css": "height:100%; width: auto; background-color: #fff;",
-  "advance": {
-    "events": [
-      {
-        "key": "onMount",
-        "name": "组件首次渲染时",
-        "desc": "在组件首次渲染时，执行方法",
-        "func": "function onMount(params) {\n\t\n}"
-      },
-      {
-        "key": "onUnmount",
-        "name": "组件卸载时",
-        "desc": "在组件卸载时，执行方法。",
-        "func": "function onUnmount(params) {\n\t\n}"
-      },
-      {
-        "key": "onClick",
-        "name": "点击事件",
-        "desc": "点击文本时，执行方法",
-        "func": "function onClick(e) {\n\t\n}"
-      }
-    ]
-  }
-}
+{
+  "component": "Box",
+  "name": "盒子",
+  "desc": "盒子是一个用于包裹其他组件的包装器，是一个单纯的容器组件，可以对其设置样式达到想要的效果。",
+  "icon": "icon-box",
+  "group": "container",
+  "groupName": "布局",
+  "order": 3,
+  "props": [
+    {
+      "key": "id",
+      "name": "唯一标识",
+      "type": "string",
+      "disabled": true
+    }
+  ],
+  "css": "height:100%; width: auto; background-color: #fff;",
+  "advance": {
+    "events": [
+      {
+        "key": "onMount",
+        "name": "组件首次渲染时",
+        "desc": "在组件首次渲染时，执行方法",
+        "func": "function onMount() {\n\t\n}"
+      },
+      {
+        "key": "onUnmount",
+        "name": "组件卸载时",
+        "desc": "在组件卸载时，执行方法。",
+        "func": "function onUnmount() {\n\t\n}"
+      },
+      {
+        "key": "onClick",
+        "name": "点击事件",
+        "desc": "点击组件时，执行方法",
+        "func": "function onClick(e) {\n\t\n}"
+      }
+    ]
+  }
+}

package/es/lowcode/view/lc-components/Button/index.js

@@ -1,7 +1,7 @@
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import React, { useRef } from 'react';
+import React, { useRef, useEffect } from 'react';
 import PropTypes from 'prop-types';
-import { useMemoizedFn, useMount, useUnmount } from 'ahooks';
+import { useMemoizedFn } from 'ahooks';
 import styled from 'styled-components';
 import classNames from 'classnames';
 import { useContext } from "../../../engine/provider/ContextProvider";
@@ -32,12 +32,12 @@ var LCButton = function LCButton(_ref) {
     advance = _ref.advance;
   var ref = useRef();
   var ctx = useContext();
-  useMount(function () {
+  useEffect(function () {
     ctx.doAction(advance.events.onMount);
-  });
-  useUnmount(function () {
-    ctx.doAction(advance.events.onUnmount);
-  });
+    return function () {
+      return ctx.doAction(advance.events.onUnmount);
+    };
+  }, []);
   var handleClick = useMemoizedFn(function (e) {
     if (onClick) {
       onClick(e);
@@ -70,53 +70,53 @@ var LCButton = function LCButton(_ref) {
   }) : null, title));
 };
 LCButton.propTypes = {
-  /**
-   * @name 唯一标识
-   * @type string
-   * @disabled true
+  /**
+   * @name 唯一标识
+   * @type string
+   * @disabled true
    */
   id: PropTypes.string.isRequired,
-  /**
-   * @name 按钮标题
-   * @type string
-   * @default 12:3:9
+  /**
+   * @name 按钮标题
+   * @type string
+   * @default 12:3:9
    */
   title: PropTypes.string,
-  /**
-   * @name 按钮类型
-   * @type _ButtonType
-   * @default 'default'
+  /**
+   * @name 按钮类型
+   * @type _ButtonType
+   * @default 'default'
    */
   type: PropTypes.oneOf(['default', 'primary', 'dashed', 'danger']),
-  /**
-   * @name 按钮大小
-   * @type segmented
-   * @options [{ "label": "小", "value": "small"}, { "label": "中", "value": "middle" }, { "label": "大", "value": "large" }]
-   * @default 'default'
+  /**
+   * @name 按钮大小
+   * @type segmented
+   * @options [{ "label": "小", "value": "small"}, { "label": "中", "value": "middle" }, { "label": "大", "value": "large" }]
+   * @default 'default'
    */
   size: PropTypes.oneOf(['small', 'default', 'large']),
-  /**
-   * @name 将按钮宽度调整为其父宽度的选项
-   * @type boolean
-   * @default false
+  /**
+   * @name 将按钮宽度调整为其父宽度的选项
+   * @type boolean
+   * @default false
    */
   block: PropTypes.bool,
-  /**
-   * @name 资源串
-   * @type string
+  /**
+   * @name 资源串
+   * @type string
    */
   serial: PropTypes.string,
-  /**
-   * @name 资源串效果
-   * @type segmented
-   * @options [{ "label": "隐藏", "value": "hidden" }, { "label": "禁用", "value": "disable"}]
-   * @default 'hidden'
+  /**
+   * @name 资源串效果
+   * @type segmented
+   * @options [{ "label": "隐藏", "value": "hidden" }, { "label": "禁用", "value": "disable"}]
+   * @default 'hidden'
    */
   serialEffect: PropTypes.oneOf(['disable', 'hidden']),
-  /**
-   * @name 幽灵按钮
-   * @type boolean
-   * @default false
+  /**
+   * @name 幽灵按钮
+   * @type boolean
+   * @default false
    */
   ghost: PropTypes.bool
 };