@hw-component/form 1.10.21 → 1.10.22

package/es/RichEditor/modal.d.ts

@@ -1,6 +1,6 @@
-import { BraftEditorProps, EditorState } from "braft-editor";
-import { PromiseFnResult } from "../modal";
-import { addFormatItemModal } from "../Form/modal";
+import type { BraftEditorProps, EditorState } from "braft-editor";
+import type { PromiseFnResult } from "../modal";
+import type { addFormatItemModal } from "../Form/modal";
 export interface IHRichEditorProps extends Omit<BraftEditorProps, "value" | "onChange"> {
     value?: string | EditorState;
     onChange?: (value: string | EditorState) => void;

package/es/Select/TagSelect/Content.d.ts

@@ -1,4 +1,4 @@
-import { HTagSelectProps } from "../modal";
+import type { HTagSelectProps } from "../modal";
 interface IContentProps extends HTagSelectProps {
     error?: Error;
     reload: VoidFunction;

package/es/Select/TagSelect/hooks.d.ts

@@ -1,4 +1,4 @@
-import { HTagSelectProps } from "@/components/Select/modal";
+import type { HTagSelectProps } from "@/components/Select/modal";
 export declare const useTagControl: ({ value, options, title }: HTagSelectProps) => {
     labelNode: {};
     checked: boolean | undefined;

package/es/Select/hooks/norHooks.js

@@ -4,7 +4,7 @@ import _asyncToGenerator from '@babel/runtime-corejs3/helpers/asyncToGenerator';
 import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
 import _slicedToArray from '@babel/runtime-corejs3/helpers/slicedToArray';
 import _regeneratorRuntime from '@babel/runtime-corejs3/regenerator';
-import { useEffect, useState, useMemo } from 'react';
+import { useEffect, useMemo, useState } from 'react';
 import { useRequest } from 'ahooks';
 import { useFormContext } from '../../Form/Context/index.js';
 
@@ -199,14 +199,19 @@ var useSelectReq = function useSelectReq(_ref3) {
       run({}, "page");
     }
   };
-  var mathShowSearch = showSearch || serviceSearch;
+  var mathShowSearch = useMemo(function () {
+    if (typeof showSearch == "undefined") {
+      return serviceSearch;
+    }
+    return showSearch;
+  }, [showSearch, serviceSearch]);
   return {
     run: run,
     loading: loading,
     error: error,
     data: data,
     onSearch: mathShowSearch ? onSearch : propsOnSearch,
-    mathShowSearch: showSearch || serviceSearch,
+    mathShowSearch: mathShowSearch,
     reload: reload,
     onPopupScroll: isList ? onPopupScroll : undefined
   };

package/es/TDPicker/TimeRangePicker.d.ts

@@ -1,5 +1,5 @@
 import React from "react";
-import { HItemProps } from "@/components/Form/modal";
+import type { HItemProps } from "@/components/Form/modal";
 declare const _default: {
     Component: React.ForwardRefExoticComponent<import("@/components/Form/modal").HFormItemProps & React.RefAttributes<any>>;
     placeholder: ({ label }: HItemProps) => string[];

package/es/TDPicker/TimeRangePicker.js

@@ -54,7 +54,7 @@ var HTimePicker = function HTimePicker(_ref) {
     order: order,
     format: format,
     style: {
-      width: '100%'
+      width: "100%"
     }
   }, props));
 };

package/es/TDPicker/index.js

