vap1 0.0.7 → 0.0.8

package/components/Upload/UploadModal.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import type { BaseUploadProps } from './index';
-import type { VModalProps } from '../../components/_adapt/Modal';
+import type { ModalProps } from '../../components/_adapt/Modal';
 import type { PlainObject } from '../../basetype';
 /**
  * 导入结果
@@ -26,7 +26,7 @@ type ImportResult = boolean | {
    9. 导入成功后显示结果，成功 OR 失败，失败时重新上传
    0. 成功后可关闭窗体，关闭后可自行刷新数据。
 */
-export type UploadModalProps = VModalProps & Omit<BaseUploadProps, 'onChange' | 'disabled'> & {
+export type UploadModalProps = ModalProps & Omit<BaseUploadProps, 'onChange' | 'disabled'> & {
     /**
      * 上传提示，通常包括上传数据说明，数据模板文件下载等内容。
      * 默认 ： 请注意：导入的Excel数据字段须与Excel模版保持一致，否则无法导入数据。点击确认时将仅导入正常数据。

package/components/Upload/UploadModal.js

@@ -39,6 +39,7 @@ exports.UploadModal = void 0;
 const react_1 = __importStar(require("react"));
 const lodash_1 = __importDefault(require("lodash"));
 const Modal_1 = require("../../components/_adapt/Modal");
+// import { Icon } from '../../components/_adapt/Icon';
 const utils_1 = require("../../utils");
 const antd_1 = require("antd");
 const Alert_1 = require("../_adapt/Alert");
@@ -48,6 +49,9 @@ const Const_1 = require("../../components/_setup/Const");
 const DEFAULT = { uploading: false, uploaded: false, percent: 0, error: false, };
 const UploadModal = props => {
     const [state, setState] = (0, react_1.useState)(DEFAULT);
+    const [open, afterClose] = (0, Modal_1.useDestoryModal)(props);
+    if (!open)
+        return utils_1.Const.NONE;
     const onChange = (info) => __awaiter(void 0, void 0, void 0, function* () {
         if (lodash_1.default.isEmpty(info.file))
             return;
@@ -132,7 +136,7 @@ const UploadModal = props => {
                 react_1.default.createElement(Button_1.Button, { loading: state.uploading, disabled: state.uploading, icon: "upload" }, utils_1.i18n.txt(Const_1.V.UPLOAD_FILE))),
             react_1.default.createElement(Button_1.Button, { onClick: () => props.onCancel() }, utils_1.i18n.ant('Modal.cancelText')));
     };
-    return react_1.default.createElement(Modal_1.Modal, Object.assign({ width: 640 }, props, { title: utils_1.i18n.getText(props.ik, props.title, Const_1.V.UPLOAD_MODAL_TITLE), className: "c-upload-modal", afterClose: () => setState(DEFAULT), footer: uploaded ? react_1.default.createElement(Button_1.Button, { type: 'primary', onClick: () => props.onOk ? props.onOk(null) : props.onCancel() }, utils_1.i18n.ant('Modal.okText')) : footer() }),
+    return react_1.default.createElement(Modal_1.Modal, Object.assign({ width: 640 }, props, { afterClose: () => { setState(DEFAULT); afterClose(); }, title: utils_1.i18n.getText(props.ik, props.title, Const_1.V.UPLOAD_MODAL_TITLE), className: "c-upload-modal", footer: uploaded ? react_1.default.createElement(Button_1.Button, { type: 'primary', onClick: () => props.onOk ? props.onOk(null) : props.onCancel() }, utils_1.i18n.ant('Modal.okText')) : footer() }),
         props.tip ? props.tip : react_1.default.createElement(Alert_1.Alert, { message: react_1.default.createElement("p", null, utils_1.i18n.txt(Const_1.V.UPLOAD_MODAL_TIP)), type: "info" }),
         error && react_1.default.createElement(Alert_1.Alert, { type: "error", message: state.errMsg }),
         uploaded && react_1.default.createElement(Alert_1.Alert, { type: "success", message: state.sucMsg }));

package/components/Upload/useUpload.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import type { UploadProps } from 'antd/es/upload';
+import type { UploadProps as AntdUploadProps } from 'antd/es/upload';
 import type { BaseUploadProps } from './index';
 import type { UploadChangeParam, UploadFile } from 'antd/es/upload/interface';
 export type UploadState = {
@@ -11,5 +11,5 @@ export type UploadState = {
     name?: string;
     info?: any;
 };
-export declare const getBaseOptions: (props: BaseUploadProps) => UploadProps;
+export declare const getBaseOptions: (props: BaseUploadProps) => AntdUploadProps;
 export declare const useUpload: (props: BaseUploadProps) => [UploadState, (info: UploadChangeParam<UploadFile<any>>) => void];

package/components/_adapt/Alert.d.ts

@@ -1,11 +1,11 @@
 import React from 'react';
 import type { FC } from 'react';
-import type { AlertProps } from 'antd/es/alert';
+import type { AlertProps as AntdAlertProps } from 'antd/es/alert';
 /**
  * 说明： 排除 Alert 组件已被 antd 标记为 deprecated 的属性:
  * closeText : 使用 closeIcon替代
 */
-export type OAlertProps = Omit<AlertProps, 'closeText'> & {
+export type AlertProps = Omit<AntdAlertProps, 'closeText'> & {
     closeIcon?: boolean | React.ReactNode;
 };
-export declare const Alert: FC<OAlertProps>;
+export declare const Alert: FC<AlertProps>;

package/components/_adapt/Breadcrumb.d.ts

@@ -0,0 +1,15 @@
+import { Breadcrumb as AntdBreadcrumb } from 'antd';
+import type { BreadcrumbProps as AntdBreadcrumbProps, BreadcrumbItemProps as AntdBreadcrumbItemProps } from 'antd/es/breadcrumb';
+import type { BaseOption } from '../../basetype';
+import type { ExoticComponent, PropsWithChildren } from 'react';
+type ItemType = Partial<AntdBreadcrumbItemProps> & BaseOption;
+export type BreadcrumbProps = AntdBreadcrumbProps & {
+    items?: ItemType[];
+};
+export type BreadcrumbItemProps = AntdBreadcrumbItemProps;
+type BreadcrumbComponent = ExoticComponent<PropsWithChildren<BreadcrumbProps>> & {
+    Item: typeof AntdBreadcrumb.Item;
+    Separator: typeof AntdBreadcrumb.Separator;
+};
+export declare const Breadcrumb: BreadcrumbComponent;
+export {};

package/components/_adapt/Breadcrumb.js

@@ -0,0 +1,18 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Breadcrumb = void 0;
+const react_1 = __importDefault(require("react"));
+const lodash_1 = __importDefault(require("lodash"));
+const antd_1 = require("antd");
+const _BreadcrumbWithItems = (props) => react_1.default.createElement(antd_1.Breadcrumb, Object.assign({}, props), props.items.map(item => react_1.default.createElement(antd_1.Breadcrumb.Item, Object.assign({}, lodash_1.default.omit(props, ['label', 'title', 'children'])), item.label || item.title || item.children)));
+const _Breadcrumb = props => {
+    if (lodash_1.default.isArray(props.items) && props.items.length)
+        return react_1.default.createElement(_BreadcrumbWithItems, Object.assign({}, props));
+    return react_1.default.createElement(antd_1.Breadcrumb, Object.assign({}, props));
+};
+exports.Breadcrumb = _Breadcrumb;
+exports.Breadcrumb.Item = antd_1.Breadcrumb.Item;
+exports.Breadcrumb.Separator = antd_1.Breadcrumb.Separator;

package/components/_adapt/Button.d.ts

@@ -1,19 +1,19 @@
 import React from 'react';
 import { Button as AntdButton } from "antd";
-import type { ButtonProps } from 'antd/es/button';
+import type { ButtonProps as AntdButtonProps } from 'antd/es/button';
 import type { ExoticComponent } from 'react';
 import type { BaseItem } from '../../basetype';
-declare const ButtonTypes: readonly ["default", "primary", "dashed", "link", "text"];
-export type ButtonType = typeof ButtonTypes[number];
-export type OButtonProps = Omit<ButtonProps, 'type' | 'icon'> & BaseItem & {
+import type { SizeType, ButtonType } from './_Antd5';
+export type ButtonProps = Omit<AntdButtonProps, 'type' | 'icon' | 'size'> & BaseItem & {
     danger?: boolean;
     type?: ButtonType;
+    size?: SizeType;
     icon?: string | React.ReactNode;
 };
 /**
  * 扩展 Button 支持 roleCode 和 ik
 */
-type Button = ExoticComponent<OButtonProps> & {
+type Button = ExoticComponent<ButtonProps> & {
     Group: typeof AntdButton.Group;
 };
 export declare const Button: Button;

package/components/_adapt/Button.js

@@ -15,6 +15,8 @@ const _Button = props => {
     let btnProps = Object.assign({}, props);
     if (props.danger)
         btnProps.type = 'danger';
+    if (props.size)
+        btnProps.size = props.size == 'middle' ? 'default' : props.size;
     let icon = null;
     if (props.icon) {
         icon = lodash_1.default.isString(props.icon) ? react_1.default.createElement(Icon_1.Icon, { type: props.icon }) : props.icon;

package/components/_adapt/Collapse.d.ts

@@ -3,15 +3,15 @@
  * 手风琴组件兼容模块  ： Collapse
  * -------------------------------
 */
-import type { CollapseProps } from 'antd/es/collapse';
-import type { CollapsePanelProps } from 'antd/es/collapse/CollapsePanel';
+import type { CollapseProps as AntdCollapseProps } from 'antd/es/collapse';
+import type { CollapsePanelProps as AntdCollapsePanelProps } from 'antd/es/collapse/CollapsePanel';
 import type { FC, PropsWithChildren, ExoticComponent } from 'react';
 /**
  * 说明： 排除 Collapse 组件已被 antd 标记为 deprecated 的属性:
  * expandIconPosition : 不支持 'left'/'right' 使用 'start'/'end' 替代
 */
-export declare type ExpandIconPosition = 'start' | 'end' | undefined;
-export type OCollapseProps = Omit<CollapseProps, 'expandIconPosition'> & {
+export type ExpandIconPosition = 'start' | 'end' | undefined;
+export type CollapseProps = Omit<AntdCollapseProps, 'expandIconPosition'> & {
     expandIconPosition?: ExpandIconPosition;
 };
 type CollapsibleType = 'disabled';
@@ -20,11 +20,11 @@ type CollapsibleType = 'disabled';
  * disabled：1.  不再被支持 ， 使用 `collapsible="disabled"` 替代
  *           2. 本版本不支持 header,icon ,只能使用 collapsible="disabled"
 */
-export type OCollapsePanelProps = Omit<CollapsePanelProps, 'disabled'> & {
+export type CollapsePanelProps = Omit<AntdCollapsePanelProps, 'disabled'> & {
     collapsible?: CollapsibleType;
 };
-type CollapseComponent = ExoticComponent<PropsWithChildren<OCollapseProps>> & {
-    Panel: FC<PropsWithChildren<OCollapsePanelProps>>;
+type CollapseComponent = ExoticComponent<PropsWithChildren<CollapseProps>> & {
+    Panel: FC<PropsWithChildren<CollapsePanelProps>>;
 };
 export declare const Collapse: CollapseComponent;
 export {};

package/components/_adapt/ConfigProvider.d.ts

@@ -0,0 +1,6 @@
+import React from 'react';
+import { ConfigProviderProps as AntdConfigProviderProps } from 'antd/es/config-provider';
+export type ConfigProviderProps = AntdConfigProviderProps & {
+    [properties: string]: any;
+};
+export declare const ConfigProvider: React.FC<ConfigProviderProps>;

package/components/_adapt/ConfigProvider.js

@@ -0,0 +1,10 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ConfigProvider = void 0;
+const react_1 = __importDefault(require("react"));
+const antd_1 = require("antd");
+const ConfigProvider = props => react_1.default.createElement(antd_1.ConfigProvider, Object.assign({}, props));
+exports.ConfigProvider = ConfigProvider;

package/components/_adapt/Drawer.d.ts

@@ -1,13 +1,13 @@
-import type { DrawerProps } from 'antd/es/drawer';
+import type { DrawerProps as AntdDrawerProps } from 'antd/es/drawer';
 import type { FC } from 'react';
 /**
  * 说明： 排除 Drawer 组件已被 antd 标记为 deprecated 的属性:
  * 1. visible : Please use `open` instead
  * 2. afterVisibleChange  Please use `afterOpenChange` instead
 */
-export type ODrawerProps = Omit<DrawerProps, 'visible' | 'afterVisibleChange'> & {
+export type DrawerProps = Omit<AntdDrawerProps, 'visible' | 'afterVisibleChange'> & {
     size?: 'default' | 'large';
     open?: boolean;
     afterOpenChange?: (open: boolean) => void;
 };
-export declare const Drawer: FC<ODrawerProps>;
+export declare const Drawer: FC<DrawerProps>;

package/components/_adapt/Dropdown.d.ts

@@ -1,15 +1,15 @@
 import type { FC } from 'react';
-import type { OMenuProps } from './Menu';
-import type { DropDownProps } from 'antd/es/dropdown';
+import type { MenuProps } from './Menu';
+import type { DropDownProps as AntdDropDownProps } from 'antd/es/dropdown';
 /**
  * 说明： 排除 Dropdown 组件已被 antd 标记为 deprecated 的属性:
  * 1. visible : Please use `open` instead
  * 2. onVisibleChange  Please use `onOpenChange` instead
  * 3. overlay Please use `menu` instead
 */
-export type ODropdownProps = Omit<DropDownProps, 'visible' | 'onVisibleChange' | 'overlay'> & {
+export type DropdownProps = Omit<AntdDropDownProps, 'visible' | 'onVisibleChange' | 'overlay'> & {
     arrow?: boolean;
-    menu?: OMenuProps;
-    overlay?: DropDownProps['overlay'];
+    menu?: MenuProps;
+    overlay?: AntdDropDownProps['overlay'];
 };
-export declare const Dropdown: FC<ODropdownProps>;
+export declare const Dropdown: FC<DropdownProps>;

package/components/_adapt/FloatButton.d.ts

@@ -1,9 +1,9 @@
 import React from 'react';
-import type { BadgeProps } from 'antd/es/badge';
+import type { BadgeProps as AntdBadgeProps } from 'antd/es/badge';
 export type FloatButtonType = 'default' | 'primary';
 export type FloatButtonShape = 'circle' | 'square';
 export type FloatButtonGroupTrigger = 'click' | 'hover';
-export type FloatButtonBadgeProps = Omit<BadgeProps, 'status' | 'text' | 'title' | 'children'>;
+export type FloatButtonBadgeProps = Omit<AntdBadgeProps, 'status' | 'text' | 'title' | 'children'>;
 export interface FloatButtonProps {
     className?: string;
     style?: React.CSSProperties;
@@ -15,4 +15,4 @@ export interface FloatButtonProps {
     badge?: FloatButtonBadgeProps;
     onClick?: React.MouseEventHandler<HTMLElement>;
 }
-export declare const FloatButton: (props: FloatButtonProps) => React.JSX.Element;
+export declare const FloatButton: (props: FloatButtonProps) => React.ReactElement<any, any>;

package/components/_adapt/FloatButton.js

@@ -2,5 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FloatButton = void 0;
 const Const_1 = require("../../utils/Const");
+// todo 
 const FloatButton = (props) => Const_1.NONE;
 exports.FloatButton = FloatButton;

package/components/_adapt/Form.d.ts

@@ -0,0 +1,14 @@
+import React from 'react';
+import type { FormProps as AntdFormProps, FormItemProps as AntdFormItemProps, FormComponentProps, FormCreateOption } from 'antd/es/form';
+import type { FormWrappedProps } from 'antd/es/form/interface';
+import type { FC, ExoticComponent, PropsWithChildren } from 'react';
+export type FormProps = AntdFormProps;
+export type FormItemProps = AntdFormItemProps & {
+    tooltip?: React.ReactNode;
+};
+type FormComponent = ExoticComponent<PropsWithChildren<AntdFormProps>> & {
+    Item: FC<FormItemProps>;
+    create: <TOwnProps extends FormComponentProps<any>>(options?: FormCreateOption<TOwnProps>) => FormWrappedProps<TOwnProps>;
+};
+export declare const Form: FormComponent;
+export {};

package/components/_adapt/Form.js

@@ -0,0 +1,48 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Form = void 0;
+const react_1 = __importStar(require("react"));
+const antd_1 = require("antd");
+const Icon_1 = require("./Icon");
+const Popover_1 = require("./Popover");
+const FormItem = props => {
+    const label = (0, react_1.useMemo)(() => {
+        if (props.label == null || props.label == undefined) {
+            return undefined;
+        }
+        if (props.tooltip) {
+            return react_1.default.createElement(react_1.default.Fragment, null,
+                react_1.default.createElement(Popover_1.Popover, null,
+                    react_1.default.createElement(Icon_1.Icon, { type: 'help' }),
+                    props.label));
+        }
+        return props.label;
+    }, [props.label, props.tooltip]);
+    return react_1.default.createElement(antd_1.Form.Item, Object.assign({}, props, { label: label }));
+};
+const _Form = antd_1.Form;
+exports.Form = _Form;
+exports.Form.Item = FormItem;

package/components/_adapt/Input.d.ts

@@ -0,0 +1,17 @@
+import { Input as AntdInput } from 'antd';
+import type { InputProps } from 'antd/es/input';
+import type { ForwardRefExoticComponent, RefAttributes } from 'react';
+export interface InputRef {
+    input: HTMLInputElement | null;
+    focus: () => void;
+    blur: () => void;
+    select: () => void;
+}
+type InputComponent = ForwardRefExoticComponent<InputProps & RefAttributes<InputRef>> & {
+    Group: typeof AntdInput.Group;
+    Search: typeof AntdInput.Search;
+    TextArea: typeof AntdInput.TextArea;
+    Password: typeof AntdInput.Password;
+};
+export declare const Input: InputComponent;
+export {};

package/components/_adapt/Input.js

@@ -0,0 +1,43 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Input = void 0;
+const react_1 = __importStar(require("react"));
+const antd_1 = require("antd");
+const _Input = (0, react_1.forwardRef)((props, ref) => react_1.default.createElement(antd_1.Input, Object.assign({}, props, { ref: aInput => {
+        if (aInput && ref) {
+            ref.current = {
+                input: aInput.input,
+                focus: aInput.focus,
+                blur: aInput.blur,
+                select: aInput.select,
+            };
+        }
+    } })));
+exports.Input = _Input;
+exports.Input.Group = antd_1.Input.Group;
+exports.Input.Search = antd_1.Input.Search;
+exports.Input.TextArea = antd_1.Input.TextArea;
+exports.Input.Password = antd_1.Input.Password;

package/components/_adapt/InputNumber.d.ts

@@ -0,0 +1,8 @@
+import { InputNumberProps as AntdInputNumberProps } from 'antd/es/input-number';
+import type { FC, ReactNode } from 'react';
+export type InputNumberProps = Omit<AntdInputNumberProps, 'size'> & {
+    addonBefore?: ReactNode;
+    addonAfter?: ReactNode;
+    size?: 'small' | 'middle' | 'large';
+};
+export declare const InputNumber: FC<InputNumberProps>;

package/components/_adapt/InputNumber.js

@@ -0,0 +1,60 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.InputNumber = void 0;
+const react_1 = __importStar(require("react"));
+const antd_1 = require("antd");
+const InputNumber = (props) => {
+    const numberProps = (0, react_1.useMemo)(() => {
+        return {};
+    }, [props.size, props.addonAfter, props.addonBefore]);
+    return react_1.default.createElement(antd_1.InputNumber, Object.assign({}, props, numberProps));
+};
+exports.InputNumber = InputNumber;
+// prefix?: React.ReactNode;
+// suffix?: React.ReactNode;
+// stringMode?: boolean;
+// style?: React.CSSProperties;
+// tabIndex?: number;
+// controls?: boolean;
+// addonBefore?: React.ReactNode;
+// addonAfter?: React.ReactNode;
+// upHandler?: React.ReactNode;
+// downHandler?: React.ReactNode;
+// keyboard?: boolean;
+// onInput?: (text: string) => void;
+// onStep?: (value: T, info: {
+//     offset: ValueType;
+//     type: 'up' | 'down';
+// }) => void;
+// disabled?: boolean;
+// bordered?: boolean;
+// status?: InputStatus;
+// controls?: boolean | {
+//     upIcon?: React.ReactNode;
+//     downIcon?: React.ReactNode;
+// };
+// onChange?: (value: number | undefined) => void;
+{ /* <AntdInputNumber value={""} /> */ }

package/components/_adapt/Menu.d.ts

@@ -1,18 +1,19 @@
 import React from 'react';
 import { Menu as AntdMenu } from 'antd';
-import type { MenuProps } from 'antd/es/menu';
-import type { MenuItemProps } from 'antd/es/menu/MenuItem';
-import type { SubMenuProps } from 'antd/es/menu/SubMenu';
+import type { MenuProps as AntdMenuProps } from 'antd/es/menu';
+import type { MenuItemProps as AntdMenuItemProps } from 'antd/es/menu/MenuItem';
+import type { SubMenuProps as AntdSubMenuProps } from 'antd/es/menu/SubMenu';
 import type { PropsWithChildren, ExoticComponent } from 'react';
 import type { Key } from '../../basetype';
-export interface MenuItemType extends MenuItemProps {
+export interface MenuItemType extends AntdMenuItemProps {
     key: Key;
+    danger?: boolean;
     icon?: string | React.ReactNode;
     ik?: string;
     label?: React.ReactNode;
     title?: string;
 }
-export interface SubMenuType<T extends MenuItemType = MenuItemType> extends Omit<SubMenuProps, 'children'> {
+export interface SubMenuType<T extends MenuItemType = MenuItemType> extends Omit<AntdSubMenuProps, 'children'> {
     key: Key;
     icon?: string | React.ReactNode;
     ik?: string;
@@ -20,10 +21,10 @@ export interface SubMenuType<T extends MenuItemType = MenuItemType> extends Omit
     children: ItemType<T>[];
 }
 export type ItemType<T extends MenuItemType = MenuItemType> = T | SubMenuType<T> | null;
-export type OMenuProps = MenuProps & {
+export type MenuProps = AntdMenuProps & {
     items?: ItemType[];
 };
-type MenuComponent = ExoticComponent<PropsWithChildren<OMenuProps>> & {
+type MenuComponent = ExoticComponent<PropsWithChildren<MenuProps>> & {
     Item: typeof AntdMenu.Item;
     SubMenu: typeof AntdMenu.SubMenu;
     ItemGroup: typeof AntdMenu.ItemGroup;

package/components/_adapt/Menu.js

@@ -11,28 +11,20 @@ const i18n_1 = require("../../utils/i18n");
 const Icon_1 = require("../_adapt/Icon");
 const getMenuProps = (props) => {
     const result = lodash_1.default.pick(props, ['className', 'key', 'disabled', 'onClick', 'level', 'onTitleClick']);
-    if (props.icon) {
-        if (props.ik) {
-            result.title = react_1.default.createElement(react_1.default.Fragment, null,
-                lodash_1.default.isString(props.icon) ? react_1.default.createElement(Icon_1.Icon, { type: props.icon }) : props.icon,
-                " ",
-                (0, i18n_1.txt)(props.ik));
-        }
-        else {
-            result.title = react_1.default.createElement(react_1.default.Fragment, null,
-                lodash_1.default.isString(props.icon) ? react_1.default.createElement(Icon_1.Icon, { type: props.icon }) : props.icon,
-                " ",
-                props.label || props.title);
-        }
+    var title = props.label || props.title;
+    if (props.ik) {
+        title = (0, i18n_1.txt)(props.ik);
     }
-    else {
-        if (props.ik) {
-            result.title = react_1.default.createElement(react_1.default.Fragment, null, (0, i18n_1.txt)(props.ik));
-        }
-        else {
-            result.title = react_1.default.createElement(react_1.default.Fragment, null, props.label || props.title);
-        }
+    if (props.danger) {
+        title = react_1.default.createElement(antd_1.Typography.Text, { type: "danger" }, title);
+    }
+    if (props.icon) {
+        title = react_1.default.createElement(react_1.default.Fragment, null,
+            lodash_1.default.isString(props.icon) ? react_1.default.createElement(Icon_1.Icon, { type: props.icon }) : props.icon,
+            " ",
+            (0, i18n_1.txt)(props.ik));
     }
+    result.title = title;
     return result;
 };
 const renderGroup = (props) => {

package/components/_adapt/Modal.d.ts

@@ -1,15 +1,15 @@
 import React, { Component } from 'react';
-import type { ModalProps } from 'antd/es/modal';
+import type { ModalProps as AntdModalProps } from 'antd/es/modal';
 import type { PlainObject } from '../../basetype';
-export type VModalProps = Omit<ModalProps, 'onOk' | 'onCancel' | 'visible'> & {
+export type ModalProps = Omit<AntdModalProps, 'onOk' | 'onCancel' | 'visible'> & {
     open?: boolean;
     onOk?: (data?: PlainObject) => void;
     onCancel?: () => void;
 };
-export declare class Modal extends Component<VModalProps> {
-    state: {
-        open: boolean;
-    };
+export declare const useDestoryModal: (props: {
+    open?: boolean;
+}) => [boolean, () => void];
+export declare class Modal extends Component<ModalProps> {
     static info: import("antd/lib/modal/Modal").ModalFunc;
     static success: import("antd/lib/modal/Modal").ModalFunc;
     static error: import("antd/lib/modal/Modal").ModalFunc;
@@ -17,7 +17,9 @@ export declare class Modal extends Component<VModalProps> {
     static warning: import("antd/lib/modal/Modal").ModalFunc;
     static confirm: import("antd/lib/modal/Modal").ModalFunc;
     static destroyAll: () => void;
-    componentDidUpdate(prevProps: Readonly<VModalProps>): void;
+    static useDestoryModal: (props: {
+        open?: boolean;
+    }) => [boolean, () => void];
     renderFooter(): React.ReactNode;
     render(): React.ReactNode;
 }

package/components/_adapt/Modal.js

@@ -23,28 +23,21 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Modal = void 0;
+exports.Modal = exports.useDestoryModal = void 0;
 const react_1 = __importStar(require("react"));
 const utils_1 = require("../../utils");
 const antd_1 = require("antd");
 const Button_1 = require("./Button");
+const useDestoryModal = (props) => {
+    const [open, setOpen] = (0, react_1.useState)(false);
+    (0, react_1.useLayoutEffect)(() => {
+        if (props.open)
+            setOpen(true);
+    }, [props.open]);
+    return [open, () => setOpen(false)];
+};
+exports.useDestoryModal = useDestoryModal;
 class Modal extends react_1.Component {
-    constructor() {
-        super(...arguments);
-        this.state = { open: false };
-    }
-    componentDidUpdate(prevProps) {
-        if (prevProps.open) {
-            // if (this.props.open) {
-            // } else {
-            // }
-        }
-        else {
-            if (this.props.open) {
-                this.setState({ open: true });
-            }
-        }
-    }
     renderFooter() {
         const { okText, okType = 'primary', cancelText, confirmLoading, onOk, onCancel, okButtonProps, cancelButtonProps, footer } = this.props;
         if (footer !== undefined)
@@ -54,9 +47,7 @@ class Modal extends react_1.Component {
             react_1.default.createElement(Button_1.Button, Object.assign({ onClick: evt => utils_1.PageUtil.stopEvent(evt, () => onCancel()) }, cancelButtonProps), cancelText || utils_1.i18n.ant('Modal.cancelText')));
     }
     render() {
-        if (!this.state.open)
-            return utils_1.Const.NONE;
-        return react_1.default.createElement(antd_1.Modal, Object.assign({}, this.props, { afterClose: () => this.setState({ open: false }), visible: this.props.open, footer: this.props.footer === null ? null : this.renderFooter() }));
+        return react_1.default.createElement(antd_1.Modal, Object.assign({}, this.props, { visible: this.props.open, footer: this.props.footer === null ? null : this.renderFooter() }));
     }
 }
 exports.Modal = Modal;
@@ -67,3 +58,4 @@ Modal.warn = antd_1.Modal.warn;
 Modal.warning = antd_1.Modal.warning;
 Modal.confirm = antd_1.Modal.confirm;
 Modal.destroyAll = antd_1.Modal.destroyAll;
+Modal.useDestoryModal = exports.useDestoryModal;