@hw-component/form 0.0.8-beta-v6 → 0.0.8-beta-v8

package/lib/DialogForm/DrawerForm/index.js

@@ -21,7 +21,7 @@ var Title = require('./Title.js');
 var Footer = require('./Footer.js');
 var FormConfigProvider = require('../../Form/Context/FormConfigProvider.js');
 
-var _excluded = ["visible", "title", "onCancel", "configData", "infoRequest", "request", "afterClose", "dialogForm", "closable", "initialValues", "labelWidth", "onOk", "onFinish", "size", "form", "footer", "params", "onValuesChange", "autoClear"];
+var _excluded = ["visible", "title", "onCancel", "configData", "infoRequest", "request", "afterClose", "dialogForm", "closable", "initialValues", "labelWidth", "onOk", "onFinish", "size", "form", "footer", "params", "onValuesChange", "autoClear", "contentRender"];
 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 DrawerForm = (function (_ref) {
@@ -46,6 +46,7 @@ var DrawerForm = (function (_ref) {
     onValuesChange = _ref.onValuesChange,
     _ref$autoClear = _ref.autoClear,
     autoClear = _ref$autoClear === void 0 ? true : _ref$autoClear,
+    contentRender = _ref.contentRender,
     props = _objectWithoutProperties(_ref, _excluded);
   var currentForm = hooks.useCurrentForm(dialogForm);
   var providerConfig = FormConfigProvider.useFormConfigContext();
@@ -89,6 +90,45 @@ var DrawerForm = (function (_ref) {
       confirmLoading: loading
     });
   };
+  var node = jsxRuntime.jsx(index.default, _objectSpread(_objectSpread({
+    configData: modalFormData,
+    initialValues: initValue,
+    onValuesChange: onValuesChange
+  }, props), {}, {
+    form: currentForm,
+    params: formParams,
+    onFinish: function () {
+      var _onFinish = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(values, subParams) {
+        var result, close;
+        return _regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              _context.next = 2;
+              return run(values, subParams);
+            case 2:
+              result = _context.sent;
+              close = onOk === null || onOk === void 0 ? void 0 : onOk(result, subParams);
+              if (!(close === false)) {
+                _context.next = 6;
+                break;
+              }
+              return _context.abrupt("return");
+            case 6:
+              cancel();
+            case 7:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee);
+      }));
+      function onFinish(_x, _x2) {
+        return _onFinish.apply(this, arguments);
+      }
+      return onFinish;
+    }(),
+    infoRequest: infoRequest,
+    labelWidth: labelWidth
+  }));
   return jsxRuntime.jsx(antd.Drawer, _objectSpread(_objectSpread({
     visible: modalVisible,
     title: jsxRuntime.jsx(Title.default, {
@@ -102,45 +142,7 @@ var DrawerForm = (function (_ref) {
     destroyOnClose: true,
     footer: footerComponent(),
     children: jsxRuntime.jsx(FormConfigProvider.default, _objectSpread(_objectSpread({}, providerConfig), {}, {
-      children: jsxRuntime.jsx(index.default, _objectSpread(_objectSpread({
-        configData: modalFormData,
-        initialValues: initValue,
-        onValuesChange: onValuesChange
-      }, props), {}, {
-        form: currentForm,
-        params: formParams,
-        onFinish: function () {
-          var _onFinish = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(values, subParams) {
-            var result, close;
-            return _regeneratorRuntime.wrap(function _callee$(_context) {
-              while (1) switch (_context.prev = _context.next) {
-                case 0:
-                  _context.next = 2;
-                  return run(values, subParams);
-                case 2:
-                  result = _context.sent;
-                  close = onOk === null || onOk === void 0 ? void 0 : onOk(result, subParams);
-                  if (!(close === false)) {
-                    _context.next = 6;
-                    break;
-                  }
-                  return _context.abrupt("return");
-                case 6:
-                  cancel();
-                case 7:
-                case "end":
-                  return _context.stop();
-              }
-            }, _callee);
-          }));
-          function onFinish(_x, _x2) {
-            return _onFinish.apply(this, arguments);
-          }
-          return onFinish;
-        }(),
-        infoRequest: infoRequest,
-        labelWidth: labelWidth
-      }))
+      children: contentRender ? contentRender(node, currentForm) : node
     }))
   }));
 });

package/lib/DialogForm/ModalForm.d.ts

@@ -1,3 +1,3 @@
 import type { DialogFormProps } from "./modal";
-declare const _default: ({ visible, title, onCancel, configData, infoRequest, request, afterClose, dialogForm, initialValues, onFinish, params, onOk, onValuesChange, autoClear, ...props }: DialogFormProps) => JSX.Element;
+declare const _default: ({ visible, title, onCancel, configData, infoRequest, request, afterClose, dialogForm, initialValues, onFinish, params, onOk, onValuesChange, autoClear, contentRender, ...props }: DialogFormProps) => JSX.Element;
 export default _default;

package/lib/DialogForm/ModalForm.js

@@ -19,7 +19,7 @@ var index = require('../Form/index.js');
 var FormConfigProvider = require('../Form/Context/FormConfigProvider.js');
 var hooks = require('./hooks.js');
 
-var _excluded = ["visible", "title", "onCancel", "configData", "infoRequest", "request", "afterClose", "dialogForm", "initialValues", "onFinish", "params", "onOk", "onValuesChange", "autoClear"];
+var _excluded = ["visible", "title", "onCancel", "configData", "infoRequest", "request", "afterClose", "dialogForm", "initialValues", "onFinish", "params", "onOk", "onValuesChange", "autoClear", "contentRender"];
 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 ModalForm = (function (_ref) {
@@ -38,6 +38,7 @@ var ModalForm = (function (_ref) {
     onValuesChange = _ref.onValuesChange,
     _ref$autoClear = _ref.autoClear,
     autoClear = _ref$autoClear === void 0 ? true : _ref$autoClear,
+    contentRender = _ref.contentRender,
     props = _objectWithoutProperties(_ref, _excluded);
   var currentForm = hooks.useCurrentForm(dialogForm);
   var providerConfig = FormConfigProvider.useFormConfigContext();
@@ -68,6 +69,44 @@ var ModalForm = (function (_ref) {
     }),
     loading = _useSub.loading,
     run = _useSub.run;
+  var node = jsxRuntime.jsx(index.default, _objectSpread(_objectSpread({
+    configData: modalFormData,
+    initialValues: initValue,
+    onValuesChange: onValuesChange,
+    onFinish: function () {
+      var _onFinish = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(values, outParams) {
+        var result, close;
+        return _regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              _context.next = 2;
+              return run(values, outParams);
+            case 2:
+              result = _context.sent;
+              close = onOk === null || onOk === void 0 ? void 0 : onOk(result, outParams);
+              if (!(close === false)) {
+                _context.next = 6;
+                break;
+              }
+              return _context.abrupt("return");
+            case 6:
+              cancel();
+            case 7:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee);
+      }));
+      function onFinish(_x, _x2) {
+        return _onFinish.apply(this, arguments);
+      }
+      return onFinish;
+    }()
+  }, props), {}, {
+    params: formParams,
+    form: currentForm,
+    infoRequest: infoRequest
+  }));
   return jsxRuntime.jsx(antd.Modal, _objectSpread(_objectSpread({
     title: modalTitle,
     visible: modalVisible,
@@ -83,44 +122,7 @@ var ModalForm = (function (_ref) {
     onOk: currentForm.submit,
     destroyOnClose: true,
     children: jsxRuntime.jsx(FormConfigProvider.default, _objectSpread(_objectSpread({}, providerConfig), {}, {
-      children: jsxRuntime.jsx(index.default, _objectSpread(_objectSpread({
-        configData: modalFormData,
-        initialValues: initValue,
-        onValuesChange: onValuesChange,
-        onFinish: function () {
-          var _onFinish = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(values, outParams) {
-            var result, close;
-            return _regeneratorRuntime.wrap(function _callee$(_context) {
-              while (1) switch (_context.prev = _context.next) {
-                case 0:
-                  _context.next = 2;
-                  return run(values, outParams);
-                case 2:
-                  result = _context.sent;
-                  close = onOk === null || onOk === void 0 ? void 0 : onOk(result, outParams);
-                  if (!(close === false)) {
-                    _context.next = 6;
-                    break;
-                  }
-                  return _context.abrupt("return");
-                case 6:
-                  cancel();
-                case 7:
-                case "end":
-                  return _context.stop();
-              }
-            }, _callee);
-          }));
-          function onFinish(_x, _x2) {
-            return _onFinish.apply(this, arguments);
-          }
-          return onFinish;
-        }()
-      }, props), {}, {
-        params: formParams,
-        form: currentForm,
-        infoRequest: infoRequest
-      }))
+      children: contentRender ? contentRender === null || contentRender === void 0 ? void 0 : contentRender(node, currentForm) : node
     }))
   }));
 });

package/lib/DialogForm/modal.d.ts

@@ -1,6 +1,7 @@
 import type { ModalProps } from "antd";
 import type { HFormInstance, HItemProps, HFormProps } from "../Form/modal";
 import type { PromiseFnResult } from "../modal";
+import type React from "react";
 type RootProps = HFormProps & ModalProps;
 export interface ModifyPropsModal<P = any> {
     configData: HItemProps[];
@@ -32,5 +33,6 @@ export interface DialogFormProps<P = any, T = any> extends Omit<RootProps, "onFi
     onOk?: (data: T, params: P) => boolean | void;
     infoRequest?: (params: P) => Promise<T>;
     autoClear?: boolean;
+    contentRender?: (dom: React.ReactNode, form: HDialogFormInstance) => React.ReactNode;
 }
 export {};

package/lib/Form/config.d.ts

@@ -11,14 +11,14 @@ declare const componentConfig: {
     checkboxGroup: import("react").ForwardRefExoticComponent<import("./modal").HFormItemProps & import("react").RefAttributes<any>>;
     checkBox: import("react").FC<import("../CheckboxGroup/modal").HCheckboxProps>;
     radioGroup: ({ value, options, onChange, fieldNames: propsFieldNames, ...props }: import("../RadioGroup").HRadioGroupProps) => JSX.Element;
-    switch: import("react").FC<import("../Switch").HSwitchProps>;
-    datePicker: import("react").FC<import("../TDPicker/modal").HDatePickerProps>;
+    switch: import("react").ForwardRefExoticComponent<import("./modal").HFormItemProps & import("react").RefAttributes<any>>;
+    datePicker: import("react").ForwardRefExoticComponent<import("./modal").HFormItemProps & import("react").RefAttributes<any>>;
     rangePicker: {
         Component: import("react").ForwardRefExoticComponent<import("./modal").HFormItemProps & import("react").RefAttributes<any>>;
         placeholder: ({ label }: import("./modal").HItemProps) => string[];
         requiredErrMsg: ({ label }: import("./modal").HItemProps) => string;
     };
-    timePicker: ({ value, format, onChange, disabledDate, ...props }: import("../TDPicker/modal").HTimePickerProps) => JSX.Element;
+    timePicker: import("react").ForwardRefExoticComponent<import("./modal").HFormItemProps & import("react").RefAttributes<any>>;
     input: ({ copy, value, addonAfter, ...props }: import("../Input/modal").HInputProps<any>) => JSX.Element;
     upload: import("react").ForwardRefExoticComponent<import("./modal").HFormItemProps & import("react").RefAttributes<any>>;
     urlUpload: ({ placeholder, value, onChange, mediaType, ...props }: import("../Upload/modal").IUrlUploadProps) => JSX.Element;
@@ -26,6 +26,8 @@ declare const componentConfig: {
     textArea: ({ autoSize, ...props }: import("antd/es/input").TextAreaProps) => JSX.Element;
     colorInput: ({ value, onChange, defaultColor, ...props }: import("../Input/modal").HInputProps<any>) => JSX.Element;
     cascader: ({ request, options, fieldNames: propsFieldNames, ...props }: import("../Cascader").HCascaderProps) => JSX.Element;
-    verificationCodeInput: () => JSX.Element;
+    verificationCodeInput: ({ value, request, form, onChange, ...props }: import("../Input/VerificationCodeInput").HVerificationCodeInputProps) => JSX.Element;
+    trimInput: import("react").ForwardRefExoticComponent<import("./modal").HFormItemProps & import("react").RefAttributes<any>>;
+    trimTextArea: import("react").ForwardRefExoticComponent<import("./modal").HFormItemProps & import("react").RefAttributes<any>>;
 };
 export default componentConfig;

package/lib/Form/config.js

@@ -21,9 +21,11 @@ var index$a = require('../TextArea/index.js');
 var index$b = require('../Input/ColorInput/index.js');
 var index$c = require('../Cascader/index.js');
 var VerificationCodeInput = require('../Input/VerificationCodeInput.js');
+var TrimInput = require('../Input/TrimInput.js');
+var TrimTextArea = require('../TextArea/TrimTextArea.js');
 
 var placeholderConfig = {
-  inputType: ["input", "inputNumber", "selectInput", "buttonInput", "verificationCodeInput"],
+  inputType: ["input", "inputNumber", "selectInput", "buttonInput", "verificationCodeInput", "trimInput", ""],
   selectType: ["select", "datePicker", "timePicker", "colorInput"]
 };
 var componentConfig = {
@@ -45,7 +47,9 @@ var componentConfig = {
   textArea: index$a.default,
   colorInput: index$b.default,
   cascader: index$c.default,
-  verificationCodeInput: VerificationCodeInput.default
+  verificationCodeInput: VerificationCodeInput.default,
+  trimInput: TrimInput.default,
+  trimTextArea: TrimTextArea.default
 };
 
 exports.default = componentConfig;

package/lib/Input/TrimInput.d.ts

@@ -0,0 +1,3 @@
+/// <reference types="react" />
+declare const _default: import("react").ForwardRefExoticComponent<import("../Form/modal").HFormItemProps & import("react").RefAttributes<any>>;
+export default _default;

package/lib/Input/TrimInput.js

@@ -0,0 +1,46 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
+var _objectWithoutProperties = require('@babel/runtime-corejs3/helpers/objectWithoutProperties');
+require('core-js/modules/es.function.name.js');
+require('core-js/modules/es.string.trim.js');
+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 jsxRuntime = require('react/jsx-runtime');
+var index = require('./index.js');
+var HFormConnect = require('../Form/HFormConnect.js');
+
+var _excluded = ["addFormat"];
+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 addFormat = _ref.addFormat,
+    props = _objectWithoutProperties(_ref, _excluded);
+  addFormat === null || addFormat === void 0 || addFormat({
+    float: {
+      inputValue: function inputValue(item, initValue) {
+        var _item$name = item.name,
+          valueName = _item$name === void 0 ? "" : _item$name;
+        return _defineProperty({}, valueName, initValue[valueName]);
+      },
+      outputValue: function outputValue(item, _outputValue) {
+        var _item$name2 = item.name,
+          name = _item$name2 === void 0 ? "" : _item$name2;
+        var itemVal = _outputValue[name];
+        return _defineProperty({}, name, itemVal === null || itemVal === void 0 ? void 0 : itemVal.trim());
+      }
+    }
+  });
+  return jsxRuntime.jsx(index.default, _objectSpread({}, props));
+};
+var TrimInput = HFormConnect.default(Index);
+
+exports.default = TrimInput;
+// powered by h

package/lib/Input/VerificationCodeInput.d.ts

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

package/lib/Input/VerificationCodeInput.js

@@ -23,7 +23,7 @@ var ahooks = require('ahooks');
 var _excluded = ["value", "request", "form", "onChange"];
 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 HVerificationCodeInput = (function (_ref) {
+var VerificationCodeInput = (function (_ref) {
   var value = _ref.value,
     request = _ref.request,
     form = _ref.form,
@@ -109,5 +109,5 @@ var HVerificationCodeInput = (function (_ref) {
   }));
 });
 
-exports.default = HVerificationCodeInput;
+exports.default = VerificationCodeInput;
 // powered by h

package/lib/Input/modal.d.ts

@@ -9,6 +9,7 @@ export interface HInputProps<V = any> extends Omit<InputProps, "onChange" | "val
     value?: V;
     defaultColor?: string;
     copy?: boolean;
+    addFormat?: (config: Record<string, addFormatItemModal>) => void;
 }
 interface ValueNameModal {
     input?: string;

package/lib/Switch/index.d.ts

@@ -1,11 +1,13 @@
 import type { SwitchProps } from "antd";
 import React from "react";
 import type { ValueSwitchMapModal } from "../modal";
+import type { addFormatItemModal } from "../Form/modal";
 export interface HSwitchProps extends Omit<SwitchProps, "onChange"> {
     valueMap?: ValueSwitchMapModal;
     value?: any;
     onChange?: (val: any) => void;
     beforeText?: React.ReactNode;
+    addFormat?: (format: Record<string, addFormatItemModal>) => void;
 }
-declare const Index: React.FC<HSwitchProps>;
-export default Index;
+declare const _default: React.ForwardRefExoticComponent<import("../Form/modal").HFormItemProps & React.RefAttributes<any>>;
+export default _default;

package/lib/Switch/index.js

@@ -2,6 +2,9 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
+var _objectWithoutProperties = require('@babel/runtime-corejs3/helpers/objectWithoutProperties');
+require('core-js/modules/es.function.name.js');
 require('core-js/modules/es.object.keys.js');
 require('core-js/modules/es.symbol.js');
 require('core-js/modules/es.array.filter.js');
@@ -9,14 +12,13 @@ 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 HFormConnect = require('../Form/HFormConnect.js');
 
-var _excluded = ["value", "onChange", "valueMap", "children", "unCheckedChildren", "checkedChildren", "beforeText"];
+var _excluded = ["value", "onChange", "valueMap", "children", "unCheckedChildren", "checkedChildren", "beforeText", "addFormat"];
 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 +31,7 @@ var Index = function Index(_ref) {
     _ref$checkedChildren = _ref.checkedChildren,
     checkedChildren = _ref$checkedChildren === void 0 ? "开启" : _ref$checkedChildren,
     beforeText = _ref.beforeText,
+    addFormat = _ref.addFormat,
     props = _objectWithoutProperties(_ref, _excluded);
   var _useMatchConfigProps = index.useMatchConfigProps({
       valueSwitchMap: propsValueSwitchMap
@@ -46,6 +49,26 @@ var Index = function Index(_ref) {
     }
     onChange === null || onChange === void 0 || onChange(subVal);
   };
+  addFormat === null || addFormat === void 0 || addFormat({
+    float: {
+      inputValue: function inputValue(item, initValue) {
+        var close = valueSwitchMap.close;
+        var _item$name = item.name,
+          valueName = _item$name === void 0 ? "" : _item$name;
+        var val = initValue[valueName];
+        if (typeof val === "undefined" || val === null) {
+          val = close;
+        }
+        console.log(val, "");
+        return _defineProperty({}, valueName, val);
+      },
+      outputValue: function outputValue(item, _outputValue) {
+        var _item$name2 = item.name,
+          name = _item$name2 === void 0 ? "" : _item$name2;
+        return _defineProperty({}, name, _outputValue[name]);
+      }
+    }
+  });
   return jsxRuntime.jsxs(antd.Space, {
     children: [beforeText, jsxRuntime.jsx(antd.Switch, _objectSpread({
       checked: swChecked,
@@ -57,6 +80,7 @@ var Index = function Index(_ref) {
     })]
   });
 };
+var HSwitch = HFormConnect.default(Index);
 
-exports.default = Index;
+exports.default = HSwitch;
 // powered by h

package/lib/TextArea/TrimTextArea.d.ts

@@ -0,0 +1,3 @@
+/// <reference types="react" />
+declare const _default: import("react").ForwardRefExoticComponent<import("../Form/modal").HFormItemProps & import("react").RefAttributes<any>>;
+export default _default;

package/lib/TextArea/TrimTextArea.js

@@ -0,0 +1,46 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
+var _objectWithoutProperties = require('@babel/runtime-corejs3/helpers/objectWithoutProperties');
+require('core-js/modules/es.function.name.js');
+require('core-js/modules/es.string.trim.js');
+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 jsxRuntime = require('react/jsx-runtime');
+var index = require('./index.js');
+var HFormConnect = require('../Form/HFormConnect.js');
+
+var _excluded = ["addFormat"];
+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 addFormat = _ref.addFormat,
+    props = _objectWithoutProperties(_ref, _excluded);
+  addFormat === null || addFormat === void 0 || addFormat({
+    float: {
+      inputValue: function inputValue(item, initValue) {
+        var _item$name = item.name,
+          valueName = _item$name === void 0 ? "" : _item$name;
+        return _defineProperty({}, valueName, initValue[valueName]);
+      },
+      outputValue: function outputValue(item, _outputValue) {
+        var _item$name2 = item.name,
+          name = _item$name2 === void 0 ? "" : _item$name2;
+        var itemVal = _outputValue[name];
+        return _defineProperty({}, name, itemVal === null || itemVal === void 0 ? void 0 : itemVal.trim());
+      }
+    }
+  });
+  return jsxRuntime.jsx(index.default, _objectSpread({}, props));
+};
+var TrimTextArea = HFormConnect.default(Index);
+
+exports.default = TrimTextArea;
+// powered by h

package/lib/index.d.ts

@@ -12,17 +12,19 @@ export declare const HUpload: import("react").ForwardRefExoticComponent<import("
 export declare const HUrlUpload: ({ placeholder, value, onChange, mediaType, ...props }: import("./Upload/modal").IUrlUploadProps) => JSX.Element;
 export declare const HButtonInput: import("react").FC<import("./Input/modal").HButtonInputProps>;
 export declare const HCheckBox: import("react").FC<import("./CheckboxGroup/modal").HCheckboxProps>;
-export declare const HSwitch: import("react").FC<import("./Switch").HSwitchProps>;
+export declare const HSwitch: import("react").ForwardRefExoticComponent<import("./Form/modal").HFormItemProps & import("react").RefAttributes<any>>;
 export declare const HCheckboxGroup: import("react").ForwardRefExoticComponent<import("./Form/modal").HFormItemProps & import("react").RefAttributes<any>>;
-export declare const HDatePicker: import("react").FC<import("./TDPicker/modal").HDatePickerProps>;
+export declare const HDatePicker: import("react").ForwardRefExoticComponent<import("./Form/modal").HFormItemProps & import("react").RefAttributes<any>>;
 export declare const HRangePicker: import("react").ForwardRefExoticComponent<import("./Form/modal").HFormItemProps & import("react").RefAttributes<any>>;
 export declare const HRadioGroup: ({ value, options, onChange, fieldNames: propsFieldNames, ...props }: import("./RadioGroup").HRadioGroupProps) => JSX.Element;
-export declare const HTimePicker: ({ value, format, onChange, disabledDate, ...props }: import("./TDPicker/modal").HTimePickerProps) => JSX.Element;
+export declare const HTimePicker: import("react").ForwardRefExoticComponent<import("./Form/modal").HFormItemProps & import("react").RefAttributes<any>>;
 export declare const HInputNumber: ({ style, ...props }: import("antd").InputNumberProps<string | number>) => 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 HColorInput: ({ value, onChange, defaultColor, ...props }: import("./Input/modal").HInputProps<any>) => JSX.Element;
-export declare const HModalForm: ({ visible, title, onCancel, configData, infoRequest, request, afterClose, dialogForm, initialValues, onFinish, params, onOk, onValuesChange, ...props }: import("./DialogForm/modal").DialogFormProps<any, any>) => JSX.Element;
-export declare const HDrawerForm: ({ visible, title, onCancel, configData, infoRequest, request, afterClose, dialogForm, closable, initialValues, labelWidth, onOk, onFinish, size, form, footer, params, onValuesChange, ...props }: import("./DialogForm/modal").DialogFormProps<any, any>) => JSX.Element;
+export declare const HModalForm: ({ visible, title, onCancel, configData, infoRequest, request, afterClose, dialogForm, initialValues, onFinish, params, onOk, onValuesChange, autoClear, contentRender, ...props }: import("./DialogForm/modal").DialogFormProps<any, any>) => JSX.Element;
+export declare const HDrawerForm: ({ visible, title, onCancel, configData, infoRequest, request, afterClose, dialogForm, closable, initialValues, labelWidth, onOk, onFinish, size, form, footer, params, onValuesChange, autoClear, contentRender, ...props }: import("./DialogForm/modal").DialogFormProps<any, any>) => JSX.Element;
 export declare const HCascader: ({ request, options, fieldNames: propsFieldNames, ...props }: import("./Cascader").HCascaderProps) => JSX.Element;
-export declare const HVerificationCodeInput: () => JSX.Element;
+export declare const HVerificationCodeInput: ({ value, request, form, onChange, ...props }: import("./Input/VerificationCodeInput").HVerificationCodeInputProps) => JSX.Element;
+export declare const HTrimInput: import("react").ForwardRefExoticComponent<import("./Form/modal").HFormItemProps & import("react").RefAttributes<any>>;
+export declare const HTrimTextArea: import("react").ForwardRefExoticComponent<import("./Form/modal").HFormItemProps & import("react").RefAttributes<any>>;

package/lib/index.js

@@ -31,6 +31,8 @@ var HModalForm = ModalForm.default;
 var HDrawerForm = index$2.default;
 var HCascader = config.default.cascader;
 var HVerificationCodeInput = config.default.verificationCodeInput;
+var HTrimInput = config.default.trimInput;
+var HTrimTextArea = config.default.trimTextArea;
 
 exports.HForm = index.default;
 exports.useHForm = useHForm.default;
@@ -55,6 +57,8 @@ exports.HSelectInput = HSelectInput;
 exports.HSwitch = HSwitch;
 exports.HTextArea = HTextArea;
 exports.HTimePicker = HTimePicker;
+exports.HTrimInput = HTrimInput;
+exports.HTrimTextArea = HTrimTextArea;
 exports.HUpload = HUpload;
 exports.HUrlUpload = HUrlUpload;
 exports.HVerificationCodeInput = HVerificationCodeInput;

package/package.json

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

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

@@ -27,6 +27,7 @@ export default ({
   params,
   onValuesChange,
   autoClear = true,
+  contentRender,
   ...props
 }: DialogFormProps) => {
   const currentForm = useCurrentForm(dialogForm);
@@ -71,6 +72,26 @@ export default ({
       )
     );
   };
+  const node = (
+    <HForm
+      configData={modalFormData}
+      initialValues={initValue}
+      onValuesChange={onValuesChange}
+      {...props}
+      form={currentForm}
+      params={formParams}
+      onFinish={async (values, subParams) => {
+        const result = await run(values, subParams);
+        const close = onOk?.(result, subParams);
+        if (close === false) {
+          return;
+        }
+        cancel();
+      }}
+      infoRequest={infoRequest}
+      labelWidth={labelWidth}
+    />
+  );
   return (
     <Drawer
       visible={modalVisible}
@@ -82,24 +103,7 @@ export default ({
       footer={footerComponent()}
     >
       <FormConfigProvider {...providerConfig}>
-        <HForm
-          configData={modalFormData}
-          initialValues={initValue}
-          onValuesChange={onValuesChange}
-          {...props}
-          form={currentForm}
-          params={formParams}
-          onFinish={async (values, subParams) => {
-            const result = await run(values, subParams);
-            const close = onOk?.(result, subParams);
-            if (close === false) {
-              return;
-            }
-            cancel();
-          }}
-          infoRequest={infoRequest}
-          labelWidth={labelWidth}
-        />
+        {contentRender ? contentRender(node, currentForm) : node}
       </FormConfigProvider>
     </Drawer>
   );