@ccs-ui/rc-pro 1.1.3 → 1.1.5

package/es/dialog/HookDrawer.js

@@ -14,7 +14,7 @@ import { Drawer } from 'antd';
 import classNames from 'classnames';
 import { forwardRef, useImperativeHandle, useRef, useState } from 'react';
 import { DialogSelfButton } from "./HookModal";
-import { DialogButtonHolder } from "./button";
+import CcsDialogButtons, { DialogButtonHolder } from "./button";
 import { DialogContentContext } from "./context";
 import DialogForm from "./form";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -101,11 +101,12 @@ var HookDrawer = function HookDrawer(_ref, ref) {
       position: 'absolute'
     } : {}), innerConfig.rootStyle),
     getContainer: isCrInProp ? innerConfig.getContainer : onGetContainer,
-    extra: innerConfig.request ? /*#__PURE__*/_jsx(DialogSelfButton, {
-      request: innerConfig.request,
+    extra: config.request ? /*#__PURE__*/_jsx(DialogSelfButton, {
+      request: config.request,
       onCancel: close,
       formRef: formRef,
-      onRequestBefore: innerConfig.onRequestBefore,
+      onRequestBefore: config.onRequestBefore,
+      auth: config.auth,
       formInitialValues: (_config$form = config.form) === null || _config$form === void 0 ? void 0 : _config$form.initialValues
     }) : /*#__PURE__*/_jsx(DialogButtonHolder, {
       ref: buttonRef
@@ -115,6 +116,7 @@ var HookDrawer = function HookDrawer(_ref, ref) {
     }),
     children: /*#__PURE__*/_jsx(DialogContentContext.Provider, {
       value: {
+        Buttons: CcsDialogButtons,
         buttonRef: buttonRef,
         buttonType: 'drawer',
         closeDialog: close,

package/es/dialog/HookModal.d.ts

@@ -2,7 +2,7 @@
 import { FormProps } from 'antd';
 import { DialogFormRef } from './form';
 import { CcsDialogModal, CcsDialogModalProps } from './hook';
-export declare const DialogSelfButton: ({ formInitialValues, formRef, request, onCancel, onRequestBefore, }: Pick<CcsDialogModalProps, "request" | "onCancel" | "onRequestBefore"> & {
+export declare const DialogSelfButton: ({ 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;

package/es/dialog/HookModal.js

@@ -14,8 +14,8 @@ import { Button, Modal } from 'antd';
 import classNames from 'classnames';
 import { forwardRef, useImperativeHandle, useRef, useState } from 'react';
 import Draggable from 'react-draggable';
-import { CcsDialog, CcsUtils } from '..';
-import { DialogButtonHolder } from "./button";
+import { CcsAuth, CcsDialog, CcsUtils } from '..';
+import CcsDialogButtons, { DialogButtonHolder } from "./button";
 import { DialogContentContext } from "./context";
 import DialogForm from "./form";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -59,9 +59,10 @@ var DragModal = function DragModal(_ref) {
   });
 };
 export var DialogSelfButton = function DialogSelfButton(_ref2) {
-  var _ref2$formInitialValu = _ref2.formInitialValues,
-    formInitialValues = _ref2$formInitialValu === void 0 ? {} : _ref2$formInitialValu,
+  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;
@@ -94,7 +95,8 @@ export var DialogSelfButton = function DialogSelfButton(_ref2) {
     children: [/*#__PURE__*/_jsx(Button, {
       onClick: onCancel,
       children: "\u53D6\u6D88"
-    }), /*#__PURE__*/_jsx(Button, {
+    }), /*#__PURE__*/_jsx(CcsAuth.Button, {
+      auth: auth || '',
       type: "primary",
       onClick: onOk,
       loading: loading,
@@ -185,10 +187,11 @@ var HookModal = function HookModal(_ref3, ref) {
         padding: '8px 16px'
       },
       children: /*#__PURE__*/_jsx(DialogSelfButton, {
-        request: innerConfig.request,
+        auth: config.auth,
+        request: config.request,
         onCancel: close,
         formRef: formRef,
-        onRequestBefore: innerConfig.onRequestBefore,
+        onRequestBefore: config.onRequestBefore,
         formInitialValues: (_config$form = config.form) === null || _config$form === void 0 ? void 0 : _config$form.initialValues
       })
     }) : /*#__PURE__*/_jsx(DialogButtonHolder, {
@@ -228,8 +231,9 @@ var HookModal = function HookModal(_ref3, ref) {
       value: {
         buttonRef: buttonRef,
         buttonType: 'modal',
-        closeDialog: close,
-        formInitialValues: ((_config$form2 = config.form) === null || _config$form2 === void 0 ? void 0 : _config$form2.initialValues) || {}
+        Buttons: CcsDialogButtons,
+        formInitialValues: ((_config$form2 = config.form) === null || _config$form2 === void 0 ? void 0 : _config$form2.initialValues) || {},
+        closeDialog: close
       },
       children: config.form ? /*#__PURE__*/_jsx(DialogForm, {
         ref: formRef,

package/es/dialog/button.d.ts

@@ -1,5 +1,5 @@
 import React, { ReactNode } from 'react';
-interface DialogButtonsProps {
+export interface DialogButtonsProps {
     okText?: string;
     cancelText?: string;
     okAuth?: string;
@@ -12,5 +12,4 @@ export type DialogButtonRef = {
     onSetButtons: (e: React.ReactElement) => void;
 };
 export declare const DialogButtonHolder: React.MemoExoticComponent<React.ForwardRefExoticComponent<React.RefAttributes<DialogButtonRef>>>;
-export default function CcsDialogButtons({ okText, okAuth, loading, children, hideCancel, cancelText, onOk, }: DialogButtonsProps): null;
-export {};
+export default function CcsDialogButtons({ okText, okAuth, loading, children, hideCancel, cancelText, onOk, }: DialogButtonsProps): import("react/jsx-runtime").JSX.Element;

package/es/dialog/button.js

@@ -84,8 +84,8 @@ export default function CcsDialogButtons(_ref) {
         children: btns
       });
     }
-    CcsUtils.showWarning(!!buttonRef.current, "\u68C0\u6D4B\u5230".concat(buttonType === 'modal' ? 'openModal' : 'openDrawer', "\u4F20\u5165request\u53C2\u6570\uFF0CCcsDialog.Buttons\u5C06\u4E0D\u80FD\u751F\u6548\u3002"));
+    CcsUtils.showWarning(!!buttonRef.current, "\u68C0\u6D4B\u5230".concat(buttonType === 'modal' ? 'openModal' : 'openDrawer', "\u4F20\u5165request\u53C2\u6570\uFF0CButtons\u5C06\u4E0D\u80FD\u751F\u6548\u3002"));
     (_buttonRef$current = buttonRef.current) === null || _buttonRef$current === void 0 ? void 0 : _buttonRef$current.onSetButtons(btns);
   });
-  return null;
+  return /*#__PURE__*/_jsx(_Fragment, {});
 }

package/es/dialog/context.d.ts

@@ -1,11 +1,13 @@
 import { Store } from 'antd/es/form/interface';
-import React, { RefObject } from 'react';
-import { DialogButtonRef } from './button';
+import React, { ReactElement, RefObject } from 'react';
+import { DialogButtonRef, DialogButtonsProps } from './button';
 export interface DialogContextType<T = Store> {
-    /** 按钮类型 */
-    buttonType: 'modal' | 'drawer';
     /** 表单初始值 */
     formInitialValues: T;
+    /** 按钮组件 */
+    Buttons: (e: DialogButtonsProps) => ReactElement;
+    /** 按钮类型 */
+    buttonType: 'modal' | 'drawer';
     /** 按钮 ref */
     buttonRef: RefObject<DialogButtonRef>;
     /** drawer footer ref */

package/es/dialog/hook.d.ts

@@ -20,6 +20,8 @@ type DrawerFunc = (props: DrawerProps) => {
 export type CcsDialogModalProps = ModalFuncProps & {
     /** antd form */
     form?: FormProps;
+    /** 表单接口请求权限 */
+    auth?: string;
     /** 表单接口请求 */
     request?: (values: any) => Promise<CCS.HttpResult>;
     /** request执行前参数处理 */
@@ -34,6 +36,8 @@ export type CcsDialogModalProps = ModalFuncProps & {
 export type CcsDialogDrawerProps = Omit<DrawerProps, 'extra'> & {
     /** antd form */
     form?: FormProps;
+    /** 表单接口请求权限 */
+    auth?: string;
     /** 抽屉内容 */
     content?: ReactNode;
     /** 表单接口请求 */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ccs-ui/rc-pro",
-  "version": "1.1.3",
+  "version": "1.1.5",
   "description": "A react pro components",
   "license": "MIT",
   "module": "es/index.js",