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

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

@@ -16,6 +16,7 @@ var _ahooks = require("ahooks");
 var _antd = require("luck-design/antd");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _styledComponents = _interopRequireDefault(require("styled-components"));
+var _lodash = require("lodash");
 var _index = require("../../../../index");
 var _ContextProvider = require("../../../engine/provider/ContextProvider");
 var _helper = require("../../../engine/tools/helper");
@@ -37,7 +38,10 @@ var LCDialog = function LCDialog(_ref) {
     wrapClassName = _ref.wrapClassName,
     maskStyle = _ref.maskStyle,
     defaultOpen = _ref.defaultOpen,
+    closable = _ref.closable,
     mask = _ref.mask,
+    padding = _ref.padding,
+    closeType = _ref.closeType,
     okText = _ref.okText,
     cancelText = _ref.cancelText,
     destroyOnClose = _ref.destroyOnClose,
@@ -83,24 +87,23 @@ var LCDialog = function LCDialog(_ref) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           setLoading(true);
-          _context.next = 3;
+          _context.prev = 1;
+          _context.next = 4;
           return ctx.doAction(advance.events.onOk);
-        case 3:
-          setLoading(false);
         case 4:
+          _context.prev = 4;
+          setLoading(false);
+          return _context.finish(4);
+        case 7:
         case "end":
           return _context.stop();
       }
