vap1 0.4.3 → 0.4.4

package/components/UForm/_FieldType.d.ts

@@ -5,4 +5,4 @@
 | text ||
  *
 */
-export declare const _FieldType: readonly ["text", "textarea", "password", "color", "number", "slider", "slider-range", "slider-range", "input-with-select", "select", "multi-select", "switch", "switch-checkbox", "radio", "radio-button", "radio-with-more", "checkbox", "checkbox-with-all", "icon", "stree-select", "dtree-select", "ftree-select", "multi-stree-select", "multi-dtree-select", "multi-ftree-select", "date", "datetime", "month", "week", "time", "daterange", "datetimerange", "daterange-single", "datetimerange-single", "timerange", "monthrange", "json-array", "json-table", "file", "multi-file", "img", "idcard", "ip", "ip4", "ip6", "phone", "telephone", "mobilephone", "port", "mac", "url", "email", "crontab", "organization", "role", "roles", "cems-org-button"];
+export declare const _FieldType: readonly ["text", "textarea", "password", "color", "number", "slider", "slider-range", "slider-range", "input-with-select", "button", "select", "multi-select", "switch", "switch-checkbox", "radio", "radio-button", "radio-with-more", "checkbox", "checkbox-with-all", "icon", "stree-select", "dtree-select", "ftree-select", "multi-stree-select", "multi-dtree-select", "multi-ftree-select", "date", "datetime", "month", "week", "time", "daterange", "datetimerange", "daterange-single", "datetimerange-single", "timerange", "monthrange", "json-array", "json-table", "file", "multi-file", "img", "idcard", "ip", "ip4", "ip6", "phone", "telephone", "mobilephone", "port", "mac", "url", "email", "crontab", "organization", "role", "roles", "cems-org-button"];

package/components/UForm/_FieldType.js

