doui-react 2.0.9 → 2.0.11

package/es/api/component/common.d.ts

@@ -18,5 +18,5 @@ export declare function includesNonStrictMode(options?: Array<OptionType>, value
 export declare function mergeProps<T, U>(originProps: T, patchProps: U): {} & T & U;
 export declare function mergeFunction(...fns: Array<FunctionType | undefined>): (...args: any[]) => void;
 export declare function transformNullToUndefined<T>(value: T): T;
-export declare function wait(fn: Function, timeout?: number): Promise<unknown>;
+export declare function wait(fn: Function, timeout?: number): Promise<boolean>;
 export {};

package/es/api/component/common.js

@@ -2,8 +2,8 @@ import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import dayjs from 'dayjs';
 import 'dayjs/locale/zh-cn';
-import delay from 'delay';
 import _ from 'lodash';
+import pWaitFor from 'p-wait-for';
 import { cloneElement, isValidElement } from 'react';
 import { Fragment as _Fragment, jsx as _jsx } from "@emotion/react/jsx-runtime";
 dayjs.locale('zh-cn');
@@ -99,49 +99,58 @@ export function transformNullToUndefined(value) {
   }
   return value;
 }
-export function wait(fn) {
-  var timeout = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 30 * 1000;
-  var interval = 100;
-  return new Promise(function (resolve) {
-    function run() {
-      return _run.apply(this, arguments);
-    }
-    function _run() {
-      _run = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-        var times,
-          _args = arguments;
-        return _regeneratorRuntime().wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              times = _args.length > 0 && _args[0] !== undefined ? _args[0] : 0;
-              if (!(times * interval >= timeout)) {
-                _context.next = 3;
-                break;
-              }
-              return _context.abrupt("return", resolve(false));
-            case 3:
-              _context.next = 5;
-              return fn();
-            case 5:
-              if (!_context.sent) {
-                _context.next = 7;
-                break;
-              }
-              return _context.abrupt("return", resolve(true));
-            case 7:
-              _context.next = 9;
-              return delay(interval);
-            case 9:
-              _context.next = 11;
-              return run(times + 1);
-            case 11:
-            case "end":
-              return _context.stop();
-          }
-        }, _callee);
-      }));
-      return _run.apply(this, arguments);
-    }
-    run();
-  });
+function checkCondition(_x) {
+  return _checkCondition.apply(this, arguments);
+}
+function _checkCondition() {
+  _checkCondition = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(fn) {
+    var result;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          _context.next = 2;
+          return fn();
+        case 2:
+          result = _context.sent;
+          return _context.abrupt("return", !!result);
+        case 4:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return _checkCondition.apply(this, arguments);
+}
+export function wait(_x2) {
+  return _wait.apply(this, arguments);
+}
+function _wait() {
+  _wait = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(fn) {
+    var timeout,
+      _args2 = arguments;
+    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          timeout = _args2.length > 1 && _args2[1] !== undefined ? _args2[1] : 30 * 1000;
+          _context2.prev = 1;
+          _context2.next = 4;
+          return pWaitFor(function () {
+            return checkCondition(fn);
+          }, {
+            interval: 300,
+            timeout: timeout
+          });
+        case 4:
+          return _context2.abrupt("return", true);
+        case 7:
+          _context2.prev = 7;
+          _context2.t0 = _context2["catch"](1);
+          return _context2.abrupt("return", false);
+        case 10:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2, null, [[1, 7]]);
+  }));
+  return _wait.apply(this, arguments);
 }

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

