fan-standard-comp 3.2.1 → 4.0.1

package/es/StandardDragModal/ChangeStandardModal.js

@@ -1,33 +1,35 @@
-import "antd/es/modal/style";
-import _Modal from "antd/es/modal";
-import "antd/es/button/style";
-import _Button from "antd/es/button";
-import "antd/es/col/style";
-import _Col from "antd/es/col";
-import "antd/es/row/style";
-import _Row from "antd/es/row";
-import "antd/es/form/style";
-import _Form from "antd/es/form";
+var _excluded = ["children", "className", "style", "size", "type", "formItemGroup", "title", "visible", "formPrefix", "formPostfix", "initialValues", "hideRequiredMark", "bodyStyle", "footer", "footerButtonGroup", "hideFooter", "getFormFields", "fieldStatus", "formLayout", "tabsConfig", "stepsConfig", "displayLayout", "dragAble"],
+  _excluded2 = ["name", "type", "icon", "ghost", "disabled", "loading", "fn"];
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0) { ; } } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import { __rest } from "tslib";
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+/* eslint-disable */
 import React, { useEffect, useMemo, useState } from 'react';
-import { general } from '../data';
-import RenderItemGroup from '../FormComp/RenderItemGroup';
-import UtilValueFormat from '../utils/ValueFormat.js';
+import { Form, Modal, Button, Row, Col } from 'antd';
+import { general } from "../data";
+import RenderItemGroup from "../FormComp/RenderItemGroup";
+import { UtilValueFormat } from "../utils";
 import IconNode from "../components/IconNode";
-import TabForm from '../StandardForm/TabForm';
-import StepForm from '../StandardForm/StepForm';
-import ActionList from '../StandardForm/ActionList.js';
-import './style/index.less';
+import TabForm from "../StandardForm/TabForm";
+import StepForm from "../StandardForm/StepForm";
+// @ts-ignore
+import ActionList from "../StandardForm/ActionList";
+import "./style/index.less";
 // import { DraggableModal, DraggableModalProvider } from '../StandardDragModal/index'
