wargerm 0.7.31 → 0.7.32

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

@@ -8,6 +8,7 @@ export interface IProps extends Swiper {
     isPreventClick?: boolean;
     slidesPerView?: number;
     rowKey?: string;
+    noMove?: boolean;
 }
 declare const Index: FC<IProps>;
 export default Index;

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

@@ -1,14 +1,5 @@
-import React, { CSSProperties } from 'react';
-import Player, { IPlayerOptions } from 'xgplayer';
-interface PlayerProps extends Player {
-    currentVideoIndex?: number;
-    video?: {
-        duration: number;
-    };
-    on: (eventName: string | symbol, listener: (...args: any[]) => void) => this;
-    off: (eventName: string | symbol, listener: (...args: any[]) => void) => this;
-    emit: (eventName: string | symbol, ...args: any[]) => boolean;
-}
+import { CSSProperties } from 'react';
+import { IPlayerOptions } from 'xgplayer';
 /** 清晰度视频项目,name 为清晰度,url 为视频源 */
 export interface DefinitionItemProps {
     name: string;
@@ -22,10 +13,10 @@ interface VideoProps extends Omit<IPlayerOptions, 'url' | 'loop'> {
     videoUrls: string[];
     /** 清晰度视频数组,顺序应与 videoUrls 保持一致 */
     definitionList?: DefinitionItemProps[][];
-    /** 是否循环播放(多视频只支持循环播放) */
+    /** 是否循环播放 */
     isLoop?: boolean;
     /** 是否可见 */
-    visible?: boolean;
+    open?: boolean;
     /** 是否静音播放 */
     muted?: boolean;
     /** 初始化显示首帧 */
@@ -40,5 +31,5 @@ interface VideoProps extends Omit<IPlayerOptions, 'url' | 'loop'> {
     style?: CSSProperties;
     className?: string;
 }
-declare const _default: React.ForwardRefExoticComponent<VideoProps & React.RefAttributes<PlayerProps>>;
+declare const _default: ({ id, videoUrls, definitionList, isLoop, muted, currentIndex: parentIndex, setCurrentIndex: setParentIndex, className, style, open, autoplay, videoInit, enableMemory, lastPlayTimeHideDelay, ...props }: VideoProps) => JSX.Element;
 export default _default;

package/dist/components/WForm/example/demo4.d.ts

@@ -0,0 +1,3 @@
+/// <reference types="react" />
+declare const _default: () => JSX.Element;
+export default _default;

package/dist/components/WForm/example/demo5.d.ts

@@ -0,0 +1,3 @@
+/// <reference types="react" />
+declare const _default: () => JSX.Element;
+export default _default;

package/dist/index.esm.js

@@ -5316,7 +5316,7 @@ var Index$b = function Index(_ref) {
   }, none || '暂无数据');
 };
 