@@ -51,9 +51,9 @@ var Index = function Index(_ref) {
       }
       if (showSecond) {
         var sPropsShowTime = typeof showTime === "boolean" ? {
-          format: 'HH:mm:ss'
+          format: "HH:mm:ss"
         } : _objectSpread({
-          format: 'HH:mm:ss'
+          format: "HH:mm:ss"
         }, showTime);
         return {
           format: "YYYY-MM-DD HH:mm:ss",
@@ -61,9 +61,9 @@ var Index = function Index(_ref) {
         };
       }
       var mPropsShowTime = typeof showTime === "boolean" ? {
-        format: 'HH:mm'
+        format: "HH:mm"
       } : _objectSpread({
-        format: 'HH:mm'
+        format: "HH:mm"
       }, showTime);
       return {
         format: "YYYY-MM-DD HH:mm",

package/es/TDPicker/modal.d.ts

@@ -6,8 +6,8 @@ import type { TimePickerProps } from "antd";
 import type { DurationInputArg2 } from "moment";
 import type { DateRangePickerValueMapModal } from "../modal";
 import type { addFormatItemModal } from "../Form/modal";
-import { TimeRangePickerProps } from "antd/lib/time-picker";
-import React from "react";
+import type { TimeRangePickerProps } from "antd/lib/time-picker";
+import type React from "react";
 interface DisabledDateFnModal<T = Moment | undefined> {
     (currentDate: Moment, value: T): boolean;
 }

package/es/Upload/modal.d.ts

@@ -5,7 +5,7 @@ import type { UploadChangeParam } from "antd/lib/upload/interface";
 import type { MediaTypeEnum } from "@/components/Upload/enums";
 import type { addFormatItemModal } from "@/components/Form/modal";
 import type React from "react";
-import { UploadListType } from "antd/lib/upload/interface";
+import type { UploadListType } from "antd/lib/upload/interface";
 export interface IUpLoadProps extends Omit<UploadProps, "onChange" | "listType" | "onPreview"> {
     exFiles?: string[] | null;
     request?: (file: Exclude<BeforeUploadFileType, File | boolean> | RcFile) => Promise<{

package/lib/Form/FormItem/BasicItem.js

@@ -36,7 +36,7 @@ var Content = function Content(_ref) {
     size: 4,
     style: {
       width: "100%",
-      display: 'flex'
+      display: "flex"
     },
     children: [jsxRuntime.jsx("div", {
       className: className,

package/lib/Form/hooks/useAddFormat.d.ts

@@ -1,4 +1,4 @@
-import { addFormatItemModal, HFormItemProps } from "../modal";
+import type { addFormatItemModal, HFormItemProps } from "../modal";
 interface ResultModal {
     inputValue?: (value: Record<string, any>) => Record<string, any>;
     outputValue?: (value: Record<string, any>) => Record<string, any>;

package/lib/RichEditor/hooks.d.ts

@@ -1,4 +1,4 @@
-import { IHRichEditorProps } from "src/components/RichEditor/modal";
+import type { IHRichEditorProps } from "src/components/RichEditor/modal";
 export declare const useProps: ({ fileRequest, valueType }: IHRichEditorProps) => {
     fileRequest: any;
     valueType: any;

package/lib/RichEditor/modal.d.ts

@@ -1,6 +1,6 @@
-import { BraftEditorProps, EditorState } from "braft-editor";
-import { PromiseFnResult } from "../modal";
-import { addFormatItemModal } from "../Form/modal";
+import type { BraftEditorProps, EditorState } from "braft-editor";
+import type { PromiseFnResult } from "../modal";
+import type { addFormatItemModal } from "../Form/modal";
 export interface IHRichEditorProps extends Omit<BraftEditorProps, "value" | "onChange"> {
     value?: string | EditorState;
     onChange?: (value: string | EditorState) => void;

package/lib/Select/TagSelect/Content.d.ts

@@ -1,4 +1,4 @@
-import { HTagSelectProps } from "../modal";
+import type { HTagSelectProps } from "../modal";
 interface IContentProps extends HTagSelectProps {
     error?: Error;
     reload: VoidFunction;

package/lib/Select/TagSelect/hooks.d.ts

@@ -1,4 +1,4 @@
-import { HTagSelectProps } from "@/components/Select/modal";
+import type { HTagSelectProps } from "@/components/Select/modal";
 export declare const useTagControl: ({ value, options, title }: HTagSelectProps) => {
     labelNode: {};
     checked: boolean | undefined;

package/lib/Select/hooks/norHooks.js

@@ -200,14 +200,19 @@ var useSelectReq = function useSelectReq(_ref3) {
       run({}, "page");
     }
   };
-  var mathShowSearch = showSearch || serviceSearch;
+  var mathShowSearch = React.useMemo(function () {
+    if (typeof showSearch == "undefined") {
+      return serviceSearch;
+    }
+    return showSearch;
+  }, [showSearch, serviceSearch]);
   return {
     run: run,
     loading: loading,
     error: error,
     data: data,
     onSearch: mathShowSearch ? onSearch : propsOnSearch,
-    mathShowSearch: showSearch || serviceSearch,
+    mathShowSearch: mathShowSearch,
     reload: reload,
     onPopupScroll: isList ? onPopupScroll : undefined
   };

package/lib/TDPicker/TimeRangePicker.d.ts

@@ -1,5 +1,5 @@
 import React from "react";
-import { HItemProps } from "@/components/Form/modal";
+import type { HItemProps } from "@/components/Form/modal";
 declare const _default: {
     Component: React.ForwardRefExoticComponent<import("@/components/Form/modal").HFormItemProps & React.RefAttributes<any>>;
     placeholder: ({ label }: HItemProps) => string[];

package/lib/TDPicker/TimeRangePicker.js

@@ -57,7 +57,7 @@ var HTimePicker = function HTimePicker(_ref) {
     order: order,
     format: format,
     style: {
-      width: '100%'
+      width: "100%"
     }
   }, props));
 };

package/lib/TDPicker/index.js

@@ -54,9 +54,9 @@ var Index = function Index(_ref) {
       }
       if (showSecond) {
         var sPropsShowTime = typeof showTime === "boolean" ? {
-          format: 'HH:mm:ss'
+          format: "HH:mm:ss"
         } : _objectSpread({
-          format: 'HH:mm:ss'
+          format: "HH:mm:ss"
         }, showTime);
         return {
           format: "YYYY-MM-DD HH:mm:ss",
@@ -64,9 +64,9 @@ var Index = function Index(_ref) {
         };
       }
       var mPropsShowTime = typeof showTime === "boolean" ? {
-        format: 'HH:mm'
+        format: "HH:mm"
       } : _objectSpread({
-        format: 'HH:mm'
+        format: "HH:mm"
       }, showTime);
       return {
         format: "YYYY-MM-DD HH:mm",

package/lib/TDPicker/modal.d.ts

@@ -6,8 +6,8 @@ import type { TimePickerProps } from "antd";
 import type { DurationInputArg2 } from "moment";
 import type { DateRangePickerValueMapModal } from "../modal";
 import type { addFormatItemModal } from "../Form/modal";
-import { TimeRangePickerProps } from "antd/lib/time-picker";
-import React from "react";
+import type { TimeRangePickerProps } from "antd/lib/time-picker";
+import type React from "react";
 interface DisabledDateFnModal<T = Moment | undefined> {
     (currentDate: Moment, value: T): boolean;
 }

package/lib/Upload/modal.d.ts

@@ -5,7 +5,7 @@ import type { UploadChangeParam } from "antd/lib/upload/interface";
 import type { MediaTypeEnum } from "@/components/Upload/enums";
 import type { addFormatItemModal } from "@/components/Form/modal";
 import type React from "react";
-import { UploadListType } from "antd/lib/upload/interface";
+import type { UploadListType } from "antd/lib/upload/interface";
 export interface IUpLoadProps extends Omit<UploadProps, "onChange" | "listType" | "onPreview"> {
     exFiles?: string[] | null;
     request?: (file: Exclude<BeforeUploadFileType, File | boolean> | RcFile) => Promise<{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hw-component/form",
-  "version": "1.10.21",
+  "version": "1.10.22",
   "description": "基于antd二次开发",
   "repository": {
     "type": "git",

package/src/components/Form/Basic.tsx

@@ -34,7 +34,9 @@ export default ({
     form.submit();
   };
   const globalItemSpan = itemSpan || formItemSpan;
-  const boxStyle= requiredMode?{paddingLeft:10,width: "100%"}:{width: "100%"};
+  const boxStyle = requiredMode
+    ? { paddingLeft: 10, width: "100%" }
+    : { width: "100%" };
   return (
     <Row gutter={gutter} style={boxStyle}>
       {newConfigData.map((itemData: HItemProps, index) => {
@@ -60,7 +62,7 @@ export default ({
         const itemStyle = style || formItemStyle;
         return (
           <Item
-              wrapperCol={wrapperCol}
+            wrapperCol={wrapperCol}
             {...itemData}
             labelAlign={labelAlign}
             key={key || index}

package/src/components/Form/FormItem/BasicItem.tsx

@@ -30,7 +30,11 @@ const Content: React.FC<ContentProps> = ({
   const relChild =
     children && React.cloneElement(children as any, { value, onChange });
   return (
-    <Space direction={"vertical"} size={4} style={{ width: "100%" ,display:'flex'}}>
+    <Space
+      direction={"vertical"}
+      size={4}
+      style={{ width: "100%", display: "flex" }}
+    >
       <div className={className}>{relChild}</div>
       <Helper helper={helper} />
     </Space>

package/src/components/Form/hooks/useAddFormat.tsx

@@ -1,4 +1,4 @@
-import { addFormatItemModal, HFormItemProps } from "../modal";
+import type { addFormatItemModal, HFormItemProps } from "../modal";
 import { useFormContext } from "@/components/Form/Context";
 import { useEffect } from "react";
 

package/src/components/Form/hooks/useDefaultRender.tsx

@@ -34,7 +34,7 @@ export const useDefaultRender = (
     );
     if (render) {
       const resultNode = render(props, node, form);
-      const nodeProps=(resultNode as any).props;
+      const nodeProps = (resultNode as any).props;
       return React.cloneElement<any>(resultNode as any, {
         ...componentProps,
         ...itemProps,

package/src/components/Form/hooks/useHForm.ts

@@ -160,9 +160,9 @@ export default () => {
         const newValue = formatValuesFn(values);
         form.setFieldsValue(newValue);
       },
-      setSourceFieldsValue(values){
-      form.setFieldsValue(values);
-    },
+      setSourceFieldsValue(values) {
+        form.setFieldsValue(values);
+      },
       validateFields(nameList) {
         return new Promise((resolve, reject) => {
           form

package/src/components/Form/index.tsx

@@ -29,8 +29,8 @@ export default ({
   dismissOnPressEnter,
   preserve,
   rowWrapper,
-                  requiredMode,
-    style,
+  requiredMode,
+  style,
   ...props
 }: HFormProps) => {
   const hForm = useCurrentForm(form);
@@ -100,7 +100,7 @@ export default ({
           onFinish={run}
           onValuesChange={valuesChange}
           preserve={preserve}
-          style={requiredMode?{paddingLeft:10,...style}:style}
+          style={requiredMode ? { paddingLeft: 10, ...style } : style}
           {...props}
         >
           <Basic

package/src/components/Form/modal.ts

@@ -127,7 +127,7 @@ export interface HFormProps<T = any, R = any>
   dismissOnPressEnter?: boolean;
   rowWrapper?: boolean;
   flexBox?: boolean;
-  requiredMode?:boolean;
+  requiredMode?: boolean;
 }
 export interface HFormItemProps extends HItemProps {
   required?: boolean;
@@ -213,7 +213,7 @@ export interface HFormInstance extends FormInstance {
   clearFormat: (name: string) => void;
   inited: boolean;
   resetFormStatus: VoidFunction;
-  setSourceFieldsValue:( values: Record<string, any>)=>void;
+  setSourceFieldsValue: (values: Record<string, any>) => void;
 }
 
 export interface ConnectConfigModal {

package/src/components/InputGroup/index.less

@@ -25,26 +25,26 @@
     border-color: #ff4d4f !important;
   }
 }
-.@{all-input-group}-before-body{
-  .@{all-input-group}-number-body{
-    border-top-right-radius:@border-radius-base;
-    border-bottom-right-radius:@border-radius-base;
+.@{all-input-group}-before-body {
+  .@{all-input-group}-number-body {
+    border-top-right-radius: @border-radius-base;
+    border-bottom-right-radius: @border-radius-base;
   }
 }
-.@{all-input-group}-after-body{
-  .@{all-input-group}-number-body{
-    border-top-left-radius:@border-radius-base;
-    border-bottom-left-radius:@border-radius-base;
+.@{all-input-group}-after-body {
+  .@{all-input-group}-number-body {
+    border-top-left-radius: @border-radius-base;
+    border-bottom-left-radius: @border-radius-base;
   }
 }
 
-.@{all-input-group}-no-addon{
-  .@{all-input-group}-number-body{
+.@{all-input-group}-no-addon {
+  .@{all-input-group}-number-body {
     border-radius: @border-radius-base;
   }
 }
-.@{ant-prefix}-form-item-has-error{
-  .@{ant-prefix}-hw-addon{
+.@{ant-prefix}-form-item-has-error {
+  .@{ant-prefix}-hw-addon {
     color: #ff4d4f;
     border-color: #ff4d4f;
   }

package/src/components/InputGroup/index.tsx

@@ -1,4 +1,4 @@
-import React, {useMemo} from "react";
+import React, { useMemo } from "react";
 import { useClassName } from "../hooks";
 import { Input } from "antd";
 interface HInputGroupProps<T = any> {
@@ -38,18 +38,18 @@ const Index: React.FC<HInputGroupProps> = ({
   const beforeAfterClassname = useClassName(["hw-input-group-after-body"]);
   const noAddonClassname = useClassName(["hw-input-group-no-addon"]);
 
-  const cuBodyClassName=useMemo(()=>{
-        if (addonBefore&&!addonAfter){
-          return beforeBodyClassname;
-        }
-        if (addonAfter&&!addonBefore){
-          return beforeAfterClassname;
-        }
-        if (!addonBefore&&!addonAfter){
-          return  noAddonClassname;
-        }
-        return  ""
-  },[addonAfter,addonBefore]);
+  const cuBodyClassName = useMemo(() => {
+    if (addonBefore && !addonAfter) {
+      return beforeBodyClassname;
+    }
+    if (addonAfter && !addonBefore) {
+      return beforeAfterClassname;
+    }
+    if (!addonBefore && !addonAfter) {
+      return noAddonClassname;
+    }
+    return "";
+  }, [addonAfter, addonBefore]);
   return (
     <Input.Group compact className={`${contentClassname} ${className}`}>
       <Addon value={value} onChange={onChange}>

package/src/components/RichEditor/hooks.ts

@@ -1,9 +1,10 @@
 import { useFormConfigContext } from "../Form/Context/FormConfigProvider";
 import { baseConfig } from "../config";
-import { IHRichEditorProps } from "src/components/RichEditor/modal";
+import type { IHRichEditorProps } from "src/components/RichEditor/modal";
 import { useClassName } from "../hooks";
 import { useEffect, useMemo, useRef, useState } from "react";
-import BraftEditor, { EditorState } from "braft-editor";
+import type { EditorState } from "braft-editor";
+import BraftEditor from "braft-editor";
 
 export const useProps = ({ fileRequest, valueType }: IHRichEditorProps) => {
   const {

package/src/components/RichEditor/index.tsx

@@ -1,6 +1,7 @@
-import BraftEditor, { EditorState } from "braft-editor";
+import type { EditorState } from "braft-editor";
+import BraftEditor from "braft-editor";
 import "braft-editor/dist/index.css";
-import { IHRichEditorProps } from "./modal";
+import type { IHRichEditorProps } from "./modal";
 import { useFocusClassname, useProps, useUploadFn, useVC } from "./hooks";
 import { useClassName } from "../hooks";
 import React from "react";

package/src/components/RichEditor/modal.ts

@@ -1,6 +1,6 @@
-import { BraftEditorProps, EditorState } from "braft-editor";
-import { PromiseFnResult } from "../modal";
-import { addFormatItemModal } from "../Form/modal";
+import type { BraftEditorProps, EditorState } from "braft-editor";
+import type { PromiseFnResult } from "../modal";
+import type { addFormatItemModal } from "../Form/modal";
 
 export interface IHRichEditorProps
   extends Omit<BraftEditorProps, "value" | "onChange"> {

package/src/components/Select/TagSelect/Content.tsx

@@ -1,4 +1,4 @@
-import { HTagSelectProps } from "../modal";
+import type { HTagSelectProps } from "../modal";
 import { useClassName } from "@/components/hooks";
 import { Row, Skeleton, Space, Tag, Empty } from "antd";
 import React from "react";

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

@@ -1,5 +1,5 @@
 import { useEffect, useMemo, useState } from "react";
-import { HTagSelectProps, OptionType } from "@/components/Select/modal";
+import type { HTagSelectProps, OptionType } from "@/components/Select/modal";
 
 export const useTagControl = ({ value, options, title }: HTagSelectProps) => {
   const { checked, indeterminate } = useMemo(() => {

package/src/components/Select/TagSelect/index.tsx

@@ -2,8 +2,8 @@ import { Collapse, Checkbox } from "antd";
 import { useClassName, useMatchConfigProps } from "../../hooks";
 import React from "react";
 import { useSelectReq } from "../hooks/norHooks";
-import { HTagSelectProps } from "../modal";
-import { CheckboxProps } from "antd/lib/checkbox/Checkbox";
+import type { HTagSelectProps } from "../modal";
+import type { CheckboxProps } from "antd/lib/checkbox/Checkbox";
 import Content from "./Content";
 import {
   useChangeControl,

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

@@ -160,14 +160,19 @@ export const useSelectReq = ({
       run({}, "page");
     }
   };
-  const mathShowSearch = showSearch || serviceSearch;
+  const mathShowSearch=useMemo(()=>{
+     if (typeof showSearch=="undefined"){
+       return serviceSearch;
+     }
+     return  showSearch;
+  },[showSearch,serviceSearch])
   return {
     run,
     loading,
     error,
     data,
     onSearch: mathShowSearch ? onSearch : propsOnSearch,
-    mathShowSearch: showSearch || serviceSearch,
+    mathShowSearch,
     reload,
     onPopupScroll: isList ? onPopupScroll : undefined,
   };

package/src/components/TDPicker/TimePicker.tsx

@@ -1,9 +1,13 @@
-import { TimePicker ,Input} from "antd";
+import { TimePicker, Input } from "antd";
 import type { HTimePickerProps } from "./modal";
-import {usePropsFormat, useTimePickerChange, useTimePickerValue} from "./hooks";
+import {
+  usePropsFormat,
+  useTimePickerChange,
+  useTimePickerValue,
+} from "./hooks";
 import HFormConnect from "../Form/HFormConnect";
 import React from "react";
-import {useClassName} from "@/components/hooks";
+import { useClassName } from "@/components/hooks";
 
 const Index = ({
   value,
@@ -18,26 +22,26 @@ const Index = ({
 }: HTimePickerProps) => {
   addFormat?.({});
   const timeVal = useTimePickerValue({ value, format });
-  const propsFormat=usePropsFormat({format})
+  const propsFormat = usePropsFormat({ format });
   const change = useTimePickerChange({ value, format, onChange });
-  const addonClassName=useClassName("hw-addon")
+  const addonClassName = useClassName("hw-addon");
   return (
-      <Input.Group compact style={{display:"flex",...style}}>
-        {addonBefore? <div className={addonClassName}>{addonBefore}</div>:null}
-    <TimePicker
-      value={timeVal}
-      onChange={change}
-      disabledDate={(currentDate) => {
-        return !!disabledDate?.(currentDate, timeVal);
-      }}
-      style={{
-        flex:1
-      }}
-      format={propsFormat}
-      {...props}
-    />
-        {addonAfter? <div className={addonClassName}>{addonAfter}</div>:null}
-      </Input.Group>
+    <Input.Group compact style={{ display: "flex", ...style }}>
+      {addonBefore ? <div className={addonClassName}>{addonBefore}</div> : null}
+      <TimePicker
+        value={timeVal}
+        onChange={change}
+        disabledDate={(currentDate) => {
+          return !!disabledDate?.(currentDate, timeVal);
+        }}
+        style={{
+          flex: 1,
+        }}
+        format={propsFormat}
+        {...props}
+      />
+      {addonAfter ? <div className={addonClassName}>{addonAfter}</div> : null}
+    </Input.Group>
   );
 };
 export default HFormConnect(Index);