wargerm 0.2.26 → 0.2.30

package/README.zh-CN.md

@@ -1,40 +1,40 @@
-<!--
- * @Author: lijin
- * @Date: 2021-10-18 15:22:28
- * @LastEditTime: 2021-11-05 09:25:52
- * @LastEditors: lijin
- * @Description:
- * @FilePath: \wargerm\README.zh-CN.md
- * 可以输入预定的版权声明、个性签名、空行等
--->
-
-## 📒 目录介绍
-
-```
-├── docs                   文档存放路径
-│   ├── index.md           首页展示
-│   └── **.**              网站目录文档
-├── src                    组件主目录
-│   ├── index.ts           组件注册
-│   └── Foo                组件开发
-├── .eslintrc.js           eslint 配置
-├── .fatherrc.ts           father 配置
-├── .umirc.ts              dumi 配置
-└── tsconfig.json          typescript 配置
-```
-
-其余文件可自行查阅了解。
-
-## 🤖 命令介绍
-
-| 名称                    | 描述           | 备注                          |
-| ----------------------- | -------------- | ----------------------------- |
-| `npm run dev`           | 项目启动       | -                             |
-| `npm run test`          | 组件测试       | -                             |
-| `npm run test:coverage` | 代码覆盖率查看 | -                             |
-| `npm run prettier`      | 代码美化       | -                             |
-| `npm run build`         | 组件打包       | -                             |
-| `npm run release`       | 组件打包发布   | -                             |
-| `npm run docs:build`    | 文档打包       | -                             |
-| `npm run docs:deploy`   | 文档发布       | 这里默认是使用了 GitHub Pages |
-| `npm run deploy`        | 文档打包发布   | -                             |
+<!--
+ * @Author: lijin
+ * @Date: 2021-10-18 15:22:28
+ * @LastEditTime: 2021-11-05 09:25:52
+ * @LastEditors: lijin
+ * @Description:
+ * @FilePath: \wargerm\README.zh-CN.md
+ * 可以输入预定的版权声明、个性签名、空行等
+-->
+
+## 📒 目录介绍
+
+```
+├── docs                   文档存放路径
+│   ├── index.md           首页展示
+│   └── **.**              网站目录文档
+├── src                    组件主目录
+│   ├── index.ts           组件注册
+│   └── Foo                组件开发
+├── .eslintrc.js           eslint 配置
+├── .fatherrc.ts           father 配置
+├── .umirc.ts              dumi 配置
+└── tsconfig.json          typescript 配置
+```
+
+其余文件可自行查阅了解。
+
+## 🤖 命令介绍
+
+| 名称                    | 描述           | 备注                          |
+| ----------------------- | -------------- | ----------------------------- |
+| `npm run dev`           | 项目启动       | -                             |
+| `npm run test`          | 组件测试       | -                             |
+| `npm run test:coverage` | 代码覆盖率查看 | -                             |
+| `npm run prettier`      | 代码美化       | -                             |
+| `npm run build`         | 组件打包       | -                             |
+| `npm run release`       | 组件打包发布   | -                             |
+| `npm run docs:build`    | 文档打包       | -                             |
+| `npm run docs:deploy`   | 文档发布       | 这里默认是使用了 GitHub Pages |
+| `npm run deploy`        | 文档打包发布   | -                             |

package/dist/components/WForm/index.d.ts

