@hw-component/form 1.2.0 → 1.2.2

package/es/CheckboxGroup/CheckBox/index.js

@@ -1,14 +1,27 @@
 // welcome to hoo hoo hoo
+import 'core-js/modules/es.object.keys.js';
+import 'core-js/modules/es.symbol.js';
+import 'core-js/modules/es.array.filter.js';
+import 'core-js/modules/es.object.to-string.js';
+import 'core-js/modules/es.object.get-own-property-descriptor.js';
+import 'core-js/modules/web.dom-collections.for-each.js';
+import 'core-js/modules/es.object.get-own-property-descriptors.js';
+import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
+import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/objectWithoutProperties';
 import { jsx } from 'react/jsx-runtime';
 import { Checkbox } from 'antd';
 import { useMemo } from 'react';
 import { useMatchConfigProps } from '../../hooks/index.js';
 
+var _excluded = ["value", "onChange", "children", "valueMap"];
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var Index = function Index(_ref) {
   var value = _ref.value,
     onChange = _ref.onChange,
     children = _ref.children,
-    propsValueCheckMap = _ref.valueMap;
+    propsValueCheckMap = _ref.valueMap,
+    props = _objectWithoutProperties(_ref, _excluded);
   var _useMatchConfigProps = useMatchConfigProps({
       valueCheckMap: propsValueCheckMap
     }),
@@ -31,11 +44,12 @@ var Index = function Index(_ref) {
     }
     onChange === null || onChange === void 0 || onChange(subVal);
   };
-  return jsx(Checkbox, {
+  return jsx(Checkbox, _objectSpread(_objectSpread({
     checked: checkedVal,
-    onChange: change,
+    onChange: change
+  }, props), {}, {
     children: children
-  });
+  }));
 };
 
 export { Index as default };

package/es/Input/VerificationCodeInput/hooks.js

