@ecoding/components.antd 0.1.1 → 0.1.4

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

@@ -1,4 +1,4 @@
-import React from 'react';
+import React from "react";
 interface IComfirm {
     title?: string;
     content?: React.ReactNode;

package/lib/core/confirm/index.js

@@ -7,19 +7,19 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import React from 'react';
-import { Modal } from 'antd';
-import { ExclamationCircleOutlined } from '@ant-design/icons';
+import React from "react";
+import { Modal } from "antd";
+import { ExclamationCircleOutlined } from "@ant-design/icons";
 const confirm = {
     showDelete(opts) {
         let loading = false;
         Modal.confirm({
-            okType: 'danger',
+            okType: "danger",
             icon: React.createElement(ExclamationCircleOutlined, null),
-            title: opts.title || '确定要删除吗？',
-            content: opts.content || '',
-            okText: opts.okText || '确定',
-            cancelText: opts.okText || '取消',
+            title: opts.title || "确定要删除吗？",
+            content: opts.content || "",
+            okText: opts.okText || "确定",
+            cancelText: opts.cancelText || "取消",
             onOk() {
                 loading = true;
                 return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
@@ -35,23 +35,23 @@ const confirm = {
             },
             onCancel() {
                 if (loading) {
-                    return Promise.reject('正在请求中，不可关闭');
+                    return Promise.reject("正在请求中，不可关闭");
                 }
                 if (opts.onCancel) {
                     return opts.onCancel();
                 }
-            },
+            }
         });
     },
     show(opts) {
         let loading = false;
         Modal.confirm({
             icon: React.createElement(ExclamationCircleOutlined, null),
-            title: opts.title || '标题',
-            content: opts.content || '',
-            okType: opts.okType || 'primary',
-            okText: opts.okText || '确定',
-            cancelText: opts.okText || '取消',
+            title: opts.title || "标题",
+            content: opts.content || "",
+            okType: opts.okType || "primary",
+            okText: opts.okText || "确定",
+            cancelText: opts.cancelText || "取消",
             onOk() {
                 loading = true;
                 return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
@@ -67,12 +67,12 @@ const confirm = {
             },
             onCancel() {
                 if (loading) {
-                    return Promise.reject('正在请求中，不可关闭');
+                    return Promise.reject("正在请求中，不可关闭");
                 }
                 if (opts.onCancel) {
                     return opts.onCancel();
                 }
-            },
+            }
         });
     }
 };

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

@@ -34,7 +34,6 @@ class InjectNotification extends React.Component {
         }
         else {
             const temp = notices.splice(index, 1);
-            console.log(notices.concat(temp));
             this.setState(Object.assign({}, {
                 notices: notices.concat(temp),
             }));

package/lib/core/loading/index.js

@@ -32,9 +32,6 @@ LoadingFC.defaultProps = {
 };
 export default {
     show(props = {}) {
-        if (notification) {
-            notification.removeNotice('loading');
-        }
         notification.notice(React.createElement(LoadingFC, Object.assign({}, props, { key: "loading" })));
     },
     hide(props = {}) {

package/lib/core/toast/index.js

@@ -62,7 +62,9 @@ const show = (props = {}) => {
     if (notification) {
         notification.removeNotice('toast');
     }
-    notification.notice(React.createElement(ToastFC, Object.assign({}, props, { key: "toast" })));
+    setTimeout(() => {
+        notification.notice(React.createElement(ToastFC, Object.assign({}, props, { key: "toast" })));
+    }, 1);
 };
 export default {
     info(props = {}) {

package/lib/helpers/notification.js

@@ -35,14 +35,20 @@ class Notification extends React.Component {
         // 创造一个不重复的key
         const { notices } = this.state;
         const key = notice.key;
-        const temp = notices.filter(item => item.key === key).length;
-        if (!temp) {
+        const index = notices.findIndex(item => item.key === key);
+        if (index === -1) {
             // 不存在重复的 添加
             notices.push(notice);
             this.setState({
                 notices,
             });
         }
+        else {
+            const temp = notices.splice(index, 1);
+            this.setState(Object.assign({}, {
+                notices: notices.concat(temp),
+            }));
+        }
     }
     // 删除一个监听项
     remove(key) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ecoding/components.antd",
-    "version": "0.1.1",
+    "version": "0.1.4",
     "author": "cxc",
     "homepage": "",
     "license": "MIT",
@@ -42,5 +42,5 @@
     "dependencies": {
         "react-quill": "^2.0.0"
     },
-    "gitHead": "ceb7610b08ba21a9f8617ef1ec29bc8ce68de1ea"
+    "gitHead": "41803868b11ed238f9ea335c2be473ee3523b874"
 }