ns-base-module 1.1.76 → 1.1.78

package/dist/utils/errorMsg.js

@@ -1,16 +1,86 @@
-import { message, Modal } from "antd";
+import { CloseCircleOutlined, QuestionCircleOutlined } from "@ant-design/icons";
+import { message, Modal as ModalPC } from "antd";
 import React from "react";
-export default (function (res) {
-  var _msg = (res === null || res === void 0 ? void 0 : res.msg) || "系统繁忙，请稍后再试";
+var msgTimer = false;
+export default (function (res, defaultMsg) {
+  if (msgTimer) return;
+  msgTimer = true;
+  setTimeout(function () {
+    msgTimer = false;
+  }, 800);
+  var _key = new Date().getTime() + Math.random();
+  // 手动关闭按钮
+  var closeDom = /*#__PURE__*/React.createElement("span", {
+    style: {
+      position: "absolute",
+      right: "-7px",
+      top: "-7px",
+      cursor: "pointer",
+      color: "#fff",
+      background: "rgba(0, 0, 0, 0.8)",
+      width: "14px",
+      height: "14px",
+      lineHeight: "12px",
+      borderRadius: "50%",
+      textAlign: "center",
+      alignItems: "center",
+      display: "block"
+      // fontSize: '12px',
+    },
+    onClick: function onClick() {
+      message.destroy(_key);
+    }
+  }, /*#__PURE__*/React.createElement(CloseCircleOutlined, {
+    style: {
+      fontSize: "16px",
+      marginTop: "-2px",
+      marginLeft: "-1px",
+      color: "#fff"
+    }
+  }));
+  //  React.createElement(
+  //   'span',
+  //   {
+  //     style: {
+  //       position: 'absolute',
+  //       right: '-7px',
+  //       top: '-7px',
+  //       cursor: 'pointer',
+  //       color: '#fff',
+  //       background: 'rgba(0, 0, 0, 0.8)',
+  //       width: '14px',
+  //       height: '14px',
+  //       lineHeight: '14px',
+  //       borderRadius: '50%',
+  //       fontSize: '12px',
+  //     },
+  //     onClick: () => {
+  //       message.destroy(_key);
+  //     },
+  //   },
+  //   'x',
+  // );
+
+  var _msg = (res === null || res === void 0 ? void 0 : res.msg) || defaultMsg || "请求失败";
   if (res !== null && res !== void 0 && res.errorCode && res !== null && res !== void 0 && res.error && res !== null && res !== void 0 && res.msg) {
     var split = res === null || res === void 0 ? void 0 : res.msg.split(res === null || res === void 0 ? void 0 : res.errorCode);
-    if (split.length > 1) _msg = /*#__PURE__*/React.createElement("span", null, split[0], /*#__PURE__*/React.createElement("a", {
+    if (res !== null && res !== void 0 && res.errorCode) _msg = /*#__PURE__*/React.createElement("span", {
+      style: {
+        paddingTop: "5px",
+        lineHeight: "12px",
+        alignItems: "center",
+        display: "inline-flex"
+      }
+    }, split[0], /*#__PURE__*/React.createElement(QuestionCircleOutlined, {
+      style: {
+        fontSize: "12px",
+        marginTop: "-2px",
+        color: "#999"
+      },
       onClick: function onClick() {
-        Modal.info({
+        ModalPC.info({
           title: "详细信息",
           width: 900,
-          className: "modal-error-msg",
-          zIndex: 1040,
           content: /*#__PURE__*/React.createElement("div", {
             dangerouslySetInnerHTML: {
               __html: res.error
@@ -24,7 +94,81 @@ export default (function (res) {
           closable: true
         });
       }
-    }, res === null || res === void 0 ? void 0 : res.errorCode), split[1]);
+    }), closeDom);
+
+    // React.createElement(
+    //   'span',
+    //   null,
+    //   React.createElement('span', {
+    //     dangerouslySetInnerHTML: { __html: split[0] },
+    //   }),
+    //   React.createElement(
+    //     'a',
+    //     {
+    //       onClick: () => {
+    //         ModalPC.info({
+    //           title: '详细信息',
+    //           width: 900,
+    //           content: React.createElement('div', {
+    //             dangerouslySetInnerHTML: { __html: res.error },
+    //             style: {
+    //               maxHeight: '60vh',
+    //               overflow: 'auto',
+    //             },
+    //           }),
+    //           onOk() {},
+    //           closable: true,
+    //         });
+    //       },
+    //     },
+    //     res?.errorCode,
+    //   ),
+    //   // split[1],
+    //   <QuestionCircleOutlined />,
+    //   closeDom,
+    // );
+  }
+  if (typeof _msg == "string") {
+    _msg = /*#__PURE__*/React.createElement("span", null, _msg, closeDom);
+  }
+
+  // 520 后端只提示作用 成功状态
+  if ((res === null || res === void 0 ? void 0 : res.code) == 520) {
+    message.info({
+      content: _msg,
+      duration: 3,
+      key: _key
+    });
+    return;
+  }
+  // 200  成功状态
+  if ((res === null || res === void 0 ? void 0 : res.code) == 200 && (res !== null && res !== void 0 && res.msg || defaultMsg)) {
+    message.success({
+      content: _msg,
+      duration: 3,
+      key: _key
+    });
+    return;
+  }
+
+  // 600 后端只提示作用 警告状态
+  if ((res === null || res === void 0 ? void 0 : res.code) == 600) {
+    message.warning({
+      content: _msg,
+      duration: 3,
+      key: _key
+    });
+    return;
+  }
+
+  // 305 右上角有弹窗处理
+  if ((res === null || res === void 0 ? void 0 : res.code) === 305) {
+    return;
   }
-  message.error(_msg);
+  message.error({
+    className: "msg-config-wrap",
+    content: _msg,
+    duration: 3,
+    key: _key
+  });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ns-base-module",
-  "version": "1.1.76",
+  "version": "1.1.78",
   "private": false,
   "description": "ns通用组件库",
   "license": "MIT",