@ccs-ui/rc-pro 1.1.2 → 1.1.4

package/es/dialog/HookDrawer.js

@@ -19,7 +19,7 @@ import { DialogContentContext } from "./context";
 import DialogForm from "./form";
 import { jsx as _jsx } from "react/jsx-runtime";
 var HookDrawer = function HookDrawer(_ref, ref) {
-  var _config$form, _innerConfig$styles;
+  var _config$form, _config$form2, _innerConfig$styles;
   var hookAfterClose = _ref.afterClose,
     config = _ref.config;
   var _useState = useState(function () {
@@ -101,11 +101,13 @@ 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
     }),
@@ -118,7 +120,7 @@ var HookDrawer = function HookDrawer(_ref, ref) {
         buttonType: 'drawer',
         closeDialog: close,
         drawerFooterRef: footerRef,
-        formInitialValues: ((_config$form = config.form) === null || _config$form === void 0 ? void 0 : _config$form.initialValues) || {}
+        formInitialValues: ((_config$form2 = config.form) === null || _config$form2 === void 0 ? void 0 : _config$form2.initialValues) || {}
       },
       children: config.form ? /*#__PURE__*/_jsx(DialogForm, {
         ref: formRef,

package/es/dialog/HookModal.d.ts

@@ -1,8 +1,10 @@
 /// <reference types="react" />
+import { FormProps } from 'antd';
 import { DialogFormRef } from './form';
 import { CcsDialogModal, CcsDialogModalProps } from './hook';
-export declare const DialogSelfButton: ({ 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;
 export interface HookModalProps {
     afterClose: () => void;

package/es/dialog/HookModal.js

@@ -14,7 +14,7 @@ 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 { CcsAuth, CcsDialog, CcsUtils } from '..';
 import { DialogButtonHolder } from "./button";
 import { DialogContentContext } from "./context";
 import DialogForm from "./form";
@@ -59,7 +59,10 @@ var DragModal = function DragModal(_ref) {
   });
 };
 export var DialogSelfButton = function DialogSelfButton(_ref2) {
-  var formRef = _ref2.formRef,
+  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;
@@ -75,7 +78,7 @@ export var DialogSelfButton = function DialogSelfButton(_ref2) {
     }
     formRef.current.formInstance.validateFields().then(function (values) {
       setLoading(true);
-      var params = onRequestBefore ? onRequestBefore(values) : values;
+      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) {
@@ -87,15 +90,13 @@ export var DialogSelfButton = function DialogSelfButton(_ref2) {
         console.log('e', err);
       });
     });
-
-    // request
   };
-
   return /*#__PURE__*/_jsxs(_Fragment, {
     children: [/*#__PURE__*/_jsx(Button, {
       onClick: onCancel,
       children: "\u53D6\u6D88"
-    }), /*#__PURE__*/_jsx(Button, {
+    }), /*#__PURE__*/_jsx(CcsAuth.Button, {
+      auth: auth || '',
       type: "primary",
       onClick: onOk,
       loading: loading,
@@ -104,7 +105,7 @@ export var DialogSelfButton = function DialogSelfButton(_ref2) {
   });
 };
 var HookModal = function HookModal(_ref3, ref) {
-  var _config$form;
+  var _config$form, _config$form2;
   var hookAfterClose = _ref3.afterClose,
     config = _ref3.config;
   var _useState3 = useState(function () {
@@ -186,20 +187,16 @@ 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, {
       ref: buttonRef
     }),
-    onOk: function onOk() {
-      // 传入request，onOk触发请求
-      if (innerConfig.request) {
-        console.log(111);
-      }
-    },
     title: /*#__PURE__*/_jsx("div", {
       style: {
         width: '100%',
@@ -235,7 +232,7 @@ var HookModal = function HookModal(_ref3, ref) {
         buttonRef: buttonRef,
         buttonType: 'modal',
         closeDialog: close,
-        formInitialValues: ((_config$form = config.form) === null || _config$form === void 0 ? void 0 : _config$form.initialValues) || {}
+        formInitialValues: ((_config$form2 = config.form) === null || _config$form2 === void 0 ? void 0 : _config$form2.initialValues) || {}
       },
       children: config.form ? /*#__PURE__*/_jsx(DialogForm, {
         ref: formRef,

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.2",
+  "version": "1.1.4",
   "description": "A react pro components",
   "license": "MIT",
   "module": "es/index.js",