@luck-design-biz/luckda 1.0.2 → 1.0.3-13tl

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

@@ -1,3 +1,4 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
@@ -8,10 +9,10 @@ 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 { isNil, isObject, isBoolean } from 'lodash';
 import { LDActions } from "../../../../index";
 import { useContext } from "../../../engine/provider/ContextProvider";
-import { omitBadProps } from "../../../engine/tools/helper";
+import { omitBadProps, executeCode } from "../../../engine/tools/helper";
 import defaultMeta from "../../../engine/meta/dialog.props.default.json";
 import usePromiseState from "../../../engine/tools/usePromiseState";
 import Wrapper from "../Wrapper";
@@ -40,6 +41,8 @@ var LCDialog = function LCDialog(_ref) {
     footer = _ref.footer,
     btnGroup = _ref.btnGroup,
     advance = _ref.advance,
+    size = _ref.size,
+    style = _ref.style,
     $apiRef = _ref.$apiRef,
     $designProps = _ref.$designProps;
   var ctx = useContext();
@@ -69,6 +72,7 @@ var LCDialog = function LCDialog(_ref) {
       ctx.doAction(advance.events.onOpen);
     } else {
       ctx.doAction(advance.events.onClose);
+      setLoading(false);
     }
   }, [open]);
   useUpdateEffect(function () {
@@ -93,7 +97,7 @@ var LCDialog = function LCDialog(_ref) {
     }, _callee, null, [[1,, 4, 7]]);
   })));
   var _footer = useCreation(function () {
-    if (!footer) return {
+    if (isBoolean(footer) && !footer || isObject(footer) && !footer.checked || isObject(footer) && footer.code && !executeCode(ctx, footer.code)) return {
       footer: null
     };
     return {
@@ -114,36 +118,36 @@ var LCDialog = function LCDialog(_ref) {
         onClick: handleOk
       }, okText))
     };
-  }, [footer, btnGroup, loading, cancelText, okText]);
+  }, [footer, btnGroup, loading, cancelText, okText, open]);
   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');
   });
   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);
@@ -179,7 +183,10 @@ var LCDialog = function LCDialog(_ref) {
     onCancel: function onCancel() {
       return setOpen(false);
     },
-    destroyOnClose: destroyOnClose
+    destroyOnClose: destroyOnClose,
+    style: size === 'full' || height === '100vh' ? _objectSpread(_objectSpread({}, style), {}, {
+      top: '0px'
+    }) : style
   }, $designProps), /*#__PURE__*/React.createElement("div", {
     style: {
       height: 0,

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

@@ -1,12 +1,12 @@
-:global {
-  .runtime-design {
-    position: absolute !important;
-    .ant-modal {
-      transition: none !important;
-      transform: none !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/es/lowcode/view/lc-components/Dialog/meta.json

@@ -1,204 +1,224 @@
-{
-  "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}"
-      }
-    ]
-  }
-}
+{
+  "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": "size",
+      "name": "#展现尺寸",
+      "type": "_DialogSize",
+      "default": "custom"
+    },
+    {
+      "key": "width",
+      "name": "对话框宽度",
+      "type": "_DialogWidthHeight",
+      "options": [
+        {
+          "label": "px",
+          "value": "px"
+        },
+        {
+          "label": "%",
+          "value": "%"
+        },
+        {
+          "label": "vw",
+          "value": "vw"
+        },
+        {
+          "label": "A",
+          "value": "auto"
+        }
+      ],
+      "sizeOptions":{
+        "small": "540px",
+        "default": "700px",
+        "large": "1150px",
+        "full": "100vw"
+      },
+      "default": "700px"
+    },
+    {
+      "key": "height",
+      "name": "内容区高度",
+      "type": "_DialogWidthHeight",
+      "options": [
+        {
+          "label": "px",
+          "value": "px"
+        },
+        {
+          "label": "vh",
+          "value": "vh"
+        },
+        {
+          "label": "A",
+          "value": "auto"
+        }
+      ],
+      "sizeOptions":{
+        "small": "40vh",
+        "default": "60vh",
+        "large": "85vh",
+        "full": "100vh"
+      },
+      "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": "_ConditionCheck",
+          "default": {
+            "checked": 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/es/lowcode/view/lc-components/Drawer/index.js

@@ -9,12 +9,12 @@ import { useMemoizedFn, useUpdateEffect } from 'ahooks';
 import { Drawer, Button } from 'luck-design/antd';
 import classNames from 'classnames';
 import styled from 'styled-components';
-import { isNil } from 'lodash';
+import { isNil, isObject, isBoolean } from 'lodash';
 import Wrapper from "../Wrapper";
 import { LDActions } from "../../../../index";
 import { useContext } from "../../../engine/provider/ContextProvider";
 import usePromiseState from "../../../engine/tools/usePromiseState";
-import { omitBadProps } from "../../../engine/tools/helper";
+import { omitBadProps, executeCode } from "../../../engine/tools/helper";
 import defaultMeta from "../../../engine/meta/drawer.props.default.json";
 import styles from "./index.less";
 var Footer = styled.div.withConfig({
@@ -98,29 +98,29 @@ var LCDrawer = function LCDrawer(_ref) {
   });
   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);
@@ -171,7 +171,7 @@ var LCDrawer = function LCDrawer(_ref) {
       visibility: 'hidden'
     },
     ref: domRef
-  }), children, footer ? /*#__PURE__*/React.createElement(Footer, {
+  }), children, isBoolean(footer) && footer || isObject(footer) && (footer.check || footer.code && executeCode(ctx, footer.code)) ? /*#__PURE__*/React.createElement(Footer, {
     className: "ant-drawer-footer"
   }, /*#__PURE__*/React.createElement(LDActions, _extends({}, btnGroup, {
     doAction: function doAction(action) {

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

@@ -1,13 +1,13 @@
-:global {
-  .runtime-design {
-    position: absolute !important;
-
-    .ant-drawer-content-wrapper {
-      transition: none !important;
-      transform: none !important;
-    }
-  }
-  div.ant-drawer.runtime-design {
-    display: none;
-  }
-}
+:global {
+  .runtime-design {
+    position: absolute !important;
+
+    .ant-drawer-content-wrapper {
+      transition: none !important;
+      transform: none !important;
+    }
+  }
+  div.ant-drawer.runtime-design {
+    display: none;
+  }
+}