@hw-component/form 0.0.6-beta-v3 → 0.0.6-beta-v4

package/es/DialogForm/hooks.js

@@ -66,7 +66,8 @@ var useModifyProps = function useModifyProps(_ref) {
     dialogForm.show = function () {
       var showParams = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
       var changeConfigData = showParams.configData,
-        changeInitialValues = showParams.initialValues,
+        _showParams$initialVa = showParams.initialValues,
+        changeInitialValues = _showParams$initialVa === void 0 ? {} : _showParams$initialVa,
         _showParams$params = showParams.params,
         changeParams = _showParams$params === void 0 ? {} : _showParams$params,
         changeTitle = showParams.title;

package/es/Form/hooks/index.js

@@ -72,23 +72,24 @@ var useInfoReq = function useInfoReq(_ref) {
           setValue = initialValues;
           reqData.params = reqParams;
           if (!(!initialValues && !infoRequest)) {
-            _context2.next = 5;
+            _context2.next = 6;
             break;
           }
+          form === null || form === void 0 || form.setFieldsValue({});
           return _context2.abrupt("return", {});
-        case 5:
+        case 6:
           if (!infoRequest) {
-            _context2.next = 9;
+            _context2.next = 10;
             break;
           }
-          _context2.next = 8;
+          _context2.next = 9;
           return infoRequest(reqParams);
-        case 8:
-          setValue = _context2.sent;
         case 9:
+          setValue = _context2.sent;
+        case 10:
           form === null || form === void 0 || form.setFieldsValue(setValue);
           return _context2.abrupt("return", setValue || {});
-        case 11:
+        case 12:
         case "end":
           return _context2.stop();
       }

package/es/Form/hooks/useHForm.js

@@ -184,6 +184,10 @@ var useHForm = (function () {
             return resolve(result);
           });
         });
+      },
+      resetFields: function resetFields() {
+        form.resetFields();
+        isLoading = false;
       }
     });
   }, []);

package/lib/DialogForm/hooks.js

@@ -67,7 +67,8 @@ var useModifyProps = function useModifyProps(_ref) {
     dialogForm.show = function () {
       var showParams = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
       var changeConfigData = showParams.configData,
-        changeInitialValues = showParams.initialValues,
+        _showParams$initialVa = showParams.initialValues,
+        changeInitialValues = _showParams$initialVa === void 0 ? {} : _showParams$initialVa,
         _showParams$params = showParams.params,
         changeParams = _showParams$params === void 0 ? {} : _showParams$params,
         changeTitle = showParams.title;

package/lib/Form/hooks/index.js

@@ -73,23 +73,24 @@ var useInfoReq = function useInfoReq(_ref) {
           setValue = initialValues;
           reqData.params = reqParams;
           if (!(!initialValues && !infoRequest)) {
-            _context2.next = 5;
+            _context2.next = 6;
             break;
           }
+          form === null || form === void 0 || form.setFieldsValue({});
           return _context2.abrupt("return", {});
-        case 5:
+        case 6:
           if (!infoRequest) {
-            _context2.next = 9;
+            _context2.next = 10;
             break;
           }
-          _context2.next = 8;
+          _context2.next = 9;
           return infoRequest(reqParams);
-        case 8:
-          setValue = _context2.sent;
         case 9:
+          setValue = _context2.sent;
+        case 10:
           form === null || form === void 0 || form.setFieldsValue(setValue);
           return _context2.abrupt("return", setValue || {});
-        case 11:
+        case 12:
         case "end":
           return _context2.stop();
       }

package/lib/Form/hooks/useHForm.js

@@ -187,6 +187,10 @@ var useHForm = (function () {
             return resolve(result);
           });
         });
+      },
+      resetFields: function resetFields() {
+        form.resetFields();
+        isLoading = false;
       }
     });
   }, []);

package/package.json

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

package/src/components/DialogForm/hooks.ts

@@ -45,7 +45,7 @@ export const useModifyProps = ({
     dialogForm.show = (showParams = {}) => {
       const {
         configData: changeConfigData,
-        initialValues: changeInitialValues,
+        initialValues: changeInitialValues={},
         params: changeParams={},
         title: changeTitle,
       } = showParams;

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

@@ -47,6 +47,7 @@ export const useInfoReq = ({
     let setValue = initialValues;
     reqData.params = reqParams;
     if (!initialValues && !infoRequest) {
+      form?.setFieldsValue({});
       return {};
     }
     if (infoRequest) {

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

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

package/src/pages/DrawerForm/index.tsx

@@ -114,12 +114,20 @@ export default () => {
           });
         }}
       >
-        打开
+        显示
+      </Button>
+      <Button
+          onClick={() => {
+            modalForm.show();
+          }}
+      >
+         打开
       </Button>
       <HDrawerForm
+
         configData={data}
         labelWidth={88}
-        modalForm={modalForm}
+        dialogForm={modalForm}
         title="测试"
       />
     </>

package/src/pages/Form/index.tsx

@@ -150,7 +150,9 @@ export default () => {
           configData={formData(options)}
           labelWidth={200}
           form={form}
-          initialValues={{}}
+          initialValues={{
+            name:'fff'
+          }}
           onFinish={(value) => {
             console.log(value);
           }}
@@ -182,22 +184,18 @@ export default () => {
       </HFormConfigProvider>
       <div
         onClick={() => {
-          form.dispatch(
-            {
-              name: "select",
-              key: "reload",
-            },
-            {
-              params: {
-                label: "更新",
-                value: 2,
-              },
-            }
-          );
+          form.setFieldsValue({name:"123"})
         }}
       >
         点我
       </div>
+      <div
+          onClick={() => {
+            form.resetFields();
+          }}
+      >
+        重置
+      </div>
     </div>
   );
 };

package/src/pages/ModalForm/index.tsx

@@ -107,7 +107,6 @@ const data = [
     },
     itemProps: {
       request: (params = {}, values) => {
-        console.log(values, "paramsparamsparams");
         const { label = "123", value = 1 } = params;
         return Promise.resolve([{ label, value }]);
       },
@@ -133,6 +132,20 @@ export default () => {
       >
         打开
       </Button>
+      <Button
+          onClick={() => {
+            modalForm.show({
+              params: {
+                name: num,
+              },
+              initialValues:{
+                name:"name"
+              }
+            });
+          }}
+      >
+        宣誓
+      </Button>
       <HModalForm
         configData={data}
         labelWidth={88}