@hw-component/form 0.0.4-beta-v3 → 0.0.4-beta-v5

package/es/DialogForm/ModalForm.js

@@ -41,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();
@@ -61,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,

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/Input/SelectInput.d.ts

@@ -5,5 +5,5 @@ export declare enum SelectInputType {
     select = 1
 }
 export declare const Index: ({ selectProps, value, onChange, valueName, addFormat, addDispatchListener, ...props }: HSelectInputProps) => JSX.Element;
-declare const _default: import("react").ForwardRefExoticComponent<import("@/components/Form/modal").HFormItemProps & import("react").RefAttributes<any>>;
+declare const _default: import("react").ForwardRefExoticComponent<import("../Form/modal").HFormItemProps & import("react").RefAttributes<any>>;
 export default _default;

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

@@ -10,7 +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>;
+    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

@@ -5,6 +5,7 @@ import _regeneratorRuntime from '@babel/runtime-corejs3/regenerator';
 import _Promise from '@babel/runtime-corejs3/core-js/promise';
 import { useState, useEffect } from 'react';
 import { useRequest } from 'ahooks';
+import { useFormContext } from '../../Form/Context/index.js';
 
 var useOptionReq = function useOptionReq(_ref) {
   var manual = _ref.manual,
@@ -13,6 +14,8 @@ var useOptionReq = function useOptionReq(_ref) {
     serviceSearch = _ref.serviceSearch,
     showSearch = _ref.showSearch,
     propsOnSearch = _ref.onSearch;
+  var _useFormContext = useFormContext(),
+    form = _useFormContext.form;
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
     data = _useState2[0],
@@ -20,23 +23,25 @@ var useOptionReq = function useOptionReq(_ref) {
   var _useRequest = useRequest( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
       var params,
         type,
+        formData,
         _args = arguments;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             params = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
             type = _args.length > 1 && _args[1] !== undefined ? _args[1] : "init";
+            formData = form === null || form === void 0 ? void 0 : form.getFieldsValue();
             if (type === "init") {
               setData(undefined);
             }
             if (!request) {
-              _context.next = 5;
+              _context.next = 6;
               break;
             }
-            return _context.abrupt("return", request(params));
-          case 5:
-            return _context.abrupt("return", _Promise.resolve(options));
+            return _context.abrupt("return", request(params, formData));
           case 6:
+            return _context.abrupt("return", _Promise.resolve(options));
+          case 7:
           case "end":
             return _context.stop();
         }

package/es/Select/index.js

@@ -20,7 +20,7 @@ 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", "addDispatchListener"];
+var _excluded = ["style", "mode", "options", "modeConfig", "value", "onChange", "fieldNames", "request", "manual", "optionLabelProp", "filterProvider", "optionFilterProp", "serviceSearch", "onSearch", "filterOption", "showSearch", "labelInValue", "noMatchItemRender", "allSelect", "addDispatchListener", "addFormat"];
 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;
@@ -51,8 +51,9 @@ var Index = function Index(_ref) {
     _ref$noMatchItemRende = _ref.noMatchItemRender,
     noMatchItemRender = _ref$noMatchItemRende === void 0 ? defaultSelectConfig.noMatchItemRender : _ref$noMatchItemRende,
     allSelect = _ref.allSelect,
-    addDispatchListener = _ref.addDispatchListener,
-    props = _objectWithoutProperties(_ref, _excluded);
+    addDispatchListener = _ref.addDispatchListener;
+    _ref.addFormat;
+    var props = _objectWithoutProperties(_ref, _excluded);
   var _ref2 = (modeConfig === null || modeConfig === void 0 ? void 0 : modeConfig[mode || ""]) || {},
     icon = _ref2.icon,
     render = _ref2.render;

package/es/Select/modal.d.ts

@@ -1,7 +1,8 @@
 import type { SelectProps } from "antd";
 import type React from "react";
 import type { PromiseFnResult } from "../modal";
-import { argsFn } from "@/components/Form/modal";
+import type { argsFn } from "@/components/Form/modal";
+import type { addFormatItemModal } from "@/components/Form/modal";
 export type OptionType = Record<string, any>;
 export type PartialHSelectProps = Partial<HSelectProps>;
 export type RenderFn = (data: OptionType) => React.ReactNode;
@@ -13,7 +14,7 @@ export interface ModeConfig {
     multiple?: ModeConfigItem;
     tags?: ModeConfigItem;
 }
-export interface HSelectProps extends Omit<SelectProps, "options"> {
+export interface HSelectProps extends Omit<SelectProps, "options" | "placeholder"> {
     style?: React.CSSProperties;
     request?: PromiseFnResult<any, OptionType[]>;
     manual?: boolean;
@@ -24,6 +25,8 @@ export interface HSelectProps extends Omit<SelectProps, "options"> {
     noMatchItemRender?: RenderFn;
     allSelect?: boolean;
     addDispatchListener?: (key: string, fn: argsFn) => void;
+    addFormat?: (format: Record<string, addFormatItemModal>) => void;
+    placeholder?: string;
 }
 export interface FilterDataModal {
     value: any;

package/es/modal.d.ts

@@ -2,7 +2,7 @@ export interface ValueCheckMapModal {
     checked?: any;
     noChecked?: any;
 }
-export type PromiseFnResult<T = any, R = any> = (params: T) => Promise<R>;
+export type PromiseFnResult<T = any, R = any> = (params: T, formDataValues?: any) => Promise<R>;
 export interface ValueSwitchMapModal {
     open?: any;
     close?: any;

package/lib/DialogForm/ModalForm.js

@@ -44,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();
@@ -64,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,

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/Input/SelectInput.d.ts

@@ -5,5 +5,5 @@ export declare enum SelectInputType {
     select = 1
 }
 export declare const Index: ({ selectProps, value, onChange, valueName, addFormat, addDispatchListener, ...props }: HSelectInputProps) => JSX.Element;
-declare const _default: import("react").ForwardRefExoticComponent<import("@/components/Form/modal").HFormItemProps & import("react").RefAttributes<any>>;
+declare const _default: import("react").ForwardRefExoticComponent<import("../Form/modal").HFormItemProps & import("react").RefAttributes<any>>;
 export default _default;

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

@@ -10,7 +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>;
+    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

@@ -6,6 +6,7 @@ var _regeneratorRuntime = require('@babel/runtime-corejs3/regenerator');
 var _Promise = require('@babel/runtime-corejs3/core-js/promise');
 var React = require('react');
 var ahooks = require('ahooks');
+var index = require('../../Form/Context/index.js');
 
 var useOptionReq = function useOptionReq(_ref) {
   var manual = _ref.manual,
@@ -14,6 +15,8 @@ var useOptionReq = function useOptionReq(_ref) {
     serviceSearch = _ref.serviceSearch,
     showSearch = _ref.showSearch,
     propsOnSearch = _ref.onSearch;
+  var _useFormContext = index.useFormContext(),
+    form = _useFormContext.form;
   var _useState = React.useState(),
     _useState2 = _slicedToArray(_useState, 2),
     data = _useState2[0],
@@ -21,23 +24,25 @@ var useOptionReq = function useOptionReq(_ref) {
   var _useRequest = ahooks.useRequest( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
       var params,
         type,
+        formData,
         _args = arguments;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             params = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
             type = _args.length > 1 && _args[1] !== undefined ? _args[1] : "init";
+            formData = form === null || form === void 0 ? void 0 : form.getFieldsValue();
             if (type === "init") {
               setData(undefined);
             }
             if (!request) {
-              _context.next = 5;
+              _context.next = 6;
               break;
             }
-            return _context.abrupt("return", request(params));
-          case 5:
-            return _context.abrupt("return", _Promise.resolve(options));
+            return _context.abrupt("return", request(params, formData));
           case 6:
+            return _context.abrupt("return", _Promise.resolve(options));
+          case 7:
           case "end":
             return _context.stop();
         }

package/lib/Select/index.js

@@ -23,7 +23,7 @@ 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", "addDispatchListener"];
+var _excluded = ["style", "mode", "options", "modeConfig", "value", "onChange", "fieldNames", "request", "manual", "optionLabelProp", "filterProvider", "optionFilterProp", "serviceSearch", "onSearch", "filterOption", "showSearch", "labelInValue", "noMatchItemRender", "allSelect", "addDispatchListener", "addFormat"];
 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;
@@ -54,8 +54,9 @@ var Index = function Index(_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);
+    addDispatchListener = _ref.addDispatchListener;
+    _ref.addFormat;
+    var props = _objectWithoutProperties(_ref, _excluded);
   var _ref2 = (modeConfig === null || modeConfig === void 0 ? void 0 : modeConfig[mode || ""]) || {},
     icon = _ref2.icon,
     render = _ref2.render;

package/lib/Select/modal.d.ts

@@ -1,7 +1,8 @@
 import type { SelectProps } from "antd";
 import type React from "react";
 import type { PromiseFnResult } from "../modal";
-import { argsFn } from "@/components/Form/modal";
+import type { argsFn } from "@/components/Form/modal";
+import type { addFormatItemModal } from "@/components/Form/modal";
 export type OptionType = Record<string, any>;
 export type PartialHSelectProps = Partial<HSelectProps>;
 export type RenderFn = (data: OptionType) => React.ReactNode;
@@ -13,7 +14,7 @@ export interface ModeConfig {
     multiple?: ModeConfigItem;
     tags?: ModeConfigItem;
 }
-export interface HSelectProps extends Omit<SelectProps, "options"> {
+export interface HSelectProps extends Omit<SelectProps, "options" | "placeholder"> {
     style?: React.CSSProperties;
     request?: PromiseFnResult<any, OptionType[]>;
     manual?: boolean;
@@ -24,6 +25,8 @@ export interface HSelectProps extends Omit<SelectProps, "options"> {
     noMatchItemRender?: RenderFn;
     allSelect?: boolean;
     addDispatchListener?: (key: string, fn: argsFn) => void;
+    addFormat?: (format: Record<string, addFormatItemModal>) => void;
+    placeholder?: string;
 }
 export interface FilterDataModal {
     value: any;

package/lib/modal.d.ts

@@ -2,7 +2,7 @@ export interface ValueCheckMapModal {
     checked?: any;
     noChecked?: any;
 }
-export type PromiseFnResult<T = any, R = any> = (params: T) => Promise<R>;
+export type PromiseFnResult<T = any, R = any> = (params: T, formDataValues?: any) => Promise<R>;
 export interface ValueSwitchMapModal {
     open?: any;
     close?: any;

package/package.json

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

package/src/components/DialogForm/ModalForm.tsx

@@ -25,12 +25,14 @@ export default ({
     setModalVisible,
     initValue,
     formParams,
+    title: modalTitle,
   } = useModifyProps({
     configData,
     visible,
     initialValues,
     dialogForm: currentForm,
     params,
+    title,
   });
   const cancel = () => {
     if (onCancel) {
@@ -41,7 +43,7 @@ export default ({
   const { loading, run } = useSub({ request, onFinish });
   return (
     <Modal
-      title={title}
+      title={modalTitle}
       visible={modalVisible}
       onCancel={cancel}
       confirmLoading={loading}

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/Input/SelectInput.tsx

@@ -3,7 +3,6 @@ import type { HSelectInputProps } from "./modal";
 import HSelect from "../Select";
 import { defaultSelectStyle, defaultValueName } from "./defaultConfig";
 import HFormConnect from "../Form/HFormConnect";
-import { ConnectResultProps } from "@/components/Form/modal";
 export enum SelectInputType {
   input,
   select,

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

@@ -4,10 +4,11 @@ import type {
   PartialHSelectProps,
 } from "@/components/Select/modal";
 import { useRequest } from "ahooks";
+import { useFormContext } from "../../Form/Context";
 
-interface ParamsModal{
+interface ParamsModal {
   options?: OptionType[];
-  params?:any;
+  params?: any;
 }
 export const useOptionReq = ({
   manual,
@@ -17,14 +18,16 @@ export const useOptionReq = ({
   showSearch,
   onSearch: propsOnSearch,
 }: PartialHSelectProps) => {
+  const { form } = useFormContext();
   const [data, setData] = useState<OptionType[] | undefined>();
   const { run, loading, error } = useRequest(
     async (params = {}, type = "init") => {
+      const formData = form?.getFieldsValue();
       if (type === "init") {
         setData(undefined);
       }
       if (request) {
-        return request(params);
+        return request(params, formData);
       }
       return Promise.resolve(options);
     },
@@ -36,12 +39,15 @@ export const useOptionReq = ({
       },
     }
   );
-  const reload=({options:changeOpts,params:requestParams}:ParamsModal)=>{
-     if (changeOpts){
-       return setData(changeOpts);
-     };
-     return  run(requestParams);
-  }
+  const reload = ({
+    options: changeOpts,
+    params: requestParams,
+  }: ParamsModal) => {
+    if (changeOpts) {
+      return setData(changeOpts);
+    }
+    return run(requestParams);
+  };
   const onSearch = (inputValue: string) => {
     if (!serviceSearch) {
       propsOnSearch?.(inputValue);
@@ -62,7 +68,7 @@ export const useOptionReq = ({
     data,
     onSearch: mathShowSearch ? onSearch : propsOnSearch,
     mathShowSearch: showSearch || serviceSearch,
-    reload
+    reload,
   };
 };
 

package/src/components/Select/index.tsx

@@ -30,7 +30,8 @@ const Index: React.FC<HSelectProps> = ({
   labelInValue,
   noMatchItemRender = defaultSelectConfig.noMatchItemRender,
   allSelect,
-                                         addDispatchListener,
+  addDispatchListener,
+  addFormat,
   ...props
 }) => {
   const { icon, render } = modeConfig?.[mode || ""] || {};
@@ -44,7 +45,7 @@ const Index: React.FC<HSelectProps> = ({
     error,
     onSearch,
     mathShowSearch,
-    reload
+    reload,
   } = useOptionReq({
     options,
     manual,
@@ -65,7 +66,7 @@ const Index: React.FC<HSelectProps> = ({
     noMatchItemRender,
     fieldNames,
   });
-  addDispatchListener?.("reload",reload);
+  addDispatchListener?.("reload", reload);
   return (
     <Select
       style={style}

package/src/components/Select/modal.ts

@@ -1,7 +1,8 @@
 import type { SelectProps } from "antd";
 import type React from "react";
 import type { PromiseFnResult } from "../modal";
-import {argsFn} from "@/components/Form/modal";
+import type { argsFn } from "@/components/Form/modal";
+import type { addFormatItemModal } from "@/components/Form/modal";
 export type OptionType = Record<string, any>;
 export type PartialHSelectProps = Partial<HSelectProps>;
 export type RenderFn = (data: OptionType) => React.ReactNode;
@@ -14,7 +15,8 @@ export interface ModeConfig {
   multiple?: ModeConfigItem;
   tags?: ModeConfigItem;
 }
-export interface HSelectProps extends Omit<SelectProps, "options"> {
+export interface HSelectProps
+  extends Omit<SelectProps, "options" | "placeholder"> {
   style?: React.CSSProperties;
   request?: PromiseFnResult<any, OptionType[]>;
   manual?: boolean;
@@ -25,6 +27,8 @@ export interface HSelectProps extends Omit<SelectProps, "options"> {
   noMatchItemRender?: RenderFn; //没有数据
   allSelect?: boolean; //显示全选
   addDispatchListener?: (key: string, fn: argsFn) => void;
+  addFormat?: (format: Record<string, addFormatItemModal>) => void;
+  placeholder?: string;
 }
 export interface FilterDataModal {
   value: any;

package/src/components/modal.ts

@@ -2,7 +2,10 @@ export interface ValueCheckMapModal {
   checked?: any;
   noChecked?: any;
 }
-export type PromiseFnResult<T = any, R = any> = (params: T) => Promise<R>;
+export type PromiseFnResult<T = any, R = any> = (
+  params: T,
+  formDataValues?: any
+) => Promise<R>;
 export interface ValueSwitchMapModal {
   open?: any;
   close?: any;

package/src/pages/Form/index.tsx

@@ -25,10 +25,11 @@ const formData = (options) => {
       name: "select",
       type: "select",
       itemProps: {
-        request: (params={}) => {
-          const {label="123",value=1}=params;
+        request: (params = {}, values) => {
+          const { label = "123", value = 1 } = params;
           return Promise.resolve([{ label, value }]);
         },
+        showSearch: true,
       },
       rules: [{ required: true }],
     },
@@ -175,15 +176,18 @@ export default () => {
       </HFormConfigProvider>
       <div
         onClick={() => {
-          form.dispatch({
-             name:"select",
-             key:"reload"
-          },{
-             params:{
-               label:"更新",
-               value:2
-             }
-          })
+          form.dispatch(
+            {
+              name: "select",
+              key: "reload",
+            },
+            {
+              params: {
+                label: "更新",
+                value: 2,
+              },
+            }
+          );
         }}
       >
         点我

package/src/pages/Select/index.tsx

@@ -15,7 +15,6 @@ export default () => {
           { name: "测试2", value: 20, userId: 112321 },
         ]}
         placeholder="多选"
-        mode={"multiple"}
         onChange={(val, option) => {
           console.log(val, option);
         }}