@hw-component/form 0.0.5 → 0.0.6-beta-v1

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

@@ -0,0 +1,87 @@
+import type { IUpLoadProps } from "../modal";
+import type { UploadFile } from "antd/es/upload/interface";
+import type { RcFile } from "antd/lib/upload";
+import { useEffect, useMemo } from "react";
+import type { UploadFileStatus } from "antd/es/upload/interface";
+import type { BeforeUploadFileType } from "rc-upload/lib/interface";
+import { message } from "antd";
+
+interface SubReqParamsModal {
+  request?: (
+    file: Exclude<BeforeUploadFileType, File | boolean> | RcFile
+  ) => Promise<{ url: string }>;
+  file: RcFile;
+}
+interface ResultModal {
+  url: string;
+  status: UploadFileStatus;
+  uid?: string;
+}
+const subReq = async ({
+  request,
+  file,
+}: SubReqParamsModal): Promise<ResultModal> => {
+  if (!request) {
+    return {
+      url: "",
+      status: "done",
+    };
+  }
+  try {
+    const { url } = await request(file);
+    return {
+      url,
+      status: "done",
+    };
+  } catch (err: any) {
+    message.error(err.message);
+    return {
+      url: "",
+      status: "error",
+    };
+  }
+};
+const fileListProvider = (changeFile: ResultModal, files?: UploadFile[]) => {
+  const { status, url, uid } = changeFile;
+  if (status === "error") {
+    return files?.filter((item) => {
+      return item.uid !== uid;
+    });
+  }
+  return files?.map((item) => {
+    const resultUrl = url || item.thumbUrl;
+    if (item.uid === uid) {
+      item.status = status;
+      item.response = { url: resultUrl };
+      return item;
+    }
+    return item;
+  });
+};
+export const useCustomRequest = ({
+  value,
+  request,
+  onChange,
+}: IUpLoadProps) => {
+  const valObj = useMemo(() => {
+    return {
+      value,
+    };
+  }, []);
+
+  useEffect(() => {
+    valObj.value = value;
+  }, [value]); //强制同步避免闭包问题
+
+  const sendFile = async (file: RcFile) => {
+    const { uid } = file;
+    const result = await subReq({ request, file });
+    const fileList = fileListProvider({ ...result, uid }, valObj.value);
+    onChange?.(fileList || []);
+  };
+  return (fileList: UploadFile[]) => {
+    fileList.forEach((item) => {
+      sendFile(item as RcFile);
+    });
+  };
+};

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

@@ -0,0 +1,20 @@
+import { useFormConfigContext } from "../../Form/Context/FormConfigProvider";
+import type { IUpLoadProps } from "../modal";
+
+export const useProps = ({ request, exFiles, maxSize }: IUpLoadProps) => {
+  const configUploadProps = useFormConfigContext("uploadProps");
+  const inputProps = {
+    request,
+    exFiles,
+    maxSize,
+  };
+  const keys = Object.keys(inputProps);
+  const resultProps = { ...configUploadProps };
+  keys.forEach((key) => {
+    if (inputProps[key]) {
+      resultProps[key] = inputProps[key];
+      return;
+    }
+  });
+  return resultProps;
+};

package/src/components/Upload/index.tsx

