@ccs-ui/rc-pro 1.1.25-beta-13 → 1.1.25-beta-17

package/es/dialog/DialogRequestButton.d.ts

@@ -0,0 +1,8 @@
+import { FormProps } from 'antd';
+import { DialogFormRef } from './form';
+import { CcsDialogModalProps } from './hook';
+declare const DialogRequestButton: ({ auth, formRef, formInitialValues, request, onCancel, onRequestBefore, }: Pick<CcsDialogModalProps, "auth" | "request" | "onCancel" | "onRequestBefore"> & {
+    formRef: React.RefObject<DialogFormRef>;
+    formInitialValues: FormProps['initialValues'];
+}) => import("react/jsx-runtime").JSX.Element;
+export default DialogRequestButton;

package/es/dialog/DialogRequestButton.js

@@ -0,0 +1,65 @@
+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 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 _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 { Button } from 'antd';
+import { useState } from 'react';
+import { CcsAuth, CcsDialog, CcsUtils } from '..';
+import { jsx as _jsx } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
+var DialogRequestButton = function DialogRequestButton(_ref) {
+  var auth = _ref.auth,
+    formRef = _ref.formRef,
+    _ref$formInitialValue = _ref.formInitialValues,
+    formInitialValues = _ref$formInitialValue === void 0 ? {} : _ref$formInitialValue,
+    request = _ref.request,
+    onCancel = _ref.onCancel,
+    onRequestBefore = _ref.onRequestBefore;
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    loading = _useState2[0],
+    setLoading = _useState2[1];
+  var onOk = function onOk() {
+    var _formRef$current;
+    if (!((_formRef$current = formRef.current) !== null && _formRef$current !== void 0 && _formRef$current.formInstance)) {
+      CcsUtils.showWarning(false, "\u672A\u5B9A\u4E49form");
+      return;
+    }
+    formRef.current.formInstance.validateFields().then(function (values) {
+      setLoading(true);
+      var params = _objectSpread(_objectSpread({}, formInitialValues), onRequestBefore ? onRequestBefore(values) : values);
+      request(params).then(function (d) {
+        setLoading(false);
+        if (d !== null && d !== void 0 && d.success && onCancel) {
+          onCancel(params);
+        }
+        CcsDialog.easyMessage(d);
+      }).catch(function (err) {
+        setLoading(false);
+        console.log('e', err);
+      });
+    });
+  };
+  return /*#__PURE__*/_jsxs(_Fragment, {
+    children: [/*#__PURE__*/_jsx(Button, {
+      onClick: onCancel,
+      children: "\u53D6\u6D88"
+    }), /*#__PURE__*/_jsx(CcsAuth.Button, {
+      auth: auth || '',
+      type: "primary",
+      onClick: onOk,
+      loading: loading,
+      children: "\u786E\u5B9A"
+    })]
+  });
+};
+export default DialogRequestButton;

package/es/dialog/DialogSelfOkButton.d.ts

@@ -0,0 +1,8 @@
+import { FormProps } from 'antd';
+import { DialogFormRef } from './form';
+import { CcsDialogModalProps } from './hook';
+declare const DialogSelfOkButton: ({ auth, formRef, formInitialValues, onCancel, onOk, }: Pick<CcsDialogModalProps, "auth" | "onCancel" | "onOk"> & {
+    formRef: React.RefObject<DialogFormRef>;
+    formInitialValues: FormProps['initialValues'];
+}) => import("react/jsx-runtime").JSX.Element;
+export default DialogSelfOkButton;

package/es/dialog/DialogSelfOkButton.js

