wargerm 0.5.4 → 0.5.7

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

@@ -16,6 +16,7 @@ export interface ColumnProps {
     valueType?: 'text' | 'textarea' | 'inputNumber' | 'select' | 'treeSelect' | 'date' | 'dateTime' | 'dateMonth' | 'dateYear' | 'dateRange' | 'dateTimeRange' | 'checkbox' | 'radio' | 'radioButton' | 'switch' | 'digit' | 'cascader';
     valueEnum?: Record<string, any>;
     options?: Record<string, any>[];
+    useFirstIteminitialValue?: boolean;
     fieldProps?: Record<string, any>;
     formItemProps?: Record<string, any>;
     order?: number;

package/dist/components/useEventEmitter/example/demo1.d.ts

@@ -0,0 +1,2 @@
+/// <reference types="react" />
+export default function demo1(): JSX.Element;

package/dist/hooks/useEventEmitter.d.ts

@@ -0,0 +1,4 @@
+import { EventEmitter } from '@/utils/event';
+export default function useEventEmitter<T = void>(options?: {
+    global?: boolean;
+}): EventEmitter<T> | EventEmitter<unknown>;

package/dist/index.d.ts

@@ -1,5 +1,6 @@
 import './styles/index-dark.less';
 import './styles/index-light.less';
+export { default as useEventEmitter } from '@/hooks/useEventEmitter';
 export { default as Button } from './components/Button';
 export { default as IconFont } from './components/IconFont';
 export { default as Input } from './components/Input';

package/dist/index.esm.js

@@ -1,10 +1,11 @@
+import React, { useRef, useEffect, useMemo, memo, useState, useImperativeHandle, forwardRef, createRef, useCallback } from 'react';
+import { cloneDeep, isEmpty } from 'lodash';
 import 'antd/es/button/style';
 import _Button from 'antd/es/button';
 import 'antd/es/dropdown/style';
 import _Dropdown from 'antd/es/dropdown';
 import 'antd/es/menu/style';
 import _Menu from 'antd/es/menu';
-import React, { memo, useState, useEffect, useMemo, useImperativeHandle, useRef, forwardRef, createRef, useCallback } from 'react';
 import { createFromIconfontCN, SearchOutlined, ReloadOutlined, CloseCircleOutlined, PlusOutlined, EllipsisOutlined, ExclamationCircleOutlined, EyeOutlined, EditOutlined, DeleteOutlined } from '@ant-design/icons';
 import 'antd/es/input/style';
 import _Input from 'antd/es/input';
@@ -38,7 +39,7 @@ import 'antd/es/tree-select/style';
 import _TreeSelect from 'antd/es/tree-select';
 import 'antd/es/cascader/style';
 import _Cascader from 'antd/es/cascader';
-import cloneDeep from 'lodash/cloneDeep';
+import cloneDeep$1 from 'lodash/cloneDeep';
 import CountUp from 'react-countup';
 import { Swiper, SwiperSlide } from 'swiper/react';
 import SwiperCore, { Pagination, Navigation, Autoplay, Virtual } from 'swiper';
@@ -51,7 +52,6 @@ import ProTable from '@ant-design/pro-table';
 import Player from 'xgplayer';
 import FlvPlayer from 'xgplayer-flv.js';
 import HlsJsPlayer from 'xgplayer-hls.js';
-import { isEmpty } from 'lodash';
 import ReactEChartsCore from 'echarts-for-react/lib/core';
 import * as echarts from 'echarts/core';
 import { use, registerTheme, graphic } from 'echarts/core';
@@ -441,6 +441,91 @@ function _createForOfIteratorHelper(o, allowArrayLike) {
   };
 }
 
