@chaoswise/ui 2.5.4 → 2.5.5

package/lib/Affix/index.js

@@ -0,0 +1,3 @@
+import "antd/es/affix/style";
+import _Affix from "antd/es/affix";
+export default _Affix;

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

@@ -13,7 +13,7 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 import React from "react";
 import moment from "moment";
 import { readInnerMessageApi } from "../../service";
-import langConfig from '../../locale';
+import langConfig from "../../locale";
 import { formatMessage } from "../../../utils";
 import "./index.less";
 var TabList = function TabList(props) {
@@ -63,9 +63,9 @@ 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") {

package/lib/CWMessage/MessageContent/index.js

@@ -89,9 +89,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") {
@@ -123,9 +123,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") {
@@ -151,9 +151,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

@@ -91,6 +91,8 @@ function Message(props) {
     setTotal = _useState6[1];
   // 保存消息配置
   var messageOptionRef = useRef({});
+  // 获取socket信息
+  var socketConnectInfo = useRef();
   // 分页配置初始化
   var _useState7 = useState({
       current: 1,
@@ -113,6 +115,11 @@ function Message(props) {
       top: headerHeight,
       maxCount: 1
     });
+    return function () {
+      if (socketConnectInfo.current) {
+        socketConnectInfo.current.disconnect && socketConnectInfo.current.disconnect();
+      }
+    };
   }, []);
   useEffect(function () {
     setPageInfo(function (pre) {
@@ -152,9 +159,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") {
@@ -190,24 +197,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();
         }
@@ -217,19 +213,47 @@ 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;
+      if (noticeMessage) {
+        var userMessageId = noticeMessage.id,
+          type = noticeMessage.type;
+        if (userMessageId) {
+          var _ref5 = messageOptionRef.current[type] || {},
+            enable = _ref5.enable,
+            mode = _ref5.mode,
+            _ref5$time = _ref5.time,
+            time = _ref5$time === void 0 ? 5 : _ref5$time;
+          if (enable) {
+            openNotification(time, userMessageId);
+          }
+        }
+      }
+    }
+  };
   var connectSocket = /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
       var resRequestApi, res, finalOrigin, socket;
-      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-        while (1) switch (_context5.prev = _context5.next) {
+      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
           case 0:
-            resRequestApi = _getSessionId ? _getSessionId() : getSessionId(gatewayPrefix);
-            _context5.next = 3;
-            return resRequestApi;
+            // 获取sessionId
+            resRequestApi = _getSessionId || getSessionId;
+            _context3.next = 3;
+            return resRequestApi(gatewayPrefix);
           case 3:
-            res = _context5.sent;
+            res = _context3.sent;
             if (res && res.status == "success") {
-              finalOrigin = socketOrigin ? socketOrigin : "ws://".concat(window.location.host);
+              finalOrigin = socketOrigin || "ws://".concat(window.location.host); // 连接到后端socket服务器
               socket = io(finalOrigin, {
                 transports: ["websocket"],
                 path: "".concat(socketPathPrefix, "/message/socket.io"),
@@ -237,95 +261,51 @@ 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;
-                              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() {
-                var res;
-                return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-                  while (1) switch (_context4.prev = _context4.next) {
-                    case 0:
-                      _context4.next = 2;
-                      return resRequestApi;
-                    case 2:
-                      res = _context4.sent;
-                      if (res && res.status == "success") {
-                        socket.io.opts.query = {
-                          sessionId: res.data,
-                          clientType: "BROWSER"
-                        };
-                      }
-                    case 4:
-                    case "end":
-                      return _context4.stop();
-                  }
-                }, _callee4);
-              })));
+              socket.on("reconnect_attempt", function () {
+                socket.io.opts.query = {
+                  sessionId: res.data,
+                  clientType: "BROWSER"
+                };
+              });
             }
           case 5:
           case "end":
-            return _context5.stop();
+            return _context3.stop();
         }
