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

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

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

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _ahooks = require("ahooks");
@@ -21,7 +22,8 @@ var EventItem = _styledComponents.default.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 = (0, _react.useRef)((0, _lodash.cloneDeep)(defaultValue));
   var _useState = (0, _react.useState)(null),
@@ -73,9 +75,15 @@ var TreeRootEditor = function TreeRootEditor(_ref) {
       cursor: 'pointer'
     },
     onClick: function onClick() {
-      return setEvent(valueRef.current);
+      setEvent((0, _objectSpread2.default)((0, _objectSpread2.default)({}, valueRef.current), {}, {
+        name: (0, _utils.formatMessage)({
+          id: 'luckda.lowcode.painter.tree.rootAdd',
+          label: '根节点新增'
+        })
+      }));
     }
   })))), /*#__PURE__*/_react.default.createElement(_ActionBindModal.default, {
+    nodeId: nodeId,
     event: event,
     onComfirm: handleComfirm,
     onClose: function onClose() {

package/lib/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/lib/lowcode/view/Canvas.js

@@ -1,5 +1,6 @@
 "use strict";
 
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
@@ -7,7 +8,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
+var _ahooks = require("ahooks");
 var _styledComponents = _interopRequireDefault(require("styled-components"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _ContextProvider = require("../engine/provider/ContextProvider");
@@ -25,11 +27,24 @@ var PageRoot = _styledComponents.default.div.withConfig({
 });
 var Canvas = function Canvas(_ref) {
   var className = _ref.className;
-  var _useGet = (0, _ContextProvider.useGet)(['props.css', 'props.enableHeader', 'props.enableFooter']),
-    _useGet2 = (0, _slicedToArray2.default)(_useGet, 3),
+  var _useGet = (0, _ContextProvider.useGet)(['props.css', 'props.advance', 'props.enableHeader', 'props.enableFooter']),
+    _useGet2 = (0, _slicedToArray2.default)(_useGet, 4),
     pagerootCss = _useGet2[0],
-    enableHeader = _useGet2[1],
-    enableFooter = _useGet2[2];
+    advance = _useGet2[1],
+    enableHeader = _useGet2[2],
+    enableFooter = _useGet2[3];
+  var ctx = (0, _ContextProvider.useContext)();
+  var handleMount = (0, _ahooks.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);
+  });
+  (0, _react.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.default.createElement(PageRoot, {
     id: "page-canvas",
     className: (0, _classnames.default)(_canvas.default['lc-view-canvas'], (0, _defineProperty2.default)({}, className, !!className)),

package/lib/lowcode/view/Page.js

@@ -19,14 +19,13 @@ var _Wrapper = _interopRequireDefault(require("./lc-components/Wrapper"));
 var _Canvas = _interopRequireDefault(require("./Canvas"));
 var _constants = require("../constants");
 var _page = _interopRequireDefault(require("./style/page.less"));
-var _excluded = ["className", "children"];
+var _excluded = ["className"];
 var Masker = _styledComponents.default.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__*/(0, _react.forwardRef)(function (_ref2, ref) {
   var className = _ref2.className,
-    children = _ref2.children,
     props = (0, _objectWithoutProperties2.default)(_ref2, _excluded);
   var _ref = (0, _react.useRef)(null);
   var _rootRef = ref || _ref;
@@ -40,7 +39,7 @@ var LCPage = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
     getTargetDom: getTargetDom
   }, /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({
     ref: _rootRef,
-    className: (0, _classnames.default)(_page.default['lc-view-page'], 'affixWrap', (0, _defineProperty2.default)((0, _defineProperty2.default)({}, _page.default.isloading, loading), className, !!className))
-  }, props), children, /*#__PURE__*/_react.default.createElement(_Canvas.default, null), loading ? /*#__PURE__*/_react.default.createElement(Masker, null, /*#__PURE__*/_react.default.createElement(_Loading.default, null)) : null));
+    className: (0, _classnames.default)(_page.default['lc-view-page'], (0, _defineProperty2.default)((0, _defineProperty2.default)({}, _page.default.isloading, loading), className, !!className))
+  }, props), /*#__PURE__*/_react.default.createElement(_Canvas.default, null), loading ? /*#__PURE__*/_react.default.createElement(Masker, null, /*#__PURE__*/_react.default.createElement(_Loading.default, null)) : null));
 });
 var _default = exports.default = LCPage;

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireDefault(require("react"));
@@ -13,16 +14,20 @@ var _ahooks = require("ahooks");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _index = _interopRequireDefault(require("./index"));
 var _index2 = _interopRequireDefault(require("./index.less"));