+var EventEmitter = /*#__PURE__*/_createClass(function EventEmitter() {
+  var _this = this;
+
+  _classCallCheck(this, EventEmitter);
+
+  this.subscriptions = new Map();
+
+  this.useSubscription = function (event, listener) {
+    var callbackRef = useRef();
+    useEffect(function () {
+      callbackRef.current = listener;
+
+      function subscription(val) {
+        if (callbackRef.current) {
+          callbackRef.current(val);
+        }
+      }
+
+      _this.subscriptions.set(event, subscription);
+
+      return function () {
+        _this.subscriptions.delete(event);
+      };
+    }, []);
+  };
+
+  this.emit = function (event) {
+    if (typeof event === 'string' || typeof event === 'number') {
+      var subscriptionValuesCallback = _this.subscriptions.get(event);
+
+      for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+        args[_key - 1] = arguments[_key];
+      }
+
+      subscriptionValuesCallback === null || subscriptionValuesCallback === void 0 ? void 0 : subscriptionValuesCallback({
+        params: cloneDeep(args),
+        event: event
+      });
+    } else throw new TypeError('event must be string or number !');
+  };
+
+  this.removeListener = function (event) {
+    _this.subscriptions.delete(event);
+  };
+
+  this.clear = function () {
+    _this.subscriptions.clear();
+  };
+
+  this.clear();
+});
+
+var eventEmitterOverall = new EventEmitter();
+
+/*
+ * @Author: lijin
+ * @Date: 2022-07-22 14:29:31
+ * @LastEditTime: 2022-07-22 14:29:31
+ * @LastEditors: lijin
+ * @Description:
+ * @FilePath: \wargerm-components\src\hooks\useEventEmitter.tsx
+ * 可以输入预定的版权声明、个性签名、空行等
+ */
+function useEventEmitter(options) {
+  var ref = useRef();
+  var eventEmitterOptions = useMemo(function () {
+    return options !== null && options !== void 0 ? options : {
+      global: false
+    };
+  }, [options]);
+
+  if (!ref.current) {
+    ref.current = eventEmitterOptions.global ? ref.current = eventEmitterOverall : ref.current = new EventEmitter();
+  }
+
+  useEffect(function () {
+    return function () {
+      var _ref$current;
+
+      return (_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : _ref$current.clear();
+    };
+  }, []);
+  return ref.current;
+}
+
 var _excluded = ["multiple", "children", "disabled"];
 
 var WButton = function WButton(props) {
@@ -546,10 +631,10 @@ Index$3.Group = _Checkbox.Group;
 /*
  * @Author: lijin
  * @Date: 2021-10-27 22:18:49
- * @LastEditTime: 2022-06-30 16:51:49
- * @LastEditors: caldelle 793238465@qq.com
+ * @LastEditTime: 2022-07-22 15:17:01
+ * @LastEditors: lijin
  * @Description:
- * @FilePath: \wargerm\src\utils\index.ts
+ * @FilePath: \wargerm-components\src\utils\index.ts
  * 可以输入预定的版权声明、个性签名、空行等
  */
 
@@ -6791,12 +6876,12 @@ var WForm = function WForm(props, ref) {
       columnsFields = _useState4[0],
       setColumnsFields = _useState4[1];
 
-  var filterFormColumns = cloneDeep(columns).filter(function (c) {
+  var filterFormColumns = cloneDeep$1(columns).filter(function (c) {
     return !c.hideInSearch || disabledHideInSearch;
   }).sort(function (a, b) {
     return (b.order || 0) - (a.order || 0);
   });
-  var filterExtraFormColumns = cloneDeep(extraColumns || []).filter(function (c) {
+  var filterExtraFormColumns = cloneDeep$1(extraColumns || []).filter(function (c) {
     return !c.hideInSearch || disabledHideInSearch;
   }).sort(function (a, b) {
     return (b.order || 0) - (a.order || 0);
@@ -6857,6 +6942,12 @@ var WForm = function WForm(props, ref) {
             setColumnsFields(function (preColumnsFields) {
               return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, opt));
             });
+
+            if (c.useFirstIteminitialValue) {
+              var _form$setFieldsValue, _opt$0$value, _opt$;
+
+              form === null || form === void 0 ? void 0 : (_form$setFieldsValue = form.setFieldsValue) === null || _form$setFieldsValue === void 0 ? void 0 : _form$setFieldsValue.call(form, _defineProperty({}, c.dataIndex, (_opt$0$value = opt === null || opt === void 0 ? void 0 : (_opt$ = opt[0]) === null || _opt$ === void 0 ? void 0 : _opt$.value) !== null && _opt$0$value !== void 0 ? _opt$0$value : ''));
+            }
           }
         }, c.fieldProps), _extraProps))));
       } else if (c.valueType == 'cascader') {
@@ -7324,6 +7415,12 @@ var WForm = function WForm(props, ref) {
             setColumnsFields(function (preColumnsFields) {
               return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, opt));
             });