-      }, _callee5);
+      }, _callee3);
     }));
     return function connectSocket() {
-      return _ref4.apply(this, arguments);
+      return _ref6.apply(this, arguments);
     };
   }();
   var getMessageQuerySettings = /*#__PURE__*/function () {
-    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
+    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
       var resRequestApi, res, data;
-      return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-        while (1) switch (_context6.prev = _context6.next) {
+      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
           case 0:
-            resRequestApi = _getMessageQuerySettingsApi ? _getMessageQuerySettingsApi() : getMessageQuerySettingsApi(gatewayPrefix);
-            _context6.next = 3;
-            return resRequestApi;
+            resRequestApi = _getMessageQuerySettingsApi || getMessageQuerySettingsApi;
+            _context4.next = 3;
+            return resRequestApi(gatewayPrefix);
           case 3:
-            res = _context6.sent;
+            res = _context4.sent;
             if (res && res.status === "success") {
               data = res.data;
               messageOptionRef.current = data || {};
             }
           case 5:
           case "end":
-            return _context6.stop();
+            return _context4.stop();
         }
-      }, _callee6);
+      }, _callee4);
     }));
     return function getMessageQuerySettings() {
-      return _ref9.apply(this, arguments);
+      return _ref7.apply(this, arguments);
     };
   }();
   return /*#__PURE__*/React.createElement("div", {

package/lib/ErrorBoundary/history.js

@@ -5,28 +5,33 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(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); }
 var Dep = /*#__PURE__*/function () {
-  // 订阅池
-  function Dep(name) {
+  function Dep() {
     _classCallCheck(this, Dep);
-    this.subs = []; //该事件下被订阅对象的集合
+    this.subs = []; // 存放所有订阅者
   }
+  // 添加订阅者
   _createClass(Dep, [{
-    key: "defined",
-    value: function defined(watch) {
-      this.subs.push(watch);
+    key: "addSub",
+    value: function addSub(watch) {
+      if (watch && this.subs.indexOf(watch) < 0) {
+        this.subs.push(watch);
+      }
     }
+    // 移除订阅者
+  }, {
+    key: "removeSub",
+    value: function removeSub(watch) {
+      var index = this.subs.indexOf(watch);
+      if (index > -1) {
+        this.subs.splice(index, 1);
+      }
+    }
+    // 通知所有订阅者
   }, {
     key: "notify",
     value: function notify() {
-      //通知订阅者有变化
-      this.subs.forEach(function (e, i) {
-        if (typeof e.update === 'function') {
-          try {
-            e.update.apply(e); //触发订阅者更新函数
-          } catch (err) {
-            console.error(err);
-          }
-        }
+      this.subs.forEach(function (sub) {
+        return sub.update();
       });
     }
   }]);
@@ -35,49 +40,44 @@ var Dep = /*#__PURE__*/function () {
 var Watch = /*#__PURE__*/function () {
   function Watch(name, fn) {
     _classCallCheck(this, Watch);
-    this.name = name; //订阅消息的名称
-    this.callBack = fn; //订阅消息发送改变时->订阅者执行的回调函数
+    this.name = name;
+    this.callBack = fn;
   }
   _createClass(Watch, [{
-    key: "add",
-    value: function add(dep) {
-      //将订阅者放入dep订阅池
-      dep.subs.push(this);
-    }
-  }, {
     key: "update",
     value: function update() {
-      //将订阅者更新方法
-      var cb = this.callBack; //赋值为了不改变函数内调用的this
-      cb(this.name);
+      if (typeof this.callBack === 'function') {
+        this.callBack(this.name);
+      }
     }
   }]);
   return Watch;
 }();
-function addMethod() {
-  var historyDep = new Dep();
-  return function (name) {
-    if (name === 'historychange') {
-      return function (name, fn) {
-        var event = new Watch(name, fn);
-        historyDep.defined(event);
-      };
-    } else if (name === 'pushState') {
-      var method = history[name];
-      return function () {
-        method.apply(history, arguments);
-        historyDep.notify();
-      };
-    } else if (name === 'replaceState') {
-      var _method = history[name];
-      return function () {
-        _method.apply(history, arguments);
-        historyDep.notify();
-      };
+var historyDep = new Dep(); // 单例订阅池
+
+// 修改history方法
+var modifyHistoryMethod = function modifyHistoryMethod(methodName) {
+  var original = history[methodName];
+  history[methodName] = function () {
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
     }
+    var result = original.apply(this, args);
+    historyDep.notify(); // 通知变动
+    return result;
+  };
+};
+
+// 添加订阅者
+window.addHistoryListener = function (name, fn) {
+  var watcher = new Watch(name, fn);
+  historyDep.addSub(watcher);
+  // 返回取消订阅的函数
+  return function removeHistoryListener() {
+    historyDep.removeSub(watcher);
   };
-}
-var addHistoryMethod = new addMethod();
-window.addHistoryListener = addHistoryMethod('historychange');
-history.pushState = addHistoryMethod('pushState');
-history.replaceState = addHistoryMethod('replaceState');
+};
+
+// 修改pushState和replaceState以便通知订阅者
+modifyHistoryMethod('pushState');
+modifyHistoryMethod('replaceState');

package/lib/ErrorBoundary/index.js

@@ -56,7 +56,7 @@ var ErrorBoundary = /*#__PURE__*/function (_React$PureComponent) {
   _createClass(ErrorBoundary, [{
     key: "componentDidMount",
     value: function componentDidMount() {
-      window.addHistoryListener('history', this.historyChange);
+      this.removeListener = window.addHistoryListener('history', this.historyChange);
       window.addEventListener('hashchange', this.historyChange);
       this.timer = setTimeout(function () {
         localStorage.setItem('ChunkLoadError', '');
@@ -65,8 +65,9 @@ var ErrorBoundary = /*#__PURE__*/function (_React$PureComponent) {
   }, {
     key: "componentWillUnmount",
     value: function componentWillUnmount() {
-      window.removeEventListener('history', this.historyChange);
+      this.removeListener();
       window.removeEventListener('hashchange', this.historyChange);
+      clearTimeout(this.timer);
     }
   }, {
     key: "componentDidCatch",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chaoswise/ui",
-  "version": "2.5.4",
+  "version": "2.5.5",
   "description": "公共UI库",
   "keywords": [
     "ui",
@@ -146,5 +146,6 @@
   "publishConfig": {
     "access": "public"
   },
-  "license": "MIT"
+  "license": "MIT",
+  "gitHead": "46b2853aff3fc06cda3a575fcf49dc688b547551"
 }