@hw-component/form 0.0.3 → 0.0.4-beta-v1

package/src/components/Select/hooks/changeHooks.tsx

@@ -5,7 +5,6 @@ import type {
 import { useEffect, useState } from "react";
 import type { FilterDataModal } from "@/components/Select/modal";
 import { itemOpProvider } from "../utils";
-import { baseConfig } from "../../config";
 
 const single = ({ options, value, noMatchItemRender }: PartialHSelectProps) => {
   const newOptions = options || [];
@@ -117,7 +116,7 @@ export const useValueChange = (params: PartialHSelectProps) => {
     options,
     mode,
     noMatchItemRender,
-    fieldNames = baseConfig.defaultFieldNames,
+    fieldNames = {},
   } = params;
   const [val, setVal] = useState<any>();
 
@@ -139,6 +138,10 @@ export const useValueChange = (params: PartialHSelectProps) => {
     onChange(newChangeVal, subItemOps);
   };
   useEffect(() => {
+    if (mode === "tags") {
+      setVal(value);
+      return;
+    }
     if (options && value) {
       setVal((oldVale) => {
         return matchNotFind(params, oldVale);

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

@@ -10,6 +10,8 @@ export const useOptionReq = ({
   request,
   options,
   serviceSearch,
+  showSearch,
+  onSearch: propsOnSearch,
 }: PartialHSelectProps) => {
   const [data, setData] = useState<OptionType[] | undefined>();
   const { run, loading, error } = useRequest(
@@ -32,16 +34,19 @@ export const useOptionReq = ({
   );
   const onSearch = (inputValue: string) => {
     if (!serviceSearch) {
+      propsOnSearch?.(inputValue);
       return;
     }
     run({ inputValue });
   };
+  const mathShowSearch = showSearch || serviceSearch;
   return {
     run,
     loading,
     error,
     data,
-    onSearch,
+    onSearch: mathShowSearch ? onSearch : propsOnSearch,
+    mathShowSearch: showSearch || serviceSearch,
   };
 };
 

package/src/components/Select/index.less

@@ -1,6 +1,22 @@
-@import url("../config.less");
-.@{hw-prefix}-option {
-  &:hover {
-    background-color: #f5f5f5;
+@import "../styles/local.less";
+@all-check-box: ~"@{ant-prefix}-hw-all-check-box";
+
+.@{all-check-box} {
+  .@{ant-prefix}-select-item-option-active:not(
+      .@{ant-prefix}-select-item-option-disabled
+    ) {
+    background-color: transparent;
+  }
+  .@{ant-prefix}-select-item-option-selected:not(
+      .@{ant-prefix}-select-item-option-disabled
+    ) {
+    background-color: #e6f7ff;
+  }
+  .@{ant-prefix}-select-item-option:not(
+      .@{ant-prefix}-select-item-option-selected
+    ) {
+    &:hover {
+      background-color: #f5f5f5;
+    }
   }
 }

package/src/components/Select/index.tsx

@@ -6,7 +6,7 @@ import type { HSelectProps } from "./modal";
 import { defaultModeConfig, defaultSelectConfig } from "./defaultConfig";
 import DropdownComponent from "./components/DropdownComponent";
 import AllSelect from "./components/AllSelect";
-import { useChangeOptions } from "../hooks/useChangeOptions";
+import { useChangeOptions, useMatchConfigProps } from "../hooks";
 const { Option } = Select;
 
 export default ({
@@ -16,12 +16,12 @@ export default ({
   modeConfig = defaultModeConfig,
   value,
   onChange,
-  fieldNames,
+  fieldNames: propsFieldNames,
   request,
   manual,
   optionLabelProp = "label",
   filterProvider,
-  optionFilterProp = "filterlabel",
+  optionFilterProp = "filterLabel",
   serviceSearch,
   onSearch: propsOnSearch,
   filterOption,
@@ -32,6 +32,8 @@ export default ({
   ...props
 }: HSelectProps) => {
   const { icon, render } = modeConfig?.[mode || ""] || {};
+  const { fieldNames } = useMatchConfigProps({ fieldNames: propsFieldNames });
+
   const selfFilterOption = useFilterOption({ filterOption, serviceSearch });
   const {
     run,
@@ -39,13 +41,17 @@ export default ({
     data: resultData,
     error,
     onSearch,
+    mathShowSearch,
   } = useOptionReq({
     options,
     manual,
     fieldNames,
     request,
     serviceSearch,
+    showSearch,
+    onSearch: propsOnSearch,
   }); //options
+
   const data = useChangeOptions({ options: resultData, fieldNames });
   const { val, change } = useValueChange({
     labelInValue,
@@ -56,13 +62,14 @@ export default ({
     noMatchItemRender,
     fieldNames,
   });
+
   return (
     <Select
       style={style}
       mode={mode}
       loading={loading}
       value={val}
-      onSearch={propsOnSearch || onSearch}
+      onSearch={onSearch}
       onChange={change}
       dropdownRender={(node) => {
         return (
@@ -78,8 +85,9 @@ export default ({
               mode={mode}
               value={val}
               onChange={change}
-            />
-            {node}
+            >
+              {node}
+            </AllSelect>
           </DropdownComponent> //全选
         );
       }}
@@ -87,21 +95,21 @@ export default ({
       menuItemSelectedIcon={icon}
       optionFilterProp={optionFilterProp}
       filterOption={selfFilterOption}
-      showSearch={showSearch}
+      showSearch={mathShowSearch}
       labelInValue={true}
       {...props}
     >
       {data?.map((item) => {
         const { value: optionValue, label } = item;
         const result = filterProvider?.(item) || label;
-        const filer = { [optionFilterProp]: result };
+        const filter = { [optionFilterProp]: result };
         return (
           <Option
             value={optionValue}
             key={optionValue}
             label={label}
             mode={mode}
-            {...filer}
+            {...filter}
           >
             {render ? render(item, val) : label}
           </Option>

package/src/components/Select/modal.ts

@@ -1,12 +1,13 @@
 import type { SelectProps } from "antd";
 import type React from "react";
-
+import type { PromiseFnResult } from "../modal";
 export type OptionType = Record<string, any>;
 export type PartialHSelectProps = Partial<HSelectProps>;
 export type RenderFn = (data: OptionType) => React.ReactNode;
+
 interface ModeConfigItem {
-  icon?: React.ReactNode | null;
-  render?: (item: OptionType, value: any[]) => React.ReactNode;
+  icon?: React.ReactNode | null; //自定义多选时当前选中的条目图标
+  render?: (item: OptionType, value: any[]) => React.ReactNode; //options内容
 }
 export interface ModeConfig {
   multiple?: ModeConfigItem;
@@ -17,11 +18,11 @@ export interface HSelectProps extends Omit<SelectProps, "options"> {
   request?: PromiseFnResult<any, OptionType[]>;
   manual?: boolean;
   modeConfig?: ModeConfig;
-  filterProvider?: (item: any) => string;
-  serviceSearch?: boolean;
+  filterProvider?: (item: any) => string; //筛选字段默认为label
+  serviceSearch?: boolean; //服务端搜索
   options?: OptionType[];
-  noMatchItemRender?: RenderFn;
-  allSelect?: boolean;
+  noMatchItemRender?: RenderFn; //没有数据
+  allSelect?: boolean; //显示全选
 }
 export interface FilterDataModal {
   value: any;

package/src/components/Submit/index.tsx

@@ -0,0 +1,46 @@
+import { Button, Row, Space } from "antd";
+import React from "react";
+import { useFormContext } from "../Form/Context";
+import type { ButtonProps, FormInstance } from "antd/es";
+
+export interface ISubmitProps extends Omit<ButtonProps, "form"> {
+  text?: string;
+  form: FormInstance;
+  reset?: boolean;
+  position?: "start" | "end";
+}
+export default ({
+  text = "提交",
+  type = "primary",
+  form,
+  loading,
+  position = "start",
+  reset,
+  ...props
+}: ISubmitProps) => {
+  const { loading: formSubLoading = loading } = useFormContext();
+  return (
+    <Row justify={position} style={{ width: "100%" }}>
+      <Space>
+        {reset && (
+          <Button
+            {...props}
+            onClick={() => {
+              form.resetFields();
+            }}
+          >
+            重制
+          </Button>
+        )}
+        <Button
+          {...props}
+          type={type}
+          onClick={form.submit}
+          loading={formSubLoading}
+        >
+          {text}
+        </Button>
+      </Space>
+    </Row>
+  );
+};

package/src/components/Switch/index.tsx

@@ -1,31 +1,36 @@
 import type { SwitchProps } from "antd";
 import { Space, Switch } from "antd";
 import React, { useMemo } from "react";
-import { baseConfig } from "../config";
-interface IProps extends Omit<SwitchProps, "onChange"> {
-  valueCheckMap?: ValueCheckMapModal;
+import { useMatchConfigProps } from "../hooks";
+import type { ValueSwitchMapModal } from "../modal";
+
+export interface HSwitchProps extends Omit<SwitchProps, "onChange"> {
+  valueMap?: ValueSwitchMapModal;
   value?: any;
   onChange?: (val: any) => void;
   beforeText?: React.ReactNode;
 }
-const Index: React.FC<IProps> = ({
+const Index: React.FC<HSwitchProps> = ({
   value,
   onChange,
-  valueCheckMap = baseConfig.defaultValueSwitchMap,
+  valueMap: propsValueSwitchMap,
   children,
   unCheckedChildren = "关闭",
   checkedChildren = "开启",
   beforeText,
   ...props
 }) => {
+  const { valueSwitchMap = {} } = useMatchConfigProps({
+    valueSwitchMap: propsValueSwitchMap,
+  });
   const swChecked = useMemo(() => {
-    const { checked } = valueCheckMap;
-    return value === checked;
+    const { open } = valueSwitchMap;
+    return value === open;
   }, [value]);
   const change = (checked) => {
-    let subVal = valueCheckMap?.noChecked;
+    let subVal = valueSwitchMap.close;
     if (checked) {
-      subVal = valueCheckMap?.checked;
+      subVal = valueSwitchMap.open;
     }
     onChange?.(subVal);
   };

package/src/components/TDPicker/RangePicker.tsx

@@ -0,0 +1,109 @@
+import { DatePicker } from "antd";
+import type { HRangePickerProps } from "./modal";
+import {
+  useGetTimeKey,
+  useRangePickerTimeVal,
+  useRangeValueProvider,
+} from "./hooks";
+import React, { useMemo } from "react";
+import type { RangePickerProps } from "antd/es/date-picker";
+import { useMatchConfigProps } from "../hooks";
+import type { HItemProps } from "../Form/modal";
+import HFormConnect from "../Form/HFormConnect";
+
+const RangePicker = DatePicker.RangePicker as any;
+
+const HRangePicker: React.FC<HRangePickerProps> = ({
+  value,
+  onChange,
+  showTime = true,
+  format = "X",
+  valueMap,
+  ranges = true,
+  name,
+  addFormat,
+  disabledDate,
+  ...props
+}) => {
+  const { valueRangePickerValueMap = {}, dateRanges } = useMatchConfigProps({
+    valueRangePickerValueMap: valueMap,
+    dateRanges: undefined,
+  });
+  const dateMapKeys = useGetTimeKey({
+    valueMap: valueRangePickerValueMap,
+    name,
+  });
+  const paramsProvider = useRangeValueProvider({ valueMap: dateMapKeys });
+  const timeVal = useRangePickerTimeVal({
+    value,
+    format,
+    valueMap: dateMapKeys,
+  });
+  const defaultRanges = useMemo(() => {
+    if (!ranges) {
+      return null;
+    }
+    if (ranges === true) {
+      return dateRanges;
+    }
+    return ranges;
+  }, [ranges]); //默认
+  addFormat?.({
+    float: {
+      inputValue: (item, initValue) => {
+        const { name: valueName = "" } = item;
+        const resultObj = {};
+        Object.values(dateMapKeys).forEach((key) => {
+          if (initValue[key]) {
+            resultObj[key] = initValue[key];
+          }
+        });
+        const hasKeys = Object.keys(resultObj).length !== 0;
+        return {
+          [valueName]: hasKeys ? resultObj : null,
+        };
+      },
+      outputValue: (item, outputValue) => {
+        const { name: valueName = "" } = item;
+        const { [valueName]: itemVal = {} } = outputValue;
+        return {
+          ...itemVal,
+        };
+      },
+    },
+  });
+
+  const change = (val) => {
+    if (!format || !val) {
+      onChange?.(val);
+      return;
+    }
+    const subVal = val.map((item) => {
+      return item?.format(format) || null;
+    });
+    onChange?.(paramsProvider(subVal));
+  };
+  return (
+    <RangePicker
+      value={timeVal}
+      onChange={change}
+      showTime={showTime}
+      onCalendarChange={change}
+      ranges={defaultRanges as RangePickerProps["ranges"]}
+      disabledDate={(currentDate) => {
+        return !!disabledDate?.(currentDate, timeVal);
+      }}
+      {...props}
+    />
+  );
+};
+const Index = HFormConnect(HRangePicker);
+export default {
+  Component: Index,
+  placeholder: ({ label }: HItemProps) => {
+    return [`请选择开始${label}`, `请选择结束${label}`];
+  },
+  requiredErrMsg: ({ label }: HItemProps) => {
+    return `请选择${label}`;
+  },
+};

package/src/components/TDPicker/TimePicker.tsx

@@ -0,0 +1,25 @@
+import { TimePicker } from "antd";
+import type { HTimePickerProps } from "./modal";
+import { useTimePickerChange, useTimePickerValue } from "./hooks";
+
+export default ({
+  value,
+  format = "X",
+  onChange,
+  disabledDate,
+  ...props
+}: HTimePickerProps) => {
+  const timeVal = useTimePickerValue({ value, format });
+  const change = useTimePickerChange({ value, format, onChange });
+
+  return (
+    <TimePicker
+      value={timeVal}
+      onChange={change}
+      disabledDate={(currentDate) => {
+        return !!disabledDate?.(currentDate, timeVal);
+      }}
+      {...props}
+    />
+  );
+};

package/src/components/TDPicker/hooks.ts

@@ -0,0 +1,150 @@
+import { useCallback, useMemo } from "react";
+import type { Moment, DurationInputArg2 } from "moment";
+import moment from "moment";
+import type { HRangePickerProps } from "./modal";
+import type { DateRangePickerValueMapModal } from "../modal";
+
+interface UseTimeValParams {
+  value?: any | [any, any];
+  format?: string;
+  valueMap?: DateRangePickerValueMapModal;
+}
+
+interface UseTimePickerValParams {
+  value?: any;
+  format?: string | DurationInputArg2;
+}
+interface UseTimeChangeParams {
+  format?: string;
+  onChange?: (time?: Moment | string | number) => void;
+  value?: any;
+}
+export const useTimeVal = ({ value, format }: UseTimeValParams) => {
+  return useMemo(() => {
+    if (!value || !format) {
+      return value;
+    }
+    return moment(value, format);
+  }, [value, format]);
+}; //单个时间
+
+export const useGetTimeKey = ({
+  valueMap = {},
+  name = "",
+}: HRangePickerProps) => {
+  const { start, end } = valueMap;
+  if (!start || !end) {
+    return {};
+  }
+  const startKey = typeof start === "string" ? start : start(name);
+  const endKey = typeof end === "string" ? end : end(name);
+  return {
+    start: startKey,
+    end: endKey,
+  };
+}; //构建格式
+export const useTimeChange = ({ format, onChange }: UseTimeChangeParams) => {
+  return useCallback(
+    (value) => {
+      if (!format) {
+        onChange?.(value);
+        return;
+      }
+      const subVal = value?.format(format);
+      onChange?.(subVal);
+    },
+    [format, onChange]
+  );
+}; //时间
+
+const formatMap = {
+  X: "s",
+  x: "ms",
+};
+export const useTimePickerValue = ({
+  value,
+  format,
+}: UseTimePickerValParams) => {
+  return useMemo(() => {
+    if (!value || !format) {
+      return value;
+    }
+    if (formatMap[format]) {
+      const timeStr = moment()
+        .startOf("days")
+        .add(value, formatMap[format] as DurationInputArg2)
+        .format("HH:mm:ss");
+      return moment(timeStr, "HH:mm:ss");
+    }
+    return moment(value, format);
+  }, [value, format]);
+}; //区间选择
+
+export const useTimePickerChange = ({
+  value,
+  format,
+  onChange,
+}: UseTimeChangeParams) => {
+  return useCallback(
+    (val) => {
+      if (!format || !val) {
+        onChange?.(val);
+        return;
+      }
+      if (formatMap[format]) {
+        const startTime = moment().startOf("days").format(format) as any;
+        const nowTime = val.format(format);
+        onChange?.(nowTime - startTime);
+        return;
+      }
+      const subVal = val?.format(format);
+      onChange?.(subVal);
+    },
+    [format, onChange, value]
+  );
+}; //时分秒
+
+export const useRangeValueProvider = ({ valueMap = {} }: HRangePickerProps) => {
+  return (val: any[]) => {
+    const { start, end } = valueMap;
+    if (!start || !end) {
+      return val;
+    }
+    return {
+      [start as string]: val[0],
+      [end as string]: val[1],
+    };
+  };
+}; //格式转化
+
+export const useRangePickerTimeVal = ({
+  value,
+  format,
+  valueMap = {},
+}: UseTimeValParams) => {
+  return useMemo(() => {
+    if (!value || !format) {
+      return value;
+    }
+    if (!Array.isArray(value)) {
+      const { start, end } = valueMap;
+      if (!start || !end) {
+        console.error("日期value格式错误!");
+        return;
+      }
+      const { [start as string]: startTime, [end as string]: endTime } = value;
+      if (!startTime && !endTime) {
+        return [];
+      }
+      const startMoment = startTime && moment(startTime, format);
+      const endMoment = endTime && moment(endTime, format);
+      return [startMoment, endMoment];
+    }
+    return value.map((item) => {
+      if (!item) {
+        return item;
+      }
+      return moment(item, format);
+    });
+  }, [value, format, valueMap]);
+}; //初始化时间格式转化

package/src/components/TDPicker/index.tsx

@@ -0,0 +1,28 @@
+import { DatePicker } from "antd";
+import type { HDatePickerProps } from "./modal";
+import { useTimeChange, useTimeVal } from "./hooks";
+import React from "react";
+const Picker = DatePicker as any;
+const Index: React.FC<HDatePickerProps> = ({
+  value,
+  onChange,
+  showTime = true,
+  format = "X",
+  disabledDate,
+  ...props
+}) => {
+  const timeVal = useTimeVal({ value, format });
+  const change = useTimeChange({ format, onChange });
+  return (
+    <Picker
+      value={timeVal}
+      onChange={change}
+      showTime={showTime}
+      disabledDate={(currentDate) => {
+        return !!disabledDate?.(currentDate, timeVal);
+      }}
+      {...props}
+    />
+  );
+};
+export default Index;

package/src/components/TDPicker/modal.ts

@@ -0,0 +1,46 @@
+import type { RangePickerProps } from "antd/es/date-picker";
+import type { SharedTimeProps } from "rc-picker/lib/panels/TimePanel";
+import type { Moment } from "moment";
+import type { DatePickerProps } from "antd";
+import type { TimePickerProps } from "antd";
+import type { DurationInputArg2 } from "moment";
+import type { DateRangePickerValueMapModal } from "../modal";
+import type { addFormatItemModal } from "@/components/Form/modal";
+interface DisabledDateFnModal<T = Moment | undefined> {
+  (currentDate: Moment, value: T): boolean;
+}
+
+export interface HDatePickerProps
+  extends Omit<
+    DatePickerProps,
+    "onChange" | "format" | "ranges" | "disabledDate"
+  > {
+  onChange?: (time?: Moment | string | number) => void;
+  format?: string;
+  showTime?: boolean | SharedTimeProps<Moment>;
+  disabledDate?: DisabledDateFnModal;
+}
+export interface HRangePickerProps
+  extends Omit<
+    RangePickerProps,
+    "onChange" | "format" | "ranges" | "value" | "disabledDate"
+  > {
+  value?: [any, any] | Record<string, any>;
+  onChange?: (val: any) => void;
+  showTime?: boolean | { defaultValue?: Moment[] };
+  format?: string;
+  valueMap?: DateRangePickerValueMapModal;
+  ranges?: RangePickerProps["ranges"] | boolean;
+  addFormat?: (config: Record<string, addFormatItemModal>) => void;
+  disabledDate?: DisabledDateFnModal<Moment[] | undefined>;
+}
+
+export interface HTimePickerProps
+  extends Omit<
+    TimePickerProps,
+    "onChange" | "format" | "ranges" | "disabledDate"
+  > {
+  onChange?: (time?: Moment | string | number) => void;
+  format?: DurationInputArg2 | string;
+  disabledDate?: DisabledDateFnModal;
+}

package/src/components/TextArea/index.tsx

@@ -0,0 +1,8 @@
+import { Input } from "antd";
+import type { TextAreaProps } from "antd/es/input";
+export default ({
+  autoSize = { minRows: 4, maxRows: 4 },
+  ...props
+}: TextAreaProps) => {
+  return <Input.TextArea autoSize={autoSize} {...props} />;
+};