@ecoding/components.antd 0.3.25 → 0.3.27

package/lib/core/drawer/index.js

@@ -107,7 +107,7 @@ export default {
     hide(props = {}) {
         props.open = false;
         props.footer = "";
-        props.id = props.id || "drawers";
+        props.id = props.id || props.key || "drawers";
         setTimeout(() => {
             InjectNotification.removeNotice(props.id);
         }, timeout);

package/lib/core/form.list/index.d.ts

@@ -20,8 +20,9 @@ interface IProps {
     afterAdd?: (index: any) => void;
     operation?: {
         width?: number;
-        component?: React.ReactNode;
-        title: string;
+        render?: (field: FormListFieldData, index: number) => React.ReactNode;
+        title?: string;
+        hideRemove?: boolean;
     };
 }
 declare const C: React.FC<IProps>;

package/lib/core/form.list/index.js

@@ -1,5 +1,5 @@
 import React, { useMemo } from 'react';
-import { Typography, Form, Button } from 'antd';
+import { Typography, Form, Button, Space } from 'antd';
 import { PlusCircleOutlined } from '@ant-design/icons';
 const C = ({ columns, rules, name, hideOperation, hideBottom, operation, i18n, afterRemove, afterAdd }) => {
     const tdStyle = {
@@ -44,7 +44,7 @@ const C = ({ columns, rules, name, hideOperation, hideBottom, operation, i18n, a
                                 }
                                 return React.createElement("th", { style: Object.assign({}, thStyle, { width: column.width || 200 }) }, column.title);
                             }),
-                            hideOperation ? null : operation ? (React.createElement("th", { style: Object.assign({}, thStyle, { width: operation.width || 150, right: 0, position: "sticky" }) }, operation.title)) : (React.createElement("th", { style: Object.assign({}, thStyle, { width: 150, right: 0, position: "sticky" }) }, i18n ? i18n.$t("global.operation", "操作") : "操作")))),
+                            hideOperation ? null : operation ? (React.createElement("th", { style: Object.assign({}, thStyle, { width: operation.width || 150, right: 0, position: "sticky" }) }, operation.title || "操作")) : (React.createElement("th", { style: Object.assign({}, thStyle, { width: 150, right: 0, position: "sticky" }) }, i18n ? i18n.$t("global.operation", "操作") : "操作")))),
                     React.createElement("tbody", null, fields.map((field, index) => {
                         return (React.createElement("tr", { style: trStyle },
                             React.createElement("td", { style: tdStyle }, index + 1),
@@ -52,7 +52,13 @@ const C = ({ columns, rules, name, hideOperation, hideBottom, operation, i18n, a
                                 return (React.createElement("td", { style: tdStyle },
                                     React.createElement(Form.Item, { style: { marginBottom: 0 }, tooltip: column.tooltip || undefined, name: [field.name, column.name], rules: column.rules || [] }, column.render(field, index))));
                             }),
-                            hideOperation ? null : operation ? (React.createElement("td", { style: Object.assign({}, tdStyle, { right: 0, position: "sticky", backgroundColor: "#fff" }) }, operation.component)) : (React.createElement("td", { style: Object.assign({}, tdStyle, { right: 0, position: "sticky", backgroundColor: "#fff" }) },
+                            hideOperation ? null : operation ? (React.createElement("td", { style: Object.assign({}, tdStyle, { right: 0, position: "sticky", backgroundColor: "#fff" }) },
+                                React.createElement(Space, null,
+                                    operation.render && operation.render(field, index),
+                                    operation.hideRemove ? null : (React.createElement(Typography.Text, { style: { cursor: 'pointer' }, type: "danger", onClick: () => {
+                                            remove(field.name);
+                                            afterRemove && afterRemove(field.name);
+                                        } }, i18n ? i18n.$t("global.del", '删除') : '删除'))))) : (React.createElement("td", { style: Object.assign({}, tdStyle, { right: 0, position: "sticky", backgroundColor: "#fff" }) },
                                 React.createElement(Typography.Text, { style: { cursor: 'pointer' }, type: "danger", onClick: () => {
                                         remove(field.name);
                                         afterRemove && afterRemove(field.name);

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

@@ -53,10 +53,8 @@ class InjectNotification extends React.Component {
     update(props) {
         const { notices } = this.state;
         const key = props.id;
-        const index = notices.findIndex(item => item.key === key);
-        const temp = notices.splice(index, 1);
-        if (temp && temp.length > 0) {
-            const notice = temp[0];
+        const notice = notices.find(item => item.key === key);
+        if (notice) {
             notice.props = Object.assign(notice.props, props);
             InjectNotification[key].forceUpdate();
         }

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

@@ -1,8 +1,20 @@
+import React from 'react';
 interface ILoadingFCProps {
     tip?: string;
+    id?: string;
+    key?: string;
+}
+export declare class LoadingFC extends React.Component<ILoadingFCProps> {
+    static defaultProps: {
+        tip: string;
+    };
+    maskStyle: React.CSSProperties;
+    alertStyle: React.CSSProperties;
+    render(): JSX.Element;
 }
 declare const _default: {
     show(props?: ILoadingFCProps): void;
+    update(props?: ILoadingFCProps): void;
     hide(props?: ILoadingFCProps): void;
 };
 export default _default;

package/lib/core/loading/index.js

@@ -1,40 +1,53 @@
 import React from 'react';
 import { Spin } from 'antd';
-import Notification from '../../helpers/notification';
-const notification = Notification.newInstance();
-const LoadingFC = (props) => {
-    const maskStyle = {
-        position: 'fixed',
-        top: 0,
-        right: 0,
-        bottom: 0,
-        left: 0,
-        zIndex: 9001,
-        backgroundColor: '#fff',
-        height: '100%',
-        opacity: 0.45
-    };
-    const alertStyle = {
-        position: 'fixed',
-        top: '50%',
-        left: '50%',
-        maxWidth: 340,
-        zIndex: 9002,
-        transform: 'translate(-50%, -70%)'
-    };
-    return (React.createElement(React.Fragment, null,
-        React.createElement("div", { style: maskStyle }),
-        React.createElement("div", { style: alertStyle },
-            React.createElement(Spin, { size: "large", tip: props.tip }))));
-};
+import InjectNotification from "../inject-notification";
+const timeout = 300;
+export class LoadingFC extends React.Component {
+    constructor() {
+        super(...arguments);
+        this.maskStyle = {
+            position: 'fixed',
+            top: 0,
+            right: 0,
+            bottom: 0,
+            left: 0,
+            zIndex: 9001,
+            backgroundColor: '#fff',
+            height: '100%',
+            opacity: 0.45
+        };
+        this.alertStyle = {
+            position: 'fixed',
+            top: '50%',
+            left: '50%',
+            maxWidth: 340,
+            zIndex: 9002,
+            transform: 'translate(-50%, -70%)'
+        };
+    }
+    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 }, " "))));
+    }
+}
 LoadingFC.defaultProps = {
     tip: ''
 };
 export default {
     show(props = {}) {
-        notification.notice(React.createElement(LoadingFC, Object.assign({}, props, { key: "loading" })));
+        props.id = props.id || props.key || "loading";
+        InjectNotification.notice(React.createElement(LoadingFC, Object.assign({}, props, { key: props.id, ref: ref => InjectNotification[props.id] = ref })));
+    },
+    update(props = {}) {
+        props.id = props.id || props.key || "loading";
+        InjectNotification.updateNotice(props);
     },
     hide(props = {}) {
-        notification.removeNotice('loading');
+        props.id = props.id || props.key || "loading";
+        setTimeout(() => {
+            InjectNotification.removeNotice(props.id);
+        }, timeout);
     }
 };

package/lib/core/modal/index.js

@@ -104,7 +104,7 @@ export default {
     hide(props = {}) {
         props.open = false;
         props.footer = "";
-        props.id = props.id || "modals";
+        props.id = props.id || props.key || "modals";
         setTimeout(() => {
             InjectNotification.removeNotice(props.id);
         }, timeout);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ecoding/components.antd",
-    "version": "0.3.25",
+    "version": "0.3.27",
     "author": "cxc",
     "homepage": "",
     "license": "MIT",
@@ -43,5 +43,5 @@
         "antd": "^5.8.4",
         "axios": "^1.1.2"
     },
-    "gitHead": "098eed4b9537a6bec1dde382cb25cac39f299356"
+    "gitHead": "571168c21c039e8eed8da932957c8b567fa22abb"
 }