fan-standard-comp 3.2.1 → 4.0.1

package/lib/StandardDragModal/ChangeStandardModal.d.ts

@@ -25,7 +25,7 @@ export interface StandardModalProps extends ModalProps {
     stepsConfig?: any;
     className?: string;
     style?: React.CSSProperties;
-    visible?: boolean;
+    visible: boolean;
     bodyStyle?: React.CSSProperties;
     hideRequiredMark?: boolean;
     hideFooter?: Boolean;
@@ -40,5 +40,5 @@ export interface StandardModalProps extends ModalProps {
     dragAble?: boolean;
     [k: string]: any;
 }
-declare const StandardModal: (props: StandardModalProps) => JSX.Element;
+declare const StandardModal: (props: StandardModalProps) => React.JSX.Element;
 export default StandardModal;

package/lib/StandardDragModal/ChangeStandardModal.js

@@ -4,38 +4,41 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-require("antd/es/modal/style");
-var _modal = _interopRequireDefault(require("antd/es/modal"));
-require("antd/es/button/style");
-var _button = _interopRequireDefault(require("antd/es/button"));
-require("antd/es/col/style");
-var _col = _interopRequireDefault(require("antd/es/col"));
-require("antd/es/row/style");
-var _row = _interopRequireDefault(require("antd/es/row"));
-require("antd/es/form/style");
-var _form = _interopRequireDefault(require("antd/es/form"));
-var _tslib = require("tslib");
 var _react = _interopRequireWildcard(require("react"));
+var _antd = require("antd");
 var _data = require("../data");
 var _RenderItemGroup = _interopRequireDefault(require("../FormComp/RenderItemGroup"));
-var _ValueFormat = _interopRequireDefault(require("../utils/ValueFormat.js"));
+var _utils = require("../utils");
 var _IconNode = _interopRequireDefault(require("../components/IconNode"));
 var _TabForm = _interopRequireDefault(require("../StandardForm/TabForm"));
 var _StepForm = _interopRequireDefault(require("../StandardForm/StepForm"));
-var _ActionList = _interopRequireDefault(require("../StandardForm/ActionList.js"));
+var _ActionList = _interopRequireDefault(require("../StandardForm/ActionList"));
 require("./style/index.less");
-var _Modal2 = _interopRequireDefault(require("../StandardDragModal/Modal"));
+var _Modal = _interopRequireDefault(require("../StandardDragModal/Modal"));
 require("../StandardDragModal/index.less");
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+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"];
+/* eslint-disable */
+// @ts-ignore
+// import { DraggableModal, DraggableModalProvider } from '../StandardDragModal/index'
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+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 _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; } // import { DraggableModal, DraggableModalProvider } from '../StandardDragModal/index'
+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; }
+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; }
 var StandardModal = function StandardModal(props) {
   var children = props.children,
     className = props.className,
@@ -64,8 +67,8 @@ var StandardModal = function StandardModal(props) {
     displayLayout = props.displayLayout,
     _props$dragAble = props.dragAble,
     dragAble = _props$dragAble === void 0 ? false : _props$dragAble,
-    otherProps = (0, _tslib.__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.default.useForm(),
+    otherProps = _objectWithoutProperties(props, _excluded);
+  var _Form$useForm = _antd.Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     modalForm = _Form$useForm2[0];
   var _useState = (0, _react.useState)(),
@@ -75,27 +78,31 @@ var StandardModal = function StandardModal(props) {
   var _useState3 = (0, _react.useState)(0),
     _useState4 = _slicedToArray(_useState3, 2),
     bodyMaxHeight = _useState4[0],
-    setBodyMaxHeight = _useState4[1]; // setTabFormChild
+    setBodyMaxHeight = _useState4[1];
+
+  // setTabFormChild
   var _useState5 = (0, _react.useState)(),
     _useState6 = _slicedToArray(_useState5, 2),
     formChild = _useState6[0],
     setFormChild = _useState6[1]; // <---- set the ref when Form Rendered
+
   // 按钮栏是否有显示（默认显示）
   var hasFooterBar = (0, _react.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 {
@@ -113,11 +120,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;
@@ -152,7 +160,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();
       }
     }
@@ -178,10 +186,9 @@ var StandardModal = function StandardModal(props) {
         if (Object.prototype.hasOwnProperty.call(values, 'false')) {
           delete values.false; // 自定义结构会莫名的出来一个false字段
         }
-
-        var resultValues = (0, _ValueFormat.default)(values, formItemGroup);
+        var resultValues = (0, _utils.UtilValueFormat)(values, formItemGroup);
         if (onSubmit) {
-          onSubmit(Object.assign({}, resultValues));
+          onSubmit(_objectSpread({}, resultValues));
         }
       }).catch(function () {
         // 定位到第一条表单异常的
@@ -198,10 +205,9 @@ var StandardModal = function StandardModal(props) {
         if (Object.prototype.hasOwnProperty.call(values, 'false')) {
           delete values.false; // 自定义结构会莫名的出来一个false字段
         }
-
-        var resultValues = (0, _ValueFormat.default)(values, formItemGroup);
+        var resultValues = (0, _utils.UtilValueFormat)(values, formItemGroup);
         if (onSubmit) {
-          onSubmit(Object.assign({}, resultValues));
+          onSubmit(_objectSpread({}, resultValues));
         }
       }).catch(function () {
         // 定位到第一条表单异常的
@@ -216,6 +222,7 @@ var StandardModal = function StandardModal(props) {
       onSubmit && onSubmit();
     }
   };
+
   // 重置所有表单
   var clearAllFieldsValue = function clearAllFieldsValue() {
     // let allFields = {}
@@ -223,7 +230,6 @@ var StandardModal = function StandardModal(props) {
     // modalForm.setFieldsValue(allFields) // 直接清空表单的赋值(initialValues传值如果没有前后赋值没有全部带上所有字段，则会默认又使用之前的部分未传参字段)
     modalForm.resetFields(); // 直接使用这个无效
   };
-
   var onAfterClose = function onAfterClose() {
     var afterClose = props.afterClose;
     if (type === 'form') clearAllFieldsValue();
@@ -233,6 +239,7 @@ var StandardModal = function StandardModal(props) {
     var onCancel = props.onCancel;
     if (onCancel) onCancel();
   };
+
   // 强制更新表单值，用于赋初始化实例值
   var forceUpdateForm = function forceUpdateForm() {
     _getFormFields && _getFormFields(modalForm.getFieldsValue() || {}, modalForm);
@@ -246,7 +253,7 @@ var StandardModal = function StandardModal(props) {
     if (Array.isArray(formItemGroup)) {
       if (type === 'gridForm') {
         // 栅格组
-        return /*#__PURE__*/_react.default.createElement(_row.default, {
+        return /*#__PURE__*/_react.default.createElement(_antd.Row, {
           gutter: 20
         }, formItemGroup.map(function (item, index) {
           var childrenFields = item.fields || [];
@@ -254,10 +261,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.default.createElement(_col.default, {
+          return /*#__PURE__*/_react.default.createElement(_antd.Col, {
             key: index,
             span: item.gridSpan || 24
           }, /*#__PURE__*/_react.default.createElement(_RenderItemGroup.default, {
@@ -294,24 +302,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()
@@ -340,8 +348,8 @@ var StandardModal = function StandardModal(props) {
               disabled = item.disabled,
               loading = item.loading,
               fn = item.fn,
-              others = (0, _tslib.__rest)(item, ["name", "type", "icon", "ghost", "disabled", "loading", "fn"]);
-            return /*#__PURE__*/_react.default.createElement(_button.default, Object.assign({
+              others = _objectWithoutProperties(item, _excluded2);
+            return /*#__PURE__*/_react.default.createElement(_antd.Button, _extends({
               key: name,
               type: _type || 'primary',
               icon: /*#__PURE__*/_react.default.createElement(_IconNode.default, {
@@ -359,28 +367,27 @@ var StandardModal = function StandardModal(props) {
           }
         }));
       }
-
       if (typeof footerButtonGroup === 'function') {
         return footerButtonGroup(modalForm, props);
       }
       return footerButtonGroup;
     }
     if (footer) return footer;
-    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_button.default, Object.assign({
+    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_antd.Button, _extends({
       key: "submit",
       type: 'primary',
       loading: confirmLoading,
       onClick: handleSubmit
-    }, confirmButtonProps, okButtonProps), confirmText || okText || '确定'), /*#__PURE__*/_react.default.createElement(_button.default, Object.assign({
+    }, confirmButtonProps, okButtonProps), confirmText || okText || '确定'), /*#__PURE__*/_react.default.createElement(_antd.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.default.createElement(_ActionList.default, {
+      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.default.createElement(_ActionList.default, {
         list: currentStepInfo.actions || [],
         onStep: handleStepType,
         form: formChild,
@@ -388,11 +395,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.default.createElement(_ActionList.default, {
-        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.default.createElement(_ActionList.default, {
+        list: (activeTabInfo === null || activeTabInfo === void 0 ? void 0 : activeTabInfo.actions) || [],
         form: formChild,
         other: props
       }) : null;
@@ -401,21 +409,23 @@ var StandardModal = function StandardModal(props) {
   };
   // 内容渲染
   var renderChildrenNodes = function renderChildrenNodes() {
-    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, children, (type === 'form' || type === 'gridForm') && /*#__PURE__*/_react.default.createElement(_form.default, {
+    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, children, (type === 'form' || type === 'gridForm') && /*#__PURE__*/_react.default.createElement(_antd.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.default.createElement(_row.default, null, formPrefix(modalForm, props, forceUpdateForm)), formItemGroup ? renderFormItemGroup() : null, formPostfix && /*#__PURE__*/_react.default.createElement(_row.default, null, formPostfix(modalForm, props, forceUpdateForm), " ")), type === 'tabForm' && /*#__PURE__*/_react.default.createElement(_TabForm.default, {
+    }, formPrefix && /*#__PURE__*/_react.default.createElement(_antd.Row, null, formPrefix(modalForm, props, forceUpdateForm)), formItemGroup ? renderFormItemGroup() : null, formPostfix && /*#__PURE__*/_react.default.createElement(_antd.Row, null, formPostfix(modalForm, props, forceUpdateForm), " ")), type === 'tabForm' && /*#__PURE__*/_react.default.createElement(_TabForm.default, {
       grid: size,
       layout: formLayout,
       fieldStatus: fieldStatus,
-      actionHide: true,
+      actionHide: true
       // @ts-ignore
+      ,
       getFormFields: function getFormFields(fields, form) {
         setFormChild(form);
         _getFormFields && _getFormFields(fields, form);
@@ -423,14 +433,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.default.createElement(_StepForm.default, {
       grid: size,
       layout: formLayout,
       fieldStatus: fieldStatus,
-      actionHide: true,
+      actionHide: true
       // @ts-ignore
+      ,
       getFormFields: function getFormFields(fields, form) {
         setFormChild(form);
         _getFormFields && _getFormFields(fields, form);
@@ -438,14 +449,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.default.createElement(_Modal2.default, Object.assign({
-      destroyOnClose: true,
+    return /*#__PURE__*/_react.default.createElement(_Modal.default, _extends({
+      destroyOnClose: true
+      // @ts-ignore
+      ,
       initialWidth: otherProps.width || _data.general.modalSize[size].width,
       initialHeight: otherProps.height,
       zIndex: 1001
@@ -476,20 +489,21 @@ var StandardModal = function StandardModal(props) {
        </DraggableModal>
      </DraggableModalProvider>*/
   }
-
-  return /*#__PURE__*/_react.default.createElement(_modal.default, Object.assign({
+  return /*#__PURE__*/_react.default.createElement(_antd.Modal, _extends({
     destroyOnClose: true,
-    maskClosable: false,
+    maskClosable: false
+    // @ts-ignore
+    ,
     width: _data.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),
@@ -498,5 +512,4 @@ var StandardModal = function StandardModal(props) {
     onOk: handleSubmit
   }), renderChildrenNodes());
 };
-var _default = StandardModal;
-exports.default = _default;
+var _default = exports.default = StandardModal;

package/lib/StandardDragModal/DraggableModal.js

@@ -5,18 +5,21 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.DraggableModal = void 0;
-var React = _interopRequireWildcard(require("react"));
+var _react = _interopRequireWildcard(require("react"));
+var React = _react;
 var _reactUid = require("react-uid");
 var _DraggableModalContext = require("./DraggableModalContext");
 var _DraggableModalInner = require("./DraggableModalInner");
 var _draggableModalReducer = require("./draggableModalReducer");
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-var DraggableModal = function DraggableModal(props) {
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+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); }
+var DraggableModal = exports.DraggableModal = function DraggableModal(props) {
   // Get the unique ID of this modal.
   var id = (0, _reactUid.useUID)();
+
   // Get modal provider.
-  var modalProvider = (0, React.useContext)(_DraggableModalContext.DraggableModalContext);
+  var modalProvider = (0, _react.useContext)(_DraggableModalContext.DraggableModalContext);
   if (!modalProvider) {
     throw new Error('No Provider');
   }
@@ -28,13 +31,13 @@ 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.DraggableModalInner, Object.assign({
+  return /*#__PURE__*/React.createElement(_DraggableModalInner.DraggableModalInner, _extends({
     id: id,
     dispatch: dispatch,
     modalState: modalState
   }, props));
-};
-exports.DraggableModal = DraggableModal;
+};

package/lib/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/lib/StandardDragModal/DraggableModalContext.js

@@ -6,10 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.DraggableModalContext = void 0;
 var React = _interopRequireWildcard(require("react"));
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-var DraggableModalContext = /*#__PURE__*/React.createContext(null);
-exports.DraggableModalContext = DraggableModalContext;
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+var DraggableModalContext = exports.DraggableModalContext = /*#__PURE__*/React.createContext(null);
 if (process.env.NODE_ENV !== 'production') {
   DraggableModalContext.displayName = 'DraggableModalContext';
 }

package/lib/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 {};