@luck-design-biz/luckda 0.0.25-11 → 0.0.25-13

package/es/lowcode/painter/panel-section/SplitDisplay.js

@@ -27,10 +27,10 @@ var _OPTIONS_ = [{
 var _RULES_ = [{
   func: function func(value) {
     // 首先，检查value是否为字符串
-    if (!isString(value)) return false;
+    if (!isString(value) || value === '') return false;
 
     // 使用正则表达式检查字符串是否只包含数字和冒号，并且不以冒号开始或结束
-    return /^[0-9]+(:[0-9]+)*$/.test(value);
+    return /^[1-9]+(:[1-9]+)+$/.test(value);
   },
   err: formatMessage({
     id: 'luckda.lowcode.painter.panel-section.splitdisplay.err',
@@ -90,6 +90,7 @@ var SplitDisplay = function SplitDisplay(_ref) {
     onChange(_objectSpread({}, valueRef.current));
   });
   var handleInputChange = useMemoizedFn(function (_, value) {
+    console.log('handleInputChange', value);
     var _fastTo = drop(value.split(':')).map(function () {
       return split === 'vertical' ? 'right' : 'down';
     });

package/es/lowcode/painter/panel-section/TreeRootEditor.js

@@ -1,3 +1,4 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React, { useState, useRef } from 'react';
 import { useMemoizedFn } from 'ahooks';
@@ -13,7 +14,8 @@ var EventItem = styled.div.withConfig({
   componentId: "luckda-6530__sc-1bvweo0-0"
 })(["display:flex;align-items:center;justify-content:space-between;padding:4px 8px;border:1px solid #e5e6e8;border-radius:6px;margin-bottom:6px;font-size:12px;i{cursor:pointer;}i:not(:last-child){margin-right:6px;}"]);
 var TreeRootEditor = function TreeRootEditor(_ref) {
-  var defaultValue = _ref.defaultValue,
+  var nodeId = _ref.nodeId,
+    defaultValue = _ref.defaultValue,
     _onChange = _ref.onChange;
   var valueRef = useRef(cloneDeep(defaultValue));
   var _useState = useState(null),
@@ -65,9 +67,15 @@ var TreeRootEditor = function TreeRootEditor(_ref) {
       cursor: 'pointer'
     },
     onClick: function onClick() {
-      return setEvent(valueRef.current);
+      setEvent(_objectSpread(_objectSpread({}, valueRef.current), {}, {
+        name: formatMessage({
+          id: 'luckda.lowcode.painter.tree.rootAdd',
+          label: '根节点新增'
+        })
+      }));
     }
   })))), /*#__PURE__*/React.createElement(ActionBindModal, {
+    nodeId: nodeId,
     event: event,
     onComfirm: handleComfirm,
     onClose: function onClose() {

package/es/lowcode/painter/style/design.less

@@ -79,6 +79,9 @@
     overflow-x: hidden;
     overflow-y: auto;
   }
+  &-workspace::-webkit-scrollbar {
+    display: none;
+  }
 
   &-simulator {
     min-height: 100%;

package/es/lowcode/view/Canvas.js

@@ -1,9 +1,10 @@
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import React from 'react';
+import React, { useEffect } from 'react';
+import { useMemoizedFn } from 'ahooks';
 import styled from 'styled-components';
 import classNames from 'classnames';
-import { useGet } from "../engine/provider/ContextProvider";
+import { useContext, useGet } from "../engine/provider/ContextProvider";
 import PageHeader from "./lc-components/PageHeader";
 import PageContent from "./lc-components/PageContent";
 import PageFooter from "./lc-components/PageFooter";
@@ -18,11 +19,24 @@ var PageRoot = styled.div.withConfig({
 });
 var Canvas = function Canvas(_ref) {
   var className = _ref.className;
-  var _useGet = useGet(['props.css', 'props.enableHeader', 'props.enableFooter']),
-    _useGet2 = _slicedToArray(_useGet, 3),
+  var _useGet = useGet(['props.css', 'props.advance', 'props.enableHeader', 'props.enableFooter']),
+    _useGet2 = _slicedToArray(_useGet, 4),
     pagerootCss = _useGet2[0],
-    enableHeader = _useGet2[1],
-    enableFooter = _useGet2[2];
+    advance = _useGet2[1],
+    enableHeader = _useGet2[2],
+    enableFooter = _useGet2[3];
+  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);
+  });
+  useEffect(function () {
+    ctx.$subscriber(ctx.topics.PAGE_LOAD_MOUNT).once(handleMount).watch();
+    return function () {
+      var _advance$events2;
+      ctx.doAction(advance === null || advance === void 0 || (_advance$events2 = advance.events) === null || _advance$events2 === void 0 ? void 0 : _advance$events2.onPageUnmount);
+    };
+  }, []);
   return /*#__PURE__*/React.createElement(PageRoot, {
     id: "page-canvas",
     className: classNames(styles['lc-view-canvas'], _defineProperty({}, className, !!className)),

package/es/lowcode/view/Page.js

@@ -1,7 +1,7 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["className", "children"];
+var _excluded = ["className"];
 import React, { useRef, forwardRef } from 'react';
 import { useMemoizedFn } from 'ahooks';
 import classNames from 'classnames';
@@ -18,7 +18,6 @@ var Masker = styled.div.withConfig({
 })(["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,
-    children = _ref2.children,
     props = _objectWithoutProperties(_ref2, _excluded);
   var _ref = useRef(null);
   var _rootRef = ref || _ref;
@@ -32,7 +31,7 @@ var LCPage = /*#__PURE__*/forwardRef(function (_ref2, ref) {
     getTargetDom: getTargetDom
   }, /*#__PURE__*/React.createElement("div", _extends({
     ref: _rootRef,
-    className: classNames(styles['lc-view-page'], 'affixWrap', _defineProperty(_defineProperty({}, styles.isloading, loading), className, !!className))
-  }, props), children, /*#__PURE__*/React.createElement(Canvas, null), loading ? /*#__PURE__*/React.createElement(Masker, null, /*#__PURE__*/React.createElement(Loading, null)) : null));
+    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));
 });
 export default LCPage;

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

@@ -1,7 +1,8 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["children", "className"];
+var _excluded = ["children", "className", "style"];
 import React from 'react';
 import { useCreation } from 'ahooks';
 import classNames from 'classnames';
@@ -10,12 +11,16 @@ import styles from "./index.less";
 var FunctionDesign = function FunctionDesign(_ref) {
   var children = _ref.children,
     className = _ref.className,
+    style = _ref.style,
     props = _objectWithoutProperties(_ref, _excluded);
   var isEmpty = useCreation(function () {
     return !children || React.Children.count(children) === 0;
   }, [children]);
   return /*#__PURE__*/React.createElement(Index, _extends({
-    className: classNames(styles['lc-component-box-design'], _defineProperty(_defineProperty({}, styles.placeholder, isEmpty), "className", !!className))
+    className: classNames(styles['lc-component-box-design'], _defineProperty(_defineProperty({}, styles.placeholder, isEmpty), "className", !!className)),
+    style: _objectSpread({
+      minHeight: 60
+    }, style)
   }, props), isEmpty ? '点击组件库的组件或拖拽组件到这里' : children);
 };
 export default FunctionDesign;

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

@@ -14,7 +14,7 @@
       "disabled": true
     }
   ],
-  "css": "height:60px; width: auto; background-color: #fff;",
+  "css": "height:100%; width: auto; background-color: #fff;",
   "advance": {
     "events": [
       {

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

@@ -1,13 +1,17 @@
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _extends from "@babel/runtime/helpers/esm/extends";
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import React, { useRef, useEffect, useImperativeHandle } from 'react';
+import React, { useRef, useEffect, useImperativeHandle, useState } from 'react';
 import { useMemoizedFn, useUpdateEffect, useCreation } from 'ahooks';
 import { Modal, Button } from 'luck-design/antd';
 import classNames from 'classnames';
 import styled from 'styled-components';
 import { LDActions } from "../../../../index";
 import { useContext } from "../../../engine/provider/ContextProvider";
+import { omitBadProps } from "../../../engine/tools/helper";
+import defaultMeta from "../../../engine/meta/dialog.props.default.json";
 import usePromiseState from "../../../engine/tools/usePromiseState";
 import Wrapper from "../Wrapper";
 import styles from "./index.less";
@@ -39,6 +43,10 @@ var LCDialog = function LCDialog(_ref) {
     _usePromiseState2 = _slicedToArray(_usePromiseState, 2),
     open = _usePromiseState2[0],
     setOpen = _usePromiseState2[1];
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    loading = _useState2[0],
+    setLoading = _useState2[1];
   var _usePromiseState3 = usePromiseState(title),
     _usePromiseState4 = _slicedToArray(_usePromiseState3, 2),
     _title = _usePromiseState4[0],
@@ -60,15 +68,29 @@ var LCDialog = function LCDialog(_ref) {
   useUpdateEffect(function () {
     _setTitle(title);
   }, [title]);
-  var handleOk = useMemoizedFn(function () {
-    ctx.doAction(advance.events.onOk);
-  });
+  var handleOk = useMemoizedFn( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          setLoading(true);
+          _context.next = 3;
+          return ctx.doAction(advance.events.onOk);
+        case 3:
+          setLoading(false);
+        case 4:
+        case "end":
+          return _context.stop();
+      }
+    }, _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 {};
+    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) {
@@ -83,10 +105,11 @@ var LCDialog = function LCDialog(_ref) {
         }
       }, cancelText), /*#__PURE__*/React.createElement(Button, {
         type: "primary",
+        loading: loading,
         onClick: handleOk
       }, okText))
     };
-  }, [footer, btnGroup]);
+  }, [footer, btnGroup, loading]);
   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');