@@ -0,0 +1,43 @@
+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 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); }
+import { Button } from 'antd';
+import { CcsAuth, CcsUtils } from '..';
+import { jsx as _jsx } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
+var DialogSelfOkButton = function DialogSelfOkButton(_ref) {
+  var auth = _ref.auth,
+    formRef = _ref.formRef,
+    _ref$formInitialValue = _ref.formInitialValues,
+    formInitialValues = _ref$formInitialValue === void 0 ? {} : _ref$formInitialValue,
+    onCancel = _ref.onCancel,
+    onOk = _ref.onOk;
+  var onHandleOk = function onHandleOk() {
+    var _formRef$current;
+    if (!((_formRef$current = formRef.current) !== null && _formRef$current !== void 0 && _formRef$current.formInstance)) {
+      CcsUtils.showWarning(false, "\u672A\u5B9A\u4E49form");
+      return;
+    }
+    formRef.current.formInstance.validateFields().then(function (values) {
+      var params = _objectSpread(_objectSpread({}, formInitialValues), values);
+      if (onOk) onOk(params);
+      if (onCancel) onCancel(params);
+    });
+  };
+  return /*#__PURE__*/_jsxs(_Fragment, {
+    children: [/*#__PURE__*/_jsx(Button, {
+      onClick: onCancel,
+      children: "\u53D6\u6D88"
+    }), /*#__PURE__*/_jsx(CcsAuth.Button, {
+      auth: auth || '',
+      type: "primary",
+      onClick: onHandleOk,
+      children: "\u786E\u5B9A"
+    })]
+  });
+};
+export default DialogSelfOkButton;

package/es/dialog/HookDrawer.js

@@ -13,9 +13,9 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { Drawer } from 'antd';
 import classNames from 'classnames';
 import { forwardRef, useImperativeHandle, useRef, useState } from 'react';
-import { DialogSelfButton } from "./HookModal";
 import CcsDialogButtons, { DialogButtonHolder } from "./button";
 import { DialogContentContext } from "./context";
