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

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, title }: 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>>;

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.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

@@ -2,6 +2,7 @@ import type { SelectProps } from "antd";
 import type React from "react";
 import type { PromiseFnResult } from "../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/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, title }: 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>>;

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.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

@@ -2,6 +2,7 @@ import type { SelectProps } from "antd";
 import type React from "react";
 import type { PromiseFnResult } from "../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-v4",
+  "version": "0.0.4-beta-v5",
   "description": "基于antd二次开发",
   "repository": {
     "type": "git",

package/src/components/DialogForm/ModalForm.tsx

@@ -25,14 +25,14 @@ export default ({
     setModalVisible,
     initValue,
     formParams,
-    title:modalTitle
+    title: modalTitle,
   } = useModifyProps({
     configData,
     visible,
     initialValues,
     dialogForm: currentForm,
     params,
-    title
+    title,
   });
   const cancel = () => {
     if (onCancel) {

package/src/components/DialogForm/hooks.ts

@@ -14,13 +14,13 @@ export const useModifyProps = ({
   dialogForm,
   afterClose,
   params,
-  title
+  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 [modalTitle, setModalTitle] = useState(title);
   const onAfterClose = () => {
     setTimeout(() => {
       dialogForm.resetFields();
@@ -47,7 +47,7 @@ export const useModifyProps = ({
         configData: changeConfigData,
         initialValues: changeInitialValues,
         params: changeParams,
-        title:changeTitle
+        title: changeTitle,
       } = showParams;
       if (!!changeConfigData) {
         setModalFormData(changeConfigData);
@@ -55,7 +55,7 @@ export const useModifyProps = ({
       if (!!changeParams) {
         setFormParams(changeParams);
       }
-      if (!!changeTitle){
+      if (!!changeTitle) {
         setModalTitle(changeTitle);
       }
       setInitValue(changeInitialValues);
@@ -75,7 +75,7 @@ export const useModifyProps = ({
     setInitValue,
     onAfterClose,
     formParams,
-    title:modalTitle
+    title: modalTitle,
   };
 };
 export const useHDialogForm = () => {

package/src/components/DialogForm/modal.ts

@@ -11,7 +11,7 @@ export interface ModifyPropsModal<P = any> {
   dialogForm: HDialogFormInstance;
   afterClose?: VoidFunction;
   params?: P;
-  title?:DialogFormProps["title"];
+  title?: DialogFormProps["title"];
 }
 export interface ShowParamsModal<P = any, T = any> {
   configData?: HItemProps[];
@@ -19,7 +19,7 @@ export interface ShowParamsModal<P = any, T = any> {
   initialValues?: Record<string, any>;
   infoRequest?: PromiseFnResult<P, T>;
   params?: P;
-  title?:DialogFormProps["title"];
+  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,6 +4,7 @@ import type {
   PartialHSelectProps,
 } from "@/components/Select/modal";
 import { useRequest } from "ahooks";
+import { useFormContext } from "../../Form/Context";
 
 interface ParamsModal {
   options?: OptionType[];
@@ -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);
     },

package/src/components/Select/index.tsx

@@ -31,6 +31,7 @@ const Index: React.FC<HSelectProps> = ({
   noMatchItemRender = defaultSelectConfig.noMatchItemRender,
   allSelect,
   addDispatchListener,
+  addFormat,
   ...props
 }) => {
   const { icon, render } = modeConfig?.[mode || ""] || {};

package/src/components/Select/modal.ts

@@ -2,6 +2,7 @@ import type { SelectProps } from "antd";
 import type React from "react";
 import type { PromiseFnResult } from "../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 = {}) => {
+        request: (params = {}, values) => {
           const { label = "123", value = 1 } = params;
           return Promise.resolve([{ label, value }]);
         },
+        showSearch: true,
       },
       rules: [{ required: true }],
     },

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);
         }}