vap1 0.0.7 → 0.0.9

package/components/UForm/UForm.js

@@ -39,7 +39,7 @@ exports.UForm = exports.initValue = void 0;
 const react_1 = __importStar(require("react"));
 const lodash_1 = __importDefault(require("lodash"));
 const utils_1 = require("../../utils");
-const antd_1 = require("antd");
+const Form_1 = require("../_adapt/Form");
 const Row_1 = require("../_adapt/Row");
 const Col_1 = require("../_adapt/Col");
 const Popconfirm_1 = require("../_adapt/Popconfirm");
@@ -145,8 +145,9 @@ const renderFormField = (state, field, form, update, data) => {
     const input = (0, _register_1.getUFormInput)(field.type || 'text');
     const { labelSpan, inputSpan, colSpan, cols, disableFields, hiddenFields, requireFields, optionFields, } = state;
     if (hiddenFields.current.has(field.field)) {
-        return react_1.default.createElement(antd_1.Form.Item, { style: { display: 'none' } }, form.getFieldDecorator(field.field)(react_1.default.createElement(input.component, {
+        return react_1.default.createElement(Form_1.Form.Item, { style: { display: 'none' } }, form.getFieldDecorator(field.field)(react_1.default.createElement(input.component, {
             form,
+            // initValue:
             field,
             disabled: disableFields.current.has(field.field),
             options: (0, _FormUtils_1.getOptions)(optionFields.current.has(field.field) ? optionFields.current.get(field.field) : (field.options || []), field, data)
@@ -154,7 +155,7 @@ const renderFormField = (state, field, form, update, data) => {
     }
     const [required, rules] = (0, _FormUtils_1.requireStatus)(field, requireFields.current, disableFields.current, hiddenFields.current);
     const options = {
-        // initialValue: form.getFieldValue(field.field),
+        initialValue: form.getFieldValue(field.field),
         validateFirst: true,
         rules,
         getValueFromEvent: (value, extra) => onChangeEvent(state, field, form, update, value, extra),
@@ -224,7 +225,7 @@ const renderFormField = (state, field, form, update, data) => {
         }
     }
     return react_1.default.createElement(Col_1.Col, Object.assign({}, colProps),
-        react_1.default.createElement(antd_1.Form.Item, Object.assign({}, itemProps), form.getFieldDecorator(field.field, options)(react_1.default.createElement(input.component, {
+        react_1.default.createElement(Form_1.Form.Item, Object.assign({}, itemProps), form.getFieldDecorator(field.field, options)(react_1.default.createElement(input.component, {
             form,
             field,
             disabled: disableFields.current.has(field.field),
@@ -346,9 +347,11 @@ const _FormField = (props) => {
     const { form } = props;
     const update = (0, useUpdate_1.useUpdate)();
     (0, react_1.useEffect)(() => {
+        // console.log('dfdsaupdate')
         const values = (0, exports.initValue)(props);
         props.initRef.current = values;
-        form.setFieldsValue(values);
+        console.log(values);
+        form.setFieldsValue(props.initRef.current);
         props.fields.map(field => {
             if (field == null || field == false)
                 return;
@@ -358,10 +361,12 @@ const _FormField = (props) => {
             if (lodash_1.default.isArray(field.link) && field.link.length > 0)
                 setTimeout(() => onChangeEvent(props.state, field, form, update, values[field.field]), 2);
         });
+        // console.log('google')
         update();
     }, []);
-    if (props.initRef.current === null)
-        return utils_1.Const.NONE;
+    // console.log(props.initRef.current)
+    // return Const.NONE
+    // if (props.initRef.current === null) return Const.NONE;
     const data = form.getFieldsValue();
     return props.fields.map(field => {
         if (field == null || field === false)
@@ -392,8 +397,7 @@ const _FormGroup = (props) => {
         });
         update();
     }, []);
-    if (props.initRef.current === null)
-        return utils_1.Const.NONE;
+    // if (props.initRef.current === null) return Const.NONE;
     const data = form.getFieldsValue();
     return props.fields.map(group => {
         if (group == null || group === false)
@@ -449,12 +453,39 @@ const _UForm = (0, react_1.forwardRef)((props, ref) => {
                 checkMultiple(item);
             }
         });
+        // initRef.current = initValue({ ...props, state })
+        // if (state.isGroup) {
+        //     props.fields.map(group => {
+        //         if (group == null || group == false) return;
+        //         (group as UFormFieldGroup).fields.map(field => {
+        //             // @ts-ignore
+        //             if (field == null || field == false) return;
+        //             if (!_.has(initRef.current, field.field) || initRef.current[field.field] === null || initRef.current[field.field] === undefined) return;
+        //             // setFieldsValue 要 render 后才能get ,延时执行 link事件
+        //             // if (_.isArray(field.link) && field.link.length > 0) setTimeout(() => onChangeEvent(state, field, form, update, values[field.field]), 2);
+        //         })
+        //     })
+        // } else {
+        //     props.fields.map(field => {
+        //         if (field == null || field == false) return;
+        //         if (!_.has(initRef.current, field.field) || initRef.current[field.field] === null || initRef.current[field.field] === undefined) return;
+        //         // setFieldsValue 要 render 后才能get ,延时执行 link事件
+        //         // if (_.isArray(field.link) && field.link.length > 0) setTimeout(() => onChangeEvent(props.state, field, form, update, values[field.field]), 2);
+        //     })
+        // }
+        // form.setFieldsValue(initRef.current, () => setChecked(true))
         setChecked(true);
     }, []);
-    return checked && react_1.default.createElement(antd_1.Form
+    if (!checked)
+        return utils_1.Const.NONE;
+    // console.log(initRef)
+    // console.log('fdsafd')
+    return react_1.default.createElement(Form_1.Form
+    // defaultValue={initRef.current}
     // initialValues={props.default}
     // size={props.size || GLOBAL.CONFIG.FORM.SIZE}
     , { 
+        // defaultValue={initRef.current}
         // initialValues={props.default}
         // size={props.size || GLOBAL.CONFIG.FORM.SIZE}
         className: state.isGroup ? 'c-form c-form-group' : 'c-form', style: { width: state.width }, form: form },
@@ -469,7 +500,8 @@ class _UFormAdaptor extends react_1.default.Component {
 }
 // 3.0 适配层
 const UFormAdaptor = (0, react_1.memo)((0, react_1.forwardRef)((props, ref) => {
-    const FROM = antd_1.Form.create()(_UFormAdaptor);
+    const FROM = Form_1.Form.create()(_UFormAdaptor);
+    // <ConfigProvider ></ConfigProvider>
     return react_1.default.createElement(FROM, Object.assign({}, props, { aref: ref }));
 }));
 /**
@@ -480,5 +512,5 @@ const UFormAdaptor = (0, react_1.memo)((0, react_1.forwardRef)((props, ref) => {
  * 3. 支持 ref 控制方法
  * 4. filed 支持更多提示，验证方法
 */
-exports.UForm = react_1.default.forwardRef((props, ref) => react_1.default.createElement(FormWrapper_1.FormWrapper, Object.assign({ isInfo: false }, props),
+exports.UForm = (0, react_1.forwardRef)((props, ref) => react_1.default.createElement(FormWrapper_1.FormWrapper, Object.assign({ isInfo: false }, props),
     react_1.default.createElement(UFormAdaptor, Object.assign({}, props, { ref: ref }))));

package/components/UForm/UFormModal.js

@@ -38,7 +38,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.UFormModal = void 0;
 const react_1 = __importStar(require("react"));
 const lodash_1 = __importDefault(require("lodash"));
-const antd_1 = require("antd");
+const Popconfirm_1 = require("../_adapt/Popconfirm");
 const Modal_1 = require("../_adapt/Modal");
 const Button_1 = require("../_adapt/Button");
 const UForm_1 = require("./UForm");
@@ -48,6 +48,9 @@ const FormWrapper_1 = require("./FormWrapper");
 const FORM_FIELDS = ['layout', 'fields', 'groupType', 'isEdit', 'tip', 'default', 'data', 'mode', 'size'];
 const UFormModal = (props) => {
     const ref = (0, react_1.useRef)(null);
+    const [open, afterClose] = (0, Modal_1.useDestoryModal)(props);
+    if (!open)
+        return utils_1.Const.NONE;
     let modalProps = {
         onOk: () => __awaiter(void 0, void 0, void 0, function* () {
             const result = yield ref.current.validate();
@@ -136,14 +139,14 @@ const UFormModal = (props) => {
                     btn.icon = react_1.default.createElement(Icon, { type: btn.icon });
                 }
                 if (btn.confirm) {
-                    return react_1.default.createElement(antd_1.Popconfirm, { title: btn.confirm, onConfirm: (evt) => onClick(evt) },
+                    return react_1.default.createElement(Popconfirm_1.Popconfirm, { title: btn.confirm, onConfirm: (evt) => onClick(evt) },
                         react_1.default.createElement(Button_1.Button, Object.assign({}, btn, { onClick: undefined }), utils_1.i18n.getText(btn.ik, btn.label)));
                 }
                 return react_1.default.createElement(Button_1.Button, Object.assign({}, btn, { onClick: evt => onClick(evt) }), utils_1.i18n.getText(btn.ik, btn.label));
             });
         }
     }
-    return react_1.default.createElement(Modal_1.Modal, Object.assign({ maskClosable: utils_1.GLOBAL.CONFIG.FORM.maskClosable, destroyOnClose: true }, lodash_1.default.omit(props, FORM_FIELDS), { className: utils_1.StringUtil.className(['u-form-modal'], props.className), onCancel: () => props.onCancel() }, modalProps),
+    return react_1.default.createElement(Modal_1.Modal, Object.assign({ maskClosable: utils_1.GLOBAL.CONFIG.FORM.maskClosable, destroyOnClose: true, afterClose: afterClose }, lodash_1.default.omit(props, FORM_FIELDS), { className: utils_1.StringUtil.className(['u-form-modal'], props.className), onCancel: () => props.onCancel() }, modalProps),
         react_1.default.createElement(UForm_1.UForm, Object.assign({}, lodash_1.default.pick(props, FORM_FIELDS), { ref: ref })));
 };
 exports.UFormModal = UFormModal;

package/components/UForm/UInfoModal.js

@@ -13,6 +13,9 @@ const Const_1 = require("../_setup/Const");
 const FormWrapper_1 = require("./FormWrapper");
 const FORM_FIELDS = ['layout', 'fields', 'groupType', 'isEdit', 'tip', 'default', 'data', 'mode', 'hideBorder', 'theme'];
 const UInfoModal = (props) => {
+    const [open, afterClose] = (0, Modal_1.useDestoryModal)(props);
+    if (!open)
+        return utils_1.Const.NONE;
     const param = lodash_1.default.omit(props, FORM_FIELDS);
     if (!lodash_1.default.has(props, 'title') && lodash_1.default.has(props, 'autoTitle')) {
         let name = null;

package/components/UForm/UModal.js

@@ -8,17 +8,22 @@ const react_1 = __importDefault(require("react"));
 const lodash_1 = __importDefault(require("lodash"));
 const UFormModal_1 = require("./UFormModal");
 const UInfoModal_1 = require("./UInfoModal");
+const Modal_1 = require("../_adapt/Modal");
+const utils_1 = require("../../utils");
 const UModal = (props) => {
+    const [open, afterClose] = (0, Modal_1.useDestoryModal)(props);
+    if (!open)
+        return utils_1.Const.NONE;
     // 指定模式时，以指定的模式为准
     if (lodash_1.default.has(props, 'mode')) {
         if (props.mode == 'INFO')
-            return react_1.default.createElement(UInfoModal_1.UInfoModal, Object.assign({}, props));
-        return react_1.default.createElement(UFormModal_1.UFormModal, Object.assign({}, props));
+            return react_1.default.createElement(UInfoModal_1.UInfoModal, Object.assign({ afterClose: afterClose }, props));
+        return react_1.default.createElement(UFormModal_1.UFormModal, Object.assign({ afterClose: afterClose }, props));
     }
     if (props.isEdit)
-        return react_1.default.createElement(UFormModal_1.UFormModal, Object.assign({}, props));
+        return react_1.default.createElement(UFormModal_1.UFormModal, Object.assign({ afterClose: afterClose }, props));
     if (props.data && lodash_1.default.keys(props.data).length)
-        return react_1.default.createElement(UInfoModal_1.UInfoModal, Object.assign({}, props));
-    return react_1.default.createElement(UFormModal_1.UFormModal, Object.assign({}, props));
+        return react_1.default.createElement(UInfoModal_1.UInfoModal, Object.assign({ afterClose: afterClose }, props));
+    return react_1.default.createElement(UFormModal_1.UFormModal, Object.assign({ afterClose: afterClose }, props));
 };
 exports.UModal = UModal;

package/components/UForm/index.d.ts

@@ -6,8 +6,8 @@ export { UInfoModal } from './UInfoModal';
 export { UModal } from './UModal';
 export { UDescriptions } from './UDescriptions';
 import type { BaseOption, PlainObject, BaseItem } from '../../basetype';
-import type { VModalProps } from '../_adapt/Modal';
-import type { OButtonProps as ButtonProps } from '../_adapt/Button';
+import type { ModalProps } from '../_adapt/Modal';
+import type { ButtonProps } from '../_adapt/Button';
 import type { ValidationRule } from 'antd/es/form/Form';
 /**
  * 表单布局方式 simple = 1 列 （比较宽松） | common = 2 列 （常规） |  compress = 3列 （紧凑）
@@ -22,6 +22,7 @@ export type UFormLayout = 'common' | 'simple' | 'compress';
 export type GroupType = 'default' | 'tabs' | 'collapse';
 export type LinkValue = string | number | boolean;
 import type { _FieldType } from './_FieldType';
+import type { SizeType } from '../_adapt/_Antd5';
 /**
  * 联动结果 ： 改变目标字段的交互属性
  * 所有属性为可选，需要改变几项属性，则只返回包含几个属性的对象，
@@ -223,6 +224,10 @@ export type UFromProps = {
      * 表单宽度，仅支持数字，一般不传，需要时使用，
     */
     width?: number;
+    /**
+     * 表单大小
+    */
+    size?: SizeType;
     /**
      * 说明：
      *
@@ -286,7 +291,7 @@ export type UFromAction = ButtonProps & {
  * 新版本 ModalProps 只支持 open 且必传，
  * 不使用 deprecated 属性
 */
-export type UModalProps = UFromProps & Omit<VModalProps, 'children'> & {
+export type UModalProps = UFromProps & Omit<ModalProps, 'children'> & {
     /**
      * open 为必填项，不使用废弃的 visable 属性
     */

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,18 @@
-import type { DrawerProps } from 'antd/es/drawer';
+import React from 'react';
+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'> & {
+    /**
+     * 1.5版本无法生效的属性
+     * */
     size?: 'default' | 'large';
     open?: boolean;
+    footer?: React.ReactNode;
     afterOpenChange?: (open: boolean) => void;
 };
-export declare const Drawer: FC<ODrawerProps>;
+export declare const Drawer: FC<DrawerProps>;

package/components/_adapt/Drawer.js

@@ -7,5 +7,9 @@ exports.Drawer = void 0;
 const react_1 = __importDefault(require("react"));
 const antd_1 = require("antd");
 const utils_1 = require("./utils");
-const Drawer = (props) => react_1.default.createElement(antd_1.Drawer, Object.assign({}, (0, utils_1.convertProps)(props, ['visible', 'open'], ['afterVisibleChange', 'afterOpenChange'])));
+const Drawer = (props) => {
+    return react_1.default.createElement(antd_1.Drawer, Object.assign({}, (0, utils_1.convertProps)(props, ['visible', 'open'], ['afterVisibleChange', 'afterOpenChange'])),
+        props.children,
+        props.footer);
+};
 exports.Drawer = Drawer;

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 {};