inl-ui 0.1.37 → 0.1.38

package/dist/components/index.cjs

@@ -8772,14 +8772,6 @@ const VideoPlayerV2 = vue.defineComponent({
         }
       });
     };
-    const stopV = id => {
-      const videoElement = document.getElementById(id);
-      if (videoElement) {
-        videoElement.pause();
-        videoElement.removeAttribute("src");
-        videoElement.load();
-      }
-    };
     const releaseUrl = vue.ref("");
     const release = async () => {
       const res = await axios__default["default"].get(releaseUrl.value);
@@ -8829,7 +8821,6 @@ const VideoPlayerV2 = vue.defineComponent({
     };
     vue.watch([() => _prop.camera, () => _prop.cameraConfig], ([camera, cameraConfig]) => {
       stopPlay();
-      stopV(`videoPlayer_${uuid}`);
       getVideoDetail(camera);
     }, {
       immediate: true,
@@ -8837,27 +8828,27 @@ const VideoPlayerV2 = vue.defineComponent({
     });
     vue.onBeforeUnmount(() => {
       stopPlay();
-      const videoElement = document.getElementById(`videoPlayer_${uuid}`);
-      if (videoElement) {
-        videoElement.pause();
-        videoElement.src = null;
-        videoElement.srcObject = null;
-        videoElement.remove();
-      }
     });
-    return () => videoInfo2.value.brandTypeCode !== "MP4" ? vue.createVNode("video", {
-      "id": `videoPlayer_${uuid}`,
-      "class": `videoComponent ${_prop.fill}`,
-      "muted": true,
-      "autoplay": true
-    }, null) : vue.createVNode("video", {
-      "id": `videoPlayer_${uuid}`,
-      "class": "videoComponent fill",
-      "src": videoInfo2.value.mp4ResourcesPath,
-      "autoplay": true,
-      "loop": true,
-      "muted": true
-    }, null);
+    const renderVideo = () => {
+      if (videoInfo2.value.brandTypeCode === "MP4") {
+        return vue.createVNode("video", {
+          "id": `mp4Player_${uuid}`,
+          "class": "videoComponent fill",
+          "src": videoInfo2.value.mp4ResourcesPath,
+          "autoplay": true,
+          "loop": true,
+          "muted": true
+        }, null);
+      } else {
+        return vue.createVNode("video", {
+          "id": `videoPlayer_${uuid}`,
+          "class": `videoComponent ${_prop.fill}`,
+          "muted": true,
+          "autoplay": true
+        }, null);
+      }
+    };
+    return () => vue.createVNode(vue.Fragment, null, [renderVideo()]);
   }
 });
 var videoPlayerV2 = installComponent(VideoPlayerV2, "video-player-v2");
@@ -9211,7 +9202,7 @@ const VideoBoxV2 = vue.defineComponent({
       signal: 28
     }]];
     const infos = vue.ref([]);
-    const uuid = UUID();
+    const uuid = vue.ref(UUID());
     vue.onMounted(() => {
       showInfo.value = _prop.showInfo;
     });
@@ -9288,7 +9279,7 @@ const VideoBoxV2 = vue.defineComponent({
         }
       });
       camera.value = res.data.data;
-      streams.value = JSON.parse(camera.value.brandTypePo?.streamTypeDict || "[]");
+      streams.value = JSON.parse(camera.value?.brandTypePo?.streamTypeDict || "[]");
     };
     let timeout;
     vue.ref(true);
