@hw-component/form 1.6.2 → 1.6.4

package/src/components/Select/modal.ts

@@ -2,8 +2,8 @@ import type { SelectProps } from "antd";
 import type React from "react";
 import type { PromiseFnResult } from "../modal";
 import type { addFormatItemModal, argsFn, DispatchModal } from "../Form/modal";
+
 export type OptionType = Record<string, any>;
-export type PartialHSelectProps = Partial<HSelectProps>;
 export type RenderFn = (data: OptionType) => React.ReactNode;
 
 interface ModeConfigItem {
@@ -15,10 +15,20 @@ export interface ModeConfig {
   tags?: ModeConfigItem;
 }
 type FilterProviderFn = (item: any) => string;
+type OptionsListType = OptionType[];
+export interface OptionsPageResultModal {
+  page: number;
+  size: number;
+  data: OptionsListType;
+  total:number;
+}
+export type OptionsDataType =
+  | OptionsListType
+  | OptionsPageResultModal
 export interface HSelectProps
   extends Omit<SelectProps, "options" | "placeholder"> {
   style?: React.CSSProperties;
-  request?: PromiseFnResult<any, OptionType[]>;
+  request?: PromiseFnResult<any, OptionsDataType>;
   manual?: boolean;
   modeConfig?: ModeConfig;
   filterProvider?: FilterProviderFn | string; //筛选字段默认为label
@@ -30,8 +40,10 @@ export interface HSelectProps
   addFormat?: (format: Record<string, addFormatItemModal>) => void;
   placeholder?: string;
   dispatch?: DispatchModal;
+  isList?:boolean
 }
 export interface FilterDataModal {
   value: any;
   index: number;
 }
+export type PartialHSelectProps = Partial<HSelectProps>;

package/src/components/Submit/components.tsx

@@ -7,9 +7,13 @@ import type {
 } from "@/components/Submit/index";
 interface ControlFooterProps extends ISubmitProps {
   action: SubmitBarExtraType;
-  style?:React.CSSProperties
+  style?: React.CSSProperties;
 }
-function ResetBtn({ form, style={borderRadius:4},...props }:Omit<ControlFooterProps, 'action'>) {
+function ResetBtn({
+  form,
+  style = { borderRadius: 4 },
+  ...props
+}: Omit<ControlFooterProps, "action">) {
   return (
     <Button
       {...props}
@@ -28,7 +32,7 @@ function SubBtn({
   form,
   text = "提交",
   loading,
-  style={borderRadius:4},
+  style = { borderRadius: 4 },
   ...props
 }: ISubmitProps) {
   const { loading: formSubLoading = loading } = useFormContext();

package/src/components/Upload/hooks/customRequest.ts

@@ -9,14 +9,14 @@ import { message } from "antd";
 interface SubReqParamsModal {
   request?: (
     file: Exclude<BeforeUploadFileType, File | boolean> | RcFile
-  ) => Promise<{ url: string ,thumbUrl?:string}>;
+  ) => Promise<{ url: string; thumbUrl?: string }>;
   file: RcFile;
 }
 interface ResultModal {
   url: string;
   status: UploadFileStatus;
   uid?: string;
-  thumbUrl?:string;
+  thumbUrl?: string;
 }
 const subReq = async ({
   request,
@@ -29,7 +29,7 @@ const subReq = async ({
     };
   }
   try {
-    const { url ,thumbUrl} = await request(file);
+    const { url, thumbUrl } = await request(file);
     return {
       url,
       thumbUrl,
@@ -44,19 +44,19 @@ const subReq = async ({
   }
 };
 const fileListProvider = (changeFile: ResultModal, files?: UploadFile[]) => {
-  const { status, url, uid,thumbUrl } = changeFile;
+  const { status, url, uid, thumbUrl } = changeFile;
   if (status === "error") {
     return files?.filter((item) => {
       return item.uid !== uid;
     });
   }
   return files?.map((item) => {
-    const fileDefaultThumbUrl=item.thumbUrl||thumbUrl;
+    const fileDefaultThumbUrl = item.thumbUrl || thumbUrl;
     const resultUrl = url || item.thumbUrl;
     if (item.uid === uid) {
       item.status = status;
       item.response = { url: resultUrl };
-      item.thumbUrl=fileDefaultThumbUrl;
+      item.thumbUrl = fileDefaultThumbUrl;
       return item;
     }
     return item;

package/src/pages/DrawerForm/index.tsx

@@ -19,12 +19,12 @@ const data = [
     type: "select",
     helper: "select",
     itemProps: {
-       mode:"tags",
-       options:[
-         { label: "选择1", value: 0 },
-         { label: "选择2", value: 1 },
-       ]
-    }
+      mode: "tags",
+      options: [
+        { label: "选择1", value: 0 },
+        { label: "选择2", value: 1 },
+      ],
+    },
   },
   {
     label: "地址文件",
@@ -85,9 +85,9 @@ export default () => {
       <Button
         onClick={() => {
           modalForm.show({
-            initialValues:{
-              select:null
-            }
+            initialValues: {
+              select: null,
+            },
           });
         }}
       >

package/src/pages/Form/index.tsx

@@ -24,16 +24,6 @@ const Test3 = ({ value, onChange }) => {
   );
 };
 const formData = (options) => {
-  const op = [
-    {
-      key: 1,
-      value: "是",
-    },
-    {
-      key: 0,
-      value: "否",
-    },
-  ];
   return [
     {
       label: "12321",
@@ -45,29 +35,32 @@ const formData = (options) => {
       },
     },
     {
-      label: "测试12312",
+      label: "下拉",
       className: "hdjd",
       type: "select",
       name: "test321",
-        itemProps: {
-          options:[{
-              value:"选项1",
-              key:1
-          },{
-              value:"选项2",
-              key:2
-          }],
-            showSearch:true
-        }
-    },
-      {
-          label: "测试12312",
-          className: "hdjd",
-          name: "test123",
-      },
-      {
-         type: "submit"
+      itemProps: {
+        options: [
+          {
+            value: "选项1",
+            key: 1,
+          },
+          {
+            value: "选项2",
+            key: 2,
+          },
+        ],
+        showSearch: true,
       },
+    },
+    {
+      label: "测试12312",
+      className: "hdjd",
+      name: "test123",
+    },
+    {
+      type: "submit",
+    },
   ];
 };
 function Ttta({ form }) {

package/src/pages/Select/index.tsx

@@ -1,5 +1,5 @@
 import { HSelect } from "../../components";
-import { Space } from "antd";
+import {Space} from "antd";
 import { useState } from "react";
 export default () => {
   const [selectVal, setSelectVal] = useState(null);
@@ -7,7 +7,7 @@ export default () => {
     <Space size={"large"} direction={"vertical"} style={{ width: "100%" }}>
       <HSelect
         options={[{ label: "测试", value: 1 }]}
-        value={100}
+        value={1}
         placeholder="基础"
         allowClear={true}
       />
@@ -18,7 +18,7 @@ export default () => {
           { name: "测试2", value: 20, userId: 112321 },
         ]}
         placeholder="多选"
-        value={selectVal}
+        value={[10,20]}
         onChange={(val, option) => {
           setSelectVal(val);
         }}
@@ -37,6 +37,28 @@ export default () => {
           { label: "测试2", value: 20 },
         ]}
       />
+        <HSelect
+            placeholder="分页"
+            serviceSearch
+            allowClear={true}
+            labelInValue
+            mode="multiple"
+            value={["21321312"]}
+            request={(params)=>{
+               const {page,size}=params
+               const op=[];
+               for (let i=0;i<size;i+=1){
+                   op.push( { label: `第${page}页第${i}条`, value:i+page })
+               }
+               return {
+                   page,
+                   size:100,
+                   total:1000,
+                   data:op
+               }
+            }}
+            isList
+        />
       <HSelect
         serviceSearch={true}
         request={(params) => {

package/src/pages/Upload/index.tsx

@@ -6,21 +6,24 @@ import { MediaTypeEnum } from "../../components/Upload/enums";
 export default () => {
   const [files, setFiles] = useState([]);
   const [files1, setFiles1] = useState([]);
-  console.log(files)
+  console.log(files);
   return (
     <Space size={"large"} direction={"vertical"} style={{ width: "100%" }}>
-      <HUpload exFiles={null}
-               value={files}
-               request={()=>{
-                   return {
-                       url:"https://inews.gtimg.com/om_bt/OGlQWfsaAoKkuCcMZ2o9IVEPqd-72DQy5EAN02XBHUwfYAA/641",
-                       thumbUrl:"https://inews.gtimg.com/om_bt/OGlQWfsaAoKkuCcMZ2o9IVEPqd-72DQy5EAN02XBHUwfYAA/641"
-                   }
-               }}
-               onChange={setFiles}
-               multiple={true}
-               maxCount={3}
-               maxSize={Number.MAX_SAFE_INTEGER}/>
+      <HUpload
+        exFiles={null}
+        value={files}
+        request={() => {
+          return {
+            url: "https://inews.gtimg.com/om_bt/OGlQWfsaAoKkuCcMZ2o9IVEPqd-72DQy5EAN02XBHUwfYAA/641",
+            thumbUrl:
+              "https://inews.gtimg.com/om_bt/OGlQWfsaAoKkuCcMZ2o9IVEPqd-72DQy5EAN02XBHUwfYAA/641",
+          };
+        }}
+        onChange={setFiles}
+        multiple={true}
+        maxCount={3}
+        maxSize={Number.MAX_SAFE_INTEGER}
+      />
       <HUrlUpload
         value={files1}
         mediaType={MediaTypeEnum.file}