doui-react 2.0.0 → 2.0.1

package/es/form/component/form-item-map.d.ts

@@ -14,6 +14,7 @@ export interface FormItemSelectProps extends Pick<FormItemProps, 'requiredInOpti
 export declare function useCollectFormItemState({ name, collectState, filterNotExistValue, requiredInOptions, form: outerForm, ...props }: FormItemSelectProps): {
     __filterNotExistValue__: boolean;
     __callback__: import("use-debounce").DebouncedState<({ loading, options, value }: SelectCallbackProps) => Promise<void>>;
+    __callbackDeps__: (string | number | boolean | undefined)[];
     labelInValue?: boolean | undefined;
 };
 declare function FormItemSelect(props: FormItemSelectProps & SelectProps): import("@emotion/react/jsx-runtime").JSX.Element;

package/es/form/component/form-item-map.js

@@ -84,7 +84,8 @@ export function useCollectFormItemState(_ref) {
   }
   return _objectSpread(_objectSpread({}, props), {}, {
     __filterNotExistValue__: !!requiredInOptionsAndFilterNotExistValue,
-    __callback__: useDebounce(onCallback)
+    __callback__: useDebounce(onCallback),
+    __callbackDeps__: [filterNotExistValue, requiredInOptions]
   });
 }
 function FormItemSelect(props) {

package/es/form/component/utils.d.ts

@@ -24,7 +24,7 @@ export declare function getFormItemProps(props: any): {
             pointAtCenter?: boolean | undefined;
         };
         autoAdjustOverflow?: boolean | import("antd/es/tooltip").AdjustOverflow | undefined;
-        getPopupContainer: typeof import("../../api").getPopupContainer;
+        getPopupContainer: (triggerNode: HTMLElement) => HTMLElement;
         children?: import("react").ReactNode;
         destroyTooltipOnHide?: boolean | {
             keepParent?: boolean | undefined;
@@ -38,12 +38,13 @@ export declare function getFormItemProps(props: any): {
         defaultVisible?: boolean | undefined;
         onVisibleChange?: ((visible: boolean) => void) | undefined;
         afterVisibleChange?: ((visible: boolean) => void) | undefined;
-        zIndex?: number | undefined;
-        animation?: string | undefined;
-        motion?: import("rc-motion").CSSMotionProps | undefined;
-        id?: string | undefined;
         prefixCls?: string | undefined;
+        id?: string | undefined;
+        animation?: string | undefined;
         transitionName?: string | undefined;
+        showArrow?: boolean | import("@rc-component/trigger").ArrowType | undefined;
+        zIndex?: number | undefined;
+        motion?: import("rc-motion").CSSMotionProps | undefined;
         mouseEnterDelay?: number | undefined;
         mouseLeaveDelay?: number | undefined;
         onPopupAlign?: ((element: HTMLElement, align: import("@rc-component/trigger").AlignType) => void) | undefined;
@@ -55,7 +56,6 @@ export declare function getFormItemProps(props: any): {
         forceRender?: boolean | undefined;
         fresh?: boolean | undefined;
         getTooltipContainer?: ((node: HTMLElement) => HTMLElement) | undefined;
-        showArrow?: boolean | import("@rc-component/trigger").ArrowType | undefined;
         arrowContent?: import("react").ReactNode;
         overlayInnerStyle?: import("react").CSSProperties | undefined;
         icon: import("@emotion/react/jsx-runtime").JSX.Element;

package/es/form/component/utils.js

@@ -149,7 +149,7 @@ function generateRules(_ref2) {
       var _form$getItems;
       var value = _ref3.value;
       var options = (_form$getItems = form.getItems(item.name)) === null || _form$getItems === void 0 ? void 0 : _form$getItems.options;
-      if (!isEmpty(value) && isValueNotExistInOptions(value, options)) {
+      if (!isEmpty(value) && options && isValueNotExistInOptions(value, options)) {
         return _message;
       }
     };

package/es/hooks/hook/use-fetch.js

@@ -6,7 +6,6 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 var _excluded = ["wait"];
 import { useDebounce, useDeepEffect } from "./..";
 import _ from 'lodash';
-import isEqual from 'react-fast-compare';
 import { useLatest, useSetState } from 'react-use';
 var defaultOptions = {
   automatic: true,
@@ -45,7 +44,8 @@ export function useFetch(_fn, dependencyList, options) {
             args[_key] = _args[_key];
           }
           setState({
-            loading: true
+            loading: true,
+            error: undefined
           });
           _context.prev = 2;
           _context.next = 5;
@@ -65,16 +65,9 @@ export function useFetch(_fn, dependencyList, options) {
           }
           return _context.abrupt("return");
         case 10:
-          setState(function (prevState) {
-            if (isEqual(prevState.data, data)) {
-              return {
-                loading: false
-              };
-            }
-            return {
-              loading: false,
-              data: data
-            };
+          setState({
+            loading: false,
+            data: data
           });
           _context.next = 16;
           break;

package/es/open-modal/component/index.js

@@ -1,8 +1,23 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+var _excluded = ["configProviderProps"];
 import { mountComponent, unmountComponent } from "../../api";
+import { ConfigProvider } from 'antd';
+import zhCN from 'antd/es/locale/zh_CN';
 import { Modal } from "./modal";
+import { jsx as _jsx } from "@emotion/react/jsx-runtime";
 export * from "./modal";
+function ModalWrapper(_ref) {
+  var configProviderProps = _ref.configProviderProps,
+    props = _objectWithoutProperties(_ref, _excluded);
+  return _jsx(ConfigProvider, _objectSpread(_objectSpread({
+    locale: zhCN
+  }, configProviderProps), {}, {
+    children: _jsx(Modal, _objectSpread({}, props))
+  }));
+}
 export function openModal(props) {
-  return mountComponent(Modal, props);
+  return mountComponent(ModalWrapper, props);
 }
 export function closeModal() {
   unmountComponent();

package/es/open-modal/type/index.d.ts

@@ -1,6 +1,7 @@
 import { FunctionReturn } from "../../api";
 import { FormInstance, FormItemProps, FormProps, FormValues } from "../../form";
 import { CSSObject } from '@emotion/react';
+import { ConfigProviderProps } from 'antd/es/config-provider';
 import type { ModalProps as AntdModalProps } from 'antd/es/modal';
 import { ReactNode } from 'react';
 type AntdComponentProps = Omit<AntdModalProps, 'onOk' | 'children'> & Omit<FormProps, 'children' | 'content' | 'title'>;
@@ -46,6 +47,10 @@ export interface OpenModalProps extends AntdComponentProps {
      * @description 对话框外层容器的样式
      */
     wrapStyle?: CSSObject;
+    /**
+     * @description Antd Provider Props
+     */
+    configProviderProps?: Omit<ConfigProviderProps, 'children'>;
     /**
      * @description 点击取消按钮的回调
      */

package/es/radio/component/abstract-box.d.ts

@@ -36,12 +36,13 @@ export declare function useAbstractBox({ refs, boxTooltip, value, onChange, inGr
         defaultVisible?: boolean | undefined;
         onVisibleChange?: ((visible: boolean) => void) | undefined;
         afterVisibleChange?: ((visible: boolean) => void) | undefined;
-        zIndex?: number | undefined;
-        animation?: string | undefined;
-        motion?: import("rc-motion").CSSMotionProps | undefined;
-        id?: string | undefined;
         prefixCls?: string | undefined;
+        id?: string | undefined;
+        animation?: string | undefined;
         transitionName?: string | undefined;
+        showArrow?: boolean | import("@rc-component/trigger").ArrowType | undefined;
+        zIndex?: number | undefined;
+        motion?: import("rc-motion").CSSMotionProps | undefined;
         mouseEnterDelay?: number | undefined;
         mouseLeaveDelay?: number | undefined;
         onPopupAlign?: ((element: HTMLElement, align: import("@rc-component/trigger").AlignType) => void) | undefined;
@@ -53,7 +54,6 @@ export declare function useAbstractBox({ refs, boxTooltip, value, onChange, inGr
         forceRender?: boolean | undefined;
         fresh?: boolean | undefined;
         getTooltipContainer?: ((node: HTMLElement) => HTMLElement) | undefined;
-        showArrow?: boolean | import("@rc-component/trigger").ArrowType | undefined;
         arrowContent?: import("react").ReactNode;
         overlayInnerStyle?: import("react").CSSProperties | undefined;
     };
@@ -65,37 +65,73 @@ export declare function useAbstractBox({ refs, boxTooltip, value, onChange, inGr
         value?: any;
         boxTooltip?: import("react").ReactNode | import("antd").TooltipProps;
         inGroup?: boolean | undefined;
+        indeterminate?: boolean | undefined;
+        prefixCls?: string | undefined;
+        className?: string | undefined;
+        rootClassName?: string | undefined;
+        defaultChecked?: boolean | undefined;
+        checked?: boolean | undefined;
         style?: import("react").CSSProperties | undefined;
+        disabled?: boolean | undefined;
         title?: string | undefined;
-        className?: string | undefined;
-        id?: string | undefined;
-        name?: string | undefined;
-        type?: string | undefined;
-        tabIndex?: number | undefined;
-        onKeyDown?: import("react").KeyboardEventHandler<HTMLElement> | undefined;
-        onKeyPress?: import("react").KeyboardEventHandler<HTMLElement> | undefined;
         onClick?: import("react").MouseEventHandler<HTMLElement> | undefined;
         onMouseEnter?: import("react").MouseEventHandler<HTMLElement> | undefined;
         onMouseLeave?: import("react").MouseEventHandler<HTMLElement> | undefined;
-        disabled?: boolean | undefined;
-        checked?: boolean | undefined;
-        required?: boolean | undefined;
-        defaultChecked?: boolean | undefined;
+        onKeyPress?: import("react").KeyboardEventHandler<HTMLElement> | undefined;
+        onKeyDown?: import("react").KeyboardEventHandler<HTMLElement> | undefined;
+        tabIndex?: number | undefined;
+        name?: string | undefined;
+        id?: string | undefined;
         autoFocus?: boolean | undefined;
-        prefixCls?: string | undefined;
-        rootClassName?: string | undefined;
-        indeterminate?: boolean | undefined;
+        type?: string | undefined;
         skipGroup?: boolean | undefined;
-        slot?: string | undefined;
-        accessKey?: string | undefined;
-        dir?: string | undefined;
-        color?: string | undefined;
-        content?: string | undefined;
+        required?: boolean | undefined;
+        'aria-label'?: string | undefined;
         direction?: import("antd/es/config-provider").DirectionType;
-        translate?: "no" | "yes" | undefined;
+        defaultValue?: string | number | readonly string[] | undefined;
+        suppressContentEditableWarning?: boolean | undefined;
         suppressHydrationWarning?: boolean | undefined;
+        accessKey?: string | undefined;
+        autoCapitalize?: "none" | "off" | "on" | "sentences" | "words" | "characters" | (string & {}) | undefined;
+        contentEditable?: (boolean | "true" | "false") | "inherit" | "plaintext-only" | undefined;
+        contextMenu?: string | undefined;
+        dir?: string | undefined;
+        draggable?: (boolean | "true" | "false") | undefined;
+        enterKeyHint?: "search" | "enter" | "done" | "go" | "next" | "previous" | "send" | undefined;
+        hidden?: boolean | undefined;
         lang?: string | undefined;
+        nonce?: string | undefined;
+        slot?: string | undefined;
+        spellCheck?: (boolean | "true" | "false") | undefined;
+        translate?: "yes" | "no" | undefined;
+        radioGroup?: string | undefined;
         role?: import("react").AriaRole | undefined;
+        about?: string | undefined;
+        content?: string | undefined;
+        datatype?: string | undefined;
+        inlist?: any;
+        prefix?: string | undefined;
+        property?: string | undefined;
+        rel?: string | undefined;
+        resource?: string | undefined;
+        rev?: string | undefined;
+        typeof?: string | undefined;
+        vocab?: string | undefined;
+        autoCorrect?: string | undefined;
+        autoSave?: string | undefined;
+        color?: string | undefined;
+        itemProp?: string | undefined;
+        itemScope?: boolean | undefined;
+        itemType?: string | undefined;
+        itemID?: string | undefined;
+        itemRef?: string | undefined;
+        results?: number | undefined;
+        security?: string | undefined;
+        unselectable?: "off" | "on" | undefined;
+        inputMode?: "text" | "search" | "none" | "tel" | "url" | "email" | "numeric" | "decimal" | undefined;
+        is?: string | undefined;
+        exportparts?: string | undefined;
+        part?: string | undefined;
         "aria-activedescendant"?: string | undefined;
         "aria-atomic"?: (boolean | "true" | "false") | undefined;
         "aria-autocomplete"?: "none" | "list" | "inline" | "both" | undefined;
@@ -108,34 +144,33 @@ export declare function useAbstractBox({ refs, boxTooltip, value, onChange, inGr
         "aria-colindextext"?: string | undefined;
         "aria-colspan"?: number | undefined;
         "aria-controls"?: string | undefined;
-        "aria-current"?: boolean | "time" | "page" | "true" | "false" | "step" | "location" | "date" | undefined;
+        "aria-current"?: boolean | "true" | "false" | "page" | "step" | "location" | "date" | "time" | undefined;
         "aria-describedby"?: string | undefined;
         "aria-description"?: string | undefined;
         "aria-details"?: string | undefined;
         "aria-disabled"?: (boolean | "true" | "false") | undefined;
-        "aria-dropeffect"?: "link" | "none" | "copy" | "execute" | "move" | "popup" | undefined;
+        "aria-dropeffect"?: "none" | "link" | "copy" | "execute" | "move" | "popup" | undefined;
         "aria-errormessage"?: string | undefined;
         "aria-expanded"?: (boolean | "true" | "false") | undefined;
         "aria-flowto"?: string | undefined;
         "aria-grabbed"?: (boolean | "true" | "false") | undefined;
-        "aria-haspopup"?: boolean | "dialog" | "menu" | "grid" | "listbox" | "tree" | "true" | "false" | undefined;
+        "aria-haspopup"?: boolean | "true" | "false" | "dialog" | "grid" | "listbox" | "menu" | "tree" | undefined;
         "aria-hidden"?: (boolean | "true" | "false") | undefined;
         "aria-invalid"?: boolean | "true" | "false" | "grammar" | "spelling" | undefined;
         "aria-keyshortcuts"?: string | undefined;
-        'aria-label'?: string | undefined;
         "aria-labelledby"?: string | undefined;
         "aria-level"?: number | undefined;
         "aria-live"?: "off" | "assertive" | "polite" | undefined;
         "aria-modal"?: (boolean | "true" | "false") | undefined;
         "aria-multiline"?: (boolean | "true" | "false") | undefined;
         "aria-multiselectable"?: (boolean | "true" | "false") | undefined;
-        "aria-orientation"?: "vertical" | "horizontal" | undefined;
+        "aria-orientation"?: "horizontal" | "vertical" | undefined;
         "aria-owns"?: string | undefined;
         "aria-placeholder"?: string | undefined;
         "aria-posinset"?: number | undefined;
         "aria-pressed"?: boolean | "true" | "false" | "mixed" | undefined;
         "aria-readonly"?: (boolean | "true" | "false") | undefined;
-        "aria-relevant"?: "text" | "all" | "additions" | "additions removals" | "additions text" | "removals" | "removals additions" | "removals text" | "text additions" | "text removals" | undefined;
+        "aria-relevant"?: "text" | "additions" | "additions removals" | "additions text" | "all" | "removals" | "removals additions" | "removals text" | "text additions" | "text removals" | undefined;
         "aria-required"?: (boolean | "true" | "false") | undefined;
         "aria-roledescription"?: string | undefined;
         "aria-rowcount"?: number | undefined;
@@ -302,43 +337,8 @@ export declare function useAbstractBox({ refs, boxTooltip, value, onChange, inGr
         onAnimationIterationCapture?: import("react").AnimationEventHandler<HTMLElement> | undefined;
         onTransitionEnd?: import("react").TransitionEventHandler<HTMLElement> | undefined;
         onTransitionEndCapture?: import("react").TransitionEventHandler<HTMLElement> | undefined;
-        tooltip?: import("react").ReactNode | import("antd").TooltipProps;
-        hidden?: boolean | undefined;
-        contextMenu?: string | undefined;
-        defaultValue?: string | number | readonly string[] | undefined;
-        prefix?: string | undefined;
-        suppressContentEditableWarning?: boolean | undefined;
-        autoCapitalize?: (string & {}) | "none" | "off" | "on" | "sentences" | "words" | "characters" | undefined;
-        contentEditable?: "inherit" | (boolean | "true" | "false") | "plaintext-only" | undefined;
-        draggable?: (boolean | "true" | "false") | undefined;
-        enterKeyHint?: "search" | "done" | "enter" | "next" | "go" | "previous" | "send" | undefined;
-        nonce?: string | undefined;
-        spellCheck?: (boolean | "true" | "false") | undefined;
-        radioGroup?: string | undefined;
-        about?: string | undefined;
-        datatype?: string | undefined;
-        inlist?: any;
-        property?: string | undefined;
-        rel?: string | undefined;
-        resource?: string | undefined;
-        rev?: string | undefined;
-        typeof?: string | undefined;
-        vocab?: string | undefined;
-        autoCorrect?: string | undefined;
-        autoSave?: string | undefined;
-        itemProp?: string | undefined;
-        itemScope?: boolean | undefined;
-        itemType?: string | undefined;
-        itemID?: string | undefined;
-        itemRef?: string | undefined;
-        results?: number | undefined;
-        security?: string | undefined;
-        unselectable?: "off" | "on" | undefined;
-        inputMode?: "search" | "text" | "none" | "email" | "tel" | "url" | "numeric" | "decimal" | undefined;
-        is?: string | undefined;
-        exportparts?: string | undefined;
-        part?: string | undefined;
         rows?: number | false | undefined;
+        tooltip?: import("react").ReactNode | import("antd").TooltipProps;
         autoShowTooltip?: boolean | undefined;
         refs?: import("../../api").Refs | undefined;
         ref: import("../../api").Refs | undefined;

package/es/radio/component/utils.js

@@ -5,7 +5,7 @@ import { highlightTextPropKeys } from "../../select/component/constant";
 import _ from 'lodash';
 export function parseHighlightTextAndRestProps(props) {
   var highlightTextProps = _.pick(props, highlightTextPropKeys);
-  var restProps = _.omit(props, [].concat(_toConsumableArray(highlightTextPropKeys), ['__callback__', 'showAll', 'isNoMatchSearchText', 'shouldRerenderOptions', '__filterNotExistValue__']));
+  var restProps = _.omit(props, [].concat(_toConsumableArray(highlightTextPropKeys), ['__callback__', '__callbackDeps__', 'showAll', 'isNoMatchSearchText', 'shouldRerenderOptions', '__filterNotExistValue__']));
   return {
     highlightTextProps: highlightTextProps,
     restProps: restProps

package/es/select/component/use-select-options.d.ts

@@ -3,7 +3,7 @@ interface DisplayValueProps extends Pick<BaseSelectProps, 'value' | 'options'> {
     filterNotExistValue?: boolean;
 }
 export declare function getDisplayValue({ value, options, filterNotExistValue }: DisplayValueProps): any;
-export declare function useSelectOptions<T = any>({ value, loading, options, __callback__, shouldRerenderOptions, __filterNotExistValue__: filterNotExistValue, ...props }: BaseSelectProps): T & {
+export declare function useSelectOptions<T = any>({ value, loading, options, __callback__, __callbackDeps__, shouldRerenderOptions, __filterNotExistValue__: filterNotExistValue, ...props }: BaseSelectProps): T & {
     value: any;
     options: import("..").SelectOptions | undefined;
     displayOptions: any[];

package/es/select/component/use-select-options.js

@@ -1,6 +1,7 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["value", "loading", "options", "__callback__", "shouldRerenderOptions", "__filterNotExistValue__"];
+var _excluded = ["value", "loading", "options", "__callback__", "__callbackDeps__", "shouldRerenderOptions", "__filterNotExistValue__"];
 import { useFormContext } from "../../form";
 import { isValueNotExistInOptions } from "../../form/component/utils";
 import { useDeepMemo } from "../../hooks";
@@ -36,6 +37,8 @@ export function useSelectOptions(_ref2) {
     loading = _ref2.loading,
     options = _ref2.options,
     __callback__ = _ref2.__callback__,
+    _ref2$__callbackDeps_ = _ref2.__callbackDeps__,
+    __callbackDeps__ = _ref2$__callbackDeps_ === void 0 ? [] : _ref2$__callbackDeps_,
     shouldRerenderOptions = _ref2.shouldRerenderOptions,
     filterNotExistValue = _ref2.__filterNotExistValue__,
     props = _objectWithoutProperties(_ref2, _excluded);
@@ -61,7 +64,7 @@ export function useSelectOptions(_ref2) {
     };
     __callback__ === null || __callback__ === void 0 || __callback__(params);
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [memoValue, memoOptions, finalLoading]);
+  }, [memoValue, memoOptions, finalLoading].concat(_toConsumableArray(__callbackDeps__)));
   var displayOptions = useMemo(function () {
     return generateOptions(_objectSpread({
       options: memoOptions

package/es/select/type/index.d.ts

@@ -3,7 +3,7 @@ import { UseFetchOptions } from "../../hooks";
 import { TextProps } from "../../text";
 import { SelectProps as AntdSelectProps } from 'antd/es/select';
 import { BaseOptionType, DefaultOptionType } from 'rc-select/lib/Select';
-import { ReactNode } from 'react';
+import { DependencyList, ReactNode } from 'react';
 /**
  * @noExtends
  */
@@ -54,6 +54,7 @@ export interface BaseSelectProps {
      */
     __filterNotExistValue__?: boolean;
     __callback__?(props: SelectCallbackProps): void;
+    __callbackDeps__?: DependencyList;
 }
 type UnionType = Omit<AntdSelectProps, 'options'> & Omit<BaseSelectProps, 'options'> & BaseComponentProps;
 export interface SelectProps extends UnionType {

package/es/tabs/component/utils.d.ts

@@ -6,16 +6,16 @@ export declare function getRenderTabBar({ type, items, size, tabBarGutter, tabBa
 export declare function generateTabItems({ items }: TabsProps): {
     label: import("@emotion/react/jsx-runtime").JSX.Element;
     key: string;
-    style?: import("react").CSSProperties | undefined;
+    prefixCls?: string | undefined;
     className?: string | undefined;
-    id?: string | undefined;
+    style?: import("react").CSSProperties | undefined;
+    disabled?: boolean | undefined;
     children?: import("react").ReactNode;
-    icon?: import("react").ReactNode;
+    id?: string | undefined;
     closable?: boolean | undefined;
     closeIcon?: import("react").ReactNode;
     active?: boolean | undefined;
-    disabled?: boolean | undefined;
-    prefixCls?: string | undefined;
+    icon?: import("react").ReactNode;
     forceRender?: boolean | undefined;
     destroyInactiveTabPane?: boolean | undefined;
     animated?: boolean | undefined;

package/lib/form/component/form-item-map.d.ts

@@ -14,6 +14,7 @@ export interface FormItemSelectProps extends Pick<FormItemProps, 'requiredInOpti
 export declare function useCollectFormItemState({ name, collectState, filterNotExistValue, requiredInOptions, form: outerForm, ...props }: FormItemSelectProps): {
     __filterNotExistValue__: boolean;
     __callback__: import("use-debounce").DebouncedState<({ loading, options, value }: SelectCallbackProps) => Promise<void>>;
+    __callbackDeps__: (string | number | boolean | undefined)[];
     labelInValue?: boolean | undefined;
 };
 declare function FormItemSelect(props: FormItemSelectProps & SelectProps): import("@emotion/react/jsx-runtime").JSX.Element;

package/lib/form/component/form-item-map.js

@@ -92,7 +92,8 @@ function useCollectFormItemState(_ref) {
   }
   return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
     __filterNotExistValue__: !!requiredInOptionsAndFilterNotExistValue,
-    __callback__: (0, _hooks.useDebounce)(onCallback)
+    __callback__: (0, _hooks.useDebounce)(onCallback),
+    __callbackDeps__: [filterNotExistValue, requiredInOptions]
   });
 }
 function FormItemSelect(props) {

package/lib/form/component/utils.d.ts

@@ -24,7 +24,7 @@ export declare function getFormItemProps(props: any): {
             pointAtCenter?: boolean | undefined;
         };
         autoAdjustOverflow?: boolean | import("antd/es/tooltip").AdjustOverflow | undefined;
-        getPopupContainer: typeof import("../../api").getPopupContainer;
+        getPopupContainer: (triggerNode: HTMLElement) => HTMLElement;
         children?: import("react").ReactNode;
         destroyTooltipOnHide?: boolean | {
             keepParent?: boolean | undefined;
@@ -38,12 +38,13 @@ export declare function getFormItemProps(props: any): {
         defaultVisible?: boolean | undefined;
         onVisibleChange?: ((visible: boolean) => void) | undefined;
         afterVisibleChange?: ((visible: boolean) => void) | undefined;
-        zIndex?: number | undefined;
-        animation?: string | undefined;
-        motion?: import("rc-motion").CSSMotionProps | undefined;
-        id?: string | undefined;
         prefixCls?: string | undefined;
+        id?: string | undefined;
+        animation?: string | undefined;
         transitionName?: string | undefined;
+        showArrow?: boolean | import("@rc-component/trigger").ArrowType | undefined;
+        zIndex?: number | undefined;
+        motion?: import("rc-motion").CSSMotionProps | undefined;
         mouseEnterDelay?: number | undefined;
         mouseLeaveDelay?: number | undefined;
         onPopupAlign?: ((element: HTMLElement, align: import("@rc-component/trigger").AlignType) => void) | undefined;
@@ -55,7 +56,6 @@ export declare function getFormItemProps(props: any): {
         forceRender?: boolean | undefined;
         fresh?: boolean | undefined;
         getTooltipContainer?: ((node: HTMLElement) => HTMLElement) | undefined;
-        showArrow?: boolean | import("@rc-component/trigger").ArrowType | undefined;
         arrowContent?: import("react").ReactNode;
         overlayInnerStyle?: import("react").CSSProperties | undefined;
         icon: import("@emotion/react/jsx-runtime").JSX.Element;

package/lib/form/component/utils.js

@@ -181,7 +181,7 @@ function generateRules(_ref2) {
       var _form$getItems;
       var value = _ref3.value;
       var options = (_form$getItems = form.getItems(item.name)) === null || _form$getItems === void 0 ? void 0 : _form$getItems.options;
-      if (!isEmpty(value) && isValueNotExistInOptions(value, options)) {
+      if (!isEmpty(value) && options && isValueNotExistInOptions(value, options)) {
         return _message;
       }
     };

package/lib/hooks/hook/use-fetch.js

@@ -12,7 +12,6 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _2 = require("./..");
 var _lodash = _interopRequireDefault(require("lodash"));
-var _reactFastCompare = _interopRequireDefault(require("react-fast-compare"));
 var _reactUse = require("react-use");
 var _excluded = ["wait"];
 var defaultOptions = {
@@ -52,7 +51,8 @@ function useFetch(_fn, dependencyList, options) {
             args[_key] = _args[_key];
           }
           setState({
-            loading: true
+            loading: true,
+            error: undefined
           });
           _context.prev = 2;
           _context.next = 5;
@@ -72,16 +72,9 @@ function useFetch(_fn, dependencyList, options) {
           }
           return _context.abrupt("return");
         case 10:
-          setState(function (prevState) {
-            if ((0, _reactFastCompare.default)(prevState.data, data)) {
-              return {
-                loading: false
-              };
-            }
-            return {
-              loading: false,
-              data: data
-            };
+          setState({
+            loading: false,
+            data: data
           });
           _context.next = 16;
           break;

package/lib/open-modal/component/index.js

@@ -1,5 +1,6 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -9,7 +10,11 @@ var _exportNames = {
 };
 exports.closeModal = closeModal;
 exports.openModal = openModal;
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _api = require("../../api");
+var _antd = require("antd");
+var _zh_CN = _interopRequireDefault(require("antd/es/locale/zh_CN"));
 var _modal = require("./modal");
 Object.keys(_modal).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -22,8 +27,19 @@ Object.keys(_modal).forEach(function (key) {
     }
   });
 });
+var _jsxRuntime = require("@emotion/react/jsx-runtime");
+var _excluded = ["configProviderProps"];
+function ModalWrapper(_ref) {
+  var configProviderProps = _ref.configProviderProps,
+    props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
+  return (0, _jsxRuntime.jsx)(_antd.ConfigProvider, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+    locale: _zh_CN.default
+  }, configProviderProps), {}, {
+    children: (0, _jsxRuntime.jsx)(_modal.Modal, (0, _objectSpread2.default)({}, props))
+  }));
+}
 function openModal(props) {
-  return (0, _api.mountComponent)(_modal.Modal, props);
+  return (0, _api.mountComponent)(ModalWrapper, props);
 }
 function closeModal() {
   (0, _api.unmountComponent)();

package/lib/open-modal/type/index.d.ts

@@ -1,6 +1,7 @@
 import { FunctionReturn } from "../../api";
 import { FormInstance, FormItemProps, FormProps, FormValues } from "../../form";
 import { CSSObject } from '@emotion/react';
+import { ConfigProviderProps } from 'antd/es/config-provider';
 import type { ModalProps as AntdModalProps } from 'antd/es/modal';
 import { ReactNode } from 'react';
 type AntdComponentProps = Omit<AntdModalProps, 'onOk' | 'children'> & Omit<FormProps, 'children' | 'content' | 'title'>;
@@ -46,6 +47,10 @@ export interface OpenModalProps extends AntdComponentProps {
      * @description 对话框外层容器的样式
      */
     wrapStyle?: CSSObject;
+    /**
+     * @description Antd Provider Props
+     */
+    configProviderProps?: Omit<ConfigProviderProps, 'children'>;
     /**
      * @description 点击取消按钮的回调
      */

package/lib/radio/component/abstract-box.d.ts

@@ -36,24 +36,24 @@ export declare function useAbstractBox({ refs, boxTooltip, value, onChange, inGr
         defaultVisible?: boolean | undefined;
         onVisibleChange?: ((visible: boolean) => void) | undefined;
         afterVisibleChange?: ((visible: boolean) => void) | undefined;
-        zIndex?: number | undefined;
-        animation?: string | undefined;
-        motion?: import("rc-motion").CSSMotionProps | undefined;
-        id?: string | undefined;
         prefixCls?: string | undefined;
+        id?: string | undefined;
+        animation?: string | undefined;
         transitionName?: string | undefined;
-        mouseEnterDelay?: number | undefined;
-        mouseLeaveDelay?: number | undefined;
-        onPopupAlign?: ((element: HTMLElement, align: import("@rc-component/trigger").AlignType) => void) | undefined;
-        overlayClassName?: string | undefined;
-        align?: import("@rc-component/trigger").AlignType | undefined;
-        overlayStyle?: import("react").CSSProperties | undefined;
+        showArrow?: boolean | import("@rc-component/trigger").ArrowType | undefined;
+        zIndex?: number | undefined;
+        motion?: import("rc-motion").CSSMotionProps | undefined;
         trigger?: import("@rc-component/trigger").ActionType | import("@rc-component/trigger").ActionType[] | undefined;
-        popupVisible?: boolean | undefined;
-        forceRender?: boolean | undefined;
+        align?: import("@rc-component/trigger").AlignType | undefined;
+        onPopupAlign?: ((element: HTMLElement, align: import("@rc-component/trigger").AlignType) => void) | undefined;
         fresh?: boolean | undefined;
+        mouseLeaveDelay?: number | undefined;
+        mouseEnterDelay?: number | undefined;
+        forceRender?: boolean | undefined;
+        popupVisible?: boolean | undefined;
+        overlayStyle?: import("react").CSSProperties | undefined;
+        overlayClassName?: string | undefined;
         getTooltipContainer?: ((node: HTMLElement) => HTMLElement) | undefined;
-        showArrow?: boolean | import("@rc-component/trigger").ArrowType | undefined;
         arrowContent?: import("react").ReactNode;
         overlayInnerStyle?: import("react").CSSProperties | undefined;
     };
@@ -65,37 +65,73 @@ export declare function useAbstractBox({ refs, boxTooltip, value, onChange, inGr
         value?: any;
         boxTooltip?: import("react").ReactNode | import("antd").TooltipProps;
         inGroup?: boolean | undefined;
+        name?: string | undefined;
+        prefixCls?: string | undefined;
+        className?: string | undefined;
+        rootClassName?: string | undefined;
+        disabled?: boolean | undefined;
         style?: import("react").CSSProperties | undefined;
+        indeterminate?: boolean | undefined;
+        defaultChecked?: boolean | undefined;
+        checked?: boolean | undefined;
         title?: string | undefined;
-        className?: string | undefined;
-        id?: string | undefined;
-        name?: string | undefined;
-        type?: string | undefined;
-        tabIndex?: number | undefined;
-        onKeyDown?: import("react").KeyboardEventHandler<HTMLElement> | undefined;
-        onKeyPress?: import("react").KeyboardEventHandler<HTMLElement> | undefined;
         onClick?: import("react").MouseEventHandler<HTMLElement> | undefined;
         onMouseEnter?: import("react").MouseEventHandler<HTMLElement> | undefined;
         onMouseLeave?: import("react").MouseEventHandler<HTMLElement> | undefined;
-        disabled?: boolean | undefined;
-        checked?: boolean | undefined;
-        required?: boolean | undefined;
-        defaultChecked?: boolean | undefined;
+        onKeyPress?: import("react").KeyboardEventHandler<HTMLElement> | undefined;
+        onKeyDown?: import("react").KeyboardEventHandler<HTMLElement> | undefined;
+        tabIndex?: number | undefined;
+        id?: string | undefined;
         autoFocus?: boolean | undefined;
-        prefixCls?: string | undefined;
-        rootClassName?: string | undefined;
-        indeterminate?: boolean | undefined;
+        type?: string | undefined;
         skipGroup?: boolean | undefined;
-        slot?: string | undefined;
-        accessKey?: string | undefined;
-        dir?: string | undefined;
-        color?: string | undefined;
-        content?: string | undefined;
+        required?: boolean | undefined;
+        defaultValue?: string | number | readonly string[] | undefined;
+        'aria-label'?: string | undefined;
         direction?: import("antd/es/config-provider").DirectionType;
-        translate?: "no" | "yes" | undefined;
+        suppressContentEditableWarning?: boolean | undefined;
         suppressHydrationWarning?: boolean | undefined;
+        accessKey?: string | undefined;
+        autoCapitalize?: "off" | "none" | "on" | "sentences" | "words" | "characters" | (string & {}) | undefined;
+        contentEditable?: (boolean | "true" | "false") | "inherit" | "plaintext-only" | undefined;
+        contextMenu?: string | undefined;
+        dir?: string | undefined;
+        draggable?: (boolean | "true" | "false") | undefined;
+        enterKeyHint?: "search" | "enter" | "done" | "go" | "next" | "previous" | "send" | undefined;
+        hidden?: boolean | undefined;
         lang?: string | undefined;
+        nonce?: string | undefined;
+        slot?: string | undefined;
+        spellCheck?: (boolean | "true" | "false") | undefined;
+        translate?: "yes" | "no" | undefined;
+        radioGroup?: string | undefined;
         role?: import("react").AriaRole | undefined;
+        about?: string | undefined;
+        content?: string | undefined;
+        datatype?: string | undefined;
+        inlist?: any;
+        prefix?: string | undefined;
+        property?: string | undefined;
+        rel?: string | undefined;
+        resource?: string | undefined;
+        rev?: string | undefined;
+        typeof?: string | undefined;
+        vocab?: string | undefined;
+        autoCorrect?: string | undefined;
+        autoSave?: string | undefined;
+        color?: string | undefined;
+        itemProp?: string | undefined;
+        itemScope?: boolean | undefined;
+        itemType?: string | undefined;
+        itemID?: string | undefined;
+        itemRef?: string | undefined;
+        results?: number | undefined;
+        security?: string | undefined;
+        unselectable?: "off" | "on" | undefined;
+        inputMode?: "text" | "search" | "none" | "tel" | "url" | "email" | "numeric" | "decimal" | undefined;
+        is?: string | undefined;
+        exportparts?: string | undefined;
+        part?: string | undefined;
         "aria-activedescendant"?: string | undefined;
         "aria-atomic"?: (boolean | "true" | "false") | undefined;
         "aria-autocomplete"?: "none" | "list" | "inline" | "both" | undefined;
@@ -108,21 +144,20 @@ export declare function useAbstractBox({ refs, boxTooltip, value, onChange, inGr
         "aria-colindextext"?: string | undefined;
         "aria-colspan"?: number | undefined;
         "aria-controls"?: string | undefined;
-        "aria-current"?: boolean | "time" | "page" | "true" | "false" | "step" | "location" | "date" | undefined;
+        "aria-current"?: boolean | "true" | "false" | "page" | "step" | "location" | "date" | "time" | undefined;
         "aria-describedby"?: string | undefined;
         "aria-description"?: string | undefined;
         "aria-details"?: string | undefined;
         "aria-disabled"?: (boolean | "true" | "false") | undefined;
-        "aria-dropeffect"?: "link" | "none" | "copy" | "execute" | "move" | "popup" | undefined;
+        "aria-dropeffect"?: "none" | "link" | "copy" | "execute" | "move" | "popup" | undefined;
         "aria-errormessage"?: string | undefined;
         "aria-expanded"?: (boolean | "true" | "false") | undefined;
         "aria-flowto"?: string | undefined;
         "aria-grabbed"?: (boolean | "true" | "false") | undefined;
-        "aria-haspopup"?: boolean | "dialog" | "menu" | "grid" | "listbox" | "tree" | "true" | "false" | undefined;
+        "aria-haspopup"?: boolean | "true" | "false" | "dialog" | "grid" | "listbox" | "menu" | "tree" | undefined;
         "aria-hidden"?: (boolean | "true" | "false") | undefined;
         "aria-invalid"?: boolean | "true" | "false" | "grammar" | "spelling" | undefined;
         "aria-keyshortcuts"?: string | undefined;
-        'aria-label'?: string | undefined;
         "aria-labelledby"?: string | undefined;
         "aria-level"?: number | undefined;
         "aria-live"?: "off" | "assertive" | "polite" | undefined;
@@ -135,7 +170,7 @@ export declare function useAbstractBox({ refs, boxTooltip, value, onChange, inGr
         "aria-posinset"?: number | undefined;
         "aria-pressed"?: boolean | "true" | "false" | "mixed" | undefined;
         "aria-readonly"?: (boolean | "true" | "false") | undefined;
-        "aria-relevant"?: "text" | "all" | "additions" | "additions removals" | "additions text" | "removals" | "removals additions" | "removals text" | "text additions" | "text removals" | undefined;
+        "aria-relevant"?: "text" | "additions" | "additions removals" | "additions text" | "all" | "removals" | "removals additions" | "removals text" | "text additions" | "text removals" | undefined;
         "aria-required"?: (boolean | "true" | "false") | undefined;
         "aria-roledescription"?: string | undefined;
         "aria-rowcount"?: number | undefined;
@@ -302,43 +337,8 @@ export declare function useAbstractBox({ refs, boxTooltip, value, onChange, inGr
         onAnimationIterationCapture?: import("react").AnimationEventHandler<HTMLElement> | undefined;
         onTransitionEnd?: import("react").TransitionEventHandler<HTMLElement> | undefined;
         onTransitionEndCapture?: import("react").TransitionEventHandler<HTMLElement> | undefined;
-        tooltip?: import("react").ReactNode | import("antd").TooltipProps;
-        hidden?: boolean | undefined;
-        contextMenu?: string | undefined;
-        defaultValue?: string | number | readonly string[] | undefined;
-        prefix?: string | undefined;
-        suppressContentEditableWarning?: boolean | undefined;
-        autoCapitalize?: (string & {}) | "none" | "off" | "on" | "sentences" | "words" | "characters" | undefined;
-        contentEditable?: "inherit" | (boolean | "true" | "false") | "plaintext-only" | undefined;
-        draggable?: (boolean | "true" | "false") | undefined;
-        enterKeyHint?: "search" | "done" | "enter" | "next" | "go" | "previous" | "send" | undefined;
-        nonce?: string | undefined;
-        spellCheck?: (boolean | "true" | "false") | undefined;
-        radioGroup?: string | undefined;
-        about?: string | undefined;
-        datatype?: string | undefined;
-        inlist?: any;
-        property?: string | undefined;
-        rel?: string | undefined;
-        resource?: string | undefined;
-        rev?: string | undefined;
-        typeof?: string | undefined;
-        vocab?: string | undefined;
-        autoCorrect?: string | undefined;
-        autoSave?: string | undefined;
-        itemProp?: string | undefined;
-        itemScope?: boolean | undefined;
-        itemType?: string | undefined;
-        itemID?: string | undefined;
-        itemRef?: string | undefined;
-        results?: number | undefined;
-        security?: string | undefined;
-        unselectable?: "off" | "on" | undefined;
-        inputMode?: "search" | "text" | "none" | "email" | "tel" | "url" | "numeric" | "decimal" | undefined;
-        is?: string | undefined;
-        exportparts?: string | undefined;
-        part?: string | undefined;
         rows?: number | false | undefined;
+        tooltip?: import("react").ReactNode | import("antd").TooltipProps;
         autoShowTooltip?: boolean | undefined;
         refs?: import("../../api").Refs | undefined;
         ref: import("../../api").Refs | undefined;

package/lib/radio/component/utils.js

@@ -13,7 +13,7 @@ var _constant = require("../../select/component/constant");
 var _lodash = _interopRequireDefault(require("lodash"));
 function parseHighlightTextAndRestProps(props) {
   var highlightTextProps = _lodash.default.pick(props, _constant.highlightTextPropKeys);
-  var restProps = _lodash.default.omit(props, [].concat((0, _toConsumableArray2.default)(_constant.highlightTextPropKeys), ['__callback__', 'showAll', 'isNoMatchSearchText', 'shouldRerenderOptions', '__filterNotExistValue__']));
+  var restProps = _lodash.default.omit(props, [].concat((0, _toConsumableArray2.default)(_constant.highlightTextPropKeys), ['__callback__', '__callbackDeps__', 'showAll', 'isNoMatchSearchText', 'shouldRerenderOptions', '__filterNotExistValue__']));
   return {
     highlightTextProps: highlightTextProps,
     restProps: restProps

package/lib/select/component/use-select-options.d.ts

@@ -3,7 +3,7 @@ interface DisplayValueProps extends Pick<BaseSelectProps, 'value' | 'options'> {
     filterNotExistValue?: boolean;
 }
 export declare function getDisplayValue({ value, options, filterNotExistValue }: DisplayValueProps): any;
-export declare function useSelectOptions<T = any>({ value, loading, options, __callback__, shouldRerenderOptions, __filterNotExistValue__: filterNotExistValue, ...props }: BaseSelectProps): T & {
+export declare function useSelectOptions<T = any>({ value, loading, options, __callback__, __callbackDeps__, shouldRerenderOptions, __filterNotExistValue__: filterNotExistValue, ...props }: BaseSelectProps): T & {
     value: any;
     options: import("..").SelectOptions | undefined;
     displayOptions: any[];

package/lib/select/component/use-select-options.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.getDisplayValue = getDisplayValue;
 exports.useSelectOptions = useSelectOptions;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _form = require("../../form");
 var _utils = require("../../form/component/utils");
@@ -14,7 +15,7 @@ var _hooks = require("../../hooks");
 var _lodash = _interopRequireDefault(require("lodash"));
 var _react = require("react");
 var _utils2 = require("./utils");
-var _excluded = ["value", "loading", "options", "__callback__", "shouldRerenderOptions", "__filterNotExistValue__"];
+var _excluded = ["value", "loading", "options", "__callback__", "__callbackDeps__", "shouldRerenderOptions", "__filterNotExistValue__"];
 var selectOptionsPropKeys = ['options', 'search', 'sort', 'renderLabel', 'presetProcessOption', 'finalProcessOption'];
 function parseSelectOptionsAndRestProps(props) {
   var selectOptionsProps = _lodash.default.pick(props, selectOptionsPropKeys);
@@ -44,6 +45,8 @@ function useSelectOptions(_ref2) {
     loading = _ref2.loading,
     options = _ref2.options,
     __callback__ = _ref2.__callback__,
+    _ref2$__callbackDeps_ = _ref2.__callbackDeps__,
+    __callbackDeps__ = _ref2$__callbackDeps_ === void 0 ? [] : _ref2$__callbackDeps_,
     shouldRerenderOptions = _ref2.shouldRerenderOptions,
     filterNotExistValue = _ref2.__filterNotExistValue__,
     props = (0, _objectWithoutProperties2.default)(_ref2, _excluded);
@@ -69,7 +72,7 @@ function useSelectOptions(_ref2) {
     };
     __callback__ === null || __callback__ === void 0 || __callback__(params);
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [memoValue, memoOptions, finalLoading]);
+  }, [memoValue, memoOptions, finalLoading].concat((0, _toConsumableArray2.default)(__callbackDeps__)));
   var displayOptions = (0, _react.useMemo)(function () {
     return (0, _utils2.generateOptions)((0, _objectSpread2.default)({
       options: memoOptions

package/lib/select/type/index.d.ts

@@ -3,7 +3,7 @@ import { UseFetchOptions } from "../../hooks";
 import { TextProps } from "../../text";
 import { SelectProps as AntdSelectProps } from 'antd/es/select';
 import { BaseOptionType, DefaultOptionType } from 'rc-select/lib/Select';
-import { ReactNode } from 'react';
+import { DependencyList, ReactNode } from 'react';
 /**
  * @noExtends
  */
@@ -54,6 +54,7 @@ export interface BaseSelectProps {
      */
     __filterNotExistValue__?: boolean;
     __callback__?(props: SelectCallbackProps): void;
+    __callbackDeps__?: DependencyList;
 }
 type UnionType = Omit<AntdSelectProps, 'options'> & Omit<BaseSelectProps, 'options'> & BaseComponentProps;
 export interface SelectProps extends UnionType {

package/lib/tabs/component/utils.d.ts

@@ -6,16 +6,16 @@ export declare function getRenderTabBar({ type, items, size, tabBarGutter, tabBa
 export declare function generateTabItems({ items }: TabsProps): {
     label: import("@emotion/react/jsx-runtime").JSX.Element;
     key: string;
-    style?: import("react").CSSProperties | undefined;
+    prefixCls?: string | undefined;
     className?: string | undefined;
-    id?: string | undefined;
+    style?: import("react").CSSProperties | undefined;
+    disabled?: boolean | undefined;
     children?: import("react").ReactNode;
-    icon?: import("react").ReactNode;
+    id?: string | undefined;
     closable?: boolean | undefined;
     closeIcon?: import("react").ReactNode;
     active?: boolean | undefined;
-    disabled?: boolean | undefined;
-    prefixCls?: string | undefined;
+    icon?: import("react").ReactNode;
     forceRender?: boolean | undefined;
     destroyInactiveTabPane?: boolean | undefined;
     animated?: boolean | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doui-react",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "A React UI library based on Ant Design",
   "license": "MIT",
   "main": "lib/index.js",