@@ -14,7 +14,6 @@ var useDis = function useDis(buttonProps) {
     setCountdown = _useState4[1];
   var setBtnDisabled = function setBtnDisabled(_ref) {
     var changedValues = _ref.changedValues;
-    console.log(changedValues, "changeValue");
     if (!!countdown) {
       return setBtnDis(true);
     }
@@ -28,8 +27,11 @@ var useDis = function useDis(buttonProps) {
     setBtnDis(!!countdown);
   }, [countdown]);
   useEffect(function () {
-    if (!countdown) {
-      setBtnDis(!!disabled);
+    if (!!countdown) {
+      return;
+    }
+    if (typeof disabled === "boolean") {
+      setBtnDis(disabled);
     }
   }, [disabled]);
   return {

package/lib/CheckboxGroup/CheckBox/index.js

@@ -2,16 +2,29 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+require('core-js/modules/es.object.keys.js');
+require('core-js/modules/es.symbol.js');
+require('core-js/modules/es.array.filter.js');
+require('core-js/modules/es.object.to-string.js');
+require('core-js/modules/es.object.get-own-property-descriptor.js');
+require('core-js/modules/web.dom-collections.for-each.js');
+require('core-js/modules/es.object.get-own-property-descriptors.js');
+var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
+var _objectWithoutProperties = require('@babel/runtime-corejs3/helpers/objectWithoutProperties');
 var jsxRuntime = require('react/jsx-runtime');
 var antd = require('antd');
 var React = require('react');
 var index = require('../../hooks/index.js');
 
+var _excluded = ["value", "onChange", "children", "valueMap"];
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var Index = function Index(_ref) {
   var value = _ref.value,
     onChange = _ref.onChange,
     children = _ref.children,
-    propsValueCheckMap = _ref.valueMap;
+    propsValueCheckMap = _ref.valueMap,
+    props = _objectWithoutProperties(_ref, _excluded);
   var _useMatchConfigProps = index.useMatchConfigProps({
       valueCheckMap: propsValueCheckMap
     }),
@@ -34,11 +47,12 @@ var Index = function Index(_ref) {
     }
     onChange === null || onChange === void 0 || onChange(subVal);
   };
-  return jsxRuntime.jsx(antd.Checkbox, {
+  return jsxRuntime.jsx(antd.Checkbox, _objectSpread(_objectSpread({
     checked: checkedVal,
-    onChange: change,
+    onChange: change
+  }, props), {}, {
     children: children
-  });
+  }));
 };
 
 exports.default = Index;

package/lib/Input/VerificationCodeInput/hooks.js

@@ -15,7 +15,6 @@ var useDis = function useDis(buttonProps) {
     setCountdown = _useState4[1];
   var setBtnDisabled = function setBtnDisabled(_ref) {
     var changedValues = _ref.changedValues;
-    console.log(changedValues, "changeValue");
     if (!!countdown) {
       return setBtnDis(true);
     }
@@ -29,8 +28,11 @@ var useDis = function useDis(buttonProps) {
     setBtnDis(!!countdown);
   }, [countdown]);
   React.useEffect(function () {
-    if (!countdown) {
-      setBtnDis(!!disabled);
+    if (!!countdown) {
+      return;
+    }
+    if (typeof disabled === "boolean") {
+      setBtnDis(disabled);
     }
   }, [disabled]);
   return {

package/package.json

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

package/src/components/CheckboxGroup/CheckBox/index.tsx

@@ -9,6 +9,7 @@ const Index: React.FC<HCheckboxProps> = ({
   onChange,
   children,
   valueMap: propsValueCheckMap,
+  ...props
 }) => {
   const { valueCheckMap = {} } = useMatchConfigProps({
     valueCheckMap: propsValueCheckMap,
@@ -30,7 +31,7 @@ const Index: React.FC<HCheckboxProps> = ({
     onChange?.(subVal);
   };
   return (
-    <Checkbox checked={checkedVal} onChange={change}>
+    <Checkbox checked={checkedVal} onChange={change} {...props}>
       {children}
     </Checkbox>
   );

package/src/components/Input/VerificationCodeInput/hooks.ts

@@ -6,7 +6,6 @@ export const useDis=(buttonProps:ButtonProps)=>{
     const [btnDis,setBtnDis]=useState<boolean|undefined>(!!disabled);
     const [countdown, setCountdown] = useState<number>(0);
     const setBtnDisabled=({changedValues})=>{
-        console.log(changedValues,"changeValue")
         if (!!countdown){
             return setBtnDis(true);
         }
@@ -20,9 +19,13 @@ export const useDis=(buttonProps:ButtonProps)=>{
        setBtnDis(!!countdown);
     }, [countdown]);
     useEffect(() => {
-        if (!countdown){
-            setBtnDis(!!disabled);
+        if (!!countdown){
+            return;
+        }
+        if (typeof disabled==="boolean"){
+            setBtnDis(disabled);
         }
+
     }, [disabled]);
     return {
         disabled:btnDis,

package/src/pages/Form/index.tsx

@@ -1,6 +1,7 @@
 import { HForm, HFormConfigProvider, useHForm } from "../../components";
 import { Button, Form, Input } from "antd";
 import React from "react";
+import {useRequest} from "ahooks";
 
 const formData = () => {
   return [
@@ -102,25 +103,6 @@ const formData = () => {
         manual:false
       },
     },
-    {
-      type: "submit",
-      itemProps: {
-        extraList: [
-          <Button
-            key="wh"
-            onClick={() => {
-              console.log("起飞");
-            }}
-          >
-            芜湖
-          </Button>,
-          <Ttta key="aa" />,
-          "666",
-          "submit",
-          "reset",
-        ],
-      },
-    },
   ];
 };
 function Ttta({ form }) {
@@ -142,6 +124,13 @@ const Test = (props) => {
 export default () => {
   const form = useHForm();
   const [aForm] = Form.useForm();
+  const {run,loading}=useRequest(async ()=>{
+     await new Promise((resolve)=>{
+        setTimeout(()=>{
+           resolve({})
+        },2000)
+     })
+  },{manual:true});
   return (
     <div style={{ overflow: "auto", height: "90vh" ,padding:30}}>
       <Form form={aForm} initialValues={{ ttim: "132123" }}>
@@ -169,17 +158,12 @@ export default () => {
           configData={formData()}
           labelWidth={200}
           form={form}
-          onFinish={(value) => {
-            console.log(value);
-          }}
-          initialValues={{
-            nameTest:"fffff"
-          }}
+          onFinish={run}
         />
       </HFormConfigProvider>
       <div
         onClick={() => {
-          aForm.resetFields();
+          form.submit();
         }}
       >
         点我