@@ -39,6 +39,7 @@ export interface Isearch {
     filterType?: 'query' | 'light';
     searchText?: string;
     resetText?: string;
+    hideResetBtn?: boolean;
     submitText?: string;
     hideSubmit?: boolean;
     transform?: (value: any) => any;

package/dist/components/WebsocketHeart/index.d.ts

@@ -0,0 +1,24 @@
+export default class WebsocketHeart {
+    WebSocket: any;
+    url: any;
+    options: any;
+    onopenCB: any;
+    onerrorCB: any;
+    onmessageCB: any;
+    oncloseCB: any;
+    HeartBeat: any;
+    stopTimer: any;
+    websock: any;
+    lockReconnect: any;
+    heartCheck: any;
+    constructor({ WebSocket, url, options, onopen, onerror, onmessage, onclose, HeartBeat, }: any);
+    init: () => void;
+    initWebSocket: () => void;
+    websocketOnopen: () => void;
+    websocketOnerror: (e: any) => void;
+    websocketOnmessage: (e: any) => void;
+    websocketOnclose: (e: string) => void;
+    send: (text: any) => void;
+    reconnect: () => void;
+    heartCheckFun: () => void;
+}

package/dist/index.css

@@ -210,7 +210,7 @@
   justify-content: center;
   position: relative;
   z-index: 2;
-  height: 32px;
+  min-height: 32px;
 }
 .container .tbody {
   overflow: auto;
@@ -220,7 +220,7 @@
 .container .tbody .tr {
   padding-left: 6px;
   width: 100%;
-  height: 32px;
+  min-height: 32px;
   display: flex;
   margin-bottom: 17px;
   position: relative;
@@ -426,7 +426,7 @@
   justify-content: center;
   position: relative;
   z-index: 2;
-  height: 32px;
+  min-height: 32px;
 }
 [data-prefers-color='light'] .container .tbody {
   overflow: auto;
@@ -436,7 +436,7 @@
 [data-prefers-color='light'] .container .tbody .tr {
   padding-left: 6px;
   width: 100%;
-  height: 32px;
+  min-height: 32px;
   display: flex;
   margin-bottom: 17px;
   position: relative;
@@ -515,12 +515,12 @@
   margin-top: 8px;
 }
 .w-frame-box-table.container .tbody .frame {
-  height: 28px;
+  min-height: 28px;
   margin-bottom: 8px;
   border: none;
 }
 .w-frame-box-table.container .tbody .frame .tr {
-  height: 28px;
+  min-height: 28px;
   margin-bottom: 0;
   background: rgba(16, 97, 139, 0.1);
 }
@@ -1780,7 +1780,6 @@ button.swiper-pagination-bullet {
 
 .frame {
   width: 40px;
-  height: 40px;
   background: rgba(15, 72, 114, 0.1);
   border: 1px solid rgba(156, 208, 239, 0.4);
   position: relative;

package/dist/index.d.ts

@@ -23,3 +23,4 @@ export { default as Modal } from './components/Modal';
 export { default as ModalForm } from './components/ModalForm';
 export { default as TabelCard } from './components/TabelCard';
 export { default as Cascader } from './components/Cascader';
+export { default as WebsocketHeart } from './components/WebsocketHeart';

package/dist/index.esm.css

@@ -210,7 +210,7 @@
   justify-content: center;
   position: relative;
   z-index: 2;
-  height: 32px;
+  min-height: 32px;
 }
 .container .tbody {
   overflow: auto;
@@ -220,7 +220,7 @@
 .container .tbody .tr {
   padding-left: 6px;
   width: 100%;
-  height: 32px;
+  min-height: 32px;
   display: flex;
   margin-bottom: 17px;
   position: relative;
@@ -426,7 +426,7 @@
   justify-content: center;
   position: relative;
   z-index: 2;
-  height: 32px;
+  min-height: 32px;
 }
 [data-prefers-color='light'] .container .tbody {
   overflow: auto;
@@ -436,7 +436,7 @@
 [data-prefers-color='light'] .container .tbody .tr {
   padding-left: 6px;
   width: 100%;
-  height: 32px;
+  min-height: 32px;
   display: flex;
   margin-bottom: 17px;
   position: relative;
@@ -515,12 +515,12 @@
   margin-top: 8px;
 }
 .w-frame-box-table.container .tbody .frame {
-  height: 28px;
+  min-height: 28px;
   margin-bottom: 8px;
   border: none;
 }
 .w-frame-box-table.container .tbody .frame .tr {
-  height: 28px;
+  min-height: 28px;
   margin-bottom: 0;
   background: rgba(16, 97, 139, 0.1);
 }
@@ -1780,7 +1780,6 @@ button.swiper-pagination-bullet {
 
 .frame {
   width: 40px;
-  height: 40px;
   background: rgba(15, 72, 114, 0.1);
   border: 1px solid rgba(156, 208, 239, 0.4);
   position: relative;

package/dist/index.esm.js

@@ -56,14 +56,9 @@ function ownKeys(object, enumerableOnly) {
 
   if (Object.getOwnPropertySymbols) {
     var symbols = Object.getOwnPropertySymbols(object);
-
-    if (enumerableOnly) {
-      symbols = symbols.filter(function (sym) {
-        return Object.getOwnPropertyDescriptor(object, sym).enumerable;
-      });
-    }
-
-    keys.push.apply(keys, symbols);
+    enumerableOnly && (symbols = symbols.filter(function (sym) {
+      return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+    })), keys.push.apply(keys, symbols);
   }
 
   return keys;
@@ -71,19 +66,12 @@ function ownKeys(object, enumerableOnly) {
 
 function _objectSpread2(target) {
   for (var i = 1; i < arguments.length; i++) {
-    var source = arguments[i] != null ? arguments[i] : {};
-
-    if (i % 2) {
-      ownKeys(Object(source), true).forEach(function (key) {
-        _defineProperty(target, key, source[key]);
-      });
-    } else if (Object.getOwnPropertyDescriptors) {
-      Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
-    } else {
-      ownKeys(Object(source)).forEach(function (key) {
-        Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
-      });
-    }
+    var source = null != arguments[i] ? arguments[i] : {};
+    i % 2 ? ownKeys(Object(source), !0).forEach(function (key) {
+      _defineProperty(target, key, source[key]);
+    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) {
+      Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+    });
   }
 
   return target;
@@ -92,17 +80,11 @@ function _objectSpread2(target) {
 function _typeof(obj) {
   "@babel/helpers - typeof";
 
-  if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") {
-    _typeof = function (obj) {
-      return typeof obj;
-    };
-  } else {
-    _typeof = function (obj) {
-      return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
-    };
-  }
-
-  return _typeof(obj);
+  return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) {
+    return typeof obj;
+  } : function (obj) {
+    return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
+  }, _typeof(obj);
 }
 
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
@@ -160,6 +142,9 @@ function _defineProperties(target, props) {
 function _createClass(Constructor, protoProps, staticProps) {
   if (protoProps) _defineProperties(Constructor.prototype, protoProps);
   if (staticProps) _defineProperties(Constructor, staticProps);
+  Object.defineProperty(Constructor, "prototype", {
+    writable: false
+  });
   return Constructor;
 }
 
@@ -201,12 +186,15 @@ function _inherits(subClass, superClass) {
     throw new TypeError("Super expression must either be null or a function");
   }
 
-  subClass.prototype = Object.create(superClass && superClass.prototype, {
-    constructor: {
-      value: subClass,
-      writable: true,
-      configurable: true
-    }
+  Object.defineProperty(subClass, "prototype", {
+    value: Object.create(superClass && superClass.prototype, {
+      constructor: {
+        value: subClass,
+        writable: true,
+        configurable: true
+      }
+    }),
+    writable: false
   });
   if (superClass) _setPrototypeOf(subClass, superClass);
 }
@@ -8795,7 +8783,8 @@ var WForm = function WForm(props, ref) {
   });
   return /*#__PURE__*/React.createElement(_Form, _objectSpread2({
     style: {
-      marginBottom: '20px'
+      marginBottom: '20px',
+      width: '100%'
     },
     onFinish: handleSearch,
     onValuesChange: function onValuesChange(changedValues, allValues) {
@@ -8803,9 +8792,7 @@ var WForm = function WForm(props, ref) {
       setchangedValues(changedValues);
     },
     form: form
-  }, extraProps), /*#__PURE__*/React.createElement(_Row, null, filterForm), /*#__PURE__*/React.createElement(_Row, null, filterExtraColumnsForm), search && search.hideSubmit ? null : /*#__PURE__*/React.createElement(_Row, {
-    justify: "end"
-  }, /*#__PURE__*/React.createElement(_Col, {
+  }, extraProps), /*#__PURE__*/React.createElement(_Row, null, filterForm, filterExtraColumnsForm, search && search.hideSubmit ? null : /*#__PURE__*/React.createElement(_Col, {
     style: {
       paddingLeft: '12px',
       paddingRight: '12px'
@@ -8821,14 +8808,14 @@ var WForm = function WForm(props, ref) {
     },
     htmlType: "submit",
     icon: /*#__PURE__*/React.createElement(SearchOutlined, null)
-  }, search && search.searchText ? search.searchText : '提交'), /*#__PURE__*/React.createElement(WButton, {
+  }, search && search.searchText ? search.searchText : '提交')].concat(_toConsumableArray(search.hideResetBtn ? [] : [/*#__PURE__*/React.createElement(WButton, {
     type: "primary",
     style: {
       marginRight: '20px'
     },
     onClick: handleRest,
     icon: /*#__PURE__*/React.createElement(ReloadOutlined, null)
-  }, search && search.resetText ? search.resetText : '重置')]), !search ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(WButton, {
+  }, search && search.resetText ? search.resetText : '重置')]))), !search ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(WButton, {
     type: "primary",
     style: {
       marginRight: '20px'
@@ -8849,14 +8836,14 @@ var WForm = function WForm(props, ref) {
     },
     htmlType: "submit",
     icon: /*#__PURE__*/React.createElement(SearchOutlined, null)
-  }, "\u63D0\u4EA4"), /*#__PURE__*/React.createElement(WButton, {
+  }, search && search.searchText ? search.searchText : '提交'), search.hideResetBtn ? null : /*#__PURE__*/React.createElement(WButton, {
     type: "primary",
     style: {
       marginRight: '20px'
     },
     icon: /*#__PURE__*/React.createElement(ReloadOutlined, null),
     onClick: handleRest
-  }, "\u91CD\u7F6E")) : null)))));
+  }, search && search.resetText ? search.resetText : '重置')) : null)))));
 };
 
 var WForm$1 = /*#__PURE__*/React.forwardRef(WForm);
