wargerm 0.6.24 → 0.7.1

package/dist/index.esm.js

@@ -1,66 +1,23 @@
+import 'antd/dist/reset.css';
 import React, { useRef, useEffect, useMemo, useState, useCallback, useImperativeHandle, memo, forwardRef, createRef } from 'react';
 import { cloneDeep, uniqBy, isEmpty } from 'lodash-es';
 import { useSyncExternalStore } from 'use-sync-external-store/shim';
-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 { createFromIconfontCN, PlusOutlined, SearchOutlined, ReloadOutlined, CloseCircleOutlined, EllipsisOutlined, ExclamationCircleOutlined, EyeOutlined, EditOutlined, DeleteOutlined, LeftOutlined, RightOutlined, CloseOutlined } from '@ant-design/icons';
-import 'antd/es/input/style';
-import _Input from 'antd/es/input';
-import 'antd/es/modal/style';
-import _Modal from 'antd/es/modal';
-import 'antd/es/message/style';
-import _message from 'antd/es/message';
-import 'antd/es/upload/style';
-import _Upload from 'antd/es/upload';
+import { Menu, Dropdown, Button, Input, Upload as Upload$1, Modal as Modal$2, message, InputNumber, DatePicker, Radio, Space, Checkbox, Select, Switch, Tooltip, TreeSelect as TreeSelect$1, Cascader, Form, Row, Col, Spin, Pagination, Breadcrumb, ConfigProvider } from 'antd';
+import { createFromIconfontCN, PlusOutlined, CloseCircleOutlined, SearchOutlined, ReloadOutlined, EllipsisOutlined, ExclamationCircleOutlined, EyeOutlined, EditOutlined, DeleteOutlined, LeftOutlined, RightOutlined, CloseOutlined } from '@ant-design/icons';
 import FileViewer from 'react-file-viewer';
-import 'antd/es/input-number/style';
-import _InputNumber from 'antd/es/input-number';
-import 'antd/es/pagination/style';
-import _Pagination from 'antd/es/pagination';
-import 'antd/es/spin/style';
-import _Spin from 'antd/es/spin';
-import 'antd/es/tooltip/style';
-import _Tooltip from 'antd/es/tooltip';
 import classnames from 'classnames';
-import 'antd/es/space/style';
-import _Space from 'antd/es/space';
-import 'antd/es/radio/style';
-import _Radio from 'antd/es/radio';
-import 'antd/es/date-picker/style';
-import _DatePicker from 'antd/es/date-picker';
 import zhCN from 'antd/es/date-picker/locale/zh_CN';
-import moment from 'moment';
-import 'moment/locale/zh-cn';
-import 'antd/es/checkbox/style';
-import _Checkbox from 'antd/es/checkbox';
-import 'antd/es/row/style';
-import _Row from 'antd/es/row';
-import 'antd/es/col/style';
-import _Col from 'antd/es/col';
-import 'antd/es/form/style';
-import _Form from 'antd/es/form';
-import 'antd/es/select/style';
-import _Select from 'antd/es/select';
-import 'antd/es/switch/style';
-import _Switch from 'antd/es/switch';
-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 dayjs, { extend, weekdaysMin } from 'dayjs';
+import 'dayjs/locale/zh-cn';
 import CountUp from 'react-countup';
 import { Swiper, SwiperSlide } from 'swiper/react';
-import SwiperCore, { Pagination, Navigation, Autoplay, Virtual } from 'swiper';
-import 'antd/es/breadcrumb/style';
-import _Breadcrumb from 'antd/es/breadcrumb';
+import SwiperCore, { Pagination as Pagination$1, Navigation, Autoplay, Virtual } from 'swiper';
 import ReactDOM from 'react-dom';
 import ProTable from '@ant-design/pro-table';
-import 'antd/es/config-provider/style';
-import _ConfigProvider from 'antd/es/config-provider';
+import weekday from 'dayjs/plugin/weekday';
+import localeData from 'dayjs/plugin/localeData';
 import zhCN$1 from 'antd/es/locale/zh_CN';
+import weekOfYear from 'dayjs/plugin/weekOfYear';
 import Player from 'xgplayer';
 import FlvPlayer from 'xgplayer-flv.js';
 import HlsJsPlayer from 'xgplayer-hls.js';