+
+            if (c.useFirstIteminitialValue) {
+              var _form$setFieldsValue2, _opt$0$value2, _opt$2;
+
+              form === null || form === void 0 ? void 0 : (_form$setFieldsValue2 = form.setFieldsValue) === null || _form$setFieldsValue2 === void 0 ? void 0 : _form$setFieldsValue2.call(form, _defineProperty({}, c.dataIndex, (_opt$0$value2 = opt === null || opt === void 0 ? void 0 : (_opt$2 = opt[0]) === null || _opt$2 === void 0 ? void 0 : _opt$2.value) !== null && _opt$0$value2 !== void 0 ? _opt$0$value2 : ''));
+            }
           }
         }, c.fieldProps), _extraProps4))));
       } else if (c.valueType == 'cascader') {
@@ -7795,6 +7892,65 @@ var WForm = function WForm(props, ref) {
     return filterObj(searchForm);
   };
 
+  var getFormValues = function getFormValues() {
+    var searchForm = form.getFieldsValue();
+    filterFormColumns.forEach(function (c) {
+      if (c.search && c.search.transform) {
+        var transformObj = c.search.transform(searchForm[c.dataIndex]);
+        searchForm = _objectSpread2(_objectSpread2({}, searchForm), transformObj);
+
+        if (!transformObj[c.dataIndex]) {
+          delete searchForm[c.dataIndex];
+        }
+
+        return false;
+      }
+
+      if (c.valueType && ['date', 'dateTime', 'dateMonth', 'dateYear', 'dateRange', 'dateTimeRange'].includes(c.valueType)) {
+        if (c.valueType === 'date' && searchForm[c.dataIndex]) {
+          var _c$fieldProps7;
+
+          searchForm[c.dataIndex] = searchForm[c.dataIndex] && hooks(searchForm[c.dataIndex]).format((c === null || c === void 0 ? void 0 : (_c$fieldProps7 = c.fieldProps) === null || _c$fieldProps7 === void 0 ? void 0 : _c$fieldProps7.format) || 'YYYY-MM-DD');
+        }
+
+        if (c.valueType === 'dateTime' && searchForm[c.dataIndex]) {
+          var _c$fieldProps8;
+
+          searchForm[c.dataIndex] = searchForm[c.dataIndex] && hooks(searchForm[c.dataIndex]).format((c === null || c === void 0 ? void 0 : (_c$fieldProps8 = c.fieldProps) === null || _c$fieldProps8 === void 0 ? void 0 : _c$fieldProps8.format) || 'YYYY-MM-DD HH:mm:ss');
+        }
+
+        if (c.valueType === 'dateMonth' && searchForm[c.dataIndex]) {
+          var _c$fieldProps9;
+
+          searchForm[c.dataIndex] = searchForm[c.dataIndex] && hooks(searchForm[c.dataIndex]).format((c === null || c === void 0 ? void 0 : (_c$fieldProps9 = c.fieldProps) === null || _c$fieldProps9 === void 0 ? void 0 : _c$fieldProps9.format) || 'YYYY-MM');
+        }
+
+        if (c.valueType === 'dateYear' && searchForm[c.dataIndex]) {
+          var _c$fieldProps10;
+
+          searchForm[c.dataIndex] = searchForm[c.dataIndex] && hooks(searchForm[c.dataIndex]).format((c === null || c === void 0 ? void 0 : (_c$fieldProps10 = c.fieldProps) === null || _c$fieldProps10 === void 0 ? void 0 : _c$fieldProps10.format) || 'YYYY');
+        }
+
+        if (c.valueType === 'dateRange' && searchForm[c.dataIndex]) {
+          searchForm[c.dataIndex] = searchForm[c.dataIndex].map(function (item) {
+            var _c$fieldProps11;
+
+            return item && searchForm[c.dataIndex] && hooks(item).format((c === null || c === void 0 ? void 0 : (_c$fieldProps11 = c.fieldProps) === null || _c$fieldProps11 === void 0 ? void 0 : _c$fieldProps11.format) || 'YYYY-MM-DD');
+          });
+        }
+
+        if (c.valueType === 'dateTimeRange' && searchForm[c.dataIndex]) {
+          searchForm[c.dataIndex] = searchForm[c.dataIndex].map(function (item) {
+            var _c$fieldProps12;
+
+            return item && hooks(item).format((c === null || c === void 0 ? void 0 : (_c$fieldProps12 = c.fieldProps) === null || _c$fieldProps12 === void 0 ? void 0 : _c$fieldProps12.format) || 'YYYY-MM-DD HH:mm:ss');
+          });
+        }
+      }
+    });
+    return filterObj(searchForm);
+  };
+
   var handleRest = function handleRest() {
     var _form$resetFields;
 
@@ -7803,7 +7959,7 @@ var WForm = function WForm(props, ref) {
   };
 
   var setFieldsValue = function setFieldsValue(record) {
-    var _form$setFieldsValue;
+    var _form$setFieldsValue4;
 
     var setFieldsValues = _objectSpread2({}, record);
 
@@ -7819,7 +7975,7 @@ var WForm = function WForm(props, ref) {
         return false;
       }
     });
-    form === null || form === void 0 ? void 0 : (_form$setFieldsValue = form.setFieldsValue) === null || _form$setFieldsValue === void 0 ? void 0 : _form$setFieldsValue.call(form, setFieldsValues);
+    form === null || form === void 0 ? void 0 : (_form$setFieldsValue4 = form.setFieldsValue) === null || _form$setFieldsValue4 === void 0 ? void 0 : _form$setFieldsValue4.call(form, setFieldsValues);
   };
 
   useImperativeHandle(ref, function () {
@@ -7829,7 +7985,8 @@ var WForm = function WForm(props, ref) {
       handleSubmit: form.submit,
       handleRest: handleRest,
       resetFields: handleRest,
-      setFieldsValue: setFieldsValue
+      setFieldsValue: setFieldsValue,
+      getFormValues: getFormValues
     };
   });
   useEffect(function () {
@@ -10414,7 +10571,7 @@ function DragBox(_ref) {
   }, children)) : /*#__PURE__*/React.createElement(React.Fragment, null);
 }
 