-    }, _callee);
+    }, _callee, null, [[1,, 4, 7]]);
   })));
   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 {
-      confirmLoading: loading
-    };
     return {
       footer: /*#__PURE__*/_react.default.createElement(Footer, null, /*#__PURE__*/_react.default.createElement(_index.LDActions, (0, _extends2.default)({}, btnGroup, {
         doAction: function doAction(action) {
@@ -119,36 +122,36 @@ var LCDialog = function LCDialog(_ref) {
         onClick: handleOk
       }, okText))
     };
-  }, [footer, btnGroup, loading]);
+  }, [footer, btnGroup, loading, cancelText, okText]);
   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');
   });
   (0, _react.useImperativeHandle)(apiRef, function () {
     return {
-      /**
-       * 弹窗打开状态
-       * @property
+      /**
+       * 弹窗打开状态
+       * @property
        */
       open: open,
-      /**
-       * 打开弹窗
-       * @method
+      /**
+       * 打开弹窗
+       * @method
        */
       doOpen: function doOpen() {
         return setOpen(true);
       },
-      /**
-       * 关闭弹窗
-       * @method
+      /**
+       * 关闭弹窗
+       * @method
        */
       doClose: function doClose() {
         return setOpen(false);
       },
-      /**
-       * 设置弹窗标题
-       * @method
-       * @param {stirng} title -标题
+      /**
+       * 设置弹窗标题
+       * @method
+       * @param {stirng} title -标题
        */
       setTitle: function setTitle(_title) {
         return _setTitle(_title);
@@ -163,16 +166,22 @@ var LCDialog = function LCDialog(_ref) {
   }, /*#__PURE__*/_react.default.createElement(_antd.Modal, (0, _extends2.default)({
     title: _title,
     visible: open,
-    getContainer: getContainer,
     width: width,
     mask: mask,
+    closable: closable,
     maskStyle: maskStyle,
     bodyStyle: {
       height: height,
       overflowY: 'auto',
-      marginTop: 0
+      marginTop: 0,
+      padding: padding
     },
-    wrapClassName: (0, _classnames.default)(_index2.default['lc-component-dialog-wrapper'], (0, _defineProperty2.default)({}, wrapClassName, !!wrapClassName))
+    wrapClassName: (0, _classnames.default)(_index2.default['lc-component-dialog-wrapper'], (0, _defineProperty2.default)({}, wrapClassName, !!wrapClassName)),
+    maskClosable: !!(closeType !== null && closeType !== void 0 && closeType.includes('maskClosable')),
+    keyboard: !!(closeType !== null && closeType !== void 0 && closeType.includes('keyboard')),
+    getContainer: (0, _lodash.isNil)(getContainer) ? function () {
+      return document.getElementById('root') || document.getElementById('react-content') || document.body;
+    } : getContainer
   }, _footer, {
     onOk: handleOk,
     onCancel: function onCancel() {

package/lib/lowcode/view/lc-components/Dialog/index.less

@@ -1,8 +1,12 @@
-:global {
-  .runtime-design {
-    position: absolute !important;
-  }
-  div.ant-modal-root:has(> .runtime-design) {
-    display: none;
-  }
-}
+:global {
+  .runtime-design {
+    position: absolute !important;
+    .ant-modal {
+      transition: none !important;
+      transform: none !important;
+    }
+  }
+  div.ant-modal-root:has(> .runtime-design) {
+    display: none;
+  }
+}

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

@@ -1,150 +1,204 @@
-{
-  "component": "Dialog",
-  "name": "对话框",
-  "desc": "需要用户处理事务，又不希望跳转页面以致打断工作流程时，可以使用 Modal 在当前页面正中打开一个浮层，承载相应的操作。",
-  "icon": "icon-dialog",
-  "group": "basic",
-  "groupName": "基础",
-  "order": 1,
-  "props": [
-    {
-      "key": "id",
-      "name": "唯一标识",
-      "type": "string",
-      "disabled": true
-    },
-    {
-      "key": "title",
-      "name": "标题",
-      "desc": "对话框左上角的标题",
-      "type": "_I18nInput",
-      "default": "对话框"
-    },
-    {
-      "key": "width",
-      "name": "对话框宽度",
-      "type": "_WidthHeight",
-      "options": [
-        {
-          "label": "px",
-          "value": "px"
-        },
-        {
-          "label": "%",
-          "value": "%"
-        },
-        {
-          "label": "vw",
-          "value": "vw"
-        },
-        {
-          "label": "A",
-          "value": "auto"
-        }
-      ],
-      "default": "700px"
-    },
-    {
-      "key": "height",
-      "name": "内容区高度",
-      "type": "_WidthHeight",
-      "options": [
-        {
-          "label": "px",
-          "value": "px"
-        },
-        {
-          "label": "vh",
-          "value": "vh"
-        },
-        {
-          "label": "A",
-          "value": "auto"
-        }
-      ],
-      "default": "50vh"
-    },
-    {
-      "key": "defaultOpen",
-      "name": "默认显示",
-      "desc": "默认是否显示",
-      "type": "switch",
-      "default": false
-    },
-    {
-      "key": "destroyOnClose",
-      "name": "关闭销毁",
-      "desc": "关闭时销毁对话框里的子元素",
-      "type": "switch",
-      "default": true
-    },
-    {
-      "key": "mask",
-      "name": "显示遮罩",
-      "type": "switch",
-      "default": true
-    },
-    {
-      "key": "okText",
-      "name": "确认文字",
-      "type": "_I18nInput",
-      "default": "确定"
-    },
-    {
-      "key": "cancelText",
-      "name": "取消文字",
-      "type": "_I18nInput",
-      "default": "取消"
-    },
-    {
-      "key": "footer",
-      "name": "显示footer",
-      "desc": "是否显示底部按钮区域",
-      "type": "switch",
-      "default": true
-    },
-    {
-      "key": "btnGroup",
-      "name": "按钮组",
-      "desc": "底部按钮区域的按钮组（参考按钮配置）",
-      "type": "_ActionsEditor",
-      "default": { "display": "button", "max": 2, "moreText": "操作", "todoList": [] },
-      "wrapper": "collapse",
-      "wrapperProps": { "suppressIcon": true }
-    }
-  ],
-  "advance": {
-    "events": [
-      {
-        "key": "onMount",
-        "name": "组件首次渲染时",
-        "desc": "在组件首次渲染时，执行方法",
-        "func": "function onMount() {\n\t\n}"
-      },
-      {
-        "key": "onUnmount",
-        "name": "组件卸载时",
-        "desc": "在组件卸载时，执行方法。",
-        "func": "function onUnmount() {\n\t\n}"
-      },
-      {
-        "key": "onOpen",
-        "name": "对话框打开时",
-        "desc": "在对话框打开时，执行方法",
-        "func": "function onOpen() {\n\t\n}"
-      },
-      {
-        "key": "onClose",
-        "name": "对话框关闭时",
-        "desc": "在对话框打开时，执行方法，promise反馈false无法截断关闭",
-        "func": "function onClose() {\n\t\n}"
-      },
-      {
-        "key": "onOk",
-        "name": "确定按钮点击",
-        "desc": "点击确定按钮时，执行方法,return为Promose对象时会自动追加loading状态",
-        "func": "function onOk() {\n\t\n}"
-      }
-    ]
-  }
-}
+{
+  "component": "Dialog",
+  "name": "对话框",
+  "desc": "需要用户处理事务，又不希望跳转页面以致打断工作流程时，可以使用 Modal 在当前页面正中打开一个浮层，承载相应的操作。",
+  "icon": "icon-dialog",
+  "group": "basic",
+  "groupName": "基础",
+  "order": 1,
+  "props": [
+    {
+      "key": "id",
+      "name": "唯一标识",
+      "type": "string",
+      "disabled": true
+    },
+    {
+      "key": "title",
+      "name": "标题",
+      "desc": "对话框左上角的标题",
+      "type": "_I18nInput",
+      "default": "对话框"
+    },
+    {
+      "key": "width",
+      "name": "对话框宽度",
+      "type": "_WidthHeight",
+      "options": [
+        {
+          "label": "px",
+          "value": "px"
+        },
+        {
+          "label": "%",
+          "value": "%"
+        },
+        {
+          "label": "vw",
+          "value": "vw"
+        },
+        {
+          "label": "A",
+          "value": "auto"
+        }
+      ],
+      "default": "700px"
+    },
+    {
+      "key": "height",
+      "name": "内容区高度",
+      "type": "_WidthHeight",
+      "options": [
+        {
+          "label": "px",
+          "value": "px"
+        },
+        {
+          "label": "vh",
+          "value": "vh"
+        },
+        {
+          "label": "A",
+          "value": "auto"
+        }
+      ],
+      "default": "50vh"
+    },
+    {
+      "key": "padding",
+      "name": "内边距",
+      "type": "select",
+      "options": [
+        {
+          "label": "大（24px）",
+          "value": 24
+        },
+        {
+          "label": "中（16px）",
+          "value": 16
+        },
+        {
+          "label": "小（8px）",
+          "value": 8
+        },
+        {
+          "label": "无（0px）",
+          "value": 0
+        }
+      ],
+      "default": 16
+    },
+    {
+      "key": "defaultOpen",
+      "name": "默认显示",
+      "desc": "默认是否显示",
+      "type": "switch",
+      "default": false
+    },
+    {
+      "key": "mask",
+      "name": "显示遮罩",
+      "type": "switch",
+      "default": true
+    },
+    {
+      "key": "closable",
+      "name": "关闭按钮",
+      "desc": "是否显示右上角的关闭按钮",
+      "type": "switch",
+      "default": true
+    },
+    {
+      "key": "destroyOnClose",
+      "name": "关闭销毁",
+      "desc": "关闭时销毁对话框里的子元素",
+      "type": "switch",
+      "default": true
+    },
+    {
+      "key": "closeType",
+      "name": "关闭方式",
+      "type": "checkbox",
+      "options": [
+        {
+          "label": "点击遮罩",
+          "value": "maskClosable"
+        },
+        {
+          "label": "ESC",
+          "value": "keyboard"
+        }
+      ],
+      "defaultValue": ["maskClosable"]
+    },
+    {
+      "key": "footerSetting",
+      "name": "底部按钮配置",
+      "type": "group",
+      "props": [
+        {
+          "key": "footer",
+          "name": "显示footer",
+          "desc": "是否显示底部按钮区域",
+          "type": "switch",
+          "default": true
+        },
+        {
+          "key": "okText",
+          "name": "确认文字",
+          "type": "_I18nInput",
+          "default": "确定"
+        },
+        {
+          "key": "cancelText",
+          "name": "取消文字",
+          "type": "_I18nInput",
+          "default": "取消"
+        }    
+      ]
+    },
+    {
+      "key": "btnGroup",
+      "name": "按钮组",
+      "desc": "底部按钮区域的按钮组",
+      "type": "_ActionsEditor",
+      "default": { "display": "button", "max": 2, "moreText": "操作", "todoList": [] },
+      "wrapper": "collapse",
+      "wrapperProps": { "suppressIcon": true }
+    }
+  ],
+  "advance": {
+    "events": [
+      {
+        "key": "onMount",
+        "name": "组件首次渲染时",
+        "desc": "在组件首次渲染时，执行方法",
+        "func": "function onMount() {\n\t\n}"
+      },
+      {
+        "key": "onUnmount",
+        "name": "组件卸载时",
+        "desc": "在组件卸载时，执行方法。",
+        "func": "function onUnmount() {\n\t\n}"
+      },
+      {
+        "key": "onOpen",
+        "name": "对话框打开时",
+        "desc": "在对话框打开时，执行方法",
+        "func": "function onOpen() {\n\t\n}"
+      },
+      {
+        "key": "onClose",
+        "name": "对话框关闭时",
+        "desc": "在对话框关闭时，执行方法",
+        "func": "function onClose() {\n\t\n}"
+      },
+      {
+        "key": "onOk",
+        "name": "确定按钮点击",
+        "desc": "点击确定按钮时，执行方法,return为Promose对象时会自动追加loading状态",
+        "func": "function onOk() {\n\t\n}"
+      }
+    ]
+  }
+}

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

@@ -1,30 +1,74 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
+var _ahooks = require("ahooks");
 var _index = _interopRequireDefault(require("./index"));
 var _classnames = _interopRequireDefault(require("classnames"));
-var _index2 = _interopRequireDefault(require("./index.less"));
-var _excluded = ["children", "className", "show"];
+var _utils = require("@luck-design-biz/base/utils");
+var _ContextProvider = require("../../../engine/provider/ContextProvider");
+require("./index.less");
+var _boxPropsDefault = _interopRequireDefault(require("../../../engine/meta/box.props.default.json"));
+var _excluded = ["id", "children", "className", "defaultOpen"];
 var FunctionDesign = function FunctionDesign(_ref) {
-  var children = _ref.children,
+  var id = _ref.id,
+    children = _ref.children,
     className = _ref.className,
-    show = _ref.show,
+    defaultOpen = _ref.defaultOpen,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
+  var apiRef = (0, _react.useRef)();
+  var ctx = (0, _ContextProvider.useContext)();
+  (0, _react.useImperativeHandle)(apiRef, function () {
+    return {
+      doOpen: function doOpen() {
+        var _self = ctx.componentMap.get(id).api.getSelfDom();
+        _self.closest('#design-workspace').style.overflow = 'hidden';
+        _self.closest('.ant-drawer').style.display = 'block';
+      },
+      doClose: function doClose() {
+        var _self = ctx.componentMap.get(id).api.getSelfDom();
+        _self.closest('#design-workspace').style.overflow = '';
+        _self.closest('.ant-drawer').style.display = 'none';
+      }
+    };
+  }, []);
+  (0, _react.useEffect)(function () {
+    if (defaultOpen) {
+      ctx.componentMap.get(id).api.getSelfDom().closest('#design-workspace').style.overflow = 'hidden';
+    }
+  }, [defaultOpen]);
+  (0, _ahooks.useCreation)(function () {
+    if (children !== null && children !== void 0 && children.length) return;
+    ctx.$subscriber(ctx.topics.COMPONENT_APPEND).once(function (_ref2) {
+      var compId = _ref2.id;
+      if (compId !== id) return;
+      (0, _ContextProvider.addNode)(id, "box_".concat((0, _utils.suid)()), (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _boxPropsDefault.default), {}, {
+        buildIn: true
+      }));
+    }).watch();
+  }, []);
   return /*#__PURE__*/_react.default.createElement(_index.default, (0, _extends2.default)({
-    className: (0, _classnames.default)(_index2.default['runtime-design'], (0, _defineProperty2.default)((0, _defineProperty2.default)({}, className, !!className), "hidden", !show)),
+    id: id,
+    className: (0, _classnames.default)('runtime-design', (0, _defineProperty2.default)({}, className, !!className)),
     getContainer: false,
-    show: show,
     style: {
       position: 'absolute'
     }
-  }, props), children);
+  }, props, {
+    $apiRef: apiRef,
+    $designProps: {
+      visible: true,
+      zIndex: 10
+    }
+  }), children);
 };
 var _default = exports.default = FunctionDesign;