@@ -0,0 +1,119 @@
+import React, { useImperativeHandle, useMemo, useState } from "react";
+import type { IUpLoadProps, IUploadRefModal } from "./modal";
+import { useProps } from "./hooks/propsMaker";
+import type { IPreviewProps } from "./Preview";
+import Preview from "./Preview";
+import { useChange } from "./hooks/change";
+import { Upload } from "antd";
+import Btn from "./Btn";
+import HFormConnect from "../Form/HFormConnect";
+
+const Index: React.ForwardRefRenderFunction<IUploadRefModal, IUpLoadProps> = (
+  {
+    value = [],
+    onChange,
+    listType = "picture-card",
+    exFiles,
+    maxCount = 1,
+    maxRowNum = 3,
+    onPreview,
+    request,
+    maxSize,
+    addFormat,
+    ...props
+  },
+  ref
+) => {
+  const matchProps = useProps({ request, exFiles, maxSize });
+  const [previewModal, setPreviewModal] = useState<IPreviewProps>({});
+  const change = useChange({
+    ...matchProps,
+    value,
+    maxCount,
+    onChange,
+  });
+  useImperativeHandle(ref, () => {
+    return {
+      change,
+    };
+  });
+  const contentStyle = useMemo(() => {
+    if (listType !== "picture-card") {
+      return {};
+    }
+    return { width: 112 * maxRowNum, maxWidth: "100%" };
+  }, [maxRowNum, listType]);
+
+  const preview = (file) => {
+    if (onPreview) {
+      onPreview(file);
+      return;
+    }
+    setPreviewModal({
+      visible: true,
+      file,
+    });
+  };
+  const maxNum = maxCount === 1 ? maxCount : Number.MAX_VALUE;
+  const { visible, file: previewFile } = previewModal;
+  addFormat?.({
+    float: {
+      inputValue: (item, initValue) => {
+        const { name = "" } = item;
+        const initFileList = initValue[name] || [];
+        const relInitFileList =
+          typeof initFileList === "string" ? [initFileList] : initFileList;
+        const fileList = relInitFileList.map((url, index) => {
+          return {
+            name: url,
+            response: {
+              url,
+            },
+            status: "done",
+            uid: `init-${index}`,
+            thumbUrl: url,
+          };
+        });
+        return {
+          [name]: fileList,
+        };
+      },
+      outputValue: (item, outputValue) => {
+        const { name: valueName = "" } = item;
+        const { [valueName]: itemVal = [] } = outputValue;
+        const urls = itemVal.map((fileItem) => {
+          return fileItem.response.url;
+        });
+        return {
+          [valueName]: maxCount === 1 ? urls[0] : urls,
+        };
+      },
+    },
+  });
+  return (
+    <div style={contentStyle}>
+      <Upload
+        listType={listType}
+        maxCount={maxNum}
+        fileList={value}
+        onPreview={preview}
+        onChange={change}
+        beforeUpload={() => {
+          return false;
+        }}
+        {...props}
+      >
+        <Btn value={value} maxCount={maxCount} listType={listType} />
+      </Upload>
+      <Preview
+        visible={visible}
+        file={previewFile}
+        onCancel={() => {
+          setPreviewModal({});
+        }}
+      />
+    </div>
+  );
+};
+
+export default HFormConnect(React.forwardRef(Index));

package/src/components/Upload/modal.ts

@@ -0,0 +1,33 @@
+import type { UploadProps } from "antd";
+import type { UploadFile } from "antd/es/upload/interface";
+import type { BeforeUploadFileType, RcFile } from "rc-upload/lib/interface";
+import type { UploadChangeParam } from "antd/lib/upload/interface";
+import type { MediaTypeEnum } from "@/components/Upload/enums";
+import type { addFormatItemModal } from "@/components/Form/modal";
+
+export interface IUpLoadProps extends Omit<UploadProps, "onChange"> {
+  exFiles?: string[];
+  request?: (
+    file: Exclude<BeforeUploadFileType, File | boolean> | RcFile
+  ) => Promise<{ url: string }>;
+  errorType?: "alert" | "show";
+  onChange?: (fileList: UploadFile[]) => void;
+  value?: UploadFile[];
+  maxRowNum?: number;
+  maxSize?: number;
+  addFormat?: (config: Record<string, addFormatItemModal>) => void;
+}
+export interface IMediaTypeEleProps {
+  file?: UploadFile;
+  onReady?: VoidFunction;
+  onError?: VoidFunction;
+}
+
+export interface IUploadRefModal {
+  change: (info: UploadChangeParam<UploadFile>) => void;
+}
+
+export interface IUrlUploadProps extends IUpLoadProps {
+  placeholder?: string;
+  mediaType?: MediaTypeEnum;
+}

package/src/components/Upload/util.ts