-var _excluded$g = ["columns", "extraColumns", "search", "visible", "setVisible", "disabled", "submitMethod", "onSubmitSuccess", "title", "record", "onFormChange", "formItemChild"];
+var _excluded$g = ["columns", "extraColumns", "search", "visible", "setVisible", "disabled", "submitMethod", "onSubmitSuccess", "title", "record", "onFormChange", "formItemChild", "onCancel"];
 
 var ModalForm = function ModalForm(props, ref) {
   var columns = props.columns,
@@ -10429,6 +10586,7 @@ var ModalForm = function ModalForm(props, ref) {
       record = props.record,
       onFormChange = props.onFormChange,
       formItemChild = props.formItemChild,
+      onCancel = props.onCancel,
       extraProps = _objectWithoutProperties(props, _excluded$g);
 
   var formRef = useRef(null);
@@ -10491,6 +10649,7 @@ var ModalForm = function ModalForm(props, ref) {
   }();
 
   var handleCancel = function handleCancel() {
+    onCancel && onCancel();
     setVisible(false);
   };
 
@@ -12537,4 +12696,4 @@ function WaterLevelCharts(config) {
   });
 }
 
-export { Index$9 as AutoScroll, Index$b as Breadcrumb, WButton as Button, index$2 as Card, WCascader as Cascader, Index$3 as Checkbox, Index$8 as CountUp, Index$1 as DatePicker, DragBox, index as IconFont, Index as Input, WInputNumber as InputNumber, LineEcharts, Modal, ModalForm$1 as ModalForm, Modal$1 as ModalTips, Index$7 as Number, NumericInput, Index$2 as Radio, Select, Index$a as Swiper, WSwitch as Switch, index$3 as TabelCard, index$1 as Table, Index$6 as TreeSelect, index$5 as Video, index$4 as VideoPlayer, Index$5 as WDatePicker, WForm$1 as WForm, WaterLevelCharts, WebsocketHeart };
+export { Index$9 as AutoScroll, Index$b as Breadcrumb, WButton as Button, index$2 as Card, WCascader as Cascader, Index$3 as Checkbox, Index$8 as CountUp, Index$1 as DatePicker, DragBox, index as IconFont, Index as Input, WInputNumber as InputNumber, LineEcharts, Modal, ModalForm$1 as ModalForm, Modal$1 as ModalTips, Index$7 as Number, NumericInput, Index$2 as Radio, Select, Index$a as Swiper, WSwitch as Switch, index$3 as TabelCard, index$1 as Table, Index$6 as TreeSelect, index$5 as Video, index$4 as VideoPlayer, Index$5 as WDatePicker, WForm$1 as WForm, WaterLevelCharts, WebsocketHeart, useEventEmitter };

