zy-react-library 1.0.131 → 1.0.133

package/components/HiddenInfo/gwj/index.js

@@ -12,6 +12,7 @@ import HeaderBack from "../../HeaderBack";
 import VideoIcon from "../../Icon/VideoIcon";
 import PreviewImg from "../../PreviewImg";
 import PreviewPdf from "../../PreviewPdf";
+import Video from "../../Video";
 
 /**
  * 隐患查看组件（港务局版本）
@@ -42,6 +43,7 @@ function HiddenInfo(props) {
   const [acceptImageFiles, setAcceptImageFiles] = useState([]);
   const [inspectionAcceptImageFiles, setInspectionAcceptImageFiles] = useState([]);
   const [loading, setLoading] = useState(true);
+  const [videoModalOpen, setVideoModalOpen] = useState(true);
 
   const { getFile } = useGetFile();
   const query = useGetUrlQuery();
@@ -146,7 +148,14 @@ function HiddenInfo(props) {
                 }),
               },
               { label: "隐患图片", children: <PreviewImg files={hiddenImageFiles} /> },
-              ...(hiddenVideoFiles.length > 0 ? [{ label: "隐患视频", children: <VideoIcon /> }] : []),
+              ...(hiddenVideoFiles.length > 0
+                ? [{ label: "隐患视频", children: (
+                    <VideoIcon onClick={() => {
+                      setVideoModalOpen(true);
+                    }}
+                    />
+                  ) }]
+                : []),
             ]}
           />
           {
@@ -420,6 +429,16 @@ function HiddenInfo(props) {
           }
         </div>
       </Spin>
+      {
+        videoModalOpen && (
+          <Video
+            visible={videoModalOpen}
+            source={hiddenVideoFiles[0].url}
+            onCancel={() => setVideoModalOpen(false)}
+            title="隐患视频"
+          />
+        )
+      }
     </div>
   );
 }

package/components/Map/MapSelector.js

@@ -34,11 +34,8 @@ const MapSelector = (props) => {
 
   // 初始化地图
   const initMap = async () => {
-    await dynamicLoadJs("https://api.map.baidu.com/api?v=1.0&type=webgl&ak=OElqFYoKiAH8KFtph8ftLKF5NlNrbCUr");
-
     if (!window.BMapGL) {
-      console.error("BMapGL is not loaded");
-      return;
+      await dynamicLoadJs("https://api.map.baidu.com/api?v=1.0&type=webgl&ak=OElqFYoKiAH8KFtph8ftLKF5NlNrbCUr");
     }
 
     setLoading(true);

package/components/Video/AliPlayer.js

@@ -44,8 +44,11 @@ const AliPlayer = forwardRef(({
   const onCreateAliPlayer = async () => {
     if (!containerRef.current)
       return;
-    await dynamicLoadJs("https://g.alicdn.com/apsara-media-box/imp-web-player/2.16.3/aliplayer-min.js");
-    await dynamicLoadCss("https://g.alicdn.com/apsara-media-box/imp-web-player/2.16.3/skins/default/aliplayer-min.css");
+    if (!window.Aliplayer) {
+      await dynamicLoadJs("https://g.alicdn.com/apsara-media-box/imp-web-player/2.16.3/aliplayer-min.js");
+      await dynamicLoadCss("https://g.alicdn.com/apsara-media-box/imp-web-player/2.16.3/skins/default/aliplayer-min.css");
+    }
+
     onDisposeAliPlayer();
 
     const skinLayout = [
@@ -79,51 +82,49 @@ const AliPlayer = forwardRef(({
       });
     }
 
-    if (typeof window.Aliplayer !== "undefined") {
-      playerRef.current = new window.Aliplayer(
-        {
-          id: className,
-          ...(source
-            ? { source }
-            : {
-                vid,
-                playauth: playAuth,
-                qualitySort: "asc",
-                format: "m3u8",
-                encryptType: 1,
-                mediaType: "video",
-                isLive: true,
-                rePlay: false,
-                playsinline: true,
-                controlBarVisibility: "hover",
-              }),
-          cover,
-          width,
-          height,
-          autoplay,
-          isLive,
-          useH5Prism: true,
-          skinLayout,
-        },
-        (player) => {
-          if (autoplay) {
-            player.play();
-          }
-
-          player.on("ended", () => {
-            onEnded && onEnded();
-          });
-
-          player.on("timeupdate", () => {
-            onTimeupdate && onTimeupdate(player.getCurrentTime());
-          });
-
-          if (playTime > 0) {
-            player.seek(playTime);
-          }
-        },
-      );
-    }
+    playerRef.current = new window.Aliplayer(
+      {
+        id: className,
+        ...(source
+          ? { source }
+          : {
+              vid,
+              playauth: playAuth,
+              qualitySort: "asc",
+              format: "m3u8",
+              encryptType: 1,
+              mediaType: "video",
+              isLive: true,
+              rePlay: false,
+              playsinline: true,
+              controlBarVisibility: "hover",
+            }),
+        cover,
+        width,
+        height,
+        autoplay,
+        isLive,
+        useH5Prism: true,
+        skinLayout,
+      },
+      (player) => {
+        if (autoplay) {
+          player.play();
+        }
+
+        player.on("ended", () => {
+          onEnded && onEnded();
+        });
+
+        player.on("timeupdate", () => {
+          onTimeupdate && onTimeupdate(player.getCurrentTime());
+        });
+
+        if (playTime > 0) {
+          player.seek(playTime);
+        }
+      },
+    );
   };
 
   useEffect(() => {

package/components/Video/index.d.ts

@@ -2,6 +2,8 @@ import type { ForwardRefExoticComponent, RefAttributes } from "react";
 import type { AliPlayerProps, AliPlayerRef } from "./AliPlayer";
 
 export interface VideoProps extends Omit<AliPlayerProps, "onEnded" | "onTimeupdate"> {
+  /** 弹窗标题，默认 “视频” */
+  title?: string;
   /** 是否显示弹窗 */
   visible?: boolean;
   /** 是否内联模式 */

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "zy-react-library",
   "private": false,
-  "version": "1.0.131",
+  "version": "1.0.133",
   "type": "module",
   "description": "",
   "author": "LiuJiaNan",