vap1 0.0.8 → 0.1.0

package/components/SearchBar/ActionButtons.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ActionButtons = void 0;
 const react_1 = __importDefault(require("react"));
 const lodash_1 = __importDefault(require("lodash"));
-const antd_1 = require("antd");
+const Popconfirm_1 = require("../_adapt/Popconfirm");
 const Icon_1 = require("../_adapt/Icon");
 const Button_1 = require("../_adapt/Button");
 const Dropdown_1 = require("../_adapt/Dropdown");
@@ -64,7 +64,7 @@ const ActionButton = (props) => {
     if (props.danger)
         btnParam.danger = true;
     if (props.confirm && props.disabled !== true) {
-        return react_1.default.createElement(antd_1.Popconfirm, { trigger: "click", placement: "bottomLeft", onConfirm: props.onClick, title: lodash_1.default.isString(props.confirm) ? props.confirm : props.confirm() },
+        return react_1.default.createElement(Popconfirm_1.Popconfirm, { trigger: "click", placement: "bottomLeft", onConfirm: props.onClick, title: lodash_1.default.isString(props.confirm) ? props.confirm : props.confirm() },
             react_1.default.createElement(Button_1.Button, Object.assign({}, props.config, btnParam), props.label));
     }
     btnParam.onClick = (evt) => utils_1.PageUtil.stopEvent(evt, props.onClick);

package/components/SearchBar/SearchTags.js

@@ -5,12 +5,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SearchTags = void 0;
 const react_1 = __importDefault(require("react"));
-const antd_1 = require("antd");
+const Tag_1 = require("../_adapt/Tag");
 const SearchTags = () => {
     return react_1.default.createElement("div", null,
         react_1.default.createElement("h1", null,
             "\u5168\u90E8\u7ED3\u679C >  ",
-            react_1.default.createElement(antd_1.Tag, { closable: true, onClose: () => { } }, "aa")),
+            react_1.default.createElement(Tag_1.Tag, { closable: true, onClose: () => { } }, "aa")),
         react_1.default.createElement("div", null,
             react_1.default.createElement("label", { htmlFor: 'p' }),
             react_1.default.createElement("p", null)));

package/components/Tables/Components/Actions.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.COL_OPERACTION = exports.ACTION = exports.DELETE = exports.EDIT = exports.INFO = void 0;
 const react_1 = __importDefault(require("react"));
 const lodash_1 = __importDefault(require("lodash"));
-const antd_1 = require("antd");
+const Popconfirm_1 = require("../../_adapt/Popconfirm");
 const Icon_1 = require("../../_adapt/Icon");
 const utils_1 = require("../../../utils");
 const Const_1 = require("../../_setup/Const");
@@ -38,7 +38,7 @@ const DELETE = props => {
         return react_1.default.createElement(react_1.default.Fragment, null);
     const title = utils_1.i18n.getText(props.ik, props.title, Const_1.V.ACT_DELETE);
     let popTitle = utils_1.i18n.txt(Const_1.V.ACT_DELETE_CONFIRM, props.name || '');
-    return react_1.default.createElement(antd_1.Popconfirm, { onConfirm: e => utils_1.PageUtil.stopEvent(e, () => props.onClick()), placement: "right", title: react_1.default.createElement("span", null, popTitle), overlayClassName: 'c-table-action-confirm' },
+    return react_1.default.createElement(Popconfirm_1.Popconfirm, { onConfirm: e => utils_1.PageUtil.stopEvent(e, () => props.onClick()), placement: "right", title: react_1.default.createElement("span", null, popTitle), overlayClassName: 'c-table-action-confirm' },
         react_1.default.createElement("span", { className: DEFAULT_CLASS.DELETE, title: `${title} ${props.name || ''}` },
             react_1.default.createElement(Icon_1.Icon, { type: 'delete' }),
             react_1.default.createElement("span", null, title)));
@@ -54,7 +54,7 @@ const ACTION = props => {
             props.icon && react_1.default.createElement(Icon_1.Icon, { type: props.icon }),
             react_1.default.createElement("span", null, title));
     }
-    return react_1.default.createElement(antd_1.Popconfirm, { onConfirm: () => props.onClick(), title: props.confrim, placement: "right", overlayClassName: 'c-table-action-confirm' },
+    return react_1.default.createElement(Popconfirm_1.Popconfirm, { onConfirm: () => props.onClick(), title: props.confrim, placement: "right", overlayClassName: 'c-table-action-confirm' },
         react_1.default.createElement("span", { className: className, title: props.name || undefined, onClick: utils_1.PageUtil.stopEvent },
             props.icon && react_1.default.createElement(Icon_1.Icon, { type: props.icon }),
             react_1.default.createElement("span", null, title)));

package/components/Tables/VTable.js

@@ -29,6 +29,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.VTable = exports.getHeightByTagName = void 0;
 const lodash_1 = __importDefault(require("lodash"));
 const react_1 = __importStar(require("react"));
+const Table_1 = require("../_adapt/Table");
 const antd_1 = require("antd");
 const ActionBar_1 = require("./Components/ActionBar");
 const utils_1 = require("../../utils");
@@ -178,7 +179,7 @@ const _VTable = react_1.default.forwardRef((props, ref) => {
             },
         };
     }
-    return react_1.default.createElement(antd_1.Table, Object.assign({ rowKey: record => record[props.rowKey || rowKey], 
+    return react_1.default.createElement(Table_1.Table, Object.assign({ rowKey: record => record[props.rowKey || rowKey], 
         // scroll={scroll}
         // tableLayout="fixed"
         // showSorterTooltip={false}

package/components/Tables/index.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import type { TableDefined } from './Components';
 import type { ForwardRefExoticComponent, ExoticComponent } from 'react';
-import type { TableProps } from 'antd/es/table';
+import type { TableProps } from '../_adapt/Table';
 import type { ColumnProps } from 'antd/es/table/interface';
 import type { SearchBarProps } from '../SearchBar/index';
 import type { TableActionButton } from './Components/ActionBar';

package/components/TreeSelect/BaseTreeSelect.js

@@ -38,7 +38,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getData = exports.renderRoot = exports.getNodeParam = exports.BaseTreeSelect = exports.useBaseTree = void 0;
 const lodash_1 = __importDefault(require("lodash"));
 const react_1 = __importStar(require("react"));
-const antd_1 = require("antd");
+const TreeSelect_1 = require("../_adapt/TreeSelect");
 const utils_1 = require("../../utils");
 const hooks_1 = require("../../hooks");
 const _Support_1 = require("../../utils/_Support");
@@ -154,13 +154,13 @@ exports.getNodeParam = getNodeParam;
 const renderNode = (node, state, props) => {
     const param = (0, exports.getNodeParam)(node, state, props.disabledNode);
     if (lodash_1.default.isArray(node.children) && node.children.length) {
-        return react_1.default.createElement(antd_1.TreeSelect.TreeNode, Object.assign({}, param, { isLeaf: false }), renderNodes(node.children, state, props));
+        return react_1.default.createElement(TreeSelect_1.TreeSelect.TreeNode, Object.assign({}, param, { isLeaf: false }), renderNodes(node.children, state, props));
     }
     let isLeaf = true;
     if (props.checkField) {
         isLeaf = !node[props.checkField];
     }
-    return react_1.default.createElement(antd_1.TreeSelect.TreeNode, Object.assign({}, param, { isLeaf: isLeaf }));
+    return react_1.default.createElement(TreeSelect_1.TreeSelect.TreeNode, Object.assign({}, param, { isLeaf: isLeaf }));
 };
 const renderNodes = (data, state, props) => data.map((item) => renderNode(item, state, props));
 const renderRoot = (props, state) => renderNodes(state.treeData, state, props);

package/components/TreeSelect/DTreeSelect.js

@@ -14,7 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DTreeSelect = void 0;
 const react_1 = __importDefault(require("react"));
-const antd_1 = require("antd");
+const TreeSelect_1 = require("../_adapt/TreeSelect");
 const lodash_1 = __importDefault(require("lodash"));
 const BaseTreeSelect_1 = require("./BaseTreeSelect");
 const hooks_1 = require("../../hooks");
@@ -59,7 +59,7 @@ const _DTreeSelect = (props) => {
             r(undefined);
         }));
     });
-    return react_1.default.createElement(antd_1.TreeSelect, Object.assign({}, treeState.baseProps, treeProps, { disabled: props.disabled, loadData: loadData, onChange: onChange, onSelect: onSelect }), (0, BaseTreeSelect_1.renderRoot)(props, treeState));
+    return react_1.default.createElement(TreeSelect_1.TreeSelect, Object.assign({}, treeState.baseProps, treeProps, { disabled: props.disabled, loadData: loadData, onChange: onChange, onSelect: onSelect }), (0, BaseTreeSelect_1.renderRoot)(props, treeState));
 };
 const DTreeSelect = (props) => react_1.default.createElement(BaseTreeSelect_1.BaseTreeSelect, Object.assign({}, props),
     react_1.default.createElement(_DTreeSelect, Object.assign({}, props)));

package/components/TreeSelect/FTreeSelect.js

@@ -14,7 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FTreeSelect = void 0;
 const react_1 = __importDefault(require("react"));
-const antd_1 = require("antd");
+const TreeSelect_1 = require("../_adapt/TreeSelect");
 const BaseTreeSelect_1 = require("./BaseTreeSelect");
 const hooks_1 = require("../../hooks");
 const _FTreeSelect = (props) => {
@@ -32,7 +32,7 @@ const _FTreeSelect = (props) => {
         // 如果根节点只有一个，则自动展开这个根结点
         treeProps.treeDefaultExpandedKeys = [treeState.treeData[0][treeState.keyField]];
     }
-    return react_1.default.createElement(antd_1.TreeSelect, Object.assign({}, treeState.baseProps, treeProps, { disabled: props.disabled, onChange: onChange, onSelect: onSelect }), (0, BaseTreeSelect_1.renderRoot)(props, treeState));
+    return react_1.default.createElement(TreeSelect_1.TreeSelect, Object.assign({}, treeState.baseProps, treeProps, { disabled: props.disabled, onChange: onChange, onSelect: onSelect }), (0, BaseTreeSelect_1.renderRoot)(props, treeState));
 };
 const FTreeSelect = (props) => react_1.default.createElement(BaseTreeSelect_1.BaseTreeSelect, Object.assign({}, props),
     react_1.default.createElement(_FTreeSelect, Object.assign({}, props)));

package/components/TreeSelect/STreeSelect.js

@@ -25,7 +25,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.STreeSelect = void 0;
 const react_1 = __importStar(require("react"));
-const antd_1 = require("antd");
+const TreeSelect_1 = require("../_adapt/TreeSelect");
 const BaseTreeSelect_1 = require("./BaseTreeSelect");
 const TreeUtil_1 = require("../../utils/TreeUtil");
 const utils_1 = require("../../utils");
@@ -45,7 +45,7 @@ const _STreeSelect = (props) => {
     }, []);
     if (!init)
         return utils_1.Const.NONE;
-    return react_1.default.createElement(antd_1.TreeSelect, Object.assign({}, treeState.baseProps, { disabled: props.disabled, onChange: onChange, onSelect: onSelect }), (0, BaseTreeSelect_1.renderRoot)(props, treeState));
+    return react_1.default.createElement(TreeSelect_1.TreeSelect, Object.assign({}, treeState.baseProps, { disabled: props.disabled, onChange: onChange, onSelect: onSelect }), (0, BaseTreeSelect_1.renderRoot)(props, treeState));
 };
 const STreeSelect = (props) => react_1.default.createElement(BaseTreeSelect_1.BaseTreeSelect, Object.assign({}, props),
     react_1.default.createElement(_STreeSelect, Object.assign({}, props)));

package/components/Trees/DTree.js

@@ -136,6 +136,9 @@ const _Dtree = (props) => {
     });
     return react_1.default.createElement(antd_1.Tree, Object.assign({}, treeState.baseProps, treeProps, { className: treeState.className, loadData: loadData, 
         // disabled={props.disabled}
+        onSelect: (keys, evt) => {
+            console.log(keys, evt);
+        }, 
         // onSelect={onSelect}
         // selectedKeys={treeState.selectedKeys}
         selectedKeys: treeState.selectedKeys }), (0, ActionTree_1.renderRoot)(props, treeState, actionContext));

package/components/UForm/UForm.d.ts

@@ -2,7 +2,7 @@ import React from 'react';
 import type { UFromProps } from './index';
 import type { FormState } from './FormWrapper';
 import type { PlainObject } from '../../basetype';
-export type UFomFunctions = {
+export type UFormFunctions = {
     /**
      * 获取当前表单数据
     */
@@ -30,4 +30,4 @@ export declare const initValue: (props: UFromProps & {
  * 3. 支持 ref 控制方法
  * 4. filed 支持更多提示，验证方法
 */
-export declare const UForm: React.ForwardRefExoticComponent<UFromProps & React.RefAttributes<UFomFunctions>>;
+export declare const UForm: React.ForwardRefExoticComponent<UFromProps & React.RefAttributes<UFormFunctions>>;

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");
@@ -139,7 +139,7 @@ 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));

package/components/_adapt/Drawer.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import type { DrawerProps as AntdDrawerProps } from 'antd/es/drawer';
 import type { FC } from 'react';
 /**
@@ -6,8 +7,12 @@ import type { FC } from 'react';
  * 2. afterVisibleChange  Please use `afterOpenChange` instead
 */
 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<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/FloatButton.d.ts

@@ -1,18 +1,24 @@
 import React from 'react';
-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<AntdBadgeProps, 'status' | 'text' | 'title' | 'children'>;
-export interface FloatButtonProps {
+import { BackTop } from 'antd';
+import type { BadgeProps } from 'antd/es/badge';
+import type { ExoticComponent } from 'react';
+type FloatButtonType = 'default' | 'primary';
+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;
     type?: FloatButtonType;
+    title?: string;
     shape?: FloatButtonShape;
     href?: string;
     badge?: FloatButtonBadgeProps;
     onClick?: React.MouseEventHandler<HTMLElement>;
-}
-export declare const FloatButton: (props: FloatButtonProps) => React.ReactElement<any, any>;
+};
+type FloatButtonComponent = ExoticComponent<FloatButtonProps> & {
+    BackTop: typeof BackTop;
+};
+export declare const FloatButton: FloatButtonComponent;
+export {};

package/components/_adapt/FloatButton.js

@@ -1,7 +1,61 @@
 "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;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 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;
+const react_1 = __importStar(require("react"));
+const lodash_1 = __importDefault(require("lodash"));
+const antd_1 = require("antd");
+const Icon_1 = require("./Icon");
+const _FloatButton = (props) => {
+    const btnProps = (0, react_1.useMemo)(() => {
+        const btnProps = { shape: 'circle' };
+        if (props.type == 'primary')
+            btnProps.type = 'primary';
+        if (props.shape == 'square')
+            btnProps.shape = 'round';
+        if (props.title)
+            btnProps.title = props.title;
+        if (props.href)
+            btnProps.href = props.href;
+        if (lodash_1.default.isFunction(props.onClick))
+            btnProps.onClick = props.onClick;
+        return btnProps;
+    }, []);
+    if (props.badge) {
+        return react_1.default.createElement(antd_1.Badge, Object.assign({}, lodash_1.default.omit(props.badge, ['status', 'text', 'title', 'children'])),
+            react_1.default.createElement(antd_1.Button, Object.assign({ size: "large" }, btnProps, { className: 'float-button', style: lodash_1.default.merge({ right: 48, top: 72, }, props.style, { position: 'fixed', }) }),
+                props.icon && (lodash_1.default.isString(props.icon ? react_1.default.createElement(Icon_1.Icon, { type: props.icon }) : props.icon)),
+                props.description));
+    }
+    // let 
+    return react_1.default.createElement(antd_1.Button, Object.assign({ size: "large" }, btnProps, { className: 'float-button', style: lodash_1.default.merge({ right: 48, top: 72, }, props.style, { position: 'fixed', }) }),
+        props.icon && (lodash_1.default.isString(props.icon) ? react_1.default.createElement(Icon_1.Icon, { type: props.icon }) : props.icon),
+        props.description);
+};
+exports.FloatButton = _FloatButton;
+exports.FloatButton.BackTop = antd_1.BackTop;

package/components/_adapt/Form.d.ts

@@ -1,14 +0,0 @@
-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

@@ -1,48 +1,36 @@
-"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;
+// import React, { useMemo } from 'react';
+// import { Form as AntdFrom } from 'antd'
+// import { Icon } from './Icon'
+// import { Popover } from './Popover'
+// 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>;
+// }
+// const FormItem: FC<FormItemProps> = props => {
+//     const label = useMemo(() => {
+//         if (props.label == null || props.label == undefined) {
+//             return undefined;
+//         }
+//         if (props.tooltip) {
+//             return <React.Fragment>
+//                 <Popover>
+//                     <Icon type='help' />
+//                     {props.label}
+//                 </Popover>
+//             </React.Fragment>
+//         }
+//         return props.label;
+//     }, [props.label, props.tooltip])
+//     return <AntdFrom.Item {...props} label={label} />
+// }
+// const _Form = AntdFrom as any
+// export const Form = _Form as FormComponent;
+// Form.Item = FormItem;
+// // Form.create = AntdFrom.create;

package/components/_adapt/Menu.js

@@ -15,16 +15,15 @@ const getMenuProps = (props) => {
     if (props.ik) {
         title = (0, i18n_1.txt)(props.ik);
     }
-    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,
+        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));
+            react_1.default.createElement("span", { className: props.danger ? 'ant-typography ant-typography-danger' : undefined }, title));
+    }
+    else {
+        result.title = react_1.default.createElement("span", { className: props.danger ? 'ant-typography ant-typography-danger' : undefined }, title);
     }
