@hw-component/form 1.9.73 → 1.9.75

package/es/Btn.d.ts

@@ -0,0 +1,7 @@
+import type { ButtonProps } from "antd";
+export interface BtnProps<R = any> extends ButtonProps {
+    request?: () => Promise<any>;
+    onSuccess?: (data: R) => void;
+}
+declare const _default: ({ loading, request, children, onClick, style, type, onSuccess, ...props }: BtnProps) => JSX.Element;
+export default _default;

package/es/Btn.js

@@ -0,0 +1,47 @@
+// welcome to hoo hoo hoo
+import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
+import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/objectWithoutProperties';
+import { jsx } from 'react/jsx-runtime';
+import { Button } from 'antd';
+import { useRequest } from 'ahooks';
+
+var _excluded = ["loading", "request", "children", "onClick", "style", "type", "onSuccess"];
+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; }
+var Btn = (function (_ref) {
+  var loading = _ref.loading,
+    request = _ref.request,
+    children = _ref.children,
+    onClick = _ref.onClick,
+    style = _ref.style,
+    type = _ref.type,
+    onSuccess = _ref.onSuccess,
+    props = _objectWithoutProperties(_ref, _excluded);
+  var _useRequest = useRequest(function () {
+      return request === null || request === void 0 ? void 0 : request();
+    }, {
+      manual: true,
+      onSuccess: onSuccess
+    }),
+    run = _useRequest.run,
+    reqLoading = _useRequest.loading;
+  var click = function click(e) {
+    if (request) {
+      run();
+      return;
+    }
+    onClick === null || onClick === void 0 || onClick(e);
+  };
+  return jsx(Button, _objectSpread(_objectSpread({}, props), {}, {
+    type: type,
+    style: _objectSpread({
+      borderRadius: 4
+    }, style),
+    onClick: click,
+    loading: loading || reqLoading,
+    children: children
+  }));
+});
+
+export { Btn as default };
+// powered by hdj

package/es/DialogForm/DrawerForm/Footer.js

@@ -1,7 +1,7 @@
 // welcome to hoo hoo hoo
 import { jsx, jsxs } from 'react/jsx-runtime';
 import { Row, Space } from 'antd';