-var _excluded = ["children", "className"];
+var _excluded = ["children", "className", "style"];
 var FunctionDesign = function FunctionDesign(_ref) {
   var children = _ref.children,
     className = _ref.className,
+    style = _ref.style,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var isEmpty = (0, _ahooks.useCreation)(function () {
     return !children || _react.default.Children.count(children) === 0;
   }, [children]);
   return /*#__PURE__*/_react.default.createElement(_index.default, (0, _extends2.default)({
-    className: (0, _classnames.default)(_index2.default['lc-component-box-design'], (0, _defineProperty2.default)((0, _defineProperty2.default)({}, _index2.default.placeholder, isEmpty), "className", !!className))
+    className: (0, _classnames.default)(_index2.default['lc-component-box-design'], (0, _defineProperty2.default)((0, _defineProperty2.default)({}, _index2.default.placeholder, isEmpty), "className", !!className)),
+    style: (0, _objectSpread2.default)({
+      minHeight: 60
+    }, style)
   }, props), isEmpty ? '点击组件库的组件或拖拽组件到这里' : children);
 };
 var _default = exports.default = FunctionDesign;

package/lib/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/lib/lowcode/view/lc-components/Dialog/index.js

@@ -8,6 +8,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _ahooks = require("ahooks");
@@ -16,6 +18,8 @@ var _classnames = _interopRequireDefault(require("classnames"));
 var _styledComponents = _interopRequireDefault(require("styled-components"));
 var _index = require("../../../../index");
 var _ContextProvider = require("../../../engine/provider/ContextProvider");
+var _helper = require("../../../engine/tools/helper");
+var _dialogPropsDefault = _interopRequireDefault(require("../../../engine/meta/dialog.props.default.json"));
 var _usePromiseState5 = _interopRequireDefault(require("../../../engine/tools/usePromiseState"));
 var _Wrapper = _interopRequireDefault(require("../Wrapper"));
 var _index2 = _interopRequireDefault(require("./index.less"));
@@ -47,6 +51,10 @@ var LCDialog = function LCDialog(_ref) {
     _usePromiseState2 = (0, _slicedToArray2.default)(_usePromiseState, 2),
     open = _usePromiseState2[0],
     setOpen = _usePromiseState2[1];
+  var _useState = (0, _react.useState)(false),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    loading = _useState2[0],
+    setLoading = _useState2[1];
   var _usePromiseState3 = (0, _usePromiseState5.default)(title),
     _usePromiseState4 = (0, _slicedToArray2.default)(_usePromiseState3, 2),
     _title = _usePromiseState4[0],
@@ -68,15 +76,29 @@ var LCDialog = function LCDialog(_ref) {
   (0, _ahooks.useUpdateEffect)(function () {
     _setTitle(title);
   }, [title]);
-  var handleOk = (0, _ahooks.useMemoizedFn)(function () {
-    ctx.doAction(advance.events.onOk);
-  });
+  var handleOk = (0, _ahooks.useMemoizedFn)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+    return (0, _regeneratorRuntime2.default)().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 = (0, _ahooks.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.default.createElement(Footer, null, /*#__PURE__*/_react.default.createElement(_index.LDActions, (0, _extends2.default)({}, btnGroup, {
         doAction: function doAction(action) {
@@ -91,10 +113,11 @@ var LCDialog = function LCDialog(_ref) {
         }
       }, cancelText), /*#__PURE__*/_react.default.createElement(_antd.Button, {
         type: "primary",
+        loading: loading,
         onClick: handleOk
       }, okText))
     };
-  }, [footer, btnGroup]);
+  }, [footer, btnGroup, loading]);
   var getTargetDom = (0, _ahooks.useMemoizedFn)(function () {
     var _domRef$current;
     return (_domRef$current = domRef.current) === null || _domRef$current === void 0 ? void 0 : _domRef$current.closest('.ant-modal-content');
@@ -165,4 +188,5 @@ var LCDialog = function LCDialog(_ref) {
     ref: domRef
   }), children));
 };
+LCDialog.defaultProps = (0, _helper.omitBadProps)(_dialogPropsDefault.default);
 var _default = exports.default = LCDialog;

package/lib/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/lib/lowcode/view/lc-components/Drawer/index.js

@@ -14,6 +14,8 @@ var _ahooks = require("ahooks");
 var _antd = require("luck-design/antd");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _Wrapper = _interopRequireDefault(require("../Wrapper"));
+var _helper = require("../../../engine/tools/helper");
+var _drawerPropsDefault = _interopRequireDefault(require("../../../engine/meta/drawer.props.default.json"));
 var _index = _interopRequireDefault(require("./index.less"));
 var _excluded = ["id", "children", "className", "getContainer", "style"];
 var LCDrawer = function LCDrawer(_ref) {
@@ -81,4 +83,5 @@ var LCDrawer = function LCDrawer(_ref) {
     ref: domRef
   }), /*#__PURE__*/_react.default.createElement("div", null, "LCDrawer-", id), children));
 };
+LCDrawer.defaultProps = (0, _helper.omitBadProps)(_drawerPropsDefault.default);
 var _default = exports.default = LCDrawer;