@@ -47,6 +47,10 @@ exports._FieldType = [
      * 说明：字段数量必须为2个
     */
     'input-with-select',
+    /**
+     * 一个没有任何意义的按钮，使用时，请设置 dataType:'none'
+    */
+    'button',
     /**
      * 下拉选择
     */

package/components/UForm/_input.d.ts

@@ -1,4 +1,4 @@
-import React from 'react';
+import type { ReactNode } from 'react';
 import type { UFormField } from './index';
 import type { PlainObject } from '../../basetype';
 import type { TableColumn } from '../Tables';
@@ -20,7 +20,7 @@ type ApiTableBuilderOptions = {
     /**
      * 选择弹框标题
     */
-    title: React.ReactNode;
+    title: ReactNode;
     /**
      * 选择弹框宽度
     */
@@ -50,7 +50,7 @@ type ApiTableBuilderOptions = {
     /**
      * 用于展示按钮内容的 render，优先级高于 nameField
     */
-    render?: (obj: PlainObject) => React.ReactNode;
+    render?: (obj: PlainObject) => ReactNode;
 };
 /**
  * 快速注册 一个 弹出ApiTable 的选择组件

package/components/UForm/_input.js

@@ -140,8 +140,8 @@ var builderApiTableSerletor = function (options, nameIdx) { return function (pro
             return values[1];
         return values[0];
     };
-    return react_1.default.createElement(react_1.default.Fragment, null,
-        values[0] != undefined ? react_1.default.createElement(Button_1.Button, __assign({}, params, { onClick: function () { return setOpen(true); } }), getTip(values)) : react_1.default.createElement(Button_1.Button, __assign({}, params, { icon: 'select', onClick: function () { return setOpen(true); } }), (0, exports.getPlaceholder)(field, true)),
+    return react_1.default.createElement(react_1.Fragment, null,
+        values[0] != undefined ? react_1.default.createElement(Button_1.Button, __assign({}, params, { icon: 'select', onClick: function () { return setOpen(true); } }), getTip(values)) : react_1.default.createElement(Button_1.Button, __assign({}, params, { icon: 'select', onClick: function () { return setOpen(true); } }), (0, exports.getPlaceholder)(field, true)),
         react_1.default.createElement(Tables_1.ApiTableModal, __assign({ title: options.title, searchBar: options.searchBar, width: options.width || 720 }, field.config, { api: options.api, columns: __spreadArray(__spreadArray([], __read(options.columns), false), [
                 Tables_1.ApiTable.COL_OPERACTION({ render: function (data) { return react_1.default.createElement(Tables_1.ApiTable.ACTION, { title: "\u9009\u62E9", icon: "select", onClick: function () { return onSelect(data); } }); } })
             ], false), open: open, onCancel: function () { return setOpen(false); } })));

package/components/UForm/_register.d.ts

@@ -1,8 +1,7 @@
-import React from 'react';
+import type { ComponentType, ReactNode } from 'react';
 import type { BaseOption, PlainObject } from '../../basetype';
 import type { UFormField } from './index';
 import type { ValidationRule, WrappedFormUtils } from 'antd/es/form/Form';
-import type { ComponentType } from 'react';
 /**
  * 自定义组件实现时，为组件提供的参数
  *
@@ -65,7 +64,7 @@ export type FormFieldOptions = {
     /**
      * INFO模式下的回显方式
     */
-    render?: (value: any, data?: PlainObject, field?: UFormField) => React.ReactNode;
+    render?: (value: any, data?: PlainObject, field?: UFormField) => ReactNode;
     /**
      * 校验规则
      * 支持传Rule, Rule数组，及一个方法，接收一个数组

package/components/UForm/index.d.ts

@@ -1,10 +1,10 @@
-/// <reference types="react" />
 export { UForm } from './UForm';
 export { UFormModal } from './UFormModal';
 export { UInfo } from './UInfo';
 export { UInfoModal } from './UInfoModal';
 export { UModal } from './UModal';
 export { UDescriptions } from './UDescriptions';
+import type { ReactNode, CSSProperties } from 'react';
 import type { BaseOption, PlainObject, BaseItem } from '../../basetype';
 import type { ModalProps } from '../_adapt/Modal';
 import type { ButtonProps } from '../_adapt/Button';
@@ -16,7 +16,10 @@ import type { ValidationRule } from 'antd/es/form/Form';
  *  2. 大于8个字段时，默认使用  common
 */
 export type UFormLayout = 'common' | 'simple' | 'compress';
-export type FieldDataType = 'string' | 'number' | 'boolean' | 'array' | 'object';
+/**
+ *
+*/
+export type FieldDataType = 'string' | 'number' | 'boolean' | 'array' | 'object' | 'NONE';
 /**
  * 分组展示的方式 default = 默认 |  tabs = 标签  | collapse = 折叠风琴
 */
@@ -155,17 +158,17 @@ export type UFormField = BaseItem & {
      * 1. 为字文本时，提示文本
      * 2. 为对象时，提示标题，文本，提示图标可指定
      */
-    tip?: React.ReactNode;
+    tip?: ReactNode;
     /**
      * FormItem 的 extra 信息
      * 说明 `tip` 显示在label 旁边，以 Icon图标显示
      * extra 直接显示
     */
-    extra?: React.ReactNode;
+    extra?: ReactNode;
     /**
      * FormItem 的 help 信息
     */
-    help?: React.ReactNode;
+    help?: ReactNode;
     /**
      * rules 用法： https://github.com/yiminghe/async-validator
     */
@@ -195,7 +198,7 @@ export type UFormField = BaseItem & {
      * render
      * 回显方法
     */
-    render?: (txt: any, obj?: any) => React.ReactNode;
+    render?: (txt: any, obj?: any) => ReactNode;
     /**
      * 字段选项，适用于 `table` `json-table` 等
      */
@@ -223,7 +226,7 @@ export type UFromProps = {
     /**
      * 自定义样式
     */
-    style?: React.CSSProperties;
+    style?: CSSProperties;
     /**
      * 列表
     */
@@ -257,7 +260,7 @@ export type UFromProps = {
     /**
      * 提示信息
     */
-    tip?: React.ReactNode;
+    tip?: ReactNode;
     /**
      * 默认
     */
@@ -303,7 +306,7 @@ export type UFromAction = ButtonProps & {
     /**
      * 点击前的提示
     */
-    confirm?: React.ReactNode;
+    confirm?: ReactNode;
 };
 /**
  * 新版本 ModalProps 只支持 open 且必传，
@@ -353,11 +356,11 @@ export type UDescriptionsProps = {
     /**
      * 样式
     */
-    style?: React.CSSProperties;
+    style?: CSSProperties;
     /**
      * 标题
     */
-    title?: React.ReactNode;
+    title?: ReactNode;
     /**
      * 标题 i18n Key
     */
@@ -394,7 +397,7 @@ export type UDescriptionsItemProps = BaseItem & {
     /**
      * label 名称
     */
-    label?: React.ReactNode;
+    label?: ReactNode;
     /**
      * 横跨制表格数，默认：1
     */
@@ -406,7 +409,7 @@ export type UDescriptionsItemProps = BaseItem & {
     /**
      * 显示内容
     */
-    children: React.ReactNode;
+    children: ReactNode;
 };
 export type UFormRef = {
     /**

package/components/Upload/UploadFile.d.ts

@@ -1,3 +1,3 @@
-import React from 'react';
+import type { FC } from 'react';
 import type { BaseUploadProps } from './index';
-export declare const UploadFile: React.FC<BaseUploadProps>;
+export declare const UploadFile: FC<BaseUploadProps>;

package/components/Upload/UploadImage.d.ts

@@ -1,4 +1,4 @@
-import React from 'react';
+import type { FC } from 'react';
 import type { BaseUploadProps } from './index';
 import type { PlainObject } from '../../basetype';
 export declare const getImageUrl: (uri: string) => string;
@@ -26,4 +26,4 @@ export type UploadImageProps = BaseUploadProps & {
     */
     builtIn?: string[];
 };
-export declare const UploadImage: React.FC<UploadImageProps>;
+export declare const UploadImage: FC<UploadImageProps>;

package/components/Upload/UploadImage.js

@@ -103,7 +103,7 @@ var ImagePreview = function (props) {
         }
         return param;
     }, [imgUrl]);
-    return react_1.default.createElement(react_1.default.Fragment, null,
+    return react_1.default.createElement(react_1.Fragment, null,
         react_1.default.createElement("div", __assign({}, divProps), showPreview && react_1.default.createElement(Icon_1.Icon, { type: "zoom-in" })),
         showPreview && react_1.default.createElement(Modal_1.Modal, { className: 'picture-card-preview', style: { top: 0, backgroundImage: "url(\"".concat(imgUrl, "\")") }, open: open, maskClosable: true, width: '100%', footer: null, onCancel: show }));
 };

package/components/Upload/UploadModal.d.ts

@@ -1,4 +1,4 @@
-import React from 'react';
+import type { FC, ReactNode } from 'react';
 import type { BaseUploadProps } from './index';
 import type { ModalProps } from '../../components/_adapt/Modal';
 import type { PlainObject } from '../../basetype';
@@ -9,7 +9,7 @@ import type { PlainObject } from '../../basetype';
  * return {ok:true, message:'成功导入111条记录'}
 */
 type ImportResult = boolean | {
-    message: React.ReactNode;
+    message: ReactNode;
     ok: boolean;
 };
 /**
@@ -31,7 +31,7 @@ export type UploadModalProps = ModalProps & Omit<BaseUploadProps, 'onChange' | '
      * 上传提示，通常包括上传数据说明，数据模板文件下载等内容。
      * 默认 ： 请注意：导入的Excel数据字段须与Excel模版保持一致，否则无法导入数据。点击确认时将仅导入正常数据。
     */
-    tip?: React.ReactNode;
+    tip?: ReactNode;
     /**
      * 二步模式，且上传接口非标准接口时，必传 onUpload
      * 返回上传结果 boolean  成功 OR 失败
@@ -46,5 +46,5 @@ export type UploadModalProps = ModalProps & Omit<BaseUploadProps, 'onChange' | '
     */
     onCancel: () => void;
 };
-export declare const UploadModal: React.FC<UploadModalProps>;
+export declare const UploadModal: FC<UploadModalProps>;
 export {};

package/components/Upload/UploadModal.js

@@ -196,9 +196,9 @@ var UploadModal = function (props) {
             uploadProps.className = 'c-upload-file';
         }
         ;
-        return react_1.default.createElement(react_1.default.Fragment, null,
+        return react_1.default.createElement(react_1.Fragment, null,
             react_1.default.createElement(antd_1.Upload, __assign({}, uploadProps, { onChange: onChange }),
-                react_1.default.createElement(Button_1.Button, { loading: state.uploading, disabled: state.uploading, icon: "upload" }, utils_1.i18n.txt(_i18n_1.V.UPLOAD_FILE))),
+                react_1.default.createElement(Button_1.Button, { loading: state.uploading, disabled: state.uploading, icon: "upload", type: "primary" }, utils_1.i18n.txt(_i18n_1.V.UPLOAD_FILE))),
             react_1.default.createElement(Button_1.Button, { onClick: function () { return props.onCancel(); } }, utils_1.i18n.ant('Modal.cancelText')));
     };
     return react_1.default.createElement(Modal_1.Modal, __assign({ width: 640 }, props, { afterClose: function () { setState(DEFAULT); afterClose(); }, title: utils_1.i18n.getText(props.ik, props.title, _i18n_1.V.UPLOAD_MODAL_TITLE), className: "c-upload-modal", footer: uploaded ? react_1.default.createElement(Button_1.Button, { type: 'primary', onClick: function () { return props.onOk ? props.onOk(null) : props.onCancel(); } }, utils_1.i18n.ant('Modal.okText')) : footer() }),

package/components/Upload/useUpload.d.ts

@@ -1,4 +1,4 @@
-import React from 'react';
+import type { ReactNode } from 'react';
 import type { UploadProps as AntdUploadProps } from 'antd/es/upload';
 import type { BaseUploadProps } from './index';
 import type { UploadChangeParam, UploadFile } from 'antd/es/upload/interface';
@@ -7,7 +7,7 @@ export type UploadState = {
     uploaded: boolean;
     error: boolean;
     percent: number;
-    errMsg?: React.ReactNode;
+    errMsg?: ReactNode;
     name?: string;
     info?: any;
 };

package/components/Upload/useUpload.js

@@ -24,7 +24,7 @@ var react_1 = require("react");
 var lodash_1 = __importDefault(require("lodash"));
 var antd_1 = require("antd");
 var utils_1 = require("../../utils");
-var _i18n_1 = require("../../components/_i18n");
+var _i18n_1 = require("../_i18n");
 var getBaseOptions = function (props) {
     var uploadProps = {
         showUploadList: false,

package/components/_RegisterUtil.d.ts

@@ -1 +1 @@
-export declare const register: (map: Map<string, any>, type: string, def: object, component: any, options?: object, forceOverWrite?: boolean) => void;
+export declare const register: (map: Map<string, any>, type: string, defaultValue: object, component: any, options?: object, forceOverWrite?: boolean) => void;

package/components/_RegisterUtil.js

@@ -17,7 +17,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.register = void 0;
 var lodash_1 = __importDefault(require("lodash"));
 var StringUtil_1 = require("../utils/StringUtil");
-var register = function (map, type, def, component, options, forceOverWrite) {
+var register = function (map, type, defaultValue, component, options, forceOverWrite) {
     if (forceOverWrite === void 0) { forceOverWrite = false; }
     var key = (0, StringUtil_1.trimLower)(type);
     if (map.has(key)) {
@@ -30,7 +30,7 @@ var register = function (map, type, def, component, options, forceOverWrite) {
             console.warn("".concat(type, " is overwite by new component"));
         }
     }
-    var element = __assign({ component: component }, def);
+    var element = __assign({ component: component }, defaultValue);
     lodash_1.default.keys(options).map(function (key) { return element[key] = options[key]; });
     map.set(key, element);
 };

package/components/_adapt/Alert.d.ts

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

package/components/_adapt/Button.d.ts

@@ -1,14 +1,13 @@
-import React from 'react';
 import { Button as AntdButton } from "antd";
-import type { ButtonProps as AntdButtonProps } from 'antd/es/button';
-import type { ExoticComponent } from 'react';
+import type { ExoticComponent, ReactNode } from 'react';
 import type { BaseItem } from '../../basetype';
+import type { ButtonProps as AntdButtonProps } from 'antd/es/button';
 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;
+    icon?: string | ReactNode;
 };
 /**
  * 扩展 Button 支持 roleCode 和 ik

package/components/_adapt/Col.d.ts

@@ -1,5 +1,5 @@
-import React from 'react';
-import { ColProps as AntdColprops } from 'antd/es/grid/col';
+import type { FC, CSSProperties, ReactNode } from 'react';
+import type { ColProps as AntdColprops } from 'antd/es/grid/col';
 import type { ActButton } from '../SearchBar/ActionButtons';
 import type { UTitleProps } from '../_common/UTitle';
 export type ColProps = Omit<AntdColprops, 'title'> & UTitleProps & {
@@ -10,15 +10,15 @@ export type ColProps = Omit<AntdColprops, 'title'> & UTitleProps & {
     /**
     * 面板标题
     */
-    title?: React.ReactNode;
+    title?: ReactNode;
     /**
      * 标题下标额外内容（以 small小一号）展示
      */
-    titleSub?: React.ReactNode;
+    titleSub?: ReactNode;
     /**
      * 标题后面的帮助文案
     */
-    help?: React.ReactNode;
+    help?: ReactNode;
     /**
      * 皮肤样式，测试中
      * grid :  网格
@@ -39,7 +39,7 @@ export type ColProps = Omit<AntdColprops, 'title'> & UTitleProps & {
     /**
      * 右上角按钮
     */
-    actions?: ActButton[] | React.ReactNode;
+    actions?: ActButton[] | ReactNode;
     /**
     * 空数据判断
     * 传 true =  数据为空
@@ -49,6 +49,6 @@ export type ColProps = Omit<AntdColprops, 'title'> & UTitleProps & {
     empty?: boolean | any[];
     width?: number;
     height?: number;
-    bodySytle?: React.CSSProperties;
+    bodySytle?: CSSProperties;
 };
-export declare const Col: React.FC<ColProps>;
+export declare const Col: FC<ColProps>;

package/components/_adapt/ColorPicker.js

@@ -68,7 +68,7 @@ var ColorPicker = function (props) {
     var content = (0, react_1.useMemo)(function () {
         if (props.children)
             return props.children;
-        return react_1.default.createElement(react_1.default.Fragment, null,
+        return react_1.default.createElement(react_1.Fragment, null,
             react_1.default.createElement("i", { style: { backgroundColor: value } }),
             " ",
             react_1.default.createElement("strong", null, (props.showText && value != null) ? react_1.default.createElement("span", null, value) : utils_1.Const.NONE));
@@ -124,7 +124,7 @@ var ColorPicker = function (props) {
         setValue(null);
         props.onChange(null, null);
     };
-    return react_1.default.createElement(react_1.default.Fragment, null,
+    return react_1.default.createElement(react_1.Fragment, null,
         react_1.default.createElement("span", __assign({}, spanProps, { ref: spanRef, onClick: function (evt) { return utils_1.PageUtil.stopEvent(evt, show); } }),
             content,
             value != null && props.allowClear && react_1.default.createElement(Icon_1.Icon, { type: 'close', onClick: clearColor })),

package/components/_adapt/ConfigProvider.d.ts

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

package/components/_adapt/Drawer.d.ts

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

package/components/_adapt/Drawer.js

@@ -43,12 +43,12 @@ var Drawer = function (props) {
         var clazz = [];
         if (props.className)
             clazz.push(props.className);
-        if (props.footer && react_1.default.isValidElement(props.footer))
+        if (props.footer && (0, react_1.isValidElement)(props.footer))
             clazz.push('ant-drawer-has-footer');
         return clazz.join(' ');
     }, [props.className, props.footer]);
     return react_1.default.createElement(antd_1.Drawer, __assign({ getContainer: function () { return document.body; } }, (0, utils_1.convertProps)(props, ['visible', 'open'], ['afterVisibleChange', 'afterOpenChange']), { className: className }),
         props.children,
-        (props.footer && react_1.default.isValidElement(props.footer)) && react_1.default.createElement("div", { className: 'ant-drawer-footer' }, props.footer));
+        (props.footer && (0, react_1.isValidElement)(props.footer)) && react_1.default.createElement("div", { className: 'ant-drawer-footer' }, props.footer));
 };
 exports.Drawer = Drawer;

package/components/_adapt/FloatButton.d.ts

@@ -1,5 +1,5 @@
-import React from 'react';
 import { BackTop } from 'antd';
+import type { CSSProperties, ReactNode, MouseEventHandler } from 'react';
 import type { BadgeProps } from 'antd/es/badge';
 import type { ExoticComponent } from 'react';
 type FloatButtonType = 'default' | 'primary';
@@ -7,15 +7,15 @@ type FloatButtonShape = 'circle' | 'square';
 type FloatButtonBadgeProps = Omit<BadgeProps, 'status' | 'text' | 'title' | 'children'>;
 export type FloatButtonProps = {
     className?: string;
-    style?: React.CSSProperties;
-    icon?: React.ReactNode;
-    description?: React.ReactNode;
+    style?: CSSProperties;
+    icon?: ReactNode;
+    description?: ReactNode;
     type?: FloatButtonType;
     title?: string;
     shape?: FloatButtonShape;
     href?: string;
     badge?: FloatButtonBadgeProps;
-    onClick?: React.MouseEventHandler<HTMLElement>;
+    onClick?: MouseEventHandler<HTMLElement>;
 };
 type FloatButtonComponent = ExoticComponent<FloatButtonProps> & {
     BackTop: typeof BackTop;

package/components/_adapt/Form.js

@@ -7,7 +7,7 @@
 // import type { FC, ExoticComponent, PropsWithChildren } from 'react'
 // export type FormProps = AntdFormProps;
 // export type FormItemProps = AntdFormItemProps & {
-//     tooltip?: React.ReactNode
+//     tooltip?: ReactNode
 // }
 // type FormComponent = ExoticComponent<PropsWithChildren<AntdFormProps>> & {
 //     Item: FC<FormItemProps>;
@@ -19,12 +19,12 @@
 //             return undefined;
 //         }
 //         if (props.tooltip) {
-//             return <React.Fragment>
+//             return <Fragment>
 //                 <Popover>
 //                     <Icon type='help' />
 //                     {props.label}
 //                 </Popover>
-//             </React.Fragment>
+//             </Fragment>
 //         }
 //         return props.label;
 //     }, [props.label, props.tooltip])

package/components/_adapt/Icon.d.ts

@@ -1,9 +1,10 @@
 import React from 'react';
+import type { CSSProperties } from 'react';
 export type IconProps = {
     type: string;
     className?: string;
     onClick?: () => void;
-    style?: React.CSSProperties;
+    style?: CSSProperties;
     title?: string;
     /**
      * 说明: 默认 点击事件，会阻止事件冒泡

package/components/_adapt/Image.js

@@ -5,7 +5,7 @@
 // import { Image as AntdImage } from 'antd';
 // import type { ImageProps } from 'antd/es/image';
 // export type OImageProps = Omit<ImageProps, 'onPreviewClose'>;
-// export interface CompositionOImage<P> extends React.FC<P> {
+// export interface CompositionOImage<P> extends FC<P> {
 //     PreviewGroup: typeof AntdImage.PreviewGroup;
 // }
 // export const Image = AntdImage as CompositionOImage<OImageProps>;

package/components/_adapt/Layout.d.ts

@@ -1,6 +1,5 @@
-import { PropsWithChildren } from 'react';
-import type { HTMLAttributes, ForwardRefExoticComponent, RefAttributes } from 'react';
 import { Layout as AntdLayout } from 'antd';
+import type { PropsWithChildren, HTMLAttributes, ForwardRefExoticComponent, RefAttributes } from 'react';
 type LayoutComponent = ForwardRefExoticComponent<PropsWithChildren<HTMLAttributes<HTMLDivElement>> & RefAttributes<HTMLDivElement>> & {
     displayName: string;
     Header: typeof AntdLayout.Header;

package/components/_adapt/Layout.js

@@ -129,7 +129,7 @@ var BasicLayout = /** @class */ (function (_super) {
     };
     BasicLayout.displayName = 'Layout';
     return BasicLayout;
-}(react_1.default.Component));
+}(react_1.Component));
 var _Layout = (0, react_1.forwardRef)(function (props, ref) { return react_1.default.createElement(context_1.ConfigConsumer, null, function () { return react_1.default.createElement(BasicLayout, __assign({}, props, { elref: ref })); }); });
 // const Content = generator({
 //     suffixCls: 'layout-content',

package/components/_adapt/Menu.d.ts

@@ -1,23 +1,22 @@
-import React from 'react';
 import { Menu as AntdMenu } from 'antd';
 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 { ReactNode, PropsWithChildren, ExoticComponent } from 'react';
 import type { Key } from '../../basetype';
 export interface MenuItemType extends AntdMenuItemProps {
     key: Key;
     danger?: boolean;
-    icon?: string | React.ReactNode;
+    icon?: string | ReactNode;
     ik?: string;
-    label?: React.ReactNode;
+    label?: ReactNode;
     title?: string;
 }
 export interface SubMenuType<T extends MenuItemType = MenuItemType> extends Omit<AntdSubMenuProps, 'children'> {
     key: Key;
-    icon?: string | React.ReactNode;
+    icon?: string | ReactNode;
     ik?: string;
-    label?: React.ReactNode;
+    label?: ReactNode;
     children: ItemType<T>[];
 }
 export type ItemType<T extends MenuItemType = MenuItemType> = T | SubMenuType<T> | null;

package/components/_adapt/Menu.js

@@ -10,12 +10,35 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+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;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Menu = void 0;
-var react_1 = __importDefault(require("react"));
+var react_1 = __importStar(require("react"));
 var lodash_1 = __importDefault(require("lodash"));
 var antd_1 = require("antd");
 var i18n_1 = require("../../utils/i18n");
@@ -27,7 +50,7 @@ var getMenuProps = function (props) {
         title = (0, i18n_1.txt)(props.ik);
     }
     if (props.icon) {
-        result.title = react_1.default.createElement(react_1.default.Fragment, null,
+        result.title = react_1.default.createElement(react_1.Fragment, null,
             lodash_1.default.isString(props.icon) ? react_1.default.createElement(Icon_1.Icon, { type: props.icon }) : props.icon,
             " ",
             react_1.default.createElement("span", { className: props.danger ? 'ant-typography ant-typography-danger' : undefined }, title));

package/components/_adapt/Modal.d.ts

@@ -1,4 +1,5 @@
 import React, { Component } from 'react';
+import type { ReactNode } from 'react';
 import type { ModalProps as AntdModalProps } from 'antd/es/modal';
 import type { PlainObject } from '../../basetype';
 export type ModalProps = Omit<AntdModalProps, 'onOk' | 'onCancel' | 'visible'> & {
@@ -18,5 +19,5 @@ export declare class Modal extends Component<ModalProps> {
     static confirm: import("antd/lib/modal/Modal").ModalFunc;
     static destroyAll: () => void;
     renderFooter(): React.ReactNode;
-    render(): React.ReactNode;
+    render(): ReactNode;
 }