@hw-component/form 1.9.46 → 1.9.47

package/es/DialogForm/hooks.js

@@ -3,9 +3,11 @@ import _asyncToGenerator from '@babel/runtime-corejs3/helpers/asyncToGenerator';
 import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
 import _slicedToArray from '@babel/runtime-corejs3/helpers/slicedToArray';
 import _regeneratorRuntime from '@babel/runtime-corejs3/regenerator';
+import { jsx } from 'react/jsx-runtime';
 import { useMemo, useState, useEffect } from 'react';
 import useHForm from '../Form/hooks/useHForm.js';
 import { useRequest } from 'ahooks';
+import Footer from './DrawerForm/Footer.js';
 
 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; }
@@ -154,13 +156,21 @@ var useFooterRender = function useFooterRender(_ref4) {
     confirmLoading = _ref4.confirmLoading,
     dialogForm = _ref4.dialogForm,
     params = _ref4.params;
-  if (!footer) {
-    return footer;
+  if (footer === null) {
+    return null;
   }
   if (typeof footer === "function") {
     return footer(dialogForm, confirmLoading, params);
   }
-  return footer;
+  return footer || jsx(Footer, {
+    onCancel: function onCancel() {
+      dialogForm === null || dialogForm === void 0 || dialogForm.hide();
+    },
+    onOk: function onOk() {
+      dialogForm === null || dialogForm === void 0 || dialogForm.submit();
+    },
+    confirmLoading: confirmLoading
+  });
 };
 
 export { useCurrentForm, useFooterRender, useHDialogForm, useModifyProps, useSub };

package/es/DialogForm/modal.d.ts

@@ -26,7 +26,7 @@ export interface HDialogFormInstance<P = any, T = any> extends HFormInstance {
     show: (data?: ShowParamsModal<P, T>) => void;
     hide: VoidFunction;
 }
-type FooterRender = (dialogForm?: HDialogFormInstance, loading?: boolean, params?: Record<string, any>) => React.ReactNode;
+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"> {
     dialogForm?: HDialogFormInstance;
     onFinish?: (values: T, params: P) => Promise<any>;

package/es/Form/config.d.ts

@@ -36,6 +36,6 @@ declare const componentConfig: {
         placeholder: ({ label }: import("./modal").HItemProps) => string[];
     };
     treeSelect: ({ request, onlyCheckChild, multiple, treeCheckable, treeData, fieldNames, ...props }: import("../Select/TreeSelect").HTreeSelectProps) => JSX.Element;
-    text: ({ value }: import("antd").FormItemProps) => JSX.Element;
+    text: ({ value }: import("./modal").HFormItemProps) => JSX.Element;
 };
 export default componentConfig;

package/es/Form/modal.d.ts

@@ -17,7 +17,7 @@ import type { DataFnProvider } from "../modal";
 import type { ColProps } from "antd/lib/grid/col";
 import type { Gutter } from "antd/lib/grid/row";
 import type { IUrlUploadProps } from "../Upload/modal";