@@ -9296,6 +9287,7 @@ const VideoBoxV2 = vue.defineComponent({
     const fill = vue.ref("fill");
     vue.watch(() => _prop.camera, val => {
       if (val && Object.keys(val).length != 0) {
+        camera.value = void 0;
         getVideoParams(val);
         getVideoDetail(val);
         const fillVal = localStorage.getItem(val);
@@ -9313,27 +9305,27 @@ const VideoBoxV2 = vue.defineComponent({
           token: sessionStorage.getItem("token") || ""
         },
         params: {
-          uuid: camera.value.uuid,
+          uuid: camera.value?.uuid,
           chosenStreamType: code
         }
       });
       cameraConfig.value.webrtcTemplateMerged = res.data.data[0];
     };
     return () => vue.createVNode("div", {
-      "id": "videoBox_" + uuid,
+      "id": "videoBox_" + uuid.value,
       "class": ["videoBox", _prop.alarm ? "alarm" : ""]
-    }, [vue.createVNode(VideoPlayerV2, {
+    }, [camera.value ? vue.createVNode(VideoPlayerV2, {
       "ref": player,
-      "domId": uuid,
+      "domId": uuid.value,
       "camera": camera.value,
       "cameraConfig": cameraConfig.value,
       "fill": fill.value,
       "onChangeStream": () => {
         cameraConfig.value = {
-          streamType: streamHistory.value || camera.value.streamType
+          streamType: streamHistory.value || camera.value?.streamType
         };
       }
-    }, null), showInfo.value ? vue.createVNode("div", {
+    }, null) : "", showInfo.value ? vue.createVNode("div", {
       "class": "selectFields"
     }, [[0, 1, 2, 3, 4, 5].map(index => {
       let info = {};
@@ -9354,7 +9346,7 @@ const VideoBoxV2 = vue.defineComponent({
     }, [vue.createVNode("span", null, [camera.value?.name])]), vue.createVNode("div", {
       "class": "tool"
     }, [_prop.btns.map(btn => {
-      if (!(camera.value.brandTypeCode === "MP4" && btn !== "close" && btn !== "fullScreen" && btn !== "look")) {
+      if (!(camera.value?.brandTypeCode === "MP4" && btn !== "close" && btn !== "fullScreen" && btn !== "look")) {
         switch (btn) {
           case "fill":
             return vue.createVNode("img", {
@@ -9362,10 +9354,10 @@ const VideoBoxV2 = vue.defineComponent({
               "onClick": e => {
                 if (fill.value === "fill") {
                   fill.value = "contain";
-                  localStorage.setItem(camera.value.uuid, fill.value);
+                  localStorage.setItem(camera.value?.uuid, fill.value);
                 } else {
                   fill.value = "fill";
-                  localStorage.setItem(camera.value.uuid, fill.value);
+                  localStorage.setItem(camera.value?.uuid, fill.value);
                 }
               },
               "src": "/micro-assets/inl/video/controls/fill.svg"
@@ -9503,13 +9495,13 @@ const PollingPlay = vue.defineComponent({
       fullScreen: false,
       name: ""
     });
-    const setCurrentVideos = team => {
+    const setCurrentVideos = async team => {
       data.name = team.pollingGroupName;
       data.showType = `type${team.amount}`;
-      data.pointList.length = 0;
+      data.pointList = [];
       for (let i = 0; i < parseInt(team.amount, 10); i++) {
         const video = team.monitorPointPoList[i];
-        data.pointList.push(video?.cameraUuid || {});
+        data.pointList.push(video?.cameraUuid || "");
       }
     };
     const findShouldPlay = () => {
@@ -9595,16 +9587,18 @@ const PollingPlay = vue.defineComponent({
     }, null), "\u5168\u5C4F\u663E\u793A"])]) : "", vue.createVNode("div", {
       "id": "grid",
       "class": ["grid", data.showType, data.fullScreen ? "full" : ""]
-    }, [data.pointList.map((item, index) => vue.createVNode("div", {
-      "class": "video"
-    }, [_props.version === "V2" ? vue.createVNode(VideoBoxV2, {
-      "camera": item,
-      "btns": _props.btns,
-      "alarm": alarmList.value[index]
-    }, null) : vue.createVNode(VideoBox, {
-      "camera": item,
-      "btns": _props.btns
-    }, null)]))])]);
+    }, [data.pointList.map((item, index) => {
+      return vue.createVNode("div", {
+        "class": "video"
+      }, [_props.version === "V2" ? vue.createVNode(VideoBoxV2, {
+        "camera": item,
+        "btns": _props.btns,
+        "alarm": alarmList.value[index]
+      }, null) : vue.createVNode(VideoBox, {
+        "camera": item,
+        "btns": _props.btns
+      }, null)]);
+    })])]);
   }
 });
 var pollingPlay = installComponent(PollingPlay, "polling-play");

package/dist/components/index.js

@@ -8761,14 +8761,6 @@ const VideoPlayerV2 = defineComponent({
         }
       });
     };
-    const stopV = id => {
-      const videoElement = document.getElementById(id);
-      if (videoElement) {
-        videoElement.pause();
-        videoElement.removeAttribute("src");
-        videoElement.load();
-      }
-    };
     const releaseUrl = ref("");
     const release = async () => {
       const res = await axios$2.get(releaseUrl.value);
@@ -8818,7 +8810,6 @@ const VideoPlayerV2 = defineComponent({
     };
     watch([() => _prop.camera, () => _prop.cameraConfig], ([camera, cameraConfig]) => {
       stopPlay();
-      stopV(`videoPlayer_${uuid}`);
       getVideoDetail(camera);
     }, {
       immediate: true,
@@ -8826,27 +8817,27 @@ const VideoPlayerV2 = defineComponent({
     });
     onBeforeUnmount(() => {
       stopPlay();
-      const videoElement = document.getElementById(`videoPlayer_${uuid}`);
-      if (videoElement) {
-        videoElement.pause();
-        videoElement.src = null;
-        videoElement.srcObject = null;
-        videoElement.remove();
-      }
     });
-    return () => videoInfo2.value.brandTypeCode !== "MP4" ? createVNode("video", {
-      "id": `videoPlayer_${uuid}`,
-      "class": `videoComponent ${_prop.fill}`,
-      "muted": true,
-      "autoplay": true
-    }, null) : createVNode("video", {
-      "id": `videoPlayer_${uuid}`,
-      "class": "videoComponent fill",
-      "src": videoInfo2.value.mp4ResourcesPath,
-      "autoplay": true,
-      "loop": true,
-      "muted": true
-    }, null);
+    const renderVideo = () => {
+      if (videoInfo2.value.brandTypeCode === "MP4") {
+        return createVNode("video", {
+          "id": `mp4Player_${uuid}`,
+          "class": "videoComponent fill",
+          "src": videoInfo2.value.mp4ResourcesPath,
+          "autoplay": true,
+          "loop": true,
+          "muted": true
+        }, null);
+      } else {
+        return createVNode("video", {
+          "id": `videoPlayer_${uuid}`,
+          "class": `videoComponent ${_prop.fill}`,
+          "muted": true,
+          "autoplay": true
+        }, null);
+      }
+    };
+    return () => createVNode(Fragment, null, [renderVideo()]);
   }
 });
 var videoPlayerV2 = installComponent(VideoPlayerV2, "video-player-v2");
@@ -9200,7 +9191,7 @@ const VideoBoxV2 = defineComponent({
       signal: 28
     }]];
     const infos = ref([]);
-    const uuid = UUID();
+    const uuid = ref(UUID());
     onMounted(() => {
       showInfo.value = _prop.showInfo;
     });
@@ -9277,7 +9268,7 @@ const VideoBoxV2 = defineComponent({
         }
       });
       camera.value = res.data.data;
-      streams.value = JSON.parse(camera.value.brandTypePo?.streamTypeDict || "[]");
+      streams.value = JSON.parse(camera.value?.brandTypePo?.streamTypeDict || "[]");
     };
     let timeout;
     ref(true);
@@ -9285,6 +9276,7 @@ const VideoBoxV2 = defineComponent({
     const fill = ref("fill");
     watch(() => _prop.camera, val => {
       if (val && Object.keys(val).length != 0) {
+        camera.value = void 0;
         getVideoParams(val);
         getVideoDetail(val);
         const fillVal = localStorage.getItem(val);
@@ -9302,27 +9294,27 @@ const VideoBoxV2 = defineComponent({
           token: sessionStorage.getItem("token") || ""
         },
         params: {
-          uuid: camera.value.uuid,
+          uuid: camera.value?.uuid,
           chosenStreamType: code
         }
       });
       cameraConfig.value.webrtcTemplateMerged = res.data.data[0];
     };
     return () => createVNode("div", {
-      "id": "videoBox_" + uuid,
+      "id": "videoBox_" + uuid.value,
       "class": ["videoBox", _prop.alarm ? "alarm" : ""]
-    }, [createVNode(VideoPlayerV2, {
+    }, [camera.value ? createVNode(VideoPlayerV2, {
       "ref": player,
-      "domId": uuid,
+      "domId": uuid.value,
       "camera": camera.value,
       "cameraConfig": cameraConfig.value,
       "fill": fill.value,
       "onChangeStream": () => {
         cameraConfig.value = {
-          streamType: streamHistory.value || camera.value.streamType
+          streamType: streamHistory.value || camera.value?.streamType
         };
       }
-    }, null), showInfo.value ? createVNode("div", {
+    }, null) : "", showInfo.value ? createVNode("div", {
       "class": "selectFields"
     }, [[0, 1, 2, 3, 4, 5].map(index => {
       let info = {};
@@ -9343,7 +9335,7 @@ const VideoBoxV2 = defineComponent({
     }, [createVNode("span", null, [camera.value?.name])]), createVNode("div", {
       "class": "tool"
     }, [_prop.btns.map(btn => {
-      if (!(camera.value.brandTypeCode === "MP4" && btn !== "close" && btn !== "fullScreen" && btn !== "look")) {
+      if (!(camera.value?.brandTypeCode === "MP4" && btn !== "close" && btn !== "fullScreen" && btn !== "look")) {
         switch (btn) {
           case "fill":
             return createVNode("img", {
@@ -9351,10 +9343,10 @@ const VideoBoxV2 = defineComponent({
               "onClick": e => {
                 if (fill.value === "fill") {
                   fill.value = "contain";
-                  localStorage.setItem(camera.value.uuid, fill.value);
+                  localStorage.setItem(camera.value?.uuid, fill.value);
                 } else {
                   fill.value = "fill";
-                  localStorage.setItem(camera.value.uuid, fill.value);
+                  localStorage.setItem(camera.value?.uuid, fill.value);
                 }
               },
               "src": "/micro-assets/inl/video/controls/fill.svg"
@@ -9492,13 +9484,13 @@ const PollingPlay = defineComponent({
       fullScreen: false,
       name: ""
     });
-    const setCurrentVideos = team => {
+    const setCurrentVideos = async team => {
       data.name = team.pollingGroupName;
       data.showType = `type${team.amount}`;
-      data.pointList.length = 0;
+      data.pointList = [];
       for (let i = 0; i < parseInt(team.amount, 10); i++) {
         const video = team.monitorPointPoList[i];
-        data.pointList.push(video?.cameraUuid || {});
+        data.pointList.push(video?.cameraUuid || "");
       }
     };
     const findShouldPlay = () => {
@@ -9584,16 +9576,18 @@ const PollingPlay = defineComponent({
     }, null), "\u5168\u5C4F\u663E\u793A"])]) : "", createVNode("div", {
       "id": "grid",
       "class": ["grid", data.showType, data.fullScreen ? "full" : ""]
-    }, [data.pointList.map((item, index) => createVNode("div", {
-      "class": "video"
-    }, [_props.version === "V2" ? createVNode(VideoBoxV2, {
-      "camera": item,
-      "btns": _props.btns,
-      "alarm": alarmList.value[index]
-    }, null) : createVNode(VideoBox, {
-      "camera": item,
-      "btns": _props.btns
-    }, null)]))])]);
+    }, [data.pointList.map((item, index) => {
+      return createVNode("div", {
+        "class": "video"
+      }, [_props.version === "V2" ? createVNode(VideoBoxV2, {
+        "camera": item,
+        "btns": _props.btns,
+        "alarm": alarmList.value[index]
+      }, null) : createVNode(VideoBox, {
+        "camera": item,
+        "btns": _props.btns
+      }, null)]);
+    })])]);
   }
 });
 var pollingPlay = installComponent(PollingPlay, "polling-play");

package/dist/index.cjs

@@ -45,7 +45,7 @@ var ___default = /*#__PURE__*/_interopDefaultLegacy(_);
 var dayjs__default = /*#__PURE__*/_interopDefaultLegacy(dayjs);
 var EZUIKit__default = /*#__PURE__*/_interopDefaultLegacy(EZUIKit);
 
-var version = "0.1.36";
+var version = "0.1.37";
 
 const setTheme = theme => {
   if (theme === "dark") {
@@ -9775,14 +9775,6 @@ const VideoPlayerV2 = vue.defineComponent({
         }
       });
     };
-    const stopV = id => {
-      const videoElement = document.getElementById(id);
-      if (videoElement) {
-        videoElement.pause();
-        videoElement.removeAttribute("src");
-        videoElement.load();
-      }
-    };
     const releaseUrl = vue.ref("");
     const release = async () => {
       const res = await axios__default["default"].get(releaseUrl.value);
@@ -9832,7 +9824,6 @@ const VideoPlayerV2 = vue.defineComponent({
     };
     vue.watch([() => _prop.camera, () => _prop.cameraConfig], ([camera, cameraConfig]) => {
       stopPlay();
-      stopV(`videoPlayer_${uuid}`);
       getVideoDetail(camera);
     }, {
       immediate: true,
@@ -9840,27 +9831,27 @@ const VideoPlayerV2 = vue.defineComponent({
     });
     vue.onBeforeUnmount(() => {
       stopPlay();
-      const videoElement = document.getElementById(`videoPlayer_${uuid}`);
-      if (videoElement) {
-        videoElement.pause();
-        videoElement.src = null;
-        videoElement.srcObject = null;
-        videoElement.remove();
-      }
     });
-    return () => videoInfo2.value.brandTypeCode !== "MP4" ? vue.createVNode("video", {
-      "id": `videoPlayer_${uuid}`,
-      "class": `videoComponent ${_prop.fill}`,
-      "muted": true,
-      "autoplay": true
-    }, null) : vue.createVNode("video", {
-      "id": `videoPlayer_${uuid}`,
-      "class": "videoComponent fill",
-      "src": videoInfo2.value.mp4ResourcesPath,
-      "autoplay": true,
-      "loop": true,
-      "muted": true
-    }, null);
+    const renderVideo = () => {
+      if (videoInfo2.value.brandTypeCode === "MP4") {
+        return vue.createVNode("video", {
+          "id": `mp4Player_${uuid}`,
+          "class": "videoComponent fill",
+          "src": videoInfo2.value.mp4ResourcesPath,
+          "autoplay": true,
+          "loop": true,
+          "muted": true
+        }, null);
+      } else {
+        return vue.createVNode("video", {
+          "id": `videoPlayer_${uuid}`,
+          "class": `videoComponent ${_prop.fill}`,
+          "muted": true,
+          "autoplay": true
+        }, null);
+      }
+    };
+    return () => vue.createVNode(vue.Fragment, null, [renderVideo()]);
   }
 });
 var videoPlayerV2 = installComponent(VideoPlayerV2, "video-player-v2");
@@ -10214,7 +10205,7 @@ const VideoBoxV2 = vue.defineComponent({
       signal: 28
     }]];
     const infos = vue.ref([]);
-    const uuid = UUID();
+    const uuid = vue.ref(UUID());
     vue.onMounted(() => {
       showInfo.value = _prop.showInfo;
     });
@@ -10291,7 +10282,7 @@ const VideoBoxV2 = vue.defineComponent({
         }
       });
       camera.value = res.data.data;
-      streams.value = JSON.parse(camera.value.brandTypePo?.streamTypeDict || "[]");
+      streams.value = JSON.parse(camera.value?.brandTypePo?.streamTypeDict || "[]");
     };
     let timeout;
     vue.ref(true);
@@ -10299,6 +10290,7 @@ const VideoBoxV2 = vue.defineComponent({
     const fill = vue.ref("fill");
     vue.watch(() => _prop.camera, val => {
       if (val && Object.keys(val).length != 0) {
+        camera.value = void 0;
         getVideoParams(val);
         getVideoDetail(val);
         const fillVal = localStorage.getItem(val);
@@ -10316,27 +10308,27 @@ const VideoBoxV2 = vue.defineComponent({
           token: sessionStorage.getItem("token") || ""
         },
         params: {
-          uuid: camera.value.uuid,
+          uuid: camera.value?.uuid,
           chosenStreamType: code
         }
       });
       cameraConfig.value.webrtcTemplateMerged = res.data.data[0];
     };
     return () => vue.createVNode("div", {
-      "id": "videoBox_" + uuid,
+      "id": "videoBox_" + uuid.value,
       "class": ["videoBox", _prop.alarm ? "alarm" : ""]
-    }, [vue.createVNode(VideoPlayerV2, {
+    }, [camera.value ? vue.createVNode(VideoPlayerV2, {
       "ref": player,
-      "domId": uuid,
+      "domId": uuid.value,
       "camera": camera.value,
       "cameraConfig": cameraConfig.value,
       "fill": fill.value,
       "onChangeStream": () => {
         cameraConfig.value = {
-          streamType: streamHistory.value || camera.value.streamType
+          streamType: streamHistory.value || camera.value?.streamType
         };
       }
-    }, null), showInfo.value ? vue.createVNode("div", {
+    }, null) : "", showInfo.value ? vue.createVNode("div", {
       "class": "selectFields"
     }, [[0, 1, 2, 3, 4, 5].map(index => {
       let info = {};
@@ -10357,7 +10349,7 @@ const VideoBoxV2 = vue.defineComponent({
     }, [vue.createVNode("span", null, [camera.value?.name])]), vue.createVNode("div", {
       "class": "tool"
     }, [_prop.btns.map(btn => {
-      if (!(camera.value.brandTypeCode === "MP4" && btn !== "close" && btn !== "fullScreen" && btn !== "look")) {
+      if (!(camera.value?.brandTypeCode === "MP4" && btn !== "close" && btn !== "fullScreen" && btn !== "look")) {
         switch (btn) {
           case "fill":
             return vue.createVNode("img", {
@@ -10365,10 +10357,10 @@ const VideoBoxV2 = vue.defineComponent({
               "onClick": e => {
                 if (fill.value === "fill") {
                   fill.value = "contain";
-                  localStorage.setItem(camera.value.uuid, fill.value);
+                  localStorage.setItem(camera.value?.uuid, fill.value);
                 } else {
                   fill.value = "fill";
-                  localStorage.setItem(camera.value.uuid, fill.value);
+                  localStorage.setItem(camera.value?.uuid, fill.value);
                 }
               },
               "src": "/micro-assets/inl/video/controls/fill.svg"
@@ -10506,13 +10498,13 @@ const PollingPlay = vue.defineComponent({
       fullScreen: false,
       name: ""
     });
-    const setCurrentVideos = team => {
+    const setCurrentVideos = async team => {
       data.name = team.pollingGroupName;
       data.showType = `type${team.amount}`;
-      data.pointList.length = 0;
+      data.pointList = [];
       for (let i = 0; i < parseInt(team.amount, 10); i++) {
         const video = team.monitorPointPoList[i];
-        data.pointList.push(video?.cameraUuid || {});
+        data.pointList.push(video?.cameraUuid || "");
       }
     };
     const findShouldPlay = () => {
@@ -10598,16 +10590,18 @@ const PollingPlay = vue.defineComponent({
     }, null), "\u5168\u5C4F\u663E\u793A"])]) : "", vue.createVNode("div", {
       "id": "grid",
       "class": ["grid", data.showType, data.fullScreen ? "full" : ""]
-    }, [data.pointList.map((item, index) => vue.createVNode("div", {
-      "class": "video"
-    }, [_props.version === "V2" ? vue.createVNode(VideoBoxV2, {
-      "camera": item,
-      "btns": _props.btns,
-      "alarm": alarmList.value[index]
-    }, null) : vue.createVNode(VideoBox, {
-      "camera": item,
-      "btns": _props.btns
-    }, null)]))])]);
+    }, [data.pointList.map((item, index) => {
+      return vue.createVNode("div", {
+        "class": "video"
+      }, [_props.version === "V2" ? vue.createVNode(VideoBoxV2, {
+        "camera": item,
+        "btns": _props.btns,
+        "alarm": alarmList.value[index]
+      }, null) : vue.createVNode(VideoBox, {
+        "camera": item,
+        "btns": _props.btns
+      }, null)]);
+    })])]);
   }
 });
 var pollingPlay = installComponent(PollingPlay, "polling-play");

package/dist/index.d.ts

@@ -11,7 +11,7 @@ import { Key } from 'ant-design-vue/lib/table/interface';
 import * as vue_jsx_runtime from 'vue/jsx-runtime';
 import * as _ant_design_icons_vue_lib_components_IconFont from '@ant-design/icons-vue/lib/components/IconFont';
 
-var version = "0.1.36";
+var version = "0.1.37";
 
 declare const _default$p: {
     set(theme: string): void;