@@ -157,4 +180,5 @@ var LCDialog = function LCDialog(_ref) {
     ref: domRef
   }), children));
 };
+LCDialog.defaultProps = omitBadProps(defaultMeta);
 export default LCDialog;

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

@@ -142,7 +142,7 @@
       {
         "key": "onOk",
         "name": "确定按钮点击",
-        "desc": "点击确定按钮时，执行方法",
+        "desc": "点击确定按钮时，执行方法,return为Promose对象时会自动追加loading状态",
         "func": "function onOk() {\n\t\n}"
       }
     ]

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

@@ -7,6 +7,8 @@ import { useMemoizedFn, useBoolean } from 'ahooks';
 import { Drawer } from 'luck-design/antd';
 import classNames from 'classnames';
 import Wrapper from "../Wrapper";
+import { omitBadProps } from "../../../engine/tools/helper";
+import defaultMeta from "../../../engine/meta/drawer.props.default.json";
 import styles from "./index.less";
 var LCDrawer = function LCDrawer(_ref) {
   var id = _ref.id,
@@ -73,4 +75,5 @@ var LCDrawer = function LCDrawer(_ref) {
     ref: domRef
   }), /*#__PURE__*/React.createElement("div", null, "LCDrawer-", id), children));
 };
+LCDrawer.defaultProps = omitBadProps(defaultMeta);
 export default LCDrawer;

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

