@hw-component/form 0.0.4-beta-v2 → 0.0.4-beta-v4

package/es/DialogForm/DrawerForm/index.d.ts

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

package/es/DialogForm/DrawerForm/index.js

@@ -18,7 +18,7 @@ import HForm from '../../Form/index.js';
 import Title from './Title.js';
 import Footer from './Footer.js';
 
-var _excluded = ["visible", "title", "onCancel", "configData", "infoRequest", "request", "afterClose", "dialogForm", "closable", "initialValues", "labelWidth", "onOk", "onFinish", "size", "form", "footer", "params"];
+var _excluded = ["visible", "title", "onCancel", "configData", "infoRequest", "request", "afterClose", "dialogForm", "closable", "initialValues", "labelWidth", "onOk", "onFinish", "size", "form", "footer", "params", "onValuesChange"];
 function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if (_Object$getOwnPropertySymbols) { var symbols = _Object$getOwnPropertySymbols(object); enumerableOnly && (symbols = _filterInstanceProperty(symbols).call(symbols, 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 _context2, _context3; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context2 = ownKeys(Object(source), !0)).call(_context2, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context3 = ownKeys(Object(source))).call(_context3, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
 var DrawerForm = (function (_ref) {
@@ -41,6 +41,7 @@ var DrawerForm = (function (_ref) {
     _ref.form;
     var footer = _ref.footer,
     params = _ref.params,
+    onValuesChange = _ref.onValuesChange,
     props = _objectWithoutProperties(_ref, _excluded);
   var currentForm = useCurrentForm(dialogForm);
   var _useModifyProps = useModifyProps({
@@ -93,7 +94,8 @@ var DrawerForm = (function (_ref) {
     footer: footerComponent(),
     children: jsx(HForm, _objectSpread(_objectSpread({
       configData: modalFormData,
-      initialValues: initValue
+      initialValues: initValue,
+      onValuesChange: onValuesChange
     }, props), {}, {
       form: currentForm,
       params: formParams,

package/es/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, ...props }: DialogFormProps) => JSX.Element;
+declare const _default: ({ visible, title, onCancel, configData, infoRequest, request, afterClose, dialogForm, initialValues, onFinish, params, onOk, onValuesChange, ...props }: DialogFormProps) => JSX.Element;
 export default _default;

package/es/DialogForm/ModalForm.js

@@ -16,7 +16,7 @@ import { Modal } from 'antd';
 import HForm from '../Form/index.js';
 import { useCurrentForm, useModifyProps, useSub } from './hooks.js';
 
-var _excluded = ["visible", "title", "onCancel", "configData", "infoRequest", "request", "afterClose", "dialogForm", "initialValues", "onFinish", "params", "onOk"];
+var _excluded = ["visible", "title", "onCancel", "configData", "infoRequest", "request", "afterClose", "dialogForm", "initialValues", "onFinish", "params", "onOk", "onValuesChange"];
 function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if (_Object$getOwnPropertySymbols) { var symbols = _Object$getOwnPropertySymbols(object); enumerableOnly && (symbols = _filterInstanceProperty(symbols).call(symbols, 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 _context2, _context3; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context2 = ownKeys(Object(source), !0)).call(_context2, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context3 = ownKeys(Object(source))).call(_context3, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
 var ModalForm = (function (_ref) {
@@ -33,6 +33,7 @@ var ModalForm = (function (_ref) {
     onFinish = _ref.onFinish,
     params = _ref.params,
     onOk = _ref.onOk,
+    onValuesChange = _ref.onValuesChange,
     props = _objectWithoutProperties(_ref, _excluded);
   var currentForm = useCurrentForm(dialogForm);
   var _useModifyProps = useModifyProps({
@@ -40,13 +41,15 @@ var ModalForm = (function (_ref) {
       visible: visible,
       initialValues: initialValues,
       dialogForm: currentForm,
-      params: params
+      params: params,
+      title: title
     }),
     modalVisible = _useModifyProps.modalVisible,
     modalFormData = _useModifyProps.modalFormData,
     setModalVisible = _useModifyProps.setModalVisible,
     initValue = _useModifyProps.initValue,
-    formParams = _useModifyProps.formParams;
+    formParams = _useModifyProps.formParams,
+    modalTitle = _useModifyProps.title;
   var cancel = function cancel() {
     if (onCancel) {
       return onCancel === null || onCancel === void 0 ? void 0 : onCancel();
@@ -60,7 +63,7 @@ var ModalForm = (function (_ref) {
     loading = _useSub.loading,
     run = _useSub.run;
   return jsx(Modal, _objectSpread(_objectSpread({
-    title: title,
+    title: modalTitle,
     visible: modalVisible,
     onCancel: cancel,
     confirmLoading: loading,
@@ -74,6 +77,7 @@ var ModalForm = (function (_ref) {
     children: jsx(HForm, _objectSpread(_objectSpread({
       configData: modalFormData,
       initialValues: initValue,
+      onValuesChange: onValuesChange,
       onFinish: function () {
         var _onFinish = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(values, outParams) {
           var result, close;

package/es/DialogForm/hooks.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import type { DialogFormProps, HDialogFormInstance, ModifyPropsModal } from "./modal";
-export declare const useModifyProps: ({ visible, configData, initialValues, dialogForm, afterClose, params, }: ModifyPropsModal) => {
+export declare const useModifyProps: ({ visible, configData, initialValues, dialogForm, afterClose, params, title }: ModifyPropsModal) => {
     modalFormData: import("../Form/modal").HItemProps[];
     modalVisible: boolean | undefined;
     setModalVisible: import("react").Dispatch<import("react").SetStateAction<boolean | undefined>>;
@@ -9,6 +9,7 @@ export declare const useModifyProps: ({ visible, configData, initialValues, dial
     setInitValue: import("react").Dispatch<import("react").SetStateAction<Record<string, any> | undefined>>;
     onAfterClose: () => void;
     formParams: any;
+    title: string | (string & import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) | (string & import("react").ReactNodeArray) | (string & import("react").ReactPortal) | undefined;
 };
 export declare const useHDialogForm: () => HDialogFormInstance<any, any>;
 export declare const useCurrentForm: (hDialogForm?: HDialogFormInstance) => HDialogFormInstance<any, any>;

package/es/DialogForm/hooks.js

@@ -24,7 +24,8 @@ var useModifyProps = function useModifyProps(_ref) {
     initialValues = _ref.initialValues,
     dialogForm = _ref.dialogForm,
     afterClose = _ref.afterClose,
-    params = _ref.params;
+    params = _ref.params,
+    title = _ref.title;
   var _useState = useState(visible),
     _useState2 = _slicedToArray(_useState, 2),
     modalVisible = _useState2[0],
@@ -41,6 +42,10 @@ var useModifyProps = function useModifyProps(_ref) {
     _useState8 = _slicedToArray(_useState7, 2),
     formParams = _useState8[0],
     setFormParams = _useState8[1];
+  var _useState9 = useState(title),
+    _useState10 = _slicedToArray(_useState9, 2),
+    modalTitle = _useState10[0],
+    setModalTitle = _useState10[1];
   var onAfterClose = function onAfterClose() {
     _setTimeout(function () {
       dialogForm.resetFields();
@@ -56,18 +61,25 @@ var useModifyProps = function useModifyProps(_ref) {
   useEffect(function () {
     setFormParams(params);
   }, [params]);
+  useEffect(function () {
+    setModalTitle(title);
+  }, [title]);
   useEffect(function () {
     dialogForm.show = function () {
       var showParams = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
       var changeConfigData = showParams.configData,
         changeInitialValues = showParams.initialValues,
-        changeParams = showParams.params;
+        changeParams = showParams.params,
+        changeTitle = showParams.title;
       if (!!changeConfigData) {
         setModalFormData(changeConfigData);
       }
       if (!!changeParams) {
         setFormParams(changeParams);
       }
+      if (!!changeTitle) {
+        setModalTitle(changeTitle);
+      }
       setInitValue(changeInitialValues);
       setModalVisible(true);
     };
@@ -84,7 +96,8 @@ var useModifyProps = function useModifyProps(_ref) {
     initValue: initValue,
     setInitValue: setInitValue,
     onAfterClose: onAfterClose,
-    formParams: formParams
+    formParams: formParams,
+    title: modalTitle
   };
 };
 var useHDialogForm = function useHDialogForm() {

package/es/DialogForm/modal.d.ts

@@ -9,6 +9,7 @@ export interface ModifyPropsModal<P = any> {
     dialogForm: HDialogFormInstance;
     afterClose?: VoidFunction;
     params?: P;
+    title?: DialogFormProps["title"];
 }
 export interface ShowParamsModal<P = any, T = any> {
     configData?: HItemProps[];
@@ -16,6 +17,7 @@ export interface ShowParamsModal<P = any, T = any> {
     initialValues?: Record<string, any>;
     infoRequest?: PromiseFnResult<P, T>;
     params?: P;
+    title?: DialogFormProps["title"];
 }
 export interface HDialogFormInstance<P = any, T = any> extends HFormInstance {
     show: (data?: ShowParamsModal<P, T>) => void;

package/es/Select/hooks/norHooks.d.ts

@@ -1,4 +1,8 @@
 import type { OptionType, PartialHSelectProps } from "@/components/Select/modal";
+interface ParamsModal {
+    options?: OptionType[];
+    params?: any;
+}
 export declare const useOptionReq: ({ manual, request, options, serviceSearch, showSearch, onSearch: propsOnSearch, }: PartialHSelectProps) => {
     run: (params?: any, type?: any) => Promise<OptionType[] | undefined>;
     loading: boolean;
@@ -6,5 +10,7 @@ export declare const useOptionReq: ({ manual, request, options, serviceSearch, s
     data: OptionType[] | undefined;
     onSearch: ((value: string) => void) | undefined;
     mathShowSearch: boolean | undefined;
+    reload: ({ options: changeOpts, params: requestParams, }: ParamsModal) => void | Promise<OptionType[] | undefined>;
 };
 export declare const useFilterOption: ({ filterOption, serviceSearch, }: PartialHSelectProps) => boolean | import("rc-select/lib/Select").FilterFunc<import("rc-select/lib/Select").DefaultOptionType> | undefined;
+export {};

package/es/Select/hooks/norHooks.js

@@ -51,6 +51,14 @@ var useOptionReq = function useOptionReq(_ref) {
     run = _useRequest.run,
     loading = _useRequest.loading,
     error = _useRequest.error;
+  var reload = function reload(_ref3) {
+    var changeOpts = _ref3.options,
+      requestParams = _ref3.params;
+    if (changeOpts) {
+      return setData(changeOpts);
+    }
+    return run(requestParams);
+  };
   var onSearch = function onSearch(inputValue) {
     if (!serviceSearch) {
       propsOnSearch === null || propsOnSearch === void 0 ? void 0 : propsOnSearch(inputValue);
@@ -72,12 +80,13 @@ var useOptionReq = function useOptionReq(_ref) {
     error: error,
     data: data,
     onSearch: mathShowSearch ? onSearch : propsOnSearch,
-    mathShowSearch: showSearch || serviceSearch
+    mathShowSearch: showSearch || serviceSearch,
+    reload: reload
   };
 };
-var useFilterOption = function useFilterOption(_ref3) {
-  var filterOption = _ref3.filterOption,
-    serviceSearch = _ref3.serviceSearch;
+var useFilterOption = function useFilterOption(_ref4) {
+  var filterOption = _ref4.filterOption,
+    serviceSearch = _ref4.serviceSearch;
   if (serviceSearch) {
     return function () {
       return true;

package/es/Select/index.d.ts

@@ -1,3 +1,3 @@
-import type { HSelectProps } from "./modal";
-declare const _default: ({ style, mode, options, modeConfig, value, onChange, fieldNames: propsFieldNames, request, manual, optionLabelProp, filterProvider, optionFilterProp, serviceSearch, onSearch: propsOnSearch, filterOption, showSearch, labelInValue, noMatchItemRender, allSelect, ...props }: HSelectProps) => JSX.Element;
+import React from "react";
+declare const _default: React.ForwardRefExoticComponent<import("../Form/modal").HFormItemProps & React.RefAttributes<any>>;
 export default _default;

package/es/Select/index.js

@@ -15,15 +15,16 @@ import { Select } from 'antd';
 import { useFilterOption, useOptionReq } from './hooks/norHooks.js';
 import { useValueChange } from './hooks/changeHooks.js';
 import { defaultModeConfig, defaultSelectConfig } from './defaultConfig.js';
-import Index from './components/DropdownComponent.js';
-import Index$1 from './components/AllSelect.js';
+import Index$1 from './components/DropdownComponent.js';
+import Index$2 from './components/AllSelect.js';
 import { useMatchConfigProps, useChangeOptions } from '../hooks/index.js';
+import HFormConnect from '../Form/HFormConnect.js';
 
-var _excluded = ["style", "mode", "options", "modeConfig", "value", "onChange", "fieldNames", "request", "manual", "optionLabelProp", "filterProvider", "optionFilterProp", "serviceSearch", "onSearch", "filterOption", "showSearch", "labelInValue", "noMatchItemRender", "allSelect"];
+var _excluded = ["style", "mode", "options", "modeConfig", "value", "onChange", "fieldNames", "request", "manual", "optionLabelProp", "filterProvider", "optionFilterProp", "serviceSearch", "onSearch", "filterOption", "showSearch", "labelInValue", "noMatchItemRender", "allSelect", "addDispatchListener"];
 function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if (_Object$getOwnPropertySymbols) { var symbols = _Object$getOwnPropertySymbols(object); enumerableOnly && (symbols = _filterInstanceProperty(symbols).call(symbols, 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 _context, _context2; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context = ownKeys(Object(source), !0)).call(_context, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context2 = ownKeys(Object(source))).call(_context2, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
 var Option = Select.Option;
-var HSelect = (function (_ref) {
+var Index = function Index(_ref) {
   var _ref$style = _ref.style,
     style = _ref$style === void 0 ? {
       width: "100%"
@@ -50,6 +51,7 @@ var HSelect = (function (_ref) {
     _ref$noMatchItemRende = _ref.noMatchItemRender,
     noMatchItemRender = _ref$noMatchItemRende === void 0 ? defaultSelectConfig.noMatchItemRender : _ref$noMatchItemRende,
     allSelect = _ref.allSelect,
+    addDispatchListener = _ref.addDispatchListener,
     props = _objectWithoutProperties(_ref, _excluded);
   var _ref2 = (modeConfig === null || modeConfig === void 0 ? void 0 : modeConfig[mode || ""]) || {},
     icon = _ref2.icon,
@@ -76,7 +78,8 @@ var HSelect = (function (_ref) {
     resultData = _useOptionReq.data,
     error = _useOptionReq.error,
     onSearch = _useOptionReq.onSearch,
-    mathShowSearch = _useOptionReq.mathShowSearch;
+    mathShowSearch = _useOptionReq.mathShowSearch,
+    reload = _useOptionReq.reload;
   var data = useChangeOptions({
     options: resultData,
     fieldNames: fieldNames
@@ -92,6 +95,7 @@ var HSelect = (function (_ref) {
     }),
     val = _useValueChange.val,
     change = _useValueChange.change;
+  addDispatchListener === null || addDispatchListener === void 0 ? void 0 : addDispatchListener("reload", reload);
   return jsx(Select, _objectSpread(_objectSpread({
     style: style,
     mode: mode,
@@ -100,12 +104,12 @@ var HSelect = (function (_ref) {
     onSearch: onSearch,
     onChange: change,
     dropdownRender: function dropdownRender(node) {
-      return jsx(Index, {
+      return jsx(Index$1, {
         loading: loading,
         reload: run,
         error: error,
         options: data,
-        children: jsx(Index$1, {
+        children: jsx(Index$2, {
           allSelect: allSelect,
           options: data,
           mode: mode,
@@ -136,7 +140,8 @@ var HSelect = (function (_ref) {
       }), optionValue);
     })
   }));
-});
+};
+var HSelect = HFormConnect(Index);
 
 export { HSelect as default };
 // powered by hdj

package/es/Select/modal.d.ts

@@ -1,6 +1,7 @@
 import type { SelectProps } from "antd";
 import type React from "react";
 import type { PromiseFnResult } from "../modal";
+import type { argsFn } from "@/components/Form/modal";
 export type OptionType = Record<string, any>;
 export type PartialHSelectProps = Partial<HSelectProps>;
 export type RenderFn = (data: OptionType) => React.ReactNode;
@@ -22,6 +23,7 @@ export interface HSelectProps extends Omit<SelectProps, "options"> {
     options?: OptionType[];
     noMatchItemRender?: RenderFn;
     allSelect?: boolean;
+    addDispatchListener?: (key: string, fn: argsFn) => void;
 }
 export interface FilterDataModal {
     value: any;

package/lib/DialogForm/DrawerForm/index.d.ts

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

package/lib/DialogForm/DrawerForm/index.js

@@ -21,7 +21,7 @@ var index = require('../../Form/index.js');
 var Title = require('./Title.js');
 var Footer = require('./Footer.js');
 
-var _excluded = ["visible", "title", "onCancel", "configData", "infoRequest", "request", "afterClose", "dialogForm", "closable", "initialValues", "labelWidth", "onOk", "onFinish", "size", "form", "footer", "params"];
+var _excluded = ["visible", "title", "onCancel", "configData", "infoRequest", "request", "afterClose", "dialogForm", "closable", "initialValues", "labelWidth", "onOk", "onFinish", "size", "form", "footer", "params", "onValuesChange"];
 function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if (_Object$getOwnPropertySymbols) { var symbols = _Object$getOwnPropertySymbols(object); enumerableOnly && (symbols = _filterInstanceProperty(symbols).call(symbols, 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 _context2, _context3; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context2 = ownKeys(Object(source), !0)).call(_context2, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context3 = ownKeys(Object(source))).call(_context3, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
 var DrawerForm = (function (_ref) {
@@ -44,6 +44,7 @@ var DrawerForm = (function (_ref) {
     _ref.form;
     var footer = _ref.footer,
     params = _ref.params,
+    onValuesChange = _ref.onValuesChange,
     props = _objectWithoutProperties(_ref, _excluded);
   var currentForm = hooks.useCurrentForm(dialogForm);
   var _useModifyProps = hooks.useModifyProps({
@@ -96,7 +97,8 @@ var DrawerForm = (function (_ref) {
     footer: footerComponent(),
     children: jsxRuntime.jsx(index.default, _objectSpread(_objectSpread({
       configData: modalFormData,
-      initialValues: initValue
+      initialValues: initValue,
+      onValuesChange: onValuesChange
     }, props), {}, {
       form: currentForm,
       params: formParams,

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, ...props }: DialogFormProps) => JSX.Element;
+declare const _default: ({ visible, title, onCancel, configData, infoRequest, request, afterClose, dialogForm, initialValues, onFinish, params, onOk, onValuesChange, ...props }: DialogFormProps) => JSX.Element;
 export default _default;

package/lib/DialogForm/ModalForm.js

@@ -19,7 +19,7 @@ var antd = require('antd');
 var index = require('../Form/index.js');
 var hooks = require('./hooks.js');
 
-var _excluded = ["visible", "title", "onCancel", "configData", "infoRequest", "request", "afterClose", "dialogForm", "initialValues", "onFinish", "params", "onOk"];
+var _excluded = ["visible", "title", "onCancel", "configData", "infoRequest", "request", "afterClose", "dialogForm", "initialValues", "onFinish", "params", "onOk", "onValuesChange"];
 function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if (_Object$getOwnPropertySymbols) { var symbols = _Object$getOwnPropertySymbols(object); enumerableOnly && (symbols = _filterInstanceProperty(symbols).call(symbols, 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 _context2, _context3; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context2 = ownKeys(Object(source), !0)).call(_context2, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context3 = ownKeys(Object(source))).call(_context3, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
 var ModalForm = (function (_ref) {
@@ -36,6 +36,7 @@ var ModalForm = (function (_ref) {
     onFinish = _ref.onFinish,
     params = _ref.params,
     onOk = _ref.onOk,
+    onValuesChange = _ref.onValuesChange,
     props = _objectWithoutProperties(_ref, _excluded);
   var currentForm = hooks.useCurrentForm(dialogForm);
   var _useModifyProps = hooks.useModifyProps({
@@ -43,13 +44,15 @@ var ModalForm = (function (_ref) {
       visible: visible,
       initialValues: initialValues,
       dialogForm: currentForm,
-      params: params
+      params: params,
+      title: title
     }),
     modalVisible = _useModifyProps.modalVisible,
     modalFormData = _useModifyProps.modalFormData,
     setModalVisible = _useModifyProps.setModalVisible,
     initValue = _useModifyProps.initValue,
-    formParams = _useModifyProps.formParams;
+    formParams = _useModifyProps.formParams,
+    modalTitle = _useModifyProps.title;
   var cancel = function cancel() {
     if (onCancel) {
       return onCancel === null || onCancel === void 0 ? void 0 : onCancel();
@@ -63,7 +66,7 @@ var ModalForm = (function (_ref) {
     loading = _useSub.loading,
     run = _useSub.run;
   return jsxRuntime.jsx(antd.Modal, _objectSpread(_objectSpread({
-    title: title,
+    title: modalTitle,
     visible: modalVisible,
     onCancel: cancel,
     confirmLoading: loading,
@@ -77,6 +80,7 @@ var ModalForm = (function (_ref) {
     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;

package/lib/DialogForm/hooks.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import type { DialogFormProps, HDialogFormInstance, ModifyPropsModal } from "./modal";
-export declare const useModifyProps: ({ visible, configData, initialValues, dialogForm, afterClose, params, }: ModifyPropsModal) => {
+export declare const useModifyProps: ({ visible, configData, initialValues, dialogForm, afterClose, params, title }: ModifyPropsModal) => {
     modalFormData: import("../Form/modal").HItemProps[];
     modalVisible: boolean | undefined;
     setModalVisible: import("react").Dispatch<import("react").SetStateAction<boolean | undefined>>;
@@ -9,6 +9,7 @@ export declare const useModifyProps: ({ visible, configData, initialValues, dial
     setInitValue: import("react").Dispatch<import("react").SetStateAction<Record<string, any> | undefined>>;
     onAfterClose: () => void;
     formParams: any;
+    title: string | (string & import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) | (string & import("react").ReactNodeArray) | (string & import("react").ReactPortal) | undefined;
 };
 export declare const useHDialogForm: () => HDialogFormInstance<any, any>;
 export declare const useCurrentForm: (hDialogForm?: HDialogFormInstance) => HDialogFormInstance<any, any>;

package/lib/DialogForm/hooks.js

@@ -25,7 +25,8 @@ var useModifyProps = function useModifyProps(_ref) {
     initialValues = _ref.initialValues,
     dialogForm = _ref.dialogForm,
     afterClose = _ref.afterClose,
-    params = _ref.params;
+    params = _ref.params,
+    title = _ref.title;
   var _useState = React.useState(visible),
     _useState2 = _slicedToArray(_useState, 2),
     modalVisible = _useState2[0],
@@ -42,6 +43,10 @@ var useModifyProps = function useModifyProps(_ref) {
     _useState8 = _slicedToArray(_useState7, 2),
     formParams = _useState8[0],
     setFormParams = _useState8[1];
+  var _useState9 = React.useState(title),
+    _useState10 = _slicedToArray(_useState9, 2),
+    modalTitle = _useState10[0],
+    setModalTitle = _useState10[1];
   var onAfterClose = function onAfterClose() {
     _setTimeout(function () {
       dialogForm.resetFields();
@@ -57,18 +62,25 @@ var useModifyProps = function useModifyProps(_ref) {
   React.useEffect(function () {
     setFormParams(params);
   }, [params]);
+  React.useEffect(function () {
+    setModalTitle(title);
+  }, [title]);
   React.useEffect(function () {
     dialogForm.show = function () {
       var showParams = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
       var changeConfigData = showParams.configData,
         changeInitialValues = showParams.initialValues,
-        changeParams = showParams.params;
+        changeParams = showParams.params,
+        changeTitle = showParams.title;
       if (!!changeConfigData) {
         setModalFormData(changeConfigData);
       }
       if (!!changeParams) {
         setFormParams(changeParams);
       }
+      if (!!changeTitle) {
+        setModalTitle(changeTitle);
+      }
       setInitValue(changeInitialValues);
       setModalVisible(true);
     };
@@ -85,7 +97,8 @@ var useModifyProps = function useModifyProps(_ref) {
     initValue: initValue,
     setInitValue: setInitValue,
     onAfterClose: onAfterClose,
-    formParams: formParams
+    formParams: formParams,
+    title: modalTitle
   };
 };
 var useHDialogForm = function useHDialogForm() {

package/lib/DialogForm/modal.d.ts

@@ -9,6 +9,7 @@ export interface ModifyPropsModal<P = any> {
     dialogForm: HDialogFormInstance;
     afterClose?: VoidFunction;
     params?: P;
+    title?: DialogFormProps["title"];
 }
 export interface ShowParamsModal<P = any, T = any> {
     configData?: HItemProps[];
@@ -16,6 +17,7 @@ export interface ShowParamsModal<P = any, T = any> {
     initialValues?: Record<string, any>;
     infoRequest?: PromiseFnResult<P, T>;
     params?: P;
+    title?: DialogFormProps["title"];
 }
 export interface HDialogFormInstance<P = any, T = any> extends HFormInstance {
     show: (data?: ShowParamsModal<P, T>) => void;

package/lib/Select/hooks/norHooks.d.ts

@@ -1,4 +1,8 @@
 import type { OptionType, PartialHSelectProps } from "@/components/Select/modal";
+interface ParamsModal {
+    options?: OptionType[];
+    params?: any;
+}
 export declare const useOptionReq: ({ manual, request, options, serviceSearch, showSearch, onSearch: propsOnSearch, }: PartialHSelectProps) => {
     run: (params?: any, type?: any) => Promise<OptionType[] | undefined>;
     loading: boolean;
@@ -6,5 +10,7 @@ export declare const useOptionReq: ({ manual, request, options, serviceSearch, s
     data: OptionType[] | undefined;
     onSearch: ((value: string) => void) | undefined;
     mathShowSearch: boolean | undefined;
+    reload: ({ options: changeOpts, params: requestParams, }: ParamsModal) => void | Promise<OptionType[] | undefined>;
 };
 export declare const useFilterOption: ({ filterOption, serviceSearch, }: PartialHSelectProps) => boolean | import("rc-select/lib/Select").FilterFunc<import("rc-select/lib/Select").DefaultOptionType> | undefined;
+export {};

package/lib/Select/hooks/norHooks.js

@@ -52,6 +52,14 @@ var useOptionReq = function useOptionReq(_ref) {
     run = _useRequest.run,
     loading = _useRequest.loading,
     error = _useRequest.error;
+  var reload = function reload(_ref3) {
+    var changeOpts = _ref3.options,
+      requestParams = _ref3.params;
+    if (changeOpts) {
+      return setData(changeOpts);
+    }
+    return run(requestParams);
+  };
   var onSearch = function onSearch(inputValue) {
     if (!serviceSearch) {
       propsOnSearch === null || propsOnSearch === void 0 ? void 0 : propsOnSearch(inputValue);
@@ -73,12 +81,13 @@ var useOptionReq = function useOptionReq(_ref) {
     error: error,
     data: data,
     onSearch: mathShowSearch ? onSearch : propsOnSearch,
-    mathShowSearch: showSearch || serviceSearch
+    mathShowSearch: showSearch || serviceSearch,
+    reload: reload
   };
 };
-var useFilterOption = function useFilterOption(_ref3) {
-  var filterOption = _ref3.filterOption,
-    serviceSearch = _ref3.serviceSearch;
+var useFilterOption = function useFilterOption(_ref4) {
+  var filterOption = _ref4.filterOption,
+    serviceSearch = _ref4.serviceSearch;
   if (serviceSearch) {
     return function () {
       return true;

package/lib/Select/index.d.ts

@@ -1,3 +1,3 @@
-import type { HSelectProps } from "./modal";
-declare const _default: ({ style, mode, options, modeConfig, value, onChange, fieldNames: propsFieldNames, request, manual, optionLabelProp, filterProvider, optionFilterProp, serviceSearch, onSearch: propsOnSearch, filterOption, showSearch, labelInValue, noMatchItemRender, allSelect, ...props }: HSelectProps) => JSX.Element;
+import React from "react";
+declare const _default: React.ForwardRefExoticComponent<import("../Form/modal").HFormItemProps & React.RefAttributes<any>>;
 export default _default;

package/lib/Select/index.js

@@ -21,12 +21,13 @@ var defaultConfig = require('./defaultConfig.js');
 var DropdownComponent = require('./components/DropdownComponent.js');
 var AllSelect = require('./components/AllSelect.js');
 var index = require('../hooks/index.js');
+var HFormConnect = require('../Form/HFormConnect.js');
 
-var _excluded = ["style", "mode", "options", "modeConfig", "value", "onChange", "fieldNames", "request", "manual", "optionLabelProp", "filterProvider", "optionFilterProp", "serviceSearch", "onSearch", "filterOption", "showSearch", "labelInValue", "noMatchItemRender", "allSelect"];
+var _excluded = ["style", "mode", "options", "modeConfig", "value", "onChange", "fieldNames", "request", "manual", "optionLabelProp", "filterProvider", "optionFilterProp", "serviceSearch", "onSearch", "filterOption", "showSearch", "labelInValue", "noMatchItemRender", "allSelect", "addDispatchListener"];
 function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if (_Object$getOwnPropertySymbols) { var symbols = _Object$getOwnPropertySymbols(object); enumerableOnly && (symbols = _filterInstanceProperty(symbols).call(symbols, 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 _context, _context2; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context = ownKeys(Object(source), !0)).call(_context, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context2 = ownKeys(Object(source))).call(_context2, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
 var Option = antd.Select.Option;
-var HSelect = (function (_ref) {
+var Index = function Index(_ref) {
   var _ref$style = _ref.style,
     style = _ref$style === void 0 ? {
       width: "100%"
@@ -53,6 +54,7 @@ var HSelect = (function (_ref) {
     _ref$noMatchItemRende = _ref.noMatchItemRender,
     noMatchItemRender = _ref$noMatchItemRende === void 0 ? defaultConfig.defaultSelectConfig.noMatchItemRender : _ref$noMatchItemRende,
     allSelect = _ref.allSelect,
+    addDispatchListener = _ref.addDispatchListener,
     props = _objectWithoutProperties(_ref, _excluded);
   var _ref2 = (modeConfig === null || modeConfig === void 0 ? void 0 : modeConfig[mode || ""]) || {},
     icon = _ref2.icon,
@@ -79,7 +81,8 @@ var HSelect = (function (_ref) {
     resultData = _useOptionReq.data,
     error = _useOptionReq.error,
     onSearch = _useOptionReq.onSearch,
-    mathShowSearch = _useOptionReq.mathShowSearch;
+    mathShowSearch = _useOptionReq.mathShowSearch,
+    reload = _useOptionReq.reload;
   var data = index.useChangeOptions({
     options: resultData,
     fieldNames: fieldNames
@@ -95,6 +98,7 @@ var HSelect = (function (_ref) {
     }),
     val = _useValueChange.val,
     change = _useValueChange.change;
+  addDispatchListener === null || addDispatchListener === void 0 ? void 0 : addDispatchListener("reload", reload);
   return jsxRuntime.jsx(antd.Select, _objectSpread(_objectSpread({
     style: style,
     mode: mode,
@@ -139,7 +143,8 @@ var HSelect = (function (_ref) {
       }), optionValue);
     })
   }));
-});
+};
+var HSelect = HFormConnect.default(Index);
 
 exports.default = HSelect;
 // powered by h

package/lib/Select/modal.d.ts

@@ -1,6 +1,7 @@
 import type { SelectProps } from "antd";
 import type React from "react";
 import type { PromiseFnResult } from "../modal";
+import type { argsFn } from "@/components/Form/modal";
 export type OptionType = Record<string, any>;
 export type PartialHSelectProps = Partial<HSelectProps>;
 export type RenderFn = (data: OptionType) => React.ReactNode;
@@ -22,6 +23,7 @@ export interface HSelectProps extends Omit<SelectProps, "options"> {
     options?: OptionType[];
     noMatchItemRender?: RenderFn;
     allSelect?: boolean;
+    addDispatchListener?: (key: string, fn: argsFn) => void;
 }
 export interface FilterDataModal {
     value: any;

package/package.json

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

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

@@ -22,6 +22,7 @@ export default ({
   form,
   footer,
   params,
+  onValuesChange,
   ...props
 }: DialogFormProps) => {
   const currentForm = useCurrentForm(dialogForm);
@@ -74,6 +75,7 @@ export default ({
       <HForm
         configData={modalFormData}
         initialValues={initValue}
+        onValuesChange={onValuesChange}
         {...props}
         form={currentForm}
         params={formParams}

package/src/components/DialogForm/ModalForm.tsx

@@ -15,6 +15,7 @@ export default ({
   onFinish,
   params,
   onOk,
+  onValuesChange,
   ...props
 }: DialogFormProps) => {
   const currentForm = useCurrentForm(dialogForm);
@@ -24,12 +25,14 @@ export default ({
     setModalVisible,
     initValue,
     formParams,
+    title:modalTitle
   } = useModifyProps({
     configData,
     visible,
     initialValues,
     dialogForm: currentForm,
     params,
+    title
   });
   const cancel = () => {
     if (onCancel) {
@@ -40,7 +43,7 @@ export default ({
   const { loading, run } = useSub({ request, onFinish });
   return (
     <Modal
-      title={title}
+      title={modalTitle}
       visible={modalVisible}
       onCancel={cancel}
       confirmLoading={loading}
@@ -55,6 +58,7 @@ export default ({
       <HForm
         configData={modalFormData}
         initialValues={initValue}
+        onValuesChange={onValuesChange}
         onFinish={async (values, outParams) => {
           const result = await run(values, outParams);
           const close = onOk?.(result, outParams);

package/src/components/DialogForm/hooks.ts

@@ -14,11 +14,13 @@ export const useModifyProps = ({
   dialogForm,
   afterClose,
   params,
+  title
 }: ModifyPropsModal) => {
   const [modalVisible, setModalVisible] = useState(visible);
   const [modalFormData, setModalFormData] = useState(configData);
   const [initValue, setInitValue] = useState(initialValues);
   const [formParams, setFormParams] = useState(params);
+  const [modalTitle,setModalTitle]=useState(title)
   const onAfterClose = () => {
     setTimeout(() => {
       dialogForm.resetFields();
@@ -36,13 +38,16 @@ export const useModifyProps = ({
   useEffect(() => {
     setFormParams(params);
   }, [params]);
-
+  useEffect(() => {
+    setModalTitle(title);
+  }, [title]);
   useEffect(() => {
     dialogForm.show = (showParams = {}) => {
       const {
         configData: changeConfigData,
         initialValues: changeInitialValues,
         params: changeParams,
+        title:changeTitle
       } = showParams;
       if (!!changeConfigData) {
         setModalFormData(changeConfigData);
@@ -50,6 +55,9 @@ export const useModifyProps = ({
       if (!!changeParams) {
         setFormParams(changeParams);
       }
+      if (!!changeTitle){
+        setModalTitle(changeTitle);
+      }
       setInitValue(changeInitialValues);
       setModalVisible(true);
     };
@@ -67,6 +75,7 @@ export const useModifyProps = ({
     setInitValue,
     onAfterClose,
     formParams,
+    title:modalTitle
   };
 };
 export const useHDialogForm = () => {

package/src/components/DialogForm/modal.ts

@@ -11,6 +11,7 @@ export interface ModifyPropsModal<P = any> {
   dialogForm: HDialogFormInstance;
   afterClose?: VoidFunction;
   params?: P;
+  title?:DialogFormProps["title"];
 }
 export interface ShowParamsModal<P = any, T = any> {
   configData?: HItemProps[];
@@ -18,6 +19,7 @@ export interface ShowParamsModal<P = any, T = any> {
   initialValues?: Record<string, any>;
   infoRequest?: PromiseFnResult<P, T>;
   params?: P;
+  title?:DialogFormProps["title"];
 }
 
 export interface HDialogFormInstance<P = any, T = any> extends HFormInstance {

package/src/components/Select/hooks/norHooks.ts

@@ -1,10 +1,14 @@
-import {useEffect, useState} from "react";
+import { useEffect, useState } from "react";
 import type {
   OptionType,
   PartialHSelectProps,
 } from "@/components/Select/modal";
 import { useRequest } from "ahooks";
 
+interface ParamsModal {
+  options?: OptionType[];
+  params?: any;
+}
 export const useOptionReq = ({
   manual,
   request,
@@ -32,6 +36,15 @@ export const useOptionReq = ({
       },
     }
   );
+  const reload = ({
+    options: changeOpts,
+    params: requestParams,
+  }: ParamsModal) => {
+    if (changeOpts) {
+      return setData(changeOpts);
+    }
+    return run(requestParams);
+  };
   const onSearch = (inputValue: string) => {
     if (!serviceSearch) {
       propsOnSearch?.(inputValue);
@@ -39,11 +52,11 @@ export const useOptionReq = ({
     }
     run({ inputValue });
   };
-  useEffect(()=>{
-    if (options){
-       setData(options);
+  useEffect(() => {
+    if (options) {
+      setData(options);
     }
-  },[options]);
+  }, [options]);
   const mathShowSearch = showSearch || serviceSearch;
   return {
     run,
@@ -52,6 +65,7 @@ export const useOptionReq = ({
     data,
     onSearch: mathShowSearch ? onSearch : propsOnSearch,
     mathShowSearch: showSearch || serviceSearch,
+    reload,
   };
 };
 

package/src/components/Select/index.tsx

@@ -7,9 +7,10 @@ import { defaultModeConfig, defaultSelectConfig } from "./defaultConfig";
 import DropdownComponent from "./components/DropdownComponent";
 import AllSelect from "./components/AllSelect";
 import { useChangeOptions, useMatchConfigProps } from "../hooks";
+import HFormConnect from "../Form/HFormConnect";
 const { Option } = Select;
 
-export default ({
+const Index: React.FC<HSelectProps> = ({
   style = { width: "100%" },
   mode,
   options,
@@ -29,8 +30,9 @@ export default ({
   labelInValue,
   noMatchItemRender = defaultSelectConfig.noMatchItemRender,
   allSelect,
+  addDispatchListener,
   ...props
-}: HSelectProps) => {
+}) => {
   const { icon, render } = modeConfig?.[mode || ""] || {};
   const { fieldNames } = useMatchConfigProps({ fieldNames: propsFieldNames });
 
@@ -42,6 +44,7 @@ export default ({
     error,
     onSearch,
     mathShowSearch,
+    reload,
   } = useOptionReq({
     options,
     manual,
@@ -62,7 +65,7 @@ export default ({
     noMatchItemRender,
     fieldNames,
   });
-
+  addDispatchListener?.("reload", reload);
   return (
     <Select
       style={style}
@@ -118,3 +121,4 @@ export default ({
     </Select>
   );
 };
+export default HFormConnect(Index);

package/src/components/Select/modal.ts

@@ -1,6 +1,7 @@
 import type { SelectProps } from "antd";
 import type React from "react";
 import type { PromiseFnResult } from "../modal";
+import type { argsFn } from "@/components/Form/modal";
 export type OptionType = Record<string, any>;
 export type PartialHSelectProps = Partial<HSelectProps>;
 export type RenderFn = (data: OptionType) => React.ReactNode;
@@ -23,6 +24,7 @@ export interface HSelectProps extends Omit<SelectProps, "options"> {
   options?: OptionType[];
   noMatchItemRender?: RenderFn; //没有数据
   allSelect?: boolean; //显示全选
+  addDispatchListener?: (key: string, fn: argsFn) => void;
 }
 export interface FilterDataModal {
   value: any;

package/src/pages/Form/index.tsx

@@ -1,8 +1,8 @@
 import { HForm, HFormConfigProvider, useHForm } from "../../components";
-import {useState} from "react";
+import { useState } from "react";
 
-const formData=(options)=>{
-  return  [
+const formData = (options) => {
+  return [
     {
       label: "输入框",
       name: "name",
@@ -21,13 +21,14 @@ const formData=(options)=>{
       rules: [{ required: true }],
     },
     {
-      label: "数字",
-      name: "sz",
+      label: "下拉框",
+      name: "select",
       type: "select",
       itemProps: {
-        request:()=>{
-          return Promise.resolve([{label:"123",value:1}])
-        }
+        request: (params = {}) => {
+          const { label = "123", value = 1 } = params;
+          return Promise.resolve([{ label, value }]);
+        },
       },
       rules: [{ required: true }],
     },
@@ -122,13 +123,13 @@ const formData=(options)=>{
       type: "submit",
     },
   ];
-}
+};
 const Test = (props) => {
   return <div>ffff</div>;
 };
 export default () => {
   const form = useHForm();
-  const [options,setOptions]=useState([{label:"1",value:1}]);
+  const [options, setOptions] = useState([{ label: "1", value: 1 }]);
 
   return (
     <div style={{ overflow: "auto", height: "90vh" }}>
@@ -172,9 +173,24 @@ export default () => {
           }}
         />
       </HFormConfigProvider>
-      <div onClick={()=>{
-        setOptions([{label:"2",value: 2}])
-      }}>点我</div>
+      <div
+        onClick={() => {
+          form.dispatch(
+            {
+              name: "select",
+              key: "reload",
+            },
+            {
+              params: {
+                label: "更新",
+                value: 2,
+              },
+            }
+          );
+        }}
+      >
+        点我
+      </div>
     </div>
   );
 };