@hw-component/form 1.9.39 → 1.9.41

package/es/Form/Basic.js

@@ -55,7 +55,8 @@ var Basic = (function (_ref) {
       var defaultItemProps = _objectSpread(_objectSpread({
         onPressEnter: dismissOnPressEnter ? undefined : defaultOnPressEnter
       }, formItemProps), itemProps);
-      var key = name || nameKey;
+      var arrayName = Array.isArray(name) ? name.join(".") : name;
+      var key = arrayName || nameKey;
       return /*#__PURE__*/createElement(Item, _objectSpread(_objectSpread({}, itemData), {}, {
         labelAlign: labelAlign,
         key: key || index,

package/es/Form/hooks/useInitConfigData.js

@@ -106,6 +106,7 @@ var dispatchProvider = function dispatchProvider(item, dispatchSourceData) {
     dispatch = _item$dispatch === void 0 ? {} : _item$dispatch,
     _item$dependencies = item.dependencies,
     dependencies = _item$dependencies === void 0 ? "allDependencies" : _item$dependencies;
+  var relName = Array.isArray(name) ? name.join(".") : name;
   var fnKey = dispatch.fnKey,
     _dispatch$dependencie = dispatch.dependencies,
     dispatchDependencies = _dispatch$dependencie === void 0 ? dependencies : _dispatch$dependencie,
@@ -119,7 +120,7 @@ var dispatchProvider = function dispatchProvider(item, dispatchSourceData) {
   if (Array.isArray(dispatchDependencies)) {
     var allDispatch = _objectSpread({}, dispatchSourceData);
     dispatchDependencies.forEach(function (key) {
-      var itemDispatch = itemDispatchProvider(name, {
+      var itemDispatch = itemDispatchProvider(relName, {
         dependencies: key,
         fnKey: fnKey,
         manual: manual,
@@ -129,7 +130,7 @@ var dispatchProvider = function dispatchProvider(item, dispatchSourceData) {
     });
     return allDispatch;
   }
-  var itemDispatch = itemDispatchProvider(name, {
+  var itemDispatch = itemDispatchProvider(relName, {
     dependencies: dispatchDependencies,
     fnKey: fnKey,
     manual: manual,

package/es/Form/modal.d.ts

@@ -45,7 +45,7 @@ export interface HItemProps extends Omit<FormItemProps, "name" | "labelAlign" |
     labelWidth?: number;
     hide?: boolean | HideModal;
     placeholder?: string | string[];
-    name?: string;
+    name?: string | string[];
     dispatch?: DispatchModal;
     itemSpan?: ColProps;
     hideLabel?: boolean;

package/es/Input/ButtonInput.js

@@ -3,11 +3,11 @@ import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
 import _asyncToGenerator from '@babel/runtime-corejs3/helpers/asyncToGenerator';
 import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/objectWithoutProperties';
 import _regeneratorRuntime from '@babel/runtime-corejs3/regenerator';
-import { jsxs, jsx } from 'react/jsx-runtime';
+import { jsx, jsxs } from 'react/jsx-runtime';
 import { Input, Button } from 'antd';
 import { useRequest } from 'ahooks';
 
-var _excluded = ["buttonProps", "value", "onChange", "children", "request"],
+var _excluded = ["buttonProps", "value", "onChange", "children", "request", "layType"],
   _excluded2 = ["onClick", "type", "ghost", "loading"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -18,14 +18,17 @@ var Index = function Index(_ref) {
     onChange = _ref.onChange,
     children = _ref.children,
     request = _ref.request,
+    _ref$layType = _ref.layType,
+    layType = _ref$layType === void 0 ? "group" : _ref$layType,
     props = _objectWithoutProperties(_ref, _excluded);
   var onClick = buttonProps.onClick,
-    _buttonProps$type = buttonProps.type,
-    type = _buttonProps$type === void 0 ? "primary" : _buttonProps$type,
+    type = buttonProps.type,
     _buttonProps$ghost = buttonProps.ghost,
     ghost = _buttonProps$ghost === void 0 ? true : _buttonProps$ghost,
     btnLoading = buttonProps.loading,
     oProps = _objectWithoutProperties(buttonProps, _excluded2);
+  var defaultBtnType = layType === "group" ? "primary" : "link";
+  var btnType = type || defaultBtnType;
   var _useRequest = useRequest(function (val) {
       return request === null || request === void 0 ? void 0 : request(val);
     }, {
@@ -63,6 +66,19 @@ var Index = function Index(_ref) {
       return _ref2.apply(this, arguments);
     };
   }();
+  if (layType === "text") {
+    return jsx(Input, _objectSpread(_objectSpread({}, props), {}, {
+      suffix: jsx(Button, _objectSpread(_objectSpread({
+        type: btnType,
+        onClick: click,
+        size: "small",
+        loading: loading || btnLoading,
+        ghost: ghost
+      }, oProps), {}, {
+        children: children
+      }))
+    }));
+  }
   return jsxs(Input.Group, {
     compact: true,
     style: {
@@ -75,7 +91,7 @@ var Index = function Index(_ref) {
       value: value,
       onChange: change
     })), jsx(Button, _objectSpread(_objectSpread({
-      type: type,
+      type: btnType,
       onClick: click,
       loading: loading || btnLoading,
       style: {

package/es/Input/modal.d.ts

@@ -30,5 +30,6 @@ export interface HButtonProps extends Omit<ButtonProps, "onClick"> {
 export interface HButtonInputProps extends HInputProps {
     buttonProps?: HButtonProps;
     request?: PromiseFnResult;
+    layType?: "group" | "text";
 }
 export {};

package/lib/Form/Basic.js

@@ -58,7 +58,8 @@ var Basic = (function (_ref) {
       var defaultItemProps = _objectSpread(_objectSpread({
         onPressEnter: dismissOnPressEnter ? undefined : defaultOnPressEnter
       }, formItemProps), itemProps);
-      var key = name || nameKey;
+      var arrayName = Array.isArray(name) ? name.join(".") : name;
+      var key = arrayName || nameKey;
       return /*#__PURE__*/React.createElement(index$1.default, _objectSpread(_objectSpread({}, itemData), {}, {
         labelAlign: labelAlign,
         key: key || index,

package/lib/Form/hooks/useInitConfigData.js

@@ -109,6 +109,7 @@ var dispatchProvider = function dispatchProvider(item, dispatchSourceData) {
     dispatch = _item$dispatch === void 0 ? {} : _item$dispatch,
     _item$dependencies = item.dependencies,
     dependencies = _item$dependencies === void 0 ? "allDependencies" : _item$dependencies;
+  var relName = Array.isArray(name) ? name.join(".") : name;
   var fnKey = dispatch.fnKey,
     _dispatch$dependencie = dispatch.dependencies,
     dispatchDependencies = _dispatch$dependencie === void 0 ? dependencies : _dispatch$dependencie,
@@ -122,7 +123,7 @@ var dispatchProvider = function dispatchProvider(item, dispatchSourceData) {
   if (Array.isArray(dispatchDependencies)) {
     var allDispatch = _objectSpread({}, dispatchSourceData);
     dispatchDependencies.forEach(function (key) {
-      var itemDispatch = itemDispatchProvider(name, {
+      var itemDispatch = itemDispatchProvider(relName, {
         dependencies: key,
         fnKey: fnKey,
         manual: manual,
@@ -132,7 +133,7 @@ var dispatchProvider = function dispatchProvider(item, dispatchSourceData) {
     });
     return allDispatch;
   }
-  var itemDispatch = itemDispatchProvider(name, {
+  var itemDispatch = itemDispatchProvider(relName, {
     dependencies: dispatchDependencies,
     fnKey: fnKey,
     manual: manual,

package/lib/Form/modal.d.ts

@@ -45,7 +45,7 @@ export interface HItemProps extends Omit<FormItemProps, "name" | "labelAlign" |
     labelWidth?: number;
     hide?: boolean | HideModal;
     placeholder?: string | string[];
-    name?: string;
+    name?: string | string[];
     dispatch?: DispatchModal;
     itemSpan?: ColProps;
     hideLabel?: boolean;

package/lib/Input/ButtonInput.js

@@ -10,7 +10,7 @@ var jsxRuntime = require('react/jsx-runtime');
 var antd = require('antd');
 var ahooks = require('ahooks');
 
-var _excluded = ["buttonProps", "value", "onChange", "children", "request"],
+var _excluded = ["buttonProps", "value", "onChange", "children", "request", "layType"],
   _excluded2 = ["onClick", "type", "ghost", "loading"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -21,14 +21,17 @@ var Index = function Index(_ref) {
     onChange = _ref.onChange,
     children = _ref.children,
     request = _ref.request,
+    _ref$layType = _ref.layType,
+    layType = _ref$layType === void 0 ? "group" : _ref$layType,
     props = _objectWithoutProperties(_ref, _excluded);
   var onClick = buttonProps.onClick,
-    _buttonProps$type = buttonProps.type,
-    type = _buttonProps$type === void 0 ? "primary" : _buttonProps$type,
+    type = buttonProps.type,
     _buttonProps$ghost = buttonProps.ghost,
     ghost = _buttonProps$ghost === void 0 ? true : _buttonProps$ghost,
     btnLoading = buttonProps.loading,
     oProps = _objectWithoutProperties(buttonProps, _excluded2);
+  var defaultBtnType = layType === "group" ? "primary" : "link";
+  var btnType = type || defaultBtnType;
   var _useRequest = ahooks.useRequest(function (val) {
       return request === null || request === void 0 ? void 0 : request(val);
     }, {
@@ -66,6 +69,19 @@ var Index = function Index(_ref) {
       return _ref2.apply(this, arguments);
     };
   }();
+  if (layType === "text") {
+    return jsxRuntime.jsx(antd.Input, _objectSpread(_objectSpread({}, props), {}, {
+      suffix: jsxRuntime.jsx(antd.Button, _objectSpread(_objectSpread({
+        type: btnType,
+        onClick: click,
+        size: "small",
+        loading: loading || btnLoading,
+        ghost: ghost
+      }, oProps), {}, {
+        children: children
+      }))
+    }));
+  }
   return jsxRuntime.jsxs(antd.Input.Group, {
     compact: true,
     style: {
@@ -78,7 +94,7 @@ var Index = function Index(_ref) {
       value: value,
       onChange: change
     })), jsxRuntime.jsx(antd.Button, _objectSpread(_objectSpread({
-      type: type,
+      type: btnType,
       onClick: click,
       loading: loading || btnLoading,
       style: {

package/lib/Input/modal.d.ts

@@ -30,5 +30,6 @@ export interface HButtonProps extends Omit<ButtonProps, "onClick"> {
 export interface HButtonInputProps extends HInputProps {
     buttonProps?: HButtonProps;
     request?: PromiseFnResult;
+    layType?: "group" | "text";
 }
 export {};

package/package.json

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

package/src/components/Form/Basic.tsx

@@ -53,7 +53,8 @@ export default ({
           ...formItemProps,
           ...itemProps,
         };
-        const key=name||nameKey;
+        const arrayName=Array.isArray(name)?name.join("."):name;
+        const key=arrayName||nameKey;
         return (
           <Item
             {...itemData}

package/src/components/Form/hooks/useInitConfigData.tsx

@@ -135,6 +135,7 @@ const dispatchProvider = (
   dispatchSourceData: DispatchSourceDataModal
 ) => {
   const { name = "", dispatch = {}, dependencies = "allDependencies" } = item;
+  const relName=Array.isArray(name)?name.join("."):name;
   const {
     fnKey,
     dependencies: dispatchDependencies = dependencies as string | string[],
@@ -150,7 +151,7 @@ const dispatchProvider = (
     };
     dispatchDependencies.forEach((key) => {
       const itemDispatch = itemDispatchProvider(
-        name,
+          relName,
         { dependencies: key, fnKey, manual, reset },
         dispatchSourceData
       );
@@ -162,7 +163,7 @@ const dispatchProvider = (
     return allDispatch;
   }
   const itemDispatch = itemDispatchProvider(
-    name,
+      relName,
     { dependencies: dispatchDependencies, fnKey, manual, reset },
     dispatchSourceData
   );

package/src/components/Form/modal.ts

@@ -92,7 +92,7 @@ export interface HItemProps
   labelWidth?: number;
   hide?: boolean | HideModal;
   placeholder?: string | string[];
-  name?: string;
+  name?: string|string[];
   dispatch?: DispatchModal;
   itemSpan?: ColProps;
   hideLabel?: boolean;

package/src/components/Input/ButtonInput.tsx

@@ -9,15 +9,18 @@ const Index: React.FC<HButtonInputProps> = ({
   onChange,
   children,
   request,
+                                              layType="group",
   ...props
 }) => {
   const {
     onClick,
-    type = "primary",
+    type ,
     ghost = true,
     loading: btnLoading,
     ...oProps
   } = buttonProps;
+  const defaultBtnType=layType==="group"?"primary":"link"
+  const btnType=type||defaultBtnType
   const { run, loading } = useRequest(
     (val) => {
       return request?.(val);
@@ -34,12 +37,28 @@ const Index: React.FC<HButtonInputProps> = ({
     }
     onClick?.(result, onChange);
   };
-
+  if (layType==="text"){
+     return  <Input
+         {...props}
+         suffix={
+           <Button
+               type={btnType}
+               onClick={click}
+               size={"small"}
+               loading={loading || btnLoading}
+               ghost={ghost}
+               {...oProps}
+           >
+             {children}
+           </Button>
+         }
+     />
+  }
   return (
     <Input.Group compact style={{ display: "flex" }}>
       <Input {...props} style={{ flex: 1 }} value={value} onChange={change} />
       <Button
-        type={type}
+        type={btnType}
         onClick={click}
         loading={loading || btnLoading}
         style={{ marginLeft: 8, borderRadius: 4 }}

package/src/components/Input/VerificationCodeInput/index.tsx

@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect, useMemo, useState } from "react";
+import React, { useCallback, useEffect, useMemo } from "react";
 import ButtonInput from "../ButtonInput";
 import { useRequest } from "ahooks";
 import type { HFormInstance } from "../../Form/modal";

package/src/components/Input/modal.ts

@@ -37,4 +37,5 @@ export interface HButtonProps extends Omit<ButtonProps, "onClick"> {
 export interface HButtonInputProps extends HInputProps {
   buttonProps?: HButtonProps;
   request?: PromiseFnResult;
+  layType?:"group"|"text";
 }

package/src/pages/Input/index.tsx

@@ -24,6 +24,7 @@ export default () => {
       <HInputNumber />
       <HColorInput value={colorVal} onChange={setColorVal} />
       <HVerificationCodeInput
+          layType="text"
         request={() => {
           return Promise.resolve({ code: 200 });
         }}