@douyinfe/semi-ui 2.30.0 → 2.30.2

package/lib/cjs/dropdown/dropdownItem.js

@@ -43,11 +43,12 @@ class DropdownItem extends _baseComponent.default {
     const {
       showTick: contextShowTick
     } = this.context;
+    const realShowTick = contextShowTick !== null && contextShowTick !== void 0 ? contextShowTick : showTick;
     const itemclass = (0, _classnames.default)(className, {
       [`${prefixCls}-item`]: true,
       [`${prefixCls}-item-disabled`]: disabled,
       [`${prefixCls}-item-hover`]: hover,
-      [`${prefixCls}-item-withTick`]: contextShowTick !== null && contextShowTick !== void 0 ? contextShowTick : showTick,
+      [`${prefixCls}-item-withTick`]: realShowTick,
       [`${prefixCls}-item-${type}`]: type,
       [`${prefixCls}-item-active`]: active
     });
@@ -62,11 +63,11 @@ class DropdownItem extends _baseComponent.default {
     let tick = null;
 
     switch (true) {
-      case showTick && active:
+      case realShowTick && active:
         tick = /*#__PURE__*/_react.default.createElement(_semiIcons.IconTick, null);
         break;
 
-      case showTick && !active:
+      case realShowTick && !active:
         tick = /*#__PURE__*/_react.default.createElement(_semiIcons.IconTick, {
           style: {
             color: 'transparent'

package/lib/cjs/form/baseForm.js

@@ -133,7 +133,11 @@ class Form extends _baseComponent.default {
         const {
           formId
         } = this.state;
-        return document.querySelectorAll(`form[x-form-id="${formId}"] .${_constants.cssClasses.PREFIX}-field-error-message`);
+        const {
+          id
+        } = this.props;
+        const xId = id ? id : formId;
+        return document.querySelectorAll(`form[x-form-id="${xId}"] .${_constants.cssClasses.PREFIX}-field-error-message`);
       },
       getFieldDOM: field => document.querySelector(`.${_constants.cssClasses.PREFIX}-field[x-field-id="${field}"]`)
     });
@@ -208,9 +212,10 @@ class Form extends _baseComponent.default {
       allowEmpty,
       autoScrollToError,
       showValidateIcon,
-      extraTextPosition
+      extraTextPosition,
+      id
     } = _a,
-          rest = __rest(_a, ["children", "getFormApi", "onChange", "onSubmit", "onSubmitFail", "onValueChange", "component", "render", "validateFields", "initValues", "layout", "style", "className", "labelPosition", "labelWidth", "labelAlign", "labelCol", "wrapperCol", "allowEmpty", "autoScrollToError", "showValidateIcon", "extraTextPosition"]);
+          rest = __rest(_a, ["children", "getFormApi", "onChange", "onSubmit", "onSubmitFail", "onValueChange", "component", "render", "validateFields", "initValues", "layout", "style", "className", "labelPosition", "labelWidth", "labelAlign", "labelCol", "wrapperCol", "allowEmpty", "autoScrollToError", "showValidateIcon", "extraTextPosition", "id"]);
 
     const formCls = (0, _classnames.default)(prefix, className, {
       [prefix + '-vertical']: layout === 'vertical',
@@ -224,7 +229,7 @@ class Form extends _baseComponent.default {
       onReset: this.reset,
       onSubmit: this.submit,
       className: formCls,
-      "x-form-id": formId
+      "x-form-id": id ? id : formId
     }), this.content);
 
     const withRowForm = /*#__PURE__*/_react.default.createElement(_row.default, null, formContent);

package/lib/cjs/modal/confirm.d.ts

@@ -140,47 +140,324 @@ export declare function withWarning(props: ModalReactProps): {
     type: "warning";
 };
 export declare function withError(props: ModalReactProps): {
-    cancelButtonProps?: import("../button").BaseButtonProps;
+    title?: React.ReactNode;
     children?: React.ReactNode;
-    okButtonProps?: import("../button").BaseButtonProps;
-    bodyStyle?: React.CSSProperties;
-    maskStyle?: React.CSSProperties;
+    size?: import("@douyinfe/semi-foundation/lib/cjs/modal/modalFoundation").Size;
     style?: React.CSSProperties;
-    icon: string | number | boolean | React.ReactFragment | JSX.Element;
-    closeIcon?: React.ReactNode;
-    title?: React.ReactNode;
-    content?: React.ReactNode;
+    className?: string;
+    motion?: boolean;
+    getPopupContainer?: () => HTMLElement;
     footer?: React.ReactNode;
     header?: React.ReactNode;
-    onCancel?: (e: React.MouseEvent<Element, MouseEvent>) => void | Promise<any>;
-    onOk?: (e: React.MouseEvent<Element, MouseEvent>) => void | Promise<any>;
+    direction?: any;
+    width?: string | number;
+    height?: string | number;
+    mask?: boolean;
+    visible?: boolean;
+    content?: React.ReactNode;
+    icon: string | number | boolean | React.ReactFragment | JSX.Element;
+    zIndex?: number;
+    closeOnEsc?: boolean;
+    preventScroll?: boolean;
     afterClose?: () => void;
     cancelText?: string;
-    centered?: boolean;
-    className?: string;
+    okText?: string;
+    closeIcon?: React.ReactNode;
+    bodyStyle?: React.CSSProperties;
     closable?: boolean;
+    keepDOM?: boolean;
+    onCancel?: (e: React.MouseEvent<Element, MouseEvent>) => void | Promise<any>;
+    maskClosable?: boolean;
+    cancelButtonProps?: import("../button").BaseButtonProps;
+    centered?: boolean;
     confirmLoading?: boolean;
     cancelLoading?: boolean;
     hasCancel?: boolean;
-    height?: string | number;
-    mask?: boolean;
-    maskClosable?: boolean;
+    maskStyle?: React.CSSProperties;
     maskFixed?: boolean;
-    motion?: boolean;
-    okText?: string;
     okType?: import("@douyinfe/semi-foundation/lib/cjs/modal/modalFoundation").OKType;
-    visible?: boolean;
-    width?: string | number;
-    zIndex?: number;
-    getPopupContainer?: () => HTMLElement;
-    closeOnEsc?: boolean;
-    size?: import("@douyinfe/semi-foundation/lib/cjs/modal/modalFoundation").Size;
+    onOk?: (e: React.MouseEvent<Element, MouseEvent>) => void | Promise<any>;
     lazyRender?: boolean;
-    keepDOM?: boolean;
-    direction?: any;
     fullScreen?: boolean;
-    preventScroll?: boolean;
     type: "error";
+    okButtonProps: {
+        id?: string;
+        block?: boolean;
+        circle?: boolean;
+        children?: React.ReactNode;
+        disabled?: boolean;
+        className?: string;
+        icon?: React.ReactNode;
+        iconPosition?: "left" | "right";
+        loading?: boolean;
+        htmlType?: import("../button").HtmlType;
+        size?: import("../button").Size;
+        style?: React.CSSProperties;
+        theme?: import("../button").Theme;
+        type: import("../button").Type;
+        prefixCls?: string;
+        onClick?: React.MouseEventHandler<HTMLButtonElement>;
+        onMouseDown?: React.MouseEventHandler<HTMLButtonElement>;
+        onMouseEnter?: React.MouseEventHandler<HTMLButtonElement>;
+        onMouseLeave?: React.MouseEventHandler<HTMLButtonElement>;
+        'aria-label'?: string;
+        title?: string;
+        name?: string;
+        value?: string | number | readonly string[];
+        onAnimationStart?: React.AnimationEventHandler<HTMLButtonElement>;
+        onAnimationEnd?: React.AnimationEventHandler<HTMLButtonElement>;
+        form?: string;
+        slot?: string;
+        hidden?: boolean;
+        color?: string;
+        onChange?: React.FormEventHandler<HTMLButtonElement>;
+        defaultChecked?: boolean;
+        defaultValue?: string | number | readonly string[];
+        suppressContentEditableWarning?: boolean;
+        suppressHydrationWarning?: boolean;
+        accessKey?: string;
+        autoFocus?: boolean;
+        formAction?: string;
+        formEncType?: string;
+        formMethod?: string;
+        formNoValidate?: boolean;
+        formTarget?: string;
+        dir?: string;
+        draggable?: boolean | "false" | "true";
+        lang?: string;
+        translate?: "no" | "yes";
+        prefix?: string;
+        contentEditable?: "inherit" | (boolean | "false" | "true");
+        inputMode?: "search" | "none" | "text" | "tel" | "url" | "email" | "numeric" | "decimal";
+        tabIndex?: number;
+        role?: React.AriaRole;
+        onMouseOut?: React.MouseEventHandler<HTMLButtonElement>;
+        onMouseOver?: React.MouseEventHandler<HTMLButtonElement>;
+        onFocus?: React.FocusEventHandler<HTMLButtonElement>;
+        onBlur?: React.FocusEventHandler<HTMLButtonElement>;
+        onKeyDown?: React.KeyboardEventHandler<HTMLButtonElement>;
+        'aria-expanded'?: boolean | "false" | "true";
+        'aria-haspopup'?: boolean | "dialog" | "menu" | "listbox" | "grid" | "false" | "true" | "tree";
+        'aria-controls'?: string;
+        'aria-describedby'?: string;
+        contextMenu?: string;
+        placeholder?: string;
+        spellCheck?: boolean | "false" | "true";
+        radioGroup?: string;
+        about?: string;
+        datatype?: string;
+        inlist?: any;
+        property?: string;
+        resource?: string;
+        typeof?: string;
+        vocab?: string;
+        autoCapitalize?: string;
+        autoCorrect?: string;
+        autoSave?: string;
+        itemProp?: string;
+        itemScope?: boolean;
+        itemType?: string;
+        itemID?: string;
+        itemRef?: string;
+        results?: number;
+        security?: string;
+        unselectable?: "on" | "off";
+        is?: string;
+        'aria-activedescendant'?: string;
+        'aria-atomic'?: boolean | "false" | "true";
+        'aria-autocomplete'?: "both" | "none" | "inline" | "list";
+        'aria-busy'?: boolean | "false" | "true";
+        'aria-checked'?: boolean | "mixed" | "false" | "true";
+        'aria-colcount'?: number;
+        'aria-colindex'?: number;
+        'aria-colspan'?: number;
+        'aria-current'?: boolean | "time" | "page" | "false" | "true" | "location" | "step" | "date";
+        'aria-details'?: string;
+        'aria-disabled'?: boolean | "false" | "true";
+        'aria-dropeffect'?: "link" | "none" | "copy" | "move" | "execute" | "popup";
+        'aria-errormessage'?: string;
+        'aria-flowto'?: string;
+        'aria-grabbed'?: boolean | "false" | "true";
+        'aria-hidden'?: boolean | "false" | "true";
+        'aria-invalid'?: boolean | "false" | "true" | "grammar" | "spelling";
+        'aria-keyshortcuts'?: string;
+        'aria-labelledby'?: string;
+        'aria-level'?: number;
+        'aria-live'?: "off" | "assertive" | "polite";
+        'aria-modal'?: boolean | "false" | "true";
+        'aria-multiline'?: boolean | "false" | "true";
+        'aria-multiselectable'?: boolean | "false" | "true";
+        'aria-orientation'?: "horizontal" | "vertical";
+        'aria-owns'?: string;
+        'aria-placeholder'?: string;
+        'aria-posinset'?: number;
+        'aria-pressed'?: boolean | "mixed" | "false" | "true";
+        'aria-readonly'?: boolean | "false" | "true";
+        'aria-relevant'?: "text" | "all" | "additions" | "additions removals" | "additions text" | "removals" | "removals additions" | "removals text" | "text additions" | "text removals";
+        'aria-required'?: boolean | "false" | "true";
+        'aria-roledescription'?: string;
+        'aria-rowcount'?: number;
+        'aria-rowindex'?: number;
+        'aria-rowspan'?: number;
+        'aria-selected'?: boolean | "false" | "true";
+        'aria-setsize'?: number;
+        'aria-sort'?: "none" | "ascending" | "descending" | "other";
+        'aria-valuemax'?: number;
+        'aria-valuemin'?: number;
+        'aria-valuenow'?: number;
+        'aria-valuetext'?: string;
+        dangerouslySetInnerHTML?: {
+            __html: string;
+        };
+        onCopy?: React.ClipboardEventHandler<HTMLButtonElement>;
+        onCopyCapture?: React.ClipboardEventHandler<HTMLButtonElement>;
+        onCut?: React.ClipboardEventHandler<HTMLButtonElement>;
+        onCutCapture?: React.ClipboardEventHandler<HTMLButtonElement>;
+        onPaste?: React.ClipboardEventHandler<HTMLButtonElement>;
+        onPasteCapture?: React.ClipboardEventHandler<HTMLButtonElement>;
+        onCompositionEnd?: React.CompositionEventHandler<HTMLButtonElement>;
+        onCompositionEndCapture?: React.CompositionEventHandler<HTMLButtonElement>;
+        onCompositionStart?: React.CompositionEventHandler<HTMLButtonElement>;
+        onCompositionStartCapture?: React.CompositionEventHandler<HTMLButtonElement>;
+        onCompositionUpdate?: React.CompositionEventHandler<HTMLButtonElement>;
+        onCompositionUpdateCapture?: React.CompositionEventHandler<HTMLButtonElement>;
+        onFocusCapture?: React.FocusEventHandler<HTMLButtonElement>;
+        onBlurCapture?: React.FocusEventHandler<HTMLButtonElement>;
+        onChangeCapture?: React.FormEventHandler<HTMLButtonElement>;
+        onBeforeInput?: React.FormEventHandler<HTMLButtonElement>;
+        onBeforeInputCapture?: React.FormEventHandler<HTMLButtonElement>;
+        onInput?: React.FormEventHandler<HTMLButtonElement>;
+        onInputCapture?: React.FormEventHandler<HTMLButtonElement>;
+        onReset?: React.FormEventHandler<HTMLButtonElement>;
+        onResetCapture?: React.FormEventHandler<HTMLButtonElement>;
+        onSubmit?: React.FormEventHandler<HTMLButtonElement>;
+        onSubmitCapture?: React.FormEventHandler<HTMLButtonElement>;
+        onInvalid?: React.FormEventHandler<HTMLButtonElement>;
+        onInvalidCapture?: React.FormEventHandler<HTMLButtonElement>;
+        onLoad?: React.ReactEventHandler<HTMLButtonElement>;
+        onLoadCapture?: React.ReactEventHandler<HTMLButtonElement>;
+        onError?: React.ReactEventHandler<HTMLButtonElement>;
+        onErrorCapture?: React.ReactEventHandler<HTMLButtonElement>;
+        onKeyDownCapture?: React.KeyboardEventHandler<HTMLButtonElement>;
+        onKeyPress?: React.KeyboardEventHandler<HTMLButtonElement>;
+        onKeyPressCapture?: React.KeyboardEventHandler<HTMLButtonElement>;
+        onKeyUp?: React.KeyboardEventHandler<HTMLButtonElement>;
+        onKeyUpCapture?: React.KeyboardEventHandler<HTMLButtonElement>;
+        onAbort?: React.ReactEventHandler<HTMLButtonElement>;
+        onAbortCapture?: React.ReactEventHandler<HTMLButtonElement>;
+        onCanPlay?: React.ReactEventHandler<HTMLButtonElement>;
+        onCanPlayCapture?: React.ReactEventHandler<HTMLButtonElement>;
+        onCanPlayThrough?: React.ReactEventHandler<HTMLButtonElement>;
+        onCanPlayThroughCapture?: React.ReactEventHandler<HTMLButtonElement>;
+        onDurationChange?: React.ReactEventHandler<HTMLButtonElement>;
+        onDurationChangeCapture?: React.ReactEventHandler<HTMLButtonElement>;
+        onEmptied?: React.ReactEventHandler<HTMLButtonElement>;
+        onEmptiedCapture?: React.ReactEventHandler<HTMLButtonElement>;
+        onEncrypted?: React.ReactEventHandler<HTMLButtonElement>;
+        onEncryptedCapture?: React.ReactEventHandler<HTMLButtonElement>;
+        onEnded?: React.ReactEventHandler<HTMLButtonElement>;
+        onEndedCapture?: React.ReactEventHandler<HTMLButtonElement>;
+        onLoadedData?: React.ReactEventHandler<HTMLButtonElement>;
+        onLoadedDataCapture?: React.ReactEventHandler<HTMLButtonElement>;
+        onLoadedMetadata?: React.ReactEventHandler<HTMLButtonElement>;
+        onLoadedMetadataCapture?: React.ReactEventHandler<HTMLButtonElement>;
+        onLoadStart?: React.ReactEventHandler<HTMLButtonElement>;
+        onLoadStartCapture?: React.ReactEventHandler<HTMLButtonElement>;
+        onPause?: React.ReactEventHandler<HTMLButtonElement>;
+        onPauseCapture?: React.ReactEventHandler<HTMLButtonElement>;
+        onPlay?: React.ReactEventHandler<HTMLButtonElement>;
+        onPlayCapture?: React.ReactEventHandler<HTMLButtonElement>;
+        onPlaying?: React.ReactEventHandler<HTMLButtonElement>;
+        onPlayingCapture?: React.ReactEventHandler<HTMLButtonElement>;
+        onProgress?: React.ReactEventHandler<HTMLButtonElement>;
+        onProgressCapture?: React.ReactEventHandler<HTMLButtonElement>;
+        onRateChange?: React.ReactEventHandler<HTMLButtonElement>;
+        onRateChangeCapture?: React.ReactEventHandler<HTMLButtonElement>;
+        onSeeked?: React.ReactEventHandler<HTMLButtonElement>;
+        onSeekedCapture?: React.ReactEventHandler<HTMLButtonElement>;
+        onSeeking?: React.ReactEventHandler<HTMLButtonElement>;
+        onSeekingCapture?: React.ReactEventHandler<HTMLButtonElement>;
+        onStalled?: React.ReactEventHandler<HTMLButtonElement>;
+        onStalledCapture?: React.ReactEventHandler<HTMLButtonElement>;
+        onSuspend?: React.ReactEventHandler<HTMLButtonElement>;
+        onSuspendCapture?: React.ReactEventHandler<HTMLButtonElement>;
+        onTimeUpdate?: React.ReactEventHandler<HTMLButtonElement>;
+        onTimeUpdateCapture?: React.ReactEventHandler<HTMLButtonElement>;
+        onVolumeChange?: React.ReactEventHandler<HTMLButtonElement>;
+        onVolumeChangeCapture?: React.ReactEventHandler<HTMLButtonElement>;
+        onWaiting?: React.ReactEventHandler<HTMLButtonElement>;
+        onWaitingCapture?: React.ReactEventHandler<HTMLButtonElement>;
+        onAuxClick?: React.MouseEventHandler<HTMLButtonElement>;
+        onAuxClickCapture?: React.MouseEventHandler<HTMLButtonElement>;
+        onClickCapture?: React.MouseEventHandler<HTMLButtonElement>;
+        onContextMenu?: React.MouseEventHandler<HTMLButtonElement>;
+        onContextMenuCapture?: React.MouseEventHandler<HTMLButtonElement>;
+        onDoubleClick?: React.MouseEventHandler<HTMLButtonElement>;
+        onDoubleClickCapture?: React.MouseEventHandler<HTMLButtonElement>;
+        onDrag?: React.DragEventHandler<HTMLButtonElement>;
+        onDragCapture?: React.DragEventHandler<HTMLButtonElement>;
+        onDragEnd?: React.DragEventHandler<HTMLButtonElement>;
+        onDragEndCapture?: React.DragEventHandler<HTMLButtonElement>;
+        onDragEnter?: React.DragEventHandler<HTMLButtonElement>;
+        onDragEnterCapture?: React.DragEventHandler<HTMLButtonElement>;
+        onDragExit?: React.DragEventHandler<HTMLButtonElement>;
+        onDragExitCapture?: React.DragEventHandler<HTMLButtonElement>;
+        onDragLeave?: React.DragEventHandler<HTMLButtonElement>;
+        onDragLeaveCapture?: React.DragEventHandler<HTMLButtonElement>;
+        onDragOver?: React.DragEventHandler<HTMLButtonElement>;
+        onDragOverCapture?: React.DragEventHandler<HTMLButtonElement>;
+        onDragStart?: React.DragEventHandler<HTMLButtonElement>;
+        onDragStartCapture?: React.DragEventHandler<HTMLButtonElement>;
+        onDrop?: React.DragEventHandler<HTMLButtonElement>;
+        onDropCapture?: React.DragEventHandler<HTMLButtonElement>;
+        onMouseDownCapture?: React.MouseEventHandler<HTMLButtonElement>;
+        onMouseMove?: React.MouseEventHandler<HTMLButtonElement>;
+        onMouseMoveCapture?: React.MouseEventHandler<HTMLButtonElement>;
+        onMouseOutCapture?: React.MouseEventHandler<HTMLButtonElement>;
+        onMouseOverCapture?: React.MouseEventHandler<HTMLButtonElement>;
+        onMouseUp?: React.MouseEventHandler<HTMLButtonElement>;
+        onMouseUpCapture?: React.MouseEventHandler<HTMLButtonElement>;
+        onSelect?: React.ReactEventHandler<HTMLButtonElement>;
+        onSelectCapture?: React.ReactEventHandler<HTMLButtonElement>;
+        onTouchCancel?: React.TouchEventHandler<HTMLButtonElement>;
+        onTouchCancelCapture?: React.TouchEventHandler<HTMLButtonElement>;
+        onTouchEnd?: React.TouchEventHandler<HTMLButtonElement>;
+        onTouchEndCapture?: React.TouchEventHandler<HTMLButtonElement>;
+        onTouchMove?: React.TouchEventHandler<HTMLButtonElement>;
+        onTouchMoveCapture?: React.TouchEventHandler<HTMLButtonElement>;
+        onTouchStart?: React.TouchEventHandler<HTMLButtonElement>;
+        onTouchStartCapture?: React.TouchEventHandler<HTMLButtonElement>;
+        onPointerDown?: React.PointerEventHandler<HTMLButtonElement>;
+        onPointerDownCapture?: React.PointerEventHandler<HTMLButtonElement>;
+        onPointerMove?: React.PointerEventHandler<HTMLButtonElement>;
+        onPointerMoveCapture?: React.PointerEventHandler<HTMLButtonElement>;
+        onPointerUp?: React.PointerEventHandler<HTMLButtonElement>;
+        onPointerUpCapture?: React.PointerEventHandler<HTMLButtonElement>;
+        onPointerCancel?: React.PointerEventHandler<HTMLButtonElement>;
+        onPointerCancelCapture?: React.PointerEventHandler<HTMLButtonElement>;
+        onPointerEnter?: React.PointerEventHandler<HTMLButtonElement>;
+        onPointerEnterCapture?: React.PointerEventHandler<HTMLButtonElement>;
+        onPointerLeave?: React.PointerEventHandler<HTMLButtonElement>;
+        onPointerLeaveCapture?: React.PointerEventHandler<HTMLButtonElement>;
+        onPointerOver?: React.PointerEventHandler<HTMLButtonElement>;
+        onPointerOverCapture?: React.PointerEventHandler<HTMLButtonElement>;
+        onPointerOut?: React.PointerEventHandler<HTMLButtonElement>;
+        onPointerOutCapture?: React.PointerEventHandler<HTMLButtonElement>;
+        onGotPointerCapture?: React.PointerEventHandler<HTMLButtonElement>;
+        onGotPointerCaptureCapture?: React.PointerEventHandler<HTMLButtonElement>;
+        onLostPointerCapture?: React.PointerEventHandler<HTMLButtonElement>;
+        onLostPointerCaptureCapture?: React.PointerEventHandler<HTMLButtonElement>;
+        onScroll?: React.UIEventHandler<HTMLButtonElement>;
+        onScrollCapture?: React.UIEventHandler<HTMLButtonElement>;
+        onWheel?: React.WheelEventHandler<HTMLButtonElement>;
+        onWheelCapture?: React.WheelEventHandler<HTMLButtonElement>;
+        onAnimationStartCapture?: React.AnimationEventHandler<HTMLButtonElement>;
+        onAnimationEndCapture?: React.AnimationEventHandler<HTMLButtonElement>;
+        onAnimationIteration?: React.AnimationEventHandler<HTMLButtonElement>;
+        onAnimationIterationCapture?: React.AnimationEventHandler<HTMLButtonElement>;
+        onTransitionEnd?: React.TransitionEventHandler<HTMLButtonElement>;
+        onTransitionEndCapture?: React.TransitionEventHandler<HTMLButtonElement>;
+    };
 };
 export declare function withConfirm(props: ModalReactProps): {
     cancelButtonProps?: import("../button").BaseButtonProps;

package/lib/cjs/modal/confirm.js

@@ -10,6 +10,8 @@ exports.withInfo = withInfo;
 exports.withSuccess = withSuccess;
 exports.withWarning = withWarning;
 
+var _omit2 = _interopRequireDefault(require("lodash/omit"));
+
 var _react = _interopRequireDefault(require("react"));
 
 var _reactDom = _interopRequireDefault(require("react-dom"));
@@ -109,8 +111,11 @@ function withWarning(props) {
 function withError(props) {
   return Object.assign({
     type: 'error',
-    icon: /*#__PURE__*/_react.default.createElement(_semiIcons.IconAlertCircle, null)
-  }, props);
+    icon: /*#__PURE__*/_react.default.createElement(_semiIcons.IconAlertCircle, null),
+    okButtonProps: Object.assign({
+      type: 'danger'
+    }, props.okButtonProps)
+  }, (0, _omit2.default)(props, ['okButtonProps']));
 }
 
 function withConfirm(props) {

package/lib/cjs/tag/index.js

@@ -178,11 +178,12 @@ class Tag extends _react.Component {
 
     const a11yProps = {
       role: 'button',
-      tabIndex: tabIndex | 0,
+      tabIndex: tabIndex || 0,
       onKeyDown: this.handleKeyDown
     };
     const baseProps = Object.assign(Object.assign({}, attr), {
       onClick,
+      tabIndex: tabIndex,
       className: (0, _classnames.default)(prefixCls, {
         [`${prefixCls}-default`]: size === 'default',
         [`${prefixCls}-small`]: size === 'small',

package/lib/es/dropdown/dropdownItem.js

@@ -26,11 +26,12 @@ class DropdownItem extends BaseComponent {
     const {
       showTick: contextShowTick
     } = this.context;
+    const realShowTick = contextShowTick !== null && contextShowTick !== void 0 ? contextShowTick : showTick;
     const itemclass = cls(className, {
       [`${prefixCls}-item`]: true,
       [`${prefixCls}-item-disabled`]: disabled,
       [`${prefixCls}-item-hover`]: hover,
-      [`${prefixCls}-item-withTick`]: contextShowTick !== null && contextShowTick !== void 0 ? contextShowTick : showTick,
+      [`${prefixCls}-item-withTick`]: realShowTick,
       [`${prefixCls}-item-${type}`]: type,
       [`${prefixCls}-item-active`]: active
     });
@@ -45,11 +46,11 @@ class DropdownItem extends BaseComponent {
     let tick = null;
 
     switch (true) {
-      case showTick && active:
+      case realShowTick && active:
         tick = /*#__PURE__*/React.createElement(IconTick, null);
         break;
 
-      case showTick && !active:
+      case realShowTick && !active:
         tick = /*#__PURE__*/React.createElement(IconTick, {
           style: {
             color: 'transparent'

package/lib/es/form/baseForm.js

@@ -105,7 +105,11 @@ class Form extends BaseComponent {
         const {
           formId
         } = this.state;
-        return document.querySelectorAll(`form[x-form-id="${formId}"] .${cssClasses.PREFIX}-field-error-message`);
+        const {
+          id
+        } = this.props;
+        const xId = id ? id : formId;
+        return document.querySelectorAll(`form[x-form-id="${xId}"] .${cssClasses.PREFIX}-field-error-message`);
       },
       getFieldDOM: field => document.querySelector(`.${cssClasses.PREFIX}-field[x-field-id="${field}"]`)
     });
@@ -180,9 +184,10 @@ class Form extends BaseComponent {
       allowEmpty,
       autoScrollToError,
       showValidateIcon,
-      extraTextPosition
+      extraTextPosition,
+      id
     } = _a,
-          rest = __rest(_a, ["children", "getFormApi", "onChange", "onSubmit", "onSubmitFail", "onValueChange", "component", "render", "validateFields", "initValues", "layout", "style", "className", "labelPosition", "labelWidth", "labelAlign", "labelCol", "wrapperCol", "allowEmpty", "autoScrollToError", "showValidateIcon", "extraTextPosition"]);
+          rest = __rest(_a, ["children", "getFormApi", "onChange", "onSubmit", "onSubmitFail", "onValueChange", "component", "render", "validateFields", "initValues", "layout", "style", "className", "labelPosition", "labelWidth", "labelAlign", "labelCol", "wrapperCol", "allowEmpty", "autoScrollToError", "showValidateIcon", "extraTextPosition", "id"]);
 
     const formCls = classNames(prefix, className, {
       [prefix + '-vertical']: layout === 'vertical',
@@ -195,7 +200,7 @@ class Form extends BaseComponent {
       onReset: this.reset,
       onSubmit: this.submit,
       className: formCls,
-      "x-form-id": formId
+      "x-form-id": id ? id : formId
     }), this.content);
     const withRowForm = /*#__PURE__*/React.createElement(Row, null, formContent);
     return /*#__PURE__*/React.createElement(FormUpdaterContext.Provider, {