package/dist/index.js

@@ -2,13 +2,14 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var React = require('react');
+var lodash = require('lodash');
 require('antd/es/button/style');
 var _Button = require('antd/es/button');
 require('antd/es/dropdown/style');
 var _Dropdown = require('antd/es/dropdown');
 require('antd/es/menu/style');
 var _Menu = require('antd/es/menu');
-var React = require('react');
 var icons = require('@ant-design/icons');
 require('antd/es/input/style');
 var _Input = require('antd/es/input');
@@ -55,7 +56,6 @@ var ProTable = require('@ant-design/pro-table');
 var Player = require('xgplayer');
 var FlvPlayer = require('xgplayer-flv.js');
 var HlsJsPlayer = require('xgplayer-hls.js');
-var lodash = require('lodash');
 var ReactEChartsCore = require('echarts-for-react/lib/core');
 var echarts = require('echarts/core');
 var charts = require('echarts/charts');
@@ -84,10 +84,10 @@ function _interopNamespace(e) {
   return Object.freeze(n);
 }
 
+var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var _Button__default = /*#__PURE__*/_interopDefaultLegacy(_Button);
 var _Dropdown__default = /*#__PURE__*/_interopDefaultLegacy(_Dropdown);
 var _Menu__default = /*#__PURE__*/_interopDefaultLegacy(_Menu);
-var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var _Input__default = /*#__PURE__*/_interopDefaultLegacy(_Input);
 var _InputNumber__default = /*#__PURE__*/_interopDefaultLegacy(_InputNumber);
 var _Pagination__default = /*#__PURE__*/_interopDefaultLegacy(_Pagination);
@@ -500,6 +500,91 @@ function _createForOfIteratorHelper(o, allowArrayLike) {
   };
 }
 
