wargerm 0.2.43 → 0.3.3

package/dist/index.js

@@ -7923,7 +7923,7 @@ var WForm = function WForm(props, ref) {
 
 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"];
+var _excluded$7 = ["columns", "dataSource", "request", "onLoad", "params", "onSubmit", "rowKey", "onRow", "className", "rowClassName", "rowSelection", "style", "tbodyStyle", "thStyle", "border", "scroll", "pagination", "search", "frameBoxTable", "frameBoxDirection", "formRef", "none"];
 function Table(_ref) {
   var _formSearchRef$curren3, _classnames2;
 
@@ -7953,6 +7953,7 @@ function Table(_ref) {
       _ref$frameBoxDirectio = _ref.frameBoxDirection,
       frameBoxDirection = _ref$frameBoxDirectio === void 0 ? 'out' : _ref$frameBoxDirectio,
       formRef = _ref.formRef,
+      none = _ref.none,
       props = _objectWithoutProperties(_ref, _excluded$7);
 
   var _useState = React.useState(_toConsumableArray((rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRowKeys) || [])),
@@ -8323,7 +8324,7 @@ function Table(_ref) {
         }
       }, _callee);
     }))();
-  }, [params, pageParams, pagination, tableList, formSearch]);
+  }, [params, pageParams, pagination, tableList, formSearch, columns]);
 
   var onFormSubmit = function onFormSubmit(values) {
     onSubmit && onSubmit(values);
@@ -8399,7 +8400,7 @@ function Table(_ref) {
     style: _objectSpread2({
       height: (style === null || style === void 0 ? void 0 : style.height) ? "calc(".concat(style.height, "  - ").concat(52 + (pagination === false ? 0 : 42), "px)") : '200px'
     }, tbodyStyle)
-  }, dataSource.map(function (record, index) {
+  }, dataSource.length > 0 ? dataSource.map(function (record, index) {
     var key = typeof rowKey === 'function' ? record[rowKey(record)] : record[rowKey];
     return frameBoxTable ? /*#__PURE__*/React__default['default'].createElement(FrameBox, {
       key: key,
@@ -8408,7 +8409,15 @@ function Table(_ref) {
         width: '100%'
       }
     }, renderTr(record, index, key)) : renderTr(record, index, key);
-  })), _typeof(pagination) === 'object' && /*#__PURE__*/React__default['default'].createElement(_Pagination__default['default'], _objectSpread2({
+  }) : /*#__PURE__*/React__default['default'].createElement("div", {
+    style: {
+      width: '100%',
+      height: '100%',
+      display: 'flex',
+      justifyContent: 'center',
+      alignItems: 'center'
+    }
+  }, none || '暂无数据')), _typeof(pagination) === 'object' && /*#__PURE__*/React__default['default'].createElement(_Pagination__default['default'], _objectSpread2({
     style: {
       textAlign: 'right',
       marginTop: '10px'
@@ -8606,7 +8615,7 @@ var Index$8 = function Index(props) {
 
 Index$8.defaultProps = {};
 
-var _excluded$a = ["list", "render", "partSize"];
+var _excluded$a = ["list", "render", "none", "partSize"];
 
 function AutoScroll(props) {
   var inner1 = React.useRef();
@@ -8688,83 +8697,90 @@ function AutoScroll(props) {
 var Index$9 = function Index(_ref) {
   var list = _ref.list,
       render = _ref.render,
+      none = _ref.none,
       _ref$partSize = _ref.partSize,
       partSize = _ref$partSize === void 0 ? 4 : _ref$partSize,
       otherProps = _objectWithoutProperties(_ref, _excluded$a);
 
-  {
-    var _useState = React.useState([]),
-        _useState2 = _slicedToArray(_useState, 2),
-        partA = _useState2[0],
-        setPatrA = _useState2[1];
+  var _useState = React.useState([]),
+      _useState2 = _slicedToArray(_useState, 2),
+      partA = _useState2[0],
+      setPatrA = _useState2[1];
 
-    var _useState3 = React.useState([]),
-        _useState4 = _slicedToArray(_useState3, 2),
-        partB = _useState4[0],
-        setPatrB = _useState4[1]; // partA在items中的开始索引
+  var _useState3 = React.useState([]),
+      _useState4 = _slicedToArray(_useState3, 2),
+      partB = _useState4[0],
+      setPatrB = _useState4[1]; // partA在items中的开始索引
 
 
-    var _useState5 = React.useState(0),
-        _useState6 = _slicedToArray(_useState5, 2),
-        partAStartIndex = _useState6[0],
-        setPartAStartIndex = _useState6[1]; // partB在items中的开始索引
+  var _useState5 = React.useState(0),
+      _useState6 = _slicedToArray(_useState5, 2),
+      partAStartIndex = _useState6[0],
+      setPartAStartIndex = _useState6[1]; // partB在items中的开始索引
 
 
-    var _useState7 = React.useState(partSize),
-        _useState8 = _slicedToArray(_useState7, 2),
-        partBStartIndex = _useState8[0],
-        setPartBStartIndex = _useState8[1];
+  var _useState7 = React.useState(partSize),
+      _useState8 = _slicedToArray(_useState7, 2),
+      partBStartIndex = _useState8[0],
+      setPartBStartIndex = _useState8[1];
 
-    var autoRef = React.useRef(); // 当滚动至一半的位置时，修改partAStartIndex
+  var autoRef = React.useRef(); // 当滚动至一半的位置时，修改partAStartIndex
 
-    var handleHalf = function handleHalf() {
-      setPartAStartIndex((partBStartIndex + partSize) % list.length);
-    }; // 当滚动归位时，修改partBStartIndex
+  var handleHalf = function handleHalf() {
+    setPartAStartIndex((partBStartIndex + partSize) % list.length);
+  }; // 当滚动归位时，修改partBStartIndex
 
 
-    var handleComplete = function handleComplete() {
-      setPartBStartIndex((partAStartIndex + partSize) % list.length);
-    };
+  var handleComplete = function handleComplete() {
+    setPartBStartIndex((partAStartIndex + partSize) % list.length);
+  };
 
-    React.useEffect(function () {
-      // partA中的数据
-      if (list.length > partSize) {
-        setPatrA(list);
-      } else {
-        setPatrA(list);
-      } // partB中的数据
+  React.useEffect(function () {
+    // partA中的数据
+    if (list.length > partSize) {
+      setPatrA(list);
+    } else {
+      setPatrA(list);
+    } // partB中的数据
 
 
-      if (list.length > partSize) {
-        setPatrB(list);
-      } else {
-        setPatrB([]);
-      }
+    if (list.length > partSize) {
+      setPatrB(list);
+    } else {
+      setPatrB([]);
+    }
 
-      setTimeout(function () {
-        //手动触发执行滚动
-        if (autoRef.current) {
-          autoRef.current.tryScroll();
-        }
-      }, 0);
-    }, [list]);
-    React.useEffect(function () {
-      setPartBStartIndex(partAStartIndex + partSize);
-    }, []);
-    return /*#__PURE__*/React__default['default'].createElement(AutoScroll, _objectSpread2({
-      cref: autoRef,
-      complete: function complete() {
-        return handleComplete;
-      },
-      half: function half() {
-        return handleHalf;
+    setTimeout(function () {
+      //手动触发执行滚动
+      if (autoRef.current) {
+        autoRef.current.tryScroll();
       }
-    }, otherProps), partA && partA.map(function (item, index) {
-      return render(item, index);
-    }), partB && partB.map(function (item, index) {
-      return render(item, index);
-    }));
-  }
+    }, 0);
+  }, [list]);
+  React.useEffect(function () {
+    setPartBStartIndex(partAStartIndex + partSize);
+  }, []);
+  return list.length > 0 ? /*#__PURE__*/React__default['default'].createElement(AutoScroll, _objectSpread2({
+    cref: autoRef,
+    complete: function complete() {
+      return handleComplete;
+    },
+    half: function half() {
+      return handleHalf;
+    }
+  }, otherProps), partA && partA.map(function (item, index) {
+    return render(item, index);
+  }), partB && partB.map(function (item, index) {
+    return render(item, index);
+  })) : /*#__PURE__*/React__default['default'].createElement("div", {
+    style: {
+      width: '100%',
+      height: '100%',
+      display: 'flex',
+      justifyContent: 'center',
+      alignItems: 'center'
+    }
+  }, none || '暂无数据');
 };
 
 var _excluded$b = ["data", "onClick", "slidesPerView", "rowKey", "onSwiperChange", "renderItem"];
@@ -9733,7 +9749,255 @@ Modal.hidden = function () {
   ModalContainer[modelSysbol] && ModalContainer[modelSysbol].hidden();
 };
 
-var _excluded$f = ["columns", "extraColumns", "search", "visible", "setVisible", "disabled", "submitMethod", "onSubmitSuccess", "title", "record", "onFormChange"];
+var controlShow$1 = function controlShow(f1, f2, value, timer) {
+  f1(value);
+  return setTimeout(function () {
+    f2(value);
+  }, timer);
+};
+
+function DialogModel$1(props) {
+  var width = props.width,
+      visible = props.visible,
+      closeCb = props.closeCb,
+      onClose = props.onClose,
+      _props$className = props.className,
+      className = _props$className === void 0 ? 'default-dialog' : _props$className,
+      style = props.style;
+
+  var _useState = React.useState(visible),
+      _useState2 = _slicedToArray(_useState, 2),
+      modelShow = _useState2[0],
+      setModelShow = _useState2[1];
+
+  var _useState3 = React.useState(visible),
+      _useState4 = _slicedToArray(_useState3, 2),
+      modelShowAync = _useState4[0],
+      setModelShowAync = _useState4[1];
+
+  var _useState5 = React.useState(visible),
+      _useState6 = _slicedToArray(_useState5, 2),
+      flag = _useState6[0],
+      setFlag = _useState6[1];
+
+  var renderChildren = React.useMemo(function () {
+    var _classNames;
+
+    return /*#__PURE__*/ReactDOM__default['default'].createPortal( /*#__PURE__*/React__default['default'].createElement("div", {
+      className: "w100p h100p pa ",
+      style: {
+        display: modelShow ? 'block' : 'none',
+        overflow: 'hidden',
+        top: 0,
+        left: 0
+      }
+    }, /*#__PURE__*/React__default['default'].createElement("div", {
+      className: classnames__default['default']((_classNames = {}, _defineProperty(_classNames, className, true), _defineProperty(_classNames, 'model_container-tips', true), _defineProperty(_classNames, "animate__animated", true), _defineProperty(_classNames, flag ? 'animate__bounceInDown' : 'animate__fadeOutRightBig', true), _classNames)),
+      style: _objectSpread2({
+        opacity: modelShowAync ? 1 : 0,
+        width: typeof width == 'number' ? width + 'px' : width
+      }, style)
+    }, /*#__PURE__*/React__default['default'].createElement("div", {
+      className: 'model_wrap-tips'
+    }, /*#__PURE__*/React__default['default'].createElement("div", {
+      style: {
+        width: '100%',
+        height: '100%',
+        position: 'relative'
+      }
+    }, ' ', props.children, ' '))), /*#__PURE__*/React__default['default'].createElement("div", {
+      className: 'mask-tips',
+      onClick: function onClick() {
+        return onClose && onClose();
+      },
+      style: {
+        opacity: modelShowAync ? 0.6 : 0
+      }
+    })), document.body);
+  }, [modelShowAync, modelShow, props]);
+  React.useEffect(function () {
+    var timer;
+    setFlag(visible);
+
+    if (visible) {
+      timer = controlShow$1(setModelShow, setModelShowAync, visible, 30);
+    } else {
+      timer = controlShow$1(setModelShowAync, setModelShow, visible, 1000);
+    }
+
+    return function () {
+      timer && clearTimeout(timer);
+    };
+  }, [visible]);
+  React.useEffect(function () {
+    !modelShow && typeof closeCb === 'function' && closeCb();
+  }, [modelShow]);
+  return renderChildren;
+}
+
+var _excluded$f = ["visible"];
+
+var Modal$1 = /*#__PURE__*/function (_React$PureComponent) {
+  _inherits(Modal, _React$PureComponent);
+
+  var _super = _createSuper(Modal);
+
+  function Modal() {
+    var _this;
+
+    _classCallCheck(this, Modal);
+
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+
+    _this = _super.call.apply(_super, [this].concat(args));
+
+    _this.renderFooter = function () {
+      var _this$props = _this.props,
+          onOk = _this$props.onOk,
+          onCancel = _this$props.onCancel,
+          cancelText = _this$props.cancelText,
+          okText = _this$props.okText,
+          footer = _this$props.footer;
+      if (footer && /*#__PURE__*/React__default['default'].isValidElement(footer)) return footer;
+      if (footer === false) return null;
+      return /*#__PURE__*/React__default['default'].createElement("div", {
+        className: "model_bottom-tips"
+      }, /*#__PURE__*/React__default['default'].createElement("div", {
+        className: "model_btn_box",
+        style: {
+          display: 'flex'
+        }
+      }, /*#__PURE__*/React__default['default'].createElement(WButton, {
+        className: "okbtn",
+        onClick: function onClick(e) {
+          onOk && onOk(e);
+        }
+      }, okText || '确定'), /*#__PURE__*/React__default['default'].createElement(WButton, {
+        className: "concellbtn",
+        style: {
+          marginLeft: '10px'
+        },
+        onClick: function onClick(e) {
+          onCancel && onCancel(e);
+        }
+      }, cancelText || '取消')));
+    };
+
+    _this.renderTop = function () {
+      var _this$props2 = _this.props,
+          title = _this$props2.title,
+          onClose = _this$props2.onClose;
+      return /*#__PURE__*/React__default['default'].createElement("div", {
+        className: "model-header-tips"
+      }, /*#__PURE__*/React__default['default'].createElement("div", {
+        className: "model-title-tips"
+      }, title), /*#__PURE__*/React__default['default'].createElement(icons.CloseCircleOutlined, {
+        className: "model-closeIcon-tips",
+        onClick: function onClick() {
+          return onClose && onClose();
+        }
+      }));
+    };
+
+    _this.renderContent = function () {
+      var _this$props3 = _this.props,
+          content = _this$props3.content,
+          children = _this$props3.children;
+      return /*#__PURE__*/React__default['default'].isValidElement(content) ? content : children ? children : null;
+    };
+
+    return _this;
+  }
+
+  _createClass(Modal, [{
+    key: "render",
+    value: function render() {
+      var _this$props4 = this.props,
+          visible = _this$props4.visible,
+          width = _this$props4.width,
+          closeCb = _this$props4.closeCb,
+          onClose = _this$props4.onClose,
+          className = _this$props4.className,
+          style = _this$props4.style;
+      return /*#__PURE__*/React__default['default'].createElement(DialogModel$1, {
+        closeCb: closeCb,
+        onClose: onClose,
+        visible: visible,
+        width: width,
+        className: className,
+        style: style
+      }, this.renderTop(), /*#__PURE__*/React__default['default'].createElement("div", {
+        className: "model-content-tips"
+      }, this.renderContent()), this.renderFooter());
+    }
+  }]);
+
+  return Modal;
+}(React__default['default'].PureComponent);
+
+Modal$1.show = void 0;
+Modal$1.hidden = void 0;
+var ModalContainer$1 = null;
+var modelSysbol$1 = Symbol('$$__model__Container_hidden');
+
+Modal$1.show = function (config) {
+  if (ModalContainer$1) return;
+
+  var props = _objectSpread2(_objectSpread2({}, config), {}, {
+    visible: true
+  });
+
+  var container = ModalContainer$1 = document.createElement('div');
+  var manager = container[modelSysbol$1] = {
+    setShow: null,
+    mounted: false,
+    hidden: function hidden() {
+      var setShow = manager.setShow;
+      setShow && setShow(false);
+    },
+    destory: function destory() {
+      ReactDOM__default['default'].unmountComponentAtNode(container);
+      document.body.removeChild(container);
+      ModalContainer$1 = null;
+    }
+  };
+
+  var ModelApp = function ModelApp(props) {
+    var _useState = React.useState(false),
+        _useState2 = _slicedToArray(_useState, 2),
+        show = _useState2[0],
+        setShow = _useState2[1];
+
+    manager.setShow = setShow;
+
+    var visible = props.visible,
+        trueProps = _objectWithoutProperties(props, _excluded$f);
+
+    React.useEffect(function () {
+      manager.mounted = true;
+      setShow(visible);
+    }, []);
+    return /*#__PURE__*/React__default['default'].createElement(Modal$1, _objectSpread2(_objectSpread2({}, trueProps), {}, {
+      closeCb: function closeCb() {
+        return manager.mounted && manager.destory();
+      },
+      visible: show
+    }));
+  };
+
+  document.body.appendChild(container);
+  ReactDOM__default['default'].render( /*#__PURE__*/React__default['default'].createElement(ModelApp, _objectSpread2({}, props)), container);
+  return manager;
+};
+
+Modal$1.hidden = function () {
+  if (!ModalContainer$1) return;
+  ModalContainer$1[modelSysbol$1] && ModalContainer$1[modelSysbol$1].hidden();
+};
+
+var _excluded$g = ["columns", "extraColumns", "search", "visible", "setVisible", "disabled", "submitMethod", "onSubmitSuccess", "title", "record", "onFormChange"];
 
 var ModalForm = function ModalForm(props, ref) {
   var columns = props.columns,
@@ -9747,7 +10011,7 @@ var ModalForm = function ModalForm(props, ref) {
       title = props.title,
       record = props.record,
       onFormChange = props.onFormChange,
-      extraProps = _objectWithoutProperties(props, _excluded$f);
+      extraProps = _objectWithoutProperties(props, _excluded$g);
 
   var formRef = React.useRef(null);
 
@@ -9878,7 +10142,7 @@ var ModalForm = function ModalForm(props, ref) {
 
 var ModalForm$1 = /*#__PURE__*/React__default['default'].forwardRef(ModalForm);
 
-var _excluded$g = ["columns", "extraColumns", "request", "modalFormSearch", "search", "tableAction", "renderTableBar", "className", "style", "onFormChange", "modalConfig", "optionColumnConfig"],
+var _excluded$h = ["columns", "extraColumns", "request", "modalFormSearch", "search", "tableAction", "renderTableBar", "className", "style", "onFormChange", "modalConfig", "optionColumnConfig"],
     _excluded2$3 = ["actionMethod"];
 
 var TabelCard = function TabelCard(props, ref) {
@@ -9894,7 +10158,7 @@ var TabelCard = function TabelCard(props, ref) {
       onFormChange = props.onFormChange,
       modalConfig = props.modalConfig,
       optionColumnConfig = props.optionColumnConfig,
-      extraProps = _objectWithoutProperties(props, _excluded$g);
+      extraProps = _objectWithoutProperties(props, _excluded$h);
 
   var actionRef = React.useRef();
   var formRef = React.useRef(null);
@@ -10452,9 +10716,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); //心跳检测重置
 
 
@@ -10480,6 +10744,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;
@@ -10549,6 +10819,7 @@ exports.Input = Index;
 exports.InputNumber = WInputNumber;
 exports.Modal = Modal;
 exports.ModalForm = ModalForm$1;
+exports.ModalTips = Modal$1;
 exports.Number = Index$7;
 exports.NumericInput = NumericInput;
 exports.Radio = Index$2;

package/package.json

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