@hw-component/form 1.9.62 → 1.9.64

package/es/DialogForm/hooks.js

@@ -87,6 +87,9 @@ var useModifyProps = function useModifyProps(_ref) {
       setModalVisible(false);
     };
   }, [afterClose, autoClear]);
+  dialogForm.getParams = function () {
+    return formParams || {};
+  };
   return {
     modalFormData: modalFormData,
     modalVisible: modalVisible,
@@ -104,7 +107,10 @@ var useHDialogForm = function useHDialogForm() {
   return useMemo(function () {
     return _objectSpread(_objectSpread({}, hForm), {}, {
       show: function show(params) {},
-      hide: function hide() {}
+      hide: function hide() {},
+      getParams: function getParams() {
+        return {};
+      }
     });
   }, []);
 };

package/es/DialogForm/modal.d.ts

@@ -25,6 +25,7 @@ export interface ShowParamsModal<P = any, T = any> {
 export interface HDialogFormInstance<P = any, T = any> extends HFormInstance {
     show: (data?: ShowParamsModal<P, T>) => void;
     hide: VoidFunction;
+    getParams: () => Record<string, any>;
 }
 export type FooterRender = (dialogForm?: HDialogFormInstance, loading?: boolean, params?: Record<string, any>) => React.ReactNode;
 export interface DialogFormProps<P = any, T = any> extends Omit<RootProps, "onFinish" | "onCancel" | "onOk" | "infoRequest" | "title" | "footer"> {

package/es/Form/Basic.d.ts

@@ -1,3 +1,3 @@
 import type { HFormProps } from "@/components/Form/modal";
-declare const _default: ({ configData, gutter, dismissOnPressEnter, itemSpan, labelWidth, }: HFormProps) => JSX.Element;
+declare const _default: ({ configData, gutter, dismissOnPressEnter, itemSpan, labelWidth, formItemStyle, }: HFormProps) => JSX.Element;
 export default _default;

package/es/Form/Basic.js

@@ -15,7 +15,8 @@ var Basic = (function (_ref) {
     _ref$dismissOnPressEn = _ref.dismissOnPressEnter,
     dismissOnPressEnter = _ref$dismissOnPressEn === void 0 ? true : _ref$dismissOnPressEn,
     itemSpan = _ref.itemSpan,
-    labelWidth = _ref.labelWidth;
+    labelWidth = _ref.labelWidth,
+    formItemStyle = _ref.formItemStyle;
   var _useFormContext = useFormContext(),
     form = _useFormContext.form,
     formItemProps = _useFormContext.itemProps,
@@ -57,10 +58,11 @@ var Basic = (function (_ref) {
       }, formItemProps), itemProps);
       var arrayName = Array.isArray(name) ? name.join(".") : name;
       var key = arrayName || nameKey;
+      var itemStyle = style || formItemStyle;
       return /*#__PURE__*/createElement(Item, _objectSpread(_objectSpread({}, itemData), {}, {
         labelAlign: labelAlign,
         key: key || index,
-        style: style,
+        style: itemStyle,
         itemProps: defaultItemProps,
         hideLabel: hideLabel,
         itemSpan: configItemSpan || globalItemSpan,

package/es/Input/InputNumberGroup.js

@@ -35,14 +35,12 @@ var Content = function Content(_ref) {
     _ref$placeholder = _ref.placeholder,
     placeholder = _ref$placeholder === void 0 ? ["请输入", "请输入"] : _ref$placeholder,
     _ref$inputNumberProps = _ref.inputNumberProps,
-    inputNumberProps = _ref$inputNumberProps === void 0 ? {} : _ref$inputNumberProps;
-    _ref.addonAfter;
-    var _ref$noHandlerWrap = _ref.noHandlerWrap,
+    inputNumberProps = _ref$inputNumberProps === void 0 ? {} : _ref$inputNumberProps,
+    _ref$noHandlerWrap = _ref.noHandlerWrap,
     noHandlerWrap = _ref$noHandlerWrap === void 0 ? true : _ref$noHandlerWrap,
     addFormat = _ref.addFormat,
-    disabled = _ref.disabled;
-    _ref.addonBefore;
-    var minValMk = _ref.minValMk,
+    disabled = _ref.disabled,
+    minValMk = _ref.minValMk,
     maxValMk = _ref.maxValMk;
   var min = valueMap.min,
     max = valueMap.max;

package/lib/DialogForm/hooks.js

@@ -88,6 +88,9 @@ var useModifyProps = function useModifyProps(_ref) {
       setModalVisible(false);
     };
   }, [afterClose, autoClear]);
+  dialogForm.getParams = function () {
+    return formParams || {};
+  };
   return {
     modalFormData: modalFormData,
     modalVisible: modalVisible,
@@ -105,7 +108,10 @@ var useHDialogForm = function useHDialogForm() {
   return React.useMemo(function () {
     return _objectSpread(_objectSpread({}, hForm), {}, {
       show: function show(params) {},
-      hide: function hide() {}
+      hide: function hide() {},
+      getParams: function getParams() {
+        return {};
+      }
     });
   }, []);
 };

package/lib/DialogForm/modal.d.ts

@@ -25,6 +25,7 @@ export interface ShowParamsModal<P = any, T = any> {
 export interface HDialogFormInstance<P = any, T = any> extends HFormInstance {
     show: (data?: ShowParamsModal<P, T>) => void;
     hide: VoidFunction;
+    getParams: () => Record<string, any>;
 }
 export type FooterRender = (dialogForm?: HDialogFormInstance, loading?: boolean, params?: Record<string, any>) => React.ReactNode;
 export interface DialogFormProps<P = any, T = any> extends Omit<RootProps, "onFinish" | "onCancel" | "onOk" | "infoRequest" | "title" | "footer"> {

package/lib/Form/Basic.d.ts

@@ -1,3 +1,3 @@
 import type { HFormProps } from "@/components/Form/modal";
-declare const _default: ({ configData, gutter, dismissOnPressEnter, itemSpan, labelWidth, }: HFormProps) => JSX.Element;
+declare const _default: ({ configData, gutter, dismissOnPressEnter, itemSpan, labelWidth, formItemStyle, }: HFormProps) => JSX.Element;
 export default _default;

package/lib/Form/Basic.js

@@ -18,7 +18,8 @@ var Basic = (function (_ref) {
     _ref$dismissOnPressEn = _ref.dismissOnPressEnter,
     dismissOnPressEnter = _ref$dismissOnPressEn === void 0 ? true : _ref$dismissOnPressEn,
     itemSpan = _ref.itemSpan,
-    labelWidth = _ref.labelWidth;
+    labelWidth = _ref.labelWidth,
+    formItemStyle = _ref.formItemStyle;
   var _useFormContext = index.useFormContext(),
     form = _useFormContext.form,
     formItemProps = _useFormContext.itemProps,
@@ -60,10 +61,11 @@ var Basic = (function (_ref) {
       }, formItemProps), itemProps);
       var arrayName = Array.isArray(name) ? name.join(".") : name;
       var key = arrayName || nameKey;
+      var itemStyle = style || formItemStyle;
       return /*#__PURE__*/React.createElement(index$1.default, _objectSpread(_objectSpread({}, itemData), {}, {
         labelAlign: labelAlign,
         key: key || index,
-        style: style,
+        style: itemStyle,
         itemProps: defaultItemProps,
         hideLabel: hideLabel,
         itemSpan: configItemSpan || globalItemSpan,

package/lib/Input/InputNumberGroup.js

@@ -38,14 +38,12 @@ var Content = function Content(_ref) {
     _ref$placeholder = _ref.placeholder,
     placeholder = _ref$placeholder === void 0 ? ["请输入", "请输入"] : _ref$placeholder,
     _ref$inputNumberProps = _ref.inputNumberProps,
-    inputNumberProps = _ref$inputNumberProps === void 0 ? {} : _ref$inputNumberProps;
-    _ref.addonAfter;
-    var _ref$noHandlerWrap = _ref.noHandlerWrap,
+    inputNumberProps = _ref$inputNumberProps === void 0 ? {} : _ref$inputNumberProps,
+    _ref$noHandlerWrap = _ref.noHandlerWrap,
     noHandlerWrap = _ref$noHandlerWrap === void 0 ? true : _ref$noHandlerWrap,
     addFormat = _ref.addFormat,
-    disabled = _ref.disabled;
-    _ref.addonBefore;
-    var minValMk = _ref.minValMk,
+    disabled = _ref.disabled,
+    minValMk = _ref.minValMk,
     maxValMk = _ref.maxValMk;
   var min = valueMap.min,
     max = valueMap.max;

package/package.json

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

package/src/components/DialogForm/hooks.tsx

@@ -72,6 +72,9 @@ export const useModifyProps = ({
       setModalVisible(false);
     };
   }, [afterClose, autoClear]);
+  dialogForm.getParams=()=>{
+    return (formParams as Record<string, any>)||{};
+  }
   return {
     modalFormData,
     modalVisible,
@@ -91,6 +94,9 @@ export const useHDialogForm = () => {
       ...hForm,
       show: (params) => {},
       hide: () => {},
+      getParams:()=>{
+        return {}
+      }
     };
   }, []);
 };

package/src/components/DialogForm/modal.ts

@@ -28,6 +28,7 @@ export interface ShowParamsModal<P = any, T = any> {
 export interface HDialogFormInstance<P = any, T = any> extends HFormInstance {
   show: (data?: ShowParamsModal<P, T>) => void;
   hide: VoidFunction;
+  getParams:()=>Record<string, any>;
 }
 export type FooterRender = (
   dialogForm?: HDialogFormInstance,

package/src/components/Form/Basic.tsx

@@ -15,6 +15,7 @@ export default ({
   dismissOnPressEnter = true,
   itemSpan,
   labelWidth,
+                  formItemStyle,
 }: HFormProps) => {
   const {
     form,
@@ -55,12 +56,13 @@ export default ({
         };
         const arrayName = Array.isArray(name) ? name.join(".") : name;
         const key = arrayName || nameKey;
+        const itemStyle=style||formItemStyle;
         return (
           <Item
             {...itemData}
             labelAlign={labelAlign}
             key={key || index}
-            style={style}
+            style={itemStyle}
             itemProps={defaultItemProps as ItemPropsType}
             hideLabel={hideLabel}
             itemSpan={configItemSpan || globalItemSpan}

package/src/components/Input/InputNumberGroup.tsx

@@ -38,11 +38,9 @@ const Content = ({
   onChange,
   placeholder = ["请输入", "请输入"],
   inputNumberProps = {},
-  addonAfter,
   noHandlerWrap = true,
   addFormat,
   disabled,
-  addonBefore,
   minValMk,
   maxValMk,
 }: IProps) => {