+var EventEmitter = /*#__PURE__*/_createClass(function EventEmitter() {
+  var _this = this;
+
+  _classCallCheck(this, EventEmitter);
+
+  this.subscriptions = new Map();
+
+  this.useSubscription = function (event, listener) {
+    var callbackRef = React.useRef();
+    React.useEffect(function () {
+      callbackRef.current = listener;
+
+      function subscription(val) {
+        if (callbackRef.current) {
+          callbackRef.current(val);
+        }
+      }
+
+      _this.subscriptions.set(event, subscription);
+
+      return function () {
+        _this.subscriptions.delete(event);
+      };
+    }, []);
+  };
+
+  this.emit = function (event) {
+    if (typeof event === 'string' || typeof event === 'number') {
+      var subscriptionValuesCallback = _this.subscriptions.get(event);
+
+      for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+        args[_key - 1] = arguments[_key];
+      }
+
+      subscriptionValuesCallback === null || subscriptionValuesCallback === void 0 ? void 0 : subscriptionValuesCallback({
+        params: lodash.cloneDeep(args),
+        event: event
+      });
+    } else throw new TypeError('event must be string or number !');
+  };
+
+  this.removeListener = function (event) {
+    _this.subscriptions.delete(event);
+  };
+
+  this.clear = function () {
+    _this.subscriptions.clear();
+  };
+
+  this.clear();
+});
+
+var eventEmitterOverall = new EventEmitter();
+
+/*
+ * @Author: lijin
+ * @Date: 2022-07-22 14:29:31
+ * @LastEditTime: 2022-07-22 14:29:31
+ * @LastEditors: lijin
+ * @Description:
+ * @FilePath: \wargerm-components\src\hooks\useEventEmitter.tsx
+ * 可以输入预定的版权声明、个性签名、空行等
+ */
+function useEventEmitter(options) {
+  var ref = React.useRef();
+  var eventEmitterOptions = React.useMemo(function () {
+    return options !== null && options !== void 0 ? options : {
+      global: false
+    };
+  }, [options]);
+
+  if (!ref.current) {
+    ref.current = eventEmitterOptions.global ? ref.current = eventEmitterOverall : ref.current = new EventEmitter();
+  }
+
+  React.useEffect(function () {
+    return function () {
+      var _ref$current;
+
+      return (_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : _ref$current.clear();
+    };
+  }, []);
+  return ref.current;
+}
+
 var _excluded = ["multiple", "children", "disabled"];
 
 var WButton = function WButton(props) {
@@ -605,10 +690,10 @@ Index$3.Group = _Checkbox__default['default'].Group;
 /*
  * @Author: lijin
  * @Date: 2021-10-27 22:18:49
- * @LastEditTime: 2022-06-30 16:51:49
- * @LastEditors: caldelle 793238465@qq.com
+ * @LastEditTime: 2022-07-22 15:17:01
+ * @LastEditors: lijin
  * @Description:
- * @FilePath: \wargerm\src\utils\index.ts
+ * @FilePath: \wargerm-components\src\utils\index.ts
  * 可以输入预定的版权声明、个性签名、空行等
  */
 
@@ -6916,6 +7001,12 @@ var WForm = function WForm(props, ref) {
             setColumnsFields(function (preColumnsFields) {
               return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, opt));
             });
+
+            if (c.useFirstIteminitialValue) {
+              var _form$setFieldsValue, _opt$0$value, _opt$;
+
+              form === null || form === void 0 ? void 0 : (_form$setFieldsValue = form.setFieldsValue) === null || _form$setFieldsValue === void 0 ? void 0 : _form$setFieldsValue.call(form, _defineProperty({}, c.dataIndex, (_opt$0$value = opt === null || opt === void 0 ? void 0 : (_opt$ = opt[0]) === null || _opt$ === void 0 ? void 0 : _opt$.value) !== null && _opt$0$value !== void 0 ? _opt$0$value : ''));
+            }
           }
         }, c.fieldProps), _extraProps))));
       } else if (c.valueType == 'cascader') {
@@ -7383,6 +7474,12 @@ var WForm = function WForm(props, ref) {
             setColumnsFields(function (preColumnsFields) {
               return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, opt));
             });