@@ -10340,14 +10327,9 @@ function ownKeys$1(object, enumerableOnly) {
 
   if (Object.getOwnPropertySymbols) {
     var symbols = Object.getOwnPropertySymbols(object);
-
-    if (enumerableOnly) {
-      symbols = symbols.filter(function (sym) {
-        return Object.getOwnPropertyDescriptor(object, sym).enumerable;
-      });
-    }
-
-    keys.push.apply(keys, symbols);
+    enumerableOnly && (symbols = symbols.filter(function (sym) {
+      return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+    })), keys.push.apply(keys, symbols);
   }
 
   return keys;
@@ -10355,19 +10337,12 @@ function ownKeys$1(object, enumerableOnly) {
 
 function _objectSpread2$1(target) {
   for (var i = 1; i < arguments.length; i++) {
-    var source = arguments[i] != null ? arguments[i] : {};
-
-    if (i % 2) {
-      ownKeys$1(Object(source), true).forEach(function (key) {
-        _defineProperty$1(target, key, source[key]);
-      });
-    } else if (Object.getOwnPropertyDescriptors) {
-      Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
-    } else {
-      ownKeys$1(Object(source)).forEach(function (key) {
-        Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
-      });
-    }
+    var source = null != arguments[i] ? arguments[i] : {};
+    i % 2 ? ownKeys$1(Object(source), !0).forEach(function (key) {
+      _defineProperty$1(target, key, source[key]);
+    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$1(Object(source)).forEach(function (key) {
+      Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+    });
   }
 
   return target;
@@ -11524,4 +11499,160 @@ var TabelCard = function TabelCard(props, ref) {
 
 var index$1 = /*#__PURE__*/React.forwardRef(TabelCard);
 
-export { Index$9 as AutoScroll, Index$b as Breadcrumb, WButton as Button, Index$c as Card, WCascader as Cascader, Index$4 as Checkbox, Index$8 as CountUp, Index$2 as DatePicker, index as IconFont, Index as Input, WInputNumber as InputNumber, Modal, ModalForm$1 as ModalForm, Index$7 as Number, NumericInput, Index$3 as Radio, Index$1 as Select, Index$a as Swiper, WSwitch as Switch, index$1 as TabelCard, Table, Index$5 as TreeSelect, Index$6 as WDatePicker, WForm$1 as WForm };
+var WebsocketHeart = /*#__PURE__*/_createClass(function WebsocketHeart(_ref) {
+  var _this = this;
+
+  var WebSocket = _ref.WebSocket,
+      url = _ref.url,
+      options = _ref.options,
+      onopen = _ref.onopen,
+      onerror = _ref.onerror,
+      onmessage = _ref.onmessage,
+      onclose = _ref.onclose,
+      HeartBeat = _ref.HeartBeat;
+
+  _classCallCheck(this, WebsocketHeart);
+
+  this.WebSocket = void 0;
+  this.url = void 0;
+  this.options = void 0;
+  this.onopenCB = void 0;
+  this.onerrorCB = void 0;
+  this.onmessageCB = void 0;
+  this.oncloseCB = void 0;
+  this.HeartBeat = void 0;
+  this.stopTimer = void 0;
+  this.websock = void 0;
+  this.lockReconnect = void 0;
+  this.heartCheck = void 0;
+
+  this.init = function () {
+    _this.initWebSocket();
+
+    _this.heartCheckFun();
+  };
+
+  this.initWebSocket = function () {
+    _this.websock = new _this.WebSocket(_this.url, _this.options);
+
+    try {
+      if ('WebSocket' in window) {
+        _this.websock.onopen = _this.websocketOnopen;
+        _this.websock.onerror = _this.websocketOnerror;
+        _this.websock.onmessage = _this.websocketOnmessage;
+        _this.websock.onclose = _this.websocketOnclose;
+      }
+    } catch (error) {
+      _this.websock.on('open', _this.websocketOnopen);
+
+      _this.websock.on('error', _this.websocketOnerror);
+
+      _this.websock.on('close', _this.websocketOnclose);
+
+      _this.websock.on('message', _this.websocketOnmessage);
+    }
+  };
+
+  this.websocketOnopen = function () {
+    console.log('WebSocket连接成功');
+
+    _this.onopenCB(); //心跳检测重置
+
+
+    _this.heartCheck.reset().start();
+  };
+
+  this.websocketOnerror = function (e) {
+    console.log('WebSocket连接发生错误', e);
+
+    _this.onerrorCB(e);
+
+    _this.reconnect();
+  };
+
+  this.websocketOnmessage = function (e) {
+    console.log('-----接收消息-------', e); // const data = e.data    //解析对象
+    // To handle
+
+    _this.onmessageCB(e); //心跳检测重置
+
+
+    _this.heartCheck.reset().start();
+  };
+
+  this.websocketOnclose = function (e) {
+    _this.oncloseCB(e);
+
+    if (e) {
+      console.log('connection closed (' + e + ')');
+    }
+
+    _this.reconnect();
+  };
+
+  this.send = function (text) {
+    // 数据发送
+    try {
+      _this.websock.send(text);
+    } catch (err) {
+      console.log('send failed (' + err + ')');
+    }
+  };
+
+  this.reconnect = function () {
+    var that = _this;
+    if (that.lockReconnect) return;
+    that.lockReconnect = true; //没连接上会一直重连，设置延迟避免请求过多
+
+    setTimeout(function () {
+      console.info('尝试重连...');
+      that.initWebSocket();
+      that.lockReconnect = false;
+    }, 5000);
+  };
+
+  this.heartCheckFun = function () {
+    var that = _this; //心跳检测,每20s心跳一次
+
+    that.heartCheck = {
+      timeout: 20000,
+      timeoutObj: null,
+      serverTimeoutObj: null,
+      reset: function reset() {
+        clearTimeout(this.timeoutObj); //clearTimeout(this.serverTimeoutObj);
+
+        return this;
+      },
+      start: function start() {
+        this.timeoutObj = setTimeout(function () {
+          //这里发送一个心跳，后端收到后，返回一个心跳消息，
+          //onmessage拿到返回的心跳就说明连接正常
+          that.send(that.HeartBeat);
+          console.info('客户端发送心跳'); //self.serverTimeoutObj = setTimeout(function(){//如果超过一定时间还没重置，说明后端主动断开了
+          //  that.websock.close();//如果onclose会执行reconnect，我们执行ws.close()就行了.如果直接执行reconnect 会触发onclose导致重连两次
+          //}, self.timeout)
+        }, this.timeout);
+      }
+    };
+  };
+
+  this.WebSocket = WebSocket || WebSocket;
+  this.url = url;
+  this.options = options !== null && options !== void 0 ? options : [];
+
+  this.onopenCB = onopen || function () {};
+
+  this.onerrorCB = onerror || function () {};
+
+  this.onmessageCB = onmessage || function () {};
+
+  this.oncloseCB = onclose || function () {};
+
+  this.HeartBeat = HeartBeat || 'HeartBeat';
+  this.stopTimer = false;
+  this.websock = null;
+  this.lockReconnect = false;
+  this.heartCheck = null;
+});
+
+export { Index$9 as AutoScroll, Index$b as Breadcrumb, WButton as Button, Index$c as Card, WCascader as Cascader, Index$4 as Checkbox, Index$8 as CountUp, Index$2 as DatePicker, index as IconFont, Index as Input, WInputNumber as InputNumber, Modal, ModalForm$1 as ModalForm, Index$7 as Number, NumericInput, Index$3 as Radio, Index$1 as Select, Index$a as Swiper, WSwitch as Switch, index$1 as TabelCard, Table, Index$5 as TreeSelect, Index$6 as WDatePicker, WForm$1 as WForm, WebsocketHeart };

package/dist/index.js

@@ -90,14 +90,9 @@ function ownKeys(object, enumerableOnly) {
 
   if (Object.getOwnPropertySymbols) {
     var symbols = Object.getOwnPropertySymbols(object);
-
-    if (enumerableOnly) {
-      symbols = symbols.filter(function (sym) {
-        return Object.getOwnPropertyDescriptor(object, sym).enumerable;
-      });
-    }
-
-    keys.push.apply(keys, symbols);
+    enumerableOnly && (symbols = symbols.filter(function (sym) {
+      return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+    })), keys.push.apply(keys, symbols);
   }
 
   return keys;
@@ -105,19 +100,12 @@ function ownKeys(object, enumerableOnly) {
 
 function _objectSpread2(target) {
   for (var i = 1; i < arguments.length; i++) {
-    var source = arguments[i] != null ? arguments[i] : {};
-
-    if (i % 2) {
-      ownKeys(Object(source), true).forEach(function (key) {
-        _defineProperty(target, key, source[key]);
-      });
-    } else if (Object.getOwnPropertyDescriptors) {
-      Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
-    } else {
-      ownKeys(Object(source)).forEach(function (key) {
-        Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
-      });
-    }
+    var source = null != arguments[i] ? arguments[i] : {};
+    i % 2 ? ownKeys(Object(source), !0).forEach(function (key) {
+      _defineProperty(target, key, source[key]);
+    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) {
+      Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+    });
   }
 
   return target;
@@ -126,17 +114,11 @@ function _objectSpread2(target) {
 function _typeof(obj) {
   "@babel/helpers - typeof";
 
-  if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") {
-    _typeof = function (obj) {
-      return typeof obj;
-    };
-  } else {
-    _typeof = function (obj) {
-      return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
-    };
-  }
-
-  return _typeof(obj);
+  return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) {
+    return typeof obj;
+  } : function (obj) {
+    return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
+  }, _typeof(obj);
 }
 
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
@@ -194,6 +176,9 @@ function _defineProperties(target, props) {
 function _createClass(Constructor, protoProps, staticProps) {
   if (protoProps) _defineProperties(Constructor.prototype, protoProps);
   if (staticProps) _defineProperties(Constructor, staticProps);
+  Object.defineProperty(Constructor, "prototype", {
+    writable: false
+  });
   return Constructor;
 }
 
@@ -235,12 +220,15 @@ function _inherits(subClass, superClass) {
     throw new TypeError("Super expression must either be null or a function");
   }
 
-  subClass.prototype = Object.create(superClass && superClass.prototype, {
-    constructor: {
-      value: subClass,
-      writable: true,
-      configurable: true
-    }
+  Object.defineProperty(subClass, "prototype", {
+    value: Object.create(superClass && superClass.prototype, {
+      constructor: {
+        value: subClass,
+        writable: true,
+        configurable: true
+      }
+    }),
+    writable: false
   });
   if (superClass) _setPrototypeOf(subClass, superClass);
 }
@@ -8829,7 +8817,8 @@ var WForm = function WForm(props, ref) {
   });
   return /*#__PURE__*/React__default['default'].createElement(_Form__default['default'], _objectSpread2({
     style: {
-      marginBottom: '20px'
+      marginBottom: '20px',
+      width: '100%'
     },
     onFinish: handleSearch,
     onValuesChange: function onValuesChange(changedValues, allValues) {
@@ -8837,9 +8826,7 @@ var WForm = function WForm(props, ref) {
       setchangedValues(changedValues);
     },
     form: form
-  }, extraProps), /*#__PURE__*/React__default['default'].createElement(_Row__default['default'], null, filterForm), /*#__PURE__*/React__default['default'].createElement(_Row__default['default'], null, filterExtraColumnsForm), search && search.hideSubmit ? null : /*#__PURE__*/React__default['default'].createElement(_Row__default['default'], {
-    justify: "end"
-  }, /*#__PURE__*/React__default['default'].createElement(_Col__default['default'], {
+  }, extraProps), /*#__PURE__*/React__default['default'].createElement(_Row__default['default'], null, filterForm, filterExtraColumnsForm, search && search.hideSubmit ? null : /*#__PURE__*/React__default['default'].createElement(_Col__default['default'], {
     style: {
       paddingLeft: '12px',
       paddingRight: '12px'
@@ -8855,14 +8842,14 @@ var WForm = function WForm(props, ref) {
     },
     htmlType: "submit",
     icon: /*#__PURE__*/React__default['default'].createElement(icons.SearchOutlined, null)
-  }, search && search.searchText ? search.searchText : '提交'), /*#__PURE__*/React__default['default'].createElement(WButton, {
+  }, search && search.searchText ? search.searchText : '提交')].concat(_toConsumableArray(search.hideResetBtn ? [] : [/*#__PURE__*/React__default['default'].createElement(WButton, {
     type: "primary",
     style: {
       marginRight: '20px'
     },
     onClick: handleRest,
     icon: /*#__PURE__*/React__default['default'].createElement(icons.ReloadOutlined, null)
-  }, search && search.resetText ? search.resetText : '重置')]), !search ? /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(WButton, {
+  }, search && search.resetText ? search.resetText : '重置')]))), !search ? /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(WButton, {
     type: "primary",
     style: {
       marginRight: '20px'
@@ -8883,14 +8870,14 @@ var WForm = function WForm(props, ref) {
     },
     htmlType: "submit",
     icon: /*#__PURE__*/React__default['default'].createElement(icons.SearchOutlined, null)
-  }, "\u63D0\u4EA4"), /*#__PURE__*/React__default['default'].createElement(WButton, {
+  }, search && search.searchText ? search.searchText : '提交'), search.hideResetBtn ? null : /*#__PURE__*/React__default['default'].createElement(WButton, {
     type: "primary",
     style: {
       marginRight: '20px'
     },
     icon: /*#__PURE__*/React__default['default'].createElement(icons.ReloadOutlined, null),
     onClick: handleRest
-  }, "\u91CD\u7F6E")) : null)))));
+  }, search && search.resetText ? search.resetText : '重置')) : null)))));
 };
 
 var WForm$1 = /*#__PURE__*/React__default['default'].forwardRef(WForm);