+import DialogRequestButton from "./DialogRequestButton";
 import DialogForm from "./form";
 import { jsx as _jsx } from "react/jsx-runtime";
 var HookDrawer = function HookDrawer(_ref, ref) {
@@ -100,6 +100,24 @@ var HookDrawer = function HookDrawer(_ref, ref) {
   styles.mask = _objectSpread({
     background: 'rgba(0, 0, 0, 0.1)'
   }, styles.mask);
+  var renderExtra = function renderExtra() {
+    if (request) {
+      return /*#__PURE__*/_jsx("div", {
+        className: "ccs-dialog-footer",
+        children: /*#__PURE__*/_jsx(DialogRequestButton, {
+          auth: auth,
+          request: request,
+          onCancel: close,
+          formRef: formRef,
+          onRequestBefore: onRequestBefore,
+          formInitialValues: form === null || form === void 0 ? void 0 : form.initialValues
+        })
+      });
+    }
+    return /*#__PURE__*/_jsx(DialogButtonHolder, {
+      ref: buttonRef
+    });
+  };
   return /*#__PURE__*/_jsx(Drawer, _objectSpread(_objectSpread({
     afterOpenChange: function afterOpenChange(open) {
       if (!open) afterClose();
@@ -112,16 +130,7 @@ var HookDrawer = function HookDrawer(_ref, ref) {
       position: 'absolute'
     } : {}), rootStyle),
     getContainer: isCrInProp ? getContainer : onGetContainer,
-    extra: request ? /*#__PURE__*/_jsx(DialogSelfButton, {
-      request: request,
-      onCancel: close,
-      formRef: formRef,
-      onRequestBefore: onRequestBefore,
-      auth: auth,
-      formInitialValues: form === null || form === void 0 ? void 0 : form.initialValues
-    }) : /*#__PURE__*/_jsx(DialogButtonHolder, {
-      ref: buttonRef
-    }),
+    extra: renderExtra(),
     footer: /*#__PURE__*/_jsx(DialogButtonHolder, {
       ref: footerRef
     }),

package/es/dialog/HookModal.d.ts

@@ -1,11 +1,5 @@
 /// <reference types="react" />
-import { FormProps } from 'antd';
-import { DialogFormRef } from './form';
 import { CcsDialogModal, CcsDialogModalProps } from './hook';
-export declare const DialogSelfButton: ({ auth, formRef, formInitialValues, request, onCancel, onRequestBefore, }: Pick<CcsDialogModalProps, "auth" | "request" | "onRequestBefore" | "onCancel"> & {
-    formRef: React.RefObject<DialogFormRef>;
-    formInitialValues: FormProps['initialValues'];
-}) => import("react/jsx-runtime").JSX.Element;
 export type HookModalProps = {
     afterClose: () => void;
     config: CcsDialogModalProps;

package/es/dialog/HookModal.js

@@ -10,17 +10,16 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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); }
-import { Button, Modal } from 'antd';
+import { Modal } from 'antd';
 import classNames from 'classnames';
 import { forwardRef, useImperativeHandle, useRef, useState } from 'react';
 import Draggable from 'react-draggable';
-import { CcsAuth, CcsDialog, CcsUtils } from '..';
 import CcsDialogButtons, { DialogButtonHolder } from "./button";
 import { DialogContentContext } from "./context";
+import DialogRequestButton from "./DialogRequestButton";
+import DialogSelfOkButton from "./DialogSelfOkButton";
 import DialogForm from "./form";
 import { jsx as _jsx } from "react/jsx-runtime";
-import { Fragment as _Fragment } from "react/jsx-runtime";
-import { jsxs as _jsxs } from "react/jsx-runtime";
 var DragModal = function DragModal(_ref) {
   var modal = _ref.modal,
     dragState = _ref.dragState,
@@ -57,56 +56,10 @@ var DragModal = function DragModal(_ref) {
     })
   });
 };
-export var DialogSelfButton = function DialogSelfButton(_ref2) {
-  var auth = _ref2.auth,
-    formRef = _ref2.formRef,
-    _ref2$formInitialValu = _ref2.formInitialValues,
-    formInitialValues = _ref2$formInitialValu === void 0 ? {} : _ref2$formInitialValu,
-    request = _ref2.request,
-    onCancel = _ref2.onCancel,
-    onRequestBefore = _ref2.onRequestBefore;
-  var _useState = useState(false),
-    _useState2 = _slicedToArray(_useState, 2),
-    loading = _useState2[0],
-    setLoading = _useState2[1];
-  var onOk = function onOk() {
-    var _formRef$current;
-    if (!((_formRef$current = formRef.current) !== null && _formRef$current !== void 0 && _formRef$current.formInstance)) {
-      CcsUtils.showWarning(false, "\u672A\u5B9A\u4E49form");
-      return;
-    }
-    formRef.current.formInstance.validateFields().then(function (values) {
-      setLoading(true);
-      var params = _objectSpread(_objectSpread({}, formInitialValues), onRequestBefore ? onRequestBefore(values) : values);
-      request(params).then(function (d) {
-        setLoading(false);
-        if (d !== null && d !== void 0 && d.success && onCancel) {
-          onCancel(params);
-        }
-        CcsDialog.easyMessage(d);
-      }).catch(function (err) {
-        setLoading(false);
-        console.log('e', err);
-      });
-    });
-  };
-  return /*#__PURE__*/_jsxs(_Fragment, {
-    children: [/*#__PURE__*/_jsx(Button, {
-      onClick: onCancel,
-      children: "\u53D6\u6D88"
-    }), /*#__PURE__*/_jsx(CcsAuth.Button, {
-      auth: auth || '',
-      type: "primary",
-      onClick: onOk,
-      loading: loading,
-      children: "\u786E\u5B9A"
-    })]
-  });
-};
-var HookModal = function HookModal(_ref3, ref) {
-  var hookAfterClose = _ref3.afterClose,
-    config = _ref3.config;
-  var _useState3 = useState(function () {
+var HookModal = function HookModal(_ref2, ref) {
+  var hookAfterClose = _ref2.afterClose,
+    config = _ref2.config;
+  var _useState = useState(function () {
       if (config.open === undefined) {
         return _objectSpread(_objectSpread({}, config), {}, {
           open: true
@@ -114,10 +67,10 @@ var HookModal = function HookModal(_ref3, ref) {
       }
       return config;
     }),
-    _useState4 = _slicedToArray(_useState3, 2),
-    innerConfig = _useState4[0],
-    setInnerConfig = _useState4[1];
-  var _useState5 = useState({
+    _useState2 = _slicedToArray(_useState, 2),
+    innerConfig = _useState2[0],
+    setInnerConfig = _useState2[1];
+  var _useState3 = useState({
       disabled: true,
       bounds: {
         left: 0,
@@ -126,9 +79,9 @@ var HookModal = function HookModal(_ref3, ref) {
         right: 0
       }
     }),
-    _useState6 = _slicedToArray(_useState5, 2),
-    dragState = _useState6[0],
-    setDragState = _useState6[1];
+    _useState4 = _slicedToArray(_useState3, 2),
+    dragState = _useState4[0],
+    setDragState = _useState4[1];
   var buttonRef = useRef(null);
   var formRef = useRef(null);
   var afterClose = function afterClose() {
@@ -181,6 +134,36 @@ var HookModal = function HookModal(_ref3, ref) {
       }
     };
   });
+  var renderFooter = function renderFooter() {
+    if (request) {
+      return /*#__PURE__*/_jsx("div", {
+        className: "ccs-dialog-footer",
+        children: /*#__PURE__*/_jsx(DialogRequestButton, {
+          auth: auth,
+          request: request,
+          onCancel: close,
+          formRef: formRef,
+          onRequestBefore: onRequestBefore,
+          formInitialValues: form === null || form === void 0 ? void 0 : form.initialValues
+        })
+      });
+    }
+    if (innerConfig.onOk) {
+      return /*#__PURE__*/_jsx("div", {
+        className: "ccs-dialog-footer",
+        children: /*#__PURE__*/_jsx(DialogSelfOkButton, {
+          auth: auth,
+          onOk: innerConfig.onOk,
+          onCancel: close,
+          formRef: formRef,
+          formInitialValues: form === null || form === void 0 ? void 0 : form.initialValues
+        })
+      });
+    }
+    return /*#__PURE__*/_jsx(DialogButtonHolder, {
+      ref: buttonRef
+    });
+  };
   return /*#__PURE__*/_jsx(Modal, _objectSpread(_objectSpread({
     onCancel: close,
     afterClose: afterClose
@@ -191,19 +174,7 @@ var HookModal = function HookModal(_ref3, ref) {
       } : undefined
     }, styles),
     className: classNames('ccs-dialog-modal', className),
-    footer: request ? /*#__PURE__*/_jsx("div", {
-      className: "ccs-dialog-footer",
-      children: /*#__PURE__*/_jsx(DialogSelfButton, {
-        auth: auth,
-        request: request,
-        onCancel: close,
-        formRef: formRef,
-        onRequestBefore: onRequestBefore,
-        formInitialValues: form === null || form === void 0 ? void 0 : form.initialValues
-      })
-    }) : /*#__PURE__*/_jsx(DialogButtonHolder, {
-      ref: buttonRef
-    }),
+    footer: renderFooter(),
     title: /*#__PURE__*/_jsx("div", {
       style: {
         width: '100%',

package/es/pro-table/head.js

@@ -116,9 +116,6 @@ function HeadComponent(_ref) {
       children: isExpand ? '收起' : '展开'
     }), /*#__PURE__*/_jsx(Button, {
       type: "primary",
-      onClick: function onClick() {
-        return form.submit();
-      },
       htmlType: "submit",
       children: "\u67E5\u8BE2"
     })]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ccs-ui/rc-pro",
-  "version": "1.1.25-beta-13",
+  "version": "1.1.25-beta-17",
   "description": "验证码组件兼容暗黑模式;proTable封装rowselection代码;proTable添加自适应布局模式;",
   "license": "MIT",
   "author": {