@hw-component/form 1.9.58 → 1.9.60

package/es/DialogForm/DrawerForm/index.js

@@ -56,10 +56,11 @@ var Index = function Index(_ref) {
     modalFormData = _useModifyProps.modalFormData,
     setModalVisible = _useModifyProps.setModalVisible,
     initValue = _useModifyProps.initValue,
-    onAfterClose = _useModifyProps.onAfterClose,
     formParams = _useModifyProps.formParams,
-    modalTitle = _useModifyProps.title;
+    modalTitle = _useModifyProps.title,
+    saveOldParams = _useModifyProps.saveOldParams;
   var cancel = function cancel() {
+    saveOldParams();
     if (onCancel) {
       return onCancel === null || onCancel === void 0 ? void 0 : onCancel();
     }
@@ -127,7 +128,8 @@ var Index = function Index(_ref) {
     onClose: cancel,
     afterVisibleChange: function afterVisibleChange(changeVisible) {
       if (!changeVisible) {
-        onAfterClose();
+        dialogForm === null || dialogForm === void 0 || dialogForm.clear();
+        afterClose === null || afterClose === void 0 || afterClose();
       }
     },
     closable: false,

package/es/DialogForm/hooks.d.ts

@@ -7,9 +7,9 @@ export declare const useModifyProps: ({ visible, configData, initialValues, dial
     setModalFormData: React.Dispatch<React.SetStateAction<import("../Form/modal").HItemProps[]>>;
     initValue: Record<string, any> | undefined;
     setInitValue: React.Dispatch<React.SetStateAction<Record<string, any> | undefined>>;
-    onAfterClose: () => void;
     formParams: any;
     title: string | number | boolean | {} | React.ReactElement<any, string | React.JSXElementConstructor<any>> | React.ReactNodeArray | React.ReactPortal | null | undefined;
+    saveOldParams: () => void;
 };
 export declare const useHDialogForm: () => HDialogFormInstance<any, any>;
 export declare const useCurrentForm: (hDialogForm?: HDialogFormInstance) => HDialogFormInstance<any, any>;

package/es/DialogForm/hooks.js

@@ -45,12 +45,8 @@ var useModifyProps = function useModifyProps(_ref) {
       old: {}
     };
   }, []);
-  var onAfterClose = function onAfterClose() {
+  var saveOldParams = function saveOldParams() {
     saveOldParamsObj.old = dialogForm.outputValues();
-    setTimeout(function () {
-      dialogForm.clear();
-      afterClose === null || afterClose === void 0 || afterClose();
-    }, 100);
   };
   useEffect(function () {
     setModalVisible(visible);
@@ -98,9 +94,9 @@ var useModifyProps = function useModifyProps(_ref) {
     setModalFormData: setModalFormData,
     initValue: initValue,
     setInitValue: setInitValue,
-    onAfterClose: onAfterClose,
     formParams: formParams,
-    title: modalTitle
+    title: modalTitle,
+    saveOldParams: saveOldParams
   };
 };
 var useHDialogForm = function useHDialogForm() {

package/es/TextArea/index.d.ts

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

package/es/TextArea/index.js

@@ -3,8 +3,9 @@ import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
 import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/objectWithoutProperties';
 import { jsx } from 'react/jsx-runtime';
 import { Input } from 'antd';
+import { useClassName } from '../hooks/index.js';
 
-var _excluded = ["autoSize"];
+var _excluded = ["autoSize", "bordered", "className"];
 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 TextArea = (function (_ref) {
@@ -13,10 +14,18 @@ var TextArea = (function (_ref) {
       minRows: 4,
       maxRows: 4
     } : _ref$autoSize,
+    _ref$bordered = _ref.bordered,
+    bordered = _ref$bordered === void 0 ? true : _ref$bordered,
+    _ref$className = _ref.className,
+    className = _ref$className === void 0 ? "" : _ref$className,
     props = _objectWithoutProperties(_ref, _excluded);
-  return jsx(Input.TextArea, _objectSpread({
+  var noBorderClassName = useClassName("hw-text-area-no-border");
+  var borderClassName = !bordered ? noBorderClassName : "";
+  return jsx(Input.TextArea, _objectSpread(_objectSpread({
     autoSize: autoSize
-  }, props));
+  }, props), {}, {
+    className: "".concat(borderClassName, " ").concat(className)
+  }));
 });
 
 export { TextArea as default };

package/es/index.css

@@ -262,6 +262,12 @@
 .ant-hw-switch .ant-hw-switch-after {
   margin-left: 4px;
 }
+.ant-hw-text-area-no-border {
+  border: none !important;
+}
+.ant-hw-text-area-no-border:focus {
+  box-shadow: none !important;
+}
 .ant-hw-addon {
   display: -webkit-box !important;
   display: -webkit-flex !important;

package/lib/DialogForm/DrawerForm/index.js

@@ -59,10 +59,11 @@ var Index = function Index(_ref) {
     modalFormData = _useModifyProps.modalFormData,
     setModalVisible = _useModifyProps.setModalVisible,
     initValue = _useModifyProps.initValue,
-    onAfterClose = _useModifyProps.onAfterClose,
     formParams = _useModifyProps.formParams,
-    modalTitle = _useModifyProps.title;
+    modalTitle = _useModifyProps.title,
+    saveOldParams = _useModifyProps.saveOldParams;
   var cancel = function cancel() {
+    saveOldParams();
     if (onCancel) {
       return onCancel === null || onCancel === void 0 ? void 0 : onCancel();
     }
@@ -130,7 +131,8 @@ var Index = function Index(_ref) {
     onClose: cancel,
     afterVisibleChange: function afterVisibleChange(changeVisible) {
       if (!changeVisible) {
-        onAfterClose();
+        dialogForm === null || dialogForm === void 0 || dialogForm.clear();
+        afterClose === null || afterClose === void 0 || afterClose();
       }
     },
     closable: false,

package/lib/DialogForm/hooks.d.ts

@@ -7,9 +7,9 @@ export declare const useModifyProps: ({ visible, configData, initialValues, dial
     setModalFormData: React.Dispatch<React.SetStateAction<import("../Form/modal").HItemProps[]>>;
     initValue: Record<string, any> | undefined;
     setInitValue: React.Dispatch<React.SetStateAction<Record<string, any> | undefined>>;
-    onAfterClose: () => void;
     formParams: any;
     title: string | number | boolean | {} | React.ReactElement<any, string | React.JSXElementConstructor<any>> | React.ReactNodeArray | React.ReactPortal | null | undefined;
+    saveOldParams: () => void;
 };
 export declare const useHDialogForm: () => HDialogFormInstance<any, any>;
 export declare const useCurrentForm: (hDialogForm?: HDialogFormInstance) => HDialogFormInstance<any, any>;

package/lib/DialogForm/hooks.js

@@ -46,12 +46,8 @@ var useModifyProps = function useModifyProps(_ref) {
       old: {}
     };
   }, []);
-  var onAfterClose = function onAfterClose() {
+  var saveOldParams = function saveOldParams() {
     saveOldParamsObj.old = dialogForm.outputValues();
-    setTimeout(function () {
-      dialogForm.clear();
-      afterClose === null || afterClose === void 0 || afterClose();
-    }, 100);
   };
   React.useEffect(function () {
     setModalVisible(visible);
@@ -99,9 +95,9 @@ var useModifyProps = function useModifyProps(_ref) {
     setModalFormData: setModalFormData,
     initValue: initValue,
     setInitValue: setInitValue,
-    onAfterClose: onAfterClose,
     formParams: formParams,
-    title: modalTitle
+    title: modalTitle,
+    saveOldParams: saveOldParams
   };
 };
 var useHDialogForm = function useHDialogForm() {

package/lib/TextArea/index.d.ts

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

package/lib/TextArea/index.js

@@ -6,8 +6,9 @@ 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 index = require('../hooks/index.js');
 
-var _excluded = ["autoSize"];
+var _excluded = ["autoSize", "bordered", "className"];
 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 TextArea = (function (_ref) {
@@ -16,10 +17,18 @@ var TextArea = (function (_ref) {
       minRows: 4,
       maxRows: 4
     } : _ref$autoSize,
+    _ref$bordered = _ref.bordered,
+    bordered = _ref$bordered === void 0 ? true : _ref$bordered,
+    _ref$className = _ref.className,
+    className = _ref$className === void 0 ? "" : _ref$className,
     props = _objectWithoutProperties(_ref, _excluded);
-  return jsxRuntime.jsx(antd.Input.TextArea, _objectSpread({
+  var noBorderClassName = index.useClassName("hw-text-area-no-border");
+  var borderClassName = !bordered ? noBorderClassName : "";
+  return jsxRuntime.jsx(antd.Input.TextArea, _objectSpread(_objectSpread({
     autoSize: autoSize
-  }, props));
+  }, props), {}, {
+    className: "".concat(borderClassName, " ").concat(className)
+  }));
 });
 
 exports.default = TextArea;

package/lib/index.css

@@ -262,6 +262,12 @@
 .ant-hw-switch .ant-hw-switch-after {
   margin-left: 4px;
 }
+.ant-hw-text-area-no-border {
+  border: none !important;
+}
+.ant-hw-text-area-no-border:focus {
+  box-shadow: none !important;
+}
 .ant-hw-addon {
   display: -webkit-box !important;
   display: -webkit-flex !important;

package/package.json

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

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

@@ -46,6 +46,7 @@ const Index: React.FC<DialogFormProps> = ({
     initValue,
     formParams,
     title: modalTitle,
+      saveOldParams
   } = useModifyProps({
     configData,
     visible,
@@ -58,6 +59,7 @@ const Index: React.FC<DialogFormProps> = ({
     afterClose,
   });
   const cancel = () => {
+    saveOldParams();
     if (onCancel) {
       return onCancel?.();
     }

package/src/components/DialogForm/ModalForm.tsx

@@ -42,7 +42,6 @@ const Index: React.FC<DialogFormProps> = ({
     initValue,
     formParams,
     title: modalTitle,
-    saveOldParams,
   } = useModifyProps({
     configData,
     visible,
@@ -53,7 +52,6 @@ const Index: React.FC<DialogFormProps> = ({
     onCancel,
   });
   const cancel = () => {
-    saveOldParams();
     if (onCancel) {
       return onCancel?.();
     }

package/src/components/TextArea/index.less

@@ -0,0 +1,8 @@
+@import "../styles/local.less";
+
+.@{ant-prefix}-hw-text-area-no-border{
+   border: none !important;
+   &:focus{
+     box-shadow: none !important;
+   }
+}

package/src/components/TextArea/index.tsx

@@ -1,8 +1,17 @@
 import { Input } from "antd";
 import type { TextAreaProps } from "antd/es/input";
+import {useClassName} from "../hooks";
+interface HTextAreaProps extends TextAreaProps{
+   bordered?:boolean;
+}
+
 export default ({
   autoSize = { minRows: 4, maxRows: 4 },
+                  bordered=true,
+    className="",
   ...props
-}: TextAreaProps) => {
-  return <Input.TextArea autoSize={autoSize} {...props} />;
+}: HTextAreaProps) => {
+  const noBorderClassName=useClassName("hw-text-area-no-border") ;
+  const borderClassName=!bordered?noBorderClassName:"";
+  return <Input.TextArea autoSize={autoSize} {...props} className={`${borderClassName} ${className}`}/>;
 };

package/src/components/styles/index.less

@@ -2,6 +2,7 @@
 @import "../Form/index.less";
 @import "../Input/index.less";
 @import "../Switch/index.less";
+@import "../TextArea/index.less";
 
 .@{ant-prefix}-hw-addon {
   display: flex !important;

package/src/pages/Input/index.tsx

@@ -6,6 +6,7 @@ import {
   HColorInput,
   HVerificationCodeInput,
   HInputNumberGroup,
+    HTextArea,
 } from "../../components";
 import { Space } from "antd";
 import { useState } from "react";
@@ -36,6 +37,7 @@ export default () => {
           },
         ]}
       />
+        <HTextArea />
     </Space>
   );
 };