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

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,7 +46,8 @@ 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 = {

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

@@ -21,18 +21,18 @@
         "key": "onMount",
         "name": "组件首次渲染时",
         "desc": "在组件首次渲染时，执行方法",
-        "func": "function onMount(params) {\n\t\n}"
+        "func": "function onMount() {\n\t\n}"
       },
       {
         "key": "onUnmount",
         "name": "组件卸载时",
         "desc": "在组件卸载时，执行方法。",
-        "func": "function onUnmount(params) {\n\t\n}"
+        "func": "function onUnmount() {\n\t\n}"
       },
       {
         "key": "onClick",
         "name": "点击事件",
-        "desc": "点击文本时，执行方法",
+        "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);

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

@@ -101,7 +101,7 @@
       "default": "hidden"
     }
   ],
-  "css": {},
+  "css": "",
   "advance": {
     "events": [
       {
@@ -119,7 +119,7 @@
       {
         "key": "onClick",
         "name": "点击事件",
-        "desc": "点击文本时，执行方法",
+        "desc": "点击按钮时，执行方法",
         "func": "function onClick(e) {\n\t\n}"
       }
     ]

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

@@ -5,6 +5,7 @@
   "icon": "icon-cardlist",
   "group": "advance",
   "groupName": "高级",
+  "hidden": true,
   "order": 1,
   "props": [
     {

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

@@ -8,6 +8,7 @@ import { useMemoizedFn, useUpdateEffect, useCreation } from 'ahooks';
 import { Modal, Button } from 'luck-design/antd';
 import classNames from 'classnames';
 import styled from 'styled-components';
+import { isNil } from 'lodash';
 import { LDActions } from "../../../../index";
 import { useContext } from "../../../engine/provider/ContextProvider";
 import { omitBadProps } from "../../../engine/tools/helper";
@@ -86,13 +87,9 @@ var LCDialog = function LCDialog(_ref) {
     }, _callee);
   })));
   var _footer = useCreation(function () {
-    var _btnGroup$todoList;
     if (!footer) return {
       footer: null
     };
-    if (!(btnGroup !== null && btnGroup !== void 0 && (_btnGroup$todoList = btnGroup.todoList) !== null && _btnGroup$todoList !== void 0 && _btnGroup$todoList.length)) return {
-      confirmLoading: loading
-    };
     return {
       footer: /*#__PURE__*/React.createElement(Footer, null, /*#__PURE__*/React.createElement(LDActions, _extends({}, btnGroup, {
         doAction: function doAction(action) {
@@ -111,7 +108,7 @@ var LCDialog = function LCDialog(_ref) {
         onClick: handleOk
       }, okText))
     };
-  }, [footer, btnGroup, loading]);
+  }, [footer, btnGroup, loading, cancelText, okText]);
   var getTargetDom = useMemoizedFn(function () {
     var _domRef$current;
     return (_domRef$current = domRef.current) === null || _domRef$current === void 0 ? void 0 : _domRef$current.closest('.ant-modal-content');
@@ -155,7 +152,6 @@ var LCDialog = function LCDialog(_ref) {
   }, /*#__PURE__*/React.createElement(Modal, _extends({
     title: _title,
     visible: open,
-    getContainer: getContainer,
     width: width,
     mask: mask,
     maskStyle: maskStyle,
@@ -164,7 +160,10 @@ var LCDialog = function LCDialog(_ref) {
       overflowY: 'auto',
       marginTop: 0
     },
-    wrapClassName: classNames(styles['lc-component-dialog-wrapper'], _defineProperty({}, wrapClassName, !!wrapClassName))
+    wrapClassName: classNames(styles['lc-component-dialog-wrapper'], _defineProperty({}, wrapClassName, !!wrapClassName)),
+    getContainer: isNil(getContainer) ? function () {
+      return document.getElementById('root') || document.getElementById('react-content') || document.body;
+    } : getContainer
   }, _footer, {
     onOk: handleOk,
     onCancel: function onCancel() {

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

@@ -106,7 +106,7 @@
     {
       "key": "btnGroup",
       "name": "按钮组",
-      "desc": "底部按钮区域的按钮组（参考按钮配置）",
+      "desc": "底部按钮区域的按钮组",
       "type": "_ActionsEditor",
       "default": { "display": "button", "max": 2, "moreText": "操作", "todoList": [] },
       "wrapper": "collapse",
@@ -136,7 +136,7 @@
       {
         "key": "onClose",
         "name": "对话框关闭时",
-        "desc": "在对话框打开时，执行方法，promise反馈false无法截断关闭",
+        "desc": "在对话框关闭时，执行方法",
         "func": "function onClose() {\n\t\n}"
       },
       {

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

@@ -5,6 +5,7 @@
   "icon": "icon-drawer",
   "group": "basic",
   "groupName": "基础",
+  "hidden": true,
   "order": 1,
   "props": [
     {

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

@@ -18,6 +18,13 @@
       "type": "switch",
       "default": true
     },
+    {
+      "key": "showPop",
+      "name": "辅助选择",
+      "type": "_ComplexPop",
+      "wrapper": "hidden",
+      "default": true
+    },
     {
       "key": "generalSetting",
       "name": "通用配置",

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

@@ -15,12 +15,14 @@
     {
       "key": "showTime",
       "name": "时间选择",
-      "type": "switch"
+      "type": "switch",
+      "default": false
     },
     {
       "key": "allowClear",
       "name": "允许清除",
-      "type": "switch"
+      "type": "switch",
+      "default": true
     },
     {
       "key": "format",

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

@@ -15,7 +15,8 @@
     {
       "key": "step",
       "name": "步数",
-      "type": "number"
+      "type": "number",
+      "default": 1
     },
     {
       "key": "min",
@@ -25,7 +26,7 @@
     {
       "key": "max",
       "name": "最大值",
-      "type": "string"
+      "type": "number"
     },
     {
       "key": "addonBefore",

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

@@ -22,7 +22,7 @@
       "key": "screenable",
       "name": "弹窗选择",
       "type": "switch",
-      "default": "true"
+      "default": true
     },
     {
       "key": "mode",

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

@@ -3,11 +3,11 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-var _excluded = ["advance", "state"];
+var _excluded = ["advance", "state", "render"];
 import React, { useRef, forwardRef, Fragment, useImperativeHandle } from 'react';
 import { useMemoizedFn, useCreation, useUnmount } from 'ahooks';
 import classNames from 'classnames';
-import { reduce, includes, isNil, cloneDeep, last, startsWith, isString } from 'lodash';
+import { reduce, includes, isNil, cloneDeep, last, startsWith, isString, xor } from 'lodash';
 import { BasicDivider } from 'luck-design';
 import { Collapse } from '@luck-design-biz/base';
 import { formatMessage, getPageQuery } from '@luck-design-biz/base/utils';
@@ -56,7 +56,7 @@ var getMthodParams = function getMthodParams(methodStr) {
   return [];
 };
 var LCForm = /*#__PURE__*/forwardRef(function (_ref3, ref) {
-  var _ctx$state2;
+  var _ctx$state2, _promiseRef$current2;
   var id = _ref3.id,
     className = _ref3.className,
     blocks = _ref3.blocks,
@@ -228,9 +228,7 @@ var LCForm = /*#__PURE__*/forwardRef(function (_ref3, ref) {
     return wrapperRef.current;
   });
   var handleDefaultDataSourceFormat = useMemoizedFn(function (defaultDataSourceFormat, defaultValues) {
-    if (isNil(defaultDataSourceFormat)) return function () {
-      return defaultValues;
-    };
+    if (isNil(defaultDataSourceFormat)) return function () {};
     return executeCode(ctx, defaultDataSourceFormat, ['defaultValues'], defaultValues);
   });
   var handleDataSourceFormat = useMemoizedFn(function (type, dataSourceFormat, dataSetKey, _ref6) {
@@ -323,6 +321,7 @@ var LCForm = /*#__PURE__*/forwardRef(function (_ref3, ref) {
     return reduce(fields, function (result, setting) {
       var advance = setting.advance,
         _state = setting.state,
+        render = setting.render,
         rest = _objectWithoutProperties(setting, _excluded);
       var isShow = true;
       if (ctx.runtime !== RUNTIME.DESIGN && _state) {
@@ -355,6 +354,14 @@ var LCForm = /*#__PURE__*/forwardRef(function (_ref3, ref) {
         };
       }
       result.push(_objectSpread(_objectSpread({}, _props), {}, {
+        render: render ? function (v, d, i, p) {
+          return /*#__PURE__*/React.createElement(RuntimeComp, {
+            value: v,
+            data: d,
+            rowIndex: i,
+            params: p
+          }, render.replace(/(function\s*\w*\s*)\([^)]*\)(\s*{)/, '$1()$2'));
+        } : null,
         events: advance !== null && advance !== void 0 && advance.events ? reduce(advance.events, function (result, value, key) {
           //处理事件
           result[key] = function () {
@@ -399,21 +406,29 @@ var LCForm = /*#__PURE__*/forwardRef(function (_ref3, ref) {
         };
         if (item.type === 'auto') data = _objectSpread(_objectSpread({}, data), {}, {
           col: item.cols
-        });else data = _objectSpread(_objectSpread({}, data), {}, {
-          suppressPreset: item.suppressPreset,
-          height: item.height,
-          bordered: item.bordered,
-          draggable: item.draggable,
-          orderByAdd: item.orderByAdd,
-          hideActionsColumn: item.suppressActions,
-          actionsWidth: item.actionsColumnWidth,
-          columnsReset: function columnsReset(columns) {
-            return handleColumnsReset(item.columnsReset, columns);
-          },
-          onGridFormReady: function onGridFormReady(_ref, params, gridForm) {
-            return handleGridFormReady(item.onGridFormReady, _ref, params, gridForm);
+        });else {
+          data = _objectSpread(_objectSpread({}, data), {}, {
+            suppressPreset: item.suppressPreset,
+            height: item.height,
+            bordered: item.bordered,
+            draggable: item.draggable,
+            orderByAdd: item.orderByAdd,
+            hideActionsColumn: item.suppressActions,
+            actionsWidth: item.actionsColumnWidth,
+            operates: item.operates ? function (ops) {
+              return xor(ops, xor(['add', 'delete', 'update'], item.operates));
+            } : null,
+            columnsReset: function columnsReset(columns) {
+              return handleColumnsReset(item.columnsReset, columns);
+            },
+            onGridFormReady: function onGridFormReady(_ref, params, gridForm) {
+              return handleGridFormReady(item.onGridFormReady, _ref, params, gridForm);
+            }
+          });
+          if (item.suppressbatch) {
+            data.rowSelection = false;
           }
-        });
+        }
         if (item.actionsColumnReset) data = _objectSpread(_objectSpread({}, data), {}, {
           resetActionsColumn: function resetActionsColumn(data, index, actions, params) {
             return handleResetActionsColumn(item.actionsColumnReset, data, index, actions, params);
@@ -577,7 +592,8 @@ var LCForm = /*#__PURE__*/forwardRef(function (_ref3, ref) {
       }
       return (_promiseRef$current = promiseRef.current) === null || _promiseRef$current === void 0 ? void 0 : _promiseRef$current.call.apply(_promiseRef$current, [promiseRef].concat(rest));
     },
-    afterInit: afterInit
+    afterInit: afterInit,
+    validateErrorCallback: (_promiseRef$current2 = promiseRef.current) === null || _promiseRef$current2 === void 0 ? void 0 : _promiseRef$current2.call(promiseRef)
   }));
 });
 LCForm.defaultProps = omitBadProps(defaultMeta);

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

@@ -114,7 +114,7 @@
         {
           "key": "dataset",
           "name": "数据集",
-          "desc": "选择系统中的可用树形数据集",
+          "desc": "选择系统中的可用数据集",
           "type": "_DataSetSelector",
           "component": "form",
           "next": {
@@ -203,13 +203,22 @@
           "type": "_BlockEditor",
           "wrapper": "hidden",
           "default": {
-            "form": { "readOnly": false, "col": 4 },
-            "table": {
+            "auto": { "readOnly": false, "cols": 4 },
+            "grid": {
+              "readOnly": false,
+              "suppressPreset": false,
+              "height": "100%",
+              "bordered": false,
+              "draggable": false,
+              "orderByAdd": "asc",
+              "suppressActions": false,
+              "actionsColumnWidth": 160
+            },
+            "writer": {
               "readOnly": false,
               "suppressPreset": false,
               "height": "100%",
               "bordered": false,
-              "popTitleKey": "title",
               "draggable": false,
               "orderByAdd": "asc",
               "suppressActions": false,
@@ -245,7 +254,7 @@
                 "name": "格式化默认数据",
                 "desc": "格式化新增时默认数据",
                 "type": "_JSEditor",
-                "defaultCode": "function defaultDataSourceFormat(defaultValues) { \n return defaultValues; \n}",
+                "defaultCode": "function defaultDataSourceFormat(defaultValues) { \n return {}; \n}",
                 "mustConfirm": true,
                 "wrapper": "collapse",
                 "wrapperProps": { "suppressIcon": true }
@@ -262,6 +271,11 @@
               }
             ],
             "_grid_props": [
+              {
+                "key": "height",
+                "name": "高度",
+                "type": "_WidthHeight"
+              },
               {
                 "key": "readOnly",
                 "name": "只读",
@@ -272,11 +286,6 @@
                 "name": "关闭预设",
                 "type": "switch"
               },
-              {
-                "key": "height",
-                "name": "高度",
-                "type": "_WidthHeight"
-              },
               {
                 "key": "bordered",
                 "name": "边框线",
@@ -287,6 +296,11 @@
                 "name": "拖拽排序",
                 "type": "switch"
               },
+              {
+                "key": "suppressbatch",
+                "name": "关闭批量",
+                "type": "switch"
+              },
               {
                 "key": "orderByAdd",
                 "name": "排序方式",
@@ -302,6 +316,26 @@
                   }
                 ]
               },
+              {
+                "key": "operates",
+                "name": "基础操作",
+                "type": "checkbox",
+                "options": [
+                  {
+                    "label": "添加",
+                    "value": "add"
+                  },
+                  {
+                    "label": "删除",
+                    "value": "delete"
+                  },
+                  {
+                    "label": "修改",
+                    "value": "update"
+                  }
+                ],
+                "defaultValue": ["add", "delete", "update"]
+              },
               {
                 "key": "actionsColumn",
                 "name": "操作列",
@@ -336,7 +370,7 @@
                 "name": "格式化默认数据",
                 "desc": "格式化新增时默认数据",
                 "type": "_JSEditor",
-                "defaultCode": "function defaultDataSourceFormat(defaultValues) { \n return defaultValues; \n}",
+                "defaultCode": "function defaultDataSourceFormat(defaultValues) { \n return {}; \n}",
                 "mustConfirm": true,
                 "wrapper": "collapse",
                 "wrapperProps": { "suppressIcon": true }
@@ -447,7 +481,7 @@
                 "name": "格式化默认数据",
                 "desc": "格式化新增时默认数据",
                 "type": "_JSEditor",
-                "defaultCode": "function defaultDataSourceFormat(defaultValues) { \n return defaultValues; \n}",
+                "defaultCode": "function defaultDataSourceFormat(defaultValues) { \n return {}; \n}",
                 "mustConfirm": true,
                 "wrapper": "collapse",
                 "wrapperProps": { "suppressIcon": true }

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

@@ -5,6 +5,7 @@
   "icon": "icon-iframe",
   "group": "basic",
   "groupName": "基础",
+  "hidden": true,
   "order": 1,
   "props": [
     {
@@ -27,6 +28,6 @@
       "default": true
     }
   ],
-  "css": {},
+  "css": "",
   "advance": {}
 }