@@ -1834,7 +1791,9 @@ function getNodePath(node) {
   var result;
 
   while (parent) {
-    result = order === 'asc' ? result.concat(parent) : [parent].concat(result);
+    var _result;
+
+    result = order === 'asc' ? (_result = result) === null || _result === void 0 ? void 0 : _result.concat(parent) : [parent].concat(result);
     parent = parent.parentElement;
   }
 
@@ -1869,6 +1828,8 @@ function getNodeXPath(node) {
 
 function clickCollection() {
   document.addEventListener('click', function (e) {
+    var _path;
+
     // 点击事件
     var _config = new RequestTemplateClick({
       eventType: 'click'
@@ -1876,7 +1837,7 @@ function clickCollection() {
     var path = e.path;
     if (path === undefined) path = e.target ? getNodePath(e.target) : []; // 获取被点击的元素到最外层元素组成的数组
 
-    var target = path.find(function (el) {
+    var target = (_path = path) === null || _path === void 0 ? void 0 : _path.find(function (el) {
       return el.hasAttribute && (el.hasAttribute('data-warden-container') || el.hasAttribute('data-warden-event-id') || el.hasAttribute('data-warden-title'));
     });
     if (!target) return;
@@ -2245,23 +2206,40 @@ var wTracing = _objectSpread2({
 var _excluded = ["multiple", "children", "disabled"];
 
 var WButton = function WButton(props) {
+  var _multiple$children;
+
   var multiple = props.multiple,
       children = props.children,
       disabled = props.disabled,
       extraProps = _objectWithoutProperties(props, _excluded);
 
-  var menu = /*#__PURE__*/React.createElement(_Menu, {
+  var menu = /*#__PURE__*/React.createElement(Menu, {
     onClick: multiple && multiple.handleMenuClick
   }, multiple && multiple.children && multiple.children.map(function (child, index) {
-    return /*#__PURE__*/React.createElement(_Menu.Item, {
+    return /*#__PURE__*/React.createElement(Menu.Item, {
       key: index
     }, child);
   }));
-  return multiple ? /*#__PURE__*/React.createElement(_Dropdown.Button, {
-    disabled: disabled,
-    onClick: multiple && multiple.handleClick,
-    overlay: menu
-  }, children) : /*#__PURE__*/React.createElement(_Button, _objectSpread2({
+  return multiple ?
+  /*#__PURE__*/
+  // <Dropdown.Button
+  //   disabled={disabled}
+  //   onClick={multiple && multiple.handleClick}
+  //   overlay={menu}
+  // >
+  //   {children}
+  // </Dropdown.Button>
+  React.createElement(Dropdown.Button, {
+    menu: {
+      items: multiple === null || multiple === void 0 ? void 0 : (_multiple$children = multiple.children) === null || _multiple$children === void 0 ? void 0 : _multiple$children.map(function (child, index) {
+        return {
+          key: (child === null || child === void 0 ? void 0 : child.key) || index,
+          label: (child === null || child === void 0 ? void 0 : child.label) || child
+        };
+      }),
+      onClick: multiple && multiple.handleMenuClick
+    }
+  }, children) : /*#__PURE__*/React.createElement(Button, _objectSpread2({
     disabled: disabled
   }, extraProps), children);
 };
@@ -2290,15 +2268,15 @@ var index = createFromIconfontCN({
 var WInput = function WInput(props) {
   var extraProps = _extends({}, props);
 
-  return /*#__PURE__*/React.createElement(_Input, _objectSpread2({}, extraProps));
+  return /*#__PURE__*/React.createElement(Input, _objectSpread2({}, extraProps));
 };
 
 var Index = WInput;
-Index.TextArea = _Input.TextArea;
+Index.TextArea = Input.TextArea;
 WInput.defaultProps = {};
 
 var _excluded$1 = ["value", "onChange", "onRemove", "beforeUpload", "uploadButton", "maxCount", "splitStr", "fetchMethod", "getFileList", "type"];
-var Dragger = _Upload.Dragger;
+var Dragger = Upload$1.Dragger;
 
 function Index$1(_ref, ref) {
   var value = _ref.value,
@@ -2379,13 +2357,13 @@ function Index$1(_ref, ref) {
     var isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png';
 
     if (!isJpgOrPng) {
-      _message.error('You can only upload JPG/PNG file!');
+      message.error('You can only upload JPG/PNG file!');
     }
 
     var isLt2M = file.size / 1024 / 1024 < 2;
 
     if (!isLt2M) {
-      _message.error('Image must smaller than 2MB!');
+      message.error('Image must smaller than 2MB!');
     }
 
     return beforeUpload ? beforeUpload(file) : isJpgOrPng && isLt2M;
@@ -2557,7 +2535,7 @@ function Index$1(_ref, ref) {
 
       return setProgress(Math.floor(percent));
     }
-  }, props), fileList.length >= maxCount ? null : uploadButton ? uploadButton : uploadButtonDom) : /*#__PURE__*/React.createElement(_Upload, _objectSpread2({
+  }, props), fileList.length >= maxCount ? null : uploadButton ? uploadButton : uploadButtonDom) : /*#__PURE__*/React.createElement(Upload$1, _objectSpread2({
     accept: "image/*",
     fileList: fileList,
     listType: "picture-card",
@@ -2578,8 +2556,8 @@ function Index$1(_ref, ref) {
 
       return setProgress(Math.floor(percent));
     }
-  }, props), fileList.length >= maxCount ? null : uploadButton ? uploadButton : uploadButtonDom), /*#__PURE__*/React.createElement(_Modal, {
-    visible: previewVisible,
+  }, props), fileList.length >= maxCount ? null : uploadButton ? uploadButton : uploadButtonDom), /*#__PURE__*/React.createElement(Modal$2, {
+    open: previewVisible,
     title: previewTitle,
     footer: null,
     onCancel: handleCancel
@@ -2604,20 +2582,32 @@ var Upload = /*#__PURE__*/React.forwardRef(Index$1);
 var WInputNumber = function WInputNumber(props) {
   var extraProps = _extends({}, props);
 
-  return /*#__PURE__*/React.createElement(_InputNumber, _objectSpread2({}, extraProps));
+  return /*#__PURE__*/React.createElement(InputNumber, _objectSpread2({}, extraProps));
 };
 
 WInputNumber.defaultProps = {};
 
 var _excluded$2 = ["getRangePickerValue", "panelType"];
-moment.locale('zh-cn');
+dayjs.locale('zh-cn');
 
 var WDatePicker = function WDatePicker(props) {
   var extraProps = _extends({}, props);
 
-  return /*#__PURE__*/React.createElement(_DatePicker, _objectSpread2({
+  return /*#__PURE__*/React.createElement(DatePicker, _objectSpread2(_objectSpread2({
     locale: zhCN
-  }, extraProps));
+  }, extraProps), {}, {
+    clearIcon: /*#__PURE__*/React.createElement("div", {
+      className: "clearIconBox"
+    }, /*#__PURE__*/React.createElement(CloseCircleOutlined, {
+      className: "clearIcon"
+    })),
+    suffixIcon: /*#__PURE__*/React.createElement("div", {
+      className: "dateIcon"
+    }, /*#__PURE__*/React.createElement("img", {
+      className: "datePickerIcon",
+      src: require('../../assets/icon/datePickerIcon.png')
+    }))
+  }));
 };
 
 WDatePicker.defaultProps = {};
@@ -2644,6 +2634,17 @@ var RangePicker = function RangePicker(props) {
   if (panelType === 'within') {
     return /*#__PURE__*/React.createElement(RangePicker, _objectSpread2({
       locale: zhCN,
+      clearIcon: /*#__PURE__*/React.createElement("div", {
+        className: "clearIconBox"
+      }, /*#__PURE__*/React.createElement(CloseCircleOutlined, {
+        className: "clearIcon"
+      })),
+      suffixIcon: /*#__PURE__*/React.createElement("div", {
+        className: "dateIcon"
+      }, /*#__PURE__*/React.createElement("img", {
+        className: "datePickerIcon",
+        src: require('../../assets/icon/datePickerIcon.png')
+      })),
       value: rangePickerValue,
       onChange: function onChange(date) {
         setRadioValue('');
@@ -2667,41 +2668,41 @@ var RangePicker = function RangePicker(props) {
           }
         }, /*#__PURE__*/React.createElement("div", {
           id: "withinDateNav"
-        }, /*#__PURE__*/React.createElement(_Radio.Group, {
+        }, /*#__PURE__*/React.createElement(Radio.Group, {
           optionType: "button",
           buttonStyle: "solid",
           value: radioValue,
           onChange: function onChange(e) {
             setRadioValue(e.target.value);
           }
-        }, /*#__PURE__*/React.createElement(_Space, {
+        }, /*#__PURE__*/React.createElement(Space, {
           direction: "vertical",
-          size: 'middle'
-        }, /*#__PURE__*/React.createElement(_Radio.Button, {
+          size: 28
+        }, /*#__PURE__*/React.createElement(Radio.Button, {
           value: '1',
           onClick: function onClick() {
-            setRangePickerValue([moment().startOf('day'), moment().endOf('day')]);
+            setRangePickerValue([dayjs().startOf('day'), dayjs().endOf('day')]);
           }
-        }, /*#__PURE__*/React.createElement("span", null, "\u4ECA\u65E5")), /*#__PURE__*/React.createElement(_Radio.Button, {
+        }, /*#__PURE__*/React.createElement("span", null, "\u4ECA\u65E5")), /*#__PURE__*/React.createElement(Radio.Button, {
           value: '2',
           onClick: function onClick() {
-            setRangePickerValue([moment().startOf('week'), moment().endOf('week')]);
+            setRangePickerValue([dayjs().startOf('week'), dayjs().endOf('week')]);
           }
-        }, /*#__PURE__*/React.createElement("span", null, "\u672C\u5468")), /*#__PURE__*/React.createElement(_Radio.Button, {
+        }, /*#__PURE__*/React.createElement("span", null, "\u672C\u5468")), /*#__PURE__*/React.createElement(Radio.Button, {
           value: '3',
           onClick: function onClick() {
-            setRangePickerValue([moment().startOf('month'), moment().endOf('month')]);
+            setRangePickerValue([dayjs().startOf('month'), dayjs().endOf('month')]);
           }
-        }, /*#__PURE__*/React.createElement("span", null, "\u672C\u6708")), /*#__PURE__*/React.createElement(_Radio.Button, {
+        }, /*#__PURE__*/React.createElement("span", null, "\u672C\u6708")), /*#__PURE__*/React.createElement(Radio.Button, {
           value: '4',
           onClick: function onClick() {
-            setRangePickerValue([moment().startOf('year'), moment().endOf('year')]);
+            setRangePickerValue([dayjs().startOf('year'), dayjs().endOf('year')]);
           }
         }, /*#__PURE__*/React.createElement("span", null, "\u672C\u5E74")))))), /*#__PURE__*/React.createElement("div", null, originalPanel));
       }
     }, extraProps));
   } else if (panelType === 'outside') {
-    return /*#__PURE__*/React.createElement(_Space, {
+    return /*#__PURE__*/React.createElement(Space, {
       split: /*#__PURE__*/React.createElement("span", {
         style: {
           color: '#768CAD'
@@ -2709,30 +2710,41 @@ var RangePicker = function RangePicker(props) {
       }, "\u2014\u2014")
     }, /*#__PURE__*/React.createElement("div", {
       id: "outsideNav"
-    }, /*#__PURE__*/React.createElement(_Radio.Group, {
+    }, /*#__PURE__*/React.createElement(Radio.Group, {
       optionType: "button",
       buttonStyle: "solid",
       value: radioValue,
       onChange: function onChange(e) {
         setRadioValue(e.target.value);
       }
-    }, /*#__PURE__*/React.createElement(_Radio.Button, {
+    }, /*#__PURE__*/React.createElement(Radio.Button, {
       value: '1',
       onClick: function onClick() {
-        setRangePickerValue([moment().startOf('year'), moment().endOf('year')]);
+        setRangePickerValue([dayjs().startOf('year'), dayjs().endOf('year')]);
       }
-    }, /*#__PURE__*/React.createElement("span", null, "\u5E74")), /*#__PURE__*/React.createElement(_Radio.Button, {
+    }, /*#__PURE__*/React.createElement("span", null, "\u5E74")), /*#__PURE__*/React.createElement(Radio.Button, {
       value: '2',
       onClick: function onClick() {
-        setRangePickerValue([moment().startOf('month'), moment().endOf('month')]);
+        setRangePickerValue([dayjs().startOf('month'), dayjs().endOf('month')]);
       }
-    }, /*#__PURE__*/React.createElement("span", null, "\u6708")), /*#__PURE__*/React.createElement(_Radio.Button, {
+    }, /*#__PURE__*/React.createElement("span", null, "\u6708")), /*#__PURE__*/React.createElement(Radio.Button, {
       value: '3',
       onClick: function onClick() {
-        setRangePickerValue([moment().startOf('day'), moment().endOf('day')]);
+        setRangePickerValue([dayjs().startOf('day'), dayjs().endOf('day')]);
       }
     }, /*#__PURE__*/React.createElement("span", null, "\u65E5")))), /*#__PURE__*/React.createElement(RangePicker, _objectSpread2({
       locale: zhCN,
+      clearIcon: /*#__PURE__*/React.createElement("div", {
+        className: "clearIconBox"
+      }, /*#__PURE__*/React.createElement(CloseCircleOutlined, {
+        className: "clearIcon"
+      })),
+      suffixIcon: /*#__PURE__*/React.createElement("div", {
+        className: "dateIcon"
+      }, /*#__PURE__*/React.createElement("img", {
+        className: "datePickerIcon",
+        src: require('../../assets/icon/datePickerIcon.png')
+      })),
       value: rangePickerValue,
       onChange: function onChange(date) {
         setRadioValue('');
@@ -2741,7 +2753,18 @@ var RangePicker = function RangePicker(props) {
     }, extraProps)));
   }
 
-  return /*#__PURE__*/React.createElement(_DatePicker.RangePicker, _objectSpread2({
+  return /*#__PURE__*/React.createElement(DatePicker.RangePicker, _objectSpread2({
+    clearIcon: /*#__PURE__*/React.createElement("div", {
+      className: "clearIconBox"
+    }, /*#__PURE__*/React.createElement(CloseCircleOutlined, {
+      className: "clearIcon"
+    })),
+    suffixIcon: /*#__PURE__*/React.createElement("div", {
+      className: "dateIcon"
+    }, /*#__PURE__*/React.createElement("img", {
+      className: "datePickerIcon",
+      src: require('../../assets/icon/datePickerIcon.png')
+    })),
     locale: zhCN
   }, extraProps));
 };
@@ -2756,23 +2779,23 @@ var WRadio = function WRadio(props) {
   var sideButtonStyle = props.sideButtonStyle,
       extraProps = _objectWithoutProperties(props, _excluded$3);
 
-  return /*#__PURE__*/React.createElement(_Radio, _objectSpread2({}, extraProps));
+  return /*#__PURE__*/React.createElement(Radio, _objectSpread2({}, extraProps));
 };
 
 var Index$3 = WRadio;
-Index$3.Group = _Radio.Group;
-Index$3.Button = _Radio.Button;
+Index$3.Group = Radio.Group;
+Index$3.Button = Radio.Button;
 WRadio.defaultProps = {};
 
 var WCheckbox = function WCheckbox(props) {
   var extraProps = _extends({}, props);
 
-  return /*#__PURE__*/React.createElement(_Checkbox, _objectSpread2({}, extraProps));
+  return /*#__PURE__*/React.createElement(Checkbox, _objectSpread2({}, extraProps));
 };
 
 WCheckbox.defaultProps = {};
 var Index$4 = WCheckbox;
-Index$4.Group = _Checkbox.Group;
+Index$4.Group = Checkbox.Group;
 
 /*
  * @Author: lijin
@@ -2986,7 +3009,7 @@ var WSelect = function WSelect(props) {
                     label = _ref2.label,
                     extraProps = _objectWithoutProperties(_ref2, _excluded2);
 
-                return /*#__PURE__*/React.createElement(_Select.Option, _objectSpread2({
+                return /*#__PURE__*/React.createElement(Select.Option, _objectSpread2({
                   key: value,
                   value: value
                 }, extraProps), label) || /*#__PURE__*/React.createElement(React.Fragment, null);
@@ -3020,7 +3043,7 @@ var WSelect = function WSelect(props) {
           label: text,
           value: key
         });
-        valueEnumNode.push( /*#__PURE__*/React.createElement(_Select.Option, {
+        valueEnumNode.push( /*#__PURE__*/React.createElement(Select.Option, {
           key: key,
           value: key
         }, text));
@@ -3033,7 +3056,7 @@ var WSelect = function WSelect(props) {
       isUnmount = true;
     };
   }, [JSON.stringify(params || {})]);
-  return /*#__PURE__*/React.createElement(_Select, _objectSpread2({
+  return /*#__PURE__*/React.createElement(Select, _objectSpread2({
     showSearch: true,
     filterOption: function filterOption(input, option) {
       var _ref3;
@@ -3051,20 +3074,20 @@ var Option = function Option(props) {
   var children = props.children,
       extraProps = _objectWithoutProperties(props, _excluded3);
 
-  return /*#__PURE__*/React.createElement(_Select.Option, _objectSpread2({}, extraProps), children);
+  return /*#__PURE__*/React.createElement(Select.Option, _objectSpread2({}, extraProps), children);
 };
 
 var Index$5 = WSelect;
 Index$5.Option = Option;
-var Select = /*#__PURE__*/memo(Index$5);
 
 var _excluded$6 = ["defaultValue", "format", "value", "onChange"],
     _excluded2$1 = ["defaultValue", "value", "format", "showTime", "onChange"];
-moment.locale('zh-cn');
+dayjs.locale('zh-cn');
 
 var momentValue = function momentValue(value) {
   if (value) {
-    return moment(value);
+    var a = dayjs.isDayjs(value);
+    return a ? value : dayjs(value);
   }
 
   return value;
@@ -3077,7 +3100,7 @@ var WDatePicker$1 = function WDatePicker(props) {
       _onChange = props.onChange,
       extraProps = _objectWithoutProperties(props, _excluded$6);
 
-  return /*#__PURE__*/React.createElement(_DatePicker, _objectSpread2(_objectSpread2({
+  return /*#__PURE__*/React.createElement(DatePicker, _objectSpread2(_objectSpread2({
     locale: zhCN,
     defaultValue: momentValue(defaultValue),
     value: momentValue(value)
@@ -3085,9 +3108,9 @@ var WDatePicker$1 = function WDatePicker(props) {
     format: format
   } : {}), {}, {
     onChange: function onChange(v) {
-      var _momentValue2, _momentValue3;
+      var _momentValue, _momentValue2;
 
-      _onChange === null || _onChange === void 0 ? void 0 : _onChange((_momentValue2 = momentValue(v)) === null || _momentValue2 === void 0 ? void 0 : _momentValue2.format(format || (extraProps.showTime ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD')), (_momentValue3 = momentValue(v)) === null || _momentValue3 === void 0 ? void 0 : _momentValue3.format(format || (extraProps.showTime ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD')));
+      _onChange === null || _onChange === void 0 ? void 0 : _onChange((_momentValue = momentValue(v)) === null || _momentValue === void 0 ? void 0 : _momentValue.format(format || (extraProps.showTime ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD')), (_momentValue2 = momentValue(v)) === null || _momentValue2 === void 0 ? void 0 : _momentValue2.format(format || (extraProps.showTime ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD')));
     }
   }, extraProps));
 };
@@ -3102,15 +3125,15 @@ var RangePicker$1 = function RangePicker(props) {
       _onChange2 = props.onChange,
       extraProps = _objectWithoutProperties(props, _excluded2$1);
 
-  return /*#__PURE__*/React.createElement(_DatePicker.RangePicker, _objectSpread2({
+  return /*#__PURE__*/React.createElement(DatePicker.RangePicker, _objectSpread2({
     locale: zhCN,
     showTime: showTime,
     defaultValue: defaultValue ? [momentValue(defaultValue[0]), momentValue(defaultValue[1])] : undefined,
     value: value ? [momentValue(value[0]), momentValue(value[1])] : undefined,
     onChange: function onChange(v) {
-      var _momentValue4, _momentValue5, _momentValue6, _momentValue7;
+      var _momentValue3, _momentValue4, _momentValue5, _momentValue6;
 
-      _onChange2 === null || _onChange2 === void 0 ? void 0 : _onChange2([((_momentValue4 = momentValue(v[0])) === null || _momentValue4 === void 0 ? void 0 : _momentValue4.format(format || (showTime ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD'))) || '', ((_momentValue5 = momentValue(v[1])) === null || _momentValue5 === void 0 ? void 0 : _momentValue5.format(format || (showTime ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD'))) || ''], [((_momentValue6 = momentValue(v[0])) === null || _momentValue6 === void 0 ? void 0 : _momentValue6.format(format || (showTime ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD'))) || '', ((_momentValue7 = momentValue(v[1])) === null || _momentValue7 === void 0 ? void 0 : _momentValue7.format(format || (showTime ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD'))) || '']);
+      _onChange2 === null || _onChange2 === void 0 ? void 0 : _onChange2([((_momentValue3 = momentValue(v[0])) === null || _momentValue3 === void 0 ? void 0 : _momentValue3.format(format || (showTime ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD'))) || '', ((_momentValue4 = momentValue(v[1])) === null || _momentValue4 === void 0 ? void 0 : _momentValue4.format(format || (showTime ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD'))) || ''], [((_momentValue5 = momentValue(v[0])) === null || _momentValue5 === void 0 ? void 0 : _momentValue5.format(format || (showTime ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD'))) || '', ((_momentValue6 = momentValue(v[1])) === null || _momentValue6 === void 0 ? void 0 : _momentValue6.format(format || (showTime ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD'))) || '']);
     }
   }, extraProps));
 };
@@ -3122,7 +3145,7 @@ Index$6.RangePicker = RangePicker$1;
 var WSwitch = function WSwitch(props) {
   var extraProps = _extends({}, props);
 
-  return /*#__PURE__*/React.createElement(_Switch, _objectSpread2({}, extraProps));
+  return /*#__PURE__*/React.createElement(Switch, _objectSpread2({}, extraProps));
 };
 
 WSwitch.defaultProps = {};
@@ -3186,7 +3209,7 @@ var NumericInput = /*#__PURE__*/function (_React$Component) {
         valueTemp = value.slice(0, -1);
       }
 
-      onChange && onChange(valueTemp.replace(/0*(\d+)/, '$1'));
+      valueTemp && onChange && onChange(valueTemp.replace(/0*(\d+)/, '$1'));
 
       if (onBlur) {
         onBlur && onBlur();
@@ -3203,12 +3226,12 @@ var NumericInput = /*#__PURE__*/function (_React$Component) {
       var title = value ? /*#__PURE__*/React.createElement("span", {
         className: "numeric-input-title"
       }, value !== '-' ? formatNumber(value) : '-') : '输入一个数字';
-      return /*#__PURE__*/React.createElement(_Tooltip, {
+      return /*#__PURE__*/React.createElement(Tooltip, {
         trigger: ['focus'],
         title: title,
         placement: "topLeft",
         overlayClassName: "numeric-input"
-      }, /*#__PURE__*/React.createElement(_Input, _objectSpread2(_objectSpread2({}, this.props), {}, {
+      }, /*#__PURE__*/React.createElement(Input, _objectSpread2(_objectSpread2({}, this.props), {}, {
         onChange: this.onChange,
         onBlur: this.onBlur,
         maxLength: 64
@@ -3236,7 +3259,7 @@ var TreeSelect = function TreeSelect(_ref) {
 
   var renderTree = function renderTree(data) {
     return data === null || data === void 0 ? void 0 : data.map(function (item) {
-      return /*#__PURE__*/React.createElement(_TreeSelect.TreeNode, {
+      return /*#__PURE__*/React.createElement(TreeSelect$1.TreeNode, {
         value: item[treeNodeValueProp],
         title: item[treeNodeLabelProp],
         key: item[treeNodeValueProp]
@@ -3297,7 +3320,7 @@ var TreeSelect = function TreeSelect(_ref) {
       isUnmount = true;
     };
   }, [JSON.stringify(params)]);
-  return /*#__PURE__*/React.createElement(_TreeSelect, _objectSpread2({
+  return /*#__PURE__*/React.createElement(TreeSelect$1, _objectSpread2({
     showSearch: true,
     treeNodeFilterProp: "title",
     treeDefaultExpandAll: true
@@ -3305,7 +3328,7 @@ var TreeSelect = function TreeSelect(_ref) {
 };
 
 var Index$7 = TreeSelect;
-Index$7.TreeNode = _TreeSelect.TreeNode;
+Index$7.TreeNode = TreeSelect$1.TreeNode;
 
 var _excluded$8 = ["request", "options", "onLoad", "value", "onChange", "params"];
 
@@ -3373,7 +3396,7 @@ var WCascader = function WCascader(props) {
       isUnmount = true;
     };
   }, [JSON.stringify(params)]);
-  return /*#__PURE__*/React.createElement(_Cascader, _objectSpread2({
+  return /*#__PURE__*/React.createElement(Cascader, _objectSpread2({
     value: typeof value === 'string' ? [value] : value,
     onChange: function onChange(v, options) {
       _onChange === null || _onChange === void 0 ? void 0 : _onChange(v, options);
@@ -3402,7 +3425,7 @@ var WForm = function WForm(props, ref) {
       deps = props.deps,
       extraProps = _objectWithoutProperties(props, _excluded$9);
 
-  var _Form$useForm = _Form.useForm(),
+  var _Form$useForm = Form.useForm(),
       _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
       form = _Form$useForm2[0];
 
@@ -3462,17 +3485,17 @@ var WForm = function WForm(props, ref) {
         };
       }
 
-      return /*#__PURE__*/React.createElement(_Col, _objectSpread2(_objectSpread2({
+      return /*#__PURE__*/React.createElement(Col, _objectSpread2(_objectSpread2({
         className: "pl12 pr12"
       }, colProps), {}, {
         key: c.dataIndex
-      }), /*#__PURE__*/React.createElement(_Form.Item, _objectSpread2(_objectSpread2({
+      }), /*#__PURE__*/React.createElement(Form.Item, _objectSpread2(_objectSpread2({
         initialValue: c.initialValue
       }, c.formItemProps), {}, {
         name: c.dataIndex,
         label: c.title,
         labelCol: labelCol
-      }), /*#__PURE__*/React.createElement(Select, _objectSpread2(_objectSpread2({
+      }), /*#__PURE__*/React.createElement(Index$5, _objectSpread2(_objectSpread2({
         placeholder: "\u8BF7\u9009\u62E9",
         disabled: disabled,
         onLoad: function onLoad(opt) {
@@ -3505,11 +3528,11 @@ var WForm = function WForm(props, ref) {
         };
       }
 
-      return /*#__PURE__*/React.createElement(_Col, _objectSpread2(_objectSpread2({
+      return /*#__PURE__*/React.createElement(Col, _objectSpread2(_objectSpread2({
         className: "pl12 pr12"
       }, colProps), {}, {
         key: c.dataIndex
-      }), /*#__PURE__*/React.createElement(_Form.Item, _objectSpread2(_objectSpread2({
+      }), /*#__PURE__*/React.createElement(Form.Item, _objectSpread2(_objectSpread2({
         initialValue: c.initialValue
       }, c.formItemProps), {}, {
         name: c.dataIndex,
@@ -3533,11 +3556,11 @@ var WForm = function WForm(props, ref) {
         };
       }
 
-      return /*#__PURE__*/React.createElement(_Col, _objectSpread2(_objectSpread2({
+      return /*#__PURE__*/React.createElement(Col, _objectSpread2(_objectSpread2({
         className: "pl12 pr12"
       }, colProps), {}, {
         key: c.dataIndex
-      }), /*#__PURE__*/React.createElement(_Form.Item, _objectSpread2(_objectSpread2({
+      }), /*#__PURE__*/React.createElement(Form.Item, _objectSpread2(_objectSpread2({
         initialValue: c.initialValue
       }, c.formItemProps), {}, {
         name: c.dataIndex,
@@ -3569,11 +3592,11 @@ var WForm = function WForm(props, ref) {
         };
       }
 
-      return /*#__PURE__*/React.createElement(_Col, _objectSpread2(_objectSpread2({
+      return /*#__PURE__*/React.createElement(Col, _objectSpread2(_objectSpread2({
         className: "pl12 pr12"
       }, colProps), {}, {
         key: c.dataIndex
-      }), /*#__PURE__*/React.createElement(_Form.Item, _objectSpread2(_objectSpread2({
+      }), /*#__PURE__*/React.createElement(Form.Item, _objectSpread2(_objectSpread2({
         initialValue: c.initialValue
       }, c.formItemProps), {}, {
         name: c.dataIndex,
@@ -3616,11 +3639,11 @@ var WForm = function WForm(props, ref) {
         };
       }
 
-      return /*#__PURE__*/React.createElement(_Col, _objectSpread2(_objectSpread2({
+      return /*#__PURE__*/React.createElement(Col, _objectSpread2(_objectSpread2({
         className: "pl12 pr12"
       }, colProps), {}, {
         key: c.dataIndex
-      }), /*#__PURE__*/React.createElement(_Form.Item, _objectSpread2(_objectSpread2({
+      }), /*#__PURE__*/React.createElement(Form.Item, _objectSpread2(_objectSpread2({
         initialValue: c.initialValue
       }, c.formItemProps), {}, {
         name: c.dataIndex,
@@ -3649,11 +3672,11 @@ var WForm = function WForm(props, ref) {
         };
       }
 
-      return /*#__PURE__*/React.createElement(_Col, _objectSpread2(_objectSpread2({
+      return /*#__PURE__*/React.createElement(Col, _objectSpread2(_objectSpread2({
         className: "pl12 pr12"
       }, colProps), {}, {
         key: c.dataIndex
-      }), /*#__PURE__*/React.createElement(_Form.Item, _objectSpread2(_objectSpread2({
+      }), /*#__PURE__*/React.createElement(Form.Item, _objectSpread2(_objectSpread2({
         initialValue: c.initialValue
       }, c.formItemProps), {}, {
         name: c.dataIndex,
@@ -3693,11 +3716,11 @@ var WForm = function WForm(props, ref) {
         };
       }
 
-      return /*#__PURE__*/React.createElement(_Col, _objectSpread2(_objectSpread2({
+      return /*#__PURE__*/React.createElement(Col, _objectSpread2(_objectSpread2({
         className: "pl12 pr12"
       }, colProps), {}, {
         key: c.dataIndex
-      }), /*#__PURE__*/React.createElement(_Form.Item, _objectSpread2(_objectSpread2({
+      }), /*#__PURE__*/React.createElement(Form.Item, _objectSpread2(_objectSpread2({
         initialValue: c.initialValue
       }, c.formItemProps), {}, {
         name: c.dataIndex,
@@ -3748,11 +3771,11 @@ var WForm = function WForm(props, ref) {
         };
       }
 
-      return /*#__PURE__*/React.createElement(_Col, _objectSpread2(_objectSpread2({
+      return /*#__PURE__*/React.createElement(Col, _objectSpread2(_objectSpread2({
         className: "pl12 pr12"
       }, colProps), {}, {
         key: c.dataIndex
-      }), /*#__PURE__*/React.createElement(_Form.Item, _objectSpread2(_objectSpread2({
+      }), /*#__PURE__*/React.createElement(Form.Item, _objectSpread2(_objectSpread2({
         initialValue: c.initialValue
       }, c.formItemProps), {}, {
         name: c.dataIndex,
@@ -3791,11 +3814,11 @@ var WForm = function WForm(props, ref) {
       setColumnsFields(function (preColumnsFields) {
         return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, _options2));
       });
-      return /*#__PURE__*/React.createElement(_Col, _objectSpread2(_objectSpread2({
+      return /*#__PURE__*/React.createElement(Col, _objectSpread2(_objectSpread2({
         className: "pl12 pr12"
       }, colProps), {}, {
         key: c.dataIndex
-      }), /*#__PURE__*/React.createElement(_Form.Item, _objectSpread2(_objectSpread2({
+      }), /*#__PURE__*/React.createElement(Form.Item, _objectSpread2(_objectSpread2({
         initialValue: c.initialValue,
         valuePropName: "checked"
       }, c.formItemProps), {}, {
@@ -3814,11 +3837,11 @@ var WForm = function WForm(props, ref) {
         };
       }
 
-      return /*#__PURE__*/React.createElement(_Col, _objectSpread2(_objectSpread2({
+      return /*#__PURE__*/React.createElement(Col, _objectSpread2(_objectSpread2({
         className: "pl12 pr12"
       }, colProps), {}, {
         key: c.dataIndex
-      }), /*#__PURE__*/React.createElement(_Form.Item, _objectSpread2(_objectSpread2({
+      }), /*#__PURE__*/React.createElement(Form.Item, _objectSpread2(_objectSpread2({
         initialValue: c.initialValue
       }, c.formItemProps), {}, {
         name: c.dataIndex,
@@ -3844,11 +3867,11 @@ var WForm = function WForm(props, ref) {
         columnsFields: columnsFields // columnsFieldsRef,
 
       }), form);
-      return baseitem ? /*#__PURE__*/React.createElement(_Col, _objectSpread2(_objectSpread2({
+      return baseitem ? /*#__PURE__*/React.createElement(Col, _objectSpread2(_objectSpread2({
         className: "pl12 pr12"
       }, colProps), {}, {
         key: c.dataIndex
-      }), /*#__PURE__*/React.createElement(_Form.Item, _objectSpread2(_objectSpread2({
+      }), /*#__PURE__*/React.createElement(Form.Item, _objectSpread2(_objectSpread2({
         initialValue: c.initialValue
       }, c.formItemProps), {}, {
         name: c.dataIndex,
@@ -3864,11 +3887,11 @@ var WForm = function WForm(props, ref) {
         };
       }
 
-      return /*#__PURE__*/React.createElement(_Col, _objectSpread2(_objectSpread2({
+      return /*#__PURE__*/React.createElement(Col, _objectSpread2(_objectSpread2({
         className: "pl12 pr12"
       }, colProps), {}, {
         key: c.dataIndex
-      }), /*#__PURE__*/React.createElement(_Form.Item, _objectSpread2(_objectSpread2({
+      }), /*#__PURE__*/React.createElement(Form.Item, _objectSpread2(_objectSpread2({
         initialValue: c.initialValue
       }, c.formItemProps), {}, {
         name: c.dataIndex,
@@ -3888,11 +3911,11 @@ var WForm = function WForm(props, ref) {
         };
       }
 
-      return /*#__PURE__*/React.createElement(_Col, _objectSpread2(_objectSpread2({
+      return /*#__PURE__*/React.createElement(Col, _objectSpread2(_objectSpread2({
         className: "pl12 pr12"
       }, colProps), {}, {
         key: c.dataIndex
-      }), /*#__PURE__*/React.createElement(_Form.Item, _objectSpread2(_objectSpread2({
+      }), /*#__PURE__*/React.createElement(Form.Item, _objectSpread2(_objectSpread2({
         initialValue: c.initialValue
       }, c.formItemProps), {}, {
         name: c.dataIndex,
@@ -3911,11 +3934,11 @@ var WForm = function WForm(props, ref) {
         };
       }
 
-      return /*#__PURE__*/React.createElement(_Col, _objectSpread2(_objectSpread2({
+      return /*#__PURE__*/React.createElement(Col, _objectSpread2(_objectSpread2({
         className: "pl12 pr12"
       }, colProps), {}, {
         key: c.dataIndex
-      }), /*#__PURE__*/React.createElement(_Form.Item, _objectSpread2(_objectSpread2({
+      }), /*#__PURE__*/React.createElement(Form.Item, _objectSpread2(_objectSpread2({
         initialValue: c.initialValue
       }, c.formItemProps), {}, {
         name: c.dataIndex,
@@ -3970,32 +3993,32 @@ var WForm = function WForm(props, ref) {
         if (c.valueType === 'date' && searchForm[c.dataIndex]) {
           var _c$fieldProps;
 
-          searchForm[c.dataIndex] = searchForm[c.dataIndex] && moment(searchForm[c.dataIndex]).format((c === null || c === void 0 ? void 0 : (_c$fieldProps = c.fieldProps) === null || _c$fieldProps === void 0 ? void 0 : _c$fieldProps.format) || 'YYYY-MM-DD');
+          searchForm[c.dataIndex] = searchForm[c.dataIndex] && dayjs(searchForm[c.dataIndex]).format((c === null || c === void 0 ? void 0 : (_c$fieldProps = c.fieldProps) === null || _c$fieldProps === void 0 ? void 0 : _c$fieldProps.format) || 'YYYY-MM-DD');
         }
 
         if (c.valueType === 'dateTime' && searchForm[c.dataIndex]) {
           var _c$fieldProps2;
 
-          searchForm[c.dataIndex] = searchForm[c.dataIndex] && moment(searchForm[c.dataIndex]).format((c === null || c === void 0 ? void 0 : (_c$fieldProps2 = c.fieldProps) === null || _c$fieldProps2 === void 0 ? void 0 : _c$fieldProps2.format) || 'YYYY-MM-DD HH:mm:ss');
+          searchForm[c.dataIndex] = searchForm[c.dataIndex] && dayjs(searchForm[c.dataIndex]).format((c === null || c === void 0 ? void 0 : (_c$fieldProps2 = c.fieldProps) === null || _c$fieldProps2 === void 0 ? void 0 : _c$fieldProps2.format) || 'YYYY-MM-DD HH:mm:ss');
         }
 
         if (c.valueType === 'dateMonth' && searchForm[c.dataIndex]) {
           var _c$fieldProps3;
 
-          searchForm[c.dataIndex] = searchForm[c.dataIndex] && moment(searchForm[c.dataIndex]).format((c === null || c === void 0 ? void 0 : (_c$fieldProps3 = c.fieldProps) === null || _c$fieldProps3 === void 0 ? void 0 : _c$fieldProps3.format) || 'YYYY-MM');
+          searchForm[c.dataIndex] = searchForm[c.dataIndex] && dayjs(searchForm[c.dataIndex]).format((c === null || c === void 0 ? void 0 : (_c$fieldProps3 = c.fieldProps) === null || _c$fieldProps3 === void 0 ? void 0 : _c$fieldProps3.format) || 'YYYY-MM');
         }
 
         if (c.valueType === 'dateYear' && searchForm[c.dataIndex]) {
           var _c$fieldProps4;
 
-          searchForm[c.dataIndex] = searchForm[c.dataIndex] && moment(searchForm[c.dataIndex]).format((c === null || c === void 0 ? void 0 : (_c$fieldProps4 = c.fieldProps) === null || _c$fieldProps4 === void 0 ? void 0 : _c$fieldProps4.format) || 'YYYY');
+          searchForm[c.dataIndex] = searchForm[c.dataIndex] && dayjs(searchForm[c.dataIndex]).format((c === null || c === void 0 ? void 0 : (_c$fieldProps4 = c.fieldProps) === null || _c$fieldProps4 === void 0 ? void 0 : _c$fieldProps4.format) || 'YYYY');
         }
 
         if (c.valueType === 'dateRange' && searchForm[c.dataIndex]) {
           searchForm[c.dataIndex] = searchForm[c.dataIndex].map(function (item) {
             var _c$fieldProps5;
 
-            return item && searchForm[c.dataIndex] && moment(item).format((c === null || c === void 0 ? void 0 : (_c$fieldProps5 = c.fieldProps) === null || _c$fieldProps5 === void 0 ? void 0 : _c$fieldProps5.format) || 'YYYY-MM-DD');
+            return item && searchForm[c.dataIndex] && dayjs(item).format((c === null || c === void 0 ? void 0 : (_c$fieldProps5 = c.fieldProps) === null || _c$fieldProps5 === void 0 ? void 0 : _c$fieldProps5.format) || 'YYYY-MM-DD');
           });
         }
 
@@ -4003,7 +4026,7 @@ var WForm = function WForm(props, ref) {
           searchForm[c.dataIndex] = searchForm[c.dataIndex].map(function (item) {
             var _c$fieldProps6;
 
-            return item && moment(item).format((c === null || c === void 0 ? void 0 : (_c$fieldProps6 = c.fieldProps) === null || _c$fieldProps6 === void 0 ? void 0 : _c$fieldProps6.format) || 'YYYY-MM-DD HH:mm:ss');
+            return item && dayjs(item).format((c === null || c === void 0 ? void 0 : (_c$fieldProps6 = c.fieldProps) === null || _c$fieldProps6 === void 0 ? void 0 : _c$fieldProps6.format) || 'YYYY-MM-DD HH:mm:ss');
           });
         }
       }
@@ -4030,32 +4053,32 @@ var WForm = function WForm(props, ref) {
         if (c.valueType === 'date' && searchForm[c.dataIndex]) {
           var _c$fieldProps7;
 
-          searchForm[c.dataIndex] = searchForm[c.dataIndex] && moment(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');
+          searchForm[c.dataIndex] = searchForm[c.dataIndex] && dayjs(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] && moment(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');
+          searchForm[c.dataIndex] = searchForm[c.dataIndex] && dayjs(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] && moment(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');
+          searchForm[c.dataIndex] = searchForm[c.dataIndex] && dayjs(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] && moment(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');
+          searchForm[c.dataIndex] = searchForm[c.dataIndex] && dayjs(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] && moment(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');
+            return item && searchForm[c.dataIndex] && dayjs(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');
           });
         }
 
@@ -4063,7 +4086,7 @@ var WForm = function WForm(props, ref) {
           searchForm[c.dataIndex] = searchForm[c.dataIndex].map(function (item) {
             var _c$fieldProps12;
 
-            return item && moment(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 item && dayjs(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');
           });
         }
       }
@@ -4121,7 +4144,7 @@ var WForm = function WForm(props, ref) {
       }
     };
   }, []);
-  return /*#__PURE__*/React.createElement(_Form, _objectSpread2({
+  return /*#__PURE__*/React.createElement(Form, _objectSpread2({
     style: {
       width: '100%'
     },
@@ -4134,9 +4157,9 @@ var WForm = function WForm(props, ref) {
       setchangedValues(changedValues);
     },
     form: form
-  }, extraProps), /*#__PURE__*/React.createElement(_Row, null, filterForm, filterExtraColumnsForm, search && search.hideSubmit ? null : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Col, _objectSpread2({
+  }, extraProps), /*#__PURE__*/React.createElement(Row, null, filterForm, filterExtraColumnsForm, search && search.hideSubmit ? null : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Col, _objectSpread2({
     className: "pl20"
-  }, search ? search === null || search === void 0 ? void 0 : search.searchButtonConfig : {}), /*#__PURE__*/React.createElement(_Form.Item, null, /*#__PURE__*/React.createElement("div", {
+  }, search ? search === null || search === void 0 ? void 0 : search.searchButtonConfig : {}), /*#__PURE__*/React.createElement(Form.Item, null, /*#__PURE__*/React.createElement("div", {
     style: {
       display: 'flex'
     }
@@ -4180,9 +4203,9 @@ var WForm = function WForm(props, ref) {
     icon: /*#__PURE__*/React.createElement(ReloadOutlined, null),
     onClick: handleRest
   }, search && search.resetText ? search.resetText : '重置')) : null))), search && (search === null || search === void 0 ? void 0 : search.tableBarDom) && (search === null || search === void 0 ? void 0 : search.tableBarDom.map(function (dom) {
-    return /*#__PURE__*/React.createElement(_Col, _objectSpread2({
+    return /*#__PURE__*/React.createElement(Col, _objectSpread2({
       className: "pr20"
-    }, search ? search === null || search === void 0 ? void 0 : search.searchButtonConfig : {}), /*#__PURE__*/React.createElement(_Form.Item, null, dom));
+    }, search ? search === null || search === void 0 ? void 0 : search.searchButtonConfig : {}), /*#__PURE__*/React.createElement(Form.Item, null, dom));
   })))));
 };
 
@@ -4405,7 +4428,7 @@ function Table(_ref) {
           if (c.showTitle) {
             var _columnsFields$c$data;
 
-            return /*#__PURE__*/React.createElement(_Tooltip, {
+            return /*#__PURE__*/React.createElement(Tooltip, {
               key: c.dataIndex,
               placement: "top",
               title: record[c.dataIndex]
@@ -4658,7 +4681,7 @@ function Table(_ref) {
     setFormSearch({});
   };
 
-  return /*#__PURE__*/React.createElement(_Spin, {
+  return /*#__PURE__*/React.createElement(Spin, {
     spinning: loading
   }, /*#__PURE__*/React.createElement("div", {
     className: "form"
@@ -4748,7 +4771,7 @@ function Table(_ref) {
       justifyContent: 'center',
       alignItems: 'center'
     }
-  }, none || '暂无数据')))), _typeof(pagination) === 'object' && /*#__PURE__*/React.createElement(_Pagination, _objectSpread2({
+  }, none || '暂无数据')))), _typeof(pagination) === 'object' && /*#__PURE__*/React.createElement(Pagination, _objectSpread2({
     style: {
       textAlign: 'right'
     },
@@ -5199,7 +5222,7 @@ var Index$b = function Index(_ref) {
 
 var _excluded$f = ["data", "onClick", "slidesPerView", "rowKey", "onSwiperChange", "renderItem"];
 
-SwiperCore.use([Pagination, Navigation, Autoplay, Virtual]);
+SwiperCore.use([Pagination$1, Navigation, Autoplay, Virtual]);
 
 var Index$c = function Index(props) {
   var data = props.data,
@@ -5880,7 +5903,7 @@ var Index$d = function Index(_ref) {
       className = _ref.className,
       props = _objectWithoutProperties(_ref, _excluded$g);
 
-  return /*#__PURE__*/React.createElement(_Breadcrumb, _objectSpread2({
+  return /*#__PURE__*/React.createElement(Breadcrumb, _objectSpread2({
     className: className || 'default',
     separator: ">>",
     itemRender: itemRender,
@@ -5952,7 +5975,7 @@ var controlShow = function controlShow(f1, f2, value, timer) {
 
 function DialogModel(props, ref) {
   var width = props.width,
-      visible = props.visible,
+      open = props.open,
       destroyOnClose = props.destroyOnClose,
       closeCb = props.closeCb,
       onClose = props.onClose,
@@ -5962,17 +5985,17 @@ function DialogModel(props, ref) {
       className = _props$className === void 0 ? 'default-dialog' : _props$className,
       style = props.style;
 
-  var _useState = useState(visible),
+  var _useState = useState(open),
       _useState2 = _slicedToArray(_useState, 2),
       modelShow = _useState2[0],
       setModelShow = _useState2[1];
 
-  var _useState3 = useState(visible),
+  var _useState3 = useState(open),
       _useState4 = _slicedToArray(_useState3, 2),
       modelShowAync = _useState4[0],
       setModelShowAync = _useState4[1];
 
-  var _useState5 = useState(visible),
+  var _useState5 = useState(open),
       _useState6 = _slicedToArray(_useState5, 2),
       flag = _useState6[0],
       setFlag = _useState6[1];
@@ -6111,18 +6134,18 @@ function DialogModel(props, ref) {
   }, []);
   useEffect(function () {
     var timer;
-    setFlag(visible);
+    setFlag(open);
 
-    if (visible) {
-      timer = controlShow(setModelShow, setModelShowAync, visible, 30);
+    if (open) {
+      timer = controlShow(setModelShow, setModelShowAync, open, 30);
     } else {
-      timer = controlShow(setModelShowAync, setModelShow, visible, 1000);
+      timer = controlShow(setModelShowAync, setModelShow, open, 1000);
     }
 
     return function () {
       timer && clearTimeout(timer);
     };
-  }, [visible]);
+  }, [open]);
   useEffect(function () {
     if (modelShow) {
       setHasVisit(true);
@@ -6143,8 +6166,8 @@ function DialogModel(props, ref) {
 
 var Dialog = /*#__PURE__*/React.forwardRef(DialogModel);
 
-var _excluded$i = ["visible", "width", "closeCb", "onClose", "className", "style"],
-    _excluded2$3 = ["visible"];
+var _excluded$i = ["open", "width", "closeCb", "onClose", "className", "style"],
+    _excluded2$3 = ["open"];
 
 var Modal = /*#__PURE__*/function (_React$PureComponent) {
   _inherits(Modal, _React$PureComponent);
@@ -6255,7 +6278,7 @@ var Modal = /*#__PURE__*/function (_React$PureComponent) {
     key: "render",
     value: function render() {
       var _this$props4 = this.props,
-          visible = _this$props4.visible,
+          open = _this$props4.open,
           width = _this$props4.width,
           closeCb = _this$props4.closeCb,
           onClose = _this$props4.onClose,
@@ -6267,7 +6290,7 @@ var Modal = /*#__PURE__*/function (_React$PureComponent) {
         ref: this.containerRef,
         closeCb: closeCb,
         onClose: onClose,
-        visible: visible,
+        open: open,
         width: width,
         className: className,
         style: style
@@ -6292,7 +6315,7 @@ Modal.show = function (config) {
   if (Modals[modelSysbol]) return;
 
   var props = _objectSpread2(_objectSpread2({}, config), {}, {
-    visible: true
+    open: true
   });
 
   var container = document.createElement('div');
@@ -6322,18 +6345,18 @@ Modal.show = function (config) {
 
     manager.setShow = setShow;
 
-    var visible = props.visible,
+    var open = props.open,
         trueProps = _objectWithoutProperties(props, _excluded2$3);
 
     useEffect(function () {
       manager.mounted = true;
-      setShow(visible);
+      setShow(open);
     }, []);
     return /*#__PURE__*/React.createElement(Modal, _objectSpread2(_objectSpread2({}, trueProps), {}, {
       closeCb: function closeCb() {
         return manager.mounted && manager.destory();
       },
-      visible: show
+      open: show
     }));
   };
 
@@ -6367,24 +6390,24 @@ var controlShow$1 = function controlShow(f1, f2, value, timer) {
 
 function DialogModel$1(props) {
   var width = props.width,
-      visible = props.visible,
+      open = props.open,
       closeCb = props.closeCb,
       onClose = props.onClose,
       _props$className = props.className,
       className = _props$className === void 0 ? 'default-dialog' : _props$className,
       style = props.style;
 
-  var _useState = useState(visible),
+  var _useState = useState(open),
       _useState2 = _slicedToArray(_useState, 2),
       modelShow = _useState2[0],
       setModelShow = _useState2[1];
 
-  var _useState3 = useState(visible),
+  var _useState3 = useState(open),
       _useState4 = _slicedToArray(_useState3, 2),
       modelShowAync = _useState4[0],
       setModelShowAync = _useState4[1];
 
-  var _useState5 = useState(visible),
+  var _useState5 = useState(open),
       _useState6 = _slicedToArray(_useState5, 2),
       flag = _useState6[0],
       setFlag = _useState6[1];
@@ -6426,25 +6449,25 @@ function DialogModel$1(props) {
   }, [modelShowAync, modelShow, props]);
   useEffect(function () {
     var timer;
-    setFlag(visible);
+    setFlag(open);
 
-    if (visible) {
-      timer = controlShow$1(setModelShow, setModelShowAync, visible, 30);
+    if (open) {
+      timer = controlShow$1(setModelShow, setModelShowAync, open, 30);
     } else {
-      timer = controlShow$1(setModelShowAync, setModelShow, visible, 1000);
+      timer = controlShow$1(setModelShowAync, setModelShow, open, 1000);
     }
 
     return function () {
       timer && clearTimeout(timer);
     };
-  }, [visible]);
+  }, [open]);
   useEffect(function () {
     !modelShow && typeof closeCb === 'function' && closeCb();
   }, [modelShow]);
   return renderChildren;
 }
 
-var _excluded$j = ["visible"];
+var _excluded$j = ["open"];
 
 var Modal$1 = /*#__PURE__*/function (_React$PureComponent) {
   _inherits(Modal, _React$PureComponent);
@@ -6527,7 +6550,7 @@ var Modal$1 = /*#__PURE__*/function (_React$PureComponent) {
     key: "render",
     value: function render() {
       var _this$props4 = this.props,
-          visible = _this$props4.visible,
+          open = _this$props4.open,
           width = _this$props4.width,
           closeCb = _this$props4.closeCb,
           onClose = _this$props4.onClose,
@@ -6536,7 +6559,7 @@ var Modal$1 = /*#__PURE__*/function (_React$PureComponent) {
       return /*#__PURE__*/React.createElement(DialogModel$1, {
         closeCb: closeCb,
         onClose: onClose,
-        visible: visible,
+        open: open,
         width: width,
         className: className,
         style: style
@@ -6558,7 +6581,7 @@ Modal$1.show = function (config) {
   if (ModalContainer) return;
 
   var props = _objectSpread2(_objectSpread2({}, config), {}, {
-    visible: true
+    open: true
   });
 
   var container = ModalContainer = document.createElement('div');
@@ -6584,18 +6607,18 @@ Modal$1.show = function (config) {
 
     manager.setShow = setShow;
 
-    var visible = props.visible,
+    var open = props.open,
         trueProps = _objectWithoutProperties(props, _excluded$j);
 
     useEffect(function () {
       manager.mounted = true;
-      setShow(visible);
+      setShow(open);
     }, []);
     return /*#__PURE__*/React.createElement(Modal$1, _objectSpread2(_objectSpread2({}, trueProps), {}, {
       closeCb: function closeCb() {
         return manager.mounted && manager.destory();
       },
-      visible: show
+      open: show
     }));
   };
 
@@ -6614,7 +6637,7 @@ function DragBox(_ref) {
       children = _ref.children,
       closeIcon = _ref.closeIcon,
       onClose = _ref.onClose,
-      visible = _ref.visible,
+      open = _ref.open,
       isDrag = _ref.isDrag,
       isResize = _ref.isResize,
       className = _ref.className,
@@ -6633,18 +6656,18 @@ function DragBox(_ref) {
   useEffect(function () {
     var timer = null;
 
-    if (visible) {
-      setDelayVisiable(visible);
+    if (open) {
+      setDelayVisiable(open);
     } else {
       timer = setTimeout(function () {
-        setDelayVisiable(visible);
+        setDelayVisiable(open);
       }, 1000);
     }
 
     return function () {
       timer && clearTimeout(timer);
     };
-  }, [visible]);
+  }, [open]);
   useEffect(function () {
     var tltleEl = titleRef.current;
     var containerEl = containerRef.current;
@@ -6754,10 +6777,10 @@ function DragBox(_ref) {
         rElOnmousedown = null;
       }
     };
-  }, [isDrag, delayVisiable, visible, isResize]);
+  }, [isDrag, delayVisiable, open, isResize]);
   return delayVisiable ? /*#__PURE__*/React.createElement("div", {
     ref: containerRef,
-    className: "drag-container ".concat(visible ? 'animation-fade' : 'animation-fade-out', "  ").concat(className),
+    className: "drag-container ".concat(open ? 'animation-fade' : 'animation-fade-out', "  ").concat(className),
     style: _objectSpread2({
       animationDelay: "0.3s"
     }, style || {})
@@ -6785,14 +6808,14 @@ function DragBox(_ref) {
   }, children)) : /*#__PURE__*/React.createElement(React.Fragment, null);
 }
 
-var _excluded$k = ["columns", "extraColumns", "search", "visible", "setVisible", "modalFormOpend", "disabled", "submitMethod", "onSubmitSuccess", "title", "record", "onFormChange", "formItemChild", "onCancel", "modalHeaderSolt", "modalFooterSolt", "formProps"];
+var _excluded$k = ["columns", "extraColumns", "search", "open", "setOpen", "modalFormOpend", "disabled", "submitMethod", "onSubmitSuccess", "title", "record", "onFormChange", "formItemChild", "onCancel", "modalHeaderSolt", "modalFooterSolt", "formProps"];
 
 var ModalForm = function ModalForm(props, ref) {
   var columns = props.columns,
       extraColumns = props.extraColumns,
       search = props.search,
-      visible = props.visible,
-      setVisible = props.setVisible,
+      open = props.open,
+      setOpen = props.setOpen,
       modalFormOpend = props.modalFormOpend,
       disabled = props.disabled,
       submitMethod = props.submitMethod,
@@ -6849,7 +6872,7 @@ var ModalForm = function ModalForm(props, ref) {
     return {
       formRef: formRef.current,
       onSubmit: onSubmit,
-      modalFormvisible: visible,
+      modalFormvisible: open,
       setFieldsValue: setFieldsValue
     };
   });
@@ -6877,7 +6900,7 @@ var ModalForm = function ModalForm(props, ref) {
 
   var handleCancel = function handleCancel() {
     onCancel && onCancel();
-    setVisible(false);
+    setOpen(false);
   };
 
   var onSubmit = /*#__PURE__*/function () {
@@ -6897,7 +6920,7 @@ var ModalForm = function ModalForm(props, ref) {
 
               _context2.next = 5;
               return submitMethod(values, function () {
-                setVisible(false);
+                setOpen(false);
                 onCancel && onCancel();
               });
 
@@ -6926,10 +6949,10 @@ var ModalForm = function ModalForm(props, ref) {
     if (formIntance) {
       setFieldsValue(record);
     }
-  }, [visible, record, formIntance]);
-  return /*#__PURE__*/React.createElement(_Modal, _objectSpread2(_objectSpread2({
+  }, [open, record, formIntance]);
+  return /*#__PURE__*/React.createElement(Modal$2, _objectSpread2(_objectSpread2({
     title: title,
-    visible: visible,
+    open: open,
     forceRender: true
   }, disabled ? {
     footer: null
@@ -6981,8 +7004,8 @@ var TabelCard = function TabelCard(props, ref) {
 
   var _useState = useState(false),
       _useState2 = _slicedToArray(_useState, 2),
-      visible = _useState2[0],
-      setVisible = _useState2[1];
+      open = _useState2[0],
+      setOpen = _useState2[1];
 
   var _useState3 = useState({}),
       _useState4 = _slicedToArray(_useState3, 2),
@@ -7002,7 +7025,7 @@ var TabelCard = function TabelCard(props, ref) {
   });
 
   var openFormModel = function openFormModel(options) {
-    setVisible(true);
+    setOpen(true);
     setModalFormConfig(options);
   };
 
@@ -7079,7 +7102,7 @@ var TabelCard = function TabelCard(props, ref) {
       });
     },
     delete: function _delete(item, record, index) {
-      _Modal.confirm({
+      Modal$2.confirm({
         title: '删除',
         icon: /*#__PURE__*/React.createElement(ExclamationCircleOutlined, null),
         content: '是否确定要删除吗？',
@@ -7174,71 +7197,106 @@ var TabelCard = function TabelCard(props, ref) {
 
     if (tableAction && showMoreNum > 0 && showMoreNum < tableActionList.length) {
       var tableAction1 = tableActionList === null || tableActionList === void 0 ? void 0 : tableActionList.slice(0, showMoreNum);
-      var tableAction2 = tableActionList === null || tableActionList === void 0 ? void 0 : tableActionList.slice(showMoreNum);
-      var menu = /*#__PURE__*/React.createElement(_Menu, null, tableAction2.map(function (item, i) {
-        var _actionHandler$item$t2;
-
-        var btn = actionConfig[item.type];
-
-        if (btn) {
-          return /*#__PURE__*/React.createElement(_Menu.Item, {
-            key: i
-          }, /*#__PURE__*/React.createElement("a", {
-            key: btn.key,
-            onClick: function () {
-              var _onClick = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5(e) {
-                var _actionHandler$item$t;
-
-                var info;
-                return regeneratorRuntime.wrap(function _callee5$(_context5) {
-                  while (1) {
-                    switch (_context5.prev = _context5.next) {
-                      case 0:
-                        e.stopPropagation();
-                        info = null;
-
-                        if (!item.fetchInfo) {
-                          _context5.next = 6;
-                          break;
+      var tableAction2 = tableActionList === null || tableActionList === void 0 ? void 0 : tableActionList.slice(showMoreNum); // const menu = (
+      //   <Menu>
+      //     {tableAction2.map((item: any, i: number) => {
+      //       let btn = actionConfig[item.type];
+      //       if (btn) {
+      //         return (
+      //           <Menu.Item key={i}>
+      //             <a
+      //               key={btn.key}
+      //               onClick={async e => {
+      //                 e.stopPropagation();
+      //                 let info = null;
+      //                 if (item.fetchInfo) {
+      //                   info = await item.fetchInfo(record);
+      //                 }
+      //                 actionHandler[item.type]?.(item, info || record, index);
+      //               }}
+      //             >
+      //               {btn.icon} {btn.title}
+      //             </a>
+      //           </Menu.Item>
+      //         );
+      //       }
+      //       return (
+      //         <Menu.Item key={i}>
+      //           {actionHandler[item.type]?.(item, record, index)}
+      //         </Menu.Item>
+      //       );
+      //     })}
+      //   </Menu>
+      // );
+
+      var menu = {
+        items: tableAction2.map(function (item, i) {
+          var _actionHandler$item$t2;
+
+          var btn = actionConfig[item.type];
+
+          if (btn) {
+            return {
+              key: i,
+              label: /*#__PURE__*/React.createElement("a", {
+                key: btn.key,
+                onClick: function () {
+                  var _onClick = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5(e) {
+                    var _actionHandler$item$t;
+
+                    var info;
+                    return regeneratorRuntime.wrap(function _callee5$(_context5) {
+                      while (1) {
+                        switch (_context5.prev = _context5.next) {
+                          case 0:
+                            e.stopPropagation();
+                            info = null;
+
+                            if (!item.fetchInfo) {
+                              _context5.next = 6;
+                              break;
+                            }
+
+                            _context5.next = 5;
+                            return item.fetchInfo(record);
+
+                          case 5:
+                            info = _context5.sent;
+
+                          case 6:
+                            (_actionHandler$item$t = actionHandler[item.type]) === null || _actionHandler$item$t === void 0 ? void 0 : _actionHandler$item$t.call(actionHandler, item, info || record, index);
+
+                          case 7:
+                          case "end":
+                            return _context5.stop();
                         }
+                      }
+                    }, _callee5);
+                  }));
 
-                        _context5.next = 5;
-                        return item.fetchInfo(record);
-
-                      case 5:
-                        info = _context5.sent;
-
-                      case 6:
-                        (_actionHandler$item$t = actionHandler[item.type]) === null || _actionHandler$item$t === void 0 ? void 0 : _actionHandler$item$t.call(actionHandler, item, info || record, index);
-
-                      case 7:
-                      case "end":
-                        return _context5.stop();
-                    }
+                  function onClick(_x3) {
+                    return _onClick.apply(this, arguments);
                   }
-                }, _callee5);
-              }));
-
-              function onClick(_x3) {
-                return _onClick.apply(this, arguments);
-              }
 
-              return onClick;
-            }()
-          }, btn.icon, " ", btn.title));
-        }
+                  return onClick;
+                }()
+              }, btn.icon, " ", btn.title)
+            };
+          }
 
-        return /*#__PURE__*/React.createElement(_Menu.Item, {
-          key: i
-        }, (_actionHandler$item$t2 = actionHandler[item.type]) === null || _actionHandler$item$t2 === void 0 ? void 0 : _actionHandler$item$t2.call(actionHandler, item, record, index));
-      }));
+          return {
+            key: i,
+            label: (_actionHandler$item$t2 = actionHandler[item.type]) === null || _actionHandler$item$t2 === void 0 ? void 0 : _actionHandler$item$t2.call(actionHandler, item, record, index)
+          };
+        })
+      };
       return [].concat(_toConsumableArray(tableAction1.map(function (item, i) {
         var _actionHandler$item$t4;
 
         var btn = actionConfig[item.type];
 
         if (btn) {
-          return /*#__PURE__*/React.createElement(_Tooltip, {
+          return /*#__PURE__*/React.createElement(Tooltip, {
             title: btn.title,
             key: i
           }, /*#__PURE__*/React.createElement("a", {
@@ -7289,8 +7347,8 @@ var TabelCard = function TabelCard(props, ref) {
         return /*#__PURE__*/React.createElement("span", {
           key: i
         }, (_actionHandler$item$t4 = actionHandler[item.type]) === null || _actionHandler$item$t4 === void 0 ? void 0 : _actionHandler$item$t4.call(actionHandler, item, record, index));
-      })), [/*#__PURE__*/React.createElement(_Dropdown, {
-        overlay: menu,
+      })), [/*#__PURE__*/React.createElement(Dropdown, {
+        menu: menu,
         key: 'more'
       }, /*#__PURE__*/React.createElement("a", {
         key: "more"
@@ -7302,7 +7360,7 @@ var TabelCard = function TabelCard(props, ref) {
         var btn = actionConfig[item.type];
 
         if (btn) {
-          return /*#__PURE__*/React.createElement(_Tooltip, {
+          return /*#__PURE__*/React.createElement(Tooltip, {
             title: btn.title,
             key: i
           }, /*#__PURE__*/React.createElement("a", {
@@ -7326,10 +7384,10 @@ var TabelCard = function TabelCard(props, ref) {
   var tableBarDom = useMemo(function () {
     return renderTableBar === null || renderTableBar === void 0 ? void 0 : renderTableBar.map(function (item) {
       if (item.type === 'add') {
-        return /*#__PURE__*/React.createElement(_Tooltip, {
+        return /*#__PURE__*/React.createElement(Tooltip, {
           title: "\u65B0\u589E",
           key: "add"
-        }, /*#__PURE__*/React.createElement(_Button, {
+        }, /*#__PURE__*/React.createElement(Button, {
           key: "add",
           type: "primary",
           onClick: function onClick() {
@@ -7418,14 +7476,14 @@ var TabelCard = function TabelCard(props, ref) {
       formSearchRef.current = obj;
     }
   }, [columns]);
-  return /*#__PURE__*/React.createElement(React.Fragment, null, visible && /*#__PURE__*/React.createElement(ModalForm$1, _objectSpread2(_objectSpread2({
+  return /*#__PURE__*/React.createElement(React.Fragment, null, open && /*#__PURE__*/React.createElement(ModalForm$1, _objectSpread2(_objectSpread2({
     ref: modalFormRef,
     title: modalFormConfig.type || '新增',
-    visible: visible,
+    open: open,
     record: modalFormConfig.record,
     formItemChild: modalFormConfig.formItemChild,
     disabled: modalFormConfig.type == '查看',
-    setVisible: setVisible,
+    setOpen: setOpen,
     submitMethod: function () {
       var _submitMethod = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee8(values, loading) {
         return regeneratorRuntime.wrap(function _callee8$(_context8) {
@@ -7636,12 +7694,13 @@ var TabelCard = function TabelCard(props, ref) {
 
 var index$4 = /*#__PURE__*/React.forwardRef(TabelCard);
 
+extend(localeData);
 var YEAER_MONTH_FORMAT_EN = 'YYYY-MM';
 
-var _moment$weekdaysMin = moment.weekdaysMin(),
-    _moment$weekdaysMin2 = _toArray(_moment$weekdaysMin),
-    _ = _moment$weekdaysMin2[0],
-    rest = _moment$weekdaysMin2.slice(1); // 将星期天放置数组最后
+var _dayjs$weekdaysMin = weekdaysMin(),
+    _dayjs$weekdaysMin2 = _toArray(_dayjs$weekdaysMin),
+    _ = _dayjs$weekdaysMin2[0],
+    rest = _dayjs$weekdaysMin2.slice(1); // 将星期天放置数组最后
 
 
 var WEEk_HEADER = [].concat(_toConsumableArray(rest), [_]); // 日历布局为6 * 7单元格
@@ -7652,33 +7711,34 @@ var INIT_DAYS = Array(TOTAL_LENGTH).fill(0).map(function (_, index) {
   return +index + 1;
 });
 
-moment.locale('zh-cn');
+dayjs.extend(weekday);
+dayjs.locale('zh-cn');
 /**
  * 获取当前月的天数
  */
 
-console.log(moment().format('YYYY-MM-DD'), 'moment()');
+console.log(dayjs().format('YYYY-MM-DD'), 'dayjs()');
 function getMonthDays(date) {
-  return moment(date).daysInMonth();
+  return dayjs(date).daysInMonth();
 }
 /**
  * 获取当前月第一天是星期几
  */
 
 function getWeekDays(date) {
-  return moment(date).startOf('month').weekday();
+  return dayjs(date).startOf('month').weekday();
 }
 /**
  * 获取当前星期第一天到星期天
  */
 
 function getWeekList(date) {
-  var weekOfDay = parseInt(moment(date).format('E')); //计算今天是这周第几天
-  // let last_monday = moment().startOf('day').subtract(weekOfDay - 1, 'days').format('YYYY-MM-DD');//周一日期
-  // let last_sunday = moment().startOf('day').subtract(weekOfDay - 7, 'days').format('YYYY-MM-DD');//周日日期
+  var weekOfDay = parseInt(dayjs(date).format('E')); //计算今天是这周第几天
+  // let last_monday = dayjs().startOf('day').subtract(weekOfDay - 1, 'days').format('YYYY-MM-DD');//周一日期
+  // let last_sunday = dayjs().startOf('day').subtract(weekOfDay - 7, 'days').format('YYYY-MM-DD');//周日日期
 
   return ['时间'].concat(_toConsumableArray(new Array(7).fill('').map(function (item, index) {
-    return moment(date).startOf('day').subtract(weekOfDay - (index + 1), 'days').format('YYYY-MM-DD');
+    return dayjs(date).startOf('day').subtract(weekOfDay - (index + 1), 'days').format('YYYY-MM-DD');
   })));
 }
 /**
@@ -7686,7 +7746,7 @@ function getWeekList(date) {
  */
 
 function getLastMonth(date) {
-  return moment(date).subtract(1, 'month').format(YEAER_MONTH_FORMAT_EN);
+  return dayjs(date).subtract(1, 'month').format(YEAER_MONTH_FORMAT_EN);
 }
 /**
  * 格式化日期为两个单词，例如：‘1’号 格式为 ‘01’
@@ -7725,36 +7785,36 @@ function initCalendar(date) {
     // 填充上个月的天数
     if (i < currentWeekDay) {
       // lastDays.push(totalDaysInLastMonth);
-      var daySting = moment(moment(date).subtract(1, 'month').format(YEAER_MONTH_FORMAT_EN) + '-' + totalDaysInLastMonth).format('YYYY-MM-DD');
+      var daySting = dayjs(dayjs(date).subtract(1, 'month').format(YEAER_MONTH_FORMAT_EN) + '-' + totalDaysInLastMonth).format('YYYY-MM-DD');
       lastDays.push({
         date: daySting,
         text: formatDayWithTwoWords(totalDaysInLastMonth),
         isCurrentMonth: false,
-        isCurrentDay: moment().format('YYYY-MM-DD') == daySting
+        isCurrentDay: dayjs().format('YYYY-MM-DD') == daySting
       });
       totalDaysInLastMonth--;
     } // 填充下个月的天数
     else if (i >= totalDaysInMonth + currentWeekDay) {
       // nextDays.push(nextFirstDate);
-      var _daySting = moment(moment(date).add(1, 'month').format(YEAER_MONTH_FORMAT_EN) + '-' + nextFirstDate).format('YYYY-MM-DD');
+      var _daySting = dayjs(dayjs(date).add(1, 'month').format(YEAER_MONTH_FORMAT_EN) + '-' + nextFirstDate).format('YYYY-MM-DD');
 
       nextDays.push({
         date: _daySting,
         text: formatDayWithTwoWords(nextFirstDate),
         isCurrentMonth: false,
-        isCurrentDay: moment().format('YYYY-MM-DD') == _daySting
+        isCurrentDay: dayjs().format('YYYY-MM-DD') == _daySting
       });
       nextFirstDate++;
     } // 填充当前月天数
     else {
       // currentDays.push(i - currentWeekDay + 1);
-      var _daySting2 = moment(moment(date).format(YEAER_MONTH_FORMAT_EN) + '-' + (i - currentWeekDay + 1)).format('YYYY-MM-DD');
+      var _daySting2 = dayjs(dayjs(date).format(YEAER_MONTH_FORMAT_EN) + '-' + (i - currentWeekDay + 1)).format('YYYY-MM-DD');
 
       currentDays.push({
         date: _daySting2,
         text: formatDayWithTwoWords(i - currentWeekDay + 1),
         isCurrentMonth: true,
-        isCurrentDay: moment().format('YYYY-MM-DD') == _daySting2
+        isCurrentDay: dayjs().format('YYYY-MM-DD') == _daySting2
       });
     }
   } // 上个月需要倒序显示
@@ -7769,7 +7829,7 @@ function initCalendar(date) {
 function initWeekCalendar(type, date) {
   var weekLength = type == 'week' ? 8 : 2;
   var dayTime = ['08:00', '08:30', '09:00', '09:30', '10:00', '10:30', '11:00', '11:30', '12:00', '12:30', '13:00', '13:30', '14:00', '14:30', '15:00', '15:30', '16:00', '16:30', '17:00', '17:30'];
-  var weekOfDay = parseInt(moment(date).format('E')); //计算今天是这周第几天
+  var weekOfDay = parseInt(dayjs(date).format('E')); //计算今天是这周第几天
 
   var days = [];
 
@@ -7782,7 +7842,7 @@ function initWeekCalendar(type, date) {
       });
     } else {
       days.push({
-        date: type == 'week' ? moment(date).startOf('day').subtract(weekOfDay - i % weekLength, 'days').format('YYYY-MM-DD') + " ".concat(dayTime[timeIndex]) : moment(date).format('YYYY-MM-DD') + " ".concat(dayTime[timeIndex])
+        date: type == 'week' ? dayjs(date).startOf('day').subtract(weekOfDay - i % weekLength, 'days').format('YYYY-MM-DD') + " ".concat(dayTime[timeIndex]) : dayjs(date).format('YYYY-MM-DD') + " ".concat(dayTime[timeIndex])
       });
     }
   }
@@ -7790,7 +7850,8 @@ function initWeekCalendar(type, date) {
   return days;
 }
 
-moment.locale('zh-cn');
+dayjs.extend(weekOfYear);
+dayjs.locale('zh-cn');
 
 function Calendar(_ref, ref) {
   var value = _ref.value,
@@ -7809,7 +7870,7 @@ function Calendar(_ref, ref) {
       days = _useState2[0],
       setDays = _useState2[1];
 
-  var _useState3 = useState(moment()),
+  var _useState3 = useState(dayjs()),
       _useState4 = _slicedToArray(_useState3, 2),
       datevalue = _useState4[0],
       setDatevalue = _useState4[1];
@@ -7822,7 +7883,7 @@ function Calendar(_ref, ref) {
   var weekLabelArray = ['周一', '周二', '周三', '周四', '周五', '周六', '周日'];
 
   var getweekDay = function getweekDay(date) {
-    var index = moment(date).day();
+    var index = dayjs(date).day();
 
     if (index == 0) {
       index = 7;
@@ -7845,7 +7906,7 @@ function Calendar(_ref, ref) {
     }
   }, [type, datevalue, dateString]);
   useEffect(function () {
-    setDatevalue(value || moment());
+    setDatevalue(value || dayjs());
   }, [value]);
   useEffect(function () {
     onChange && onChange(datevalue);
@@ -7854,18 +7915,18 @@ function Calendar(_ref, ref) {
   var handleUp = function handleUp() {
     if (type == 'day' || type == 'week') {
       if (type == 'day') {
-        var lastDay = moment(datevalue).subtract(1, 'days');
+        var lastDay = dayjs(datevalue).subtract(1, 'days');
         setOneWeekDays(['时间'].concat(_toConsumableArray(getweekDay(lastDay))));
         setDays(initWeekCalendar(type, lastDay));
         setDatevalue(lastDay);
       } else {
-        var lastWeek = moment().week(moment(datevalue).week() - 1);
+        var lastWeek = dayjs().week(dayjs(datevalue).week() - 1);
         setOneWeekDays(getWeekList(lastWeek));
         setDays(initWeekCalendar(type, lastWeek));
         setDatevalue(lastWeek);
       }
     } else {
-      var lastMonth = moment(datevalue).subtract(1, 'month');
+      var lastMonth = dayjs(datevalue).subtract(1, 'month');
       setDays(initCalendar(lastMonth));
       setDatevalue(lastMonth);
     }
@@ -7874,18 +7935,18 @@ function Calendar(_ref, ref) {
   var handleDown = function handleDown() {
     if (type == 'day' || type == 'week') {
       if (type == 'day') {
-        var lastDay = moment(datevalue).add(1, 'days');
+        var lastDay = dayjs(datevalue).add(1, 'days');
         setOneWeekDays(['时间'].concat(_toConsumableArray(getweekDay(lastDay))));
         setDays(initWeekCalendar(type, lastDay));
         setDatevalue(lastDay);
       } else {
-        var lastWeek = moment().week(moment(datevalue).week() + 1);
+        var lastWeek = dayjs().week(dayjs(datevalue).week() + 1);
         setOneWeekDays(getWeekList(lastWeek));
         setDays(initWeekCalendar(type, lastWeek));
         setDatevalue(lastWeek);
       }
     } else {
-      var lastMonth = moment(datevalue).add(1, 'month');
+      var lastMonth = dayjs(datevalue).add(1, 'month');
       setDays(initCalendar(lastMonth));
       setDatevalue(lastMonth);
     }
@@ -7905,15 +7966,15 @@ function Calendar(_ref, ref) {
   });
   return /*#__PURE__*/React.createElement("div", {
     className: "content_container"
-  }, /*#__PURE__*/React.createElement(_ConfigProvider, {
+  }, /*#__PURE__*/React.createElement(ConfigProvider, {
     locale: zhCN$1
   }, !dateString && /*#__PURE__*/React.createElement("div", {
     className: "toolbar_container"
-  }, /*#__PURE__*/React.createElement(_Space, null, /*#__PURE__*/React.createElement(_Button, {
+  }, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Button, {
     icon: /*#__PURE__*/React.createElement(LeftOutlined, null),
     type: "text",
     onClick: handleUp
-  }), type == 'day' ? /*#__PURE__*/React.createElement(_DatePicker, {
+  }), type == 'day' ? /*#__PURE__*/React.createElement(DatePicker, {
     allowClear: false,
     value: datevalue,
     onChange: function onChange(date) {
@@ -7924,20 +7985,20 @@ function Calendar(_ref, ref) {
     style: {
       width: '250px'
     }
-  }) : type == 'week' ? /*#__PURE__*/React.createElement(_DatePicker, {
+  }) : type == 'week' ? /*#__PURE__*/React.createElement(DatePicker, {
     allowClear: false,
     value: datevalue,
     style: {
       width: '250px'
     },
-    format: "".concat(moment(datevalue).startOf('week').format('YYYY-MM-DD'), " ~ ").concat(moment(datevalue).endOf('week').format('YYYY-MM-DD')),
+    format: "".concat(dayjs(datevalue).startOf('week').format('YYYY-MM-DD'), " ~ ").concat(dayjs(datevalue).endOf('week').format('YYYY-MM-DD')),
     picker: "week",
     onChange: function onChange(date) {
       setOneWeekDays(getWeekList(date));
       setDays(initWeekCalendar(type, date));
       setDatevalue(date);
     }
-  }) : /*#__PURE__*/React.createElement(_DatePicker, {
+  }) : /*#__PURE__*/React.createElement(DatePicker, {
     allowClear: false,
     value: datevalue,
     picker: "month",
@@ -7948,7 +8009,7 @@ function Calendar(_ref, ref) {
     style: {
       width: '250px'
     }
-  }), /*#__PURE__*/React.createElement(_Button, {
+  }), /*#__PURE__*/React.createElement(Button, {
     icon: /*#__PURE__*/React.createElement(RightOutlined, null),
     type: "text",
     onClick: handleDown
@@ -8334,6 +8395,9 @@ function VideoPlayer(_ref, ref) {
   useEffect(function () {
     setUrls(url);
   }, [url]);
+  useEffect(function () {
+    setCurrentLayoutIndex(layoutIndex);
+  }, [layoutIndex]);
   var initPlayerIndex = allLayouts[layoutIndex || 0].span >= url.length ? url.length - 1 >= 0 ? url.length - 1 : 0 : allLayouts[layoutIndex || 0].span - 1;
 
   var _useState5 = useState(initPlayerIndex),
@@ -8471,7 +8535,7 @@ function VideoPlayer(_ref, ref) {
         setCurrentPlayerIndex(playerIndex);
         setCurrentLayoutIndex(index);
       }
-    }, /*#__PURE__*/React.createElement(_Tooltip, {
+    }, /*#__PURE__*/React.createElement(Tooltip, {
       placement: "top",
       title: item.title
     }, item.icon || /*#__PURE__*/React.createElement(IconFont, {
@@ -8489,7 +8553,7 @@ var DEFAULT_PLAY_BACK_RATE = [0.5, 0.75, 1, 1.5, 2]; // 默认记忆提示文字
 var DEFAULT_LAST_PLAY_TIME_DELAY = 5; // 默认音量大小
 
 var DEFAULT_VOLUME = 0.6;
-var index$7 = (function (_ref) {
+var index$7 = /*#__PURE__*/forwardRef(function (_ref, playerRef) {
   var id = _ref.id,
       _ref$videoUrls = _ref.videoUrls,
       videoUrls = _ref$videoUrls === void 0 ? [] : _ref$videoUrls,
@@ -8516,19 +8580,26 @@ var index$7 = (function (_ref) {
       props = _objectWithoutProperties(_ref, _excluded$m);
 
   var player = useRef();
-  var currentPlayerIndex = useRef(0); // 内置的 index 状态管理
 
-  var _useState = useState(0),
+  var _useState = useState(true),
       _useState2 = _slicedToArray(_useState, 2),
-      videoIndex = _useState2[0],
-      setVideoIndex = _useState2[1];
-
-  var currentIndex = useMemo(function () {
-    return parentIndex !== null && parentIndex !== void 0 ? parentIndex : videoIndex;
-  }, [parentIndex, videoIndex]);
-  var setCurrentIndex = useMemo(function () {
-    return setParentIndex !== null && setParentIndex !== void 0 ? setParentIndex : setVideoIndex;
-  }, [setParentIndex, setVideoIndex]);
+      firstRender = _useState2[0],
+      setFirstRender = _useState2[1];
+
+  var _useState3 = useState(false),
+      _useState4 = _slicedToArray(_useState3, 2),
+      ready = _useState4[0],
+      setReady = _useState4[1];
+
+  var currentPlayerIndex = useRef(0); // 内置的 index 状态管理
+
+  var _useState5 = useState(0),
+      _useState6 = _slicedToArray(_useState5, 2),
+      videoIndex = _useState6[0],
+      setVideoIndex = _useState6[1];
+
+  var currentIndex = parentIndex !== null && parentIndex !== void 0 ? parentIndex : videoIndex;
+  var setCurrentIndex = setParentIndex !== null && setParentIndex !== void 0 ? setParentIndex : setVideoIndex;
   var config = useRef(_objectSpread2({
     url: videoUrls[0],
     playbackRate: DEFAULT_PLAY_BACK_RATE,
@@ -8542,25 +8613,52 @@ var index$7 = (function (_ref) {
   }, props));
   /** 设置当前播放 index */
 
-  var handleSetCurrentIndex = useCallback(function (currentIdx) {
+  var handleSetCurrentIndex = useCallback(function (_ref2) {
+    var currentIdx = _ref2.currentIdx,
+        videoUrls = _ref2.videoUrls;
     var newIdx = currentIdx !== null && currentIdx !== void 0 ? currentIdx : currentPlayerIndex.current + 1;
 
     if (newIdx >= videoUrls.length) {
-      if (isLoop) {
-        // 允许循环则播放起始视频
-        newIdx = 0;
-      } else if (player.current && player.current.video) {
-        // 不允许循环则进度条快进到最后
-        player.current.currentTime = player.current.video.duration;
-        return;
-      }
+      newIdx = 0;
     }
 
     setCurrentIndex(newIdx);
-  }, [isLoop, setCurrentIndex, videoUrls.length]);
+  }, [setCurrentIndex]);
+  /** 结束事件 */
+
+  var onEnd = useCallback(function (isLoop, videoUrls) {
+    return function () {
+      // 如果是循环或有其他视频未播放完，继续播放下一个
+      if (isLoop || !isLoop && currentPlayerIndex.current < videoUrls.length - 1) {
+        setTimeout(function () {
+          var _player$current;
+
+          return (_player$current = player.current) === null || _player$current === void 0 ? void 0 : _player$current.play();
+        });
+      }
+
+      handleSetCurrentIndex({
+        videoUrls: videoUrls
+      });
+    };
+  }, [handleSetCurrentIndex]);
+  /** 点击下一个事件 */
+
+  var onPlayNextBtnClick = useCallback(function (videoUrls) {
+    return function () {
+      if (player.current) {
+        // 防止 next 按钮消失
+        player.current.currentVideoIndex = videoUrls.length - 2;
+      }
+
+      handleSetCurrentIndex({
+        videoUrls: videoUrls
+      });
+    };
+  }, [handleSetCurrentIndex]);
   /** 播放下一个 */
 
-  var handlePlayNext = useCallback(function (currentIdx) {
+  var handlePlayNext = useCallback(function (currentIdx, isLoop) {
     if (!player.current) {
       return;
     }
@@ -8574,7 +8672,7 @@ var index$7 = (function (_ref) {
       // 防止 next 按钮消失
       player.current.currentVideoIndex = -videoUrls.length;
     }
-  }, [videoUrls, isLoop]);
+  }, [videoUrls]);
   /** 重置视频 */
 
   var handleReset = useCallback(function () {
@@ -8601,36 +8699,36 @@ var index$7 = (function (_ref) {
       return;
     }
 
-    handlePlayNext(currentIndex !== null && currentIndex !== void 0 ? currentIndex : currentPlayerIndex.current);
-  }, [currentIndex, handlePlayNext, visible]);
+    handlePlayNext(currentIndex !== null && currentIndex !== void 0 ? currentIndex : currentPlayerIndex.current, isLoop);
+  }, [currentIndex, handlePlayNext, isLoop, visible]);
   /** 播放器初始化并绑定事件 */
 
   useEffect(function () {
+    var _player$current4;
+
     if (!visible || isEmpty(videoUrls) || player.current) {
       return;
     }
 
-    player.current = new Player(config.current);
-    player.current.currentVideoIndex = -videoUrls.length;
-    player.current.on('ended', function () {
-      // 如果是循环或有其他视频未播放完，继续播放下一个
-      if (isLoop || !isLoop && currentPlayerIndex.current < videoUrls.length - 1) {
-        handleSetCurrentIndex();
-        setTimeout(function () {
-          var _player$current;
+    var newConfig = _objectSpread2(_objectSpread2({}, config.current), {}, {
+      muted: muted,
+      volume: muted ? 0 : DEFAULT_VOLUME,
+      autoplay: autoplay,
+      videoInit: videoInit
+    });
 
-          return (_player$current = player.current) === null || _player$current === void 0 ? void 0 : _player$current.play();
-        });
-      } else {
-        var _player$current2;
+    setReady(false);
+    setFirstRender(false); // @ts-ignore
 
-        (_player$current2 = player.current) === null || _player$current2 === void 0 ? void 0 : _player$current2.pause();
-      }
-    }); // 播放记忆缓存
+    player.current = new Player(newConfig);
+    player.current.currentVideoIndex = -videoUrls.length;
+    player.current.on('ended', onEnd(isLoop, videoUrls)); // 播放记忆缓存
 
     if (enableMemory) {
+      var _player$current2;
+
       var videoPlayedTimeObj = JSON.parse(localStorage.getItem('videoPlayedTime') || '{}');
-      player.current.on('timeupdate', function () {
+      (_player$current2 = player.current) === null || _player$current2 === void 0 ? void 0 : _player$current2.on('timeupdate', function () {
         var _player$current3;
 
         if (currentPlayerIndex.current === -1) {
@@ -8644,27 +8742,23 @@ var index$7 = (function (_ref) {
       });
     }
 
-    player.current.on('playNextBtnClick', function () {
-      if (!isLoop && player.current) {
-        // 防止 next 按钮消失
-        player.current.currentVideoIndex = videoUrls.length - 2;
-      }
-
-      handleSetCurrentIndex();
-    });
-  }, [autoplay, enableMemory, handleSetCurrentIndex, id, isLoop, videoUrls, videoUrls.length, visible]);
+    (_player$current4 = player.current) === null || _player$current4 === void 0 ? void 0 : _player$current4.on('playNextBtnClick', onPlayNextBtnClick(videoUrls));
+  }, [ready, autoplay, enableMemory, handleSetCurrentIndex, id, isLoop, videoUrls, videoUrls.length, visible, muted, videoInit, onEnd, onPlayNextBtnClick]);
   /** 读取缓存的播放记忆并跳转 */
 
   useEffect(function () {
     if (enableMemory && visible) {
       var _JSON$parse;
 
-      var _ref2 = ((_JSON$parse = JSON.parse(localStorage.getItem('videoPlayedTime') || '{}')) === null || _JSON$parse === void 0 ? void 0 : _JSON$parse[id]) || {},
-          lastPlayTime = _ref2.lastPlayTime,
-          _videoIndex = _ref2.videoIndex;
+      var _ref3 = ((_JSON$parse = JSON.parse(localStorage.getItem('videoPlayedTime') || '{}')) === null || _JSON$parse === void 0 ? void 0 : _JSON$parse[id]) || {},
+          lastPlayTime = _ref3.lastPlayTime,
+          _videoIndex = _ref3.videoIndex;
 
       setTimeout(function () {
-        handleSetCurrentIndex(_videoIndex);
+        handleSetCurrentIndex({
+          currentIdx: _videoIndex,
+          videoUrls: videoUrls
+        });
         setTimeout(function () {
           if (player.current) {
             player.current.currentTime = lastPlayTime;
@@ -8672,7 +8766,7 @@ var index$7 = (function (_ref) {
         });
       });
     }
-  }, [visible, enableMemory, handleSetCurrentIndex, id]);
+  }, [visible, enableMemory, handleSetCurrentIndex, id, videoUrls]);
   /** 加载清晰度配置 */
 
   useEffect(function () {
@@ -8680,6 +8774,19 @@ var index$7 = (function (_ref) {
       player.current.emit('resourceReady', definitionList[currentIndex]);
     }
   }, [currentIndex, definitionList]);
+  useEffect(function () {
+    var _player$current5, _player$current6, _player$current7;
+
+    if (firstRender) {
+      return;
+    }
+
+    (_player$current5 = player.current) === null || _player$current5 === void 0 ? void 0 : _player$current5.off('ended', onEnd(isLoop, videoUrls));
+    (_player$current6 = player.current) === null || _player$current6 === void 0 ? void 0 : _player$current6.off('playNextBtnClick', onPlayNextBtnClick(videoUrls));
+    (_player$current7 = player.current) === null || _player$current7 === void 0 ? void 0 : _player$current7.destroy();
+    player.current = undefined;
+    setReady(true); // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [muted, isLoop, videoUrls, autoplay, videoInit, onEnd, onPlayNextBtnClick]);
   var getRef = useCallback(function (ref) {
     if (ref && visible) {
       var newConfig = _objectSpread2(_objectSpread2({}, config.current), {}, {
@@ -8693,8 +8800,8 @@ var index$7 = (function (_ref) {
       if (enableMemory) {
         var _JSON$parse2;
 
-        var _ref3 = ((_JSON$parse2 = JSON.parse(localStorage.getItem('videoPlayedTime') || '{}')) === null || _JSON$parse2 === void 0 ? void 0 : _JSON$parse2[id]) || {},
-            lastPlayTime = _ref3.lastPlayTime;
+        var _ref4 = ((_JSON$parse2 = JSON.parse(localStorage.getItem('videoPlayedTime') || '{}')) === null || _JSON$parse2 === void 0 ? void 0 : _JSON$parse2[id]) || {},
+            lastPlayTime = _ref4.lastPlayTime;
 
         Object.assign(newConfig, {
           lastPlayTime: lastPlayTime,
@@ -8704,7 +8811,15 @@ var index$7 = (function (_ref) {
 
       config.current = newConfig;
     }
-  }, [visible, id, videoUrls, lastPlayTimeHideDelay, enableMemory]);
+
+    if (playerRef) {
+      if (typeof playerRef === 'function') {
+        playerRef(player.current);
+      } else {
+        playerRef.current = player.current;
+      }
+    }
+  }, [visible, playerRef, videoUrls, enableMemory, id, lastPlayTimeHideDelay]);
   return /*#__PURE__*/React.createElement("div", {
     className: className,
     ref: getRef,
@@ -8967,7 +9082,7 @@ function NtTable(_ref) {
           if (c.showTitle) {
             var _columnsFields$c$data;
 
-            return /*#__PURE__*/React.createElement(_Tooltip, {
+            return /*#__PURE__*/React.createElement(Tooltip, {
               key: c.dataIndex,
               placement: "top",
               title: record[c.dataIndex]
@@ -8993,7 +9108,7 @@ function NtTable(_ref) {
               return item.value == record[c.dataIndex];
             })) === null || _columnsFields$c$data === void 0 ? void 0 : _columnsFields$c$data.label : record[c.dataIndex])));
           } else {
-            var _columnsFields$c$data2, _columnsFields$c$data3;
+            var _columnsFields$c$data2, _columnsFields$c$data3, _columnsFields$c$data4, _columnsFields$c$data5;
 
             return /*#__PURE__*/React.createElement("div", {
               key: c.dataIndex,
@@ -9017,9 +9132,13 @@ function NtTable(_ref) {
               }
             }, c.render ? c.render(record[c.dataIndex], record, index) : columnsFields[c.dataIndex] ? (_columnsFields$c$data2 = columnsFields[c.dataIndex].find(function (item) {
               return item.value == record[c.dataIndex];
-            })) === null || _columnsFields$c$data2 === void 0 ? void 0 : _columnsFields$c$data2.label : record[c.dataIndex]) : c.render ? c.render(record[c.dataIndex], record, index) : columnsFields[c.dataIndex] ? (_columnsFields$c$data3 = columnsFields[c.dataIndex].find(function (item) {
+            })) === null || _columnsFields$c$data2 === void 0 ? void 0 : _columnsFields$c$data2.label : record[c.dataIndex]) : c.render ? c.render(record[c.dataIndex], record, index) : columnsFields[c.dataIndex] ? ((_columnsFields$c$data3 = columnsFields[c.dataIndex].find(function (item) {
               return item.value == record[c.dataIndex];
-            })) === null || _columnsFields$c$data3 === void 0 ? void 0 : _columnsFields$c$data3.label : record[c.dataIndex]);
+            })) === null || _columnsFields$c$data3 === void 0 ? void 0 : _columnsFields$c$data3.label) && ((_columnsFields$c$data4 = columnsFields[c.dataIndex].find(function (item) {
+              return item.value == record[c.dataIndex];
+            })) === null || _columnsFields$c$data4 === void 0 ? void 0 : _columnsFields$c$data4.label) !== 0 ? (_columnsFields$c$data5 = columnsFields[c.dataIndex].find(function (item) {
+              return item.value == record[c.dataIndex];
+            })) === null || _columnsFields$c$data5 === void 0 ? void 0 : _columnsFields$c$data5.label : '-' : record[c.dataIndex]);
           }
         }
       });
@@ -9220,7 +9339,7 @@ function NtTable(_ref) {
     setFormSearch({});
   };
 
-  return /*#__PURE__*/React.createElement(_Spin, {
+  return /*#__PURE__*/React.createElement(Spin, {
     spinning: loading
   }, /*#__PURE__*/React.createElement("div", {
     className: "form"
@@ -9311,7 +9430,7 @@ function NtTable(_ref) {
       justifyContent: 'center',
       alignItems: 'center'
     }
-  }, none || '暂无数据')))), _typeof(pagination) === 'object' && /*#__PURE__*/React.createElement(_Pagination, _objectSpread2({
+  }, none || '暂无数据')))), _typeof(pagination) === 'object' && /*#__PURE__*/React.createElement(Pagination, _objectSpread2({
     style: {
       textAlign: 'right',
       marginTop: '10px'
@@ -10106,7 +10225,7 @@ function WaterLevelCharts(config) {
 /*
  * @Author: lijin
  * @Date: 2021-09-09 11:02:54
- * @LastEditTime: 2023-02-02 09:42:57
+ * @LastEditTime: 2023-02-21 14:29:33
  * @LastEditors: lijin
  * @Description:
  * @FilePath: \wargerm\src\index.ts
@@ -10116,7 +10235,7 @@ console.log(REACT_APP_ENV, 'REACT_APP_ENV');
 
 if (REACT_APP_ENV == 'development') {
   var COLOR_ATTR_NAME = 'data-prefers-color';
-  document.documentElement.setAttribute(COLOR_ATTR_NAME, 'sd');
+  document.documentElement.setAttribute(COLOR_ATTR_NAME, 'nt');
 }
 
-export { Index$b as AutoScroll, Index$d as Breadcrumb, WButton as Button, index$5 as Calendar, index$3 as Card, WCascader as Cascader, Index$4 as Checkbox, Index$a as CountUp, Index$2 as DatePicker, DragBox, index as IconFont, Index as Input, WInputNumber as InputNumber, LineEcharts, Modal, ModalForm$1 as ModalForm, Modal$1 as ModalTips, index$8 as NtTable, Index$9 as Number, NumericInput, Index$3 as Radio, index$2 as RequestRenderDom, Select, Index$c as Swiper, WSwitch as Switch, index$4 as TabelCard, index$1 as Table, Index$7 as TreeSelect, Upload, index$7 as Video, index$6 as VideoPlayer, Index$6 as WDatePicker, WForm$1 as WForm, WaterLevelCharts, WebsocketHeart, useEventEmitter, useStateWithCall, wTracing, create as whox, wmox };
+export { Index$b as AutoScroll, Index$d as Breadcrumb, WButton as Button, index$5 as Calendar, index$3 as Card, WCascader as Cascader, Index$4 as Checkbox, Index$a as CountUp, Index$2 as DatePicker, DragBox, index as IconFont, Index as Input, WInputNumber as InputNumber, LineEcharts, Modal, ModalForm$1 as ModalForm, Modal$1 as ModalTips, index$8 as NtTable, Index$9 as Number, NumericInput, Index$3 as Radio, index$2 as RequestRenderDom, Index$5 as Select, Index$c as Swiper, WSwitch as Switch, index$4 as TabelCard, index$1 as Table, Index$7 as TreeSelect, Upload, index$7 as Video, index$6 as VideoPlayer, Index$6 as WDatePicker, WForm$1 as WForm, WaterLevelCharts, WebsocketHeart, useEventEmitter, useStateWithCall, wTracing, create as whox, wmox };