wargerm 0.3.19 → 0.3.22

package/dist/components/Modal/dialog.d.ts

@@ -9,6 +9,7 @@ declare type Props = {
     onClose?: () => void;
     okText?: string;
     cancelText?: string;
+    destroyOnClose?: boolean;
     visible?: boolean;
     width?: number;
     className?: string;

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

@@ -10,6 +10,7 @@ declare type Props = {
     okText?: string;
     cancelText?: string;
     visible?: boolean;
+    destroyOnClose?: boolean;
     width?: number;
     className?: string;
     style?: React.CSSProperties;

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

@@ -1,6 +1,7 @@
 import React from 'react';
 import { ReactNode } from 'react';
 import { FormProps } from 'antd';
+import { Isearch } from '../WForm';
 interface ColumnProps {
     title: string;
     dataIndex: string;
@@ -57,23 +58,6 @@ interface Iscroll {
      */
     y?: string | number;
 }
-declare type defaultColConfig = {
-    xs: 24;
-    sm: 24;
-    md: 12;
-    lg: 12;
-    xl: 8;
-    xxl: 6;
-};
-interface Isearch {
-    labelWidth?: number | 'auto';
-    span?: number | defaultColConfig;
-    filterType?: 'query' | 'light';
-    searchText?: string;
-    resetText?: string;
-    submitText?: string;
-    optionRender?: ((searchConfig: any, formProps: any, dom: any) => ReactNode[]) | false;
-}
 declare type Props = {
     className?: string;
     rowClassName?: (record: Record<string, any>, index: number) => string;

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

@@ -43,6 +43,7 @@ export interface Isearch {
     submitText?: string;
     hideSubmit?: boolean;
     transform?: (value: any) => any;
+    optionDomReverse?: boolean;
     optionRender?: ((searchConfig: any, formProps: any, dom: any) => ReactNode[]) | false;
 }
 export interface WFormProps extends FormProps {

package/dist/index.css

@@ -1211,7 +1211,7 @@ div.ant-picker.ant-picker-focused {
   align-items: baseline;
 }
 .autoScroll-outer {
-  overflow: hidden;
+  overflow: auto;
   height: 100px;
 }
 @font-face {

package/dist/index.esm.css

@@ -1211,7 +1211,7 @@ div.ant-picker.ant-picker-focused {
   align-items: baseline;
 }
 .autoScroll-outer {
-  overflow: hidden;
+  overflow: auto;
   height: 100px;
 }
 @font-face {

package/dist/index.esm.js

@@ -8346,7 +8346,8 @@ function Table(_ref) {
       span: 6
     }, search), {}, {
       optionRender: function optionRender(searchConfig, formProps, dom) {
-        return _toConsumableArray(dom.reverse());
+        // return [...dom.reverse()];
+        return _toConsumableArray((search === null || search === void 0 ? void 0 : search.optionDomReverse) ? dom.reverse() : dom);
       }
     }),
     onSubmit: onFormSubmit,
@@ -9506,6 +9507,7 @@ var controlShow = function controlShow(f1, f2, value, timer) {
 function DialogModel(props) {
   var width = props.width,
       visible = props.visible,
+      destroyOnClose = props.destroyOnClose,
       closeCb = props.closeCb,
       onClose = props.onClose,
       _props$className = props.className,
@@ -9527,6 +9529,16 @@ function DialogModel(props) {
       flag = _useState6[0],
       setFlag = _useState6[1];
 
+  var _useState7 = useState(false),
+      _useState8 = _slicedToArray(_useState7, 2),
+      hasVisit = _useState8[0],
+      setHasVisit = _useState8[1];
+
+  var _useState9 = useState(false),
+      _useState10 = _slicedToArray(_useState9, 2),
+      isDesChild = _useState10[0],
+      setIsDesChild = _useState10[1];
+
   var renderChildren = useMemo(function () {
     var _classNames;
 
@@ -9552,16 +9564,16 @@ function DialogModel(props) {
         height: '100%',
         position: 'relative'
       }
-    }, props.children))), /*#__PURE__*/React.createElement("div", {
+    }, isDesChild ? null : props.children))), /*#__PURE__*/React.createElement("div", {
       className: 'mask',
       onClick: function onClick() {
-        return onClose && onClose();
+        onClose && onClose();
       },
       style: {
         opacity: modelShowAync ? 0.6 : 0
       }
     })), document.body);
-  }, [modelShowAync, modelShow, props]);
+  }, [modelShowAync, modelShow, props, isDesChild]);
   useEffect(function () {
     var timer;
     setFlag(visible);
@@ -9577,12 +9589,25 @@ function DialogModel(props) {
     };
   }, [visible]);
   useEffect(function () {
+    if (modelShow) {
+      setHasVisit(true);
+    }
+
+    if (destroyOnClose && hasVisit) {
+      if (!modelShow) {
+        setIsDesChild(true);
+      } else {
+        setIsDesChild(false);
+      }
+    }
+
     !modelShow && typeof closeCb === 'function' && closeCb();
-  }, [modelShow]);
+  }, [modelShow, hasVisit, destroyOnClose]);
   return renderChildren;
 }
 
