@hw-component/form 1.1.7 → 1.1.9

package/es/Input/ButtonInput.js

@@ -15,7 +15,7 @@ import { Input, Button } from 'antd';
 import { useRequest } from 'ahooks';
 
 var _excluded = ["buttonProps", "value", "onChange", "children", "request"],
-  _excluded2 = ["onClick", "type"];
+  _excluded2 = ["onClick", "type", "loading"];
 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) {
@@ -29,6 +29,7 @@ var Index = function Index(_ref) {
   var onClick = buttonProps.onClick,
     _buttonProps$type = buttonProps.type,
     type = _buttonProps$type === void 0 ? "primary" : _buttonProps$type,
+    btnLoading = buttonProps.loading,
     oProps = _objectWithoutProperties(buttonProps, _excluded2);
   var _useRequest = useRequest(function (val) {
       return request === null || request === void 0 ? void 0 : request(val);
@@ -81,7 +82,7 @@ var Index = function Index(_ref) {
     })), jsx(Button, _objectSpread(_objectSpread({}, oProps), {}, {
       type: type,
       onClick: click,
-      loading: loading,
+      loading: loading || btnLoading,
       style: {
         marginLeft: 4
       },

package/es/Input/VerificationCodeInput.d.ts

@@ -1,8 +1,8 @@
 import type { HFormInstance } from "../Form/modal";
-import type { InputProps } from "antd";
-export interface HVerificationCodeInputProps extends Omit<InputProps, "form"> {
+import { HButtonInputProps } from "@/components/Input/modal";
+export interface HVerificationCodeInputProps extends Omit<HButtonInputProps, "form"> {
     request?: (value: any) => Promise<any>;
     form?: HFormInstance;
 }
-declare const _default: ({ value, request, form, onChange, ...props }: HVerificationCodeInputProps) => JSX.Element;
+declare const _default: ({ value, request, form, onChange, buttonProps, ...props }: HVerificationCodeInputProps) => JSX.Element;
 export default _default;

package/es/Input/VerificationCodeInput.js

@@ -17,7 +17,7 @@ import { useState, useMemo, useCallback, useEffect } from 'react';
 import Index from './ButtonInput.js';
 import { useRequest } from 'ahooks';
 
-var _excluded = ["value", "request", "form", "onChange"];
+var _excluded = ["value", "request", "form", "onChange", "buttonProps"];
 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 VerificationCodeInput = (function (_ref) {
@@ -25,6 +25,8 @@ var VerificationCodeInput = (function (_ref) {
     request = _ref.request,
     form = _ref.form,
     onChange = _ref.onChange,
+    _ref$buttonProps = _ref.buttonProps,
+    buttonProps = _ref$buttonProps === void 0 ? {} : _ref$buttonProps,
     props = _objectWithoutProperties(_ref, _excluded);
   var _useState = useState(0),
     _useState2 = _slicedToArray(_useState, 2),
@@ -93,14 +95,15 @@ var VerificationCodeInput = (function (_ref) {
     }
     return "".concat(countdownStr, "\u79D2\u540E\u91CD\u65B0\u83B7\u53D6");
   };
+  var defaultButtonProps = {
+    onClick: run,
+    loading: loading,
+    disabled: !!countdown
+  };
   return jsx(Index, _objectSpread(_objectSpread({
     value: value,
     onChange: onChange,
-    buttonProps: {
-      onClick: run,
-      loading: loading,
-      disabled: !!countdown
-    }
+    buttonProps: _objectSpread(_objectSpread({}, defaultButtonProps), buttonProps)
   }, props), {}, {
     children: text()
   }));

package/es/Input/modal.d.ts

@@ -25,7 +25,7 @@ export interface HSelectInputProps extends Omit<HInputProps, "value" | "onChange
     subParams?: (formatValue: Record<string, any>) => any;
 }
 export interface HButtonProps extends Omit<ButtonProps, "onClick"> {
-    onClick: (value: string | readonly string[] | number | undefined, onChange?: (val: any) => void) => void;
+    onClick?: (value: string | readonly string[] | number | undefined, onChange?: (val: any) => void) => void;
 }
 export interface HButtonInputProps extends HInputProps {
     buttonProps?: HButtonProps;

package/es/index.css

@@ -38,9 +38,6 @@
 .ant-hw-form-base-item-top-left .ant-hw-form-label-item {
   position: relative;
 }
-.ant-hw-form-base-item-left .ant-form-item-label > label {
-  height: 32px;
-}
 .ant-hw-form-base-item-top-right .ant-form-item-label > label {
   height: auto;
 }
@@ -67,6 +64,9 @@
 .ant-hw-form-base-item-left .ant-hw-form-label-item {
   position: relative;
 }
+.ant-hw-form-base-item-left .ant-form-item-label > label {
+  height: 32px;
+}
 .ant-hw-form-item-no-required {
   display: none;
 }

package/lib/Input/ButtonInput.js

@@ -18,7 +18,7 @@ var antd = require('antd');
 var ahooks = require('ahooks');
 
 var _excluded = ["buttonProps", "value", "onChange", "children", "request"],
-  _excluded2 = ["onClick", "type"];
+  _excluded2 = ["onClick", "type", "loading"];
 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) {
@@ -32,6 +32,7 @@ var Index = function Index(_ref) {
   var onClick = buttonProps.onClick,
     _buttonProps$type = buttonProps.type,
     type = _buttonProps$type === void 0 ? "primary" : _buttonProps$type,
+    btnLoading = buttonProps.loading,
     oProps = _objectWithoutProperties(buttonProps, _excluded2);
   var _useRequest = ahooks.useRequest(function (val) {
       return request === null || request === void 0 ? void 0 : request(val);
@@ -84,7 +85,7 @@ var Index = function Index(_ref) {
     })), jsxRuntime.jsx(antd.Button, _objectSpread(_objectSpread({}, oProps), {}, {
       type: type,
       onClick: click,
-      loading: loading,
+      loading: loading || btnLoading,
       style: {
         marginLeft: 4
       },

package/lib/Input/VerificationCodeInput.d.ts

@@ -1,8 +1,8 @@
 import type { HFormInstance } from "../Form/modal";
-import type { InputProps } from "antd";
-export interface HVerificationCodeInputProps extends Omit<InputProps, "form"> {
+import { HButtonInputProps } from "@/components/Input/modal";
+export interface HVerificationCodeInputProps extends Omit<HButtonInputProps, "form"> {
     request?: (value: any) => Promise<any>;
     form?: HFormInstance;
 }
-declare const _default: ({ value, request, form, onChange, ...props }: HVerificationCodeInputProps) => JSX.Element;
+declare const _default: ({ value, request, form, onChange, buttonProps, ...props }: HVerificationCodeInputProps) => JSX.Element;
 export default _default;

package/lib/Input/VerificationCodeInput.js

@@ -20,7 +20,7 @@ var React = require('react');
 var ButtonInput = require('./ButtonInput.js');
 var ahooks = require('ahooks');
 
-var _excluded = ["value", "request", "form", "onChange"];
+var _excluded = ["value", "request", "form", "onChange", "buttonProps"];
 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 VerificationCodeInput = (function (_ref) {
@@ -28,6 +28,8 @@ var VerificationCodeInput = (function (_ref) {
     request = _ref.request,
     form = _ref.form,
     onChange = _ref.onChange,
+    _ref$buttonProps = _ref.buttonProps,
+    buttonProps = _ref$buttonProps === void 0 ? {} : _ref$buttonProps,
     props = _objectWithoutProperties(_ref, _excluded);
   var _useState = React.useState(0),
     _useState2 = _slicedToArray(_useState, 2),
@@ -96,14 +98,15 @@ var VerificationCodeInput = (function (_ref) {
     }
     return "".concat(countdownStr, "\u79D2\u540E\u91CD\u65B0\u83B7\u53D6");
   };
+  var defaultButtonProps = {
+    onClick: run,
+    loading: loading,
+    disabled: !!countdown
+  };
   return jsxRuntime.jsx(ButtonInput.default, _objectSpread(_objectSpread({
     value: value,
     onChange: onChange,
-    buttonProps: {
-      onClick: run,
-      loading: loading,
-      disabled: !!countdown
-    }
+    buttonProps: _objectSpread(_objectSpread({}, defaultButtonProps), buttonProps)
   }, props), {}, {
     children: text()
   }));

package/lib/Input/modal.d.ts

@@ -25,7 +25,7 @@ export interface HSelectInputProps extends Omit<HInputProps, "value" | "onChange
     subParams?: (formatValue: Record<string, any>) => any;
 }
 export interface HButtonProps extends Omit<ButtonProps, "onClick"> {
-    onClick: (value: string | readonly string[] | number | undefined, onChange?: (val: any) => void) => void;
+    onClick?: (value: string | readonly string[] | number | undefined, onChange?: (val: any) => void) => void;
 }
 export interface HButtonInputProps extends HInputProps {
     buttonProps?: HButtonProps;

package/lib/index.css

@@ -38,9 +38,6 @@
 .ant-hw-form-base-item-top-left .ant-hw-form-label-item {
   position: relative;
 }
-.ant-hw-form-base-item-left .ant-form-item-label > label {
-  height: 32px;
-}
 .ant-hw-form-base-item-top-right .ant-form-item-label > label {
   height: auto;
 }
@@ -67,6 +64,9 @@
 .ant-hw-form-base-item-left .ant-hw-form-label-item {
   position: relative;
 }
+.ant-hw-form-base-item-left .ant-form-item-label > label {
+  height: 32px;
+}
 .ant-hw-form-item-no-required {
   display: none;
 }

package/package.json

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

package/src/components/Form/index.less

@@ -26,11 +26,6 @@
     position: relative;
   }
 }
-.@{ant-prefix}-hw-form-base-item-left {
-  .@{ant-prefix}-form-item-label > label {
-    height: 32px;
-  }
-}
 .@{ant-prefix}-hw-form-base-item-top-right {
   .@{ant-prefix}-form-item-label > label {
     height: auto;
@@ -65,6 +60,9 @@
   .@{ant-prefix}-hw-form-label-item{
     position: relative;
   }
+  .@{ant-prefix}-form-item-label > label {
+    height: 32px;
+  }
 }
 
 .@{ant-prefix}-hw-form-item-no-required{

package/src/components/Input/ButtonInput.tsx

@@ -11,7 +11,7 @@ const Index: React.FC<HButtonInputProps> = ({
   request,
   ...props
 }) => {
-  const { onClick, type = "primary", ...oProps } = buttonProps;
+  const { onClick, type = "primary", loading:btnLoading,...oProps } = buttonProps;
   const { run, loading } = useRequest(
     (val) => {
       return request?.(val);
@@ -36,7 +36,7 @@ const Index: React.FC<HButtonInputProps> = ({
         {...oProps}
         type={type}
         onClick={click}
-        loading={loading}
+        loading={loading||btnLoading}
         style={{ marginLeft: 4 }}
       >
         {children}

package/src/components/Input/VerificationCodeInput.tsx

@@ -2,8 +2,8 @@ import React, { useCallback, useEffect, useMemo, useState } from "react";
 import ButtonInput from "./ButtonInput";
 import { useRequest } from "ahooks";
 import type { HFormInstance } from "../Form/modal";
-import type { InputProps } from "antd";
-export interface HVerificationCodeInputProps extends Omit<InputProps, "form"> {
+import {HButtonInputProps} from "@/components/Input/modal";
+export interface HVerificationCodeInputProps extends Omit<HButtonInputProps, "form"> {
   request?: (value: any) => Promise<any>;
   form?: HFormInstance;
 }
@@ -12,6 +12,7 @@ export default ({
   request,
   form,
   onChange,
+  buttonProps={},
   ...props
 }: HVerificationCodeInputProps) => {
   const [countdown, setCountdown] = useState<number>(0);
@@ -61,11 +62,16 @@ export default ({
     }
     return `${countdownStr}秒后重新获取`;
   };
+  const defaultButtonProps={
+    onClick: run,
+    loading,
+    disabled: !!countdown
+  }
   return (
     <ButtonInput
       value={value}
       onChange={onChange}
-      buttonProps={{ onClick: run, loading, disabled: !!countdown }}
+      buttonProps={{...defaultButtonProps,...buttonProps}}
       {...props}
     >
       {text()}

package/src/components/Input/modal.ts

@@ -29,7 +29,7 @@ export interface HSelectInputProps
   subParams?: (formatValue: Record<string, any>) => any;
 }
 export interface HButtonProps extends Omit<ButtonProps, "onClick"> {
-  onClick: (
+  onClick?: (
     value: string | readonly string[] | number | undefined,
     onChange?: (val: any) => void
   ) => void;

package/src/pages/Form/index.tsx

@@ -1,5 +1,6 @@
 import { HForm, HFormConfigProvider, useHForm } from "../../components";
 import { Button, Form, Input } from "antd";
+import React from "react";
 
 const formData = () => {
   return [
@@ -73,6 +74,30 @@ const formData = () => {
         ],
       },
     },
+    {
+      type: "verificationCodeInput",
+      name:"verificationCodeInput",
+      label:"验证码",
+      shouldUpdate:(prevValue,curValue)=>{
+        return prevValue.switch!==curValue.switch;
+      },
+      itemProps: {
+        request:()=>{
+         return new Promise((resolve)=>{
+            setTimeout(()=>{
+              resolve({})
+            },4000);
+         })
+        }
+      },
+      render:(item,node,form)=>{
+        const phone=form.getFieldValue("switch");
+        if (!phone){
+          return React.cloneElement(node,{buttonProps:{ghost: true,disabled:true}});
+        }
+          return React.cloneElement(node,{buttonProps:{ghost:true}})
+      }
+    },
     {
       type: "submit",
       itemProps: {