@ecoding/components.antd 0.3.30 → 0.3.32

package/lib/core/async-select/index.js

@@ -7,6 +7,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 import React, { useEffect, useState, memo, useMemo } from "react";
 import { Select } from "antd";
 import { LoadingOutlined } from "@ant-design/icons";
@@ -22,6 +33,10 @@ const AsyncSlect = memo((props) => {
     const iface = useMemo(() => props.iface, [props.iface]);
     const data = useMemo(() => props.data, [props.data]);
     const searchIface = useMemo(() => props.searchIface, []);
+    const getRest = (p) => {
+        const { onChange, searchIface, data, iface } = p, rest = __rest(p, ["onChange", "searchIface", "data", "iface"]);
+        return rest;
+    };
     useEffect(() => {
         const ex = () => __awaiter(void 0, void 0, void 0, function* () {
             const innerEx = () => __awaiter(void 0, void 0, void 0, function* () {
@@ -134,6 +149,6 @@ const AsyncSlect = memo((props) => {
                 return option.children.join("").toLowerCase().indexOf(input.toLowerCase()) >= 0;
             }
             return option.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
-        }, allowClear: true, showSearch: true, onSearch: handleSearch, optionFilterProp: "children" }, props, { onChange: changeHandler }), children));
+        }, allowClear: true, showSearch: true, onSearch: handleSearch, optionFilterProp: "children" }, getRest(props), { onChange: changeHandler }), children));
 });
 export default AsyncSlect;

package/lib/core/drawer/index.d.ts

@@ -4,7 +4,6 @@ export interface IDrawerProps {
     key?: string;
     id?: string;
     className?: string;
-    bodyStyle?: React.CSSProperties;
     closable?: boolean;
     maskClosable?: boolean;
     open?: boolean;
@@ -33,7 +32,7 @@ export interface IDrawerProps {
         disabled: boolean;
     };
 }