+
+            if (c.useFirstIteminitialValue) {
+              var _form$setFieldsValue2, _opt$0$value2, _opt$2;
+
+              form === null || form === void 0 ? void 0 : (_form$setFieldsValue2 = form.setFieldsValue) === null || _form$setFieldsValue2 === void 0 ? void 0 : _form$setFieldsValue2.call(form, _defineProperty({}, c.dataIndex, (_opt$0$value2 = opt === null || opt === void 0 ? void 0 : (_opt$2 = opt[0]) === null || _opt$2 === void 0 ? void 0 : _opt$2.value) !== null && _opt$0$value2 !== void 0 ? _opt$0$value2 : ''));
+            }
           }
         }, c.fieldProps), _extraProps4))));
       } else if (c.valueType == 'cascader') {
@@ -7854,6 +7951,65 @@ var WForm = function WForm(props, ref) {
     return filterObj(searchForm);
   };
 
+  var getFormValues = function getFormValues() {
+    var searchForm = form.getFieldsValue();
+    filterFormColumns.forEach(function (c) {
+      if (c.search && c.search.transform) {
+        var transformObj = c.search.transform(searchForm[c.dataIndex]);
+        searchForm = _objectSpread2(_objectSpread2({}, searchForm), transformObj);
+
+        if (!transformObj[c.dataIndex]) {
+          delete searchForm[c.dataIndex];
+        }
+
+        return false;
+      }
+
+      if (c.valueType && ['date', 'dateTime', 'dateMonth', 'dateYear', 'dateRange', 'dateTimeRange'].includes(c.valueType)) {
+        if (c.valueType === 'date' && searchForm[c.dataIndex]) {
+          var _c$fieldProps7;
+
+          searchForm[c.dataIndex] = searchForm[c.dataIndex] && hooks(searchForm[c.dataIndex]).format((c === null || c === void 0 ? void 0 : (_c$fieldProps7 = c.fieldProps) === null || _c$fieldProps7 === void 0 ? void 0 : _c$fieldProps7.format) || 'YYYY-MM-DD');
+        }
+
+        if (c.valueType === 'dateTime' && searchForm[c.dataIndex]) {
+          var _c$fieldProps8;
+
+          searchForm[c.dataIndex] = searchForm[c.dataIndex] && hooks(searchForm[c.dataIndex]).format((c === null || c === void 0 ? void 0 : (_c$fieldProps8 = c.fieldProps) === null || _c$fieldProps8 === void 0 ? void 0 : _c$fieldProps8.format) || 'YYYY-MM-DD HH:mm:ss');
+        }
+
+        if (c.valueType === 'dateMonth' && searchForm[c.dataIndex]) {
+          var _c$fieldProps9;
+
+          searchForm[c.dataIndex] = searchForm[c.dataIndex] && hooks(searchForm[c.dataIndex]).format((c === null || c === void 0 ? void 0 : (_c$fieldProps9 = c.fieldProps) === null || _c$fieldProps9 === void 0 ? void 0 : _c$fieldProps9.format) || 'YYYY-MM');
+        }
+
+        if (c.valueType === 'dateYear' && searchForm[c.dataIndex]) {
+          var _c$fieldProps10;
+
+          searchForm[c.dataIndex] = searchForm[c.dataIndex] && hooks(searchForm[c.dataIndex]).format((c === null || c === void 0 ? void 0 : (_c$fieldProps10 = c.fieldProps) === null || _c$fieldProps10 === void 0 ? void 0 : _c$fieldProps10.format) || 'YYYY');
+        }
+
+        if (c.valueType === 'dateRange' && searchForm[c.dataIndex]) {
+          searchForm[c.dataIndex] = searchForm[c.dataIndex].map(function (item) {
+            var _c$fieldProps11;
+
+            return item && searchForm[c.dataIndex] && hooks(item).format((c === null || c === void 0 ? void 0 : (_c$fieldProps11 = c.fieldProps) === null || _c$fieldProps11 === void 0 ? void 0 : _c$fieldProps11.format) || 'YYYY-MM-DD');
+          });
+        }
+
+        if (c.valueType === 'dateTimeRange' && searchForm[c.dataIndex]) {
+          searchForm[c.dataIndex] = searchForm[c.dataIndex].map(function (item) {
+            var _c$fieldProps12;
+
+            return item && hooks(item).format((c === null || c === void 0 ? void 0 : (_c$fieldProps12 = c.fieldProps) === null || _c$fieldProps12 === void 0 ? void 0 : _c$fieldProps12.format) || 'YYYY-MM-DD HH:mm:ss');
+          });
+        }
+      }
+    });
+    return filterObj(searchForm);
+  };
+
   var handleRest = function handleRest() {
     var _form$resetFields;
 
@@ -7862,7 +8018,7 @@ var WForm = function WForm(props, ref) {
   };
 
   var setFieldsValue = function setFieldsValue(record) {
-    var _form$setFieldsValue;
+    var _form$setFieldsValue4;
 
     var setFieldsValues = _objectSpread2({}, record);
 
@@ -7878,7 +8034,7 @@ var WForm = function WForm(props, ref) {
         return false;
       }
     });
-    form === null || form === void 0 ? void 0 : (_form$setFieldsValue = form.setFieldsValue) === null || _form$setFieldsValue === void 0 ? void 0 : _form$setFieldsValue.call(form, setFieldsValues);
+    form === null || form === void 0 ? void 0 : (_form$setFieldsValue4 = form.setFieldsValue) === null || _form$setFieldsValue4 === void 0 ? void 0 : _form$setFieldsValue4.call(form, setFieldsValues);
   };
 
   React.useImperativeHandle(ref, function () {
@@ -7888,7 +8044,8 @@ var WForm = function WForm(props, ref) {
       handleSubmit: form.submit,
       handleRest: handleRest,
       resetFields: handleRest,
-      setFieldsValue: setFieldsValue
+      setFieldsValue: setFieldsValue,
+      getFormValues: getFormValues
     };
   });
   React.useEffect(function () {
@@ -10473,7 +10630,7 @@ function DragBox(_ref) {
   }, children)) : /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null);
 }
 
