@hw-component/form 1.9.60 → 1.9.62

package/lib/Input/InputNumberGroup.js

@@ -10,8 +10,9 @@ var jsxRuntime = require('react/jsx-runtime');
 var antd = require('antd');
 var icons = require('@ant-design/icons');
 var React = require('react');
-var index = require('../hooks/index.js');
+var index$1 = require('../hooks/index.js');
 var HFormConnect = require('../Form/HFormConnect.js');
+var index = require('../InputGroup/index.js');
 
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
@@ -25,49 +26,27 @@ var useArrayProps = function useArrayProps(props) {
     return [props, props];
   }, [props]);
 };
-var Addon = function Addon(_ref) {
-  var children = _ref.children,
-    value = _ref.value,
-    onChange = _ref.onChange;
-  var addonClassname = index.useClassName(["hw-addon"]);
-  if (!children) {
-    return jsxRuntime.jsx(jsxRuntime.Fragment, {});
-  }
-  if (/*#__PURE__*/React.isValidElement(children)) {
-    return jsxRuntime.jsx("div", {
-      className: addonClassname,
-      children: /*#__PURE__*/React.cloneElement(children, {
-        value: value,
-        onChange: onChange
-      })
-    });
-  }
-  return jsxRuntime.jsx("div", {
-    className: addonClassname,
-    children: children
-  });
-};
-var InputNumberGroup = function InputNumberGroup(_ref2) {
-  var _ref2$value = _ref2.value,
-    value = _ref2$value === void 0 ? {} : _ref2$value,
-    _ref2$valueMap = _ref2.valueMap,
-    valueMap = _ref2$valueMap === void 0 ? {
+var Content = function Content(_ref) {
+  var _ref$value = _ref.value,
+    value = _ref$value === void 0 ? {} : _ref$value,
+    _ref$valueMap = _ref.valueMap,
+    valueMap = _ref$valueMap === void 0 ? {
       min: "min",
       max: "max"
-    } : _ref2$valueMap,
-    onChange = _ref2.onChange,
-    _ref2$placeholder = _ref2.placeholder,
-    placeholder = _ref2$placeholder === void 0 ? ["请输入", "请输入"] : _ref2$placeholder,
-    _ref2$inputNumberProp = _ref2.inputNumberProps,
-    inputNumberProps = _ref2$inputNumberProp === void 0 ? {} : _ref2$inputNumberProp,
-    addonAfter = _ref2.addonAfter,
-    _ref2$noHandlerWrap = _ref2.noHandlerWrap,
-    noHandlerWrap = _ref2$noHandlerWrap === void 0 ? true : _ref2$noHandlerWrap,
-    addFormat = _ref2.addFormat,
-    disabled = _ref2.disabled,
-    addonBefore = _ref2.addonBefore,
-    minValMk = _ref2.minValMk,
-    maxValMk = _ref2.maxValMk;
+    } : _ref$valueMap,
+    onChange = _ref.onChange,
+    _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,
+    noHandlerWrap = _ref$noHandlerWrap === void 0 ? true : _ref$noHandlerWrap,
+    addFormat = _ref.addFormat,
+    disabled = _ref.disabled;
+    _ref.addonBefore;
+    var minValMk = _ref.minValMk,
+    maxValMk = _ref.maxValMk;
   var min = valueMap.min,
     max = valueMap.max;
   var minVal = value[min],
@@ -84,15 +63,13 @@ var InputNumberGroup = function InputNumberGroup(_ref2) {
     _useState2 = _slicedToArray(_useState, 2),
     focus = _useState2[0],
     setFocus = _useState2[1];
-  var contentClassname = index.useClassName(["hw-input-group"]);
-  var bodyClassname = index.useClassName(["hw-input-group-body"]);
-  var activeClassname = index.useClassName(["hw-input-group-active"]);
-  var borderClassname = index.useClassName(["hw-input-group-border"]);
-  var oneClassname = index.useClassName(["hw-input-group-one"]);
-  var iconClassname = index.useClassName(["hw-input-group-icon"]);
-  var disabledClassname = index.useClassName(["hw-input-group-disabled"]);
-  var notDisabledClassname = index.useClassName(["hw-input-group-not-disabled"]);
-  var noHandlerWrapClassname = index.useClassName(["hw-input-group-no-handler-wrap"]);
+  var bodyClassname = index$1.useClassName(["hw-input-group-number-body"]);
+  var activeClassname = index$1.useClassName(["hw-input-group-active"]);
+  var oneClassname = index$1.useClassName(["hw-input-group-one"]);
+  var iconClassname = index$1.useClassName(["hw-input-group-icon"]);
+  var disabledClassname = index$1.useClassName(["hw-input-group-disabled"]);
+  var notDisabledClassname = index$1.useClassName(["hw-input-group-not-disabled"]);
+  var noHandlerWrapClassname = index$1.useClassName(["hw-input-group-no-handler-wrap"]);
   addFormat === null || addFormat === void 0 || addFormat({
     float: {
       inputValue: function inputValue(item, initValue) {
@@ -124,68 +101,59 @@ var InputNumberGroup = function InputNumberGroup(_ref2) {
     newVal[key] = val;
     onChange === null || onChange === void 0 || onChange(newVal);
   };
-  return jsxRuntime.jsxs(antd.Input.Group, {
-    compact: true,
-    className: contentClassname,
-    children: [jsxRuntime.jsx(Addon, {
-      value: value,
-      onChange: onChange,
-      children: addonBefore
-    }), jsxRuntime.jsxs("div", {
-      className: "".concat(bodyClassname, " \n        ").concat(focus ? activeClassname : "", " \n        ").concat(noHandlerWrap ? noHandlerWrapClassname : "", "\n         ").concat(disabled ? disabledClassname : notDisabledClassname, "\n        "),
-      children: [jsxRuntime.jsx("span", {
-        className: borderClassname
-      }), jsxRuntime.jsx(antd.InputNumber, _objectSpread(_objectSpread({
-        bordered: false,
-        value: minVal,
-        max: maxValMk ? maxValMk(maxVal) : maxVal,
-        min: 0,
-        className: oneClassname,
-        onFocus: function onFocus() {
-          setFocus(true);
-        },
-        onBlur: function onBlur() {
-          setFocus(false);
-        },
-        onChange: function onChange(val) {
-          change(min, val);
-        },
-        placeholder: fsPlaceholder
-      }, fsProps), {}, {
-        disabled: disabled
-      })), jsxRuntime.jsx("div", {
-        className: iconClassname,
-        children: jsxRuntime.jsx(icons.SwapRightOutlined, {})
-      }), jsxRuntime.jsx(antd.InputNumber, _objectSpread(_objectSpread({
-        bordered: false,
-        value: maxVal,
-        className: oneClassname,
-        placeholder: edPlaceholder,
-        min: minValMk ? minValMk(minVal) : minVal,
-        onFocus: function onFocus() {
-          setFocus(true);
-        },
-        onBlur: function onBlur() {
-          setFocus(false);
-        },
-        onChange: function onChange(val) {
-          change(max, val);
-        }
-      }, edProps), {}, {
-        disabled: disabled
-      }))]
-    }), jsxRuntime.jsx(Addon, {
-      value: value,
-      onChange: onChange,
-      children: addonAfter
-    })]
+  return jsxRuntime.jsxs("div", {
+    className: "".concat(bodyClassname, " \n        ").concat(focus ? activeClassname : "", " \n        ").concat(noHandlerWrap ? noHandlerWrapClassname : "", "\n         ").concat(disabled ? disabledClassname : notDisabledClassname, "\n        "),
+    children: [jsxRuntime.jsx(antd.InputNumber, _objectSpread(_objectSpread({
+      bordered: false,
+      value: minVal,
+      max: maxValMk ? maxValMk(maxVal) : maxVal,
+      min: 0,
+      className: oneClassname,
+      onFocus: function onFocus() {
+        setFocus(true);
+      },
+      onBlur: function onBlur() {
+        setFocus(false);
+      },
+      onChange: function onChange(val) {
+        change(min, val);
+      },
+      placeholder: fsPlaceholder
+    }, fsProps), {}, {
+      disabled: disabled
+    })), jsxRuntime.jsx("div", {
+      className: iconClassname,
+      children: jsxRuntime.jsx(icons.SwapRightOutlined, {})
+    }), jsxRuntime.jsx(antd.InputNumber, _objectSpread(_objectSpread({
+      bordered: false,
+      value: maxVal,
+      className: oneClassname,
+      placeholder: edPlaceholder,
+      min: minValMk ? minValMk(minVal) : minVal,
+      onFocus: function onFocus() {
+        setFocus(true);
+      },
+      onBlur: function onBlur() {
+        setFocus(false);
+      },
+      onChange: function onChange(val) {
+        change(max, val);
+      }
+    }, edProps), {}, {
+      disabled: disabled
+    }))]
   });
 };
+var InputNumberGroup = function InputNumberGroup(props) {
+  return jsxRuntime.jsx(index.default, _objectSpread(_objectSpread({}, props), {}, {
+    children: jsxRuntime.jsx(Content, {})
+  }));
+};
 var Index = HFormConnect.default(InputNumberGroup);
 var HInputNumberGroup = {
   Component: Index,
-  placeholder: function placeholder(_ref5) {
-    var label = _ref5.label;
+  placeholder: function placeholder(_ref4) {
+    var label = _ref4.label;
     return ["\u8BF7\u8F93\u5165".concat(label, "\u6700\u5C0F\u503C"), "\u8BF7\u8F93\u5165".concat(label, "\u6700\u5927\u503C")];
   }
 };

package/lib/InputGroup/index.d.ts

@@ -0,0 +1,10 @@
+import React from "react";
+interface HInputGroupProps<T = any> {
+    addonAfter?: React.ReactNode;
+    value?: T;
+    onChange?: (value: T) => void;
+    addonBefore?: React.ReactNode;
+    className?: string;
+}
+declare const Index: React.FC<HInputGroupProps>;
+export default Index;

package/lib/InputGroup/index.js

@@ -0,0 +1,70 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
+var _objectWithoutProperties = require('@babel/runtime-corejs3/helpers/objectWithoutProperties');
+var jsxRuntime = require('react/jsx-runtime');
+var React = require('react');
+var index = require('../hooks/index.js');
+var antd = require('antd');
+
+var _excluded = ["addonAfter", "addonBefore", "children", "value", "className", "onChange"];
+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; }
+var Addon = function Addon(_ref) {
+  var children = _ref.children,
+    value = _ref.value,
+    onChange = _ref.onChange;
+  var addonClassname = index.useClassName(["hw-addon"]);
+  if (!children) {
+    return jsxRuntime.jsx(jsxRuntime.Fragment, {});
+  }
+  if (/*#__PURE__*/React.isValidElement(children)) {
+    return jsxRuntime.jsx("div", {
+      className: addonClassname,
+      children: /*#__PURE__*/React.cloneElement(children, {
+        value: value,
+        onChange: onChange
+      })
+    });
+  }
+  return jsxRuntime.jsx("div", {
+    className: addonClassname,
+    children: children
+  });
+};
+var Index = function Index(_ref2) {
+  var addonAfter = _ref2.addonAfter,
+    addonBefore = _ref2.addonBefore,
+    children = _ref2.children,
+    value = _ref2.value,
+    _ref2$className = _ref2.className,
+    className = _ref2$className === void 0 ? "" : _ref2$className,
+    onChange = _ref2.onChange,
+    props = _objectWithoutProperties(_ref2, _excluded);
+  var contentClassname = index.useClassName(["hw-input-group"]);
+  var bodyClassname = index.useClassName(["hw-input-group-body"]);
+  return jsxRuntime.jsxs(antd.Input.Group, {
+    compact: true,
+    className: "".concat(contentClassname, " ").concat(className),
+    children: [jsxRuntime.jsx(Addon, {
+      value: value,
+      onChange: onChange,
+      children: addonBefore
+    }), jsxRuntime.jsx("div", {
+      className: bodyClassname,
+      children: /*#__PURE__*/React.cloneElement(children, _objectSpread({
+        value: value,
+        onChange: onChange
+      }, props))
+    }), jsxRuntime.jsx(Addon, {
+      value: value,
+      onChange: onChange,
+      children: addonAfter
+    })]
+  });
+};
+
+exports.default = Index;
+// powered by h

package/lib/Text/index.d.ts

@@ -1,4 +1,4 @@
-import { TextProps } from "antd/lib/typography/Text";
+import type { TextProps } from "antd/lib/typography/Text";
 import React from "react";
 export interface HFormTextProps<V = any> extends TextProps {
     value?: V;

package/lib/TextArea/index.d.ts

@@ -1,5 +1,5 @@
 import type { TextAreaProps } from "antd/es/input";
-interface HTextAreaProps extends TextAreaProps {
+export interface HTextAreaProps extends TextAreaProps {
     bordered?: boolean;
 }
 declare const _default: ({ autoSize, bordered, className, ...props }: HTextAreaProps) => JSX.Element;

package/lib/index.css

@@ -160,27 +160,15 @@
 .ant-hw-form-form-item .ant-form-item-label {
   overflow: visible;
 }
-.ant-hw-input-group {
-  display: -webkit-box !important;
-  display: -webkit-flex !important;
-  display: -ms-flexbox !important;
-  display: flex !important;
-  width: 100%;
-  color: rgba(0, 0, 0, 0.25);
-}
 .ant-hw-input-group .ant-hw-input-group-disabled {
   background-color: #f5f5f5;
 }
-.ant-hw-input-group .ant-hw-input-group-body {
-  position: relative;
+.ant-hw-input-group .ant-hw-input-group-number-body {
   display: -webkit-box !important;
   display: -webkit-flex !important;
   display: -ms-flexbox !important;
   display: flex !important;
-  -webkit-box-flex: 1;
-  -webkit-flex: 1;
-      -ms-flex: 1;
-          flex: 1;
+  width: 100%;
   border: 1px solid #d9d9d9;
 }
 .ant-hw-input-group .ant-hw-input-group-not-disabled:hover {
@@ -195,14 +183,6 @@
 .ant-hw-input-group .ant-hw-input-group-no-handler-wrap .ant-input-number-handler-wrap {
   display: none;
 }
-.ant-hw-input-group .ant-hw-input-group-border {
-  position: absolute;
-  left: -1px;
-  display: none;
-  width: 1px;
-  height: 100%;
-  background-color: #40a9ff;
-}
 .ant-hw-input-group .ant-hw-input-group-icon {
   display: -webkit-box;
   display: -webkit-flex;
@@ -234,7 +214,7 @@
 .ant-hw-color-input-picker {
   box-shadow: 0 0 0 0 !important;
 }
-.ant-form-item-has-error .ant-hw-input-group-body {
+.ant-form-item-has-error .ant-hw-input-group-number-body {
   border-color: #ff4d4f !important;
 }
 .ant-form-item-has-error .ant-hw-input-group-active {
@@ -268,6 +248,25 @@
 .ant-hw-text-area-no-border:focus {
   box-shadow: none !important;
 }
+.ant-hw-input-group {
+  display: -webkit-box !important;
+  display: -webkit-flex !important;
+  display: -ms-flexbox !important;
+  display: flex !important;
+  width: 100%;
+  color: rgba(0, 0, 0, 0.25);
+}
+.ant-hw-input-group .ant-hw-input-group-body {
+  position: relative;
+  display: -webkit-box !important;
+  display: -webkit-flex !important;
+  display: -ms-flexbox !important;
+  display: flex !important;
+  -webkit-box-flex: 1;
+  -webkit-flex: 1;
+      -ms-flex: 1;
+          flex: 1;
+}
 .ant-hw-addon {
   display: -webkit-box !important;
   display: -webkit-flex !important;
@@ -281,7 +280,6 @@
   background-color: #fafafa;
   border: 1px solid #d9d9d9;
 }
-.ant-form-item-has-error .ant-hw-addon {
-  color: #ff4d4f;
+.ant-form-item-has-error .ant-hw-input-group-body {
   border-color: #ff4d4f !important;
 }

package/lib/index.d.ts

@@ -5,6 +5,7 @@ export { useHDialogForm } from "@/components/DialogForm/hooks";
 export { default as HFormConnect } from "./Form/HFormConnect";
 export { default as HFormConfigProvider } from "./Form/Context/FormConfigProvider";
 export { default as HBasicForm } from "./Form/Basic";
+export { default as HInputGroup } from "./InputGroup";
 export declare const HSelect: import("react").ForwardRefExoticComponent<import("./Form/modal").HFormItemProps & import("react").RefAttributes<any>>;
 export declare const HInput: ({ copy: copyProps, value, addonAfter, ...props }: import("./Input/modal").HInputProps) => JSX.Element;
 export declare const HSelectInput: import("react").ForwardRefExoticComponent<import("./Form/modal").HFormItemProps & import("react").RefAttributes<any>>;
@@ -20,7 +21,7 @@ export declare const HRadioGroup: ({ value, options, onChange, fieldNames: props
 export declare const HTimePicker: import("react").ForwardRefExoticComponent<import("./Form/modal").HFormItemProps & import("react").RefAttributes<any>>;
 export declare const HInputNumber: ({ style, ...props }: import("antd").InputNumberProps) => JSX.Element;
 export declare const HPageHandler: import("react").FC<import("./PageHandler/modal").IHPageHandler<any>>;
-export declare const HTextArea: ({ autoSize, ...props }: import("antd/es/input").TextAreaProps) => JSX.Element;
+export declare const HTextArea: ({ autoSize, bordered, className, ...props }: import("./TextArea").HTextAreaProps) => JSX.Element;
 export declare const HColorInput: ({ value, onChange, defaultColor, ...props }: import("./Input/modal").HInputProps) => JSX.Element;
 export declare const HModalForm: import("react").FC<import("./DialogForm/modal").DialogFormProps<any, any>>;
 export declare const HDrawerForm: import("react").FC<import("./DialogForm/modal").DialogFormProps<any, any>>;

package/lib/index.js

@@ -1,15 +1,16 @@
 'use strict';
 
 var config = require('./Form/config.js');
-var index$1 = require('./PageHandler/index.js');
+var index$2 = require('./PageHandler/index.js');
 var index = require('./Form/index.js');
 var useHForm = require('./Form/hooks/useHForm.js');
 var hooks = require('./DialogForm/hooks.js');
 var HFormConnect = require('./Form/HFormConnect.js');
 var FormConfigProvider = require('./Form/Context/FormConfigProvider.js');
 var Basic = require('./Form/Basic.js');
+var index$1 = require('./InputGroup/index.js');
 var ModalForm = require('./DialogForm/ModalForm.js');
-var index$2 = require('./DialogForm/DrawerForm/index.js');
+var index$3 = require('./DialogForm/DrawerForm/index.js');
 
 var HSelect = config.default.select;
 var HInput = config.default.input;
@@ -25,11 +26,11 @@ var HRangePicker = config.default.rangePicker.Component;
 var HRadioGroup = config.default.radioGroup;
 var HTimePicker = config.default.timePicker;
 var HInputNumber = config.default.inputNumber;
-var HPageHandler = index$1.default;
+var HPageHandler = index$2.default;
 var HTextArea = config.default.textArea;
 var HColorInput = config.default.colorInput;
 var HModalForm = ModalForm.default;
-var HDrawerForm = index$2.default;
+var HDrawerForm = index$3.default;
 var HCascader = config.default.cascader;
 var HVerificationCodeInput = config.default.verificationCodeInput;
 var HTrimInput = config.default.trimInput;
@@ -42,6 +43,7 @@ exports.useHDialogForm = hooks.useHDialogForm;
 exports.HFormConnect = HFormConnect.default;
 exports.HFormConfigProvider = FormConfigProvider.default;
 exports.HBasicForm = Basic.default;
+exports.HInputGroup = index$1.default;
 exports.HButtonInput = HButtonInput;
 exports.HCascader = HCascader;
 exports.HCheckBox = HCheckBox;

package/package.json

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

package/src/components/DialogForm/DrawerForm/index.tsx

@@ -46,7 +46,7 @@ const Index: React.FC<DialogFormProps> = ({
     initValue,
     formParams,
     title: modalTitle,
-      saveOldParams
+    saveOldParams,
   } = useModifyProps({
     configData,
     visible,
@@ -99,11 +99,11 @@ const Index: React.FC<DialogFormProps> = ({
       title={<Title title={modalTitle} closable={closable} onCancel={cancel} />}
       {...props}
       onClose={cancel}
-      afterVisibleChange={(changeVisible)=>{
-         if (!changeVisible){
-           dialogForm?.clear();
-           afterClose?.();
-         }
+      afterVisibleChange={(changeVisible) => {
+        if (!changeVisible) {
+          dialogForm?.clear();
+          afterClose?.();
+        }
       }}
       closable={false}
       destroyOnClose

package/src/components/DialogForm/hooks.tsx

@@ -28,9 +28,9 @@ export const useModifyProps = ({
       old: {},
     };
   }, []);
-  const saveOldParams=()=>{
+  const saveOldParams = () => {
     saveOldParamsObj.old = dialogForm.outputValues();
-  }
+  };
   useEffect(() => {
     setModalVisible(visible);
   }, [visible]);
@@ -81,7 +81,7 @@ export const useModifyProps = ({
     setInitValue,
     formParams,
     title: modalTitle,
-    saveOldParams
+    saveOldParams,
   };
 };
 export const useHDialogForm = () => {

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

@@ -173,7 +173,7 @@ export default () => {
             });
         });
       },
-      resetFieldsInitValue: (values={}) => {
+      resetFieldsInitValue: (values = {}) => {
         const oldValue = form.getFieldsValue();
         const keys = Object.keys(oldValue);
         const newVale = {};
@@ -183,7 +183,7 @@ export default () => {
         form.setFieldsValue({
           ...newVale,
           ...initSaveValue,
-          ...values
+          ...values,
         });
       },
       clear: () => {

package/src/components/Form/modal.ts

@@ -36,7 +36,7 @@ import type { ColProps } from "antd/lib/grid/col";
 import type { Gutter } from "antd/lib/grid/row";
 import type { IUrlUploadProps } from "../Upload/modal";
 import type { BaseOptions } from "@ahooksjs/use-request/lib/types";
-import { HFormTextProps } from "../Text";
+import type { HFormTextProps } from "../Text";
 
 type RenderFun = (
   props: HItemProps,
@@ -199,7 +199,7 @@ export interface HFormInstance extends FormInstance {
   removeDispatchListener: (action?: ActionModal, fn?: argsFn) => void;
   reload: PromiseFnResult;
   clear: VoidFunction;
-  resetFieldsInitValue:( values?: Record<string, any>)=>void;
+  resetFieldsInitValue: (values?: Record<string, any>) => void;
   clearFormat: (name: string) => void;
 }