-import { BaseOptions } from "@ahooksjs/use-request/lib/types";
+import type { BaseOptions } from "@ahooksjs/use-request/lib/types";
 type RenderFun = (props: HItemProps, node: React.ReactNode, form: FormInstance) => React.ReactNode;
 export type ItemPropsType = HCheckboxProps | HInputProps | HSelectInputProps | HButtonProps | HRadioGroupProps | HSelectProps | ButtonProps | HSwitchProps | HDatePickerProps | HRangePickerProps | HTimePickerProps | TextAreaProps | IUpLoadProps | CascaderProps<any> | IUrlUploadProps;
 export interface HoverModal {

package/es/Input/ButtonInput.js

@@ -4,8 +4,9 @@ import _asyncToGenerator from '@babel/runtime-corejs3/helpers/asyncToGenerator';
 import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/objectWithoutProperties';
 import _regeneratorRuntime from '@babel/runtime-corejs3/regenerator';
 import { jsx, jsxs } from 'react/jsx-runtime';
-import { Input, Button } from 'antd';
+import { Input } from 'antd';
 import { useRequest } from 'ahooks';
+import { HJBtn } from '@hw-component/hj';
 
 var _excluded = ["buttonProps", "value", "onChange", "children", "request", "layType"],
   _excluded2 = ["onClick", "type", "ghost", "loading"];
@@ -68,7 +69,7 @@ var Index = function Index(_ref) {
   }();
   if (layType === "text") {
     return jsx(Input, _objectSpread(_objectSpread({}, props), {}, {
-      suffix: jsx(Button, _objectSpread(_objectSpread({
+      suffix: jsx(HJBtn, _objectSpread(_objectSpread({
         type: btnType,
         onClick: click,
         size: "small",
@@ -90,13 +91,12 @@ var Index = function Index(_ref) {
       },
       value: value,
       onChange: change
-    })), jsx(Button, _objectSpread(_objectSpread({
+    })), jsx(HJBtn, _objectSpread(_objectSpread({
       type: btnType,
       onClick: click,
       loading: loading || btnLoading,
       style: {
-        marginLeft: 8,
-        borderRadius: 4
+        marginLeft: 8
       },
       ghost: ghost
     }, oProps), {}, {

package/es/Input/SelectInput.js

@@ -53,6 +53,7 @@ var Index = function Index(_ref) {
         Object.values(valueName).forEach(function (key) {
           resultObj[key] = initValue[key];
         });
+        console.log(item, valueName);
         return _defineProperty({}, name, resultObj);
       },
       outputValue: function outputValue(item, _outputValue) {

package/es/PageHandler/ErrorComponent.js

@@ -1,7 +1,8 @@
 // welcome to hoo hoo hoo
 import { jsx, jsxs } from 'react/jsx-runtime';
-import { Typography, Row, Space, Button } from 'antd';
+import { Typography, Row, Space } from 'antd';
 import { ExclamationCircleOutlined } from '@ant-design/icons';
+import { HJBtn } from '@hw-component/hj';
 
 var Text = Typography.Text;
 var ErrorComponent = (function (_ref) {
@@ -24,7 +25,7 @@ var ErrorComponent = (function (_ref) {
       }), jsx(Text, {
         type: "danger",
         children: error === null || error === void 0 ? void 0 : error.message
-      }), jsx(Button, {
+      }), jsx(HJBtn, {
         type: "primary",
         size: "small",
         onClick: reload,

package/es/Select/TreeSelect.d.ts

@@ -1,5 +1,5 @@
-import { TreeSelectProps } from "antd/lib/tree-select";
-import { PromiseFnResult } from "../modal";
+import type { TreeSelectProps } from "antd/lib/tree-select";
+import type { PromiseFnResult } from "../modal";
 export interface HTreeSelectProps extends TreeSelectProps {
     request?: PromiseFnResult;
     onlyCheckChild?: boolean;

package/es/Select/components/NotFoundContent.js

@@ -1,7 +1,8 @@
 // welcome to hoo hoo hoo
 import { jsx, jsxs } from 'react/jsx-runtime';
-import { Typography, Row, Space, Button, Empty } from 'antd';
+import { Typography, Row, Space, Empty } from 'antd';
 import { ExclamationCircleOutlined } from '@ant-design/icons';
+import { HJBtn } from '@hw-component/hj';
 
 var Text = Typography.Text;
 var NotFoundContent = (function (_ref) {
@@ -25,7 +26,7 @@ var NotFoundContent = (function (_ref) {
         }), jsx(Text, {
           type: "danger",
           children: error.message
-        }), jsx(Button, {
+        }), jsx(HJBtn, {
           type: "primary",
           size: "small",
           onClick: reload,

package/es/Submit/components.js

@@ -2,9 +2,9 @@
 import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
 import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/objectWithoutProperties';
 import { jsx, Fragment } from 'react/jsx-runtime';
-import { Button } from 'antd';
 import { useFormContext } from '../Form/Context/index.js';
 import React from 'react';
+import { HJBtn } from '@hw-component/hj';
 
 var _excluded = ["form", "style"],
   _excluded2 = ["type", "form", "text", "loading", "style"],
@@ -18,7 +18,7 @@ function ResetBtn(_ref) {
       borderRadius: 4
     } : _ref$style,
     props = _objectWithoutProperties(_ref, _excluded);
-  return jsx(Button, _objectSpread(_objectSpread({}, props), {}, {
+  return jsx(HJBtn, _objectSpread(_objectSpread({}, props), {}, {
     style: style,
     onClick: function onClick() {
       form.resetFields();
@@ -41,7 +41,7 @@ function SubBtn(_ref2) {
   var _useFormContext = useFormContext(),
     _useFormContext$loadi = _useFormContext.loading,
     formSubLoading = _useFormContext$loadi === void 0 ? loading : _useFormContext$loadi;
-  return jsx(Button, _objectSpread(_objectSpread({}, props), {}, {
+  return jsx(HJBtn, _objectSpread(_objectSpread({}, props), {}, {
     type: type,
     onClick: form.submit,
     loading: formSubLoading,

package/es/Switch/index.d.ts

@@ -2,7 +2,7 @@ import type { SwitchProps } from "antd";
 import React from "react";
 import type { ValueSwitchMapModal } from "../modal";
 import type { addFormatItemModal } from "../Form/modal";
-import { PromiseFnResult } from "../modal";
+import type { PromiseFnResult } from "../modal";
 export interface HSwitchProps extends Omit<SwitchProps, "onChange"> {
     valueMap?: ValueSwitchMapModal;
     value?: any;

package/es/Text/index.d.ts

@@ -1,3 +1,3 @@
-import { HFormItemProps } from "../Form/modal";
+import type { HFormItemProps } from "../Form/modal";
 declare const _default: ({ value }: HFormItemProps) => JSX.Element;
 export default _default;

package/es/index.css

@@ -19,9 +19,9 @@
           flex-direction: row;
 }
 .ant-hw-select-box .ant-hw-group-addon-before {
-  border-bottom-left-radius: 2px;
+  border-right: 0;
   border-top-left-radius: 2px;
-  border-right: 0px;
+  border-bottom-left-radius: 2px;
 }
 .ant-hw-select-box .ant-select {
   -webkit-box-flex: 1;
@@ -30,17 +30,17 @@
           flex: 1;
 }
 .ant-hw-select-box .ant-hw-group-addon-after {
-  border-bottom-right-radius: 2px;
+  border-left: 0;
   border-top-right-radius: 2px;
-  border-left: 0px;
+  border-bottom-right-radius: 2px;
 }
 .ant-hw-select-box-addon-before .ant-select .ant-select-selector {
-  border-bottom-left-radius: 0px !important;
-  border-top-left-radius: 0px !important;
+  border-top-left-radius: 0 !important;
+  border-bottom-left-radius: 0 !important;
 }
 .ant-hw-select-box-addon-after .ant-select .ant-select-selector {
-  border-bottom-right-radius: 0px !important;
-  border-top-right-radius: 0px !important;
+  border-top-right-radius: 0 !important;
+  border-bottom-right-radius: 0 !important;
 }
 .ant-hw-form-item-colon:after {
   position: relative;

package/es/index.d.ts

@@ -1,7 +1,7 @@
 import "./styles/index.less";
 export { default as HForm } from "./Form";
 export { default as useHForm } from "./Form/hooks/useHForm";
-export { useHDialogForm } from "./DialogForm/hooks";
+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";

package/lib/DialogForm/DrawerForm/Footer.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var jsxRuntime = require('react/jsx-runtime');
 var antd = require('antd');
+var hj = require('@hw-component/hj');
 
 var Footer = (function (_ref) {
   var onCancel = _ref.onCancel,
@@ -12,11 +13,11 @@ var Footer = (function (_ref) {
   return jsxRuntime.jsx(antd.Row, {
     justify: "end",
     children: jsxRuntime.jsxs(antd.Space, {
-      size: "middle",
-      children: [jsxRuntime.jsx(antd.Button, {
+      size: "small",
+      children: [jsxRuntime.jsx(hj.HJBtn, {
         onClick: onCancel,
         children: "\u5173\u95ED"
-      }), jsxRuntime.jsx(antd.Button, {
+      }), jsxRuntime.jsx(hj.HJBtn, {
         type: "primary",
         onClick: onOk,
         loading: confirmLoading,

package/lib/DialogForm/DrawerForm/index.js

@@ -11,7 +11,6 @@ var antd = require('antd');
 var hooks = require('../hooks.js');
 var index = require('../../Form/index.js');
 var Title = require('./Title.js');
-var Footer = require('./Footer.js');
 var FormConfigProvider = require('../../Form/Context/FormConfigProvider.js');
 var ChildComponent = require('../ChildComponent.js');
 
@@ -76,19 +75,12 @@ var Index = function Index(_ref) {
     }),
     loading = _useSub.loading,
     run = _useSub.run;
-  var footerComponent = function footerComponent() {
-    if (footer === null) {
-      return null;
-    }
-    if (typeof footer === "function") {
-      return footer(dialogForm, loading, formParams);
-    }
-    return footer || jsxRuntime.jsx(Footer.default, {
-      onCancel: cancel,
-      onOk: currentForm.submit,
-      confirmLoading: loading
-    });
-  };
+  var defaultFooter = hooks.useFooterRender({
+    dialogForm: dialogForm,
+    footer: footer,
+    confirmLoading: loading,
+    params: formParams
+  });
   var node = jsxRuntime.jsx(index.default, _objectSpread(_objectSpread({
     configData: modalFormData,
     initialValues: initValue,
@@ -139,7 +131,7 @@ var Index = function Index(_ref) {
     onClose: cancel,
     closable: false,
     destroyOnClose: true,
-    footer: footerComponent(),
+    footer: defaultFooter,
     children: jsxRuntime.jsx(FormConfigProvider.default, _objectSpread(_objectSpread({}, providerConfig), {}, {
       children: jsxRuntime.jsx(ChildComponent.default, {
         dialogForm: currentForm,

package/lib/DialogForm/hooks.d.ts

@@ -1,14 +1,15 @@
+import React from "react";
 import type { DialogFormProps, HDialogFormInstance, ModifyPropsModal } from "./modal";
 export declare const useModifyProps: ({ visible, configData, initialValues, dialogForm, afterClose, params, title, onCancel, autoClear, }: ModifyPropsModal) => {
     modalFormData: import("../Form/modal").HItemProps[];
     modalVisible: boolean | undefined;
-    setModalVisible: import("react").Dispatch<import("react").SetStateAction<boolean | undefined>>;
-    setModalFormData: import("react").Dispatch<import("react").SetStateAction<import("../Form/modal").HItemProps[]>>;
+    setModalVisible: React.Dispatch<React.SetStateAction<boolean | undefined>>;
+    setModalFormData: React.Dispatch<React.SetStateAction<import("../Form/modal").HItemProps[]>>;
     initValue: Record<string, any> | undefined;
-    setInitValue: import("react").Dispatch<import("react").SetStateAction<Record<string, any> | undefined>>;
+    setInitValue: React.Dispatch<React.SetStateAction<Record<string, any> | undefined>>;
     onAfterClose: () => void;
     formParams: any;
-    title: string | number | boolean | {} | import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>> | import("react").ReactNodeArray | import("react").ReactPortal | null | undefined;
+    title: string | number | boolean | {} | React.ReactElement<any, string | React.JSXElementConstructor<any>> | React.ReactNodeArray | React.ReactPortal | null | undefined;
 };
 export declare const useHDialogForm: () => HDialogFormInstance<any, any>;
 export declare const useCurrentForm: (hDialogForm?: HDialogFormInstance) => HDialogFormInstance<any, any>;

package/lib/DialogForm/hooks.js

@@ -4,9 +4,11 @@ var _asyncToGenerator = require('@babel/runtime-corejs3/helpers/asyncToGenerator
 var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
 var _slicedToArray = require('@babel/runtime-corejs3/helpers/slicedToArray');
 var _regeneratorRuntime = require('@babel/runtime-corejs3/regenerator');
+var jsxRuntime = require('react/jsx-runtime');
 var React = require('react');
 var useHForm = require('../Form/hooks/useHForm.js');
 var ahooks = require('ahooks');
+var Footer = require('./DrawerForm/Footer.js');
 
 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; }
@@ -155,13 +157,21 @@ var useFooterRender = function useFooterRender(_ref4) {
     confirmLoading = _ref4.confirmLoading,
     dialogForm = _ref4.dialogForm,
     params = _ref4.params;
-  if (!footer) {
-    return footer;
+  if (footer === null) {
+    return null;
   }
   if (typeof footer === "function") {
     return footer(dialogForm, confirmLoading, params);
   }
-  return footer;
+  return footer || jsxRuntime.jsx(Footer.default, {
+    onCancel: function onCancel() {
+      dialogForm === null || dialogForm === void 0 || dialogForm.hide();
+    },
+    onOk: function onOk() {
+      dialogForm === null || dialogForm === void 0 || dialogForm.submit();
+    },
+    confirmLoading: confirmLoading
+  });
 };
 
 exports.useCurrentForm = useCurrentForm;

package/lib/DialogForm/modal.d.ts

@@ -26,7 +26,7 @@ export interface HDialogFormInstance<P = any, T = any> extends HFormInstance {
     show: (data?: ShowParamsModal<P, T>) => void;
     hide: VoidFunction;
 }
-type FooterRender = (dialogForm?: HDialogFormInstance, loading?: boolean, params?: Record<string, any>) => React.ReactNode;
+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"> {
     dialogForm?: HDialogFormInstance;
     onFinish?: (values: T, params: P) => Promise<any>;

package/lib/Form/config.d.ts

@@ -36,6 +36,6 @@ declare const componentConfig: {
         placeholder: ({ label }: import("./modal").HItemProps) => string[];
     };
     treeSelect: ({ request, onlyCheckChild, multiple, treeCheckable, treeData, fieldNames, ...props }: import("../Select/TreeSelect").HTreeSelectProps) => JSX.Element;
-    text: ({ value }: import("antd").FormItemProps) => JSX.Element;
+    text: ({ value }: import("./modal").HFormItemProps) => JSX.Element;
 };
 export default componentConfig;

package/lib/Form/modal.d.ts

@@ -17,7 +17,7 @@ import type { DataFnProvider } from "../modal";
 import type { ColProps } from "antd/lib/grid/col";
 import type { Gutter } from "antd/lib/grid/row";
 import type { IUrlUploadProps } from "../Upload/modal";
-import { BaseOptions } from "@ahooksjs/use-request/lib/types";
+import type { BaseOptions } from "@ahooksjs/use-request/lib/types";
 type RenderFun = (props: HItemProps, node: React.ReactNode, form: FormInstance) => React.ReactNode;
 export type ItemPropsType = HCheckboxProps | HInputProps | HSelectInputProps | HButtonProps | HRadioGroupProps | HSelectProps | ButtonProps | HSwitchProps | HDatePickerProps | HRangePickerProps | HTimePickerProps | TextAreaProps | IUpLoadProps | CascaderProps<any> | IUrlUploadProps;
 export interface HoverModal {

package/lib/Input/ButtonInput.js

@@ -9,6 +9,7 @@ var _regeneratorRuntime = require('@babel/runtime-corejs3/regenerator');
 var jsxRuntime = require('react/jsx-runtime');
 var antd = require('antd');
 var ahooks = require('ahooks');
+var hj = require('@hw-component/hj');
 
 var _excluded = ["buttonProps", "value", "onChange", "children", "request", "layType"],
   _excluded2 = ["onClick", "type", "ghost", "loading"];
@@ -71,7 +72,7 @@ var Index = function Index(_ref) {
   }();
   if (layType === "text") {
     return jsxRuntime.jsx(antd.Input, _objectSpread(_objectSpread({}, props), {}, {
-      suffix: jsxRuntime.jsx(antd.Button, _objectSpread(_objectSpread({
+      suffix: jsxRuntime.jsx(hj.HJBtn, _objectSpread(_objectSpread({
         type: btnType,
         onClick: click,
         size: "small",
@@ -93,13 +94,12 @@ var Index = function Index(_ref) {
       },
       value: value,
       onChange: change
-    })), jsxRuntime.jsx(antd.Button, _objectSpread(_objectSpread({
+    })), jsxRuntime.jsx(hj.HJBtn, _objectSpread(_objectSpread({
       type: btnType,
       onClick: click,
       loading: loading || btnLoading,
       style: {
-        marginLeft: 8,
-        borderRadius: 4
+        marginLeft: 8
       },
       ghost: ghost
     }, oProps), {}, {

package/lib/Input/SelectInput.js

@@ -56,6 +56,7 @@ var Index = function Index(_ref) {
         Object.values(valueName).forEach(function (key) {
           resultObj[key] = initValue[key];
         });
+        console.log(item, valueName);
         return _defineProperty({}, name, resultObj);
       },
       outputValue: function outputValue(item, _outputValue) {

package/lib/PageHandler/ErrorComponent.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var jsxRuntime = require('react/jsx-runtime');
 var antd = require('antd');
 var icons = require('@ant-design/icons');
+var hj = require('@hw-component/hj');
 
 var Text = antd.Typography.Text;
 var ErrorComponent = (function (_ref) {
@@ -27,7 +28,7 @@ var ErrorComponent = (function (_ref) {
       }), jsxRuntime.jsx(Text, {
         type: "danger",
         children: error === null || error === void 0 ? void 0 : error.message
-      }), jsxRuntime.jsx(antd.Button, {
+      }), jsxRuntime.jsx(hj.HJBtn, {
         type: "primary",
         size: "small",
         onClick: reload,

package/lib/Select/TreeSelect.d.ts

@@ -1,5 +1,5 @@
-import { TreeSelectProps } from "antd/lib/tree-select";
-import { PromiseFnResult } from "../modal";
+import type { TreeSelectProps } from "antd/lib/tree-select";
+import type { PromiseFnResult } from "../modal";
 export interface HTreeSelectProps extends TreeSelectProps {
     request?: PromiseFnResult;
     onlyCheckChild?: boolean;

package/lib/Select/components/NotFoundContent.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var jsxRuntime = require('react/jsx-runtime');
 var antd = require('antd');
 var icons = require('@ant-design/icons');
+var hj = require('@hw-component/hj');
 
 var Text = antd.Typography.Text;
 var NotFoundContent = (function (_ref) {
@@ -28,7 +29,7 @@ var NotFoundContent = (function (_ref) {
         }), jsxRuntime.jsx(Text, {
           type: "danger",
           children: error.message
-        }), jsxRuntime.jsx(antd.Button, {
+        }), jsxRuntime.jsx(hj.HJBtn, {
           type: "primary",
           size: "small",
           onClick: reload,

package/lib/Submit/components.js

@@ -3,9 +3,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('../Form/Context/index.js');
 var React = require('react');
+var hj = require('@hw-component/hj');
 
 var _excluded = ["form", "style"],
   _excluded2 = ["type", "form", "text", "loading", "style"],
@@ -19,7 +19,7 @@ function ResetBtn(_ref) {
       borderRadius: 4
     } : _ref$style,
     props = _objectWithoutProperties(_ref, _excluded);
-  return jsxRuntime.jsx(antd.Button, _objectSpread(_objectSpread({}, props), {}, {
+  return jsxRuntime.jsx(hj.HJBtn, _objectSpread(_objectSpread({}, props), {}, {
     style: style,
     onClick: function onClick() {
       form.resetFields();
@@ -42,7 +42,7 @@ function SubBtn(_ref2) {
   var _useFormContext = index.useFormContext(),
     _useFormContext$loadi = _useFormContext.loading,
     formSubLoading = _useFormContext$loadi === void 0 ? loading : _useFormContext$loadi;
-  return jsxRuntime.jsx(antd.Button, _objectSpread(_objectSpread({}, props), {}, {
+  return jsxRuntime.jsx(hj.HJBtn, _objectSpread(_objectSpread({}, props), {}, {
     type: type,
     onClick: form.submit,
     loading: formSubLoading,

package/lib/Switch/index.d.ts

@@ -2,7 +2,7 @@ import type { SwitchProps } from "antd";
 import React from "react";
 import type { ValueSwitchMapModal } from "../modal";
 import type { addFormatItemModal } from "../Form/modal";
-import { PromiseFnResult } from "../modal";
+import type { PromiseFnResult } from "../modal";
 export interface HSwitchProps extends Omit<SwitchProps, "onChange"> {
     valueMap?: ValueSwitchMapModal;
     value?: any;

package/lib/Text/index.d.ts

@@ -1,3 +1,3 @@
-import { HFormItemProps } from "../Form/modal";
+import type { HFormItemProps } from "../Form/modal";
 declare const _default: ({ value }: HFormItemProps) => JSX.Element;
 export default _default;

package/lib/index.css

@@ -19,9 +19,9 @@
           flex-direction: row;
 }
 .ant-hw-select-box .ant-hw-group-addon-before {
-  border-bottom-left-radius: 2px;
+  border-right: 0;
   border-top-left-radius: 2px;
-  border-right: 0px;
+  border-bottom-left-radius: 2px;
 }
 .ant-hw-select-box .ant-select {
   -webkit-box-flex: 1;
@@ -30,17 +30,17 @@
           flex: 1;
 }
 .ant-hw-select-box .ant-hw-group-addon-after {
-  border-bottom-right-radius: 2px;
+  border-left: 0;
   border-top-right-radius: 2px;
-  border-left: 0px;
+  border-bottom-right-radius: 2px;
 }
 .ant-hw-select-box-addon-before .ant-select .ant-select-selector {
-  border-bottom-left-radius: 0px !important;
-  border-top-left-radius: 0px !important;
+  border-top-left-radius: 0 !important;
+  border-bottom-left-radius: 0 !important;
 }
 .ant-hw-select-box-addon-after .ant-select .ant-select-selector {
-  border-bottom-right-radius: 0px !important;
-  border-top-right-radius: 0px !important;
+  border-top-right-radius: 0 !important;
+  border-bottom-right-radius: 0 !important;
 }
 .ant-hw-form-item-colon:after {
   position: relative;

package/lib/index.d.ts

@@ -1,7 +1,7 @@
 import "./styles/index.less";
 export { default as HForm } from "./Form";
 export { default as useHForm } from "./Form/hooks/useHForm";
-export { useHDialogForm } from "./DialogForm/hooks";
+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";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hw-component/form",
-  "version": "1.9.46",
+  "version": "1.9.47",
   "description": "基于antd二次开发",
   "repository": {
     "type": "git",
@@ -85,13 +85,15 @@
     "webpack": "^5.83.1",
     "webpack-cli": "^5.1.1",
     "webpack-dev-server": "^4.15.0",
-    "webpackbar": "^5.0.2"
+    "webpackbar": "^5.0.2",
+    "@hw-component/hj": "0.9.0"
   },
   "peerDependencies": {
     "@ant-design/icons": "4.6.2",
     "antd": "4.20.7",
     "react": "17.0.0",
-    "react-dom": "17.0.2"
+    "react-dom": "17.0.2",
+    "@hw-component/hj": "0.9.0"
   },
   "cssPrefix": "hw"
 }

package/src/components/CheckboxGroup/index.tsx

@@ -43,15 +43,15 @@ const Index = ({
           resultObj[key] = initValue[key];
         });
         return {
-          [(name as string)]: resultObj,
+          [name as string]: resultObj,
         };
       },
       outputValue: (item, outputValue) => {
         const { name = "" } = item;
-        const { [(name as string)]: itemVal = {} } = outputValue;
+        const { [name as string]: itemVal = {} } = outputValue;
         if (Array.isArray(itemVal)) {
           return {
-            [(name as string)]: itemVal,
+            [name as string]: itemVal,
           };
         }
         return {