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

package/es/DialogForm/hooks.js

@@ -66,15 +66,15 @@ 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,
-        changeParams = showParams.params,
+        _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;
       if (!!changeConfigData) {
         setModalFormData(changeConfigData);
       }
-      if (!!changeParams) {
-        setFormParams(changeParams);
-      }
+      setFormParams(changeParams);
       if (!!changeTitle) {
         setModalTitle(changeTitle);
       }

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,15 +67,15 @@ 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,
-        changeParams = showParams.params,
+        _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;
       if (!!changeConfigData) {
         setModalFormData(changeConfigData);
       }
-      if (!!changeParams) {
-        setFormParams(changeParams);
-      }
+      setFormParams(changeParams);
       if (!!changeTitle) {
         setModalTitle(changeTitle);
       }

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-v2",
+  "version": "0.0.6-beta-v4",
   "description": "基于antd二次开发",
   "repository": {
     "type": "git",
@@ -26,6 +26,12 @@
       "prettier --write"
     ]
   },
+  "browserslist": [
+    "> 0.5%",
+    "last 2 versions",
+    "Firefox ESR",
+    "not dead"
+  ],
   "dependencies": {
     "@ant-design/icons": "4.6.2",
     "@types/react-color": "^3.0.9",
@@ -80,11 +86,5 @@
     "webpack-dev-server": "^4.15.0",
     "webpackbar": "^5.0.2"
   },
-  "cssPrefix": "hw",
-  "browserslist": [
-    "> 0.5%",
-    "last 2 versions",
-    "Firefox ESR",
-    "not dead"
-  ]
+  "cssPrefix": "hw"
 }

package/scripts/rollup.config.js

@@ -61,17 +61,20 @@ module.exports = {
       exclude: "node_modules/**",
       extensions: [".ts", ".tsx", ".js", ".jsx"],
       babelHelpers: "runtime",
-      "presets": [
-       [ "@babel/preset-env",{
-         "targets":{
-           "chrome": "58",
-           "ie": "11",
-           "ios":"11"
-         },
-         "useBuiltIns":"usage",
-         "corejs":3,
-         "modules":false
-       }]
+      presets: [
+        [
+          "@babel/preset-env",
+          {
+            targets: {
+              chrome: "58",
+              ie: "11",
+              ios: "11",
+            },
+            useBuiltIns: "usage",
+            corejs: 3,
+            modules: false,
+          },
+        ],
       ],
     }),
     inject({

package/src/components/DialogForm/hooks.ts

@@ -45,16 +45,14 @@ export const useModifyProps = ({
     dialogForm.show = (showParams = {}) => {
       const {
         configData: changeConfigData,
-        initialValues: changeInitialValues,
-        params: changeParams,
+        initialValues: changeInitialValues={},
+        params: changeParams={},
         title: changeTitle,
       } = showParams;
       if (!!changeConfigData) {
         setModalFormData(changeConfigData);
       }
-      if (!!changeParams) {
-        setFormParams(changeParams);
-      }
+      setFormParams(changeParams);
       if (!!changeTitle) {
         setModalTitle(changeTitle);
       }

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/components/Input/ColorInput/index.tsx

@@ -3,11 +3,16 @@ import { Input, Popover } from "antd";
 import Picker from "./Picker";
 import { useMemo } from "react";
 import { useClassName } from "../../hooks";
-export default ({ value, onChange,defaultColor="rgba(0,0,0,1)", ...props }: HInputProps) => {
+export default ({
+  value,
+  onChange,
+  defaultColor = "rgba(0,0,0,1)",
+  ...props
+}: HInputProps) => {
   const classname = useClassName("hw-color-box");
-  const inputVal=value?.trim();
+  const inputVal = value?.trim();
   const pickerValue = useMemo(() => {
-    const  matchVal=inputVal||defaultColor;
+    const matchVal = inputVal || defaultColor;
     if (typeof matchVal === "string") {
       if (matchVal.startsWith("#")) {
         return matchVal;
@@ -42,7 +47,10 @@ export default ({ value, onChange,defaultColor="rgba(0,0,0,1)", ...props }: HInp
           content={<Picker value={pickerValue} onChange={colorChange} />}
           placement="topLeft"
         >
-          <div style={{ backgroundColor: inputVal||defaultColor }} className={classname} />
+          <div
+            style={{ backgroundColor: inputVal || defaultColor }}
+            className={classname}
+          />
         </Popover>
       }
     />

package/src/components/Input/modal.ts

@@ -8,7 +8,7 @@ export interface HInputProps<V = any>
   extends Omit<InputProps, "onChange" | "value"> {
   onChange?: (value: V) => void;
   value?: V;
-  defaultColor?:string;
+  defaultColor?: string;
 }
 
 interface ValueNameModal {

package/src/components/config.ts

@@ -41,5 +41,5 @@ export const baseConfig: IFormConfigContextProps = {
 };
 
 export default {
-  name:"name"
-}
+  name: "name",
+};

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}