@chaoswise/ui 3.0.11 → 3.0.13

package/lib/AppHolder/index.js

@@ -0,0 +1,19 @@
+import _App from "@chaoswise/ui/lib/App";
+var message;
+var notification;
+var modal;
+var AppHolder = function AppHolder() {
+  var staticFunction = _App.useApp();
+  message = staticFunction.message;
+  modal = staticFunction.modal;
+  notification = staticFunction.notification;
+  return null;
+};
+export default AppHolder;
+// 这里的问题是 AppHolder 组件在首次定义的时候，message、modal 和 notification 还没有被赋值。当你在其他地方尝试访问 AppHolder.message 时，这些属性是 undefined 的。
+// AppHolder.message = message;
+// AppHolder.modal = modal;
+// AppHolder.notification = notification;
+
+// 具名导出的方式可以保证AppHolder组件在渲染时正确赋值这些变量，并且在其他模块中可以正确导入和使用这些变量
+export { message, notification, modal };

package/lib/Badge/index.style.js

@@ -1,15 +1,43 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _templateObject, _templateObject2, _templateObject3, _templateObject4;
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _taggedTemplateLiteral(e, t) { return t || (t = e.slice(0)), Object.freeze(Object.defineProperties(e, { raw: { value: Object.freeze(t) } })); }
 import { genStyleHooks } from "../Antd5/theme/internal";