-export declare class Drawers extends React.Component<IDrawerProps> {
+export declare class Drawers extends React.Component<IDrawerProps, IDrawerProps> {
     static defaultProps: {
         className: string;
         open: boolean;
@@ -63,9 +62,39 @@ export declare class Drawers extends React.Component<IDrawerProps> {
         component: null;
     };
     state: {
+        key?: string | undefined;
+        id?: string | undefined;
+        className?: string | undefined;
+        closable?: boolean | undefined;
+        maskClosable?: boolean | undefined;
+        open?: boolean | undefined;
+        width?: string | number | undefined;
+        zIndex?: number | undefined;
+        height?: string | number | undefined;
+        placement?: import("rc-drawer/lib/DrawerPopup").Placement | undefined;
+        okDanger?: boolean | undefined;
+        title?: React.ReactNode;
+        okType?: "link" | "text" | "dashed" | "default" | "primary" | undefined;
+        okText?: string | undefined;
+        cancelText?: string | undefined;
+        mask?: boolean | undefined;
+        footer?: React.ReactNode;
+        extra?: React.ReactNode;
+        onOk?: (() => Promise<any>) | undefined;
+        onOkAfter?: ((args: any) => void | Promise<any>) | undefined;
+        onCancel?: (() => Promise<any>) | undefined;
+        component?: React.ReactNode;
+        addonBefore?: React.ReactNode;
+        addonAfter?: React.ReactNode;
+        okButtonProps?: {
+            disabled: boolean;
+        } | undefined;
+        cancelButtonProps?: {
+            disabled: boolean;
+        } | undefined;
         loading: boolean;
-        open: boolean | undefined;
     };
+    update(props: IDrawerProps): void;
     cancel: () => void;
     ok: () => void;
     render(): JSX.Element;

package/lib/core/drawer/index.js

@@ -5,10 +5,7 @@ const timeout = 300;
 export class Drawers extends React.Component {
     constructor() {
         super(...arguments);
-        this.state = {
-            loading: false,
-            open: this.props.open
-        };
+        this.state = Object.assign({ loading: false }, this.props);
         this.cancel = () => {
             if (this.state.loading) {
                 return;
@@ -24,36 +21,39 @@ export class Drawers extends React.Component {
                 });
         };
         this.ok = () => {
-            this.setState({
+            this.setState(Object.assign({}, this.state, {
                 loading: true
-            });
+            }));
             this.props.onOk &&
                 this.props
                     .onOk()
                     .then((res) => {
-                    this.setState({
+                    this.setState(Object.assign({}, this.state, {
                         loading: false,
                         open: false
-                    });
+                    }));
                     setTimeout(() => {
                         InjectNotification.removeNotice(this.props.id);
                         this.props.onOkAfter && this.props.onOkAfter(res);
                     }, timeout);
                 })
                     .catch(() => {
-                    this.setState({
+                    this.setState(Object.assign({}, this.state, {
                         loading: false
-                    });
+                    }));
                 });
         };
     }
+    update(props) {
+        this.setState(props);
+    }
     render() {
         // if (!this.props.visible) return null;
-        return (React.createElement(Drawer, { className: this.props.className, bodyStyle: this.props.bodyStyle, placement: this.props.placement, height: this.props.height, open: this.state.open, destroyOnClose: true, maskClosable: this.props.maskClosable, keyboard: false, title: this.props.title, extra: this.props.extra === null ? null : this.props.extra ? (this.props.extra) : (React.createElement("div", { className: "tac" },
-                this.props.addonBefore ? this.props.addonBefore : null,
-                React.createElement(Button, Object.assign({}, this.props.cancelButtonProps, { className: "mr10", key: "back", onClick: this.cancel }), this.props.cancelText),
-                React.createElement(Button, Object.assign({}, this.props.okButtonProps, { danger: this.props.okDanger, key: "submit", type: this.props.okType, loading: this.state.loading, onClick: this.ok }), this.props.okText),
-                this.props.addonAfter ? this.props.addonAfter : null)), width: this.props.width, zIndex: this.props.zIndex, mask: this.props.mask, onClose: this.cancel, closable: this.props.closable }, this.props.component ? this.props.component : null));
+        return (React.createElement(Drawer, { className: this.state.className, placement: this.state.placement, height: this.state.height, open: this.state.open, destroyOnClose: true, maskClosable: this.state.maskClosable, keyboard: false, title: this.state.title, extra: this.state.extra === null ? null : this.state.extra ? (this.state.extra) : (React.createElement("div", { className: "tac" },
+                this.state.addonBefore ? this.state.addonBefore : null,
+                React.createElement(Button, Object.assign({}, this.state.cancelButtonProps, { className: "mr10", key: "back", onClick: this.cancel }), this.state.cancelText),
+                React.createElement(Button, Object.assign({}, this.state.okButtonProps, { danger: this.state.okDanger, key: "submit", type: this.state.okType, loading: this.state.loading, onClick: this.ok }), this.state.okText),
+                this.state.addonAfter ? this.state.addonAfter : null)), width: this.state.width, zIndex: this.state.zIndex, mask: this.state.mask, onClose: this.cancel, closable: this.state.closable }, this.props.component ? this.props.component : null));
     }
 }
 Drawers.defaultProps = {

package/lib/core/inject-notification/index.js

@@ -55,8 +55,7 @@ class InjectNotification extends React.Component {
         const key = props.id;
         const notice = notices.find(item => item.key === key);
         if (notice) {
-            notice.props = Object.assign(notice.props, props);
-            InjectNotification[key].forceUpdate();
+            InjectNotification[key].update(Object.assign({}, notice.props, props));
         }
     }
     getNoticeList() {

package/lib/core/loading/index.d.ts

@@ -3,13 +3,16 @@ interface ILoadingFCProps {
     tip?: string;
     id?: string;
     key?: string;
+    style?: React.CSSProperties;
 }
-export declare class LoadingFC extends React.Component<ILoadingFCProps> {
+export declare class LoadingFC extends React.Component<ILoadingFCProps, ILoadingFCProps> {
     static defaultProps: {
         tip: string;
     };
+    constructor(props: ILoadingFCProps);
     maskStyle: React.CSSProperties;
     alertStyle: React.CSSProperties;
+    update(props: ILoadingFCProps): void;
     render(): JSX.Element;
 }
 declare const _default: {

package/lib/core/loading/index.js

@@ -3,8 +3,8 @@ import { Spin } from 'antd';
 import InjectNotification from "../inject-notification";
 const timeout = 300;
 export class LoadingFC extends React.Component {
-    constructor() {
-        super(...arguments);
+    constructor(props) {
+        super(props);
         this.maskStyle = {
             position: 'fixed',
             top: 0,
@@ -24,12 +24,16 @@ export class LoadingFC extends React.Component {
             zIndex: 9002,
             transform: 'translate(-50%, -70%)'
         };
+        this.state = Object.assign({}, props);
+    }
+    update(props) {
+        this.setState(props);
     }
     render() {
         return (React.createElement(React.Fragment, null,
             React.createElement("div", { style: this.maskStyle }),
-            React.createElement("div", { style: this.alertStyle, className: 'ecoding-spin' },
-                React.createElement(Spin, { size: "large", tip: this.props.tip }, " "))));
+            React.createElement("div", { style: Object.assign({}, this.alertStyle, this.state.style), className: 'ecoding-spin' },
+                React.createElement(Spin, { size: "large", tip: this.state.tip, style: { width: 200 } }, " "))));
     }
 }
 LoadingFC.defaultProps = {

package/lib/core/modal/index.d.ts

@@ -4,7 +4,6 @@ export interface IModalProps {
     id?: string;
     className?: string;
     open?: boolean;
-    bodyStyle?: React.CSSProperties;
     width?: string | number;
     zIndex?: number;
     mask?: boolean;
@@ -56,8 +55,34 @@ export declare class Modals extends React.Component<IModalProps> {
         component: null;
     };
     state: {
+        key?: string | undefined;
+        id?: string | undefined;
+        className?: string | undefined;
+        open?: boolean | undefined;
+        width?: string | number | undefined;
+        zIndex?: number | undefined;
+        mask?: boolean | undefined;
+        title?: React.ReactNode;
+        okDanger?: boolean | undefined;
+        okType?: "link" | "text" | "dashed" | "default" | "primary" | undefined;
+        okText?: string | undefined;
+        cancelText?: string | undefined;
+        closable?: boolean | undefined;
+        maskClosable?: boolean | undefined;
+        footer?: React.ReactNode;
+        onOk?: (() => Promise<any>) | undefined;
+        onOkAfter?: ((args: any) => void | Promise<any>) | undefined;
+        onCancel?: (() => Promise<any>) | undefined;
+        component?: React.ReactNode;
+        addonBefore?: React.ReactNode;
+        addonAfter?: React.ReactNode;
+        okButtonProps?: {
+            disabled: boolean;
+        } | undefined;
+        cancelButtonProps?: {
+            disabled: boolean;
+        } | undefined;
         loading: boolean;
-        open: boolean | undefined;
     };
     cancel: () => void;
     ok: () => void;

package/lib/core/modal/index.js

@@ -5,10 +5,7 @@ const timeout = 300;
 export class Modals extends React.Component {
     constructor() {
         super(...arguments);
-        this.state = {
-            loading: false,
-            open: this.props.open
-        };
+        this.state = Object.assign({ loading: false }, this.props);
         this.cancel = () => {
             if (this.state.loading) {
                 return;
@@ -24,36 +21,36 @@ export class Modals extends React.Component {
                 });
         };
         this.ok = () => {
-            this.setState({
+            this.setState(Object.assign({}, this.state, {
                 loading: true
-            });
+            }));
             this.props.onOk &&
                 this.props
                     .onOk()
                     .then((res) => {
-                    this.setState({
+                    this.setState(Object.assign({}, this.state, {
                         loading: false,
                         open: false
-                    });
+                    }));
                     setTimeout(() => {
                         InjectNotification.removeNotice(this.props.id);
                         this.props.onOkAfter && this.props.onOkAfter(res);
                     }, timeout);
                 })
                     .catch(() => {
-                    this.setState({
+                    this.setState(Object.assign({}, this.state, {
                         loading: false
-                    });
+                    }));
                 });
         };
     }
     render() {
         // if (!this.props.visible) return null;
-        return (React.createElement(Modal, { className: this.props.className, open: this.state.open, bodyStyle: this.props.bodyStyle, width: this.props.width, zIndex: this.props.zIndex, mask: this.props.mask, title: typeof this.props.title === "string" ? (React.createElement("div", { style: { boxShadow: "inset 0px -1px 0px #F0F0F0", marginBottom: "20px", paddingBottom: "12px" } }, this.props.title)) : (this.props.title), closable: this.props.closable, maskClosable: this.props.maskClosable, onCancel: this.cancel, destroyOnClose: true, keyboard: false, footer: this.props.footer === null ? null : this.props.footer ? (this.props.footer) : (React.createElement(React.Fragment, null,
-                this.props.addonBefore ? this.props.addonBefore : null,
-                React.createElement(Button, Object.assign({}, this.props.cancelButtonProps, { key: "back", onClick: this.cancel }), this.props.cancelText),
-                React.createElement(Button, Object.assign({}, this.props.okButtonProps, { danger: this.props.okDanger, key: "submit", type: this.props.okType, loading: this.state.loading, onClick: this.ok }), this.props.okText),
-                this.props.addonAfter ? this.props.addonAfter : null)) }, this.props.component ? this.props.component : null));
+        return (React.createElement(Modal, { className: this.state.className, open: this.state.open, width: this.state.width, zIndex: this.state.zIndex, mask: this.state.mask, title: typeof this.state.title === "string" ? (React.createElement("div", { style: { boxShadow: "inset 0px -1px 0px #F0F0F0", marginBottom: "20px", paddingBottom: "12px" } }, this.state.title)) : (this.state.title), closable: this.state.closable, maskClosable: this.state.maskClosable, onCancel: this.cancel, destroyOnClose: true, keyboard: false, footer: this.state.footer === null ? null : this.state.footer ? (this.state.footer) : (React.createElement(React.Fragment, null,
+                this.state.addonBefore ? this.state.addonBefore : null,
+                React.createElement(Button, Object.assign({}, this.state.cancelButtonProps, { key: "back", onClick: this.cancel }), this.state.cancelText),
+                React.createElement(Button, Object.assign({}, this.state.okButtonProps, { danger: this.state.okDanger, key: "submit", type: this.state.okType, loading: this.state.loading, onClick: this.ok }), this.state.okText),
+                this.state.addonAfter ? this.state.addonAfter : null)) }, this.props.component ? this.props.component : null));
     }
 }
 Modals.defaultProps = {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ecoding/components.antd",
-    "version": "0.3.30",
+    "version": "0.3.32",
     "author": "cxc",
     "homepage": "",
     "license": "MIT",
@@ -43,5 +43,5 @@
         "antd": "^5.8.4",
         "axios": "^1.1.2"
     },
-    "gitHead": "5ea58b44f581ea22ba222331e44699a0da566b74"
+    "gitHead": "91de23836af8423f200834bdd68cf7b77a2a0424"
 }