@@ -12,8 +12,8 @@ export declare function getFormItemProps(props: any): {
         color?: string | undefined;
         title?: import("react").ReactNode | import("antd/es/_util/getRenderPropValue").RenderFunction;
         overlay?: import("react").ReactNode | import("antd/es/_util/getRenderPropValue").RenderFunction;
-        styles?: Partial<Record<"root" | "body", import("react").CSSProperties>> | undefined;
-        classNames: Partial<Record<"root" | "body", string>>;
+        styles?: Partial<Record<"body" | "root", import("react").CSSProperties>> | undefined;
+        classNames: Partial<Record<"body" | "root", string>>;
         rootClassName?: string | undefined;
         placement?: import("antd/es/tooltip").TooltipPlacement | undefined;
         builtinPlacements?: import("@rc-component/trigger").BuildInPlacements | undefined;
@@ -24,7 +24,7 @@ export declare function getFormItemProps(props: any): {
             pointAtCenter?: boolean | undefined;
         };
         autoAdjustOverflow?: boolean | import("antd/es/tooltip").AdjustOverflow | undefined;
-        getPopupContainer: (triggerNode: HTMLElement) => HTMLElement;
+        getPopupContainer: typeof import("../../api").getPopupContainer;
         children?: import("react").ReactNode;
         destroyTooltipOnHide?: boolean | {
             keepParent?: boolean | undefined;
@@ -38,26 +38,26 @@ export declare function getFormItemProps(props: any): {
         defaultVisible?: boolean | undefined;
         onVisibleChange?: ((visible: boolean) => void) | undefined;
         afterVisibleChange?: ((visible: boolean) => void) | undefined;
-        prefixCls?: string | 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;
-        trigger?: import("@rc-component/trigger").ActionType | import("@rc-component/trigger").ActionType[] | undefined;
-        transitionName?: string | undefined;
+        zIndex?: number | undefined;
         animation?: string | undefined;
         motion?: import("rc-motion").CSSMotionProps | undefined;
-        overlayStyle?: import("react").CSSProperties | undefined;
+        transitionName?: string | undefined;
+        prefixCls?: string | undefined;
+        forceRender?: boolean | undefined;
+        id?: string | undefined;
+        mouseEnterDelay?: number | undefined;
+        mouseLeaveDelay?: number | undefined;
+        onPopupAlign?: ((element: HTMLElement, align: import("@rc-component/trigger").AlignType) => void) | undefined;
         overlayClassName?: string | undefined;
-        getTooltipContainer?: ((node: HTMLElement) => HTMLElement) | undefined;
         align?: import("@rc-component/trigger").AlignType | undefined;
+        overlayStyle?: import("react").CSSProperties | undefined;
+        trigger?: import("@rc-component/trigger").ActionType | import("@rc-component/trigger").ActionType[] | undefined;
+        popupVisible?: boolean | undefined;
+        fresh?: boolean | undefined;
+        getTooltipContainer?: ((node: HTMLElement) => HTMLElement) | undefined;
         showArrow?: boolean | import("@rc-component/trigger").ArrowType | undefined;
         arrowContent?: import("react").ReactNode;
-        id?: string | undefined;
         overlayInnerStyle?: import("react").CSSProperties | undefined;
-        zIndex?: number | undefined;
         icon: import("@emotion/react/jsx-runtime").JSX.Element;
     } | undefined;
     initialValue: any;

package/es/form/style/index.js

@@ -7,7 +7,7 @@ var style = {
   wrapper: function wrapper(_ref) {
     var labelWidth = _ref.labelWidth,
       formItemMarginBottom = _ref.formItemMarginBottom;
-    return css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n    .ant-form-item {\n      margin-bottom: ", ";\n    }\n\n    .ant-form-item-label {\n      width: ", ";\n    }\n\n    .ant-form-item-with-help .ant-form-item-explain {\n      line-height: 1.1;\n      padding: 4px 0;\n\n      .ant-form-item-explain-error + .ant-form-item-explain-error {\n        margin-top: 2px;\n      }\n    }\n\n    &.ant-form-horizontal {\n      .ant-form-item-required::before {\n        position: absolute;\n        left: -10px;\n      }\n    }\n\n    &.ant-form-vertical {\n      .ant-form-item-label {\n        padding-bottom: 5px;\n      }\n    }\n  "])), transformValueWithStyleUnit(formItemMarginBottom), transformValueWithStyleUnit(labelWidth));
+    return css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n    .ant-form-item {\n      margin-bottom: ", ";\n    }\n\n    .ant-form-item-label {\n      width: ", ";\n    }\n\n    .ant-form-item-with-help .ant-form-item-explain {\n      line-height: 1.1;\n      padding: 4px 0;\n\n      .ant-form-item-explain-error + .ant-form-item-explain-error {\n        margin-top: 2px;\n      }\n    }\n\n    &.ant-form-horizontal {\n      .ant-form-item-label {\n        padding-left: 10px;\n      }\n\n      .ant-form-item-required::before {\n        position: absolute;\n        left: -10px;\n      }\n    }\n\n    &.ant-form-vertical {\n      .ant-form-item-label {\n        padding-bottom: 5px;\n      }\n    }\n  "])), transformValueWithStyleUnit(formItemMarginBottom), transformValueWithStyleUnit(labelWidth));
   }
 };
 export default style;

package/es/grid/component/pagination.d.ts

@@ -11,7 +11,7 @@ export declare function usePagination({ data, rows, column, pagination }: Pagina
     current: number;
     total: number;
     onChange: import("react").Dispatch<import("react").SetStateAction<number>>;
-    position?: ("none" | "bottomLeft" | "bottomRight" | "topLeft" | "topRight" | "topCenter" | "bottomCenter")[] | undefined;
+    position?: ("none" | "topLeft" | "topRight" | "bottomLeft" | "bottomRight" | "topCenter" | "bottomCenter")[] | undefined;
     showQuickJumper?: boolean | {
         goButton?: import("react").ReactNode;
     } | undefined;
@@ -23,12 +23,12 @@ export declare function usePagination({ data, rows, column, pagination }: Pagina
     showSizeChanger?: boolean | import("antd").SelectProps<any, import("rc-select/lib/Select").DefaultOptionType> | undefined;
     selectComponentClass?: any;
     pageSizeOptions?: (string | number)[] | undefined;
-    className?: string | undefined;
     style?: import("react").CSSProperties | undefined;
+    className?: string | undefined;
     prefixCls?: string | undefined;
     "aria-activedescendant"?: string | undefined;
     "aria-atomic"?: (boolean | "true" | "false") | undefined;
-    "aria-autocomplete"?: "inline" | "none" | "list" | "both" | undefined;
+    "aria-autocomplete"?: "none" | "list" | "inline" | "both" | undefined;
     "aria-braillelabel"?: string | undefined;
     "aria-brailleroledescription"?: string | undefined;
     "aria-busy"?: (boolean | "true" | "false") | undefined;
@@ -38,17 +38,17 @@ export declare function usePagination({ data, rows, column, pagination }: Pagina
     "aria-colindextext"?: string | undefined;
     "aria-colspan"?: number | undefined;
     "aria-controls"?: string | undefined;
-    "aria-current"?: boolean | "page" | "true" | "false" | "step" | "location" | "date" | "time" | undefined;
+    "aria-current"?: boolean | "time" | "page" | "true" | "false" | "step" | "location" | "date" | undefined;
     "aria-describedby"?: string | undefined;
     "aria-description"?: string | undefined;
     "aria-details"?: string | undefined;
     "aria-disabled"?: (boolean | "true" | "false") | undefined;
-    "aria-dropeffect"?: "none" | "link" | "copy" | "execute" | "move" | "popup" | undefined;
+    "aria-dropeffect"?: "link" | "none" | "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 | "grid" | "true" | "false" | "dialog" | "listbox" | "menu" | "tree" | undefined;
+    "aria-haspopup"?: boolean | "dialog" | "menu" | "grid" | "listbox" | "tree" | "true" | "false" | undefined;
     "aria-hidden"?: (boolean | "true" | "false") | undefined;
     "aria-invalid"?: boolean | "true" | "false" | "grammar" | "spelling" | undefined;
     "aria-keyshortcuts"?: string | undefined;
@@ -65,7 +65,7 @@ export declare function usePagination({ data, rows, column, pagination }: Pagina
     "aria-posinset"?: number | undefined;
     "aria-pressed"?: boolean | "true" | "false" | "mixed" | undefined;
     "aria-readonly"?: (boolean | "true" | "false") | undefined;
-    "aria-relevant"?: "all" | "text" | "additions" | "additions removals" | "additions text" | "removals" | "removals additions" | "removals text" | "text additions" | "text removals" | undefined;
+    "aria-relevant"?: "text" | "all" | "additions" | "additions removals" | "additions text" | "removals" | "removals additions" | "removals text" | "text additions" | "text removals" | undefined;
     "aria-required"?: (boolean | "true" | "false") | undefined;
     "aria-roledescription"?: string | undefined;
     "aria-rowcount"?: number | undefined;
@@ -80,10 +80,10 @@ export declare function usePagination({ data, rows, column, pagination }: Pagina
     "aria-valuenow"?: number | undefined;
     "aria-valuetext"?: string | undefined;
     disabled?: boolean | undefined;
-    align?: "start" | "end" | "center" | undefined;
     locale?: import("rc-pagination").PaginationLocale | undefined;
     prevIcon?: import("react").ReactNode | import("react").ComponentType<{}>;
     nextIcon?: import("react").ReactNode | import("react").ComponentType<{}>;
+    align?: "center" | "end" | "start" | undefined;
     selectPrefixCls?: string | undefined;
     defaultCurrent?: number | undefined;
     defaultPageSize?: number | undefined;
@@ -98,9 +98,9 @@ export declare function usePagination({ data, rows, column, pagination }: Pagina
     jumpPrevIcon?: import("react").ReactNode | import("react").ComponentType<{}>;
     jumpNextIcon?: import("react").ReactNode | import("react").ComponentType<{}>;
     onShowSizeChange?: ((current: number, size: number) => void) | undefined;
-    itemRender?: ((page: number, type: "page" | "next" | "prev" | "jump-prev" | "jump-next", element: import("react").ReactNode) => import("react").ReactNode) | undefined;
+    itemRender?: ((page: number, type: "page" | "prev" | "next" | "jump-prev" | "jump-next", element: import("react").ReactNode) => import("react").ReactNode) | undefined;
     showTotal?: ((total: number, range: [number, number]) => import("react").ReactNode) | undefined;
-    justify?: "left" | "right" | "center" | "between" | undefined;
+    justify?: "center" | "left" | "right" | "between" | undefined;
 };
 export type PaginationProps = TablePaginationConfig & Pick<HStackProps, 'justify'>;
 export declare function Pagination({ justify, className, style, ...props }: PaginationProps): import("@emotion/react/jsx-runtime").JSX.Element;