-var _excluded$e = ["visible"];
+var _excluded$e = ["visible", "width", "closeCb", "onClose", "className", "style"],
+    _excluded2$3 = ["visible"];
 
 var Modal = /*#__PURE__*/function (_React$PureComponent) {
   _inherits(Modal, _React$PureComponent);
@@ -9661,15 +9686,17 @@ var Modal = /*#__PURE__*/function (_React$PureComponent) {
           closeCb = _this$props4.closeCb,
           onClose = _this$props4.onClose,
           className = _this$props4.className,
-          style = _this$props4.style;
-      return /*#__PURE__*/React.createElement(DialogModel, {
+          style = _this$props4.style,
+          other = _objectWithoutProperties(_this$props4, _excluded$e);
+
+      return /*#__PURE__*/React.createElement(DialogModel, _objectSpread2({
         closeCb: closeCb,
         onClose: onClose,
         visible: visible,
         width: width,
         className: className,
         style: style
-      }, this.renderTop(), /*#__PURE__*/React.createElement("div", {
+      }, other), this.renderTop(), /*#__PURE__*/React.createElement("div", {
         className: "model-content"
       }, /*#__PURE__*/React.createElement("div", {
         className: "model-content-in"
@@ -9716,7 +9743,7 @@ Modal.show = function (config) {
     manager.setShow = setShow;
 
     var visible = props.visible,
-        trueProps = _objectWithoutProperties(props, _excluded$e);
+        trueProps = _objectWithoutProperties(props, _excluded2$3);
 
     useEffect(function () {
       manager.mounted = true;
@@ -10565,7 +10592,8 @@ var TabelCard = function TabelCard(props, ref) {
       span: 6
     }, search), {}, {
       optionRender: function optionRender(searchConfig, formProps, dom) {
-        return [].concat(_toConsumableArray(dom.reverse()), [tableBarDom]);
+        // return [...dom.reverse(), tableBarDom];
+        return [].concat(_toConsumableArray((search === null || search === void 0 ? void 0 : search.optionDomReverse) ? dom.reverse() : dom), [tableBarDom]);
       }
     }),
     onSubmit: onSubmit,

package/dist/index.js

@@ -8380,7 +8380,8 @@ function Table(_ref) {
       span: 6
     }, search), {}, {
       optionRender: function optionRender(searchConfig, formProps, dom) {
-        return _toConsumableArray(dom.reverse());
+        // return [...dom.reverse()];
+        return _toConsumableArray((search === null || search === void 0 ? void 0 : search.optionDomReverse) ? dom.reverse() : dom);
       }
     }),
     onSubmit: onFormSubmit,
@@ -9540,6 +9541,7 @@ var controlShow = function controlShow(f1, f2, value, timer) {
 function DialogModel(props) {
   var width = props.width,
       visible = props.visible,
+      destroyOnClose = props.destroyOnClose,
       closeCb = props.closeCb,
       onClose = props.onClose,
       _props$className = props.className,
@@ -9561,6 +9563,16 @@ function DialogModel(props) {
       flag = _useState6[0],
       setFlag = _useState6[1];
 
+  var _useState7 = React.useState(false),
+      _useState8 = _slicedToArray(_useState7, 2),
+      hasVisit = _useState8[0],
+      setHasVisit = _useState8[1];
+
+  var _useState9 = React.useState(false),
+      _useState10 = _slicedToArray(_useState9, 2),
+      isDesChild = _useState10[0],
+      setIsDesChild = _useState10[1];
+
   var renderChildren = React.useMemo(function () {
     var _classNames;
 
@@ -9586,16 +9598,16 @@ function DialogModel(props) {
         height: '100%',
         position: 'relative'
       }
-    }, props.children))), /*#__PURE__*/React__default['default'].createElement("div", {
+    }, isDesChild ? null : props.children))), /*#__PURE__*/React__default['default'].createElement("div", {
       className: 'mask',
       onClick: function onClick() {
-        return onClose && onClose();
+        onClose && onClose();
       },
       style: {
         opacity: modelShowAync ? 0.6 : 0
       }
     })), document.body);
-  }, [modelShowAync, modelShow, props]);
+  }, [modelShowAync, modelShow, props, isDesChild]);
   React.useEffect(function () {
     var timer;
     setFlag(visible);
@@ -9611,12 +9623,25 @@ function DialogModel(props) {
     };
   }, [visible]);
   React.useEffect(function () {
+    if (modelShow) {
+      setHasVisit(true);
+    }
+
+    if (destroyOnClose && hasVisit) {
+      if (!modelShow) {
+        setIsDesChild(true);
+      } else {
+        setIsDesChild(false);
+      }
+    }
+
     !modelShow && typeof closeCb === 'function' && closeCb();
-  }, [modelShow]);
+  }, [modelShow, hasVisit, destroyOnClose]);
   return renderChildren;
 }
 