-import { HJBtn } from '@hw-component/hj';
+import Btn from '../../Btn.js';
 
 var Footer = (function (_ref) {
   var onCancel = _ref.onCancel,
@@ -11,10 +11,10 @@ var Footer = (function (_ref) {
     justify: "end",
     children: jsxs(Space, {
       size: "small",
-      children: [jsx(HJBtn, {
+      children: [jsx(Btn, {
         onClick: onCancel,
         children: "\u5173\u95ED"
-      }), jsx(HJBtn, {
+      }), jsx(Btn, {
         type: "primary",
         onClick: onOk,
         loading: confirmLoading,

package/es/DialogForm/DrawerForm/index.js

@@ -135,10 +135,13 @@ var Index = function Index(_ref) {
   }, props), {}, {
     onClose: cancel,
     afterVisibleChange: function afterVisibleChange(changeVisible) {
-      if (!changeVisible) {
+      if (changeVisible) {
+        return;
+      }
+      if (autoClear) {
         dialogForm === null || dialogForm === void 0 || dialogForm.clear();
-        afterClose === null || afterClose === void 0 || afterClose();
       }
+      afterClose === null || afterClose === void 0 || afterClose();
     },
     closable: false,
     destroyOnClose: true,

package/es/DialogForm/ModalForm.js

@@ -10,7 +10,7 @@ import Index$1, { useFormConfigContext } from '../Form/Context/FormConfigProvide
 import { useCurrentForm, useModifyProps, useSub, useFooterRender } from './hooks.js';
 import Index$2 from './ChildComponent.js';
 
-var _excluded = ["visible", "title", "onCancel", "configData", "infoRequest", "request", "afterClose", "dialogForm", "initialValues", "onFinish", "params", "onOk", "onValuesChange", "autoClear", "contentRender", "footer", "children"];
+var _excluded = ["visible", "title", "onCancel", "configData", "infoRequest", "request", "afterClose", "dialogForm", "initialValues", "onFinish", "params", "onOk", "onValuesChange", "autoClear", "contentRender", "footer", "children", "destroyOnClose"];
 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; }
 var Index = function Index(_ref) {
@@ -32,6 +32,8 @@ var Index = function Index(_ref) {
     contentRender = _ref.contentRender,
     footer = _ref.footer,
     children = _ref.children,
+    _ref$destroyOnClose = _ref.destroyOnClose,
+    destroyOnClose = _ref$destroyOnClose === void 0 ? true : _ref$destroyOnClose,
     props = _objectWithoutProperties(_ref, _excluded);
   var currentForm = useCurrentForm(dialogForm);
   var providerConfig = useFormConfigContext();
@@ -127,7 +129,7 @@ var Index = function Index(_ref) {
     }
   }, props), {}, {
     onOk: currentForm.submit,
-    destroyOnClose: true,
+    destroyOnClose: destroyOnClose,
     footer: defaultFooter,
     children: jsx(Index$1, _objectSpread(_objectSpread({}, providerConfig), {}, {
       children: jsx(Index$2, {

package/es/Form/hooks/useHForm.js

@@ -189,7 +189,7 @@ var useHForm = (function () {
       },
       resetFieldsInitValue: function resetFieldsInitValue() {
         var values = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-        var oldValue = form.getFieldsValue();
+        var oldValue = form.getFieldsValue(true);
         var keys = Object.keys(oldValue);
         var newVale = {};
         keys.forEach(function (key) {

package/es/Input/ButtonInput.js

@@ -6,7 +6,7 @@ import _regeneratorRuntime from '@babel/runtime-corejs3/regenerator';
 import { jsx, jsxs } from 'react/jsx-runtime';
 import { Input } from 'antd';
 import { useRequest } from 'ahooks';
-import { HJBtn } from '@hw-component/hj';
+import Btn from '../Btn.js';
 
 var _excluded = ["buttonProps", "value", "onChange", "children", "request", "layType"],
   _excluded2 = ["onClick", "type", "ghost", "loading"];
@@ -69,7 +69,7 @@ var Index = function Index(_ref) {
   }();
   if (layType === "text") {
     return jsx(Input, _objectSpread(_objectSpread({}, props), {}, {
-      suffix: jsx(HJBtn, _objectSpread(_objectSpread({
+      suffix: jsx(Btn, _objectSpread(_objectSpread({
         type: btnType,
         onClick: click,
         size: "small",
@@ -91,7 +91,7 @@ var Index = function Index(_ref) {
       },
       value: value,
       onChange: change
-    })), jsx(HJBtn, _objectSpread(_objectSpread({
+    })), jsx(Btn, _objectSpread(_objectSpread({
       type: btnType,
       onClick: click,
       loading: loading || btnLoading,

package/es/PageHandler/ErrorComponent.js

@@ -2,7 +2,7 @@
 import { jsx, jsxs } from 'react/jsx-runtime';
 import { Typography, Row, Space } from 'antd';
 import { ExclamationCircleOutlined } from '@ant-design/icons';
-import { HJBtn } from '@hw-component/hj';
+import Btn from '../Btn.js';
 
 var Text = Typography.Text;
 var ErrorComponent = (function (_ref) {
@@ -25,7 +25,7 @@ var ErrorComponent = (function (_ref) {
       }), jsx(Text, {
         type: "danger",
         children: error === null || error === void 0 ? void 0 : error.message
-      }), jsx(HJBtn, {
+      }), jsx(Btn, {
         type: "primary",
         size: "small",
         onClick: reload,

package/es/Select/components/NotFoundContent.js

@@ -2,7 +2,7 @@
 import { jsx, jsxs } from 'react/jsx-runtime';
 import { Typography, Row, Space, Empty } from 'antd';
 import { ExclamationCircleOutlined } from '@ant-design/icons';
-import { HJBtn } from '@hw-component/hj';
+import Btn from '../../Btn.js';
 
 var Text = Typography.Text;
 var NotFoundContent = (function (_ref) {
@@ -26,7 +26,7 @@ var NotFoundContent = (function (_ref) {
         }), jsx(Text, {
           type: "danger",
           children: error.message
-        }), jsx(HJBtn, {
+        }), jsx(Btn, {
           type: "primary",
           size: "small",
           onClick: reload,

package/es/Submit/components.js

@@ -4,7 +4,7 @@ import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/objectWitho
 import { jsx, Fragment } from 'react/jsx-runtime';
 import { useFormContext } from '../Form/Context/index.js';
 import React from 'react';
-import { HJBtn } from '@hw-component/hj';
+import Btn from '../Btn.js';
 
 var _excluded = ["form", "style"],
   _excluded2 = ["type", "form", "text", "loading", "style"],
@@ -18,7 +18,7 @@ function ResetBtn(_ref) {
       borderRadius: 4
     } : _ref$style,
     props = _objectWithoutProperties(_ref, _excluded);
-  return jsx(HJBtn, _objectSpread(_objectSpread({}, props), {}, {
+  return jsx(Btn, _objectSpread(_objectSpread({}, props), {}, {
     style: style,
     onClick: function onClick() {
       form.resetFields();
@@ -41,7 +41,7 @@ function SubBtn(_ref2) {
   var _useFormContext = useFormContext(),
     _useFormContext$loadi = _useFormContext.loading,
     formSubLoading = _useFormContext$loadi === void 0 ? loading : _useFormContext$loadi;
-  return jsx(HJBtn, _objectSpread(_objectSpread({}, props), {}, {
+  return jsx(Btn, _objectSpread(_objectSpread({}, props), {}, {
     type: type,
     onClick: form.submit,
     loading: formSubLoading,

package/lib/Btn.d.ts

@@ -0,0 +1,7 @@
+import type { ButtonProps } from "antd";
+export interface BtnProps<R = any> extends ButtonProps {
+    request?: () => Promise<any>;
+    onSuccess?: (data: R) => void;
+}
+declare const _default: ({ loading, request, children, onClick, style, type, onSuccess, ...props }: BtnProps) => JSX.Element;
+export default _default;

package/lib/Btn.js

@@ -0,0 +1,50 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
+var _objectWithoutProperties = require('@babel/runtime-corejs3/helpers/objectWithoutProperties');
+var jsxRuntime = require('react/jsx-runtime');
+var antd = require('antd');
+var ahooks = require('ahooks');
+
+var _excluded = ["loading", "request", "children", "onClick", "style", "type", "onSuccess"];
+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; }
+var Btn = (function (_ref) {
+  var loading = _ref.loading,
+    request = _ref.request,
+    children = _ref.children,
+    onClick = _ref.onClick,
+    style = _ref.style,
+    type = _ref.type,
+    onSuccess = _ref.onSuccess,
+    props = _objectWithoutProperties(_ref, _excluded);
+  var _useRequest = ahooks.useRequest(function () {
+      return request === null || request === void 0 ? void 0 : request();
+    }, {
+      manual: true,
+      onSuccess: onSuccess
+    }),
+    run = _useRequest.run,
+    reqLoading = _useRequest.loading;
+  var click = function click(e) {
+    if (request) {
+      run();
+      return;
+    }
+    onClick === null || onClick === void 0 || onClick(e);
+  };
+  return jsxRuntime.jsx(antd.Button, _objectSpread(_objectSpread({}, props), {}, {
+    type: type,
+    style: _objectSpread({
+      borderRadius: 4
+    }, style),
+    onClick: click,
+    loading: loading || reqLoading,
+    children: children
+  }));
+});
+
+exports.default = Btn;
+// powered by h

package/lib/DialogForm/DrawerForm/Footer.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var jsxRuntime = require('react/jsx-runtime');
 var antd = require('antd');
-var hj = require('@hw-component/hj');
+var Btn = require('../../Btn.js');
 
 var Footer = (function (_ref) {
   var onCancel = _ref.onCancel,
@@ -14,10 +14,10 @@ var Footer = (function (_ref) {
     justify: "end",
     children: jsxRuntime.jsxs(antd.Space, {
       size: "small",
-      children: [jsxRuntime.jsx(hj.HJBtn, {
+      children: [jsxRuntime.jsx(Btn.default, {
         onClick: onCancel,
         children: "\u5173\u95ED"
-      }), jsxRuntime.jsx(hj.HJBtn, {
+      }), jsxRuntime.jsx(Btn.default, {
         type: "primary",
         onClick: onOk,
         loading: confirmLoading,

package/lib/DialogForm/DrawerForm/index.js

@@ -138,10 +138,13 @@ var Index = function Index(_ref) {
   }, props), {}, {
     onClose: cancel,
     afterVisibleChange: function afterVisibleChange(changeVisible) {
-      if (!changeVisible) {
+      if (changeVisible) {
+        return;
+      }
+      if (autoClear) {
         dialogForm === null || dialogForm === void 0 || dialogForm.clear();
-        afterClose === null || afterClose === void 0 || afterClose();
       }
+      afterClose === null || afterClose === void 0 || afterClose();
     },
     closable: false,
     destroyOnClose: true,

package/lib/DialogForm/ModalForm.js

@@ -13,7 +13,7 @@ var FormConfigProvider = require('../Form/Context/FormConfigProvider.js');
 var hooks = require('./hooks.js');
 var ChildComponent = require('./ChildComponent.js');
 
-var _excluded = ["visible", "title", "onCancel", "configData", "infoRequest", "request", "afterClose", "dialogForm", "initialValues", "onFinish", "params", "onOk", "onValuesChange", "autoClear", "contentRender", "footer", "children"];
+var _excluded = ["visible", "title", "onCancel", "configData", "infoRequest", "request", "afterClose", "dialogForm", "initialValues", "onFinish", "params", "onOk", "onValuesChange", "autoClear", "contentRender", "footer", "children", "destroyOnClose"];
 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; }
 var Index = function Index(_ref) {
@@ -35,6 +35,8 @@ var Index = function Index(_ref) {
     contentRender = _ref.contentRender,
     footer = _ref.footer,
     children = _ref.children,
+    _ref$destroyOnClose = _ref.destroyOnClose,
+    destroyOnClose = _ref$destroyOnClose === void 0 ? true : _ref$destroyOnClose,
     props = _objectWithoutProperties(_ref, _excluded);
   var currentForm = hooks.useCurrentForm(dialogForm);
   var providerConfig = FormConfigProvider.useFormConfigContext();
@@ -130,7 +132,7 @@ var Index = function Index(_ref) {
     }
   }, props), {}, {
     onOk: currentForm.submit,
-    destroyOnClose: true,
+    destroyOnClose: destroyOnClose,
     footer: defaultFooter,
     children: jsxRuntime.jsx(FormConfigProvider.default, _objectSpread(_objectSpread({}, providerConfig), {}, {
       children: jsxRuntime.jsx(ChildComponent.default, {

package/lib/Form/hooks/useHForm.js

@@ -192,7 +192,7 @@ var useHForm = (function () {
       },
       resetFieldsInitValue: function resetFieldsInitValue() {
         var values = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-        var oldValue = form.getFieldsValue();
+        var oldValue = form.getFieldsValue(true);
         var keys = Object.keys(oldValue);
         var newVale = {};
         keys.forEach(function (key) {

package/lib/Input/ButtonInput.js

@@ -9,7 +9,7 @@ var _regeneratorRuntime = require('@babel/runtime-corejs3/regenerator');
 var jsxRuntime = require('react/jsx-runtime');
 var antd = require('antd');
 var ahooks = require('ahooks');
-var hj = require('@hw-component/hj');
+var Btn = require('../Btn.js');
 
 var _excluded = ["buttonProps", "value", "onChange", "children", "request", "layType"],
   _excluded2 = ["onClick", "type", "ghost", "loading"];
@@ -72,7 +72,7 @@ var Index = function Index(_ref) {
   }();
   if (layType === "text") {
     return jsxRuntime.jsx(antd.Input, _objectSpread(_objectSpread({}, props), {}, {
-      suffix: jsxRuntime.jsx(hj.HJBtn, _objectSpread(_objectSpread({
+      suffix: jsxRuntime.jsx(Btn.default, _objectSpread(_objectSpread({
         type: btnType,
         onClick: click,
         size: "small",
@@ -94,7 +94,7 @@ var Index = function Index(_ref) {
       },
       value: value,
       onChange: change
-    })), jsxRuntime.jsx(hj.HJBtn, _objectSpread(_objectSpread({
+    })), jsxRuntime.jsx(Btn.default, _objectSpread(_objectSpread({
       type: btnType,
       onClick: click,
       loading: loading || btnLoading,

package/lib/PageHandler/ErrorComponent.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var jsxRuntime = require('react/jsx-runtime');
 var antd = require('antd');
 var icons = require('@ant-design/icons');
-var hj = require('@hw-component/hj');
+var Btn = require('../Btn.js');
 
 var Text = antd.Typography.Text;
 var ErrorComponent = (function (_ref) {
@@ -28,7 +28,7 @@ var ErrorComponent = (function (_ref) {
       }), jsxRuntime.jsx(Text, {
         type: "danger",
         children: error === null || error === void 0 ? void 0 : error.message
-      }), jsxRuntime.jsx(hj.HJBtn, {
+      }), jsxRuntime.jsx(Btn.default, {
         type: "primary",
         size: "small",
         onClick: reload,

package/lib/Select/components/NotFoundContent.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var jsxRuntime = require('react/jsx-runtime');
 var antd = require('antd');
 var icons = require('@ant-design/icons');
-var hj = require('@hw-component/hj');
+var Btn = require('../../Btn.js');
 
 var Text = antd.Typography.Text;
 var NotFoundContent = (function (_ref) {
@@ -29,7 +29,7 @@ var NotFoundContent = (function (_ref) {
         }), jsxRuntime.jsx(Text, {
           type: "danger",
           children: error.message
-        }), jsxRuntime.jsx(hj.HJBtn, {
+        }), jsxRuntime.jsx(Btn.default, {
           type: "primary",
           size: "small",
           onClick: reload,

package/lib/Submit/components.js

@@ -5,7 +5,7 @@ var _objectWithoutProperties = require('@babel/runtime-corejs3/helpers/objectWit
 var jsxRuntime = require('react/jsx-runtime');
 var index = require('../Form/Context/index.js');
 var React = require('react');
-var hj = require('@hw-component/hj');
+var Btn = require('../Btn.js');
 
 var _excluded = ["form", "style"],
   _excluded2 = ["type", "form", "text", "loading", "style"],
@@ -19,7 +19,7 @@ function ResetBtn(_ref) {
       borderRadius: 4
     } : _ref$style,
     props = _objectWithoutProperties(_ref, _excluded);
-  return jsxRuntime.jsx(hj.HJBtn, _objectSpread(_objectSpread({}, props), {}, {
+  return jsxRuntime.jsx(Btn.default, _objectSpread(_objectSpread({}, props), {}, {
     style: style,
     onClick: function onClick() {
       form.resetFields();
@@ -42,7 +42,7 @@ function SubBtn(_ref2) {
   var _useFormContext = index.useFormContext(),
     _useFormContext$loadi = _useFormContext.loading,
     formSubLoading = _useFormContext$loadi === void 0 ? loading : _useFormContext$loadi;
-  return jsxRuntime.jsx(hj.HJBtn, _objectSpread(_objectSpread({}, props), {}, {
+  return jsxRuntime.jsx(Btn.default, _objectSpread(_objectSpread({}, props), {}, {
     type: type,
     onClick: form.submit,
     loading: formSubLoading,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hw-component/form",
-  "version": "1.9.73",
+  "version": "1.9.75",
   "description": "基于antd二次开发",
   "repository": {
     "type": "git",
@@ -47,7 +47,6 @@
     "@babel/preset-env": "^7.23.2",
     "@babel/preset-react": "^7.18.6",
     "@babel/preset-typescript": "^7.21.5",
-    "@hw-component/hj": "0.9.0",
     "@rollup/plugin-babel": "^6.0.3",
     "@rollup/plugin-commonjs": "^25.0.0",
     "@rollup/plugin-inject": "^5.0.3",
@@ -91,7 +90,6 @@
   },
   "peerDependencies": {
     "@ant-design/icons": "4.6.2",
-    "@hw-component/hj": "0.9.0",
     "antd": "4.20.7",
     "react": "17.0.0",
     "react-dom": "17.0.2"

package/src/components/Btn.tsx

@@ -0,0 +1,44 @@
+import type { ButtonProps } from "antd";
+import { Button } from "antd";
+import React from "react";
+import { useRequest } from "ahooks";
+
+export interface BtnProps<R = any> extends ButtonProps {
+    request?: () => Promise<any>;
+    onSuccess?: (data: R) => void;
+}
+export default ({
+                    loading,
+                    request,
+                    children,
+                    onClick,
+                    style,
+                    type,
+                    onSuccess,
+                    ...props
+                }:BtnProps) => {
+    const { run, loading: reqLoading } = useRequest(
+        () => {
+            return request?.();
+        },
+        { manual: true, onSuccess }
+    );
+    const click = (e) => {
+        if (request) {
+            run();
+            return;
+        }
+        onClick?.(e);
+    };
+    return (
+        <Button
+            {...props}
+            type={type}
+            style={{ borderRadius: 4, ...style }}
+            onClick={click}
+            loading={loading || reqLoading}
+        >
+            {children}
+        </Button>
+    );
+};

package/src/components/DialogForm/DrawerForm/Footer.tsx

@@ -1,5 +1,5 @@
 import { Row, Space } from "antd";
-import { HJBtn } from "@hw-component/hj";
+import Btn from "../../Btn";
 
 interface IProps {
   onOk?: VoidFunction;
@@ -11,10 +11,10 @@ export default ({ onCancel, onOk, confirmLoading }: IProps) => {
   return (
     <Row justify={"end"}>
       <Space size={"small"}>
-        <HJBtn onClick={onCancel}>关闭</HJBtn>
-        <HJBtn type={"primary"} onClick={onOk} loading={confirmLoading}>
+        <Btn onClick={onCancel}>关闭</Btn>
+        <Btn type={"primary"} onClick={onOk} loading={confirmLoading}>
           确定
-        </HJBtn>
+        </Btn>
       </Space>
     </Row>
   );

package/src/components/DialogForm/DrawerForm/index.tsx

@@ -108,10 +108,13 @@ const Index: React.FC<DialogFormProps> = ({
       {...props}
       onClose={cancel}
       afterVisibleChange={(changeVisible) => {
-        if (!changeVisible) {
+        if (changeVisible){
+          return;
+        }
+        if (autoClear){
           dialogForm?.clear();
-          afterClose?.();
         }
+        afterClose?.();
       }}
       closable={false}
       destroyOnClose

package/src/components/DialogForm/ModalForm.tsx

@@ -30,6 +30,7 @@ const Index: React.FC<DialogFormProps> = ({
   contentRender,
   footer,
   children,
+                                            destroyOnClose=true,
   ...props
 }) => {
   const currentForm = useCurrentForm(dialogForm);
@@ -106,7 +107,7 @@ const Index: React.FC<DialogFormProps> = ({
       }}
       {...props}
       onOk={currentForm.submit}
-      destroyOnClose
+      destroyOnClose={destroyOnClose}
       footer={defaultFooter}
     >
       <FormConfigProvider {...providerConfig}>

package/src/components/Form/hooks/useHForm.ts

@@ -174,7 +174,7 @@ export default () => {
         });
       },
       resetFieldsInitValue: (values = {}) => {
-        const oldValue = form.getFieldsValue();
+        const oldValue = form.getFieldsValue(true);
         const keys = Object.keys(oldValue);
         const newVale = {};
         keys.forEach((key) => {

package/src/components/Input/ButtonInput.tsx

@@ -2,7 +2,7 @@ import { Input } from "antd";
 import React from "react";
 import { useRequest } from "ahooks";
 import type { HButtonInputProps } from "./modal";
-import { HJBtn } from "@hw-component/hj";
+import Btn from "../Btn";
 const Index: React.FC<HButtonInputProps> = ({
   buttonProps = {},
   value,
@@ -42,7 +42,7 @@ const Index: React.FC<HButtonInputProps> = ({
       <Input
         {...props}
         suffix={
-          <HJBtn
+          <Btn
             type={btnType}
             onClick={click}
             size={"small"}
@@ -51,7 +51,7 @@ const Index: React.FC<HButtonInputProps> = ({
             {...oProps}
           >
             {children}
-          </HJBtn>
+          </Btn>
         }
       />
     );
@@ -59,7 +59,7 @@ const Index: React.FC<HButtonInputProps> = ({
   return (
     <Input.Group compact style={{ display: "flex" }}>
       <Input {...props} style={{ flex: 1 }} value={value} onChange={change} />
-      <HJBtn
+      <Btn
         type={btnType}
         onClick={click}
         loading={loading || btnLoading}
@@ -68,7 +68,7 @@ const Index: React.FC<HButtonInputProps> = ({
         {...oProps}
       >
         {children}
-      </HJBtn>
+      </Btn>
     </Input.Group>
   );
 };

package/src/components/PageHandler/ErrorComponent.tsx

@@ -1,7 +1,7 @@
 import { Row, Space, Typography } from "antd";
 import { ExclamationCircleOutlined } from "@ant-design/icons";
 import type { IHPageHandler } from "./modal";
-import { HJBtn } from "@hw-component/hj";
+import Btn from "../Btn";
 
 const { Text } = Typography;
 export default ({ error, reload }: IHPageHandler) => {
@@ -12,9 +12,9 @@ export default ({ error, reload }: IHPageHandler) => {
           <ExclamationCircleOutlined size={24} />
         </Text>
         <Text type={"danger"}>{error?.message}</Text>
-        <HJBtn type="primary" size={"small"} onClick={reload}>
+        <Btn type="primary" size={"small"} onClick={reload}>
           重新加载
-        </HJBtn>
+        </Btn>
       </Space>
     </Row>
   );

package/src/components/Select/components/NotFoundContent.tsx

@@ -1,6 +1,6 @@
 import { Empty, Row, Space, Typography } from "antd";
 import { ExclamationCircleOutlined } from "@ant-design/icons";
-import { HJBtn } from "@hw-component/hj";
+import Btn from "../../Btn";
 const { Text } = Typography;
 interface IProps {
   error?: Error;
@@ -15,9 +15,9 @@ export default ({ error, reload }: IProps) => {
             <ExclamationCircleOutlined size={24} />
           </Text>
           <Text type={"danger"}>{error.message}</Text>
-          <HJBtn type="primary" size={"small"} onClick={reload}>
+          <Btn type="primary" size={"small"} onClick={reload}>
             重新加载
-          </HJBtn>
+          </Btn>
         </Space>
       </Row>
     );

package/src/components/Submit/components.tsx

@@ -4,7 +4,7 @@ import type {
   ISubmitProps,
   SubmitBarExtraType,
 } from "@/components/Submit/index";
-import { HJBtn } from "@hw-component/hj";
+import Btn from "../Btn";
 interface ControlFooterProps extends ISubmitProps {
   action: SubmitBarExtraType;
   style?: React.CSSProperties;
@@ -15,7 +15,7 @@ function ResetBtn({
   ...props
 }: Omit<ControlFooterProps, "action">) {
   return (
-    <HJBtn
+    <Btn
       {...props}
       style={style}
       onClick={() => {
@@ -23,7 +23,7 @@ function ResetBtn({
       }}
     >
       重置
-    </HJBtn>
+    </Btn>
   );
 }
 
@@ -38,7 +38,7 @@ function SubBtn({
   const { loading: formSubLoading = loading } = useFormContext();
 
   return (
-    <HJBtn
+    <Btn
       {...props}
       type={type as any}
       onClick={form.submit}
@@ -46,7 +46,7 @@ function SubBtn({
       style={style}
     >
       {text}
-    </HJBtn>
+    </Btn>
   );
 }
 

package/src/index.less

@@ -1,4 +1,3 @@
-@import "~@hw-component/hj/src/components/styles/index.less";
 .layout {
   position: fixed;
   top: 0;

package/src/pages/DrawerForm/index.tsx

@@ -4,7 +4,7 @@ import { MediaTypeEnum } from "../../components/Upload/enums";
 import FormItem from "../../components/Form/FormItem";
 import { useEffect } from "react";
 const Test = () => {
-  return <FormItem name="123" label="你好" />;
+  return <FormItem name="input" label="你好" />;
 };
 const data = [
   {
@@ -13,6 +13,17 @@ const data = [
       return <Test />;
     },
   },
+    {
+        type:'select',
+         label:"下啦",
+         name:"select",
+         itemProps:{
+            options:[{
+                value:"123",
+                key:1
+            }]
+         }
+    },
 ];
 let num = 0;
 const Test1 = ({ formNode, dialogForm, params }) => {
@@ -54,11 +65,11 @@ export default () => {
       </Button>
       <Button
         onClick={() => {
-          modalForm.show({
-            initialValues: {
-              select: null,
-            },
-          });
+            modalForm.show({
+                 initialValues:{
+                     "input":"12312"
+                 }
+            });
         }}
       >
         打开
@@ -68,6 +79,7 @@ export default () => {
         labelWidth={88}
         labelAlign={"left"}
         dialogForm={modalForm}
+        autoClear={false}
         request={(values) => {
           return Promise.resolve();
         }}

package/src/pages/Form/index.tsx

@@ -75,6 +75,19 @@ export default () => {
         <div style={{ width: 1000 }}>
           <HForm
             configData={[
+                {
+                    label: "inputSelect",
+                    type: "richEditor",
+                    name: "richEditor",
+                    rules: [
+                        {
+                            validator: (rule, value, callback) => {
+                                console.log(value);
+                                return Promise.resolve();
+                            },
+                        },
+                    ],
+                },
               {
                 label: "富文本",
                 type: "richEditor",
@@ -224,6 +237,13 @@ export default () => {
       >
         点我
       </div>
+        <div
+            onClick={() => {
+                form.resetFieldsInitValue();
+            }}
+        >
+            重置
+        </div>
       <div
         onClick={() => {
           form.submit();