pixuireactcomponents 1.5.28 → 1.5.30

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "pixuireactcomponents",
-    "version": "1.5.28",
+    "version": "1.5.30",
     "description": "pixui react components",
     "main": "index.js",
     "scripts": {

package/src/components/react/app/dropDown/DropDown.js

@@ -35,20 +35,27 @@ export var DropDown = function (props) {
     var elementStyleOrClass = getElementStyleOrClass();
     var _a = useState(false), spread = _a[0], setSpread = _a[1];
     var dropdownRef = useRef(null);
+    var dropdownContentRef = useRef(null);
     useEffect(function () {
         onSpread && onSpread(spread);
     }, [spread]);
     useEffect(function () {
         var handleClickOutside = function (event) {
             // console.log('handleClickOutside, ', event.clientX, event.clientY)
-            if (dropdownRef.current) {
+            if (dropdownRef.current && dropdownContentRef.current) {
                 var dropDownRect = dropdownRef.current.getBoundingClientRect();
+                var contentRect = dropdownContentRef.current.getBoundingClientRect();
                 // console.log('dropDownRect', dropDownRect, 'isOutside', event.clientX < dropDownRect.left, 'isOutside', event.clientX > dropDownRect.right, 'isOutside', event.clientY < dropDownRect.top, 'isOutside', event.clientY > dropDownRect.bottom)
-                var isOutside = event.clientX < dropDownRect.left ||
+                // console.log('contentRect', contentRect, 'isOutside', event.clientX < contentRect.left, 'isOutside', event.clientX > contentRect.right, 'isOutside', event.clientY < contentRect.top, 'isOutside', event.clientY > contentRect.bottom)
+                var isOutsideDropdown = event.clientX < dropDownRect.left ||
                     event.clientX > dropDownRect.right ||
                     event.clientY < dropDownRect.top ||
                     event.clientY > dropDownRect.bottom;
-                if (isOutside) {
+                var isOutsideContent = event.clientX < contentRect.left ||
+                    event.clientX > contentRect.right ||
+                    event.clientY < contentRect.top ||
+                    event.clientY > contentRect.bottom;
+                if (isOutsideDropdown && isOutsideContent) {
                     setSpread(false);
                 }
             }
@@ -87,7 +94,7 @@ export var DropDown = function (props) {
         overlayRender,
         spread && (
         //在下方展开
-        h("div", { className: typeof elementStyleOrClass.dropdownBg === 'string' ? elementStyleOrClass.dropdownBg : '', style: __assign({ flexDirection: 'column', overflow: 'scroll' }, (typeof elementStyleOrClass.dropdownBg === 'object' ? elementStyleOrClass.dropdownBg : undefined)) }, options.map(function (option, index) {
+        h("div", { ref: dropdownContentRef, className: typeof elementStyleOrClass.dropdownBg === 'string' ? elementStyleOrClass.dropdownBg : '', style: __assign({ flexDirection: 'column', overflow: 'scroll' }, (typeof elementStyleOrClass.dropdownBg === 'object' ? elementStyleOrClass.dropdownBg : undefined)) }, options.map(function (option, index) {
             return (h("div", null, optionRender(option)));
         })))));
 };

package/src/components/react/app/videoPlayer/VideoPlayer.js

@@ -88,7 +88,7 @@ var videoLog = function () {
 };
 export var VideoPlayer = function (props) {
     var rootId = props.rootId, rootClassName = props.rootClassName, _a = props.playUrl, playUrl = _a === void 0 ? '' : _a, _b = props.autoPlay, autoPlay = _b === void 0 ? true : _b, playEvent = props.playEvent, iconElement = props.iconElement, _c = props.hideSliderDuration, hideSliderDuration = _c === void 0 ? 3000 : _c, sliderElement = props.sliderElement, videoDuration = props.videoDuration, compRef = props.compRef;
-    var isStreaming = !playUrl.endsWith('.mp4');
+    var isStreaming = !playUrl.split('?')[0].endsWith('.mp4');
     var refVideo = useRef(null);
     var _d = useState(VideoStatus.Loading), videoStatus = _d[0], setVideoStatus = _d[1];
     var _e = useState(0), currentTime = _e[0], setCurrentTime = _e[1];
@@ -133,26 +133,27 @@ export var VideoPlayer = function (props) {
         updatePlayTimeFunRef.current = updatePlayTime;
     });
     useEffect(function () {
-        updatePlayTimeFunRef.current = updatePlayTime;
-        var interval = setInterval(function () {
-            updatePlayTimeFunRef.current();
-        }, 1000);
-        if (isStreaming)
-            return;
-        var playTime = refVideo.current.currentTime;
-        var currentSeconds = Math.floor(playTime / 1000 + 0.5);
-        var duration = getDuration();
-        if (duration == undefined) {
-            console.error('该版本的pixui不支持自动获取视频时长，请手动传入videoDuration');
+        // 如果是直播流则不需要处理进度条
+        if (!isStreaming) {
+            updatePlayTimeFunRef.current = updatePlayTime;
+            var interval_1 = setInterval(function () {
+                updatePlayTimeFunRef.current();
+            }, 1000);
+            var playTime = refVideo.current.currentTime;
+            var currentSeconds = Math.floor(playTime / 1000 + 0.5);
+            var duration = getDuration();
+            if (duration == undefined) {
+                console.error('该版本的pixui不支持自动获取视频时长，请手动传入videoDuration');
+            }
+            var totalSeconds = Math.floor(duration / 1000 + 0.5);
+            setCurrentTime(currentSeconds);
+            setTotalTime(totalSeconds);
+            return function () {
+                clearInterval(interval_1);
+                clearInterval(sliderTimmer.current);
+            };
         }
-        var totalSeconds = Math.floor(duration / 1000 + 0.5);
-        setCurrentTime(currentSeconds);
-        setTotalTime(totalSeconds);
-        return function () {
-            clearInterval(interval);
-            clearInterval(sliderTimmer.current);
-        };
-    }, []);
+    }, [playUrl]);
     // 开始拖就长显Bar
     var onSliderDragStart = function () {
         videoLog('onDragStart-----------------');