-var _excluded$e = ["visible"];
+var _excluded$e = ["visible", "width", "closeCb", "onClose", "className", "style"],
+    _excluded2$3 = ["visible"];
 
 var Modal = /*#__PURE__*/function (_React$PureComponent) {
   _inherits(Modal, _React$PureComponent);
@@ -9695,15 +9720,17 @@ var Modal = /*#__PURE__*/function (_React$PureComponent) {
           closeCb = _this$props4.closeCb,
           onClose = _this$props4.onClose,
           className = _this$props4.className,
-          style = _this$props4.style;
-      return /*#__PURE__*/React__default['default'].createElement(DialogModel, {
+          style = _this$props4.style,
+          other = _objectWithoutProperties(_this$props4, _excluded$e);
+
+      return /*#__PURE__*/React__default['default'].createElement(DialogModel, _objectSpread2({
         closeCb: closeCb,
         onClose: onClose,
         visible: visible,
         width: width,
         className: className,
         style: style
-      }, this.renderTop(), /*#__PURE__*/React__default['default'].createElement("div", {
+      }, other), this.renderTop(), /*#__PURE__*/React__default['default'].createElement("div", {
         className: "model-content"
       }, /*#__PURE__*/React__default['default'].createElement("div", {
         className: "model-content-in"
@@ -9750,7 +9777,7 @@ Modal.show = function (config) {
     manager.setShow = setShow;
 
     var visible = props.visible,
-        trueProps = _objectWithoutProperties(props, _excluded$e);
+        trueProps = _objectWithoutProperties(props, _excluded2$3);
 
     React.useEffect(function () {
       manager.mounted = true;
@@ -10599,7 +10626,8 @@ var TabelCard = function TabelCard(props, ref) {
       span: 6
     }, search), {}, {
       optionRender: function optionRender(searchConfig, formProps, dom) {
-        return [].concat(_toConsumableArray(dom.reverse()), [tableBarDom]);
+        // return [...dom.reverse(), tableBarDom];
+        return [].concat(_toConsumableArray((search === null || search === void 0 ? void 0 : search.optionDomReverse) ? dom.reverse() : dom), [tableBarDom]);
       }
     }),
     onSubmit: onSubmit,

package/package.json

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