@@ -10374,14 +10361,9 @@ function ownKeys$1(object, enumerableOnly) {
 
   if (Object.getOwnPropertySymbols) {
     var symbols = Object.getOwnPropertySymbols(object);
-
-    if (enumerableOnly) {
-      symbols = symbols.filter(function (sym) {
-        return Object.getOwnPropertyDescriptor(object, sym).enumerable;
-      });
-    }
-
-    keys.push.apply(keys, symbols);
+    enumerableOnly && (symbols = symbols.filter(function (sym) {
+      return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+    })), keys.push.apply(keys, symbols);
   }
 
   return keys;
@@ -10389,19 +10371,12 @@ function ownKeys$1(object, enumerableOnly) {
 
 function _objectSpread2$1(target) {
   for (var i = 1; i < arguments.length; i++) {
-    var source = arguments[i] != null ? arguments[i] : {};
-
-    if (i % 2) {
-      ownKeys$1(Object(source), true).forEach(function (key) {
-        _defineProperty$1(target, key, source[key]);
-      });
-    } else if (Object.getOwnPropertyDescriptors) {
-      Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
-    } else {
-      ownKeys$1(Object(source)).forEach(function (key) {
-        Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
-      });
-    }
+    var source = null != arguments[i] ? arguments[i] : {};
+    i % 2 ? ownKeys$1(Object(source), !0).forEach(function (key) {
+      _defineProperty$1(target, key, source[key]);
+    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$1(Object(source)).forEach(function (key) {
+      Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+    });
   }
 
   return target;
@@ -11558,6 +11533,162 @@ var TabelCard = function TabelCard(props, ref) {
 
 var index$1 = /*#__PURE__*/React__default['default'].forwardRef(TabelCard);
 
+var WebsocketHeart = /*#__PURE__*/_createClass(function WebsocketHeart(_ref) {
+  var _this = this;
+
+  var WebSocket = _ref.WebSocket,
+      url = _ref.url,
+      options = _ref.options,
+      onopen = _ref.onopen,
+      onerror = _ref.onerror,
+      onmessage = _ref.onmessage,
+      onclose = _ref.onclose,
+      HeartBeat = _ref.HeartBeat;
+
+  _classCallCheck(this, WebsocketHeart);
+
+  this.WebSocket = void 0;
+  this.url = void 0;
+  this.options = void 0;
+  this.onopenCB = void 0;
+  this.onerrorCB = void 0;
+  this.onmessageCB = void 0;
+  this.oncloseCB = void 0;
+  this.HeartBeat = void 0;
+  this.stopTimer = void 0;
+  this.websock = void 0;
+  this.lockReconnect = void 0;
+  this.heartCheck = void 0;
+
+  this.init = function () {
+    _this.initWebSocket();
+
+    _this.heartCheckFun();
+  };
+
+  this.initWebSocket = function () {
+    _this.websock = new _this.WebSocket(_this.url, _this.options);
+
+    try {
+      if ('WebSocket' in window) {
+        _this.websock.onopen = _this.websocketOnopen;
+        _this.websock.onerror = _this.websocketOnerror;
+        _this.websock.onmessage = _this.websocketOnmessage;
+        _this.websock.onclose = _this.websocketOnclose;
+      }
+    } catch (error) {
+      _this.websock.on('open', _this.websocketOnopen);
+
+      _this.websock.on('error', _this.websocketOnerror);
+
+      _this.websock.on('close', _this.websocketOnclose);
+
+      _this.websock.on('message', _this.websocketOnmessage);
+    }
+  };
+
+  this.websocketOnopen = function () {
+    console.log('WebSocket连接成功');
+
+    _this.onopenCB(); //心跳检测重置
+
+
+    _this.heartCheck.reset().start();
+  };
+
+  this.websocketOnerror = function (e) {
+    console.log('WebSocket连接发生错误', e);
+
+    _this.onerrorCB(e);
+
+    _this.reconnect();
+  };
+
+  this.websocketOnmessage = function (e) {
+    console.log('-----接收消息-------', e); // const data = e.data    //解析对象
+    // To handle
+
+    _this.onmessageCB(e); //心跳检测重置
+
+
+    _this.heartCheck.reset().start();
+  };
+
+  this.websocketOnclose = function (e) {
+    _this.oncloseCB(e);
+
+    if (e) {
+      console.log('connection closed (' + e + ')');
+    }
+
+    _this.reconnect();
+  };
+
+  this.send = function (text) {
+    // 数据发送
+    try {
+      _this.websock.send(text);
+    } catch (err) {
+      console.log('send failed (' + err + ')');
+    }
+  };
+
+  this.reconnect = function () {
+    var that = _this;
+    if (that.lockReconnect) return;
+    that.lockReconnect = true; //没连接上会一直重连，设置延迟避免请求过多
+
+    setTimeout(function () {
+      console.info('尝试重连...');
+      that.initWebSocket();
+      that.lockReconnect = false;
+    }, 5000);
+  };
+
+  this.heartCheckFun = function () {
+    var that = _this; //心跳检测,每20s心跳一次
+
+    that.heartCheck = {
+      timeout: 20000,
+      timeoutObj: null,
+      serverTimeoutObj: null,
+      reset: function reset() {
+        clearTimeout(this.timeoutObj); //clearTimeout(this.serverTimeoutObj);
+
+        return this;
+      },
+      start: function start() {
+        this.timeoutObj = setTimeout(function () {
+          //这里发送一个心跳，后端收到后，返回一个心跳消息，
+          //onmessage拿到返回的心跳就说明连接正常
+          that.send(that.HeartBeat);
+          console.info('客户端发送心跳'); //self.serverTimeoutObj = setTimeout(function(){//如果超过一定时间还没重置，说明后端主动断开了
+          //  that.websock.close();//如果onclose会执行reconnect，我们执行ws.close()就行了.如果直接执行reconnect 会触发onclose导致重连两次
+          //}, self.timeout)
+        }, this.timeout);
+      }
+    };
+  };
+
+  this.WebSocket = WebSocket || WebSocket;
+  this.url = url;
+  this.options = options !== null && options !== void 0 ? options : [];
+
+  this.onopenCB = onopen || function () {};
+
+  this.onerrorCB = onerror || function () {};
+
+  this.onmessageCB = onmessage || function () {};
+
+  this.oncloseCB = onclose || function () {};
+
+  this.HeartBeat = HeartBeat || 'HeartBeat';
+  this.stopTimer = false;
+  this.websock = null;
+  this.lockReconnect = false;
+  this.heartCheck = null;
+});
+
 exports.AutoScroll = Index$9;
 exports.Breadcrumb = Index$b;
 exports.Button = WButton;
@@ -11582,3 +11713,4 @@ exports.Table = Table;
 exports.TreeSelect = Index$5;
 exports.WDatePicker = Index$6;
 exports.WForm = WForm$1;
+exports.WebsocketHeart = WebsocketHeart;

package/dist/utils/websocketHeart.d.ts

@@ -0,0 +1,24 @@
+export default class WebsocketHeart {
+    WebSocket: any;
+    url: any;
+    options: any;
+    onopenCB: any;
+    onerrorCB: any;
+    onmessageCB: any;
+    oncloseCB: any;
+    HeartBeat: any;
+    stopTimer: any;
+    websock: any;
+    lockReconnect: any;
+    heartCheck: any;
+    constructor({ WebSocket, url, options, onopen, onerror, onmessage, onclose, HeartBeat, }: any);
+    init: () => void;
+    initWebSocket: () => void;
+    websocketOnopen: () => void;
+    websocketOnerror: (e: any) => void;
+    websocketOnmessage: (e: any) => void;
+    websocketOnclose: (e: string) => void;
+    send: (text: any) => void;
+    reconnect: () => void;
+    heartCheckFun: () => void;
+}

package/package.json

@@ -1,79 +1,79 @@
-{
-  "private": false,
-  "name": "wargerm",
-  "version": "0.2.26",
-  "scripts": {
-    "dev": "dumi dev",
-    "docs:build": "dumi build",
-    "docs:deploy": "gh-pages -d docs-dist",
-    "build": "father-build",
-    "deploy": "npm run docs:build && npm run docs:deploy",
-    "release": "npm run build && npm publish",
-    "prettier": "prettier --write \"**/*.{js,jsx,tsx,ts,less,md,json}\"",
-    "test": "umi-test",
-    "test:coverage": "umi-test --coverage"
-  },
-  "main": "dist/index.js",
-  "module": "dist/index.esm.js",
-  "unpkg": "dist/index.umd.min.js",
-  "typings": "dist/index.d.ts",
-  "author": "jinly2",
-  "license": "MIT",
-  "keywords": [
-    "React",
-    "Component"
-  ],
-  "gitHooks": {
-    "pre-commit": "lint-staged"
-  },
-  "repository": {
-    "type": "git",
-    "url": "http://code.eblssmart.com/platform/web/wargerm-components.git",
-    "branch": "main"
-  },
-  "files": [
-    "dist",
-    "es",
-    "lib",
-    "index.css"
-  ],
-  "lint-staged": {
-    "*.{js,jsx,less,md,json}": [
-      "prettier --write"
-    ],
-    "*.ts?(x)": [
-      "prettier --parser=typescript --write"
-    ]
-  },
-  "dependencies": {
-    "@ant-design/pro-form": "^1.49.3",
-    "@ant-design/pro-table": "^2.58.1",
-    "animate.css": "^4.1.1",
-    "react-countup": "^6.0.0",
-    "react-dom": "^17.0.2",
-    "swiper": "^6.7.0"
-  },
-  "peerDependencies": {
-    "@ant-design/icons": ">=4.2.0",
-    "antd": ">=4.7.0",
-    "classnames": ">=2.2.0",
-    "lodash": ">=4.0.0",
-    "react": ">=17.0.0"
-  },
-  "devDependencies": {
-    "@ant-design/icons": "^4.6.4",
-    "@types/lodash": "^4.14.173",
-    "@types/react-dom": "^17.0.11",
-    "@umijs/test": "^3.0.5",
-    "antd": "^4.16.13",
-    "babel-plugin-import": "^1.13.3",
-    "classnames": "^2.3.1",
-    "dumi": "^1.1.31",
-    "father-build": "^1.19.1",
-    "gh-pages": "^3.0.0",
-    "lint-staged": "^10.0.7",
-    "prettier": "^1.19.1",
-    "react": "^16.12.0",
-    "yorkie": "^2.0.0"
-  }
-}
+{
+  "private": false,
+  "name": "wargerm",
+  "version": "0.2.30",
+  "scripts": {
+    "dev": "dumi dev",
+    "docs:build": "dumi build",
+    "docs:deploy": "gh-pages -d docs-dist",
+    "build": "father-build",
+    "deploy": "npm run docs:build && npm run docs:deploy",
+    "release": "npm run build && npm publish",
+    "prettier": "prettier --write \"**/*.{js,jsx,tsx,ts,less,md,json}\"",
+    "test": "umi-test",
+    "test:coverage": "umi-test --coverage"
+  },
+  "main": "dist/index.js",
+  "module": "dist/index.esm.js",
+  "unpkg": "dist/index.umd.min.js",
+  "typings": "dist/index.d.ts",
+  "author": "jinly2",
+  "license": "MIT",
+  "keywords": [
+    "React",
+    "Component"
+  ],
+  "gitHooks": {
+    "pre-commit": "lint-staged"
+  },
+  "repository": {
+    "type": "git",
+    "url": "http://code.eblssmart.com/platform/web/wargerm-components.git",
+    "branch": "main"
+  },
+  "files": [
+    "dist",
+    "es",
+    "lib",
+    "index.css"
+  ],
+  "lint-staged": {
+    "*.{js,jsx,less,md,json}": [
+      "prettier --write"
+    ],
+    "*.ts?(x)": [
+      "prettier --parser=typescript --write"
+    ]
+  },
+  "dependencies": {
+    "@ant-design/pro-form": "^1.49.3",
+    "@ant-design/pro-table": "^2.58.1",
+    "animate.css": "^4.1.1",
+    "react-countup": "^6.0.0",
+    "react-dom": "^17.0.2",
+    "swiper": "^6.7.0"
+  },
+  "peerDependencies": {
+    "@ant-design/icons": ">=4.2.0",
+    "antd": ">=4.7.0",
+    "classnames": ">=2.2.0",
+    "lodash": ">=4.0.0",
+    "react": ">=17.0.0"
+  },
+  "devDependencies": {
+    "@ant-design/icons": "^4.6.4",
+    "@types/lodash": "^4.14.173",
+    "@types/react-dom": "^17.0.11",
+    "@umijs/test": "^3.0.5",
+    "antd": "^4.16.13",
+    "babel-plugin-import": "^1.13.3",
+    "classnames": "^2.3.1",
+    "dumi": "^1.1.31",
+    "father-build": "^1.19.1",
+    "gh-pages": "^3.0.0",
+    "lint-staged": "^10.0.7",
+    "prettier": "^1.19.1",
+    "react": "^16.12.0",
+    "yorkie": "^2.0.0"
+  }
+}