@@ -7,6 +7,11 @@
   "groupName": "表单项",
   "order": 1,
   "props": [
+    {
+      "key": "fieldAliasName",
+      "name": "字段标题",
+      "type": "_I18nInput"
+    },
     {
       "key": "enableAlpha",
       "name": "启用透明度",
@@ -36,15 +41,93 @@
         }
       ],
       "default": "topLeft"
+    },
+    {
+      "key": "generalSetting",
+      "name": "通用配置",
+      "type": "group",
+      "props": [
+        {
+          "key": "col",
+          "name": "占列数",
+          "type": "radio",
+          "repositioning": true,
+          "options": [
+            {
+              "label": "1",
+              "value": 1
+            },
+            {
+              "label": "2",
+              "value": 2
+            },
+            {
+              "label": "3",
+              "value": 3
+            },
+            {
+              "label": "4",
+              "value": 4
+            }
+          ],
+          "default": 1
+        },
+        {
+          "key": "row",
+          "name": "占行数",
+          "type": "radio",
+          "repositioning": true,
+          "options": [
+            {
+              "label": "1",
+              "value": 1
+            },
+            {
+              "label": "2",
+              "value": 2
+            },
+            {
+              "label": "3",
+              "value": 3
+            },
+            {
+              "label": "4",
+              "value": 4
+            }
+          ],
+          "default": 1
+        },
+        {
+          "key": "note",
+          "name": "字段注释",
+          "type": "_I18nInput"
+        },
+        {
+          "key": "tip",
+          "name": "长说明",
+          "type": "_I18nInput"
+        },
+        {
+          "key": "placeholder",
+          "name": "默认提示",
+          "type": "_I18nInput"
+        }
+      ]
     }
   ],
   "advance": {
     "events": [
+      {
+        "key": "onValueChange",
+        "name": "数据变化事件",
+        "desc": "在数据变化事件时，执行方法",
+        "func": "function onValueChange(value, field, data, formProps) {\n\t\n}"
+      },
       {
         "key": "onChange",
-        "name": "色值变化事件",
-        "desc": "在色值变化时，执行方法",
-        "func": "function onChange(colors) {\n\t\n}"
+        "name": "值变化事件(onChange)",
+        "desc": "原生onChange事件，在值发生变化时，执行方法",
+        "func": "function onChange(color) {\n\t\n}"
       },
       {
         "key": "onOpen",