@@ -0,0 +1,27 @@
+import type { UploadFile } from "antd/es/upload/interface";
+
+export const getFileExt = (file: UploadFile): string => {
+  const { name } = file;
+  const index = name.lastIndexOf(".");
+  return name.substring(index + 1).toUpperCase();
+};
+
+export const checkFileType = (file: UploadFile, exFiles: string[] = []) => {
+  const exName: string = getFileExt(file);
+  return exFiles.indexOf(exName) !== -1;
+};
+
+export const checkFileSize = (file: UploadFile, maxSize = 0) => {
+  const { size = 0 } = file;
+  return size <= maxSize;
+};
+
+export const fileToBase64 = (file: any) => {
+  return new Promise((resolve) => {
+    const reader = new FileReader();
+    reader.readAsDataURL(file?.originFileObj);
+    reader.onload = (e) => {
+      resolve(e.target?.result);
+    };
+  });
+};

package/src/components/config.ts

@@ -1,14 +1,45 @@
-export const baseConfig = {
-  defaultFieldNames: {
+import moment from "moment";
+import type { IFormConfigContextProps } from "./Form/modal";
+import { fileToBase64 } from "./Upload/util";
+export const baseConfig: IFormConfigContextProps = {
+  fieldNames: {
     label: "label",
     value: "value",
   },
-  defaultValueCheckMap: {
-    checked: true,
-    noChecked: false,
+  valueCheckMap: {
+    checked: 1,
+    noChecked: 0,
   },
-  defaultValueSwitchMap: {
-    checked: true,
-    noChecked: false,
+  valueSwitchMap: {
+    open: 1,
+    close: 0,
   },
+  valueRangePickerValueMap: {
+    start: (name) => {
+      return `${name}StartTime`;
+    },
+    end: (name) => {
+      return `${name}EndTime`;
+    },
+  },
+  dateRanges: {
+    最近三天: [moment().subtract(2, "days").startOf("days"), moment()],
+    最近七天: [moment().subtract(6, "days").startOf("days"), moment()],
+    最近三十天: [moment().subtract(29, "days").startOf("days"), moment()],
+  },
+  uploadProps: {
+    exFiles: ["JPG", "PNG", "JPEG", "GIF"],
+    request: async (file: any) => {
+      const url = await fileToBase64(file);
+      return {
+        url,
+      };
+    },
+    maxSize: 1024 * 1024 * 1.8,
+  },
+  defaultComponent: {},
 };
+
+export default {
+  name:"name"
+}

package/src/components/hooks/index.ts

@@ -0,0 +1,53 @@
+import { useContext, useMemo } from "react";
+import type { SelectProps } from "antd";
+import { ConfigContext } from "antd/es/config-provider";
+import type { IFormConfigContextProps } from "../Form/modal";
+import { useFormConfigContext } from "../Form/Context/FormConfigProvider";
+
+interface UseChangeOptionsParams {
+  options?: Record<string, any>[];
+  fieldNames?: SelectProps["fieldNames"];
+}
+export const useChangeOptions = ({
+  options,
+  fieldNames = {},
+}: UseChangeOptionsParams) => {
+  return useMemo(() => {
+    return options?.map((item) => {
+      const { label = "", value = "" } = fieldNames;
+      const { [label]: relLabel, [value]: relVal, ...oItem } = item;
+      return {
+        ...oItem,
+        label: relLabel,
+        value: relVal,
+      };
+    });
+  }, [options]);
+}; //options组装
+
+export const useClassName = (className: string | string[]) => {
+  const config = useContext(ConfigContext);
+  return useMemo(() => {
+    if (Array.isArray(className)) {
+      const classNames = className.map((item) => {
+        return `${config.getPrefixCls()}-${item}`;
+      });
+      return classNames.join(" ");
+    }
+    return `${config.getPrefixCls()}-${className}`;
+  }, [className]);
+};
+
+export const useMatchConfigProps = (matchProps: IFormConfigContextProps) => {
+  const globalConfig = useFormConfigContext();
+  const keys = Object.keys(matchProps);
+  const resultMatchProps: IFormConfigContextProps = {};
+  keys.forEach((key) => {
+    if (!matchProps[key]) {
+      resultMatchProps[key] = globalConfig[key];
+      return;
+    }
+    resultMatchProps[key] = matchProps[key];
+  });
+  return resultMatchProps;
+}; //匹配全局配置

package/src/components/index.tsx

@@ -1,11 +1,30 @@
-export { default as HSelect } from "./Select";
-export { default as HInput } from "./Input";
-export { default as HInputNumber } from "./Input/InputNumber";
-export { default as HSelectInput } from "./Input/SelectInput";
-export { default as HButtonInput } from "./Input/ButtonInput";
-export { default as HCheckboxGroup } from "./CheckboxGroup";
-export { default as HCheckBox } from "./CheckboxGroup/CheckBox";
-export { default as HRadioGroup } from "./RadioGroup";
-export { default as HSwitch } from "./Switch";
-export { default as HDatePicker } from "./DatePicker";
-export { default as HRangePicker } from "./DatePicker/RangePicker";
+import "./styles/index.less";
+import FormConfig from "./Form/config";
+import PageHandler from "./PageHandler";
+export { default as HForm } from "./Form";
+export { default as useHForm } from "./Form/hooks/useHForm";
+export { useHDialogForm } from "./DialogForm/hooks";
+export { default as HFormConnect } from "./Form/HFormConnect";
+export { default as HFormConfigProvider } from "./Form/Context/FormConfigProvider";
+
+import ModalForm from "./DialogForm/ModalForm";
+import DrawerForm from "./DialogForm/DrawerForm";
+export const HSelect = FormConfig.select;
+export const HInput = FormConfig.input;
+export const HSelectInput = FormConfig.selectInput;
+export const HUpload = FormConfig.upload;
+export const HUrlUpload = FormConfig.urlUpload;
+export const HButtonInput = FormConfig.buttonInput;
+export const HCheckBox = FormConfig.checkBox;
+export const HSwitch = FormConfig.switch;
+export const HCheckboxGroup = FormConfig.checkboxGroup;
+export const HDatePicker = FormConfig.datePicker;
+export const HRangePicker = FormConfig.rangePicker.Component;
+export const HRadioGroup = FormConfig.radioGroup;
+export const HTimePicker = FormConfig.timePicker;
+export const HInputNumber = FormConfig.inputNumber;
+export const HPageHandler = PageHandler;
+export const HTextArea = FormConfig.textArea;
+export const HColorInput = FormConfig.colorInput;
+export const HModalForm = ModalForm;
+export const HDrawerForm = DrawerForm;

package/src/components/modal.ts

@@ -0,0 +1,20 @@
+export interface ValueCheckMapModal {
+  checked?: any;
+  noChecked?: any;
+}
+export type PromiseFnResult<T = any, R = any> = (
+  params: T,
+  formDataValues?: any
+) => Promise<R>;
+export interface ValueSwitchMapModal {
+  open?: any;
+  close?: any;
+}
+export interface DataFnProvider<P = any, R = any> {
+  (name: P): R;
+}
+
+export interface DateRangePickerValueMapModal {
+  start?: string | DataFnProvider<string, string>;
+  end?: string | DataFnProvider<string, string>;
+}

package/src/components/styles/index.less

@@ -1 +1,3 @@
-@import "../Select/index.less";
+@import "../Select/index.less";
+@import "../Form/index.less";
+@import "../Input/ColorInput/index.less";

package/src/components/styles/local.less

@@ -1 +1 @@
-@ant-prefix:ant;
+@ant-prefix: ant;

package/src/components/typings.d.ts

@@ -9,8 +9,3 @@ declare module "*.jpeg";
 declare module "*.gif";
 declare module "*.bmp";
 declare module "*.tiff";
-type PromiseFnResult<T = any, R = any> = (params: T) => Promise<R>;
-interface ValueCheckMapModal {
-  checked?: any;
-  noChecked?: any;
-}

package/src/pages/Checkbox/index.tsx

@@ -4,12 +4,11 @@ export default () => {
   return (
     <Space size={"large"} direction={"vertical"} style={{ width: "100%" }}>
       <HCheckboxGroup
-        options={[{ label: "测试", value: "uu" }]}
+        options={[
+          { label: "测试", value: "uu" },
+          { label: "测试1", value: "uu1" },
+        ]}
         value={{ uu: 0 }}
-        onChange={(value) => {
-          console.log(value);
-        }}
-        valueCheckMap={{ checked: 1, noChecked: 0 }}
       />
     </Space>
   );

package/src/pages/DatePicker/index.tsx

@@ -1,6 +1,11 @@
 import { Space } from "antd";
-import { HDatePicker, HRangePicker } from "../../components";
+import { HDatePicker, HRangePicker, HTimePicker } from "../../components";
+import { useState } from "react";
 export default () => {
+  const [timeVal, setTimeVal] = useState({
+    start: 1692070068,
+    end: 1692242868,
+  });
   return (
     <Space size={"large"} direction={"vertical"} style={{ width: "100%" }}>
       <HDatePicker
@@ -9,7 +14,20 @@ export default () => {
           console.log(val);
         }}
       />
-      <HRangePicker />
+      <HRangePicker
+        value={timeVal}
+        valueMap={{ start: "start", end: "end" }}
+        onChange={(val) => {
+          console.log(val);
+          setTimeVal(val);
+        }}
+      />
+      <HTimePicker
+        value={55135}
+        onChange={(val) => {
+          console.log(val);
+        }}
+      />
     </Space>
   );
 };

package/src/pages/DrawerForm/index.tsx

@@ -0,0 +1,127 @@
+import { Button } from "antd";
+import { HDrawerForm, useHDialogForm } from "../../components";
+const data = [
+  {
+    label: "输入框",
+    name: "name",
+    rules: [
+      () => {
+        return {
+          required: true,
+        };
+      },
+    ],
+  },
+  {
+    label: "数字",
+    name: "sz",
+    type: "inputNumber",
+    rules: [{ required: true }],
+  },
+  {
+    label: "下拉输入框",
+    name: "selectInput",
+    type: "selectInput",
+    rules: [{ required: true }],
+    itemProps: {
+      valueName: {
+        select: "op",
+        input: "opInput",
+      },
+      selectProps: {
+        options: [{ label: "测试", value: 1 }],
+      },
+    },
+  },
+  {
+    label: "按钮输入框",
+    name: "buttonInput",
+    type: "buttonInput",
+    children: "点击",
+    rules: [{ required: true }],
+  },
+  {
+    label: "选择",
+    name: "checkboxGroup",
+    type: "checkboxGroup",
+    rules: [{ required: true }],
+    helper: "帮助我",
+    options: [
+      { label: "选择1", value: "check1" },
+      { label: "选择2", value: "check2" },
+    ],
+  },
+  {
+    label: "开关",
+    name: "switch",
+    type: "switch",
+    rules: [{ required: true }],
+  },
+  {
+    label: "时间",
+    name: "datePicker",
+    type: "datePicker",
+    hover: "时间选择",
+    helper: "帮助我",
+    rules: [{ required: true }],
+  },
+  {
+    label: "时间段",
+    name: "rangePicker",
+    type: "rangePicker",
+    helper: "帮助我",
+    rules: [{ required: true }],
+    itemProps: {
+      valueMap: {
+        start: "testStart",
+        end: "testEnd",
+      },
+    },
+  },
+  {
+    label: "时分秒",
+    name: "timePicker",
+    type: "timePicker",
+    rules: [{ required: true }],
+  },
+  {
+    label: "文件",
+    name: "upload",
+    type: "upload",
+    rules: [{ required: true }],
+  },
+  {
+    label: "地址文件",
+    name: "urlUpload",
+    type: "urlUpload",
+    rules: [{ required: true }],
+  },
+];
+export default () => {
+  const modalForm = useHDialogForm();
+  return (
+    <>
+      <Button
+        onClick={() => {
+          modalForm.show({
+            initialValues: {
+              check1: 1,
+              testStart: "1694747960",
+              testEnd: "1693538359",
+              op: 1,
+              opInput: "12121",
+            },
+          });
+        }}
+      >
+        打开
+      </Button>
+      <HDrawerForm
+        configData={data}
+        labelWidth={88}
+        modalForm={modalForm}
+        title="测试"
+      />
+    </>
+  );
+};