doui-react 1.0.2 → 2.0.1

package/lib/form/component/utils.js

@@ -40,7 +40,7 @@ var _utils = require("../../select/component/utils");
 var _text = require("../../text");
 var _tooltip = require("../../tooltip");
 var _icons = require("@ant-design/icons");
-var _util = require("antd/lib/form/util");
+var _util = require("antd/es/form/util");
 var _delay = _interopRequireDefault(require("delay"));
 var _lodash = _interopRequireDefault(require("lodash"));
 var _constant = require("./constant");
@@ -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/form/style/form-item.d.ts

@@ -1,3 +1,3 @@
 import { FormItemProps, FormItemPropsWithType } from "..";
 export declare function getFormItemWidth({ width, type }: FormItemPropsWithType): string | number | undefined;
-export declare function getFormItemStyle({ labelWidth, controlWidth, requiredMark, layout, type, ...props }: FormItemProps): string;
+export declare function getFormItemStyle({ labelWidth, controlWidth, requiredMark, type, ...props }: FormItemProps): string;

package/lib/form/style/form-item.js

@@ -12,8 +12,8 @@ var _api = require("../../api");
 var _style = require("../../stack/style");
 var _css = require("@emotion/css");
 var _constant = require("../component/constant");
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5;
-var _excluded = ["labelWidth", "controlWidth", "requiredMark", "layout", "type"];
+var _templateObject, _templateObject2, _templateObject3;
+var _excluded = ["labelWidth", "controlWidth", "requiredMark", "type"];
 function getFormItemWidth(_ref) {
   var width = _ref.width,
     type = _ref.type;
@@ -29,18 +29,11 @@ function getFormItemStyle(_ref2) {
     controlWidth = _ref2.controlWidth,
     _ref2$requiredMark = _ref2.requiredMark,
     requiredMark = _ref2$requiredMark === void 0 ? true : _ref2$requiredMark,
-    layout = _ref2.layout,
     type = _ref2.type,
     props = (0, _objectWithoutProperties2.default)(_ref2, _excluded);
-  var baseStyle = (0, _css.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n    &.ant-form-item {\n      min-width: 0;\n\n      .ant-form-item-label {\n        width: ", ";\n\n        .ant-form-item-tooltip {\n          color: inherit;\n          font-size: 13px;\n          margin-inline-start: unset;\n          margin-left: 3px;\n        }\n      }\n\n      .ant-form-item-control-input {\n        width: ", ";\n      }\n\n      .ant-form-item-required::before {\n        display: ", ";\n      }\n\n      ", "\n      ", "\n      ", "\n    }\n  "])), (0, _api.transformValueWithStyleUnit)(labelWidth), (0, _api.transformValueWithStyleUnit)(controlWidth), requiredMark ? undefined : 'none', layout === 'horizontal' && getHorizontalStyle(), layout === 'vertical' && getVerticalStyle(), type === 'tree' && treeItemStyle());
+  var baseStyle = (0, _css.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n    &.ant-form-item {\n      min-width: 0;\n\n      .ant-form-item-label {\n        width: ", ";\n\n        .ant-form-item-tooltip {\n          color: inherit;\n          font-size: 13px;\n          margin-inline-start: unset;\n          margin-left: 3px;\n        }\n      }\n\n      .ant-form-item-control-input {\n        width: ", ";\n      }\n\n      label.ant-form-item-required::before {\n        display: ", ";\n      }\n\n      // ", "\n    }\n  "])), (0, _api.transformValueWithStyleUnit)(labelWidth), (0, _api.transformValueWithStyleUnit)(controlWidth), requiredMark ? undefined : 'none', type === 'tree' && treeItemStyle());
   return (0, _css.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n    ", "\n    ", "\n  "])), (0, _style.getWidthAndFlex)(props), baseStyle);
 }
-function getHorizontalStyle() {
-  return (0, _css.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n    .ant-form-item-row {\n      flex-direction: row;\n    }\n\n    .ant-form-item-label {\n      padding-bottom: 0;\n\n      > label {\n        height: 32px;\n        margin-right: 8px;\n      }\n    }\n\n    .ant-form-item-control {\n      flex: 1;\n      min-width: 0;\n    }\n  "])));
-}
-function getVerticalStyle() {
-  return (0, _css.css)(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2.default)(["\n    .ant-form-item-row {\n      flex-direction: column;\n    }\n\n    .ant-form-item-label {\n      > label {\n        height: auto;\n        margin-bottom: 4px;\n      }\n\n      .ant-form-item-required::before {\n        position: unset;\n      }\n    }\n  "])));
-}
 function treeItemStyle() {
-  return (0, _css.css)(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2.default)(["\n    &,\n    .ant-form-item-row,\n    .ant-form-item-control,\n    .ant-form-item-control-input,\n    .ant-form-item-control-input-content {\n      height: 100%;\n    }\n  "])));
+  return (0, _css.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n    &,\n    .ant-form-item-row,\n    .ant-form-item-control,\n    .ant-form-item-control-input,\n    .ant-form-item-control-input-content,\n    .ant-select-in-form-item {\n      height: 100%;\n    }\n  "])));
 }

package/lib/form/style/index.js

@@ -26,7 +26,7 @@ var style = {
   wrapper: function wrapper(_ref) {
     var labelWidth = _ref.labelWidth,
       formItemMarginBottom = _ref.formItemMarginBottom;
-    return (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n    ", "\n\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: 2px;\n      }\n    }\n\n    // disabled \u65F6\u4E5F\u9700\u8981\u663E\u793A error \u6846\n    .ant-picker-status-error.ant-picker,\n    .ant-select-status-error.ant-select:not(.ant-select-customize-input) .ant-select-selector,\n    .ant-input-status-error:not(.ant-input-borderless),\n    .ant-input-number-status-error:not(.ant-input-number-borderless),\n    .ant-input-affix-wrapper-status-error:not(.ant-input-affix-wrapper-borderless) {\n      border-color: #ff4d4f;\n    }\n  "])), _api.commonFontFamily, (0, _api.transformValueWithStyleUnit)(formItemMarginBottom), (0, _api.transformValueWithStyleUnit)(labelWidth));
+    return (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\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  "])), (0, _api.transformValueWithStyleUnit)(formItemMarginBottom), (0, _api.transformValueWithStyleUnit)(labelWidth));
   }
 };
 var _default = exports.default = style;

package/lib/form/type/form-item.d.ts

@@ -7,13 +7,13 @@ import { RadioProps } from "../../radio";
 import { SelectOptions, SelectProps } from "../../select";
 import { SwitchProps } from "../../switch";
 import { TreeSelectProps } from "../../tree-select";
-import { FormItemProps as AntdFormItemProps } from 'antd/lib/form/FormItem';
-import { SliderRangeProps, SliderSingleProps } from 'antd/lib/slider';
+import { FormItemProps as AntdFormItemProps } from 'antd/es/form/FormItem';
+import { SliderRangeProps, SliderSingleProps } from 'antd/es/slider';
 import { Rule } from 'rc-field-form/lib/interface';
 import { ReactElement, ReactNode } from 'react';
 import { InputComponentType, OtherComponentType } from '../component/form-item';
 type SliderProps = SliderSingleProps | SliderRangeProps;
-type UnionType = Omit<AntdFormItemProps & InputProps & SelectProps & TreeSelectProps & SwitchProps & RadioProps & CheckboxProps & SliderProps, 'rules' | 'type' | 'disabled' | 'options' | 'required'>;
+type UnionType = Omit<AntdFormItemProps & InputProps & SelectProps & TreeSelectProps & SwitchProps & RadioProps & CheckboxProps & SliderProps, 'rules' | 'type' | 'disabled' | 'options' | 'required' | 'children'>;
 /**
  * @noExtends
  */
@@ -84,10 +84,9 @@ export interface FormItemProps extends UnionType {
      */
     controlWidth?: number | string;
     /**
-     * @description 布局方式
-     * @default horizontal
+     * @description 是否显示必填标记
      */
-    layout?: 'horizontal' | 'vertical';
+    requiredMark?: boolean;
     preserveStatus?: boolean;
     /**
      * @description 自定义渲染

package/lib/form/type/form-list.d.ts

@@ -1,7 +1,7 @@
 import { ButtonProps } from "../../button";
 import { FormItemProps, FormValues } from "..";
 import { ListOperation } from "../../hooks";
-import { FormListFieldData } from 'antd/lib/form/FormList';
+import { FormListFieldData } from 'antd/es/form/FormList';
 import { ReactNode } from 'react';
 export interface FormListContext extends FormListCommonProps {
     name: FormItemProps['name'];
@@ -9,7 +9,7 @@ export interface FormListContext extends FormListCommonProps {
 /**
  * @noExtends
  */
-export interface FormListProps extends FormItemProps {
+export interface FormListProps extends Omit<FormItemProps, 'children'> {
     /**
      * @description 表单名称，支持层级嵌套，如：a.b.c
      */

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

@@ -1,9 +1,9 @@
 import { FunctionReturn } from "../../api";
 import { ButtonProps } from "../../button";
 import { FormContext, FormItemContext, FormItemProps, FormListContext } from "..";
-import { FormProps as AntdFormProps } from 'antd/lib/form/Form';
-import { FormInstance as AntdFormInstance } from 'antd/lib/form/hooks/useForm';
-import { InputFocusOptions } from 'antd/lib/input/Input';
+import { FormProps as AntdFormProps } from 'antd/es/form/Form';
+import { FormInstance as AntdFormInstance } from 'antd/es/form/hooks/useForm';
+import { InputFocusOptions } from 'antd/es/input/Input';
 import { ValidateOptions } from 'rc-field-form/es/interface';
 import { StoreValue } from 'rc-field-form/lib/interface';
 import { ReactNode } from 'react';

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

@@ -1,5 +1,4 @@
 /// <reference types="react" />
-/// <reference types="rc-pagination" />
 import { GridProps } from "..";
 import { HStackProps } from "../../stack";
 import { TablePaginationConfig } from 'antd';
@@ -12,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?: ("topLeft" | "topRight" | "bottomLeft" | "bottomRight" | "topCenter" | "bottomCenter")[] | undefined;
+    position?: ("none" | "topLeft" | "topRight" | "bottomLeft" | "bottomRight" | "topCenter" | "bottomCenter")[] | undefined;
     showQuickJumper?: boolean | {
         goButton?: import("react").ReactNode;
     } | undefined;
@@ -20,29 +19,87 @@ export declare function usePagination({ data, rows, column, pagination }: Pagina
     responsive?: boolean | undefined;
     role?: string | undefined;
     totalBoundaryShowSizeChanger?: number | undefined;
-    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;
-    showTotal?: ((total: number, range: [number, number]) => import("react").ReactNode) | undefined;
+    rootClassName?: string | undefined;
+    showSizeChanger?: boolean | import("antd").SelectProps<any, import("rc-select/lib/Select").DefaultOptionType> | undefined;
+    selectComponentClass?: any;
+    pageSizeOptions?: (string | number)[] | undefined;
+    style?: import("react").CSSProperties | undefined;
     className?: string | undefined;
-    selectPrefixCls?: string | undefined;
+    "aria-activedescendant"?: string | undefined;
+    "aria-atomic"?: (boolean | "true" | "false") | undefined;
+    "aria-autocomplete"?: "none" | "list" | "inline" | "both" | undefined;
+    "aria-braillelabel"?: string | undefined;
+    "aria-brailleroledescription"?: string | undefined;
+    "aria-busy"?: (boolean | "true" | "false") | undefined;
+    "aria-checked"?: boolean | "true" | "false" | "mixed" | undefined;
+    "aria-colcount"?: number | undefined;
+    "aria-colindex"?: number | undefined;
+    "aria-colindextext"?: string | undefined;
+    "aria-colspan"?: number | undefined;
+    "aria-controls"?: string | 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"?: "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 | "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;
+    "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-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-required"?: (boolean | "true" | "false") | undefined;
+    "aria-roledescription"?: string | undefined;
+    "aria-rowcount"?: number | undefined;
+    "aria-rowindex"?: number | undefined;
+    "aria-rowindextext"?: string | undefined;
+    "aria-rowspan"?: number | undefined;
+    "aria-selected"?: (boolean | "true" | "false") | undefined;
+    "aria-setsize"?: number | undefined;
+    "aria-sort"?: "none" | "ascending" | "descending" | "other" | undefined;
+    "aria-valuemax"?: number | undefined;
+    "aria-valuemin"?: number | undefined;
+    "aria-valuenow"?: number | undefined;
+    "aria-valuetext"?: string | undefined;
+    disabled?: boolean | undefined;
+    locale?: import("rc-pagination").PaginationLocale | undefined;
+    prevIcon?: import("react").ReactNode | import("react").ComponentType<{}>;
+    nextIcon?: import("react").ReactNode | import("react").ComponentType<{}>;
     prefixCls?: string | undefined;
-    pageSizeOptions?: string[] | number[] | undefined;
+    align?: "center" | "end" | "start" | undefined;
+    selectPrefixCls?: string | undefined;
     defaultCurrent?: number | undefined;
     defaultPageSize?: number | undefined;
     hideOnSinglePage?: boolean | undefined;
-    showSizeChanger?: boolean | undefined;
+    sizeChangerRender?: import("rc-pagination/lib/Options").SizeChangerRender | undefined;
     showLessItems?: boolean | undefined;
     showPrevNextJumpers?: boolean | undefined;
     showTitle?: boolean | undefined;
-    simple?: boolean | undefined;
-    disabled?: boolean | undefined;
-    locale?: import("rc-pagination").PaginationLocale | undefined;
-    style?: import("react").CSSProperties | undefined;
-    selectComponentClass?: import("react").ComponentType<{}> | undefined;
-    prevIcon?: import("react").ReactNode | import("react").ComponentType<{}>;
-    nextIcon?: import("react").ReactNode | import("react").ComponentType<{}>;
+    simple?: boolean | {
+        readOnly?: boolean | undefined;
+    } | undefined;
     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" | "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?: "center" | "left" | "right" | "between" | undefined;
 };
 export type PaginationProps = TablePaginationConfig & Pick<HStackProps, 'justify'>;

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;