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

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

@@ -17,12 +17,15 @@ export const useOptionReq = ({
   serviceSearch,
   showSearch,
   onSearch: propsOnSearch,
+  dispatch = {},
 }: PartialHSelectProps) => {
+  const { manual: dispatchManual } = dispatch;
   const { form } = useFormContext();
   const [data, setData] = useState<OptionType[] | undefined>();
   const { run, loading, error } = useRequest(
-    async (params = {}, type = "init") => {
-      const formData = form?.getFieldsValue();
+    async (requestParams = {}) => {
+      const { params = {}, values, type = "init" } = requestParams;
+      const formData = values || form?.getFieldsValue();
       if (type === "init") {
         setData(undefined);
       }
@@ -32,28 +35,25 @@ export const useOptionReq = ({
       return Promise.resolve(options);
     },
     {
-      manual,
+      manual: dispatchManual === false ? true : manual,
       debounceInterval: 300,
       onSuccess: (resultData) => {
         setData(resultData);
       },
     }
   );
-  const reload = ({
-    options: changeOpts,
-    params: requestParams,
-  }: ParamsModal) => {
+  const reload = ({ options: changeOpts, params }: ParamsModal) => {
     if (changeOpts) {
       return setData(changeOpts);
     }
-    return run(requestParams);
+    return run({ params });
   };
   const onSearch = (inputValue: string) => {
     if (!serviceSearch) {
       propsOnSearch?.(inputValue);
       return;
     }
-    run({ inputValue });
+    run({ params: { inputValue } });
   };
   useEffect(() => {
     if (options) {

package/src/components/Select/index.tsx

@@ -32,6 +32,7 @@ const Index: React.FC<HSelectProps> = ({
   allSelect,
   addDispatchListener,
   addFormat,
+  dispatch,
   ...props
 }) => {
   const { icon, render } = modeConfig?.[mode || ""] || {};
@@ -54,6 +55,7 @@ const Index: React.FC<HSelectProps> = ({
     serviceSearch,
     showSearch,
     onSearch: propsOnSearch,
+    dispatch,
   }); //options
 
   const data = useChangeOptions({ options: resultData, fieldNames });

package/src/components/Select/modal.ts

@@ -3,6 +3,7 @@ import type React from "react";
 import type { PromiseFnResult } from "../modal";
 import type { argsFn } from "@/components/Form/modal";
 import type { addFormatItemModal } from "@/components/Form/modal";
+import type { DispatchModal } from "@/components/Form/modal";
 export type OptionType = Record<string, any>;
 export type PartialHSelectProps = Partial<HSelectProps>;
 export type RenderFn = (data: OptionType) => React.ReactNode;
@@ -29,6 +30,7 @@ export interface HSelectProps
   addDispatchListener?: (key: string, fn: argsFn) => void;
   addFormat?: (format: Record<string, addFormatItemModal>) => void;
   placeholder?: string;
+  dispatch?: DispatchModal;
 }
 export interface FilterDataModal {
   value: any;

package/src/pages/Form/index.tsx

@@ -24,8 +24,14 @@ const formData = (options) => {
       label: "下拉框",
       name: "select",
       type: "select",
+      dispatch: {
+        fnKey: "reload",
+        dependencies: ["selectInput", "sz"],
+        manual: false,
+      },
       itemProps: {
         request: (params = {}, values) => {
+          console.log(values, "paramsparamsparams");
           const { label = "123", value = 1 } = params;
           return Promise.resolve([{ label, value }]);
         },
@@ -145,11 +151,12 @@ export default () => {
           configData={formData(options)}
           labelWidth={200}
           form={form}
+          initialValues={{}}
           onFinish={(value) => {
             console.log(value);
           }}
           onValuesChange={(val) => {
-            console.log(val);
+            console.log(val, "onValuesChange");
           }}
           infoRequest={() => {
             return new Promise<any>((resolve) => {

package/src/pages/ModalForm/index.tsx

@@ -96,6 +96,25 @@ const data = [
     type: "urlUpload",
     rules: [{ required: true }],
   },
+  {
+    label: "下拉框",
+    name: "select",
+    type: "select",
+    dispatch: {
+      fnKey: "reload",
+      dependencies: ["selectInput", "sz"],
+      manual: false,
+    },
+    itemProps: {
+      request: (params = {}, values) => {
+        console.log(values, "paramsparamsparams");
+        const { label = "123", value = 1 } = params;
+        return Promise.resolve([{ label, value }]);
+      },
+      showSearch: true,
+    },
+    rules: [{ required: true }],
+  },
 ];
 let num = 0;
 export default () => {
@@ -120,17 +139,6 @@ export default () => {
         request={(val, params) => {
           console.log(val, params);
         }}
-        infoRequest={(ppp) => {
-          console.log(ppp);
-          return Promise.resolve({
-            check1: 1,
-            testStart: "1694747960",
-            testEnd: "1693538359",
-            op: 1,
-            opInput: "12121",
-            name: ppp.name,
-          });
-        }}
         dialogForm={modalForm}
         title="测试"
       />