@ecoding/components.antd 0.1.22 → 0.1.26

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

@@ -19,9 +19,9 @@ const AsyncSlect = memo((props) => {
     const r = http.getRequest();
     const [loading, setLoading] = useState(true);
     const [options, setOptions] = useState([]);
-    const iface = useMemo(() => props.iface, []);
-    const data = useMemo(() => props.data, []);
-    const searchIface = useMemo(() => props.searchIface, []);
+    const iface = useMemo(() => props.iface, [props]);
+    const data = useMemo(() => props.data, [props]);
+    const searchIface = useMemo(() => props.searchIface, [props]);
     useEffect(() => {
         const ex = () => __awaiter(void 0, void 0, void 0, function* () {
             const innerEx = () => __awaiter(void 0, void 0, void 0, function* () {
@@ -70,7 +70,7 @@ const AsyncSlect = memo((props) => {
             setLoading(false);
         });
         ex();
-    }, [data]);
+    }, [data, iface, searchIface]);
     const handleSearch = (newValue) => __awaiter(void 0, void 0, void 0, function* () {
         if (!newValue) {
             return null;

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

@@ -1,10 +1,12 @@
 interface IToastFCProps {
+    id?: string;
+    key?: string;
     mask?: boolean;
     title?: string;
     maskTheme?: string;
     duration?: number;
     auto?: boolean;
-    type?: 'error' | 'warning' | 'info' | 'success';
+    type?: "error" | "warning" | "info" | "success";
 }
 declare const _default: {
     info(props?: IToastFCProps): void;

package/lib/core/toast/index.js

@@ -1,36 +1,35 @@
-import React, { useEffect } from 'react';
-import { Alert } from 'antd';
-import Notification from '../../helpers/notification';
-const notification = Notification.newInstance();
+import React, { useEffect } from "react";
+import { Alert } from "antd";
+import InjectNotification from "../inject-notification";
 var EaskTheme;
 (function (EaskTheme) {
     EaskTheme["dark"] = "#333";
     EaskTheme["light"] = "#fff";
 })(EaskTheme || (EaskTheme = {}));
 const typeMap = {
-    error: '错误',
-    warning: '警告',
-    info: '提示',
-    success: '成功'
+    error: "错误",
+    warning: "警告",
+    info: "提示",
+    success: "成功"
 };
 const ToastFC = (props) => {
     const maskStyle = {
-        position: 'fixed',
+        position: "fixed",
         top: 0,
         right: 0,
         bottom: 0,
         left: 0,
         zIndex: 9000,
-        height: '100%',
+        height: "100%",
         opacity: 0.45
     };
     const alertStyle = {
-        position: 'fixed',
-        top: '50%',
-        left: '50%',
+        position: "fixed",
+        top: "50%",
+        left: "50%",
         maxWidth: 340,
         zIndex: 9001,
-        transform: 'translate(-50%, -70%)'
+        transform: "translate(-50%, -70%)"
     };
     useEffect(() => {
         if (props.duration === 0) {
@@ -38,7 +37,7 @@ const ToastFC = (props) => {
         }
         const timeout = setTimeout(() => {
             if (props.auto) {
-                notification.removeNotice('toast');
+                InjectNotification.removeNotice(props.id);
             }
         }, props.duration);
         return () => {
@@ -46,37 +45,33 @@ const ToastFC = (props) => {
         };
     }, []);
     return (React.createElement(React.Fragment, null,
-        props.mask ? React.createElement("div", { style: Object.assign(maskStyle, { backgroundColor: props.maskTheme === 'light' ? EaskTheme.light : EaskTheme.dark }) }) : null,
+        props.mask ? (React.createElement("div", { style: Object.assign(maskStyle, { backgroundColor: props.maskTheme === "light" ? EaskTheme.light : EaskTheme.dark }) })) : null,
         React.createElement("div", { style: alertStyle },
-            React.createElement(Alert, { description: props.title, message: typeMap[props.type], type: props.type, showIcon: true, closable: true, onClose: () => notification.removeNotice('toast') }))));
+            React.createElement(Alert, { description: props.title, message: typeMap[props.type], type: props.type, showIcon: true, closable: true, onClose: () => InjectNotification.removeNotice(props.id) }))));
 };
 ToastFC.defaultProps = {
     mask: false,
-    title: '提示',
-    maskTheme: 'light',
+    title: "提示",
+    maskTheme: "light",
     duration: 2000,
     auto: true,
-    type: 'success'
+    type: "success"
 };
 const show = (props = {}) => {
-    if (notification) {
-        notification.removeNotice('toast');
-    }
-    setTimeout(() => {
-        notification.notice(React.createElement(ToastFC, Object.assign({}, props, { key: "toast" })));
-    }, 1);
+    props.id = props.id || props.key || "modals";
+    InjectNotification.notice(React.createElement(ToastFC, Object.assign({}, props, { key: props.id })));
 };
 export default {
     info(props = {}) {
-        return show(Object.assign(Object.assign({}, props), { type: 'info' }));
+        return show(Object.assign(Object.assign({}, props), { type: "info" }));
     },
     success(props = {}) {
-        return show(Object.assign(Object.assign({}, props), { type: 'success' }));
+        return show(Object.assign(Object.assign({}, props), { type: "success" }));
     },
     warning(props = {}) {
-        return show(Object.assign(Object.assign({}, props), { type: 'warning' }));
+        return show(Object.assign(Object.assign({}, props), { type: "warning" }));
     },
     error(props = {}) {
-        return show(Object.assign(Object.assign({}, props), { type: 'error' }));
-    },
+        return show(Object.assign(Object.assign({}, props), { type: "error" }));
+    }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ecoding/components.antd",
-    "version": "0.1.22",
+    "version": "0.1.26",
     "author": "cxc",
     "homepage": "",
     "license": "MIT",
@@ -29,6 +29,7 @@
         "@ecoding/helper.json": ">=0.0.5",
         "@ecoding/helper.request.hook": ">=0.0.6",
         "@ecoding/helper.url": ">=0.0.5",
+        "antd": "5.0.0",
         "axios": ">=1.1.2"
     },
     "devDependencies": {
@@ -42,5 +43,5 @@
     "dependencies": {
         "react-quill": "^2.0.0"
     },
-    "gitHead": "bafbbfdf3c3c4f571151dbcc75bccb52df348de4"
+    "gitHead": "73c595e4e6d8ea7c79a12ac8f9530655f3737a50"
 }