@zgfe/business-lib 1.1.29-visual.2 → 1.1.29-visual.4

package/es/socket/demo/demo.js

@@ -1,52 +1,152 @@
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
 import { SocketClient } from '@zgfe/business-lib';
-import { notification } from 'antd';
-export default (function () {
+import { Button, Card, Form, Input, notification } from 'antd';
+import styles from './index.less';
+var ChatPanel = function ChatPanel(_ref) {
+  var name = _ref.name,
+    param = _ref.param;
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
     client = _useState2[0],
     setClient = _useState2[1];
+  var _useState3 = useState([]),
+    _useState4 = _slicedToArray(_useState3, 2),
+    history = _useState4[0],
+    setHistory = _useState4[1];
+  var _useState5 = useState(true),
+    _useState6 = _slicedToArray(_useState5, 2),
+    online = _useState6[0],
+    setOnline = _useState6[1];
+  var formRef = useRef();
+  var historyRef = useRef();
   useEffect(function () {
-    setClient(new SocketClient('wss://rt2.zhugeio.com/eventtracking/ws', {
-      id: 'eti8-4ilv-876r-1wr5',
-      origin: 1,
-      appId: '146',
-      programId: 'zgej-3det-9edb-dje3',
-      type: 3,
-      event: 'login',
-      payload: {
-        unionid: 'hjadfhdskji884bdfd',
-        username: 'zhangsan'
-      }
-    }));
+    setClient(new SocketClient('wss://rt2.zhugeio.com/eventtracking/ws', param));
   }, []);
+  useEffect(function () {
+    var _historyRef$current;
+    if (historyRef.current) historyRef.current.scrollTop = (_historyRef$current = historyRef.current) === null || _historyRef$current === void 0 ? void 0 : _historyRef$current.scrollHeight;
+  }, [history]);
   useEffect(function () {
     if (!client) return;
     client.openLog(true);
     client.onConnected(onConnected);
     client.onError(onError);
+    client.onLogin(onLogin);
+    client.on('offline', function () {
+      setHistory(function (list) {
+        return [].concat(_toConsumableArray(list), [{
+          type: 'he',
+          message: '对方已下线'
+        }]);
+      });
+    });
+    client.on('message', function (message) {
+      setHistory(function (list) {
+        return [].concat(_toConsumableArray(list), [{
+          type: 'he',
+          message: message
+        }]);
+      });
+    });
   }, [client]);
   function onConnected() {
     notification.success({
       message: '连接成功'
     });
-    client.emit('init', {
-      msg: '这是初始化信息'
-    });
-    client.on('init', function (data) {
-      console.log('init response', data);
-    });
   }
   function onError() {
     notification.error({
       message: '连接失败'
     });
   }
-  return /*#__PURE__*/React.createElement(React.Fragment, null);
+  function onLogin() {
+    setHistory(function (list) {
+      return [].concat(_toConsumableArray(list), [{
+        type: 'he',
+        message: '登录成功'
+      }]);
+    });
+  }
+  return /*#__PURE__*/React.createElement(Card, {
+    title: name
+  }, /*#__PURE__*/React.createElement("div", {
+    className: styles.history,
+    ref: historyRef
+  }, history.map(function (item, i) {
+    return /*#__PURE__*/React.createElement("div", {
+      className: styles[item.type],
+      key: i
+    }, item.type, ": ", item.message);
+  })), /*#__PURE__*/React.createElement("div", {
+    className: styles.footer
+  }, /*#__PURE__*/React.createElement(Form, {
+    ref: formRef,
+    autoComplete: "off",
+    onFinish: function onFinish(_ref2) {
+      var _formRef$current;
+      var message = _ref2.message;
+      client.emit('message', message);
+      setHistory(function (list) {
+        return [].concat(_toConsumableArray(list), [{
+          type: 'me',
+          message: message
+        }]);
+      });
+      (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.resetFields();
+    }
+  }, /*#__PURE__*/React.createElement(Form.Item, {
+    name: "message"
+  }, /*#__PURE__*/React.createElement(Input, {
+    placeholder: "\u56DE\u8F66\u53D1\u9001\u4FE1\u606F",
+    autoFocus: true
+  })), /*#__PURE__*/React.createElement(Form.Item, null, /*#__PURE__*/React.createElement(Button, {
+    onClick: function onClick() {
+      if (online) {
+        client.close();
+      } else {
+        client.open();
+      }
+      setOnline(!online);
+    }
+  }, online ? '下线' : '上线')))));
+};
+export default (function () {
+  return /*#__PURE__*/React.createElement("div", {
+    className: styles.container
+  }, /*#__PURE__*/React.createElement(ChatPanel, {
+    name: "\u5F20\u4E09",
+    param: {
+      id: 'eti8-4ilv-876r-1wr5',
+      origin: 1,
+      appId: '146',
+      programId: 'zgej-3det-9edb-dje3',
+      type: 3,
+      payload: {
+        unionid: 'hjadfhdskji884bdfd',
+        username: 'zhangsan'
+      }
+    }
+  }), /*#__PURE__*/React.createElement(ChatPanel, {
+    name: "\u674E\u56DB",
+    param: {
+      id: 'ueks-d8d2-njka-8742-2mdd',
+      origin: 3,
+      appId: '146',
+      type: 3,
+      payload: {
+        unionid: 'web-unionid2132',
+        username: 'zhangsan'
+      }
+    }
+  }));
 });

package/es/socket/demo/index.less

@@ -1,4 +1,27 @@
 @import '../../assets/styles/inner.less';
 .container {
+  display: flex;
+  flex-direction: row;
   border: 1px solid red;
+  & > :global(.ant-card) {
+    flex: 1;
+    margin: @margin-md;
+  }
+}
+.history {
+  height: 400px;
+  overflow: auto;
+}
+.he,
+.me {
+  margin-bottom: @margin-sm;
+  padding: @padding-sm;
+  line-height: 24px;
+  background: @background-color-base;
+}
+.he {
+  text-align: left;
+}
+.me {
+  text-align: right;
 }

package/es/socket/index.d.ts

@@ -9,10 +9,11 @@ declare class SocketClient {
     private pingTimer?;
     constructor(url: string, params?: Record<string, any>);
     emit(event: string, payload: SocketClientTypes.Message['data']['payload']): void;
-    on(type: string, handle: SocketClientTypes.Handler): void;
+    on(type: SocketClientTypes.EventType | string, handle: SocketClientTypes.Handler): void;
     onConnected(handle: SocketClientTypes.Handler): void;
     onDisconnected(handle: SocketClientTypes.Handler): void;
     onError(handle: SocketClientTypes.Handler): void;
+    onLogin(handle: SocketClientTypes.Handler): void;
     private _onError;
     private _onClose;
     private _onOpen;

package/es/socket/index.js

@@ -84,6 +84,11 @@ var SocketClient = /*#__PURE__*/function () {
     value: function onError(handle) {
       this.on(SocketClientTypes.EventType.error, handle);
     }
+  }, {
+    key: "onLogin",
+    value: function onLogin(handle) {
+      this.on(SocketClientTypes.EventType.login, handle);
+    }
   }, {
     key: "_onError",
     value: function _onError(_event) {
@@ -125,23 +130,33 @@ var SocketClient = /*#__PURE__*/function () {
   }, {
     key: "onMessage",
     value: function onMessage(event) {
-      var res = JSON.parse(event.data);
-      if (res.type === SocketClientTypes.RequestType.pong) return;
-      var res_ = res.data;
-      try {
-        res_ = JSON.parse(res.data);
-      } catch (e) {
-        this.log('info', '非json响应', res_);
-      }
-      if (res_.type === SocketClientTypes.RequestType.login) {
-        this.log('info', '登录成功');
+      var res_ = JSON.parse(event.data);
+      if (res_.code) {
+        var data = res_.data;
+        if (res_.code === '109001') {
+          var _this$listeners$Socke;
+          (_this$listeners$Socke = this.listeners[SocketClientTypes.EventType.offline]) === null || _this$listeners$Socke === void 0 ? void 0 : _this$listeners$Socke.forEach(function (handle) {
+            handle.call(undefined, res_);
+          });
+          return;
+        }
+        if (data.type === SocketClientTypes.RequestType.login) {
+          var _this$listeners$Socke2;
+          this.log('info', '登录成功');
+          (_this$listeners$Socke2 = this.listeners[SocketClientTypes.EventType.login]) === null || _this$listeners$Socke2 === void 0 ? void 0 : _this$listeners$Socke2.forEach(function (handle) {
+            handle.call(undefined, res_);
+          });
+          return;
+        }
+      } else if (res_.type === SocketClientTypes.RequestType.pong) {
         return;
-      }
-      var data = res_.data;
-      if (this.listeners[data.event]) {
-        this.listeners[data.event].forEach(function (handle) {
-          handle.call(undefined, data.payload);
-        });
+      } else {
+        var _data = res_.data;
+        if (this.listeners[_data.event]) {
+          this.listeners[_data.event].forEach(function (handle) {
+            handle.call(undefined, _data.payload);
+          });
+        }
       }
     }
   }, {

package/es/socket/types.d.ts

@@ -2,7 +2,9 @@ declare namespace SocketClientTypes {
     enum EventType {
         connected = "connected",
         disconnected = "disconnected",
-        error = "error"
+        error = "error",
+        login = "login",
+        offline = "offline"
     }
     enum RequestType {
         common = 0,
@@ -21,7 +23,10 @@ declare namespace SocketClientTypes {
     };
     interface ResponseData {
         code: string;
-        data: Message;
+        data: {
+            type: RequestType;
+            [prop: string]: any;
+        };
     }
     type Handler = (msg?: Message['data']['payload']) => void;
 }

package/es/socket/types.js

@@ -5,6 +5,8 @@ var SocketClientTypes;
     EventType["connected"] = "connected";
     EventType["disconnected"] = "disconnected";
     EventType["error"] = "error";
+    EventType["login"] = "login";
+    EventType["offline"] = "offline";
   })(EventType = SocketClientTypes.EventType || (SocketClientTypes.EventType = {}));
   var RequestType;
   (function (RequestType) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.1.29-visual.2",
+  "version": "1.1.29-visual.4",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -59,5 +59,5 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "4b4aab8d962968da9a435213ac26f8e7d7473262"
+  "gitHead": "b020ab1026aa6a5d412a06f738b6ed6fa4c5ccd3"
 }