vap1 0.0.9 → 0.1.0

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.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 Form_1 = require("../_adapt/Form");
+const antd_1 = require("antd");
 const Row_1 = require("../_adapt/Row");
 const Col_1 = require("../_adapt/Col");
 const Popconfirm_1 = require("../_adapt/Popconfirm");
@@ -145,7 +145,7 @@ 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(Form_1.Form.Item, { style: { display: 'none' } }, form.getFieldDecorator(field.field)(react_1.default.createElement(input.component, {
+        return react_1.default.createElement(antd_1.Form.Item, { style: { display: 'none' } }, form.getFieldDecorator(field.field)(react_1.default.createElement(input.component, {
             form,
             // initValue:
             field,
@@ -225,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(Form_1.Form.Item, Object.assign({}, itemProps), form.getFieldDecorator(field.field, options)(react_1.default.createElement(input.component, {
+        react_1.default.createElement(antd_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),
@@ -480,7 +480,7 @@ const _UForm = (0, react_1.forwardRef)((props, ref) => {
         return utils_1.Const.NONE;
     // console.log(initRef)
     // console.log('fdsafd')
-    return react_1.default.createElement(Form_1.Form
+    return react_1.default.createElement(antd_1.Form
     // defaultValue={initRef.current}
     // initialValues={props.default}
     // size={props.size || GLOBAL.CONFIG.FORM.SIZE}
@@ -500,7 +500,7 @@ class _UFormAdaptor extends react_1.default.Component {
 }
 // 3.0 适配层
 const UFormAdaptor = (0, react_1.memo)((0, react_1.forwardRef)((props, ref) => {
-    const FROM = Form_1.Form.create()(_UFormAdaptor);
+    const FROM = antd_1.Form.create()(_UFormAdaptor);
     // <ConfigProvider ></ConfigProvider>
     return react_1.default.createElement(FROM, Object.assign({}, props, { aref: ref }));
 }));

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/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/_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/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';

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.9","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"}