wargerm 0.2.40 → 0.2.44

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

@@ -1,6 +1,6 @@
-import React, { MutableRefObject } from 'react';
+import React from 'react';
 import { ReactNode } from 'react';
-import { FormInstance, FormProps } from 'antd';
+import { FormProps } from 'antd';
 interface ColumnProps {
     title: string;
     dataIndex: string;
@@ -96,7 +96,7 @@ declare type Props = {
     rowSelection?: IRowSelection;
     scroll?: Iscroll;
     pagination?: false | Record<string, any>;
-    formRef?: MutableRefObject<FormInstance>;
+    formRef?: any;
     children?: ReactNode;
     form?: FormProps;
     search?: Isearch | false;

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

@@ -19,6 +19,7 @@ export default class WebsocketHeart {
     websocketOnmessage: (e: any) => void;
     websocketOnclose: (e: string) => void;
     send: (text: any) => void;
+    close: () => void;
     reconnect: () => void;
     heartCheckFun: () => void;
 }

package/dist/index.css

@@ -1602,7 +1602,7 @@ button.swiper-pagination-bullet {
   border-image-slice: 63 124 63 124;
   border-image-width: 63px 124px 63px 124px;
   border-image-repeat: stretch stretch;
-  min-width: 400px;
+  min-width: 200px;
   min-height: 100px;
 }
 .card-container .container-in {
@@ -1674,6 +1674,7 @@ button.swiper-pagination-bullet {
 }
 .card-container .container-in .container-in-border .body {
   flex: 1;
+  overflow: hidden;
 }
 .model_container {
   position: absolute;

package/dist/index.esm.css

@@ -1602,7 +1602,7 @@ button.swiper-pagination-bullet {
   border-image-slice: 63 124 63 124;
   border-image-width: 63px 124px 63px 124px;
   border-image-repeat: stretch stretch;
-  min-width: 400px;
+  min-width: 200px;
   min-height: 100px;
 }
 .card-container .container-in {
@@ -1674,6 +1674,7 @@ button.swiper-pagination-bullet {
 }
 .card-container .container-in .container-in-border .body {
   flex: 1;
+  overflow: hidden;
 }
 .model_container {
   position: absolute;

package/dist/index.esm.js

@@ -7809,6 +7809,7 @@ var WForm = function WForm(props, ref) {
   useImperativeHandle(ref, function () {
     return {
       form: form,
+      columnsFields: columnsFields,
       handleSubmit: form.submit,
       handleRest: handleRest,
       resetFields: handleRest,
@@ -7836,6 +7837,7 @@ var WForm = function WForm(props, ref) {
       display: 'flex'
     }
   }, search && search.optionRender && search.optionRender(search, props.form, [/*#__PURE__*/React.createElement(WButton, {
+    key: 'submit',
     type: "primary",
     style: {
       marginRight: '20px'
@@ -7843,6 +7845,7 @@ var WForm = function WForm(props, ref) {
     htmlType: "submit",
     icon: /*#__PURE__*/React.createElement(SearchOutlined, null)
   }, search && search.searchText ? search.searchText : '提交')].concat(_toConsumableArray(search.hideResetBtn ? [] : [/*#__PURE__*/React.createElement(WButton, {
+    key: 'reset',
     type: "primary",
     style: {
       marginRight: '20px'
@@ -7850,6 +7853,7 @@ var WForm = function WForm(props, ref) {
     onClick: handleRest,
     icon: /*#__PURE__*/React.createElement(ReloadOutlined, null)
   }, search && search.resetText ? search.resetText : '重置')]))), !search ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(WButton, {
+    key: 'submit',
     type: "primary",
     style: {
       marginRight: '20px'
@@ -7857,6 +7861,7 @@ var WForm = function WForm(props, ref) {
     htmlType: "submit",
     icon: /*#__PURE__*/React.createElement(SearchOutlined, null)
   }, "\u63D0\u4EA4"), /*#__PURE__*/React.createElement(WButton, {
+    key: 'reset',
     type: "primary",
     style: {
       marginRight: '20px'
@@ -7864,6 +7869,7 @@ var WForm = function WForm(props, ref) {
     icon: /*#__PURE__*/React.createElement(ReloadOutlined, null),
     onClick: handleRest
   }, "\u91CD\u7F6E")) : search && !search.optionRender ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(WButton, {
+    key: 'submit',
     type: "primary",
     style: {
       marginRight: '20px'
@@ -7871,6 +7877,7 @@ var WForm = function WForm(props, ref) {
     htmlType: "submit",
     icon: /*#__PURE__*/React.createElement(SearchOutlined, null)
   }, search && search.searchText ? search.searchText : '提交'), search.hideResetBtn ? null : /*#__PURE__*/React.createElement(WButton, {
+    key: 'reset',
     type: "primary",
     style: {
       marginRight: '20px'
@@ -7884,7 +7891,7 @@ var WForm$1 = /*#__PURE__*/React.forwardRef(WForm);
 
 var _excluded$7 = ["columns", "dataSource", "request", "onLoad", "params", "onSubmit", "rowKey", "onRow", "className", "rowClassName", "rowSelection", "style", "tbodyStyle", "thStyle", "border", "scroll", "pagination", "search", "frameBoxTable", "frameBoxDirection", "formRef"];
 function Table(_ref) {
-  var _classnames2;
+  var _formSearchRef$curren3, _classnames2;
 
   var columns = _ref.columns,
       tableList = _ref.dataSource,
@@ -7958,6 +7965,21 @@ function Table(_ref) {
       formSearch = _useState8[0],
       setFormSearch = _useState8[1];
 
+  var formSearchRef = useRef(null);
+  useEffect(function () {
+    var _formSearchRef$curren;
+
+    if (formSearchRef === null || formSearchRef === void 0 ? void 0 : (_formSearchRef$curren = formSearchRef.current) === null || _formSearchRef$curren === void 0 ? void 0 : _formSearchRef$curren.columnsFields) {
+      var _formSearchRef$curren2;
+
+      if (formRef === null || formRef === void 0 ? void 0 : formRef.current) {
+        formRef.current = formSearchRef === null || formSearchRef === void 0 ? void 0 : formSearchRef.current;
+      }
+
+      setColumnsFields(formSearchRef === null || formSearchRef === void 0 ? void 0 : (_formSearchRef$curren2 = formSearchRef.current) === null || _formSearchRef$curren2 === void 0 ? void 0 : _formSearchRef$curren2.columnsFields);
+    }
+  }, [JSON.stringify(formSearchRef === null || formSearchRef === void 0 ? void 0 : (_formSearchRef$curren3 = formSearchRef.current) === null || _formSearchRef$curren3 === void 0 ? void 0 : _formSearchRef$curren3.columnsFields)]);
+
   var flattenColumns = function flattenColumns(columns) {
     var arr = columns.reduce(function (pre, cur) {
       if (cur.children) {
@@ -8291,7 +8313,7 @@ function Table(_ref) {
   }, /*#__PURE__*/React.createElement("div", {
     className: "form"
   }, search !== false && /*#__PURE__*/React.createElement(WForm$1, {
-    ref: formRef,
+    ref: formSearchRef,
     search: _objectSpread2(_objectSpread2({
       labelWidth: 'auto',
       searchText: '查询',
@@ -10396,9 +10418,9 @@ var WebsocketHeart = /*#__PURE__*/_createClass(function WebsocketHeart(_ref) {
   };
 
   this.websocketOnmessage = function (e) {
-    console.log('-----接收消息-------', e); // const data = e.data    //解析对象
+    // console.log('-----接收消息-------', e);
+    // const data = e.data    //解析对象
     // To handle
-
     _this.onmessageCB(e); //心跳检测重置
 
 
@@ -10424,6 +10446,12 @@ var WebsocketHeart = /*#__PURE__*/_createClass(function WebsocketHeart(_ref) {
     }
   };
 
+  this.close = function () {
+    _this.websock.close();
+
+    _this.lockReconnect = true;
+  };
+
   this.reconnect = function () {
     var that = _this;
     if (that.lockReconnect) return;

package/dist/index.js

@@ -7843,6 +7843,7 @@ var WForm = function WForm(props, ref) {
   React.useImperativeHandle(ref, function () {
     return {
       form: form,
+      columnsFields: columnsFields,
       handleSubmit: form.submit,
       handleRest: handleRest,
       resetFields: handleRest,
@@ -7870,6 +7871,7 @@ var WForm = function WForm(props, ref) {
       display: 'flex'
     }
   }, search && search.optionRender && search.optionRender(search, props.form, [/*#__PURE__*/React__default['default'].createElement(WButton, {
+    key: 'submit',
     type: "primary",
     style: {
       marginRight: '20px'
@@ -7877,6 +7879,7 @@ var WForm = function WForm(props, ref) {
     htmlType: "submit",
     icon: /*#__PURE__*/React__default['default'].createElement(icons.SearchOutlined, null)
   }, search && search.searchText ? search.searchText : '提交')].concat(_toConsumableArray(search.hideResetBtn ? [] : [/*#__PURE__*/React__default['default'].createElement(WButton, {
+    key: 'reset',
     type: "primary",
     style: {
       marginRight: '20px'
@@ -7884,6 +7887,7 @@ var WForm = function WForm(props, ref) {
     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, {
+    key: 'submit',
     type: "primary",
     style: {
       marginRight: '20px'
@@ -7891,6 +7895,7 @@ 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, {
+    key: 'reset',
     type: "primary",
     style: {
       marginRight: '20px'
@@ -7898,6 +7903,7 @@ var WForm = function WForm(props, ref) {
     icon: /*#__PURE__*/React__default['default'].createElement(icons.ReloadOutlined, null),
     onClick: handleRest
   }, "\u91CD\u7F6E")) : search && !search.optionRender ? /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(WButton, {
+    key: 'submit',
     type: "primary",
     style: {
       marginRight: '20px'
@@ -7905,6 +7911,7 @@ var WForm = function WForm(props, ref) {
     htmlType: "submit",
     icon: /*#__PURE__*/React__default['default'].createElement(icons.SearchOutlined, null)
   }, search && search.searchText ? search.searchText : '提交'), search.hideResetBtn ? null : /*#__PURE__*/React__default['default'].createElement(WButton, {
+    key: 'reset',
     type: "primary",
     style: {
       marginRight: '20px'
@@ -7918,7 +7925,7 @@ var WForm$1 = /*#__PURE__*/React__default['default'].forwardRef(WForm);
 
 var _excluded$7 = ["columns", "dataSource", "request", "onLoad", "params", "onSubmit", "rowKey", "onRow", "className", "rowClassName", "rowSelection", "style", "tbodyStyle", "thStyle", "border", "scroll", "pagination", "search", "frameBoxTable", "frameBoxDirection", "formRef"];
 function Table(_ref) {
-  var _classnames2;
+  var _formSearchRef$curren3, _classnames2;
 
   var columns = _ref.columns,
       tableList = _ref.dataSource,
@@ -7992,6 +7999,21 @@ function Table(_ref) {
       formSearch = _useState8[0],
       setFormSearch = _useState8[1];
 
+  var formSearchRef = React.useRef(null);
+  React.useEffect(function () {
+    var _formSearchRef$curren;
+
+    if (formSearchRef === null || formSearchRef === void 0 ? void 0 : (_formSearchRef$curren = formSearchRef.current) === null || _formSearchRef$curren === void 0 ? void 0 : _formSearchRef$curren.columnsFields) {
+      var _formSearchRef$curren2;
+
+      if (formRef === null || formRef === void 0 ? void 0 : formRef.current) {
+        formRef.current = formSearchRef === null || formSearchRef === void 0 ? void 0 : formSearchRef.current;
+      }
+
+      setColumnsFields(formSearchRef === null || formSearchRef === void 0 ? void 0 : (_formSearchRef$curren2 = formSearchRef.current) === null || _formSearchRef$curren2 === void 0 ? void 0 : _formSearchRef$curren2.columnsFields);
+    }
+  }, [JSON.stringify(formSearchRef === null || formSearchRef === void 0 ? void 0 : (_formSearchRef$curren3 = formSearchRef.current) === null || _formSearchRef$curren3 === void 0 ? void 0 : _formSearchRef$curren3.columnsFields)]);
+
   var flattenColumns = function flattenColumns(columns) {
     var arr = columns.reduce(function (pre, cur) {
       if (cur.children) {
@@ -8325,7 +8347,7 @@ function Table(_ref) {
   }, /*#__PURE__*/React__default['default'].createElement("div", {
     className: "form"
   }, search !== false && /*#__PURE__*/React__default['default'].createElement(WForm$1, {
-    ref: formRef,
+    ref: formSearchRef,
     search: _objectSpread2(_objectSpread2({
       labelWidth: 'auto',
       searchText: '查询',
@@ -10430,9 +10452,9 @@ var WebsocketHeart = /*#__PURE__*/_createClass(function WebsocketHeart(_ref) {
   };
 
   this.websocketOnmessage = function (e) {
-    console.log('-----接收消息-------', e); // const data = e.data    //解析对象
+    // console.log('-----接收消息-------', e);
+    // const data = e.data    //解析对象
     // To handle
-
     _this.onmessageCB(e); //心跳检测重置
 
 
@@ -10458,6 +10480,12 @@ var WebsocketHeart = /*#__PURE__*/_createClass(function WebsocketHeart(_ref) {
     }
   };
 
+  this.close = function () {
+    _this.websock.close();
+
+    _this.lockReconnect = true;
+  };
+
   this.reconnect = function () {
     var that = _this;
     if (that.lockReconnect) return;

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "wargerm",
-  "version": "0.2.40",
+  "version": "0.2.44",
   "scripts": {
     "dev": "dumi dev",
     "docs:build": "dumi build",