@hw-component/form 1.9.73 → 1.9.74

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/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hw-component/form",
-  "version": "1.9.73",
+  "version": "1.9.74",
   "description": "基于antd二次开发",
   "repository": {
     "type": "git",

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/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();
         }}