@hw-component/form 1.4.1 → 1.4.3

package/es/Form/HFormConnect.js

@@ -41,20 +41,30 @@ var HFormConnect = (function (component) {
   var _config$format = config.format,
     format = _config$format === void 0 ? {} : _config$format;
   var Index = function Index(props, ref) {
-    var _props$name = props.name,
-      name = _props$name === void 0 ? "" : _props$name,
-      dispatch = props.dispatch;
     var _useFormContext = useFormContext(),
       form = _useFormContext.form,
       _useFormContext$value = _useFormContext.valueType,
       valueType = _useFormContext$value === void 0 ? "float" : _useFormContext$value;
     useEffect(function () {
+      var name = props.name;
+      if (!name) {
+        return;
+      }
       form === null || form === void 0 || form.addFormat(name, formatMaker(props, format[valueType]));
     }, [valueType, props]);
     var addFormat = function addFormat(aFormat) {
+      var name = props.name;
+      if (!name) {
+        return;
+      }
       form === null || form === void 0 || form.addFormat(name, formatMaker(props, aFormat[valueType]));
     };
     var addDispatchListener = function addDispatchListener(key, fn) {
+      var name = props.name,
+        dispatch = props.dispatch;
+      if (!name) {
+        return;
+      }
       form === null || form === void 0 || form.addDispatchListener({
         key: key,
         name: name,

package/es/Form/config.js

@@ -22,7 +22,7 @@ import TrimInput from '../Input/TrimInput.js';
 import TrimTextArea from '../TextArea/TrimTextArea.js';
 
 var placeholderConfig = {
-  inputType: ["input", "inputNumber", "selectInput", "buttonInput", "verificationCodeInput", "trimInput", "urlUpload"],
+  inputType: ["input", "inputNumber", "selectInput", "buttonInput", "verificationCodeInput", "trimInput", "urlUpload", "textArea"],
   selectType: ["select", "datePicker", "timePicker", "colorInput"]
 };
 var componentConfig = {

package/es/Form/hooks/useHForm.js

@@ -69,6 +69,7 @@ var useHForm = (function () {
         if (!format) {
           return;
         }
+        console.log(name, "nnnnnnnn");
         var inputValue = format.inputValue,
           outputValue = format.outputValue;
         formatSourceData[name] = {

package/lib/Form/HFormConnect.js

@@ -44,20 +44,30 @@ var HFormConnect = (function (component) {
   var _config$format = config.format,
     format = _config$format === void 0 ? {} : _config$format;
   var Index = function Index(props, ref) {
-    var _props$name = props.name,
-      name = _props$name === void 0 ? "" : _props$name,
-      dispatch = props.dispatch;
     var _useFormContext = index.useFormContext(),
       form = _useFormContext.form,
       _useFormContext$value = _useFormContext.valueType,
       valueType = _useFormContext$value === void 0 ? "float" : _useFormContext$value;
     React.useEffect(function () {
+      var name = props.name;
+      if (!name) {
+        return;
+      }
       form === null || form === void 0 || form.addFormat(name, formatMaker(props, format[valueType]));
     }, [valueType, props]);
     var addFormat = function addFormat(aFormat) {
+      var name = props.name;
+      if (!name) {
+        return;
+      }
       form === null || form === void 0 || form.addFormat(name, formatMaker(props, aFormat[valueType]));
     };
     var addDispatchListener = function addDispatchListener(key, fn) {
+      var name = props.name,
+        dispatch = props.dispatch;
+      if (!name) {
+        return;
+      }
       form === null || form === void 0 || form.addDispatchListener({
         key: key,
         name: name,

package/lib/Form/config.js

@@ -25,7 +25,7 @@ var TrimInput = require('../Input/TrimInput.js');
 var TrimTextArea = require('../TextArea/TrimTextArea.js');
 
 var placeholderConfig = {
-  inputType: ["input", "inputNumber", "selectInput", "buttonInput", "verificationCodeInput", "trimInput", "urlUpload"],
+  inputType: ["input", "inputNumber", "selectInput", "buttonInput", "verificationCodeInput", "trimInput", "urlUpload", "textArea"],
   selectType: ["select", "datePicker", "timePicker", "colorInput"]
 };
 var componentConfig = {

package/lib/Form/hooks/useHForm.js

@@ -72,6 +72,7 @@ var useHForm = (function () {
         if (!format) {
           return;
         }
+        console.log(name, "nnnnnnnn");
         var inputValue = format.inputValue,
           outputValue = format.outputValue;
         formatSourceData[name] = {

package/package.json

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

package/src/components/Form/HFormConnect.tsx

@@ -43,17 +43,28 @@ export default (
     props: HFormItemProps,
     ref
   ) => {
-    const { name = "", dispatch } = props;
 
     const { form, valueType = "float" } = useFormContext();
 
     useEffect(() => {
+      const {name}=props;
+      if (!name){
+        return;
+      }
       form?.addFormat(name, formatMaker(props, format[valueType]));
     }, [valueType, props]);
     const addFormat = (aFormat: Record<string, addFormatItemModal>) => {
+      const {name}=props;
+      if (!name){
+        return;
+      }
       form?.addFormat(name, formatMaker(props, aFormat[valueType]));
     };
     const addDispatchListener = (key: string, fn: argsFn) => {
+      const { name , dispatch } = props;
+      if (!name){
+        return;
+      }
       form?.addDispatchListener({ key, name, dispatch }, fn);
     };
     const Component = component as React.ForwardRefRenderFunction<

package/src/components/Form/config.ts

@@ -28,6 +28,7 @@ export const placeholderConfig = {
     "verificationCodeInput",
     "trimInput",
     "urlUpload",
+    "textArea"
   ],
   selectType: ["select", "datePicker", "timePicker", "colorInput"],
 };

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

@@ -55,6 +55,7 @@ export default () => {
         if (!format) {
           return;
         }
+        console.log(name,"nnnnnnnn")
         const { inputValue, outputValue } = format;
         formatSourceData[name] = {
           inputValue,

package/src/components/Switch/index.tsx

@@ -43,7 +43,7 @@ const Index: React.FC<HSwitchProps> = ({
     float: {
       inputValue: (item, initValue) => {
         const { close } = valueSwitchMap;
-        const { name: valueName = "" } = item;
+        const { name: valueName="" } = item;
         let val = initValue[valueName];
         if (typeof val === "undefined" || val === null) {
           val = close;

package/src/pages/Form/index.tsx

@@ -1,7 +1,11 @@
-import { HForm, HFormConfigProvider, useHForm } from "../../components";
+import {HForm, HFormConfigProvider, HSwitch, useHForm} from "../../components";
 import { useState } from "react";
-import { Button, DatePicker, Form, Input } from "antd";
+import {Button, DatePicker, Form, Input, Row} from "antd";
+const Test2=()=>{
+  return <Row style={{background:"red"}}>
 
+  </Row>
+}
 const formData = (options) => {
   const op = [
     {
@@ -14,104 +18,18 @@ const formData = (options) => {
     },
   ];
   return [
+      {
+          label: "12321",
+          className: "3",
+          name:"3",
+      },
     {
       label: "测试12312",
       className: "hdjd",
-      name:"test"
-    },
-    {
-      label: "测试1",
-      type: "select",
-    },
-    {
-      label: "测试1",
-      type: "inputNumber",
-    },
-    {
-      noStyle: true,
-      render: () => {
-        return <div>你好a</div>;
-      },
-    },
-    {
-      label: "时间",
-      type: "rangePicker",
-      name: "rangePicker",
-      itemProps: {
-        subProvider: () => {
-          return {
-            hdj: "fff",
-          };
-        },
-      },
-    },
-    {
-      label: "选择",
-      name: "checkboxGroup",
-      type: "checkboxGroup",
-      rules: [{ required: true }],
-      helper: "帮助我",
-      options: [
-        { value: "选择1", key: "check1" },
-        { value: "选择2", key: "check2" },
-      ],
-      direction: "vertical",
-      labelAlign: "topLeft",
-    },
-    {
-      label: "file",
-      name: "file",
-      type: "upload",
-      direction: "vertical",
-      labelAlign: "topLeft",
-    },
-    {
-      label: "开关",
-      name: "switch",
-      type: "switch",
-      rules: [{ required: true }],
-      itemProps: {
-        valueMap: {
-          open: 1,
-          close: 0,
-        },
-      },
-    },
-    {
-      type: "submit",
-      itemProps: {
-        extraList: [
-          <Button
-            key="wh"
-            onClick={() => {
-              console.log("起飞");
-            }}
-          >
-            芜湖
-          </Button>,
-          "666",
-          "reset",
-        ],
-      },
-    },
-    {
-      type: "submit",
-      itemProps: {
-        extraList: [
-          <Button
-            key="wh"
-            onClick={() => {
-              console.log("起飞");
-            }}
-          >
-            芜湖
-          </Button>,
-          <Ttta key="aa" />,
-          "666",
-          "submit",
-          "reset",
-        ],
-      },
+      name:"test",
+      render:()=>{
+        return <Test2/>
+      }
     },
   ];
 };
@@ -161,7 +79,6 @@ export default () => {
         <HForm
           configData={formData(options)}
           labelWidth={200}
-          itemSpan={{ span: 6 }}
           form={form}
           labelAlign={"right"}
           onFinish={(value) => {
@@ -183,8 +100,9 @@ export default () => {
         />
       </HFormConfigProvider>
       <div
-        onClick={() => {
-          aForm.resetFields();
+        onClick={async () => {
+           const result=await form.validateFields();
+           console.log(result);
         }}
       >
         点我