-var _excluded$f = ["data", "onClick", "slidesPerView", "rowKey", "onSwiperChange", "renderItem"];
+var _excluded$f = ["data", "onClick", "slidesPerView", "rowKey", "onSwiperChange", "renderItem", "noMove"];
 
 SwiperCore.use([Pagination$1, Navigation, Autoplay, Virtual]);
 var Index$c = /*#__PURE__*/forwardRef(function (props, ref) {
@@ -5327,6 +5327,7 @@ var Index$c = /*#__PURE__*/forwardRef(function (props, ref) {
       rowKey = props.rowKey,
       onSwiperChange = props.onSwiperChange,
       renderItem = props.renderItem,
+      noMove = props.noMove,
       extraProps = _objectWithoutProperties(props, _excluded$f);
 
   var _useState = useState(null),
@@ -5372,7 +5373,7 @@ var Index$c = /*#__PURE__*/forwardRef(function (props, ref) {
           height: '100%'
         },
         onClick: function onClick(event) {
-          if (controlledSwiper) {
+          if (controlledSwiper && !noMove) {
             if (controlledSwiper.clickedIndex - slidesPerView > data.length) {
               controlledSwiper.slideNext();
             } else {
@@ -7559,22 +7560,32 @@ var TabelCard = function TabelCard(props, ref) {
     actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current6 = actionRef.current) === null || _actionRef$current6 === void 0 ? void 0 : _actionRef$current6.reload(true);
   };
 
+  var onKeyUpSubmit = function onKeyUpSubmit(values) {
+    if (values.keyCode === 13) {
+      var _searchFormRef$curren, _searchFormRef$curren2, _actionRef$current7;
+
+      (searchFormConfig === null || searchFormConfig === void 0 ? void 0 : searchFormConfig.handleSubmit) && searchFormConfig.handleSubmit((_searchFormRef$curren = searchFormRef.current) === null || _searchFormRef$curren === void 0 ? void 0 : _searchFormRef$curren.getFormValues());
+      formSearchRef.current = (_searchFormRef$curren2 = searchFormRef.current) === null || _searchFormRef$curren2 === void 0 ? void 0 : _searchFormRef$curren2.getFormValues();
+      actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current7 = actionRef.current) === null || _actionRef$current7 === void 0 ? void 0 : _actionRef$current7.reload(true);
+    }
+  };
+
   var onReset = function onReset(values) {
-    var _actionRef$current7;
+    var _actionRef$current8;
 
     (searchFormConfig === null || searchFormConfig === void 0 ? void 0 : searchFormConfig.onReset) && searchFormConfig.onReset();
     formSearchRef.current = _objectSpread2({}, values);
-    actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current7 = actionRef.current) === null || _actionRef$current7 === void 0 ? void 0 : _actionRef$current7.reload(true);
+    actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current8 = actionRef.current) === null || _actionRef$current8 === void 0 ? void 0 : _actionRef$current8.reload(true);
   };
 
   useEffect(function () {
-    var _searchFormRef$curren, _searchFormRef$curren2;
+    var _searchFormRef$curren3, _searchFormRef$curren4;
 
-    if ((_searchFormRef$curren = searchFormRef.current) === null || _searchFormRef$curren === void 0 ? void 0 : (_searchFormRef$curren2 = _searchFormRef$curren.form) === null || _searchFormRef$curren2 === void 0 ? void 0 : _searchFormRef$curren2.getFieldsValue) {
-      var _searchFormRef$curren3;
+    if ((_searchFormRef$curren3 = searchFormRef.current) === null || _searchFormRef$curren3 === void 0 ? void 0 : (_searchFormRef$curren4 = _searchFormRef$curren3.form) === null || _searchFormRef$curren4 === void 0 ? void 0 : _searchFormRef$curren4.getFieldsValue) {
+      var _searchFormRef$curren5;
 
       var obj = // filterObj(searchFormRef.current?.form?.getFieldsValue()) || {};
-      filterObj((_searchFormRef$curren3 = searchFormRef.current) === null || _searchFormRef$curren3 === void 0 ? void 0 : _searchFormRef$curren3.handleSearch(true)) || {};
+      filterObj((_searchFormRef$curren5 = searchFormRef.current) === null || _searchFormRef$curren5 === void 0 ? void 0 : _searchFormRef$curren5.handleSearch(true)) || {};
       (columns || []).filter(function (c) {
         return c.notInitialValueInSearch;
       }).forEach(function (item) {
@@ -7720,6 +7731,7 @@ var TabelCard = function TabelCard(props, ref) {
     }),
     onSubmit: onSubmit,
     onReset: onReset,
+    onKeyUp: onKeyUpSubmit,
     columns: formSearchColumn.reduce(function (pre, column) {
       if (column.type == 'group') {
         return [].concat(_toConsumableArray(pre), _toConsumableArray(column.children));
@@ -11484,14 +11496,14 @@ function DhPlayer(_ref, ref) {
 
 var index$7 = /*#__PURE__*/forwardRef(DhPlayer);
 
-var _excluded$m = ["id", "videoUrls", "definitionList", "isLoop", "muted", "currentIndex", "setCurrentIndex", "className", "style", "visible", "autoplay", "videoInit", "enableMemory", "lastPlayTimeHideDelay"];
+var _excluded$m = ["id", "videoUrls", "definitionList", "isLoop", "muted", "currentIndex", "setCurrentIndex", "className", "style", "open", "autoplay", "videoInit", "enableMemory", "lastPlayTimeHideDelay"];
 
 var DEFAULT_PLAY_BACK_RATE = [0.5, 0.75, 1, 1.5, 2]; // 默认记忆提示文字展示时长(s)
 
 var DEFAULT_LAST_PLAY_TIME_DELAY = 5; // 默认音量大小
 
 var DEFAULT_VOLUME = 0.6;
-var index$8 = /*#__PURE__*/forwardRef(function (_ref, playerRef) {
+var index$8 = (function (_ref) {
   var id = _ref.id,
       _ref$videoUrls = _ref.videoUrls,
       videoUrls = _ref$videoUrls === void 0 ? [] : _ref$videoUrls,
@@ -11505,8 +11517,8 @@ var index$8 = /*#__PURE__*/forwardRef(function (_ref, playerRef) {
       setParentIndex = _ref.setCurrentIndex,
       className = _ref.className,
       style = _ref.style,
-      _ref$visible = _ref.visible,
-      visible = _ref$visible === void 0 ? true : _ref$visible,
+      _ref$open = _ref.open,
+      open = _ref$open === void 0 ? true : _ref$open,
       _ref$autoplay = _ref.autoplay,
       autoplay = _ref$autoplay === void 0 ? false : _ref$autoplay,
       _ref$videoInit = _ref.videoInit,
@@ -11518,26 +11530,19 @@ var index$8 = /*#__PURE__*/forwardRef(function (_ref, playerRef) {
       props = _objectWithoutProperties(_ref, _excluded$m);
 
   var player = useRef();
-
-  var _useState = useState(true),
-      _useState2 = _slicedToArray(_useState, 2),
-      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 _useState = useState(0),
+      _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]);
   var config = useRef(_objectSpread2({
     url: videoUrls[0],
     playbackRate: DEFAULT_PLAY_BACK_RATE,
@@ -11551,52 +11556,25 @@ var index$8 = /*#__PURE__*/forwardRef(function (_ref, playerRef) {
   }, props));
   /** 设置当前播放 index */
 
-  var handleSetCurrentIndex = useCallback(function (_ref2) {
-    var currentIdx = _ref2.currentIdx,
-        videoUrls = _ref2.videoUrls;
+  var handleSetCurrentIndex = useCallback(function (currentIdx) {
     var newIdx = currentIdx !== null && currentIdx !== void 0 ? currentIdx : currentPlayerIndex.current + 1;
 
     if (newIdx >= videoUrls.length) {
-      newIdx = 0;
+      if (isLoop) {
+        // 允许循环则播放起始视频
+        newIdx = 0;
+      } else if (player.current && player.current.video) {
+        // 不允许循环则进度条快进到最后
+        player.current.currentTime = player.current.video.duration;
+        return;
+      }
     }
 
     setCurrentIndex(newIdx);
-  }, [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]);
+  }, [isLoop, setCurrentIndex, videoUrls.length]);
   /** 播放下一个 */
 
-  var handlePlayNext = useCallback(function (currentIdx, isLoop) {
+  var handlePlayNext = useCallback(function (currentIdx) {
     if (!player.current) {
       return;
     }
@@ -11610,7 +11588,7 @@ var index$8 = /*#__PURE__*/forwardRef(function (_ref, playerRef) {
       // 防止 next 按钮消失
       player.current.currentVideoIndex = -videoUrls.length;
     }
-  }, [videoUrls]);
+  }, [videoUrls, isLoop]);
   /** 重置视频 */
 
   var handleReset = useCallback(function () {
@@ -11626,47 +11604,47 @@ var index$8 = /*#__PURE__*/forwardRef(function (_ref, playerRef) {
   /** 弹窗中的视频关闭以后重置 */
 
   useEffect(function () {
-    if (!visible) {
+    if (!open) {
       handleReset();
     }
-  }, [handleReset, visible]);
+  }, [handleReset, open]);
   /** 当 currentIndex 改变以后自动播放下一个 */
 
   useEffect(function () {
-    if (!player.current || !visible) {
+    if (!player.current || !open) {
       return;
     }
 
-    handlePlayNext(currentIndex !== null && currentIndex !== void 0 ? currentIndex : currentPlayerIndex.current, isLoop);
-  }, [currentIndex, handlePlayNext, isLoop, visible]);
+    handlePlayNext(currentIndex !== null && currentIndex !== void 0 ? currentIndex : currentPlayerIndex.current);
+  }, [currentIndex, handlePlayNext, open]);
   /** 播放器初始化并绑定事件 */
 
   useEffect(function () {
-    var _player$current4;
-
-    if (!visible || isEmpty(videoUrls) || player.current) {
+    if (!open || isEmpty(videoUrls) || player.current) {
       return;
     }
 
-    var newConfig = _objectSpread2(_objectSpread2({}, config.current), {}, {
-      muted: muted,
-      volume: muted ? 0 : DEFAULT_VOLUME,
-      autoplay: autoplay,
-      videoInit: videoInit
-    });
+    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;
 
-    setReady(false);
-    setFirstRender(false); // @ts-ignore
+          return (_player$current = player.current) === null || _player$current === void 0 ? void 0 : _player$current.play();
+        });
+      } else {
+        var _player$current2;
 
-    player.current = new Player(newConfig);
-    player.current.currentVideoIndex = -videoUrls.length;
-    player.current.on('ended', onEnd(isLoop, videoUrls)); // 播放记忆缓存
+        (_player$current2 = player.current) === null || _player$current2 === void 0 ? void 0 : _player$current2.pause();
+      }
+    }); // 播放记忆缓存
 
     if (enableMemory) {
-      var _player$current2;
-
       var videoPlayedTimeObj = JSON.parse(localStorage.getItem('videoPlayedTime') || '{}');
-      (_player$current2 = player.current) === null || _player$current2 === void 0 ? void 0 : _player$current2.on('timeupdate', function () {
+      player.current.on('timeupdate', function () {
         var _player$current3;
 
         if (currentPlayerIndex.current === -1) {
@@ -11680,23 +11658,27 @@ var index$8 = /*#__PURE__*/forwardRef(function (_ref, playerRef) {
       });
     }
 
-    (_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]);
+    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, open]);
   /** 读取缓存的播放记忆并跳转 */
 
   useEffect(function () {
-    if (enableMemory && visible) {
+    if (enableMemory && open) {
       var _JSON$parse;
 
-      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;
+      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;
 
       setTimeout(function () {
-        handleSetCurrentIndex({
-          currentIdx: _videoIndex,
-          videoUrls: videoUrls
-        });
+        handleSetCurrentIndex(_videoIndex);
         setTimeout(function () {
           if (player.current) {
             player.current.currentTime = lastPlayTime;
@@ -11704,7 +11686,7 @@ var index$8 = /*#__PURE__*/forwardRef(function (_ref, playerRef) {
         });
       });
     }
-  }, [visible, enableMemory, handleSetCurrentIndex, id, videoUrls]);
+  }, [open, enableMemory, handleSetCurrentIndex, id]);
   /** 加载清晰度配置 */
 
   useEffect(function () {
@@ -11712,23 +11694,10 @@ var index$8 = /*#__PURE__*/forwardRef(function (_ref, playerRef) {
       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 (r) {
-    if (r && visible) {
+  var getRef = useCallback(function (ref) {
+    if (ref && open) {
       var newConfig = _objectSpread2(_objectSpread2({}, config.current), {}, {
-        el: r,
+        el: ref,
         url: videoUrls[0],
         playNext: {
           urlList: videoUrls.slice(1)
@@ -11738,8 +11707,8 @@ var index$8 = /*#__PURE__*/forwardRef(function (_ref, playerRef) {
       if (enableMemory) {
         var _JSON$parse2;
 
-        var _ref4 = ((_JSON$parse2 = JSON.parse(localStorage.getItem('videoPlayedTime') || '{}')) === null || _JSON$parse2 === void 0 ? void 0 : _JSON$parse2[id]) || {},
-            lastPlayTime = _ref4.lastPlayTime;
+        var _ref3 = ((_JSON$parse2 = JSON.parse(localStorage.getItem('videoPlayedTime') || '{}')) === null || _JSON$parse2 === void 0 ? void 0 : _JSON$parse2[id]) || {},
+            lastPlayTime = _ref3.lastPlayTime;
 
         Object.assign(newConfig, {
           lastPlayTime: lastPlayTime,
@@ -11749,15 +11718,7 @@ var index$8 = /*#__PURE__*/forwardRef(function (_ref, playerRef) {
 
       config.current = newConfig;
     }
-
-    if (playerRef) {
-      if (typeof playerRef === 'function') {
-        playerRef(player.current);
-      } else {
-        playerRef.current = player.current;
-      }
-    }
-  }, [visible, playerRef, videoUrls, enableMemory, id, lastPlayTimeHideDelay]);
+  }, [open, id, videoUrls, lastPlayTimeHideDelay, enableMemory]);
   return /*#__PURE__*/React.createElement("div", {
     className: className,
     ref: getRef,

package/dist/index.js

@@ -5360,7 +5360,7 @@ var Index$b = function Index(_ref) {
   }, none || '暂无数据');
 };
 
-var _excluded$f = ["data", "onClick", "slidesPerView", "rowKey", "onSwiperChange", "renderItem"];
+var _excluded$f = ["data", "onClick", "slidesPerView", "rowKey", "onSwiperChange", "renderItem", "noMove"];
 
 SwiperCore__default['default'].use([SwiperCore.Pagination, SwiperCore.Navigation, SwiperCore.Autoplay, SwiperCore.Virtual]);
 var Index$c = /*#__PURE__*/React.forwardRef(function (props, ref) {
@@ -5371,6 +5371,7 @@ var Index$c = /*#__PURE__*/React.forwardRef(function (props, ref) {
       rowKey = props.rowKey,
       onSwiperChange = props.onSwiperChange,
       renderItem = props.renderItem,
+      noMove = props.noMove,
       extraProps = _objectWithoutProperties(props, _excluded$f);
 
   var _useState = React.useState(null),
@@ -5416,7 +5417,7 @@ var Index$c = /*#__PURE__*/React.forwardRef(function (props, ref) {
           height: '100%'
         },
         onClick: function onClick(event) {
-          if (controlledSwiper) {
+          if (controlledSwiper && !noMove) {
             if (controlledSwiper.clickedIndex - slidesPerView > data.length) {
               controlledSwiper.slideNext();
             } else {
@@ -7603,22 +7604,32 @@ var TabelCard = function TabelCard(props, ref) {
     actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current6 = actionRef.current) === null || _actionRef$current6 === void 0 ? void 0 : _actionRef$current6.reload(true);
   };
 
+  var onKeyUpSubmit = function onKeyUpSubmit(values) {
+    if (values.keyCode === 13) {
+      var _searchFormRef$curren, _searchFormRef$curren2, _actionRef$current7;
+
+      (searchFormConfig === null || searchFormConfig === void 0 ? void 0 : searchFormConfig.handleSubmit) && searchFormConfig.handleSubmit((_searchFormRef$curren = searchFormRef.current) === null || _searchFormRef$curren === void 0 ? void 0 : _searchFormRef$curren.getFormValues());
+      formSearchRef.current = (_searchFormRef$curren2 = searchFormRef.current) === null || _searchFormRef$curren2 === void 0 ? void 0 : _searchFormRef$curren2.getFormValues();
+      actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current7 = actionRef.current) === null || _actionRef$current7 === void 0 ? void 0 : _actionRef$current7.reload(true);
+    }
+  };
+
   var onReset = function onReset(values) {
-    var _actionRef$current7;
+    var _actionRef$current8;
 
     (searchFormConfig === null || searchFormConfig === void 0 ? void 0 : searchFormConfig.onReset) && searchFormConfig.onReset();
     formSearchRef.current = _objectSpread2({}, values);
-    actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current7 = actionRef.current) === null || _actionRef$current7 === void 0 ? void 0 : _actionRef$current7.reload(true);
+    actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current8 = actionRef.current) === null || _actionRef$current8 === void 0 ? void 0 : _actionRef$current8.reload(true);
   };
 
   React.useEffect(function () {
-    var _searchFormRef$curren, _searchFormRef$curren2;
+    var _searchFormRef$curren3, _searchFormRef$curren4;
 
-    if ((_searchFormRef$curren = searchFormRef.current) === null || _searchFormRef$curren === void 0 ? void 0 : (_searchFormRef$curren2 = _searchFormRef$curren.form) === null || _searchFormRef$curren2 === void 0 ? void 0 : _searchFormRef$curren2.getFieldsValue) {
-      var _searchFormRef$curren3;
+    if ((_searchFormRef$curren3 = searchFormRef.current) === null || _searchFormRef$curren3 === void 0 ? void 0 : (_searchFormRef$curren4 = _searchFormRef$curren3.form) === null || _searchFormRef$curren4 === void 0 ? void 0 : _searchFormRef$curren4.getFieldsValue) {
+      var _searchFormRef$curren5;
 
       var obj = // filterObj(searchFormRef.current?.form?.getFieldsValue()) || {};
-      filterObj((_searchFormRef$curren3 = searchFormRef.current) === null || _searchFormRef$curren3 === void 0 ? void 0 : _searchFormRef$curren3.handleSearch(true)) || {};
+      filterObj((_searchFormRef$curren5 = searchFormRef.current) === null || _searchFormRef$curren5 === void 0 ? void 0 : _searchFormRef$curren5.handleSearch(true)) || {};
       (columns || []).filter(function (c) {
         return c.notInitialValueInSearch;
       }).forEach(function (item) {
@@ -7764,6 +7775,7 @@ var TabelCard = function TabelCard(props, ref) {
     }),
     onSubmit: onSubmit,
     onReset: onReset,
+    onKeyUp: onKeyUpSubmit,
     columns: formSearchColumn.reduce(function (pre, column) {
       if (column.type == 'group') {
         return [].concat(_toConsumableArray(pre), _toConsumableArray(column.children));
@@ -11528,14 +11540,14 @@ function DhPlayer(_ref, ref) {
 
 var index$7 = /*#__PURE__*/React.forwardRef(DhPlayer);
 
-var _excluded$m = ["id", "videoUrls", "definitionList", "isLoop", "muted", "currentIndex", "setCurrentIndex", "className", "style", "visible", "autoplay", "videoInit", "enableMemory", "lastPlayTimeHideDelay"];
+var _excluded$m = ["id", "videoUrls", "definitionList", "isLoop", "muted", "currentIndex", "setCurrentIndex", "className", "style", "open", "autoplay", "videoInit", "enableMemory", "lastPlayTimeHideDelay"];
 
 var DEFAULT_PLAY_BACK_RATE = [0.5, 0.75, 1, 1.5, 2]; // 默认记忆提示文字展示时长(s)
 
 var DEFAULT_LAST_PLAY_TIME_DELAY = 5; // 默认音量大小
 
 var DEFAULT_VOLUME = 0.6;
-var index$8 = /*#__PURE__*/React.forwardRef(function (_ref, playerRef) {
+var index$8 = (function (_ref) {
   var id = _ref.id,
       _ref$videoUrls = _ref.videoUrls,
       videoUrls = _ref$videoUrls === void 0 ? [] : _ref$videoUrls,
@@ -11549,8 +11561,8 @@ var index$8 = /*#__PURE__*/React.forwardRef(function (_ref, playerRef) {
       setParentIndex = _ref.setCurrentIndex,
       className = _ref.className,
       style = _ref.style,
-      _ref$visible = _ref.visible,
-      visible = _ref$visible === void 0 ? true : _ref$visible,
+      _ref$open = _ref.open,
+      open = _ref$open === void 0 ? true : _ref$open,
       _ref$autoplay = _ref.autoplay,
       autoplay = _ref$autoplay === void 0 ? false : _ref$autoplay,
       _ref$videoInit = _ref.videoInit,
@@ -11562,26 +11574,19 @@ var index$8 = /*#__PURE__*/React.forwardRef(function (_ref, playerRef) {
       props = _objectWithoutProperties(_ref, _excluded$m);
 
   var player = React.useRef();
-
-  var _useState = React.useState(true),
-      _useState2 = _slicedToArray(_useState, 2),
-      firstRender = _useState2[0],
-      setFirstRender = _useState2[1];
-
-  var _useState3 = React.useState(false),
-      _useState4 = _slicedToArray(_useState3, 2),
-      ready = _useState4[0],
-      setReady = _useState4[1];
-
   var currentPlayerIndex = React.useRef(0); // 内置的 index 状态管理
 
-  var _useState5 = React.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 _useState = React.useState(0),
+      _useState2 = _slicedToArray(_useState, 2),
+      videoIndex = _useState2[0],
+      setVideoIndex = _useState2[1];
+
+  var currentIndex = React.useMemo(function () {
+    return parentIndex !== null && parentIndex !== void 0 ? parentIndex : videoIndex;
+  }, [parentIndex, videoIndex]);
+  var setCurrentIndex = React.useMemo(function () {
+    return setParentIndex !== null && setParentIndex !== void 0 ? setParentIndex : setVideoIndex;
+  }, [setParentIndex, setVideoIndex]);
   var config = React.useRef(_objectSpread2({
     url: videoUrls[0],
     playbackRate: DEFAULT_PLAY_BACK_RATE,
@@ -11595,52 +11600,25 @@ var index$8 = /*#__PURE__*/React.forwardRef(function (_ref, playerRef) {
   }, props));
   /** 设置当前播放 index */
 
-  var handleSetCurrentIndex = React.useCallback(function (_ref2) {
-    var currentIdx = _ref2.currentIdx,
-        videoUrls = _ref2.videoUrls;
+  var handleSetCurrentIndex = React.useCallback(function (currentIdx) {
     var newIdx = currentIdx !== null && currentIdx !== void 0 ? currentIdx : currentPlayerIndex.current + 1;
 
     if (newIdx >= videoUrls.length) {
-      newIdx = 0;
+      if (isLoop) {
+        // 允许循环则播放起始视频
+        newIdx = 0;
+      } else if (player.current && player.current.video) {
+        // 不允许循环则进度条快进到最后
+        player.current.currentTime = player.current.video.duration;
+        return;
+      }
     }
 
     setCurrentIndex(newIdx);
-  }, [setCurrentIndex]);
-  /** 结束事件 */
-
-  var onEnd = React.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 = React.useCallback(function (videoUrls) {
-    return function () {
-      if (player.current) {
-        // 防止 next 按钮消失
-        player.current.currentVideoIndex = videoUrls.length - 2;
-      }
-
-      handleSetCurrentIndex({
-        videoUrls: videoUrls
-      });
-    };
-  }, [handleSetCurrentIndex]);
+  }, [isLoop, setCurrentIndex, videoUrls.length]);
   /** 播放下一个 */
 
-  var handlePlayNext = React.useCallback(function (currentIdx, isLoop) {
+  var handlePlayNext = React.useCallback(function (currentIdx) {
     if (!player.current) {
       return;
     }
@@ -11654,7 +11632,7 @@ var index$8 = /*#__PURE__*/React.forwardRef(function (_ref, playerRef) {
       // 防止 next 按钮消失
       player.current.currentVideoIndex = -videoUrls.length;
     }
-  }, [videoUrls]);
+  }, [videoUrls, isLoop]);
   /** 重置视频 */
 
   var handleReset = React.useCallback(function () {
@@ -11670,47 +11648,47 @@ var index$8 = /*#__PURE__*/React.forwardRef(function (_ref, playerRef) {
   /** 弹窗中的视频关闭以后重置 */
 
   React.useEffect(function () {
-    if (!visible) {
+    if (!open) {
       handleReset();
     }
-  }, [handleReset, visible]);
+  }, [handleReset, open]);
   /** 当 currentIndex 改变以后自动播放下一个 */
 
   React.useEffect(function () {
-    if (!player.current || !visible) {
+    if (!player.current || !open) {
       return;
     }
 
-    handlePlayNext(currentIndex !== null && currentIndex !== void 0 ? currentIndex : currentPlayerIndex.current, isLoop);
-  }, [currentIndex, handlePlayNext, isLoop, visible]);
+    handlePlayNext(currentIndex !== null && currentIndex !== void 0 ? currentIndex : currentPlayerIndex.current);
+  }, [currentIndex, handlePlayNext, open]);
   /** 播放器初始化并绑定事件 */
 
   React.useEffect(function () {
-    var _player$current4;
-
-    if (!visible || lodashEs.isEmpty(videoUrls) || player.current) {
+    if (!open || lodashEs.isEmpty(videoUrls) || player.current) {
       return;
     }
 
-    var newConfig = _objectSpread2(_objectSpread2({}, config.current), {}, {
-      muted: muted,
-      volume: muted ? 0 : DEFAULT_VOLUME,
-      autoplay: autoplay,
-      videoInit: videoInit
-    });
+    player.current = new Player__default['default'](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;
 
-    setReady(false);
-    setFirstRender(false); // @ts-ignore
+          return (_player$current = player.current) === null || _player$current === void 0 ? void 0 : _player$current.play();
+        });
+      } else {
+        var _player$current2;
 
-    player.current = new Player__default['default'](newConfig);
-    player.current.currentVideoIndex = -videoUrls.length;
-    player.current.on('ended', onEnd(isLoop, videoUrls)); // 播放记忆缓存
+        (_player$current2 = player.current) === null || _player$current2 === void 0 ? void 0 : _player$current2.pause();
+      }
+    }); // 播放记忆缓存
 
     if (enableMemory) {
-      var _player$current2;
-
       var videoPlayedTimeObj = JSON.parse(localStorage.getItem('videoPlayedTime') || '{}');
-      (_player$current2 = player.current) === null || _player$current2 === void 0 ? void 0 : _player$current2.on('timeupdate', function () {
+      player.current.on('timeupdate', function () {
         var _player$current3;
 
         if (currentPlayerIndex.current === -1) {
@@ -11724,23 +11702,27 @@ var index$8 = /*#__PURE__*/React.forwardRef(function (_ref, playerRef) {
       });
     }
 
-    (_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]);
+    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, open]);
   /** 读取缓存的播放记忆并跳转 */
 
   React.useEffect(function () {
-    if (enableMemory && visible) {
+    if (enableMemory && open) {
       var _JSON$parse;
 
-      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;
+      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;
 
       setTimeout(function () {
-        handleSetCurrentIndex({
-          currentIdx: _videoIndex,
-          videoUrls: videoUrls
-        });
+        handleSetCurrentIndex(_videoIndex);
         setTimeout(function () {
           if (player.current) {
             player.current.currentTime = lastPlayTime;
@@ -11748,7 +11730,7 @@ var index$8 = /*#__PURE__*/React.forwardRef(function (_ref, playerRef) {
         });
       });
     }
-  }, [visible, enableMemory, handleSetCurrentIndex, id, videoUrls]);
+  }, [open, enableMemory, handleSetCurrentIndex, id]);
   /** 加载清晰度配置 */
 
   React.useEffect(function () {
@@ -11756,23 +11738,10 @@ var index$8 = /*#__PURE__*/React.forwardRef(function (_ref, playerRef) {
       player.current.emit('resourceReady', definitionList[currentIndex]);
     }
   }, [currentIndex, definitionList]);
-  React.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 = React.useCallback(function (r) {
-    if (r && visible) {
+  var getRef = React.useCallback(function (ref) {
+    if (ref && open) {
       var newConfig = _objectSpread2(_objectSpread2({}, config.current), {}, {
-        el: r,
+        el: ref,
         url: videoUrls[0],
         playNext: {
           urlList: videoUrls.slice(1)
@@ -11782,8 +11751,8 @@ var index$8 = /*#__PURE__*/React.forwardRef(function (_ref, playerRef) {
       if (enableMemory) {
         var _JSON$parse2;
 
-        var _ref4 = ((_JSON$parse2 = JSON.parse(localStorage.getItem('videoPlayedTime') || '{}')) === null || _JSON$parse2 === void 0 ? void 0 : _JSON$parse2[id]) || {},
-            lastPlayTime = _ref4.lastPlayTime;
+        var _ref3 = ((_JSON$parse2 = JSON.parse(localStorage.getItem('videoPlayedTime') || '{}')) === null || _JSON$parse2 === void 0 ? void 0 : _JSON$parse2[id]) || {},
+            lastPlayTime = _ref3.lastPlayTime;
 
         Object.assign(newConfig, {
           lastPlayTime: lastPlayTime,
@@ -11793,15 +11762,7 @@ var index$8 = /*#__PURE__*/React.forwardRef(function (_ref, playerRef) {
 
       config.current = newConfig;
     }
-
-    if (playerRef) {
-      if (typeof playerRef === 'function') {
-        playerRef(player.current);
-      } else {
-        playerRef.current = player.current;
-      }
-    }
-  }, [visible, playerRef, videoUrls, enableMemory, id, lastPlayTimeHideDelay]);
+  }, [open, id, videoUrls, lastPlayTimeHideDelay, enableMemory]);
   return /*#__PURE__*/React__default['default'].createElement("div", {
     className: className,
     ref: getRef,

package/package.json

@@ -1,93 +1,93 @@
-{
-  "private": false,
-  "name": "wargerm",
-  "version": "0.7.31",
-  "scripts": {
-    "dev": "dumi dev",
-    "docs:build": "dumi build",
-    "docs:deploy": "gh-pages -d docs-dist",
-    "build": "father-build",
-    "deploy": "npm run docs:build && npm run docs:deploy",
-    "release": "npm run build && npm publish",
-    "prettier": "prettier --write \"**/*.{js,jsx,tsx,ts,less,md,json}\"",
-    "test": "umi-test",
-    "test:coverage": "umi-test --coverage"
-  },
-  "main": "dist/index.js",
-  "module": "dist/index.esm.js",
-  "unpkg": "dist/index.umd.min.js",
-  "typings": "dist/index.d.ts",
-  "author": "jinly2",
-  "license": "MIT",
-  "keywords": [
-    "React",
-    "Component"
-  ],
-  "gitHooks": {
-    "pre-commit": "lint-staged"
-  },
-  "repository": {
-    "type": "git",
-    "url": "http://code.eblssmart.com/platform/web/wargerm-components.git",
-    "branch": "main"
-  },
-  "files": [
-    "dist",
-    "es",
-    "lib",
-    "index.css"
-  ],
-  "lint-staged": {
-    "*.{js,jsx,less,md,json}": [
-      "prettier --write"
-    ],
-    "*.ts?(x)": [
-      "prettier --parser=typescript --write"
-    ]
-  },
-  "dependencies": {
-    "@ant-design/pro-table": "^3.3.1",
-    "animate.css": "^4.1.1",
-    "dayjs": "^1.11.7",
-    "echarts": "^5.2.2",
-    "echarts-for-react": "^3.0.2",
-    "lodash-es": "^4.17.21",
-    "react-countup": "^6.0.0",
-    "react-dom": "^17.0.2",
-    "react-file-viewer": "^1.2.1",
-    "swiper": "^6.7.0",
-    "use-sync-external-store": "^1.2.0",
-    "xgplayer": "^2.31.6",
-    "xgplayer-flv": "^2.5.1",
-    "xgplayer-flv.js": "^2.3.0",
-    "xgplayer-hls": "^2.5.2",
-    "xgplayer-hls.js": "^2.6.1"
-  },
-  "peerDependencies": {
-    "@ant-design/icons": ">=4.2.0",
-    "antd": ">=4.7.0",
-    "classnames": ">=2.2.0",
-    "echarts": "^5.2.2",
-    "echarts-for-react": "^3.0.2",
-    "lodash-es": ">=4.17.21",
-    "react": ">=17.0.0"
-  },
-  "devDependencies": {
-    "@ant-design/icons": "^4.6.4",
-    "@types/lodash-es": "^4.17.6",
-    "@types/react-dom": "^17.0.11",
-    "@types/use-sync-external-store": "^0.0.3",
-    "@umijs/test": "^3.0.5",
-    "antd": "^5.2.2",
-    "classnames": "^2.3.1",
-    "dumi": "^1.1.31",
-    "father-build": "^1.19.1",
-    "gh-pages": "^3.0.0",
-    "lint-staged": "^10.0.7",
-    "prettier": "^1.19.1",
-    "react": "^16.12.0",
-    "react-dnd": "^16.0.1",
-    "react-dnd-html5-backend": "^16.0.1",
-    "yorkie": "^2.0.0"
-  }
+{
+  "private": false,
+  "name": "wargerm",
+  "version": "0.7.32",
+  "scripts": {
+    "dev": "dumi dev",
+    "docs:build": "dumi build",
+    "docs:deploy": "gh-pages -d docs-dist",
+    "build": "father-build",
+    "deploy": "npm run docs:build && npm run docs:deploy",
+    "release": "npm run build && npm publish",
+    "prettier": "prettier --write \"**/*.{js,jsx,tsx,ts,less,md,json}\"",
+    "test": "umi-test",
+    "test:coverage": "umi-test --coverage"
+  },
+  "main": "dist/index.js",
+  "module": "dist/index.esm.js",
+  "unpkg": "dist/index.umd.min.js",
+  "typings": "dist/index.d.ts",
+  "author": "jinly2",
+  "license": "MIT",
+  "keywords": [
+    "React",
+    "Component"
+  ],
+  "gitHooks": {
+    "pre-commit": "lint-staged"
+  },
+  "repository": {
+    "type": "git",
+    "url": "http://code.eblssmart.com/platform/web/wargerm-components.git",
+    "branch": "main"
+  },
+  "files": [
+    "dist",
+    "es",
+    "lib",
+    "index.css"
+  ],
+  "lint-staged": {
+    "*.{js,jsx,less,md,json}": [
+      "prettier --write"
+    ],
+    "*.ts?(x)": [
+      "prettier --parser=typescript --write"
+    ]
+  },
+  "dependencies": {
+    "@ant-design/pro-table": "^3.3.1",
+    "animate.css": "^4.1.1",
+    "dayjs": "^1.11.7",
+    "echarts": "^5.2.2",
+    "echarts-for-react": "^3.0.2",
+    "lodash-es": "^4.17.21",
+    "react-countup": "^6.0.0",
+    "react-dom": "^17.0.2",
+    "react-file-viewer": "^1.2.1",
+    "swiper": "^6.7.0",
+    "use-sync-external-store": "^1.2.0",
+    "xgplayer": "^2.31.6",
+    "xgplayer-flv": "^2.5.1",
+    "xgplayer-flv.js": "^2.3.0",
+    "xgplayer-hls": "^2.5.2",
+    "xgplayer-hls.js": "^2.6.1"
+  },
+  "peerDependencies": {
+    "@ant-design/icons": ">=4.2.0",
+    "antd": ">=4.7.0",
+    "classnames": ">=2.2.0",
+    "echarts": "^5.2.2",
+    "echarts-for-react": "^3.0.2",
+    "lodash-es": ">=4.17.21",
+    "react": ">=17.0.0"
+  },
+  "devDependencies": {
+    "@ant-design/icons": "^4.6.4",
+    "@types/lodash-es": "^4.17.6",
+    "@types/react-dom": "^17.0.11",
+    "@types/use-sync-external-store": "^0.0.3",
+    "@umijs/test": "^3.0.5",
+    "antd": "^5.2.2",
+    "classnames": "^2.3.1",
+    "dumi": "^1.1.31",
+    "father-build": "^1.19.1",
+    "gh-pages": "^3.0.0",
+    "lint-staged": "^10.0.7",
+    "prettier": "^1.19.1",
+    "react": "^16.12.0",
+    "react-dnd": "^16.0.1",
+    "react-dnd-html5-backend": "^16.0.1",
+    "yorkie": "^2.0.0"
+  }
 }