-    result.title = title;
     return result;
 };
 const renderGroup = (props) => {

package/components/_adapt/Modal.d.ts

@@ -17,9 +17,6 @@ export declare class Modal extends Component<ModalProps> {
     static warning: import("antd/lib/modal/Modal").ModalFunc;
     static confirm: import("antd/lib/modal/Modal").ModalFunc;
     static destroyAll: () => void;
-    static useDestoryModal: (props: {
-        open?: boolean;
-    }) => [boolean, () => void];
     renderFooter(): React.ReactNode;
     render(): React.ReactNode;
 }

package/components/_adapt/Modal.js

@@ -38,6 +38,7 @@ const useDestoryModal = (props) => {
 };
 exports.useDestoryModal = useDestoryModal;
 class Modal extends react_1.Component {
+    // static useDestoryModal = useDestoryModal;
     renderFooter() {
         const { okText, okType = 'primary', cancelText, confirmLoading, onOk, onCancel, okButtonProps, cancelButtonProps, footer } = this.props;
         if (footer !== undefined)
@@ -58,4 +59,3 @@ 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;

package/components/_adapt/Pagination.d.ts

@@ -0,0 +1,9 @@
+import { PaginationProps as AntdPaginationProps } from 'antd/es/pagination';
+import { FC } from 'react';
+export type PaginationProps = AntdPaginationProps & {
+    /**
+     * 1.5无效属性
+    */
+    showTitle?: boolean;
+};
+export declare const Pagination: FC<PaginationProps>;

package/components/_adapt/Pagination.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.Pagination = void 0;
+const react_1 = __importDefault(require("react"));
+const antd_1 = require("antd");
+const Pagination = props => react_1.default.createElement(antd_1.Pagination, Object.assign({}, props));
+exports.Pagination = Pagination;

package/components/_adapt/Radio.d.ts

@@ -8,7 +8,7 @@ export type RadioGroupProps = Omit<AntdRadioGroupProps, 'options'> & {
     optionType?: 'default' | 'button';
 };
 type RadioGroupComponent = FC<PropsWithChildren<RadioGroupProps>>;
-type CompoundedComponent = ExoticComponent<PropsWithChildren<RadioGroupProps>> & {
+type CompoundedComponent = ExoticComponent<PropsWithChildren<RadioProps>> & {
     Group: RadioGroupComponent;
     Button: typeof AntdRadio.Button;
 };

package/components/_adapt/Radio.js

@@ -7,13 +7,13 @@ exports.Radio = void 0;
 const react_1 = __importDefault(require("react"));
 const antd_1 = require("antd");
 const lodash_1 = __importDefault(require("lodash"));
-const RadioGroupWithOptions = (props) => react_1.default.createElement(exports.Radio.Group, Object.assign({}, lodash_1.default.omit(props, 'children')), props.options.map(item => {
+const RadioGroupWithOptions = (props) => react_1.default.createElement(antd_1.Radio.Group, Object.assign({}, lodash_1.default.omit(props, 'children')), props.options.map(item => {
     if (props.optionType == 'button') {
         return react_1.default.createElement(antd_1.Radio.Button, { value: item.value }, item.label);
     }
     return react_1.default.createElement(antd_1.Radio, { value: item.value }, item.label);
 }));
-const RadioGroup = (props) => {
+const RadioGroup = props => {
     if (lodash_1.default.isArray(props.options))
         return react_1.default.createElement(RadioGroupWithOptions, Object.assign({}, props));
     return react_1.default.createElement(antd_1.Radio.Group, Object.assign({}, props));

package/components/_adapt/todo/NotEffectOnV15.d.ts

@@ -0,0 +1 @@
+export declare const NotEffectOnVap1: (() => MethodDecorator);

package/components/_adapt/todo/NotEffectOnV15.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NotEffectOnVap1 = void 0;
+const NotEffectOnVap1 = () => (target, property, descriptor) => { };
+exports.NotEffectOnVap1 = NotEffectOnVap1;

package/components/_common/Role.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Role = void 0;
-// import React from "react";
 const utils_1 = require("../../utils");
 const Role = (props) => {
     if (!utils_1.PageUtil.hasRole(props.code))

package/components/_common/Upagination.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import type { PaginationProps } from 'antd/es/pagination';
+import type { PaginationProps } from '../_adapt/Pagination';
 export interface UPaginationProps extends PaginationProps {
     /**
      * 分布皮肤模式，目前支持3种，传序号即可

package/components/_common/Upagination.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UPagination = void 0;
 const react_1 = __importDefault(require("react"));
-const antd_1 = require("antd");
+const Pagination_1 = require("../_adapt/Pagination");
 const utils_1 = require("../../utils");
 const i18n_1 = require("../../utils/i18n");
 const TXT = (0, i18n_1.fastRegister)({
@@ -101,6 +101,6 @@ const getConfig = (total, totalAcc, cost) => {
 };
 const UPagination = (props) => {
     const conf = getConfig(props.total, props.totalAcc, props.cost);
-    return react_1.default.createElement(antd_1.Pagination, Object.assign({}, conf, props, { className: utils_1.StringUtil.className(['c-pagination', 'c-pagination-style' + (props.mode || utils_1.GLOBAL.CONFIG.PAGINATION.THEME || 1)], props.className) }));
+    return react_1.default.createElement(Pagination_1.Pagination, Object.assign({}, conf, props, { className: utils_1.StringUtil.className(['c-pagination', 'c-pagination-style' + (props.mode || utils_1.GLOBAL.CONFIG.PAGINATION.THEME || 1)], props.className) }));
 };
 exports.UPagination = UPagination;

package/components/_setup/UForm/UFormJSON.js

@@ -30,6 +30,8 @@ const react_1 = __importStar(require("react"));
 const lodash_1 = __importDefault(require("lodash"));
 const dayjs_1 = __importDefault(require("dayjs"));
 const utils_1 = require("../../../utils");
+const Table_1 = require("../../_adapt/Table");
+const InputNumber_1 = require("../../_adapt/InputNumber");
 const antd_1 = require("antd");
 const Select_1 = require("../../_adapt/Select");
 const Button_1 = require("../../_adapt/Button");
@@ -112,7 +114,7 @@ const renderColumn = (txt, column) => {
             return react_1.default.createElement(antd_1.DatePicker, { size: "small", defaultValue: val ? (0, dayjs_1.default)(val) : undefined, onChange: mnt => stateRef.current.item[column.dataIndex] = mnt.format('YYYY-MM-DD') });
         }
         if (column.type == 'number') {
-            return react_1.default.createElement(antd_1.InputNumber, { size: "small", defaultValue: val, onChange: val => stateRef.current.item[column.dataIndex] = val });
+            return react_1.default.createElement(InputNumber_1.InputNumber, { size: "small", defaultValue: val, onChange: val => stateRef.current.item[column.dataIndex] = val });
         }
         if (column.type == 'select') {
             return react_1.default.createElement(Select_1.Select, { size: "small", defaultValue: val, onChange: val => stateRef.current.item[column.dataIndex] = val }, column.options.map(item => react_1.default.createElement(Select_1.Select.Option, { value: item.value }, item.name)));
@@ -193,7 +195,7 @@ const renderColumn = (txt, column) => {
     }, [value]);
     if (!stateRef.current.loaded)
         return utils_1.Const.NONE;
-    return react_1.default.createElement(antd_1.Table, { className: "c-table json-array-table", size: "small", locale: { emptyText: react_1.default.createElement(antd_1.Empty, { description: react_1.default.createElement(Button_1.Button, { type: "primary", icon: 'plus', onClick: () => showAdd() },
+    return react_1.default.createElement(Table_1.Table, { className: "c-table json-array-table", size: "small", locale: { emptyText: react_1.default.createElement(antd_1.Empty, { description: react_1.default.createElement(Button_1.Button, { type: "primary", icon: 'plus', onClick: () => showAdd() },
                     "\u6DFB\u52A0",
                     field.title) }) }, dataSource: stateRef.current.arr, columns: stateRef.current.columns, pagination: false, footer: () => {
             if (stateRef.current.arr.length == 0 || stateRef.current.isAdd || stateRef.current.isEdit || disabled) {
@@ -214,6 +216,6 @@ const renderColumn = (txt, column) => {
         catch (e) {
             console.error(e);
         }
-        return react_1.default.createElement(antd_1.Table, { className: "c-table json-array-table", size: "small", locale: { emptyText: react_1.default.createElement(antd_1.Empty, { description: "\u6682\u65E0\u6570\u636E" }) }, dataSource: list, columns: field.config.columns.map(item => (Object.assign(Object.assign({}, item), { render: (txt) => renderColumn(txt, item) }))), pagination: false });
+        return react_1.default.createElement(Table_1.Table, { className: "c-table json-array-table", size: "small", locale: { emptyText: react_1.default.createElement(antd_1.Empty, { description: "\u6682\u65E0\u6570\u636E" }) }, dataSource: list, columns: field.config.columns.map(item => (Object.assign(Object.assign({}, item), { render: (txt) => renderColumn(txt, item) }))), pagination: false });
     }
 });

package/components/_setup/UForm/UFormSelect.js

@@ -30,6 +30,9 @@ const react_1 = __importStar(require("react"));
 const lodash_1 = __importDefault(require("lodash"));
 const _register_1 = require("../../UForm/_register");
 const antd_1 = require("antd");
+const Input_1 = require("../../_adapt/Input");
+const Radio_1 = require("../../_adapt/Radio");
+const TreeSelect_1 = require("../../_adapt/TreeSelect");
 const Icon_1 = require("../../_adapt/Icon");
 const Select_1 = require("../../_adapt/Select");
 const _input_1 = require("../../UForm/_input");
@@ -82,12 +85,12 @@ const Const_1 = require("../Const");
 // 单选
 (0, _register_1.registerFormField)('radio', (props) => {
     const { field, disabled, value, onChange, options } = props;
-    return react_1.default.createElement(antd_1.Radio.Group, Object.assign({}, field.config, { disabled: disabled, value: value === null ? undefined : value, onChange: evt => onChange(evt.target.value), optionType: "default", options: options }));
+    return react_1.default.createElement(Radio_1.Radio.Group, Object.assign({}, field.config, { disabled: disabled, value: value === null ? undefined : value, onChange: evt => onChange(evt.target.value), optionType: "default", options: options }));
 }, { breakCol: true });
 // 单选按钮
 (0, _register_1.registerFormField)('radio-button', (props) => {
     const { field, disabled, value, onChange, options } = props;
-    return react_1.default.createElement(antd_1.Radio.Group, Object.assign({ buttonStyle: "solid" }, field.config, { disabled: disabled, value: value === null ? undefined : value, optionType: "button", options: options, onChange: evt => onChange(evt.target.value) }));
+    return react_1.default.createElement(Radio_1.Radio.Group, Object.assign({ buttonStyle: "solid" }, field.config, { disabled: disabled, value: value === null ? undefined : value, optionType: "button", options: options, onChange: evt => onChange(evt.target.value) }));
 });
 // 单选 - 带更多
 (0, _register_1.registerFormField)('radio-with-more', (props) => {
@@ -102,15 +105,15 @@ const Const_1 = require("../Const");
         return { isMore: false, txt: '' };
     };
     const [status, setStatus] = (0, react_1.useState)(morStatus(value));
-    return react_1.default.createElement(antd_1.Radio.Group, Object.assign({ disabled: disabled }, field.config),
-        options.map(item => react_1.default.createElement(antd_1.Radio, { checked: !status.isMore && item.value == value, value: item.value, onClick: evt => {
+    return react_1.default.createElement(Radio_1.Radio.Group, Object.assign({ disabled: disabled }, field.config),
+        options.map(item => react_1.default.createElement(Radio_1.Radio, { checked: !status.isMore && item.value == value, value: item.value, onClick: evt => {
                 utils_1.PageUtil.stopEvent(evt);
                 if (status.isMore)
                     setStatus((stats) => (Object.assign(Object.assign({}, stats), { isMore: false })));
                 // @ts-ignore
                 onChange(evt.target.value);
             } }, field.render ? (field.render(item.value, item)) : item.label)),
-        react_1.default.createElement(antd_1.Radio, { value: "___MORE__", checked: status.isMore, onClick: (evt) => {
+        react_1.default.createElement(Radio_1.Radio, { value: "___MORE__", checked: status.isMore, onClick: (evt) => {
                 utils_1.PageUtil.stopEvent(evt);
                 if (status.isMore)
                     return;
@@ -118,7 +121,7 @@ const Const_1 = require("../Const");
                 onChange(status.txt);
             } },
             !status.isMore && react_1.default.createElement("span", null, utils_1.i18n.txt(Const_1.V.INPUT_MORE)),
-            status.isMore && react_1.default.createElement(antd_1.Input, { value: status.txt, onChange: evt => {
+            status.isMore && react_1.default.createElement(Input_1.Input, { value: status.txt, onChange: evt => {
                     onChange(evt.target.value);
                     setStatus({ isMore: true, txt: evt.target.value });
                 } })));
@@ -173,7 +176,7 @@ const Const_1 = require("../Const");
     if (field.required || field.rules && lodash_1.default.find(field.rules, { required: true }))
         params.allowClear = false;
     params.treeData = utils_1.GLOBAL.CONFIG.ICONS.CLAZZ.map(item => ({ label: react_1.default.createElement(Icon_1.Icon, { type: item }), value: item, key: item }));
-    return react_1.default.createElement(antd_1.TreeSelect, Object.assign({ showSearch: false, popupClassName: "i-iconselect", virtual: false }, params, field.config, { value: value, multiple: false, treeCheckable: false, onChange: value => onChange(value) }));
+    return react_1.default.createElement(TreeSelect_1.TreeSelect, Object.assign({ showSearch: false, popupClassName: "i-iconselect", virtual: false }, params, field.config, { value: value, multiple: false, treeCheckable: false, onChange: value => onChange(value) }));
 }, {
     render: (value) => react_1.default.createElement(Icon_1.Icon, { type: value })
 });

package/deps/_editor/tools/_TxtButton.js

@@ -9,7 +9,8 @@ const slate_1 = require("slate");
 const slate_react_1 = require("slate-react");
 const types_1 = require("../base/types");
 const utils_1 = require("../../../utils");
-const antd_1 = require("antd");
+const Popover_1 = require("../../../components/_adapt/Popover");
+const Slider_1 = require("../../../components/_adapt/Slider");
 const Button_1 = require("../../../components/_adapt/Button");
 const Select_1 = require("../../../components/_adapt/Select");
 const UForm_1 = require("../../../components/UForm");
@@ -51,7 +52,7 @@ const Link = ({ icon, ik, cmd, disabled }) => {
         clazz.push('editor-icon-disabled');
     }
     return react_1.default.createElement(react_1.default.Fragment, null,
-        value ? react_1.default.createElement(antd_1.Popover, { placement: "bottomLeft", content: react_1.default.createElement("div", { style: { width: 320 } },
+        value ? react_1.default.createElement(Popover_1.Popover, { placement: "bottomLeft", content: react_1.default.createElement("div", { style: { width: 320 } },
                 react_1.default.createElement("p", null,
                     "\u94FE\u63A5\u5230 : ",
                     react_1.default.createElement("a", { href: value, target: '_blank' }, value)),
@@ -103,8 +104,8 @@ const FontSize = ({ icon, ik, cmd, disabled }) => {
     if (disabled || (((_a = editor.selection) === null || _a === void 0 ? void 0 : _a.focus.offset) == ((_b = editor.selection) === null || _b === void 0 ? void 0 : _b.anchor.offset))) {
         clazz.push('editor-icon-disabled');
     }
-    return react_1.default.createElement(antd_1.Popover, { placement: "bottomLeft", content: react_1.default.createElement("div", { style: { width: 240, }, onClick: utils_1.PageUtil.stopEvent },
-            react_1.default.createElement(antd_1.Slider, { value: value, min: 12, max: 60, onChange: (val) => setValue(editor, cmd, val) })) },
+    return react_1.default.createElement(Popover_1.Popover, { placement: "bottomLeft", content: react_1.default.createElement("div", { style: { width: 240, }, onClick: utils_1.PageUtil.stopEvent },
+            react_1.default.createElement(Slider_1.Slider, { value: value, min: 12, max: 60, onChange: (val) => setValue(editor, cmd, val) })) },
         react_1.default.createElement("span", { className: clazz.join(' ') },
             "\u5B57\u53F7 : ",
             react_1.default.createElement("b", { className: 'vapfont' },

package/index.d.ts

@@ -90,7 +90,7 @@ Checkbox, Switch, DatePicker, TimePicker, Upload, Rate, AutoComplete, Cascader,
  * 应用性组件
 */
 Carousel, Calendar, } from 'antd';
-export { Form } from './components/_adapt/Form';
+export { Form } from 'antd';
 export { Table } from './components/_adapt/Table';
 export type { TableProps } from './components/_adapt/Table';
 export type { DescriptionsProps } from 'antd/es/descriptions';
@@ -105,7 +105,7 @@ export { Slider } from './components/_adapt/Slider';
 export { InputNumber } from './components/_adapt/InputNumber';
 export { Radio } from './components/_adapt/Radio';
 export { ColorPicker } from './components/_adapt/ColorPicker';
-export type { FormProps, FormItemProps } from './components/_adapt/Form';
+export type { FormProps, FormItemProps } from 'antd/es/form';
 export type { InputProps, TextAreaProps, PasswordProps } from 'antd/es/input';
 export type { InputRef } from './components/_adapt/Input';
 export type { InputNumberProps } from './components/_adapt/InputNumber';
@@ -132,7 +132,8 @@ export { VTable, ApiTable, ApiTableModal, STable, TopTable, TopTableModal } from
 export { STree, DTree, FTree } from './components/Trees';
 export { UploadFile, UploadImage, UploadModal } from './components/Upload';
 export { SList } from './components/Lists/SList';
-export type { UFromProps, UModalProps, UFormField, UFormFieldGroup, LinkResult, UDescriptionsProps } from './components/UForm';
+export type { UFromProps, UModalProps, UFormField, UFormFieldGroup, LinkResult, UDescriptionsProps, } from './components/UForm';
+export type { UFormFunctions } from './components/UForm/UForm';
 export type { TableColumn } from './components/Tables/index';
 export type { VTableProps } from './components/Tables/VTable';
 export type { ApiTableProps } from './components/Tables/ApiTable';

package/index.js

@@ -109,8 +109,9 @@ Object.defineProperty(exports, "Transfer", { enumerable: true, get: function ()
 */
 Object.defineProperty(exports, "Carousel", { enumerable: true, get: function () { return antd_5.Carousel; } });
 Object.defineProperty(exports, "Calendar", { enumerable: true, get: function () { return antd_5.Calendar; } });
-var Form_1 = require("./components/_adapt/Form");
-Object.defineProperty(exports, "Form", { enumerable: true, get: function () { return Form_1.Form; } });
+var antd_6 = require("antd");
+Object.defineProperty(exports, "Form", { enumerable: true, get: function () { return antd_6.Form; } });
+// export { Form } from './components/_adapt/Form'
 var Table_1 = require("./components/_adapt/Table");
 Object.defineProperty(exports, "Table", { enumerable: true, get: function () { return Table_1.Table; } });
 var Input_1 = require("./components/_adapt/Input");

package/package.json

@@ -1 +1 @@
-{"name":"vap1","version":"0.0.8","description":"vap1, Both support MicroService and SAP FrameWork, Support IE>9","main":"index.js","author":"Xiang da","license":"ISC"}
+{"name":"vap1","version":"0.1.0","description":"vap1, Both support MicroService and SAP FrameWork, Support IE>9","main":"index.js","author":"Xiang da","license":"ISC"}