@hw-component/form 1.9.79 → 1.9.81

package/es/DialogForm/DrawerForm/index.js

@@ -11,7 +11,7 @@ import Title from './Title.js';
 import Index$1, { useFormConfigContext } from '../../Form/Context/FormConfigProvider.js';
 import Index$2 from '../ChildComponent.js';
 
-var _excluded = ["visible", "title", "onCancel", "configData", "infoRequest", "request", "afterClose", "dialogForm", "closable", "initialValues", "labelWidth", "onOk", "onFinish", "size", "form", "footer", "params", "onValuesChange", "autoClear", "contentRender", "children"];
+var _excluded = ["visible", "title", "onCancel", "configData", "infoRequest", "request", "afterClose", "dialogForm", "closable", "initialValues", "labelWidth", "onOk", "onFinish", "size", "form", "footer", "params", "onValuesChange", "autoClear", "contentRender", "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) {
@@ -38,6 +38,8 @@ var Index = function Index(_ref) {
     autoClear = _ref$autoClear === void 0 ? true : _ref$autoClear,
     contentRender = _ref.contentRender,
     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();
@@ -144,7 +146,7 @@ var Index = function Index(_ref) {
       afterClose === null || afterClose === void 0 || afterClose();
     },
     closable: false,
-    destroyOnClose: true,
+    destroyOnClose: destroyOnClose,
     footer: defaultFooter,
     children: jsx(Index$1, _objectSpread(_objectSpread({}, providerConfig), {}, {
       children: jsx(Index$2, {

package/es/DialogForm/hooks.js

@@ -46,7 +46,7 @@ var useModifyProps = function useModifyProps(_ref) {
     };
   }, []);
   var saveOldParams = function saveOldParams() {
-    saveOldParamsObj.old = dialogForm.outputValues();
+    saveOldParamsObj.old = dialogForm.getFieldsValue(true);
   };
   useEffect(function () {
     setModalVisible(visible);

package/es/Form/InitSet.js

@@ -8,6 +8,10 @@ var InitSet = (function () {
     form = _useFormContext.form;
   useEffect(function () {
     form.initValues();
+    form.inited = true;
+    return function () {
+      form.inited = false;
+    };
   }, []);
   return jsx(Fragment, {});
 });

package/es/Form/hooks/useHForm.js

@@ -200,7 +200,8 @@ var useHForm = (function () {
       clear: function clear() {
         form.resetFields();
         isLoading = false;
-      }
+      },
+      inited: false
     });
   }, []);
 });

package/es/Form/modal.d.ts

@@ -150,6 +150,7 @@ export interface HFormInstance extends FormInstance {
     clear: VoidFunction;
     resetFieldsInitValue: (values?: Record<string, any>) => void;
     clearFormat: (name: string) => void;
+    inited: boolean;
 }
 export interface ConnectConfigModal {
     format?: Record<string, addFormatItemModal>;

package/lib/DialogForm/DrawerForm/index.js

@@ -14,7 +14,7 @@ var Title = require('./Title.js');
 var FormConfigProvider = require('../../Form/Context/FormConfigProvider.js');
 var ChildComponent = require('../ChildComponent.js');
 
-var _excluded = ["visible", "title", "onCancel", "configData", "infoRequest", "request", "afterClose", "dialogForm", "closable", "initialValues", "labelWidth", "onOk", "onFinish", "size", "form", "footer", "params", "onValuesChange", "autoClear", "contentRender", "children"];
+var _excluded = ["visible", "title", "onCancel", "configData", "infoRequest", "request", "afterClose", "dialogForm", "closable", "initialValues", "labelWidth", "onOk", "onFinish", "size", "form", "footer", "params", "onValuesChange", "autoClear", "contentRender", "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) {
@@ -41,6 +41,8 @@ var Index = function Index(_ref) {
     autoClear = _ref$autoClear === void 0 ? true : _ref$autoClear,
     contentRender = _ref.contentRender,
     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();
@@ -147,7 +149,7 @@ var Index = function Index(_ref) {
       afterClose === null || afterClose === void 0 || afterClose();
     },
     closable: false,
-    destroyOnClose: true,
+    destroyOnClose: destroyOnClose,
     footer: defaultFooter,
     children: jsxRuntime.jsx(FormConfigProvider.default, _objectSpread(_objectSpread({}, providerConfig), {}, {
       children: jsxRuntime.jsx(ChildComponent.default, {

package/lib/DialogForm/hooks.js

@@ -47,7 +47,7 @@ var useModifyProps = function useModifyProps(_ref) {
     };
   }, []);
   var saveOldParams = function saveOldParams() {
-    saveOldParamsObj.old = dialogForm.outputValues();
+    saveOldParamsObj.old = dialogForm.getFieldsValue(true);
   };
   React.useEffect(function () {
     setModalVisible(visible);

package/lib/Form/InitSet.js

@@ -11,6 +11,10 @@ var InitSet = (function () {
     form = _useFormContext.form;
   React.useEffect(function () {
     form.initValues();
+    form.inited = true;
+    return function () {
+      form.inited = false;
+    };
   }, []);
   return jsxRuntime.jsx(jsxRuntime.Fragment, {});
 });

package/lib/Form/hooks/useHForm.js

@@ -203,7 +203,8 @@ var useHForm = (function () {
       clear: function clear() {
         form.resetFields();
         isLoading = false;
-      }
+      },
+      inited: false
     });
   }, []);
 });

package/lib/Form/modal.d.ts

@@ -150,6 +150,7 @@ export interface HFormInstance extends FormInstance {
     clear: VoidFunction;
     resetFieldsInitValue: (values?: Record<string, any>) => void;
     clearFormat: (name: string) => void;
+    inited: boolean;
 }
 export interface ConnectConfigModal {
     format?: Record<string, addFormatItemModal>;

package/package.json

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

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

@@ -35,6 +35,7 @@ const Index: React.FC<DialogFormProps> = ({
   autoClear = true,
   contentRender,
   children,
+                                            destroyOnClose=true,
   ...props
 }: DialogFormProps) => {
   const currentForm = useCurrentForm(dialogForm);
@@ -117,7 +118,7 @@ const Index: React.FC<DialogFormProps> = ({
         afterClose?.();
       }}
       closable={false}
-      destroyOnClose
+      destroyOnClose={destroyOnClose}
       footer={defaultFooter}
     >
       <FormConfigProvider {...providerConfig}>

package/src/components/DialogForm/hooks.tsx

@@ -29,7 +29,7 @@ export const useModifyProps = ({
     };
   }, []);
   const saveOldParams = () => {
-    saveOldParamsObj.old = dialogForm.outputValues();
+    saveOldParamsObj.old = dialogForm.getFieldsValue(true);
   };
   useEffect(() => {
     setModalVisible(visible);

package/src/components/Form/InitSet.tsx

@@ -5,6 +5,10 @@ export default () => {
   const { form } = useFormContext();
   useEffect(() => {
     form.initValues();
+    form.inited=true;
+    return ()=>{
+      form.inited=false;
+    }
   }, []);
   return <></>;
 };

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

@@ -190,6 +190,7 @@ export default () => {
         form.resetFields();
         isLoading = false;
       },
+      inited:false
     };
   }, []);
 };

package/src/components/Form/index.tsx

@@ -33,7 +33,6 @@ export default ({
 }: HFormProps) => {
   const hForm = useCurrentForm(form);
   const [dispatchSourceData, setDispatchSourceData] = useState({});
-
   const { subControl, infoControl } = useInfoReq({
     initialValues,
     request,

package/src/components/Form/modal.ts

@@ -209,6 +209,7 @@ export interface HFormInstance extends FormInstance {
   clear: VoidFunction;
   resetFieldsInitValue: (values?: Record<string, any>) => void;
   clearFormat: (name: string) => void;
+  inited:boolean;
 }
 
 export interface ConnectConfigModal {

package/src/pages/Form/index.tsx

@@ -75,6 +75,14 @@ export default () => {
         <div style={{ width: 1000 }}>
           <HForm
             configData={[
+                {
+                    label:"文字",
+                    name:"wz"
+                },
+                {
+                    label:"文字1",
+                    name:"wz1"
+                },
                 {
                     label: "inputSelect",
                     type: "richEditor",
@@ -208,9 +216,6 @@ export default () => {
               },
             ]}
             dismissOnPressEnter={false}
-            formItemStyle={{
-              marginBottom: 100,
-            }}
             labelWidth={88}
             form={form}
             initialValues={{
@@ -243,10 +248,12 @@ export default () => {
       </div>
         <div
             onClick={() => {
-                form.resetFieldsInitValue();
+                form.setFieldsValue({
+                    wz:"你好"
+                })
             }}
         >
-            重置
+            设置
         </div>
       <div
         onClick={() => {

package/src/pages/ModalForm/index.tsx

@@ -22,9 +22,9 @@ const data = [
     label: "输入框",
     name: "name",
     hideLabel: true,
-    render:()=>{
-        return <ITest/>
-    },
+    // render:()=>{
+    //     return <ITest/>
+    // },
   },
   // {
   //   label: "数字",
@@ -204,15 +204,12 @@ export default () => {
           formItemStyle={{
             marginBottom: 100,
           }}
+          destroyOnClose={false}
+          autoClear={false}
           onOk={() => {
               console.log("fff")
             return false;
           }}
-          infoRequest={() => {
-            return Promise.resolve({
-              text: "你好",
-            });
-          }}
           labelAlign={"left"}
           request={(values, params) => {
               console.log(values,params)