-var _excluded$g = ["columns", "extraColumns", "search", "visible", "setVisible", "disabled", "submitMethod", "onSubmitSuccess", "title", "record", "onFormChange", "formItemChild"];
+var _excluded$g = ["columns", "extraColumns", "search", "visible", "setVisible", "disabled", "submitMethod", "onSubmitSuccess", "title", "record", "onFormChange", "formItemChild", "onCancel"];
 
 var ModalForm = function ModalForm(props, ref) {
   var columns = props.columns,
@@ -10488,6 +10645,7 @@ var ModalForm = function ModalForm(props, ref) {
       record = props.record,
       onFormChange = props.onFormChange,
       formItemChild = props.formItemChild,
+      onCancel = props.onCancel,
       extraProps = _objectWithoutProperties(props, _excluded$g);
 
   var formRef = React.useRef(null);
@@ -10550,6 +10708,7 @@ var ModalForm = function ModalForm(props, ref) {
   }();
 
   var handleCancel = function handleCancel() {
+    onCancel && onCancel();
     setVisible(false);
   };
 
@@ -12627,3 +12786,4 @@ exports.WDatePicker = Index$5;
 exports.WForm = WForm$1;
 exports.WaterLevelCharts = WaterLevelCharts;
 exports.WebsocketHeart = WebsocketHeart;
+exports.useEventEmitter = useEventEmitter;

package/dist/utils/event.d.ts

@@ -0,0 +1,15 @@
+declare type SubscriptionParams<T = any> = {
+    params: T;
+    event: string | number;
+};
+declare type Subscription<T> = ({ params, event }: SubscriptionParams<T>) => void;
+declare class EventEmitter<T> {
+    private subscriptions;
+    constructor();
+    useSubscription: (event: string, listener?: Subscription<T> | undefined) => void;
+    emit: (event: string | number, ...args: T extends any[] ? any[] : any) => void;
+    removeListener: (event: string) => void;
+    clear: () => void;
+}
+declare const eventEmitterOverall: EventEmitter<unknown>;
+export { EventEmitter, eventEmitterOverall };

package/package.json

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