-import { keyframes } from "../antd-style";
-var k_loadingK = keyframes(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  0% {\n      left: 0;\n      transform: scale(1.1)\n  }\n\n  50% {\n      left: 100%;\n      transform: scale(1)\n  }\n\n  100% {\n      left: 0;\n      transform: scale(1.1)\n  }\n"])));
-var k_loadingM = keyframes(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  0% {\n      z-index: 0\n  }\n\n  50% {\n      z-index: 1\n  }\n\n  100% {\n      z-index: 0\n  }\n"])));
-var k_loadingL = keyframes(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  0% {\n      left: 100%;\n      transform: scale(1.1)\n  }\n\n  50% {\n      left: 0;\n      transform: scale(1)\n  }\n\n  100% {\n      left: 100%;\n      transform: scale(1.1)\n  }\n"])));
-var k_loadingN = keyframes(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  0% {\n      z-index: 1\n  }\n\n  50% {\n      z-index: 0\n  }\n\n  100% {\n      z-index: 1\n  }\n"])));
+import { Keyframes } from "@ant-design/cssinjs";
+var k_loadingK = new Keyframes("k_loadingK", {
+  "0%": {
+    left: 0,
+    transform: "scale(1.1)",
+    zIndex: 0
+  },
+  "50%": {
+    left: "100%",
+    transform: "scale(1)",
+    zIndex: 1
+  },
+  "100%": {
+    left: 0,
+    transform: 'scale(1.1)',
+    zIndex: 0
+  }
+});
+var k_loadingL = new Keyframes("k_loadingL", {
+  "0%": {
+    left: "100%",
+    transform: 'scale(1.1)',
+    zIndex: 1
+  },
+  "50%": {
+    left: 0,
+    transform: "scale(1)",
+    zIndex: 1
+  },
+  "100%": {
+    left: "100%",
+    transform: 'scale(1.1)',
+    zIndex: 0
+  }
+});
 var genCustomBadgeStyle = function genCustomBadgeStyle(token) {
   var prefixCls = token.antCls;
   var badgePrefix = "".concat(prefixCls, "-badge");
@@ -35,11 +63,15 @@ var genCustomBadgeStyle = function genCustomBadgeStyle(token) {
     },
     "&::before": {
       background: token.colorPrimary,
-      animation: "".concat(k_loadingK, " 1s ease-in-out infinite, ").concat(k_loadingM, " 0.33s ease-in-out infinite")
+      animationName: k_loadingK,
+      animationDuration: '1s',
+      animationIterationCount: 'infinite'
     },
     "&:after": {
       background: token.colorSuccess,
-      animation: "".concat(k_loadingL, " 1s ease-in-out infinite, ").concat(k_loadingN, " 0.33s ease-in-out infinite")
+      animationName: k_loadingL,
+      animationDuration: '1s',
+      animationIterationCount: 'infinite'
     }
   }), "".concat(badgePrefix, "-processing-text"), {
     display: "inline-block",
@@ -62,6 +94,6 @@ var genCustomBadgeStyle = function genCustomBadgeStyle(token) {
 // ============================== Export ==============================
 export default genStyleHooks("CWBadge", function (token) {
   return [
-  // 
+  //
   genCustomBadgeStyle(token)];
 });

package/lib/BasicLayout/Sider.js

@@ -23,6 +23,7 @@ import { Resizable } from "re-resizable";
 import { MenuFoldOutlined, MenuUnfoldOutlined } from "@ant-design/icons";
 import { useTheme } from '../antd-style';
 import classnames from 'classnames';
+import useConfigContext from "../useConfigContext";
 import useStyle from "./style/sider";
 var AntSider = _Layout.Sider;
 function Sider(_ref) {
@@ -37,7 +38,10 @@ function Sider(_ref) {
     _setSiderDragWidth = _ref._setSiderDragWidth,
     menuOptions = _ref.menuOptions,
     onCollapse = _ref.onCollapse;
-  var _useStyle = useStyle("cw-side"),
+  var _useConfigContext = useConfigContext(),
+    getPrefixCls = _useConfigContext.getPrefixCls;
+  var prefixCls = getPrefixCls("basic-layout");
+  var _useStyle = useStyle("".concat(prefixCls, "-cw-side")),
     _useStyle2 = _slicedToArray(_useStyle, 3),
     wrapCSSVar = _useStyle2[0],
     hashId = _useStyle2[1],
@@ -116,7 +120,7 @@ function Sider(_ref) {
       width: selfCollapsed ? siderCollapsedWidth : _siderDragWidth
     }
   }), /*#__PURE__*/React.createElement(AntSider, {
-    className: classnames(hashId, cssVarCls, "cw-side"),
+    className: classnames(hashId, cssVarCls, "".concat(prefixCls, "-cw-side")),
     width: canDrag ? "100%" : _siderDragWidth,
     collapsed: selfCollapsed,
     collapsedWidth: siderCollapsedWidth,

package/lib/BasicLayout/style/sider.js

@@ -1,3 +1,7 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { genStyleHooks } from "../../Antd5/theme/internal";
 var prepareComponentToken = function prepareComponentToken(token) {
   return {
@@ -8,62 +12,62 @@ var prepareComponentToken = function prepareComponentToken(token) {
   };
 };
 var genCustomSiderStyle = function genCustomSiderStyle(token) {
-  return {
-    ".cw-side": {
-      fontSize: "14px",
+  var prefixCls = token.antCls;
+  var basicLayoutPrefixCls = "".concat(prefixCls, "-basic-layout");
+  return _defineProperty({}, "".concat(basicLayoutPrefixCls, "-cw-side"), {
+    fontSize: "14px",
+    height: "100%",
+    boxShadow: "none",
+    overflow: "auto",
+    overflowX: "hidden",
+    ".cw-side-menu-box": {
       height: "100%",
-      boxShadow: "none",
-      overflow: "auto",
-      overflowX: "hidden",
-      ".cw-side-menu-box": {
-        height: "100%",
+      width: "100%",
+      ".cw-side-menu": {
+        height: "calc(100% - 40px)",
+        width: "100%",
+        overflow: "auto"
+      },
+      ".cw-sider-bottom-box": {
+        position: "relative",
+        borderTop: "1px solid transparent",
+        height: "40px",
         width: "100%",
-        ".cw-side-menu": {
-          height: "calc(100% - 40px)",
-          width: "100%",
-          overflow: "auto"
+        backgroundColor: "#fff",
+        display: "flex",
+        justifyContent: "space-between",
+        alignItems: "center",
+        padding: "0 12px",
+        ".cw-sider-setting": {
+          color: token.siderBtnColor,
+          "&:hover": {
+            color: token.siderBtnHoverColor
+          }
         },
-        ".cw-sider-bottom-box": {
-          position: "relative",
-          borderTop: "1px solid transparent",
-          height: "40px",
-          width: "100%",
-          backgroundColor: "#fff",
-          display: "flex",
-          justifyContent: "space-between",
-          alignItems: "center",
-          padding: "0 12px",
-          ".cw-sider-setting": {
-            color: token.siderBtnColor,
-            "&:hover": {
-              color: token.siderBtnHoverColor
-            }
-          },
-          ".cw-sider-collapsed-btn": {
-            background: token.collapsedBtnBg,
-            display: "inline-block",
-            width: "24px",
-            height: "24px",
-            cursor: "pointer",
-            lineHeight: "24px",
-            fontSize: "16px",
-            textAlign: "center",
-            color: token.siderBtnColor,
-            "&:hover": {
-              color: token.siderBtnHoverColor
-            }
-          },
-          ".cw-sider-version": {
-            fontSize: "12px",
-            color: token.versionColor,
-            "&:hover": {
-              color: token.siderBtnHoverColor
-            }
+        ".cw-sider-collapsed-btn": {
+          background: token.collapsedBtnBg,
+          display: "inline-block",
+          width: "24px",
+          height: "24px",
+          cursor: "pointer",
+          lineHeight: "24px",
+          fontSize: "16px",
+          textAlign: "center",
+          color: token.siderBtnColor,
+          "&:hover": {
+            color: token.siderBtnHoverColor
+          }
+        },
+        ".cw-sider-version": {
+          fontSize: "12px",
+          color: token.versionColor,
+          "&:hover": {
+            color: token.siderBtnHoverColor
           }
         }
       }
     }
-  };
+  });
 };
 // ============================== Export ==============================
 export default genStyleHooks(["BasicLayout", "Sider"], function (token) {

package/lib/CWMessage/MessageContent/TabList/index.js

@@ -1,5 +1,6 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 import _Button from "@chaoswise/ui/lib/Button";
+import _Tag from "@chaoswise/ui/lib/Tag";
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator["return"] && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, "catch": function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -8,10 +9,11 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
 function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
-import React from "react";
-import moment from "moment";
-import { readInnerMessageApi } from "../../service";
-import { useIntl } from "../../../locales";
+import React from 'react';
+import moment from 'moment';
+import classnames from 'classnames';
+import { readInnerMessageApi } from '../../service';
+import { useIntl } from '../../../locales';
 var TabList = function TabList(props) {
   var _props$messages = props.messages,
     messages = _props$messages === void 0 ? [] : _props$messages,
@@ -31,12 +33,15 @@ var TabList = function TabList(props) {
   var _readInnerMessageApi = requestOption.readInnerMessageApi;
   var onHandleMessage = function onHandleMessage(message) {
     var userMessageId = message.userMessageId,
-      url = message.url;
+      url = message.url,
+      showMode = message.showMode;
     var params = {
       userMessageIds: [userMessageId],
       all: false
     };
     readInnerMessage(params);
+    // 撤回消息不操作
+    if (showMode === 'invalid') return;
     var _isClose = onTabListItem(message);
     if (isClose || _isClose) {
       setVisible(false);
@@ -59,12 +64,12 @@ var TabList = function TabList(props) {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            resRequestApi = _readInnerMessageApi ? _readInnerMessageApi(params) : readInnerMessageApi(params, gatewayPrefix);
+            resRequestApi = _readInnerMessageApi || readInnerMessageApi;
             _context.next = 3;
-            return resRequestApi;
+            return resRequestApi(params, gatewayPrefix);
           case 3:
             res = _context.sent;
-            if (res.status == "success") {
+            if (res.status == 'success') {
               _params = {};
               if (pageInfo.current > 1 && messages.length === 1) {
                 _params = {
@@ -92,22 +97,24 @@ var TabList = function TabList(props) {
   var messageList = messages.map(function (message) {
     var _message$title, _message$summary;
     return /*#__PURE__*/React.createElement("div", {
-      className: "".concat(messagePrefixCls, "-content-tabs-list"),
+      className: classnames("".concat(messagePrefixCls, "-content-tabs-list"), _defineProperty({}, "".concat(messagePrefixCls, "-content-tabs-list-invalid"), message.showMode === 'invalid')),
       key: message.userMessageId
     }, /*#__PURE__*/React.createElement("div", {
       className: "".concat(messagePrefixCls, "-content-tabs-list-title"),
       onClick: function onClick() {
         return onHandleMessage(message);
       }
-    }, (_message$title = message.title) !== null && _message$title !== void 0 ? _message$title : ""), /*#__PURE__*/React.createElement("div", {
+    }, message.showMode === 'top' && /*#__PURE__*/React.createElement(_Tag, {
+      className: "".concat(messagePrefixCls, "-content-tabs-list-title-top")
+    }, intl.get('5cc44ee5-8da3-446b-b962-3fe7f77d4f38').d('置顶')), (_message$title = message.title) !== null && _message$title !== void 0 ? _message$title : ''), /*#__PURE__*/React.createElement("div", {
       className: "".concat(messagePrefixCls, "-content-tabs-list-desc")
-    }, (_message$summary = message.summary) !== null && _message$summary !== void 0 ? _message$summary : ""), /*#__PURE__*/React.createElement("div", {
+    }, (_message$summary = message.summary) !== null && _message$summary !== void 0 ? _message$summary : ''), /*#__PURE__*/React.createElement("div", {
       className: "".concat(messagePrefixCls, "-content-tabs-list-date")
-    }, message.time ? moment(Number(message.time)).format("YYYY/MM/DD HH:mm:ss") : ""));
+    }, message.time ? moment(Number(message.time)).format('YYYY/MM/DD HH:mm:ss') : ''));
   });
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Button, {
     className: "".concat(messagePrefixCls, "-content-all-read"),
     onClick: onHandleReadAllMessage
-  }, intl.get("58bc27cb-aac5-49f8-8c9e-3b0fbb9d9c61").d("全部已读")), messageList);
+  }, intl.get('58bc27cb-aac5-49f8-8c9e-3b0fbb9d9c61').d('全部已读')), messageList);
 };
 export default TabList;

package/lib/CWMessage/MessageContent/index.js

@@ -82,9 +82,9 @@ var MessageContent = function MessageContent(props) {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            resRequestApi = _getMessageTypeApi ? _getMessageTypeApi() : getMessageTypeApi(gatewayPrefix);
+            resRequestApi = _getMessageTypeApi || getMessageTypeApi;
             _context.next = 3;
-            return resRequestApi;
+            return resRequestApi(gatewayPrefix);
           case 3:
             res = _context.sent;
             if (res && res.status == "success") {
@@ -115,9 +115,9 @@ var MessageContent = function MessageContent(props) {
           case 0:
             setLoading(true);
             conditionsRef.current = _objectSpread(_objectSpread({}, conditionsRef.current), params);
-            resRequestApi = _getMessageListApi ? _getMessageListApi(conditionsRef.current) : getMessageListApi(conditionsRef.current, gatewayPrefix);
+            resRequestApi = _getMessageListApi || getMessageListApi;
             _context2.next = 5;
-            return resRequestApi;
+            return resRequestApi(conditionsRef.current, gatewayPrefix);
           case 5:
             res = _context2.sent;
             if (res && res.status == "success") {
@@ -143,9 +143,9 @@ var MessageContent = function MessageContent(props) {
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
-            resRequestApi = _getMessageUnreadCountApi ? _getMessageUnreadCountApi() : getMessageUnreadCountApi(gatewayPrefix);
+            resRequestApi = _getMessageUnreadCountApi || getMessageUnreadCountApi;
             _context3.next = 3;
-            return resRequestApi;
+            return resRequestApi(gatewayPrefix);
           case 3:
             res = _context3.sent;
             if (res && res.status == "success") {

package/lib/CWMessage/index.js

@@ -99,6 +99,8 @@ function Message(props) {
     setTotal = _useState8[1];
   // 保存消息配置
   var messageOptionRef = useRef({});
+  // 获取socket信息
+  var socketConnectInfo = useRef();
   // 分页配置初始化
   var _useState9 = useState({
       current: 1,
@@ -124,6 +126,11 @@ function Message(props) {
   useEffect(function () {
     getMessageQuerySettings();
     connectSocket();
+    return function () {
+      if (socketConnectInfo.current) {
+        socketConnectInfo.current.disconnect && socketConnectInfo.current.disconnect();
+      }
+    };
   }, []);
   useEffect(function () {
     setPageInfo(function (pre) {
@@ -166,9 +173,9 @@ function Message(props) {
               userMessageId: id,
               clientType: "BROWSER"
             };
-            resRequestApi = _getMessageDetailApi ? _getMessageDetailApi(params) : getMessageDetailApi(params, gatewayPrefix);
+            resRequestApi = _getMessageDetailApi || getMessageDetailApi;
             _context.next = 4;
-            return resRequestApi;
+            return resRequestApi(params, gatewayPrefix);
           case 4:
             res = _context.sent;
             if (res && res.status == "success") {
@@ -203,24 +210,13 @@ function Message(props) {
   }();
   var readInnerMessage = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
-      var resRequestApi, res;
+      var resRequestApi;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            resRequestApi = _readInnerMessageApi ? _readInnerMessageApi(params) : readInnerMessageApi(params, gatewayPrefix);
-            _context2.next = 3;
-            return resRequestApi;
-          case 3:
-            res = _context2.sent;
-            if (res.status == "success") {
-              // if (pageInfo.current > 1 && dataSource.length === 1) {
-              //   let _params = { current: pageInfo.current - 1 };
-              //   setPageInfo((pre) => ({ ...pre, current: pre.current - 1 }));
-              //   conditionsRef.current = { ...conditionsRef.current, ..._params };
-              // }
-              // 已读消息
-            }
-          case 5:
+            resRequestApi = _readInnerMessageApi || readInnerMessageApi;
+            resRequestApi(params, gatewayPrefix);
+          case 2:
           case "end":
             return _context2.stop();
         }
@@ -230,17 +226,53 @@ function Message(props) {
       return _ref3.apply(this, arguments);
     };
   }();
+  var getSocketPostMessage = function getSocketPostMessage(data) {
+    var _JSON$parse = JSON.parse(data),
+      count = _JSON$parse.count,
+      message = _JSON$parse.message;
+    var _ref4 = count || {},
+      _ref4$total = _ref4.total,
+      total = _ref4$total === void 0 ? 0 : _ref4$total;
+    setMessageTotal(total);
+    onSocketChange(JSON.parse(data));
+    if (message) {
+      var noticeMessage = message.noticeMessage,
+        action = message.action;
+      var _ref5 = noticeMessage || {},
+        userMessageId = _ref5.id,
+        type = _ref5.type;
+      if (!userMessageId) return;
+      if (action && action.mode === "recall") {
+        // 销毁强提醒
+        api.destroy(userMessageId);
+        // 销毁后如果弹窗开启关闭弹窗
+        setVisible(false);
+      } else {
+        // 生成强提醒
+        var _ref6 = messageOptionRef.current[type] || {},
+          enable = _ref6.enable,
+          _mode = _ref6.mode,
+          _ref6$time = _ref6.time,
+          time = _ref6$time === void 0 ? 5 : _ref6$time;
+        setMode(_mode);
+        if (enable) {
+          openNotification(time, userMessageId);
+        }
+      }
+    }
+  };
   var connectSocket = /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
+    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
       var resRequestApi, res, finalOrigin, socket;
-      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-        while (1) switch (_context5.prev = _context5.next) {
+      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
           case 0:
-            resRequestApi = _getSessionId ? _getSessionId() : getSessionId(gatewayPrefix);
-            _context5.next = 3;
-            return resRequestApi;
+            // 获取sessionId
+            resRequestApi = _getSessionId || getSessionId;
+            _context4.next = 3;
+            return resRequestApi(gatewayPrefix);
           case 3:
-            res = _context5.sent;
+            res = _context4.sent;
             if (res && res.status == "success") {
               finalOrigin = socketOrigin ? socketOrigin : "ws://".concat(window.location.host);
               socket = io(finalOrigin, {
@@ -250,50 +282,20 @@ function Message(props) {
                   sessionId: res.data,
                   clientType: "BROWSER"
                 }
-              });
-              socket.on("push", /*#__PURE__*/function () {
-                var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(data) {
-                  var _JSON$parse, count, message, _ref6, _ref6$total, total, noticeMessage, userMessageId, type, _ref7, enable, _mode, _ref7$time, time;
-                  return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-                    while (1) switch (_context3.prev = _context3.next) {
-                      case 0:
-                        _JSON$parse = JSON.parse(data), count = _JSON$parse.count, message = _JSON$parse.message;
-                        _ref6 = count || {}, _ref6$total = _ref6.total, total = _ref6$total === void 0 ? 0 : _ref6$total;
-                        setMessageTotal(total);
-                        onSocketChange(JSON.parse(data));
-                        if (message) {
-                          noticeMessage = message.noticeMessage;
-                          if (noticeMessage) {
-                            userMessageId = noticeMessage.id, type = noticeMessage.type;
-                            if (userMessageId) {
-                              _ref7 = messageOptionRef.current[type] || {}, enable = _ref7.enable, _mode = _ref7.mode, _ref7$time = _ref7.time, time = _ref7$time === void 0 ? 5 : _ref7$time;
-                              setMode(_mode);
-                              if (enable) {
-                                openNotification(time, userMessageId);
-                              }
-                            }
-                          }
-                        }
-                      case 5:
-                      case "end":
-                        return _context3.stop();
-                    }
-                  }, _callee3);
-                }));
-                return function (_x4) {
-                  return _ref5.apply(this, arguments);
-                };
-              }());
+              }); // 记录socket连接信息，用于关闭socket连接
+              socketConnectInfo.current = socket;
+              // 监听从服务器传来的消息
+              socket.on("push", getSocketPostMessage);
               // socket重连
-              socket.on("reconnect_attempt", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+              socket.on("reconnect_attempt", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
                 var res;
-                return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-                  while (1) switch (_context4.prev = _context4.next) {
+                return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+                  while (1) switch (_context3.prev = _context3.next) {
                     case 0:
-                      _context4.next = 2;
+                      _context3.next = 2;
                       return resRequestApi;
                     case 2:
-                      res = _context4.sent;
+                      res = _context3.sent;
                       if (res && res.status == "success") {
                         socket.io.opts.query = {
                           sessionId: res.data,
@@ -302,41 +304,41 @@ function Message(props) {
                       }
                     case 4:
                     case "end":
-                      return _context4.stop();
+                      return _context3.stop();
                   }
-                }, _callee4);
+                }, _callee3);
               })));
             }
           case 5:
           case "end":
-            return _context5.stop();
+            return _context4.stop();
         }
-      }, _callee5);
+      }, _callee4);
     }));
     return function connectSocket() {
-      return _ref4.apply(this, arguments);
+      return _ref7.apply(this, arguments);
     };
   }();
   var getMessageQuerySettings = /*#__PURE__*/function () {
-    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
+    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
       var resRequestApi, res, data;
-      return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-        while (1) switch (_context6.prev = _context6.next) {
+      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
           case 0:
-            resRequestApi = _getMessageQuerySettingsApi ? _getMessageQuerySettingsApi() : getMessageQuerySettingsApi(gatewayPrefix);
-            _context6.next = 3;
-            return resRequestApi;
+            resRequestApi = _getMessageQuerySettingsApi || getMessageQuerySettingsApi;
+            _context5.next = 3;
+            return resRequestApi(gatewayPrefix);
           case 3:
-            res = _context6.sent;
+            res = _context5.sent;
             if (res && res.status === "success") {
               data = res.data;
               messageOptionRef.current = data || {};
             }
           case 5:
           case "end":
-            return _context6.stop();
+            return _context5.stop();
         }
-      }, _callee6);
+      }, _callee5);
     }));
     return function getMessageQuerySettings() {
       return _ref9.apply(this, arguments);