-import StandardDragModal from '../StandardDragModal/Modal';
-import '../StandardDragModal/index.less';
+import StandardDragModal from "../StandardDragModal/Modal";
+import "../StandardDragModal/index.less";
 var StandardModal = function StandardModal(props) {
   var children = props.children,
     className = props.className,
@@ -56,8 +58,8 @@ var StandardModal = function StandardModal(props) {
     displayLayout = props.displayLayout,
     _props$dragAble = props.dragAble,
     dragAble = _props$dragAble === void 0 ? false : _props$dragAble,
-    otherProps = __rest(props, ["children", "className", "style", "size", "type", "formItemGroup", "title", "visible", "formPrefix", "formPostfix", "initialValues", "hideRequiredMark", "bodyStyle", "footer", "footerButtonGroup", "hideFooter", "getFormFields", "fieldStatus", "formLayout", "tabsConfig", "stepsConfig", "displayLayout", "dragAble"]);
-  var _Form$useForm = _Form.useForm(),
+    otherProps = _objectWithoutProperties(props, _excluded);
+  var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     modalForm = _Form$useForm2[0];
   var _useState = useState(),
@@ -67,27 +69,31 @@ var StandardModal = function StandardModal(props) {
   var _useState3 = useState(0),
     _useState4 = _slicedToArray(_useState3, 2),
     bodyMaxHeight = _useState4[0],
-    setBodyMaxHeight = _useState4[1]; // setTabFormChild
+    setBodyMaxHeight = _useState4[1];
+
+  // setTabFormChild
   var _useState5 = useState(),
     _useState6 = _slicedToArray(_useState5, 2),
     formChild = _useState6[0],
     setFormChild = _useState6[1]; // <---- set the ref when Form Rendered
+
   // 按钮栏是否有显示（默认显示）
   var hasFooterBar = useMemo(function () {
-    var _a, _b, _c, _d, _e;
     var openLog = false;
     if (type === 'tabForm' || type === 'stepForm') {
       if (type === 'tabForm') {
-        var activeTabInfo = formItemGroup.find(function (fItem) {
+        var _activeTabInfo$action, _activeTabInfo$action2;
+        var activeTabInfo = (formItemGroup || []).find(function (fItem) {
           return fItem.key === (tabsConfig === null || tabsConfig === void 0 ? void 0 : tabsConfig.activeKey);
         });
-        openLog && console.log('rule 0-1', ((_a = activeTabInfo === null || activeTabInfo === void 0 ? void 0 : activeTabInfo.actions) === null || _a === void 0 ? void 0 : _a.length) > 0);
-        return ((_b = activeTabInfo === null || activeTabInfo === void 0 ? void 0 : activeTabInfo.actions) === null || _b === void 0 ? void 0 : _b.length) > 0;
+        openLog && console.log('rule 0-1', (activeTabInfo === null || activeTabInfo === void 0 || (_activeTabInfo$action = activeTabInfo.actions) === null || _activeTabInfo$action === void 0 ? void 0 : _activeTabInfo$action.length) > 0);
+        return (activeTabInfo === null || activeTabInfo === void 0 || (_activeTabInfo$action2 = activeTabInfo.actions) === null || _activeTabInfo$action2 === void 0 ? void 0 : _activeTabInfo$action2.length) > 0;
       }
       if (type === 'stepForm') {
-        var currentStepInfo = formItemGroup[stepsConfig.current];
-        openLog && console.log('rule 0-2', ((_c = currentStepInfo === null || currentStepInfo === void 0 ? void 0 : currentStepInfo.actions) === null || _c === void 0 ? void 0 : _c.length) > 0);
-        return ((_d = currentStepInfo === null || currentStepInfo === void 0 ? void 0 : currentStepInfo.actions) === null || _d === void 0 ? void 0 : _d.length) > 0;
+        var _currentStepInfo$acti, _currentStepInfo$acti2;
+        var currentStepInfo = (formItemGroup || [])[stepsConfig.current];
+        openLog && console.log('rule 0-2', (currentStepInfo === null || currentStepInfo === void 0 || (_currentStepInfo$acti = currentStepInfo.actions) === null || _currentStepInfo$acti === void 0 ? void 0 : _currentStepInfo$acti.length) > 0);
+        return (currentStepInfo === null || currentStepInfo === void 0 || (_currentStepInfo$acti2 = currentStepInfo.actions) === null || _currentStepInfo$acti2 === void 0 ? void 0 : _currentStepInfo$acti2.length) > 0;
       }
       return true;
     } else {
@@ -105,11 +111,12 @@ var StandardModal = function StandardModal(props) {
         return false;
       }
       if (props.hasOwnProperty('footerButtonGroup') && footerButtonGroup) {
+        var _footerButtonGroup;
         if (Array.isArray(footerButtonGroup) && footerButtonGroup.length === 0) {
           openLog && console.log('rule 4');
           // 返回为空数组不占用按钮栏
           return false;
-        } else if (typeof footerButtonGroup === 'function' && (!footerButtonGroup() || ((_e = footerButtonGroup()) === null || _e === void 0 ? void 0 : _e.length) === 0)) {
+        } else if (typeof footerButtonGroup === 'function' && (!footerButtonGroup() || ((_footerButtonGroup = footerButtonGroup()) === null || _footerButtonGroup === void 0 ? void 0 : _footerButtonGroup.length) === 0)) {
           openLog && console.log('rule 5');
           // 配置类型为Function且返回值为null或者返回数组长度为0时，不显示按钮栏
           return false;
@@ -144,7 +151,7 @@ var StandardModal = function StandardModal(props) {
     if (visible && modalFormRef) {
       // <---- check ref before use the form instance
       if (initialValues && _typeof(initialValues) === 'object') {
-        initialValues && modalForm.setFieldsValue(Object.assign({}, initialValues));
+        initialValues && modalForm.setFieldsValue(_objectSpread({}, initialValues));
         forceUpdateForm();
       }
     }
@@ -170,10 +177,9 @@ var StandardModal = function StandardModal(props) {
         if (Object.prototype.hasOwnProperty.call(values, 'false')) {
           delete values.false; // 自定义结构会莫名的出来一个false字段
         }
-
         var resultValues = UtilValueFormat(values, formItemGroup);
         if (onSubmit) {
-          onSubmit(Object.assign({}, resultValues));
+          onSubmit(_objectSpread({}, resultValues));
         }
       }).catch(function () {
         // 定位到第一条表单异常的
@@ -190,10 +196,9 @@ var StandardModal = function StandardModal(props) {
         if (Object.prototype.hasOwnProperty.call(values, 'false')) {
           delete values.false; // 自定义结构会莫名的出来一个false字段
         }
-
         var resultValues = UtilValueFormat(values, formItemGroup);
         if (onSubmit) {
-          onSubmit(Object.assign({}, resultValues));
+          onSubmit(_objectSpread({}, resultValues));
         }
       }).catch(function () {
         // 定位到第一条表单异常的
@@ -208,6 +213,7 @@ var StandardModal = function StandardModal(props) {
       onSubmit && onSubmit();
     }
   };
+
   // 重置所有表单
   var clearAllFieldsValue = function clearAllFieldsValue() {
     // let allFields = {}
@@ -215,7 +221,6 @@ var StandardModal = function StandardModal(props) {
     // modalForm.setFieldsValue(allFields) // 直接清空表单的赋值(initialValues传值如果没有前后赋值没有全部带上所有字段，则会默认又使用之前的部分未传参字段)
     modalForm.resetFields(); // 直接使用这个无效
   };
-
   var onAfterClose = function onAfterClose() {
     var afterClose = props.afterClose;
     if (type === 'form') clearAllFieldsValue();
@@ -225,6 +230,7 @@ var StandardModal = function StandardModal(props) {
     var onCancel = props.onCancel;
     if (onCancel) onCancel();
   };
+
   // 强制更新表单值，用于赋初始化实例值
   var forceUpdateForm = function forceUpdateForm() {
     _getFormFields && _getFormFields(modalForm.getFieldsValue() || {}, modalForm);
@@ -238,7 +244,7 @@ var StandardModal = function StandardModal(props) {
     if (Array.isArray(formItemGroup)) {
       if (type === 'gridForm') {
         // 栅格组
-        return /*#__PURE__*/React.createElement(_Row, {
+        return /*#__PURE__*/React.createElement(Row, {
           gutter: 20
         }, formItemGroup.map(function (item, index) {
           var childrenFields = item.fields || [];
@@ -246,10 +252,11 @@ var StandardModal = function StandardModal(props) {
             childrenFields = [{
               type: item.type,
               label: item.label,
-              protoConfig: Object.assign({}, item.protoConfig)
+              protoConfig: _objectSpread({}, item.protoConfig)
+              // protoConfig: { className: '', ...item.protoConfig }
             }].concat(childrenFields);
           }
-          return /*#__PURE__*/React.createElement(_Col, {
+          return /*#__PURE__*/React.createElement(Col, {
             key: index,
             span: item.gridSpan || 24
           }, /*#__PURE__*/React.createElement(RenderItemGroup, {
@@ -286,24 +293,24 @@ var StandardModal = function StandardModal(props) {
       case 'next':
         // 获取当前步骤的表单配置下有 rules 的控件进行校验（自定义的控件则自己有业务层面处理添加校验）
         // console.log('执行下一步骤，需要优先进行校验')
-        var currentFields = formItemGroup[current].fields;
+        var currentFields = (formItemGroup || [])[current].fields;
         var validatorGroup = currentFields && Array.isArray(currentFields) ? currentFields.map(function (fItem) {
           return fItem.rules ? fItem.filedName : null;
         }) : [];
         formChild.validateFields(validatorGroup).then(function () {
           // if (stepClick) stepClick(type, formChild, values);
-          extraFunc();
+          extraFunc && extraFunc();
         }).catch(function () {
           // console.log('表单校验不通过 ', errorFields.map(err => err))
         });
         break;
       case 'prev':
         // if (stepClick) stepClick(type, formChild);
-        extraFunc();
+        extraFunc && extraFunc();
         break;
       case 'cancel':
         // if (stepClick) stepClick(type, formChild);
-        extraFunc();
+        extraFunc && extraFunc();
         break;
       default:
         // extraFunc()
@@ -332,8 +339,8 @@ var StandardModal = function StandardModal(props) {
               disabled = item.disabled,
               loading = item.loading,
               fn = item.fn,
-              others = __rest(item, ["name", "type", "icon", "ghost", "disabled", "loading", "fn"]);
-            return /*#__PURE__*/React.createElement(_Button, Object.assign({
+              others = _objectWithoutProperties(item, _excluded2);
+            return /*#__PURE__*/React.createElement(Button, _extends({
               key: name,
               type: _type || 'primary',
               icon: /*#__PURE__*/React.createElement(IconNode, {
@@ -351,28 +358,27 @@ var StandardModal = function StandardModal(props) {
           }
         }));
       }
-
       if (typeof footerButtonGroup === 'function') {
         return footerButtonGroup(modalForm, props);
       }
       return footerButtonGroup;
     }
     if (footer) return footer;
-    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Button, Object.assign({
+    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Button, _extends({
       key: "submit",
       type: 'primary',
       loading: confirmLoading,
       onClick: handleSubmit
-    }, confirmButtonProps, okButtonProps), confirmText || okText || '确定'), /*#__PURE__*/React.createElement(_Button, Object.assign({
+    }, confirmButtonProps, okButtonProps), confirmText || okText || '确定'), /*#__PURE__*/React.createElement(Button, _extends({
       key: "back",
       onClick: handleCancel
     }, cancelButtonProps), cancelText || '取消'));
   };
   var renderFooter = function renderFooter() {
-    var _a, _b;
     if (type === 'stepForm') {
-      var currentStepInfo = formItemGroup[stepsConfig.current];
-      return ((_a = currentStepInfo === null || currentStepInfo === void 0 ? void 0 : currentStepInfo.actions) === null || _a === void 0 ? void 0 : _a.length) > 0 ? /*#__PURE__*/React.createElement(ActionList, {
+      var _currentStepInfo$acti3;
+      var currentStepInfo = (formItemGroup || [])[stepsConfig.current];
+      return (currentStepInfo === null || currentStepInfo === void 0 || (_currentStepInfo$acti3 = currentStepInfo.actions) === null || _currentStepInfo$acti3 === void 0 ? void 0 : _currentStepInfo$acti3.length) > 0 ? /*#__PURE__*/React.createElement(ActionList, {
         list: currentStepInfo.actions || [],
         onStep: handleStepType,
         form: formChild,
@@ -380,11 +386,12 @@ var StandardModal = function StandardModal(props) {
       }) : null;
     }
     if (type === 'tabForm') {
-      var activeTabInfo = formItemGroup.find(function (fItem) {
+      var _activeTabInfo$action3;
+      var activeTabInfo = (formItemGroup || []).find(function (fItem) {
         return fItem.key === (tabsConfig === null || tabsConfig === void 0 ? void 0 : tabsConfig.activeKey);
       });
-      return ((_b = activeTabInfo === null || activeTabInfo === void 0 ? void 0 : activeTabInfo.actions) === null || _b === void 0 ? void 0 : _b.length) > 0 ? /*#__PURE__*/React.createElement(ActionList, {
-        list: activeTabInfo.actions || [],
+      return (activeTabInfo === null || activeTabInfo === void 0 || (_activeTabInfo$action3 = activeTabInfo.actions) === null || _activeTabInfo$action3 === void 0 ? void 0 : _activeTabInfo$action3.length) > 0 ? /*#__PURE__*/React.createElement(ActionList, {
+        list: (activeTabInfo === null || activeTabInfo === void 0 ? void 0 : activeTabInfo.actions) || [],
         form: formChild,
         other: props
       }) : null;
@@ -393,21 +400,23 @@ var StandardModal = function StandardModal(props) {
   };
   // 内容渲染
   var renderChildrenNodes = function renderChildrenNodes() {
-    return /*#__PURE__*/React.createElement(React.Fragment, null, children, (type === 'form' || type === 'gridForm') && /*#__PURE__*/React.createElement(_Form, {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, children, (type === 'form' || type === 'gridForm') && /*#__PURE__*/React.createElement(Form, {
       layout: formLayout,
       ref: setModalFormRef,
       form: modalForm,
       onFinish: handleSubmit,
-      hideRequiredMark: fieldStatus === 'viewOnly' || hideRequiredMark,
+      hideRequiredMark: fieldStatus === 'viewOnly' || hideRequiredMark
       // initialValues={{ ...initialValues }}
+      ,
       scrollToFirstError: true,
       className: "modalForm"
-    }, formPrefix && /*#__PURE__*/React.createElement(_Row, null, formPrefix(modalForm, props, forceUpdateForm)), formItemGroup ? renderFormItemGroup() : null, formPostfix && /*#__PURE__*/React.createElement(_Row, null, formPostfix(modalForm, props, forceUpdateForm), " ")), type === 'tabForm' && /*#__PURE__*/React.createElement(TabForm, {
+    }, formPrefix && /*#__PURE__*/React.createElement(Row, null, formPrefix(modalForm, props, forceUpdateForm)), formItemGroup ? renderFormItemGroup() : null, formPostfix && /*#__PURE__*/React.createElement(Row, null, formPostfix(modalForm, props, forceUpdateForm), " ")), type === 'tabForm' && /*#__PURE__*/React.createElement(TabForm, {
       grid: size,
       layout: formLayout,
       fieldStatus: fieldStatus,
-      actionHide: true,
+      actionHide: true
       // @ts-ignore
+      ,
       getFormFields: function getFormFields(fields, form) {
         setFormChild(form);
         _getFormFields && _getFormFields(fields, form);
@@ -415,14 +424,15 @@ var StandardModal = function StandardModal(props) {
       formItemGroup: formItemGroup,
       tabsConfig: tabsConfig,
       onSubmit: handleSubmit,
-      initialValues: Object.assign({}, initialValues),
+      initialValues: _objectSpread({}, initialValues),
       displayLayout: displayLayout
     }), type === 'stepForm' && /*#__PURE__*/React.createElement(StepForm, {
       grid: size,
       layout: formLayout,
       fieldStatus: fieldStatus,
-      actionHide: true,
+      actionHide: true
       // @ts-ignore
+      ,
       getFormFields: function getFormFields(fields, form) {
         setFormChild(form);
         _getFormFields && _getFormFields(fields, form);
@@ -430,14 +440,16 @@ var StandardModal = function StandardModal(props) {
       formItemGroup: formItemGroup,
       stepsConfig: stepsConfig,
       onSubmit: handleSubmit,
-      initialValues: Object.assign({}, initialValues),
+      initialValues: _objectSpread({}, initialValues),
       displayLayout: displayLayout
     }));
   };
   // 可拖动及缩放
   if (dragAble) {
-    return /*#__PURE__*/React.createElement(StandardDragModal, Object.assign({
-      destroyOnClose: true,
+    return /*#__PURE__*/React.createElement(StandardDragModal, _extends({
+      destroyOnClose: true
+      // @ts-ignore
+      ,
       initialWidth: otherProps.width || general.modalSize[size].width,
       initialHeight: otherProps.height,
       zIndex: 1001
@@ -468,20 +480,21 @@ var StandardModal = function StandardModal(props) {
        </DraggableModal>
      </DraggableModalProvider>*/
   }
-
-  return /*#__PURE__*/React.createElement(_Modal, Object.assign({
+  return /*#__PURE__*/React.createElement(Modal, _extends({
     destroyOnClose: true,
-    maskClosable: false,
+    maskClosable: false
+    // @ts-ignore
+    ,
     width: general.modalSize[size].width
   }, otherProps, {
     open: visible,
     title: title,
     footer: renderFooter(),
     className: "standardModal ".concat(className || '', " ").concat(fieldStatus === 'viewOnly' ? 'is-view' : ''),
-    style: Object.assign({
+    style: _objectSpread({
       top: '80px'
     }, style),
-    bodyStyle: Object.assign({
+    bodyStyle: _objectSpread({
       maxHeight: bodyMaxHeight,
       overflowY: 'scroll'
     }, bodyStyle),

package/es/StandardDragModal/DraggableModal.js

@@ -1,12 +1,14 @@
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 import * as React from 'react';
 import { useContext } from 'react';
 import { useUID } from 'react-uid';
-import { DraggableModalContext } from './DraggableModalContext';
-import { DraggableModalInner } from './DraggableModalInner';
-import { getModalState } from './draggableModalReducer';
+import { DraggableModalContext } from "./DraggableModalContext";
+import { DraggableModalInner } from "./DraggableModalInner";
+import { getModalState } from "./draggableModalReducer";
 export var DraggableModal = function DraggableModal(props) {
   // Get the unique ID of this modal.
   var id = useUID();
+
   // Get modal provider.
   var modalProvider = useContext(DraggableModalContext);
   if (!modalProvider) {
@@ -20,10 +22,11 @@ export var DraggableModal = function DraggableModal(props) {
     initialHeight: props.initialHeight,
     initialWidth: props.initialWidth
   });
+
   // We do this so that we don't re-render all modals for every state change.
   // DraggableModalInner uses React.memo, so it only re-renders if
   // if props change (e.g. modalState).
-  return /*#__PURE__*/React.createElement(DraggableModalInner, Object.assign({
+  return /*#__PURE__*/React.createElement(DraggableModalInner, _extends({
     id: id,
     dispatch: dispatch,
     modalState: modalState

package/es/StandardDragModal/DraggableModalContext.d.ts

@@ -6,4 +6,4 @@ export interface DraggableModalContextMethods {
 export interface DraggableModalContextValue extends DraggableModalContextMethods {
     state: ModalsState;
 }
-export declare const DraggableModalContext: React.Context<DraggableModalContextValue>;
+export declare const DraggableModalContext: React.Context<DraggableModalContextValue | null>;

package/es/StandardDragModal/DraggableModalInner.d.ts

@@ -8,9 +8,9 @@ interface ContextProps extends DraggableModalContextMethods {
     initialWidth?: number;
     initialHeight?: number;
 }
-export declare type DraggableModalInnerProps = ModalProps & {
+export type DraggableModalInnerProps = ModalProps & {
     children?: React.ReactNode;
 } & ContextProps;
-declare function DraggableModalInnerNonMemo({ id, modalState, dispatch, visible, children, title, initialWidth, initialHeight, ...otherProps }: DraggableModalInnerProps): JSX.Element;
+declare function DraggableModalInnerNonMemo({ id, modalState, dispatch, visible, children, title, initialWidth, initialHeight, ...otherProps }: DraggableModalInnerProps): React.JSX.Element;
 export declare const DraggableModalInner: React.MemoExoticComponent<typeof DraggableModalInnerNonMemo>;
 export {};

package/es/StandardDragModal/DraggableModalInner.js

@@ -1,27 +1,36 @@
-import "antd/es/modal/style";
-import _Modal from "antd/es/modal";
-import { __rest } from "tslib";
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+var _excluded = ["id", "modalState", "dispatch", "visible", "children", "title", "initialWidth", "initialHeight"];
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import * as React from 'react';
 import { useEffect, useMemo, useCallback, memo } from 'react';
-import { ResizeHandle } from './ResizeHandle';
-import { useDrag } from './useDrag';
-import { usePrevious } from './usePrevious';
-import { useResize } from './useResize';
+import { Modal } from 'antd';
+import { ResizeHandle } from "./ResizeHandle";
+import { useDrag } from "./useDrag";
+import { usePrevious } from "./usePrevious";
+import { useResize } from "./useResize";
 var modalStyle = {
   margin: 0,
   paddingBottom: 0,
   pointerEvents: 'auto'
 };
-function DraggableModalInnerNonMemo(_a) {
-  var id = _a.id,
-    modalState = _a.modalState,
-    dispatch = _a.dispatch,
-    visible = _a.visible,
-    children = _a.children,
-    title = _a.title,
-    initialWidth = _a.initialWidth,
-    initialHeight = _a.initialHeight,
-    otherProps = __rest(_a, ["id", "modalState", "dispatch", "visible", "children", "title", "initialWidth", "initialHeight"]); // Call on mount and unmount.
+function DraggableModalInnerNonMemo(_ref) {
+  var id = _ref.id,
+    modalState = _ref.modalState,
+    dispatch = _ref.dispatch,
+    visible = _ref.visible,
+    children = _ref.children,
+    title = _ref.title,
+    initialWidth = _ref.initialWidth,
+    initialHeight = _ref.initialHeight,
+    otherProps = _objectWithoutProperties(_ref, _excluded);
+  // Call on mount and unmount.
   useEffect(function () {
     dispatch({
       type: 'mount',
@@ -38,6 +47,7 @@ function DraggableModalInnerNonMemo(_a) {
       });
     };
   }, [dispatch, id, initialWidth, initialHeight]);
+
   // Bring this to the front if it's been opened with props.
   var visiblePrevious = usePrevious(visible);
   useEffect(function () {
@@ -61,7 +71,7 @@ function DraggableModalInnerNonMemo(_a) {
     width = modalState.width,
     height = modalState.height;
   var style = useMemo(function () {
-    return Object.assign(Object.assign({}, modalStyle), {
+    return _objectSpread(_objectSpread({}, modalStyle), {}, {
       top: y,
       left: x,
       height: height
@@ -74,13 +84,13 @@ function DraggableModalInnerNonMemo(_a) {
     });
   }, [id, dispatch]);
   var onDragWithID = useCallback(function (args) {
-    return dispatch(Object.assign({
+    return dispatch(_objectSpread({
       type: 'drag',
       id: id
     }, args));
   }, [dispatch, id]);
   var onResizeWithID = useCallback(function (args) {
-    return dispatch(Object.assign({
+    return dispatch(_objectSpread({
       type: 'resize',
       id: id
     }, args));
@@ -94,7 +104,7 @@ function DraggableModalInnerNonMemo(_a) {
       onClick: onFocus
     }, title);
   }, [onMouseDrag, onFocus, title]);
-  return /*#__PURE__*/React.createElement(_Modal, Object.assign({
+  return /*#__PURE__*/React.createElement(Modal, _extends({
     wrapClassName: "ant-design-draggable-modal",
     style: style,
     width: width,

package/es/StandardDragModal/DraggableModalProvider.js

@@ -2,14 +2,14 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0) { ; } } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import * as React from 'react';
 import { useEffect, useReducer } from 'react';
-import { DraggableModalContext } from './DraggableModalContext';
-import { getWindowSize } from './getWindowSize';
-import { draggableModalReducer, initialModalsState } from './draggableModalReducer';
+import { DraggableModalContext } from "./DraggableModalContext";
+import { getWindowSize } from "./getWindowSize";
+import { draggableModalReducer, initialModalsState } from "./draggableModalReducer";
 export var DraggableModalProvider = function DraggableModalProvider(_ref) {
   var children = _ref.children;
   var _useReducer = useReducer(draggableModalReducer, initialModalsState),

package/es/StandardDragModal/Modal.d.ts

@@ -7,5 +7,5 @@ interface StandardDragModalProps {
     initialHeight?: number;
     [k: string]: any;
 }
-declare const StandardDragModal: (props: StandardDragModalProps) => JSX.Element;
+declare const StandardDragModal: (props: StandardDragModalProps) => React.JSX.Element;
 export default StandardDragModal;

package/es/StandardDragModal/Modal.js

@@ -1,20 +1,23 @@
-import { __rest } from "tslib";
+var _excluded = ["visible", "onCancel", "onSubmit", "children"];
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import React from 'react';
-import { DraggableModal, DraggableModalProvider } from './index';
-import './index.less';
+import { DraggableModal, DraggableModalProvider } from "./index";
+import "./index.less";
 var StandardDragModal = function StandardDragModal(props) {
   var visible = props.visible,
     onCancel = props.onCancel,
     onSubmit = props.onSubmit,
     children = props.children,
-    others = __rest(props, ["visible", "onCancel", "onSubmit", "children"]);
+    others = _objectWithoutProperties(props, _excluded);
   var handleOk = function handleOk() {
     onSubmit && onSubmit();
   };
   var handleCancel = function handleCancel() {
     onCancel && onCancel();
   };
-  return /*#__PURE__*/React.createElement(DraggableModalProvider, null, /*#__PURE__*/React.createElement(DraggableModal, Object.assign({
+  return /*#__PURE__*/React.createElement(DraggableModalProvider, null, /*#__PURE__*/React.createElement(DraggableModal, _extends({
     visible: visible,
     onOk: handleOk,
     onCancel: handleCancel,

package/es/StandardDragModal/ResizeHandle.js

@@ -1,6 +1,7 @@
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 import * as React from 'react';
 export var ResizeHandle = function ResizeHandle(props) {
-  return /*#__PURE__*/React.createElement("div", Object.assign({
+  return /*#__PURE__*/React.createElement("div", _extends({
     className: "ant-design-draggable-modal-resize-handle"
   }, props), /*#__PURE__*/React.createElement("div", {
     className: "ant-design-draggable-modal-resize-handle-inner"