From b9bce7c0f2cdc38659f3c9b58193507315c39d92 Mon Sep 17 00:00:00 2001 From: freddysundowner Date: Tue, 24 Oct 2023 16:02:45 +0300 Subject: [PATCH 01/24] added agora token --- .../comps/comps/layout/mobileTabLayout.tsx | 27 ++++++++++++++----- .../videoMeetingControllerComp.tsx | 26 ++++++++++-------- 2 files changed, 36 insertions(+), 17 deletions(-) diff --git a/client/packages/lowcoder/src/comps/comps/layout/mobileTabLayout.tsx b/client/packages/lowcoder/src/comps/comps/layout/mobileTabLayout.tsx index f220fea9e..38c1a8063 100644 --- a/client/packages/lowcoder/src/comps/comps/layout/mobileTabLayout.tsx +++ b/client/packages/lowcoder/src/comps/comps/layout/mobileTabLayout.tsx @@ -86,7 +86,9 @@ function TabBarView(props: TabBarProps) { activeKey={props.selectedKey} > {props.tabs.map((tab) => { - return ; + return ( + + ); })} @@ -126,9 +128,18 @@ let MobileTabLayoutTmp = (function () { const childrenMap = { tabs: manualOptionsControl(TabOptionComp, { initOptions: [ - { label: trans("optionsControl.optionI", { i: 1 }), icon: "/icon:solid/1" }, - { label: trans("optionsControl.optionI", { i: 2 }), icon: "/icon:solid/2" }, - { label: trans("optionsControl.optionI", { i: 3 }), icon: "/icon:solid/3" }, + { + label: trans("optionsControl.optionI", { i: 1 }), + icon: "/icon:solid/1", + }, + { + label: trans("optionsControl.optionI", { i: 2 }), + icon: "/icon:solid/2", + }, + { + label: trans("optionsControl.optionI", { i: 3 }), + icon: "/icon:solid/3", + }, ], }), }; @@ -138,7 +149,9 @@ let MobileTabLayoutTmp = (function () { .setPropertyViewFn((children) => { return ( <> -
{children.tabs.propertyView({})}
+
+ {children.tabs.propertyView({})} +
); }) @@ -168,7 +181,9 @@ MobileTabLayoutTmp = withViewFn(MobileTabLayoutTmp, (comp) => { tabs={tabViews.map((tab, index) => ({ key: index, title: tab.children.label.getView(), - icon: tab.children.icon.toJsonValue() ? tab.children.icon.getView() : undefined, + icon: tab.children.icon.toJsonValue() + ? tab.children.icon.getView() + : undefined, }))} selectedKey={tabIndex + ""} onChange={(key) => setTabIndex(Number(key))} diff --git a/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx b/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx index c700d5961..1266dc74c 100644 --- a/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx @@ -103,6 +103,8 @@ export const client: IAgoraRTCClient = AgoraRTC.createClient({ mode: "rtc", codec: "vp8", }); +AgoraRTC.setLogLevel(3); + let audioTrack: IMicrophoneAudioTrack; let videoTrack: ICameraVideoTrack; let screenShareStream: ILocalVideoTrack; @@ -115,8 +117,13 @@ const generateToken = async ( certificate: any, channelName: any ) => { - const agoraTokenUrl = `https://api.agora.io/v1/token?channelName=test&uid=${userId}&appID=${appId}&appCertificate=${certificate}`; - await axios.post(agoraTokenUrl); + const agoraTokenUrl = `https://sandbox.wiggolive.com/token/rtc`; + let response = await axios.post(agoraTokenUrl, { + appId, + certificate, + channelName, + }); + return response.data; }; const turnOnCamera = async (flag?: boolean) => { @@ -180,14 +187,13 @@ const publishVideo = async ( height: any, certifiCateKey: string ) => { - // console.log( - // "generateToken", - // await generateToken(appId, certifiCateKey, channel) - // ); - - // return; + console.log(appId, certifiCateKey, channel); + let token = null; + if (certifiCateKey) { + token = await generateToken(appId, certifiCateKey, channel); + } await turnOnCamera(true); - await client.join(appId, channel, null, userId); + await client.join(appId, channel, token, userId); await client.publish(videoTrack); await rtmInit(appId, userId, channel); @@ -581,8 +587,6 @@ MTComp = withMethodExposing(MTComp, [ }; message["data"] = otherData; - console.log(toUsers); - if (toUsers.length > 0 && toUsers[0] !== undefined) { let peers = toUsers?.map((u: any) => u.user); console.log("peers", peers); From 21aa2bb12053f99a0e5b76156cd71b3cd2a21cab Mon Sep 17 00:00:00 2001 From: freddysundowner Date: Wed, 25 Oct 2023 14:35:45 +0300 Subject: [PATCH 02/24] feat: added set username and Fix: dublicate events --- .../videoMeetingControllerComp.tsx | 55 +++++++++++++++++-- 1 file changed, 49 insertions(+), 6 deletions(-) diff --git a/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx b/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx index 1266dc74c..3896ac4a0 100644 --- a/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx @@ -12,7 +12,9 @@ import { booleanExposingStateControl, jsonObjectExposingStateControl, numberExposingStateControl, + numberStateControl, stringExposingStateControl, + stringStateControl, } from "comps/controls/codeStateControl"; import { PositionControl } from "comps/controls/dropdownControl"; import { @@ -274,13 +276,14 @@ export const meetingControllerChildren = { endCall: booleanExposingStateControl("false"), sharing: booleanExposingStateControl("false"), videoSettings: jsonObjectExposingStateControl(""), - videoWidth: numberExposingStateControl("videoWidth", 200), - videoHeight: numberExposingStateControl("videoHeight", 200), + videoWidth: numberStateControl(200), + videoHeight: numberStateControl(200), appId: withDefault(StringControl, trans("meeting.appid")), participants: stateComp([]), usersScreenShared: stateComp([]), localUser: jsonObjectExposingStateControl(""), - meetingName: stringExposingStateControl("meetingName"), + meetingName: stringStateControl("meetingName"), + userName: stringStateControl("userName"), certifiCateKey: stringExposingStateControl(""), messages: stateComp([]), }; @@ -314,6 +317,12 @@ let MTComp = (function () { ); }, [userIds]); + useEffect(() => { + dispatch( + changeChildAction("participants", getData(userIds).data, false) + ); + }, [userIds]); + useEffect(() => { if (props.endCall.value) { let newUsers = userIds.filter((item: any) => item.user !== userId); @@ -331,6 +340,19 @@ let MTComp = (function () { } }, [rtmMessages]); + useEffect(() => { + if (props.localUser.value) { + let newUsers = userIds.filter((item: any) => item.user !== userId); + if (newUsers.length == 0) return; + newUsers = props.localUser.value; + let updatedUsers = [...userIds, newUsers]; + console.log("updatedUsers", updatedUsers); + dispatch( + changeChildAction("participants", getData(updatedUsers).data, false) + ); + } + }, [props.localUser.value]); + useEffect(() => { if (rtmChannelResponse) { rtmClient.on("MessageFromPeer", function (message, peerId) { @@ -526,7 +548,6 @@ MTComp = withMethodExposing(MTComp, [ user: userId + "", audiostatus: value, }); - console.log(localUserData); await turnOnMicrophone(value); comp.children.audioControl.change(value); }, @@ -583,13 +604,12 @@ MTComp = withMethodExposing(MTComp, [ let message: any = { time: Date.now(), - from: userId, + from: comp.children.localUser.getView().value, }; message["data"] = otherData; if (toUsers.length > 0 && toUsers[0] !== undefined) { let peers = toUsers?.map((u: any) => u.user); - console.log("peers", peers); peers.forEach((p: any) => { sendPeerMessageRtm(message, String(p)); }); @@ -598,6 +618,29 @@ MTComp = withMethodExposing(MTComp, [ } }, }, + { + method: { + name: "setMeetingName", + description: trans("meeting.meetingName"), + params: [], + }, + execute: async (comp, values) => { + let meetingName: any = values[0]; + comp.children.meetingName.change(meetingName); + }, + }, + { + method: { + name: "setUserName", + description: trans("meeting.meetingName"), + params: [], + }, + execute: async (comp, values) => { + let userName: any = values[0]; + let userLocal = comp.children.localUser.getView().value; + comp.children.localUser.change({ ...userLocal, userName: userName }); + }, + }, { method: { name: "endMeeting", From 871e85642bf5ba65687dc5077a86b9424f82ce11 Mon Sep 17 00:00:00 2001 From: freddysundowner Date: Fri, 27 Oct 2023 09:57:33 +0300 Subject: [PATCH 03/24] feat: speaking status to participant and local object --- .../videoMeetingControllerComp.tsx | 77 ++++++++++++------- 1 file changed, 49 insertions(+), 28 deletions(-) diff --git a/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx b/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx index 3896ac4a0..2fc02a78c 100644 --- a/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx @@ -312,12 +312,7 @@ let MTComp = (function () { const [rtmMessages, setRtmMessages] = useState([]); useEffect(() => { - dispatch( - changeChildAction("participants", getData(userIds).data, false) - ); - }, [userIds]); - - useEffect(() => { + console.log(userIds); dispatch( changeChildAction("participants", getData(userIds).data, false) ); @@ -372,28 +367,51 @@ let MTComp = (function () { }, [rtmChannelResponse]); useEffect(() => { - client.on("user-joined", (user: IAgoraRTCRemoteUser) => { - let userData = { - user: user.uid, - host: false, - audiostatus: user.hasVideo, - }; - if (userIds.length == 0) { - userData.host = true; - } else { - userData.host = false; - } - setUserIds((userIds: any) => [...userIds, userData]); - }); - client.on("user-left", (user: IAgoraRTCRemoteUser, reason: any) => { - let newUsers = userIds.filter((item: any) => item.user !== user.uid); - let hostExists = newUsers.filter((f: any) => f.host === true); - if (hostExists.length == 0 && newUsers.length > 0) { - newUsers[0].host = true; - hostChanged(newUsers); - } - setUserIds(newUsers); - }); + if (client) { + client.enableAudioVolumeIndicator(); + client.on("user-joined", (user: IAgoraRTCRemoteUser) => { + let userData = { + user: user.uid, + host: false, + audiostatus: user.hasVideo, + }; + + if (userIds.length == 0) { + userData.host = true; + } else { + userData.host = false; + } + setUserIds((userIds: any) => [...userIds, userData]); + }); + client.on("user-left", (user: IAgoraRTCRemoteUser, reason: any) => { + let newUsers = userIds.filter( + (item: any) => item.user !== user.uid + ); + let hostExists = newUsers.filter((f: any) => f.host === true); + if (hostExists.length == 0 && newUsers.length > 0) { + newUsers[0].host = true; + hostChanged(newUsers); + } + setUserIds(newUsers); + }); + client.on("volume-indicator", (volumeInfos: any) => { + if (volumeInfos.length == 0) return; + volumeInfos.map((volumeInfo: any) => { + const speaking = volumeInfo.level >= 30; + if (volumeInfo.uid == userId) { + props.localUser.onChange({ + ...props.localUser.value, + speaking, + }); + } else { + const userInfo = userIds.find( + (info: any) => info.user === volumeInfo.uid + ); + setUserIds([...userIds, { ...userInfo, speaking }]); + } + }); + }); + } }, [client]); return ( @@ -579,7 +597,10 @@ MTComp = withMethodExposing(MTComp, [ comp.children.localUser.change({ user: userId + "", audiostatus: false, + speaking: false, }); + console.log(userId); + await publishVideo( comp.children.appId.getView(), comp.children.meetingName.getView().value == "" From 25a3e35813c5e49a349e89b45c772f35712ce727 Mon Sep 17 00:00:00 2001 From: freddysundowner Date: Fri, 27 Oct 2023 11:29:06 +0300 Subject: [PATCH 04/24] feat: removed dark screen when video ends streaming --- .../videoMeetingControllerComp.tsx | 11 ++++++--- .../meetingComp/videoMeetingStreamComp.tsx | 24 ++++++++++++++++++- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx b/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx index 2fc02a78c..6e60b5f78 100644 --- a/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx @@ -189,7 +189,6 @@ const publishVideo = async ( height: any, certifiCateKey: string ) => { - console.log(appId, certifiCateKey, channel); let token = null; if (certifiCateKey) { token = await generateToken(appId, certifiCateKey, channel); @@ -562,7 +561,7 @@ MTComp = withMethodExposing(MTComp, [ }, execute: async (comp, values) => { let value = !comp.children.audioControl.getView().value; - let localUserData = comp.children.localUser.change({ + comp.children.localUser.change({ user: userId + "", audiostatus: value, }); @@ -598,8 +597,8 @@ MTComp = withMethodExposing(MTComp, [ user: userId + "", audiostatus: false, speaking: false, + streamingVideo: true, }); - console.log(userId); await publishVideo( comp.children.appId.getView(), @@ -671,7 +670,13 @@ MTComp = withMethodExposing(MTComp, [ execute: async (comp, values) => { let value = !comp.children.endCall.getView().value; comp.children.endCall.change(value); + await leaveChannel(); + + comp.children.localUser.change({ + user: userId + "", + streamingVideo: false, + }); }, }, { diff --git a/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingStreamComp.tsx b/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingStreamComp.tsx index b50cd8f19..5e205034f 100644 --- a/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingStreamComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingStreamComp.tsx @@ -28,7 +28,10 @@ import { RefControl } from "comps/controls/refControl"; import { useEffect, useRef, useState } from "react"; import { AutoHeightControl } from "comps/controls/autoHeightControl"; -import { client } from "./videoMeetingControllerComp"; +import { + VideoMeetingControllerComp, + client, +} from "./videoMeetingControllerComp"; import { IAgoraRTCRemoteUser } from "agora-rtc-sdk-ng"; @@ -184,6 +187,14 @@ let VideoCompBuilder = (function (props) { useEffect(() => { if (props.userId.value !== "") { let userData = JSON.parse(props.userId?.value); + if ( + userData.user == userId && + userData.streamingVideo == false && + videoRef.current && + videoRef.current?.id == userId + "" + ) { + videoRef.current.srcObject = null; + } client.on( "user-published", async (user: IAgoraRTCRemoteUser, mediaType: "video" | "audio") => { @@ -231,6 +242,10 @@ let VideoCompBuilder = (function (props) { } } if (mediaType === "video") { + console.log("user-unpublished video"); + if (videoRef.current && videoRef.current?.id == user.uid + "") { + videoRef.current.srcObject = null; + } if ( !user.hasVideo && user.uid + "" != userData.user && @@ -241,10 +256,17 @@ let VideoCompBuilder = (function (props) { } } ); + setUserId(userData.user); } }, [props.userId.value]); + // useEffect(() => { + // if (videoRef.current && videoRef.current?.id == userId + "") { + // videoRef.current.srcObject = null; + // } + // }, []); + return ( {(editorState) => ( From e601b46b7a48a65b1b5df4b862b8519ee52bf8c8 Mon Sep 17 00:00:00 2001 From: freddysundowner Date: Fri, 27 Oct 2023 14:03:59 +0300 Subject: [PATCH 05/24] fix: trasmitting audio and video stream --- .../videoMeetingControllerComp.tsx | 43 ++++++++++++++++--- .../meetingComp/videoMeetingStreamComp.tsx | 15 +++---- 2 files changed, 44 insertions(+), 14 deletions(-) diff --git a/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx b/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx index 6e60b5f78..06e375c43 100644 --- a/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx @@ -308,15 +308,40 @@ let MTComp = (function () { [dispatch, isTopBom] ); const [userIds, setUserIds] = useState([]); + const [updateVolume, setUpdateVolume] = useState({ + update: false, + userid: null, + }); const [rtmMessages, setRtmMessages] = useState([]); useEffect(() => { - console.log(userIds); dispatch( changeChildAction("participants", getData(userIds).data, false) ); }, [userIds]); + useEffect(() => { + if (updateVolume.userid) { + console.log("userIds ", props.participants); + let prevUsers: [] = props.participants as []; + + const updatedItems = prevUsers.map((userInfo: any) => { + if ( + userInfo.user === updateVolume.userid && + userInfo.speaking != updateVolume.update + ) { + return { ...userInfo, speaking: updateVolume.update }; + } + return userInfo; + }); + console.log("updatedItems", updatedItems); + + dispatch( + changeChildAction("participants", getData(updatedItems).data, false) + ); + } + }, [updateVolume]); + useEffect(() => { if (props.endCall.value) { let newUsers = userIds.filter((item: any) => item.user !== userId); @@ -397,16 +422,16 @@ let MTComp = (function () { if (volumeInfos.length == 0) return; volumeInfos.map((volumeInfo: any) => { const speaking = volumeInfo.level >= 30; - if (volumeInfo.uid == userId) { + if ( + volumeInfo.uid == userId && + props.localUser.value.speaking != speaking + ) { props.localUser.onChange({ ...props.localUser.value, speaking, }); } else { - const userInfo = userIds.find( - (info: any) => info.user === volumeInfo.uid - ); - setUserIds([...userIds, { ...userInfo, speaking }]); + setUpdateVolume({ update: speaking, userid: volumeInfo.uid }); } }); }); @@ -582,6 +607,12 @@ MTComp = withMethodExposing(MTComp, [ } else { await turnOnCamera(value); } + comp.children.localUser.change({ + user: userId + "", + streamingVideo: value, + audiostatus: false, + speaking: false, + }); comp.children.videoControl.change(value); }, }, diff --git a/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingStreamComp.tsx b/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingStreamComp.tsx index 5e205034f..c66a3d0d1 100644 --- a/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingStreamComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingStreamComp.tsx @@ -187,18 +187,17 @@ let VideoCompBuilder = (function (props) { useEffect(() => { if (props.userId.value !== "") { let userData = JSON.parse(props.userId?.value); - if ( - userData.user == userId && - userData.streamingVideo == false && - videoRef.current && - videoRef.current?.id == userId + "" - ) { - videoRef.current.srcObject = null; + if (userData.user == userId && userData.streamingVideo == false && videoRef.current && videoRef.current?.id == userId + "") { + if (videoRef.current && videoRef.current?.id == userId + "") { + videoRef.current.srcObject = null; + } } client.on( "user-published", async (user: IAgoraRTCRemoteUser, mediaType: "video" | "audio") => { if (mediaType === "video") { + console.log("user-published",user.uid); + const remoteTrack = await client.subscribe(user, mediaType); let userId = user.uid + ""; if ( @@ -242,7 +241,7 @@ let VideoCompBuilder = (function (props) { } } if (mediaType === "video") { - console.log("user-unpublished video"); + console.log("user-unpublished video", user.uid); if (videoRef.current && videoRef.current?.id == user.uid + "") { videoRef.current.srcObject = null; } From d113fc28cad4a28df9716c506fe283e016d0cb5d Mon Sep 17 00:00:00 2001 From: freddysundowner Date: Fri, 27 Oct 2023 14:06:15 +0300 Subject: [PATCH 06/24] fix: remove logs --- .../videoMeetingControllerComp.tsx | 45 ++----------------- .../meetingComp/videoMeetingStreamComp.tsx | 5 +-- 2 files changed, 4 insertions(+), 46 deletions(-) diff --git a/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx b/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx index 06e375c43..1d52cfac5 100644 --- a/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx @@ -210,25 +210,11 @@ const publishVideo = async ( }; const sendMessageRtm = (message: any) => { - rtmChannelResponse - .sendMessage({ text: JSON.stringify(message) }) - .then(() => { - console.log("message sent " + JSON.stringify(message)); - }) - .catch((e: any) => { - console.log("error", e); - }); + rtmChannelResponse.sendMessage({ text: JSON.stringify(message) }); }; const sendPeerMessageRtm = (message: any, toId: string) => { - rtmClient - .sendMessageToPeer({ text: JSON.stringify(message) }, toId) - .then(() => { - console.log("message sent " + JSON.stringify(message)); - }) - .catch((e: any) => { - console.log("error", e); - }); + rtmClient.sendMessageToPeer({ text: JSON.stringify(message) }, toId); }; const rtmInit = async (appId: any, uid: any, channel: any) => { @@ -238,26 +224,9 @@ const rtmInit = async (appId: any, uid: any, channel: any) => { }; await rtmClient.login(options); - rtmClient.on("ConnectionStateChanged", function (state, reason) { - console.log("State changed To: " + state + " Reason: " + reason); - }); - rtmChannelResponse = rtmClient.createChannel(channel); - await rtmChannelResponse.join().then(async () => { - console.log( - "You have successfully joined channel " + rtmChannelResponse.channelId - ); - }); - - // Display channel member stats - rtmChannelResponse.on("MemberJoined", function (memberId) { - console.log(memberId + " joined the channel"); - }); - // Display channel member stats - rtmChannelResponse.on("MemberLeft", function (memberId) { - console.log(memberId + " left the channel"); - }); + await rtmChannelResponse.join(); }; export const meetingControllerChildren = { @@ -322,7 +291,6 @@ let MTComp = (function () { useEffect(() => { if (updateVolume.userid) { - console.log("userIds ", props.participants); let prevUsers: [] = props.participants as []; const updatedItems = prevUsers.map((userInfo: any) => { @@ -334,8 +302,6 @@ let MTComp = (function () { } return userInfo; }); - console.log("updatedItems", updatedItems); - dispatch( changeChildAction("participants", getData(updatedItems).data, false) ); @@ -365,7 +331,6 @@ let MTComp = (function () { if (newUsers.length == 0) return; newUsers = props.localUser.value; let updatedUsers = [...userIds, newUsers]; - console.log("updatedUsers", updatedUsers); dispatch( changeChildAction("participants", getData(updatedUsers).data, false) ); @@ -375,13 +340,9 @@ let MTComp = (function () { useEffect(() => { if (rtmChannelResponse) { rtmClient.on("MessageFromPeer", function (message, peerId) { - console.log( - "Message from: " + peerId + " Message: " + message.text - ); setRtmMessages(message.text); }); rtmChannelResponse.on("ChannelMessage", function (message, memberId) { - console.log("Message received from: " + memberId, message.text); setRtmMessages(message.text); dispatch( changeChildAction("messages", getData(rtmMessages).data, false) diff --git a/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingStreamComp.tsx b/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingStreamComp.tsx index c66a3d0d1..3f686903e 100644 --- a/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingStreamComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingStreamComp.tsx @@ -195,9 +195,7 @@ let VideoCompBuilder = (function (props) { client.on( "user-published", async (user: IAgoraRTCRemoteUser, mediaType: "video" | "audio") => { - if (mediaType === "video") { - console.log("user-published",user.uid); - + if (mediaType === "video") { const remoteTrack = await client.subscribe(user, mediaType); let userId = user.uid + ""; if ( @@ -241,7 +239,6 @@ let VideoCompBuilder = (function (props) { } } if (mediaType === "video") { - console.log("user-unpublished video", user.uid); if (videoRef.current && videoRef.current?.id == user.uid + "") { videoRef.current.srcObject = null; } From 691c42fe6587949284963646dd67507ae1914e9f Mon Sep 17 00:00:00 2001 From: freddysundowner Date: Fri, 27 Oct 2023 14:58:49 +0300 Subject: [PATCH 07/24] feat: added no text when there is no user --- .../videoMeetingControllerComp.tsx | 1 + .../meetingComp/videoMeetingStreamComp.tsx | 57 +++++++++++++------ .../packages/lowcoder/src/i18n/locales/en.ts | 1 + 3 files changed, 43 insertions(+), 16 deletions(-) diff --git a/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx b/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx index 1d52cfac5..1aec71e1f 100644 --- a/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx @@ -474,6 +474,7 @@ let MTComp = (function () { {children.meetingName.propertyView({ label: trans("meeting.meetingName"), })} + {children.placement.propertyView({ label: trans("drawer.placement"), radioButton: true, diff --git a/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingStreamComp.tsx b/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingStreamComp.tsx index 3f686903e..b066caf54 100644 --- a/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingStreamComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingStreamComp.tsx @@ -62,6 +62,15 @@ const Container = styled.div<{ $style: any }>` align-items: center; justify-content: center; `; +const TextContainer = styled.div<{ $style: any }>` + height: 100%; + width: 100%; + display: flex; + align-items: center; + position: absolute; + justify-content: center; + ${(props) => props.$style && getStyle(props.$style)} +`; const VideoContainer = styled.video<{ $style: any }>` height: 100%; width: 100%; @@ -166,13 +175,16 @@ export const meetingStreamChildren = { style: ButtonStyleControl, viewRef: RefControl, userId: stringExposingStateControl(""), + noVideoText: stringExposingStateControl("No Video"), }; let VideoCompBuilder = (function (props) { return new UICompBuilder(meetingStreamChildren, (props) => { const videoRef = useRef(null); const conRef = useRef(null); + const userNameRef = useRef(null); const [userId, setUserId] = useState(); + const [userName, setUsername] = useState(""); useEffect(() => { onResize(); @@ -181,21 +193,31 @@ let VideoCompBuilder = (function (props) { const onResize = async () => { const container = conRef.current; let videoCo = videoRef.current; - videoCo!.style.height = container?.clientHeight + "px"; - videoCo!.style.width = container?.clientWidth + "px"; + if (videoCo) { + videoCo!.style.height = container?.clientHeight + "px"; + videoCo!.style.width = container?.clientWidth + "px"; + } }; useEffect(() => { if (props.userId.value !== "") { let userData = JSON.parse(props.userId?.value); - if (userData.user == userId && userData.streamingVideo == false && videoRef.current && videoRef.current?.id == userId + "") { + if ( + userData.user == userId && + userData.streamingVideo == false && + videoRef.current && + videoRef.current?.id == userId + "" + ) { if (videoRef.current && videoRef.current?.id == userId + "") { videoRef.current.srcObject = null; + if (userNameRef.current) { + userNameRef.current.textContent = userData.user; + } } } client.on( "user-published", async (user: IAgoraRTCRemoteUser, mediaType: "video" | "audio") => { - if (mediaType === "video") { + if (mediaType === "video") { const remoteTrack = await client.subscribe(user, mediaType); let userId = user.uid + ""; if ( @@ -254,26 +276,29 @@ let VideoCompBuilder = (function (props) { ); setUserId(userData.user); + setUsername(userData.user); } }, [props.userId.value]); - // useEffect(() => { - // if (videoRef.current && videoRef.current?.id == userId + "") { - // videoRef.current.srcObject = null; - // } - // }, []); - return ( {(editorState) => ( - props.onEvent("videoClicked")} - ref={videoRef} - $style={props.style} - id={props.shareScreen ? "share-screen" : userId} - > + {props.shareScreen || userId ? ( +
+ props.onEvent("videoClicked")} + ref={videoRef} + $style={props.style} + id={props.shareScreen ? "share-screen" : userId} + > +
+ ) : ( + +

No Video

+
+ )}
)} diff --git a/client/packages/lowcoder/src/i18n/locales/en.ts b/client/packages/lowcoder/src/i18n/locales/en.ts index c52812d7b..1fdc28ddf 100644 --- a/client/packages/lowcoder/src/i18n/locales/en.ts +++ b/client/packages/lowcoder/src/i18n/locales/en.ts @@ -1451,6 +1451,7 @@ export const en = { shareScreen: "Share Screen", appid: "Application Id", meetingName: "Meeting Name", + videoCompText: "No video Text", right: "Right", bottom: "Bottom", videoId: "Video Id", From 4a838cff06969d000fcf4afd5c3385e884d2a322 Mon Sep 17 00:00:00 2001 From: freddysundowner Date: Sat, 28 Oct 2023 12:36:04 +0300 Subject: [PATCH 08/24] feat: added no text when there is no user --- .../src/comps/comps/meetingComp/videoMeetingStreamComp.tsx | 2 -- .../packages/lowcoder/src/comps/comps/remoteComp/remoteComp.tsx | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingStreamComp.tsx b/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingStreamComp.tsx index b066caf54..5b7d4315b 100644 --- a/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingStreamComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingStreamComp.tsx @@ -286,14 +286,12 @@ let VideoCompBuilder = (function (props) { {props.shareScreen || userId ? ( -
props.onEvent("videoClicked")} ref={videoRef} $style={props.style} id={props.shareScreen ? "share-screen" : userId} > -
) : (

No Video

diff --git a/client/packages/lowcoder/src/comps/comps/remoteComp/remoteComp.tsx b/client/packages/lowcoder/src/comps/comps/remoteComp/remoteComp.tsx index 0c345aceb..0abcde27f 100644 --- a/client/packages/lowcoder/src/comps/comps/remoteComp/remoteComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/remoteComp/remoteComp.tsx @@ -9,7 +9,7 @@ import { useState } from "react"; import { useMount } from "react-use"; import styled from "styled-components"; import { RemoteCompInfo, RemoteCompLoader } from "types/remoteComp"; -import { loaders } from "./loaders"; +import { loaders } from "./loaders"; import { withErrorBoundary } from "comps/generators/withErrorBoundary"; const ViewError = styled.div` From 3ebf5bc70b78e626214534c5a615cb9ccdec61b0 Mon Sep 17 00:00:00 2001 From: freddysundowner Date: Sat, 28 Oct 2023 14:09:26 +0300 Subject: [PATCH 09/24] feat: added username when there is no video stream --- .../meetingComp/videoMeetingStreamComp.tsx | 24 +++++++++++++++---- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingStreamComp.tsx b/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingStreamComp.tsx index 5b7d4315b..38d78225b 100644 --- a/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingStreamComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingStreamComp.tsx @@ -182,9 +182,10 @@ let VideoCompBuilder = (function (props) { return new UICompBuilder(meetingStreamChildren, (props) => { const videoRef = useRef(null); const conRef = useRef(null); - const userNameRef = useRef(null); + const placeholderRef = useRef(null); const [userId, setUserId] = useState(); const [userName, setUsername] = useState(""); + const [showVideo, setVideo] = useState(true); useEffect(() => { onResize(); @@ -209,10 +210,10 @@ let VideoCompBuilder = (function (props) { ) { if (videoRef.current && videoRef.current?.id == userId + "") { videoRef.current.srcObject = null; - if (userNameRef.current) { - userNameRef.current.textContent = userData.user; - } + setVideo(false); } + } else { + setVideo(true); } client.on( "user-published", @@ -228,6 +229,7 @@ let VideoCompBuilder = (function (props) { props.onEvent("videoOn"); } const element = document.getElementById(userId); + if (element) { remoteTrack.play(userId); } @@ -276,7 +278,7 @@ let VideoCompBuilder = (function (props) { ); setUserId(userData.user); - setUsername(userData.user); + setUsername(userData.userName); } }, [props.userId.value]); @@ -286,13 +288,25 @@ let VideoCompBuilder = (function (props) { {props.shareScreen || userId ? ( + <> props.onEvent("videoClicked")} ref={videoRef} + style={{ display: `${showVideo ? "flex" : "none"}` }} $style={props.style} id={props.shareScreen ? "share-screen" : userId} > + props.onEvent("videoClicked")} + ref={placeholderRef} + style={{ display: `${!showVideo ? "flex" : "none"}` }} + $style={props.style} + > + {userName ?? "No Username"} + + ) : ( + // )

No Video

From ace706f50789f584d54a78ae48b2a71557e955bc Mon Sep 17 00:00:00 2001 From: freddysundowner Date: Tue, 31 Oct 2023 13:33:45 +0300 Subject: [PATCH 10/24] feat: added profile image url provision on video comp --- .../meetingComp/videoMeetingStreamComp.tsx | 20 ++++++++++++++++++- .../packages/lowcoder/src/i18n/locales/en.ts | 1 + 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingStreamComp.tsx b/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingStreamComp.tsx index 38d78225b..574751cb6 100644 --- a/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingStreamComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingStreamComp.tsx @@ -37,6 +37,7 @@ import { IAgoraRTCRemoteUser } from "agora-rtc-sdk-ng"; import { MeetingEventHandlerControl, + StringStateControl, hiddenPropertyView, stringExposingStateControl, } from "@lowcoder-ee/index.sdk"; @@ -175,6 +176,10 @@ export const meetingStreamChildren = { style: ButtonStyleControl, viewRef: RefControl, userId: stringExposingStateControl(""), + profileImageUrl: withDefault( + StringStateControl, + "https://via.placeholder.com/120" + ), noVideoText: stringExposingStateControl("No Video"), }; @@ -299,9 +304,16 @@ let VideoCompBuilder = (function (props) { props.onEvent("videoClicked")} ref={placeholderRef} - style={{ display: `${!showVideo ? "flex" : "none"}` }} + style={{ + display: `${!showVideo ? "flex" : "none"}`, + flexDirection: "column", + }} $style={props.style} > + {userName ?? "No Username"} @@ -321,6 +333,10 @@ let VideoCompBuilder = (function (props) { <>
{children.userId.propertyView({ label: trans("meeting.videoId") })} + {children.profileImageUrl.propertyView({ + label: trans("meeting.profileImageUrl"), + placeholder: "https://via.placeholder.com/120", + })} {children.autoHeight.getPropertyView()} {children.shareScreen.propertyView({ label: trans("meeting.shareScreen"), @@ -348,5 +364,7 @@ VideoCompBuilder = class extends VideoCompBuilder { export const VideoMeetingStreamComp = withExposingConfigs(VideoCompBuilder, [ new NameConfig("loading", trans("button.loadingDesc")), + new NameConfig("profileImageUrl", trans("meeting.profileImageUrl")), + ...CommonNameConfig, ]); diff --git a/client/packages/lowcoder/src/i18n/locales/en.ts b/client/packages/lowcoder/src/i18n/locales/en.ts index 1fdc28ddf..325903ea4 100644 --- a/client/packages/lowcoder/src/i18n/locales/en.ts +++ b/client/packages/lowcoder/src/i18n/locales/en.ts @@ -1452,6 +1452,7 @@ export const en = { appid: "Application Id", meetingName: "Meeting Name", videoCompText: "No video Text", + profileImageUrl: "Profile Image Url", right: "Right", bottom: "Bottom", videoId: "Video Id", From 26917d328e0addd0eb6678a9ff1c1170bc44988a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Nov 2023 13:33:35 +0000 Subject: [PATCH 11/24] build(deps-dev): bump @types/intl from 1.2.0 to 1.2.1 in /client Bumps [@types/intl](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/intl) from 1.2.0 to 1.2.1. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/intl) --- updated-dependencies: - dependency-name: "@types/intl" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- client/packages/lowcoder/package.json | 2 +- client/yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/client/packages/lowcoder/package.json b/client/packages/lowcoder/package.json index b9fd727cf..3f9dc3541 100644 --- a/client/packages/lowcoder/package.json +++ b/client/packages/lowcoder/package.json @@ -116,7 +116,7 @@ }, "devDependencies": { "@types/core-js": "^2.5.5", - "@types/intl": "^1.2.0", + "@types/intl": "^1.2.1", "@types/papaparse": "^5.3.5", "@types/regenerator-runtime": "^0.13.1", "@types/uuid": "^8.3.4", diff --git a/client/yarn.lock b/client/yarn.lock index af6402202..d09ad29ea 100644 --- a/client/yarn.lock +++ b/client/yarn.lock @@ -4025,10 +4025,10 @@ __metadata: languageName: node linkType: hard -"@types/intl@npm:^1.2.0": - version: 1.2.0 - resolution: "@types/intl@npm:1.2.0" - checksum: 95348313fee4949c6feba98bb35be45c0930ff816d7fedee8afd003282cbc004bf682ff94e6a662af5987c8fcc98bb4e8f93a4919d1ef6bbd9ce83577bd77fa6 +"@types/intl@npm:^1.2.1": + version: 1.2.1 + resolution: "@types/intl@npm:1.2.1" + checksum: 5e1c93792a0c61f55c21384d8a64e521deae878cb5ff730008aca43790b2a6e91d96ab5779c390014ec9184246e2420835455c261645a8877a2500c96646a49e languageName: node linkType: hard @@ -11999,7 +11999,7 @@ __metadata: "@rjsf/utils": ^5.10.0 "@rjsf/validator-ajv8": ^5.10.0 "@types/core-js": ^2.5.5 - "@types/intl": ^1.2.0 + "@types/intl": ^1.2.1 "@types/lodash": ^4.14.194 "@types/node": ^16.7.13 "@types/papaparse": ^5.3.5 From ccf6612f6c49f9f73ff8f058961589533581e9d8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Nov 2023 13:34:52 +0000 Subject: [PATCH 12/24] build(deps): bump @fullcalendar/list from 6.1.8 to 6.1.9 in /client Bumps [@fullcalendar/list](https://github.com/fullcalendar/fullcalendar/tree/HEAD/packages/list) from 6.1.8 to 6.1.9. - [Release notes](https://github.com/fullcalendar/fullcalendar/releases) - [Changelog](https://github.com/fullcalendar/fullcalendar/blob/main/CHANGELOG.md) - [Commits](https://github.com/fullcalendar/fullcalendar/commits/v6.1.9/packages/list) --- updated-dependencies: - dependency-name: "@fullcalendar/list" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- client/packages/lowcoder-comps/package.json | 2 +- client/yarn.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/client/packages/lowcoder-comps/package.json b/client/packages/lowcoder-comps/package.json index a64dfd632..5d7ba98f3 100644 --- a/client/packages/lowcoder-comps/package.json +++ b/client/packages/lowcoder-comps/package.json @@ -7,7 +7,7 @@ "@fullcalendar/core": "^6.1.6", "@fullcalendar/daygrid": "^6.1.6", "@fullcalendar/interaction": "^6.1.6", - "@fullcalendar/list": "^6.1.6", + "@fullcalendar/list": "^6.1.9", "@fullcalendar/moment": "^6.1.6", "@fullcalendar/react": "^6.1.6", "@fullcalendar/timegrid": "^6.1.6", diff --git a/client/yarn.lock b/client/yarn.lock index af6402202..a986421d7 100644 --- a/client/yarn.lock +++ b/client/yarn.lock @@ -2532,12 +2532,12 @@ __metadata: languageName: node linkType: hard -"@fullcalendar/list@npm:^6.1.6": - version: 6.1.8 - resolution: "@fullcalendar/list@npm:6.1.8" +"@fullcalendar/list@npm:^6.1.9": + version: 6.1.9 + resolution: "@fullcalendar/list@npm:6.1.9" peerDependencies: - "@fullcalendar/core": ~6.1.8 - checksum: b5c397040e0ed9566f0bdbe2c6377a3656f2db823b38085bf45bfb50c6415ecc854411e496b81d5932a5c77a1a9abfa8b582d67bad1e4dc562f41b6b14621dae + "@fullcalendar/core": ~6.1.9 + checksum: 978dd54b7131369d023e4d8a0e97b986a89a986b94a0d71dc6e9782e60e6c268184f2c596dcc7fa0580b143bfd39390a40ea4c9114afd1fa2eca5c48a7b0aaab languageName: node linkType: hard @@ -11843,7 +11843,7 @@ __metadata: "@fullcalendar/core": ^6.1.6 "@fullcalendar/daygrid": ^6.1.6 "@fullcalendar/interaction": ^6.1.6 - "@fullcalendar/list": ^6.1.6 + "@fullcalendar/list": ^6.1.9 "@fullcalendar/moment": ^6.1.6 "@fullcalendar/react": ^6.1.6 "@fullcalendar/timegrid": ^6.1.6 From 3ae7d6f87cdbaebdb1f61b6b370363e22fd82532 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Nov 2023 13:36:30 +0000 Subject: [PATCH 13/24] build(deps): bump antd from 5.7.2 to 5.10.3 in /client Bumps [antd](https://github.com/ant-design/ant-design) from 5.7.2 to 5.10.3. - [Release notes](https://github.com/ant-design/ant-design/releases) - [Changelog](https://github.com/ant-design/ant-design/blob/master/CHANGELOG.en-US.md) - [Commits](https://github.com/ant-design/ant-design/compare/5.7.2...5.10.3) --- updated-dependencies: - dependency-name: antd dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- client/packages/lowcoder/package.json | 2 +- client/yarn.lock | 505 ++++++++++++++++---------- 2 files changed, 320 insertions(+), 187 deletions(-) diff --git a/client/packages/lowcoder/package.json b/client/packages/lowcoder/package.json index b9fd727cf..7738c21d0 100644 --- a/client/packages/lowcoder/package.json +++ b/client/packages/lowcoder/package.json @@ -40,7 +40,7 @@ "agora-rtc-sdk-ng": "^4.19.0", "agora-rtm-sdk": "^1.5.1", "ali-oss": "^6.17.1", - "antd": "5.7.2", + "antd": "5.10.3", "antd-img-crop": "^4.12.2", "axios": "^0.21.1", "buffer": "^6.0.3", diff --git a/client/yarn.lock b/client/yarn.lock index af6402202..5cc28e55b 100644 --- a/client/yarn.lock +++ b/client/yarn.lock @@ -74,21 +74,21 @@ __metadata: languageName: node linkType: hard -"@ant-design/cssinjs@npm:^1.10.1": - version: 1.13.2 - resolution: "@ant-design/cssinjs@npm:1.13.2" +"@ant-design/cssinjs@npm:^1.17.2": + version: 1.17.2 + resolution: "@ant-design/cssinjs@npm:1.17.2" dependencies: "@babel/runtime": ^7.11.1 "@emotion/hash": ^0.8.0 "@emotion/unitless": ^0.7.5 classnames: ^2.3.1 csstype: ^3.0.10 - rc-util: ^5.34.1 + rc-util: ^5.35.0 stylis: ^4.0.13 peerDependencies: react: ">=16.0.0" react-dom: ">=16.0.0" - checksum: 630c30defcd713ab64ea9b2f2cd193d9f71eb7d55eef142a86e7a32214e613c2d5ded35dd859d0becb1f005868bb7ae496c18c80edbb6fb5df2f3fef7f9b6ba9 + checksum: ed864b4f890038cb132131c25ebe137a421c32a518dbbd0424126ce2603f71946ce0fca91bbe1ad7a629760374266af6246da01ca86fbce8f68acb9ceba6b91f languageName: node linkType: hard @@ -99,6 +99,13 @@ __metadata: languageName: node linkType: hard +"@ant-design/icons-svg@npm:^4.3.0": + version: 4.3.1 + resolution: "@ant-design/icons-svg@npm:4.3.1" + checksum: 47f0474277366fb3b8bacfeb1691be35052c3f9b28811be7fb25ad219100533d0e31c2eec00a8dee744c34381a4cda7f39b39403e160811a8fd5d33b861e77aa + languageName: node + linkType: hard + "@ant-design/icons@npm:^4.1.0, @ant-design/icons@npm:^4.2.1, @ant-design/icons@npm:^4.3.0, @ant-design/icons@npm:^4.7.0": version: 4.8.0 resolution: "@ant-design/icons@npm:4.8.0" @@ -115,19 +122,19 @@ __metadata: languageName: node linkType: hard -"@ant-design/icons@npm:^5.1.0": - version: 5.1.4 - resolution: "@ant-design/icons@npm:5.1.4" +"@ant-design/icons@npm:^5.2.6": + version: 5.2.6 + resolution: "@ant-design/icons@npm:5.2.6" dependencies: "@ant-design/colors": ^7.0.0 - "@ant-design/icons-svg": ^4.2.1 + "@ant-design/icons-svg": ^4.3.0 "@babel/runtime": ^7.11.2 classnames: ^2.2.6 rc-util: ^5.31.1 peerDependencies: react: ">=16.0.0" react-dom: ">=16.0.0" - checksum: f74f27b526459e69354adbc9d222a99afcf5fd0074a97575df239fbe5d077de0de903afa612546f24c378c2e163e02e4e31cde575da4e84e597025f12c90984f + checksum: 2f571699b1903383cd09faa78e4cce34973debb0e7ec6223b9d9a0a6ab2b2f0c876072db62bbd4e6a45e864df5447343315e066abeffaf58aa5b97df3acc89f1 languageName: node linkType: hard @@ -274,9 +281,9 @@ __metadata: languageName: node linkType: hard -"@ant-design/react-slick@npm:~1.0.0": - version: 1.0.1 - resolution: "@ant-design/react-slick@npm:1.0.1" +"@ant-design/react-slick@npm:~1.0.2": + version: 1.0.2 + resolution: "@ant-design/react-slick@npm:1.0.2" dependencies: "@babel/runtime": ^7.10.4 classnames: ^2.2.5 @@ -285,7 +292,7 @@ __metadata: throttle-debounce: ^5.0.0 peerDependencies: react: ">=16.9.0" - checksum: 4b6274b4d9097d6c922321550a0923b1f52a85e9b8bec2b51be56523f158801a9931fcd5b211a44aeb8a6bb583b9b88bf13d47fe263883178915860598144ab4 + checksum: c2a2d14270b3551c1af16c4cc8c63e29ee7f08e4203191d834df61211235102fd5d8e4325adfa41ada1c5212e4388849ec0d23fcb980bf69790b565f363e2d1f languageName: node linkType: hard @@ -1840,6 +1847,15 @@ __metadata: languageName: node linkType: hard +"@babel/runtime@npm:^7.23.2": + version: 7.23.2 + resolution: "@babel/runtime@npm:7.23.2" + dependencies: + regenerator-runtime: ^0.14.0 + checksum: 6c4df4839ec75ca10175f636d6362f91df8a3137f86b38f6cd3a4c90668a0fe8e9281d320958f4fbd43b394988958585a17c3aab2a4ea6bf7316b22916a371fb + languageName: node + linkType: hard + "@babel/template@npm:^7.18.10, @babel/template@npm:^7.20.7, @babel/template@npm:^7.3.3": version: 7.21.9 resolution: "@babel/template@npm:7.21.9" @@ -2093,6 +2109,13 @@ __metadata: languageName: node linkType: hard +"@ctrl/tinycolor@npm:^3.6.1": + version: 3.6.1 + resolution: "@ctrl/tinycolor@npm:3.6.1" + checksum: cefec6fcaaa3eb8ddf193f981e097dccf63b97b93b1e861cb18c645654824c831a568f444996e15ee509f255658ed82fba11c5365494a6e25b9b12ac454099e0 + languageName: node + linkType: hard + "@cush/relative@npm:^1.0.0": version: 1.0.0 resolution: "@cush/relative@npm:1.0.0" @@ -3069,7 +3092,7 @@ __metadata: languageName: node linkType: hard -"@rc-component/color-picker@npm:~1.4.0": +"@rc-component/color-picker@npm:~1.4.1": version: 1.4.1 resolution: "@rc-component/color-picker@npm:1.4.1" dependencies: @@ -3084,16 +3107,16 @@ __metadata: languageName: node linkType: hard -"@rc-component/context@npm:^1.3.0": - version: 1.3.0 - resolution: "@rc-component/context@npm:1.3.0" +"@rc-component/context@npm:^1.4.0": + version: 1.4.0 + resolution: "@rc-component/context@npm:1.4.0" dependencies: "@babel/runtime": ^7.10.1 rc-util: ^5.27.0 peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: 77cdd49a2dfde3b2d82ff8652581eddeceefb53c0f3f31b9ed6b09356291821d4e16e915c07a1e15a38ceb6087fb92e7c2cb8ddb26d304fafd96c8571c9136ce + checksum: 3771237de1e82a453cfff7b5f0ca0dcc370a2838be8ecbfe172c26dec2e94dc2354a8b3061deaff7e633e418fc1b70ce3d10d770603f12dc477fe03f2ada7059 languageName: node linkType: hard @@ -3106,9 +3129,9 @@ __metadata: languageName: node linkType: hard -"@rc-component/mutate-observer@npm:^1.0.0": - version: 1.0.0 - resolution: "@rc-component/mutate-observer@npm:1.0.0" +"@rc-component/mutate-observer@npm:^1.1.0": + version: 1.1.0 + resolution: "@rc-component/mutate-observer@npm:1.1.0" dependencies: "@babel/runtime": ^7.18.0 classnames: ^2.3.2 @@ -3116,7 +3139,7 @@ __metadata: peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: fd6d9581882cca35582e399bf5585e237748fc8240a2d76549ed003ea17fdf7ca97609cb6c8113c2836e9d3182fceda2c1469620560168eeb66fc95656f495e7 + checksum: ffd79ad54b1f4dd02a94306373d3ebe408d5348156ac7908a86937f58c169f2fd42457461a5dc27bb874b9af5c2c196dc11a18db6bb6a5ff514cfd6bc1a3bb6a languageName: node linkType: hard @@ -3148,9 +3171,9 @@ __metadata: languageName: node linkType: hard -"@rc-component/tour@npm:~1.8.0": - version: 1.8.0 - resolution: "@rc-component/tour@npm:1.8.0" +"@rc-component/tour@npm:~1.10.0": + version: 1.10.0 + resolution: "@rc-component/tour@npm:1.10.0" dependencies: "@babel/runtime": ^7.18.0 "@rc-component/portal": ^1.0.0-9 @@ -3160,11 +3183,28 @@ __metadata: peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: 58fa0e23b84e581298c0d4f5e0ac3a30eddb6c101a9d3405a3189a20c787254b7f416ecff0e383ffded554ad93f8f732052623c6eaf59f5270f51bd0c4782058 + checksum: d586ca2e02d85c346640ddb228b60ddae94790973b030a85297aeef1e10e8e4ce1bef9d65f66098de59cafdacff5c04ad390528099d2b23fab449813696ba089 languageName: node linkType: hard -"@rc-component/trigger@npm:^1.0.4, @rc-component/trigger@npm:^1.13.0, @rc-component/trigger@npm:^1.3.6, @rc-component/trigger@npm:^1.5.0, @rc-component/trigger@npm:^1.6.2, @rc-component/trigger@npm:^1.7.0": +"@rc-component/trigger@npm:^1.17.0, @rc-component/trigger@npm:^1.18.0": + version: 1.18.0 + resolution: "@rc-component/trigger@npm:1.18.0" + dependencies: + "@babel/runtime": ^7.23.2 + "@rc-component/portal": ^1.1.0 + classnames: ^2.3.2 + rc-motion: ^2.0.0 + rc-resize-observer: ^1.3.1 + rc-util: ^5.38.0 + peerDependencies: + react: ">=16.9.0" + react-dom: ">=16.9.0" + checksum: 8d4daf32aaea36f083a57aa40a4cab0224d0603ac3327675d6dcee861f5ac897f20dc406dc7a89181c81399ea44a0a14bbb52365045dca2eaced09fc70a8185e + languageName: node + linkType: hard + +"@rc-component/trigger@npm:^1.3.6, @rc-component/trigger@npm:^1.5.0, @rc-component/trigger@npm:^1.7.0": version: 1.14.3 resolution: "@rc-component/trigger@npm:1.14.3" dependencies: @@ -5095,62 +5135,62 @@ __metadata: languageName: node linkType: hard -"antd@npm:5.7.2": - version: 5.7.2 - resolution: "antd@npm:5.7.2" +"antd@npm:5.10.3": + version: 5.10.3 + resolution: "antd@npm:5.10.3" dependencies: "@ant-design/colors": ^7.0.0 - "@ant-design/cssinjs": ^1.10.1 - "@ant-design/icons": ^5.1.0 - "@ant-design/react-slick": ~1.0.0 + "@ant-design/cssinjs": ^1.17.2 + "@ant-design/icons": ^5.2.6 + "@ant-design/react-slick": ~1.0.2 "@babel/runtime": ^7.18.3 - "@ctrl/tinycolor": ^3.6.0 - "@rc-component/color-picker": ~1.4.0 - "@rc-component/mutate-observer": ^1.0.0 - "@rc-component/tour": ~1.8.0 - "@rc-component/trigger": ^1.13.0 + "@ctrl/tinycolor": ^3.6.1 + "@rc-component/color-picker": ~1.4.1 + "@rc-component/mutate-observer": ^1.1.0 + "@rc-component/tour": ~1.10.0 + "@rc-component/trigger": ^1.18.0 classnames: ^2.2.6 copy-to-clipboard: ^3.2.0 dayjs: ^1.11.1 qrcode.react: ^3.1.0 - rc-cascader: ~3.12.0 + rc-cascader: ~3.18.1 rc-checkbox: ~3.1.0 - rc-collapse: ~3.7.0 - rc-dialog: ~9.1.0 - rc-drawer: ~6.2.0 + rc-collapse: ~3.7.1 + rc-dialog: ~9.3.4 + rc-drawer: ~6.5.2 rc-dropdown: ~4.1.0 - rc-field-form: ~1.34.0 - rc-image: ~7.0.0 - rc-input: ~1.1.0 - rc-input-number: ~8.0.2 - rc-mentions: ~2.5.0 - rc-menu: ~9.10.0 - rc-motion: ^2.7.3 - rc-notification: ~5.0.4 - rc-pagination: ~3.5.0 - rc-picker: ~3.10.0 - rc-progress: ~3.4.1 + rc-field-form: ~1.39.0 + rc-image: ~7.3.1 + rc-input: ~1.2.1 + rc-input-number: ~8.1.0 + rc-mentions: ~2.8.0 + rc-menu: ~9.12.2 + rc-motion: ^2.9.0 + rc-notification: ~5.3.0 + rc-pagination: ~3.6.1 + rc-picker: ~3.14.6 + rc-progress: ~3.5.1 rc-rate: ~2.12.0 - rc-resize-observer: ^1.2.0 - rc-segmented: ~2.2.0 - rc-select: ~14.5.0 - rc-slider: ~10.1.0 + rc-resize-observer: ^1.4.0 + rc-segmented: ~2.2.2 + rc-select: ~14.9.2 + rc-slider: ~10.3.1 rc-steps: ~6.0.1 rc-switch: ~4.1.0 - rc-table: ~7.32.1 - rc-tabs: ~12.9.0 - rc-textarea: ~1.3.2 - rc-tooltip: ~6.0.0 - rc-tree: ~5.7.6 - rc-tree-select: ~5.9.0 - rc-upload: ~4.3.0 - rc-util: ^5.32.0 + rc-table: ~7.34.4 + rc-tabs: ~12.12.1 + rc-textarea: ~1.4.0 + rc-tooltip: ~6.1.2 + rc-tree: ~5.7.12 + rc-tree-select: ~5.13.0 + rc-upload: ~4.3.5 + rc-util: ^5.38.0 scroll-into-view-if-needed: ^3.0.3 throttle-debounce: ^5.0.0 peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: 38565a6443bf9b801da8c5e9cbaae5b4856aee1e5948e3c0e6ef6948cd0eaaed0f0261724c22e73ec0fc21342585f6f986031bf16e406da847fe0aea69f9ff70 + checksum: de3aaa1f3441e478c38e8ec398ff0e86101362e85e64455f20a19188f1a462622e4fb86d251d7f701883e838bed8babd6162d1064cfc4d4e5f81bd39c60e1685 languageName: node linkType: hard @@ -12015,7 +12055,7 @@ __metadata: agora-rtc-sdk-ng: ^4.19.0 agora-rtm-sdk: ^1.5.1 ali-oss: ^6.17.1 - antd: 5.7.2 + antd: 5.10.3 antd-img-crop: ^4.12.2 axios: ^0.21.1 buffer: ^6.0.3 @@ -14284,20 +14324,20 @@ __metadata: languageName: node linkType: hard -"rc-cascader@npm:~3.12.0": - version: 3.12.1 - resolution: "rc-cascader@npm:3.12.1" +"rc-cascader@npm:~3.18.1": + version: 3.18.1 + resolution: "rc-cascader@npm:3.18.1" dependencies: "@babel/runtime": ^7.12.5 array-tree-filter: ^2.1.0 classnames: ^2.3.1 - rc-select: ~14.5.0 + rc-select: ~14.9.0 rc-tree: ~5.7.0 - rc-util: ^5.6.1 + rc-util: ^5.35.0 peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: 11fddad49d7c6dcd06f7875b34fb40d798d912e2280e75e4f89777ade05d8a162f2c8f81e447dec44b327603e92f15c93b5c1a7489353732ca37f4c020d45624 + checksum: 4a3ecee7385a8814b1a78c1e8921dd3194f052352a2d08d0c931f3edd83ee3ae4864eb535f9dd243dd9699e601372309ea5fb64c715d1c79231e309da703abf0 languageName: node linkType: hard @@ -14362,9 +14402,9 @@ __metadata: languageName: node linkType: hard -"rc-collapse@npm:~3.7.0": - version: 3.7.0 - resolution: "rc-collapse@npm:3.7.0" +"rc-collapse@npm:~3.7.1": + version: 3.7.1 + resolution: "rc-collapse@npm:3.7.1" dependencies: "@babel/runtime": ^7.10.1 classnames: 2.x @@ -14373,7 +14413,7 @@ __metadata: peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: f3f6dc1724c763f2e89ac8f1a853f8d80bc32731ad266c1092167cf9af3eb7e32a4d6b113c54366716f3e63f14eb511be77d9192103dec9d95c021b813f26203 + checksum: 8256ecff54d9a54f2abe0cce71ca52cce27522ec24ee3e87a5796e29ed18fd92008d2353a9797f034f5e5af060609b8c0cff2f9a92966d62ff0095d501687607 languageName: node linkType: hard @@ -14393,9 +14433,9 @@ __metadata: languageName: node linkType: hard -"rc-dialog@npm:~9.1.0": - version: 9.1.0 - resolution: "rc-dialog@npm:9.1.0" +"rc-dialog@npm:~9.3.4": + version: 9.3.4 + resolution: "rc-dialog@npm:9.3.4" dependencies: "@babel/runtime": ^7.10.1 "@rc-component/portal": ^1.0.0-8 @@ -14405,7 +14445,7 @@ __metadata: peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: 59d2504301a813022b9782e808e61e4e6a55d746a5608d9927b8f6cf4806dd694df7812678f56174419cccb5273d5e302c3178d31a6c5871aa97be5fd086267c + checksum: 75d689d281ae3a1a85faa2f87c95ac65995ed58f696898edbe89a79604e18213565edc1d21291c9a640379fa6705c19ec51ba9275d69cde877d21f5108eb3503 languageName: node linkType: hard @@ -14425,19 +14465,19 @@ __metadata: languageName: node linkType: hard -"rc-drawer@npm:~6.2.0": - version: 6.2.0 - resolution: "rc-drawer@npm:6.2.0" +"rc-drawer@npm:~6.5.2": + version: 6.5.2 + resolution: "rc-drawer@npm:6.5.2" dependencies: "@babel/runtime": ^7.10.1 "@rc-component/portal": ^1.1.1 classnames: ^2.2.6 rc-motion: ^2.6.1 - rc-util: ^5.21.2 + rc-util: ^5.36.0 peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: b006caa2036bb84760f447de193841de00a0867e32971349d210b6e1c97f7cf61b2dba05a467f03d55bba592d153b688e882adb4af20daa5271b9286f313fbc0 + checksum: e96908f641ea0a4b26e7142a932cefe60ee34c03c6c569a6070af770b0be8a883e89521217d8391957254b0ed88b4ac1735129c9e062528db0751bfd0222a0c1 languageName: node linkType: hard @@ -14485,9 +14525,9 @@ __metadata: languageName: node linkType: hard -"rc-field-form@npm:~1.34.0": - version: 1.34.2 - resolution: "rc-field-form@npm:1.34.2" +"rc-field-form@npm:~1.39.0": + version: 1.39.0 + resolution: "rc-field-form@npm:1.39.0" dependencies: "@babel/runtime": ^7.18.0 async-validator: ^4.1.0 @@ -14495,7 +14535,7 @@ __metadata: peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: 50535a06fa3f3fa428ab142e4722e6c567a30202c7fec0a7e63685ba1cc356c3159721902aa2fdeb563e9153faa9d1b515624da4d0c5ba4cf93cf6249a763521 + checksum: 26ccb14ea49c60a7e70134d50d68da59400deb6f04ac73a7878c420091f52e61c2069580837e73970075c459ebf79cdd958805bdaa6fa0f75c745eb1d93a2e8a languageName: node linkType: hard @@ -14516,20 +14556,20 @@ __metadata: languageName: node linkType: hard -"rc-image@npm:~7.0.0": - version: 7.0.0 - resolution: "rc-image@npm:7.0.0" +"rc-image@npm:~7.3.1": + version: 7.3.2 + resolution: "rc-image@npm:7.3.2" dependencies: "@babel/runtime": ^7.11.2 "@rc-component/portal": ^1.0.2 classnames: ^2.2.6 - rc-dialog: ~9.1.0 + rc-dialog: ~9.3.4 rc-motion: ^2.6.2 rc-util: ^5.34.1 peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: e45be52d57481b290501d97dc8fe76a5541564e92a183c087956f09b39b0f4cd21aabad668e8df1ab3a263c009f7d02f91be333e4b153190b95d4dd6c5a08f44 + checksum: d6447b31a92b9c5bb303bfafef4938546a28402ef3c35c3a00c53962ae7a4aa430be91211de1e3c2440f88bbe2a94b1efcae99adf239f2764e3e7dc391767e2b languageName: node linkType: hard @@ -14547,19 +14587,19 @@ __metadata: languageName: node linkType: hard -"rc-input-number@npm:~8.0.2": - version: 8.0.3 - resolution: "rc-input-number@npm:8.0.3" +"rc-input-number@npm:~8.1.0": + version: 8.1.0 + resolution: "rc-input-number@npm:8.1.0" dependencies: "@babel/runtime": ^7.10.1 "@rc-component/mini-decimal": ^1.0.1 classnames: ^2.2.5 - rc-input: ~1.1.0 + rc-input: ~1.2.1 rc-util: ^5.28.0 peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: d567919037db72dd2df04868ae909e1d74959e3956bded722931accefcdfa48d05946489dfd10e39f63599045cc89351108e7bbff869cc4415a53b6f06837d48 + checksum: 2266cc4dbabe1f289bca9fdfeaaa024b76d24b22de944f8a7230c8da4f6c3573447f237a67866b8f0c37718a401c9902e91a8575c3cdbc55ad515a16e6e3d90a languageName: node linkType: hard @@ -14577,9 +14617,9 @@ __metadata: languageName: node linkType: hard -"rc-input@npm:~1.1.0": - version: 1.1.0 - resolution: "rc-input@npm:1.1.0" +"rc-input@npm:~1.2.1": + version: 1.2.1 + resolution: "rc-input@npm:1.2.1" dependencies: "@babel/runtime": ^7.11.1 classnames: ^2.2.1 @@ -14587,7 +14627,7 @@ __metadata: peerDependencies: react: ">=16.0.0" react-dom: ">=16.0.0" - checksum: d3f7fc2c6dfe2cf1cec4cebe2c21614f306666f39fef798af4885b58f6ada8cead0a301c10e16940a37199a572420a5146c9ff4d67927da8a9e52ca53b09de04 + checksum: ab83347620ef505e12e92ac2ea380ac5ad33e3d97a98f7cc2dd01c6eae228edd293b13df360bf7ac91962e09ba2355ffff962aa8eff6268dad4249e0f8b95cce languageName: node linkType: hard @@ -14608,30 +14648,30 @@ __metadata: languageName: node linkType: hard -"rc-mentions@npm:~2.5.0": - version: 2.5.0 - resolution: "rc-mentions@npm:2.5.0" +"rc-mentions@npm:~2.8.0": + version: 2.8.0 + resolution: "rc-mentions@npm:2.8.0" dependencies: "@babel/runtime": ^7.22.5 "@rc-component/trigger": ^1.5.0 classnames: ^2.2.6 - rc-input: ~1.1.0 - rc-menu: ~9.10.0 - rc-textarea: ~1.3.0 - rc-util: ^5.22.5 + rc-input: ~1.2.1 + rc-menu: ~9.12.0 + rc-textarea: ~1.4.0 + rc-util: ^5.34.1 peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: 084236d5e58738acbc8ab3ccaa9c02daf6a6cda8040780a8c99cdebf9a7bec262df5a22732ce250d73263bc64c115f44bc8b5e11b0db4eb82c68f7cdcbb2ab9c + checksum: 74703e3763522768797eaa0f7c24efa449cf242db97f19b4fb516aff3191f012ac947cf597672bf53f8e39a63eed30b3dfcea324cb440a4f752cac6296a19c5f languageName: node linkType: hard -"rc-menu@npm:~9.10.0": - version: 9.10.0 - resolution: "rc-menu@npm:9.10.0" +"rc-menu@npm:~9.12.0, rc-menu@npm:~9.12.2": + version: 9.12.2 + resolution: "rc-menu@npm:9.12.2" dependencies: "@babel/runtime": ^7.10.1 - "@rc-component/trigger": ^1.6.2 + "@rc-component/trigger": ^1.17.0 classnames: 2.x rc-motion: ^2.4.3 rc-overflow: ^1.3.1 @@ -14639,7 +14679,7 @@ __metadata: peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: 600f16a6d8b64ee90093786abdee3ad4663d4c4922ad7b568bc51dd9e5edbbd230ba93a8eae56d8d8ce070551ca12f3ae3c01d5e5b105a3d07a11245207fda6c + checksum: 0db857a5e0819348f86a66a560e7bf0496a6e69ef88b96fe2fccd1616ff5989d20bb0c3d84bbec892483f9f29c9c210be1ead3b7f08c608dc7dce439b0637dd0 languageName: node linkType: hard @@ -14660,7 +14700,7 @@ __metadata: languageName: node linkType: hard -"rc-motion@npm:^2.0.0, rc-motion@npm:^2.0.1, rc-motion@npm:^2.2.0, rc-motion@npm:^2.3.0, rc-motion@npm:^2.3.4, rc-motion@npm:^2.4.3, rc-motion@npm:^2.4.4, rc-motion@npm:^2.6.0, rc-motion@npm:^2.6.1, rc-motion@npm:^2.6.2, rc-motion@npm:^2.7.3": +"rc-motion@npm:^2.0.0, rc-motion@npm:^2.0.1, rc-motion@npm:^2.2.0, rc-motion@npm:^2.3.0, rc-motion@npm:^2.3.4, rc-motion@npm:^2.4.3, rc-motion@npm:^2.4.4, rc-motion@npm:^2.6.1, rc-motion@npm:^2.6.2": version: 2.7.3 resolution: "rc-motion@npm:2.7.3" dependencies: @@ -14674,6 +14714,20 @@ __metadata: languageName: node linkType: hard +"rc-motion@npm:^2.9.0": + version: 2.9.0 + resolution: "rc-motion@npm:2.9.0" + dependencies: + "@babel/runtime": ^7.11.1 + classnames: ^2.2.1 + rc-util: ^5.21.0 + peerDependencies: + react: ">=16.9.0" + react-dom: ">=16.9.0" + checksum: 6c7c211a62896a2c443c43f27d13ec84c832884ec1860a40025f6270321e4e8c8a7abaf99d60a09d6e5cadc112e3d9787e0c58970eb69b0bb798eaa6be81dcf5 + languageName: node + linkType: hard + "rc-notification@npm:~4.6.0": version: 4.6.1 resolution: "rc-notification@npm:4.6.1" @@ -14689,18 +14743,18 @@ __metadata: languageName: node linkType: hard -"rc-notification@npm:~5.0.4": - version: 5.0.5 - resolution: "rc-notification@npm:5.0.5" +"rc-notification@npm:~5.3.0": + version: 5.3.0 + resolution: "rc-notification@npm:5.3.0" dependencies: "@babel/runtime": ^7.10.1 classnames: 2.x - rc-motion: ^2.6.0 + rc-motion: ^2.9.0 rc-util: ^5.20.1 peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: 47aee7887dae4d943303803cb74a908411eabdfcfb5154c82f834e0a4f0b934d07b8933907e513787ffc98de5f66e71537820bc48fb6cf8a24870919e6548036 + checksum: 1e6bc146e687815d784e0b4c626a9af82435086bc02bb5e19827baa523e26440d6ed03b43de83a15e0272b83bebede3b67d61c4d4af2240ae7dcdd6604f0ef58 languageName: node linkType: hard @@ -14747,9 +14801,9 @@ __metadata: languageName: node linkType: hard -"rc-pagination@npm:~3.5.0": - version: 3.5.0 - resolution: "rc-pagination@npm:3.5.0" +"rc-pagination@npm:~3.6.1": + version: 3.6.1 + resolution: "rc-pagination@npm:3.6.1" dependencies: "@babel/runtime": ^7.10.1 classnames: ^2.2.1 @@ -14757,7 +14811,7 @@ __metadata: peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: 27ac05cdaf331ba571eb19fdaf79a2e3b6cb3575fce5f011f0de5abbe88db21a4292ef5323abab3a829ff6cda396444c664f88bd55226fa477f473282a8a868e + checksum: 12389a94bf60048cd3d8e95c638170646b7405aa30f748b96baee8df7e24d00b9d5b3c75195e3ea7589d08b771f2661d48f2fe7784624e4bdf6b22c290ffef85 languageName: node linkType: hard @@ -14780,9 +14834,9 @@ __metadata: languageName: node linkType: hard -"rc-picker@npm:~3.10.0": - version: 3.10.0 - resolution: "rc-picker@npm:3.10.0" +"rc-picker@npm:~3.14.6": + version: 3.14.6 + resolution: "rc-picker@npm:3.14.6" dependencies: "@babel/runtime": ^7.10.1 "@rc-component/trigger": ^1.5.0 @@ -14804,7 +14858,7 @@ __metadata: optional: true moment: optional: true - checksum: 908df48acfff11d62a64b11f12ceda10f424b3483ea2926ca25d5477609f0416559826ede78f2a0604682cc0e28a8c0ffdd98ee802746b1bee0f5b9890699df4 + checksum: e87914c6ffbbcf760b56080d8bf504cf9323885378a6769abcf9a62bb1325f7a9d534c065a683ab1d30269a26a81ce11a008d01aacc800359e3c7a4fbda66e17 languageName: node linkType: hard @@ -14822,6 +14876,20 @@ __metadata: languageName: node linkType: hard +"rc-progress@npm:~3.5.1": + version: 3.5.1 + resolution: "rc-progress@npm:3.5.1" + dependencies: + "@babel/runtime": ^7.10.1 + classnames: ^2.2.6 + rc-util: ^5.16.1 + peerDependencies: + react: ">=16.9.0" + react-dom: ">=16.9.0" + checksum: b0722a696396f985267e35e26f49c1c1bd6a17b4918eb93318fc36a7a5ffae9806932d4982a7da0d83349648ca85325b792003ec40240820fd6e00e0bc6f3c1d + languageName: node + linkType: hard + "rc-rate@npm:~2.12.0": version: 2.12.0 resolution: "rc-rate@npm:2.12.0" @@ -14865,6 +14933,21 @@ __metadata: languageName: node linkType: hard +"rc-resize-observer@npm:^1.4.0": + version: 1.4.0 + resolution: "rc-resize-observer@npm:1.4.0" + dependencies: + "@babel/runtime": ^7.20.7 + classnames: ^2.2.1 + rc-util: ^5.38.0 + resize-observer-polyfill: ^1.5.1 + peerDependencies: + react: ">=16.9.0" + react-dom: ">=16.9.0" + checksum: e6ee24fd887ea440b07e0326c3fc60b240274fa43ea87cf8f86ca9e0741a2c817e47a182f336b00d7246b4fd21b3536f4d3aacd7f0db5ae673f106630cd348ba + languageName: node + linkType: hard + "rc-segmented@npm:~2.1.0": version: 2.1.2 resolution: "rc-segmented@npm:2.1.2" @@ -14880,7 +14963,7 @@ __metadata: languageName: node linkType: hard -"rc-segmented@npm:~2.2.0": +"rc-segmented@npm:~2.2.2": version: 2.2.2 resolution: "rc-segmented@npm:2.2.2" dependencies: @@ -14913,21 +14996,21 @@ __metadata: languageName: node linkType: hard -"rc-select@npm:~14.5.0": - version: 14.5.2 - resolution: "rc-select@npm:14.5.2" +"rc-select@npm:~14.9.0, rc-select@npm:~14.9.2": + version: 14.9.2 + resolution: "rc-select@npm:14.9.2" dependencies: "@babel/runtime": ^7.10.1 "@rc-component/trigger": ^1.5.0 classnames: 2.x rc-motion: ^2.0.1 - rc-overflow: ^1.0.0 + rc-overflow: ^1.3.1 rc-util: ^5.16.1 rc-virtual-list: ^3.5.2 peerDependencies: react: "*" react-dom: "*" - checksum: d3f55543eae15ac9bf56019345ad94268f9e063ede38c3d8c46dc59b1bc47c0f4c724613a9e9a6f4dc0d5bc0e31c7f7029e6bef717b335432818fbeea0f7398f + checksum: 1d5738fbd963df170ffe5b3f37a7800340814d6bd7699601980816a9bd71985933188fc8940c82c564b46f7eca941759b814c08dced01187c3f4fb1f5dad2421 languageName: node linkType: hard @@ -14946,9 +15029,9 @@ __metadata: languageName: node linkType: hard -"rc-slider@npm:~10.1.0": - version: 10.1.1 - resolution: "rc-slider@npm:10.1.1" +"rc-slider@npm:~10.3.1": + version: 10.3.1 + resolution: "rc-slider@npm:10.3.1" dependencies: "@babel/runtime": ^7.10.1 classnames: ^2.2.5 @@ -14956,7 +15039,7 @@ __metadata: peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: 8df66142f1be00d31aaa45f3cf266fa30d03b70c74c734502389bbfacdb6741e149cd36dc1d3557d9dbb0194ed2733748366d888651d1120098338086419ba2c + checksum: 67998137031ab0551538ba7aa038863ccd07c876d268f2ab05e408298105ab4e6136a532c97296231e91c6791442c2f7a495d9a604440bddaa094e73336705f2 languageName: node linkType: hard @@ -15032,55 +15115,56 @@ __metadata: languageName: node linkType: hard -"rc-table@npm:~7.32.1": - version: 7.32.1 - resolution: "rc-table@npm:7.32.1" +"rc-table@npm:~7.34.4": + version: 7.34.4 + resolution: "rc-table@npm:7.34.4" dependencies: "@babel/runtime": ^7.10.1 - "@rc-component/context": ^1.3.0 + "@rc-component/context": ^1.4.0 classnames: ^2.2.5 rc-resize-observer: ^1.1.0 - rc-util: ^5.27.1 + rc-util: ^5.36.0 + rc-virtual-list: ^3.11.1 peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: b2ecc2a11ceb4789414c3e49947508d570c163911d4c09926277b1c2973806bdc6932ca9652cf8098c1ad73657b6c6e412b002555d90f1bd9104d0cc570e09de + checksum: 44f6d4f3d5418928708929c1eea28ad7eb6294e4f23611bb3d92609c1d76942733dcd8070fb6c417aaeb98ebf35afb9e168f6f4dc0e62c69fa226bbad58f0c34 languageName: node linkType: hard -"rc-tabs@npm:~12.5.6": - version: 12.5.10 - resolution: "rc-tabs@npm:12.5.10" +"rc-tabs@npm:~12.12.1": + version: 12.12.1 + resolution: "rc-tabs@npm:12.12.1" dependencies: "@babel/runtime": ^7.11.2 classnames: 2.x - rc-dropdown: ~4.0.0 - rc-menu: ~9.8.0 + rc-dropdown: ~4.1.0 + rc-menu: ~9.12.0 rc-motion: ^2.6.2 rc-resize-observer: ^1.0.0 - rc-util: ^5.16.0 + rc-util: ^5.34.1 peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: 0b26b61ce96f525c2d4c74b89561997176b8673c842d28f542cbc056cc26ee16953ea34d9a591b599872717a342ffbdded4e6115d95bcfe1ec594048fe669d31 + checksum: 4a0d1a83bb9d96d3ad9935ff63bfde782b02caa75fe0e81a2979afae85c70b99cebe9fbb4e7795656cb769ed5103d5a3079f305be6ea215aeb291c512f668e34 languageName: node linkType: hard -"rc-tabs@npm:~12.9.0": - version: 12.9.0 - resolution: "rc-tabs@npm:12.9.0" +"rc-tabs@npm:~12.5.6": + version: 12.5.10 + resolution: "rc-tabs@npm:12.5.10" dependencies: "@babel/runtime": ^7.11.2 classnames: 2.x - rc-dropdown: ~4.1.0 - rc-menu: ~9.10.0 + rc-dropdown: ~4.0.0 + rc-menu: ~9.8.0 rc-motion: ^2.6.2 rc-resize-observer: ^1.0.0 rc-util: ^5.16.0 peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: a8ab132f3e2f5dfc933e6942962ea3c13a0aa9b88c498d9183901f0124c92d60692fe5e9ee34bfa67dfce3b8ee426d999f9dd465617fde755a27dfbdd6fcd134 + checksum: 0b26b61ce96f525c2d4c74b89561997176b8673c842d28f542cbc056cc26ee16953ea34d9a591b599872717a342ffbdded4e6115d95bcfe1ec594048fe669d31 languageName: node linkType: hard @@ -15100,19 +15184,19 @@ __metadata: languageName: node linkType: hard -"rc-textarea@npm:~1.3.0, rc-textarea@npm:~1.3.2": - version: 1.3.3 - resolution: "rc-textarea@npm:1.3.3" +"rc-textarea@npm:~1.4.0": + version: 1.4.0 + resolution: "rc-textarea@npm:1.4.0" dependencies: "@babel/runtime": ^7.10.1 classnames: ^2.2.1 - rc-input: ~1.1.0 + rc-input: ~1.2.1 rc-resize-observer: ^1.0.0 rc-util: ^5.27.0 peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: b91a691f63093195f63190258a705ce2464bb3ac22a81d6c4248b888044754e55efdbbe9c3d01bd4ae397731d21fb4ee8c7f07017719195b15dc3a655faea5b7 + checksum: 3aa6b6f8c3ab846f3c0e21087a096028fbbb7d0c5b19b210f7dfea787c25eab31e926edff8ba9ce02eb684e12a39c90d97495a1a9e247ec69ab9daa41df6c978 languageName: node linkType: hard @@ -15130,49 +15214,49 @@ __metadata: languageName: node linkType: hard -"rc-tooltip@npm:~6.0.0": - version: 6.0.1 - resolution: "rc-tooltip@npm:6.0.1" +"rc-tooltip@npm:~6.1.2": + version: 6.1.2 + resolution: "rc-tooltip@npm:6.1.2" dependencies: "@babel/runtime": ^7.11.2 - "@rc-component/trigger": ^1.0.4 + "@rc-component/trigger": ^1.18.0 classnames: ^2.3.1 peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: fe7f617a4f4e0085d8f5eb5e8da5598f0164841c841f62f77966706ae604491246441a469aeb44f1dec7001bb4716ee81d11ec646e8889f4164fcba3a024eea5 + checksum: 0450fe0bac954fe13cc1117cef1e632ec65e5fbb7bc9d31069925e7df026ff39211cad95509ec93500541bf55e70efaf0ee99694fdd18deac7e804b1b3f72240 languageName: node linkType: hard -"rc-tree-select@npm:~5.5.0": - version: 5.5.5 - resolution: "rc-tree-select@npm:5.5.5" +"rc-tree-select@npm:~5.13.0": + version: 5.13.0 + resolution: "rc-tree-select@npm:5.13.0" dependencies: "@babel/runtime": ^7.10.1 classnames: 2.x - rc-select: ~14.1.0 + rc-select: ~14.9.0 rc-tree: ~5.7.0 rc-util: ^5.16.1 peerDependencies: react: "*" react-dom: "*" - checksum: 6d7de4d9b80583b3bd39be0c8bad5138a62770805048da9fd177eb3f21acc7d02cd68ea64d9ca3accf8bfefa41b0db84c1ac50a3637c7b3c97060d7d3e9d60e5 + checksum: 0fa16bb69c411197e3c1fea125132949576ff42ad4f0c1f22c89ff055665fcf9e436b10934a916e940d64a68397c2a011343ec9358b7b266d4585919a47ded36 languageName: node linkType: hard -"rc-tree-select@npm:~5.9.0": - version: 5.9.0 - resolution: "rc-tree-select@npm:5.9.0" +"rc-tree-select@npm:~5.5.0": + version: 5.5.5 + resolution: "rc-tree-select@npm:5.5.5" dependencies: "@babel/runtime": ^7.10.1 classnames: 2.x - rc-select: ~14.5.0 + rc-select: ~14.1.0 rc-tree: ~5.7.0 rc-util: ^5.16.1 peerDependencies: react: "*" react-dom: "*" - checksum: 35114024de35c59b2b56df77aa5b1ad6d262ae6ac5a02b68a425af598420e98d08a12dfa64f68578d4293166032239647d5c03a9c089aef49b33b5cfc4be9306 + checksum: 6d7de4d9b80583b3bd39be0c8bad5138a62770805048da9fd177eb3f21acc7d02cd68ea64d9ca3accf8bfefa41b0db84c1ac50a3637c7b3c97060d7d3e9d60e5 languageName: node linkType: hard @@ -15192,9 +15276,9 @@ __metadata: languageName: node linkType: hard -"rc-tree@npm:~5.7.6": - version: 5.7.9 - resolution: "rc-tree@npm:5.7.9" +"rc-tree@npm:~5.7.12": + version: 5.7.12 + resolution: "rc-tree@npm:5.7.12" dependencies: "@babel/runtime": ^7.10.1 classnames: 2.x @@ -15204,7 +15288,7 @@ __metadata: peerDependencies: react: "*" react-dom: "*" - checksum: ece66a1c56883da5a3412d524e2fb66e3ddb7c463a0d91e15062f023e590bf738431d70a8697d6799db758cf2f9752c875b89d7d60d5903ab41a5d4185a6600b + checksum: 107a85407c774616cd06bc54164f3413d4e85fbe0909efee16d6bf45486ee624ba67ff07e523c25249724d6be99ec155a2503d89e14d5b3ed28acf06b4cdabab languageName: node linkType: hard @@ -15238,6 +15322,20 @@ __metadata: languageName: node linkType: hard +"rc-upload@npm:~4.3.5": + version: 4.3.5 + resolution: "rc-upload@npm:4.3.5" + dependencies: + "@babel/runtime": ^7.18.3 + classnames: ^2.2.5 + rc-util: ^5.2.0 + peerDependencies: + react: ">=16.9.0" + react-dom: ">=16.9.0" + checksum: 00758b3f34d5850a37cba8e1b4d7c5e2e60c8bd21e44b42c4ac2fe5f641575464e4209d7b9bdbdab70e46ff55705f5be71b1df7f13bbe15fd5950e895474c0cd + languageName: node + linkType: hard + "rc-util@npm:^5.0.1, rc-util@npm:^5.0.6, rc-util@npm:^5.15.0, rc-util@npm:^5.16.0, rc-util@npm:^5.16.1, rc-util@npm:^5.17.0, rc-util@npm:^5.18.1, rc-util@npm:^5.19.2, rc-util@npm:^5.2.0, rc-util@npm:^5.2.1, rc-util@npm:^5.20.1, rc-util@npm:^5.21.0, rc-util@npm:^5.21.2, rc-util@npm:^5.22.5, rc-util@npm:^5.23.0, rc-util@npm:^5.24.4, rc-util@npm:^5.25.2, rc-util@npm:^5.26.0, rc-util@npm:^5.27.0, rc-util@npm:^5.30.0, rc-util@npm:^5.4.0, rc-util@npm:^5.6.1, rc-util@npm:^5.8.0, rc-util@npm:^5.9.4": version: 5.32.2 resolution: "rc-util@npm:5.32.2" @@ -15251,7 +15349,7 @@ __metadata: languageName: node linkType: hard -"rc-util@npm:^5.27.1, rc-util@npm:^5.28.0, rc-util@npm:^5.31.1, rc-util@npm:^5.32.0, rc-util@npm:^5.32.2, rc-util@npm:^5.33.0, rc-util@npm:^5.34.1": +"rc-util@npm:^5.28.0, rc-util@npm:^5.31.1, rc-util@npm:^5.32.2, rc-util@npm:^5.33.0, rc-util@npm:^5.34.1": version: 5.34.1 resolution: "rc-util@npm:5.34.1" dependencies: @@ -15264,6 +15362,34 @@ __metadata: languageName: node linkType: hard +"rc-util@npm:^5.35.0, rc-util@npm:^5.36.0, rc-util@npm:^5.38.0": + version: 5.38.0 + resolution: "rc-util@npm:5.38.0" + dependencies: + "@babel/runtime": ^7.18.3 + react-is: ^18.2.0 + peerDependencies: + react: ">=16.9.0" + react-dom: ">=16.9.0" + checksum: 97a3e1dd94e199c12e69eed1f69e9a9be39b383f2b0d9e1d52d6fcdf676e91e6499fa7be4c48f37b08b6500747f2dc41014f9be54351a39f23b3b5087360690c + languageName: node + linkType: hard + +"rc-virtual-list@npm:^3.11.1": + version: 3.11.2 + resolution: "rc-virtual-list@npm:3.11.2" + dependencies: + "@babel/runtime": ^7.20.0 + classnames: ^2.2.6 + rc-resize-observer: ^1.0.0 + rc-util: ^5.36.0 + peerDependencies: + react: "*" + react-dom: "*" + checksum: b642e55ca2c4b56fb2048b5151a17e2f0f1c15cf3f4d8a26a4f1f370c95a6f4476743886b6633f083f107c82fbe86c5548bbf37b7e2f8b79615d90b62777824e + languageName: node + linkType: hard + "rc-virtual-list@npm:^3.2.0, rc-virtual-list@npm:^3.5.1": version: 3.5.2 resolution: "rc-virtual-list@npm:3.5.2" @@ -15971,6 +16097,13 @@ __metadata: languageName: node linkType: hard +"regenerator-runtime@npm:^0.14.0": + version: 0.14.0 + resolution: "regenerator-runtime@npm:0.14.0" + checksum: 1c977ad82a82a4412e4f639d65d22be376d3ebdd30da2c003eeafdaaacd03fc00c2320f18120007ee700900979284fc78a9f00da7fb593f6e6eeebc673fba9a3 + languageName: node + linkType: hard + "regenerator-transform@npm:^0.15.1": version: 0.15.1 resolution: "regenerator-transform@npm:0.15.1" From dd56bfb55068b5eea105087d11f6b201c06cf69d Mon Sep 17 00:00:00 2001 From: freddysundowner Date: Thu, 2 Nov 2023 10:28:04 +0300 Subject: [PATCH 14/24] fix: profile image styling --- .../videoMeetingControllerComp.tsx | 7 +--- .../meetingComp/videoMeetingStreamComp.tsx | 40 +++++++++++++++---- 2 files changed, 35 insertions(+), 12 deletions(-) diff --git a/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx b/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx index 1aec71e1f..bb782c83c 100644 --- a/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx @@ -387,10 +387,7 @@ let MTComp = (function () { volumeInfo.uid == userId && props.localUser.value.speaking != speaking ) { - props.localUser.onChange({ - ...props.localUser.value, - speaking, - }); + props.localUser.value.speaking = speaking; } else { setUpdateVolume({ update: speaking, userid: volumeInfo.uid }); } @@ -474,7 +471,7 @@ let MTComp = (function () { {children.meetingName.propertyView({ label: trans("meeting.meetingName"), })} - + {children.placement.propertyView({ label: trans("drawer.placement"), radioButton: true, diff --git a/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingStreamComp.tsx b/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingStreamComp.tsx index 574751cb6..892fb15d2 100644 --- a/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingStreamComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingStreamComp.tsx @@ -37,6 +37,7 @@ import { IAgoraRTCRemoteUser } from "agora-rtc-sdk-ng"; import { MeetingEventHandlerControl, + StringControl, StringStateControl, hiddenPropertyView, stringExposingStateControl, @@ -72,6 +73,15 @@ const TextContainer = styled.div<{ $style: any }>` justify-content: center; ${(props) => props.$style && getStyle(props.$style)} `; +const ProfileImageContainer = styled.div<{ $style: any }>` + height: 100%; + width: 100%; + display: flex; + align-items: center; + position: absolute; + justify-content: center; + ${(props) => props.$style && getStyle(props.$style)} +`; const VideoContainer = styled.video<{ $style: any }>` height: 100%; width: 100%; @@ -166,6 +176,8 @@ const typeOptions = [ export const meetingStreamChildren = { autoHeight: withDefault(AutoHeightControl, "fixed"), shareScreen: withDefault(BoolCodeControl, false), + profileImageHeight: withDefault(StringControl, "300px"), + profileImageWidth: withDefault(StringControl, "300px"), type: dropdownControl(typeOptions, ""), onEvent: MeetingEventHandlerControl, disabled: BoolCodeControl, @@ -311,16 +323,26 @@ let VideoCompBuilder = (function (props) { $style={props.style} > {userName ?? "No Username"} ) : ( - // ) -

No Video

+
)} @@ -333,10 +355,6 @@ let VideoCompBuilder = (function (props) { <>
{children.userId.propertyView({ label: trans("meeting.videoId") })} - {children.profileImageUrl.propertyView({ - label: trans("meeting.profileImageUrl"), - placeholder: "https://via.placeholder.com/120", - })} {children.autoHeight.getPropertyView()} {children.shareScreen.propertyView({ label: trans("meeting.shareScreen"), @@ -349,6 +367,14 @@ let VideoCompBuilder = (function (props) { {hiddenPropertyView(children)}
+ {children.profileImageUrl.propertyView({ + label: trans("meeting.profileImageUrl"), + placeholder: "https://via.placeholder.com/120", + })} + {children.profileImageHeight.propertyView({ + label: "Profile Height", + })} + {children.profileImageWidth.propertyView({ label: "Profile Width" })} {children.style.getPropertyView()}
From 07bfe358d1f1ede2e7da57ba4b7e8a6e986d9835 Mon Sep 17 00:00:00 2001 From: freddysundowner Date: Thu, 2 Nov 2023 11:14:15 +0300 Subject: [PATCH 15/24] feat: changed share screen bool from string to switch --- .../meetingComp/meetingControlerUtils.tsx | 36 +++++++++++++++++++ .../meetingComp/videoMeetingStreamComp.tsx | 24 +++++-------- .../comps/tableComp/expansionControl.tsx | 2 +- 3 files changed, 46 insertions(+), 16 deletions(-) create mode 100644 client/packages/lowcoder/src/comps/comps/meetingComp/meetingControlerUtils.tsx diff --git a/client/packages/lowcoder/src/comps/comps/meetingComp/meetingControlerUtils.tsx b/client/packages/lowcoder/src/comps/comps/meetingComp/meetingControlerUtils.tsx new file mode 100644 index 000000000..81b11f622 --- /dev/null +++ b/client/packages/lowcoder/src/comps/comps/meetingComp/meetingControlerUtils.tsx @@ -0,0 +1,36 @@ +import { CheckBox, controlItem, Switch, SwitchWrapper } from "lowcoder-design"; +import { ReactNode } from "react"; +import { ControlParams, SimpleComp } from "@lowcoder-ee/index.sdk"; + +export class BoolShareVideoControl extends SimpleComp { + readonly IGNORABLE_DEFAULT_VALUE = false; + protected getDefaultValue(): boolean { + return false; + } + + getPropertyView(): ReactNode { + return ( + this.dispatchChangeValueAction(x)} + /> + ); + } + + propertyView(params: ControlParams & { type?: "switch" | "checkbox" }) { + return controlItem( + { filterText: params.label }, + + {params.type === "checkbox" ? ( + this.dispatchChangeValueAction(x.target.checked)} + /> + ) : ( + this.getPropertyView() + )} + + ); + } +} diff --git a/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingStreamComp.tsx b/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingStreamComp.tsx index 892fb15d2..dfb70a8b4 100644 --- a/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingStreamComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingStreamComp.tsx @@ -28,20 +28,20 @@ import { RefControl } from "comps/controls/refControl"; import { useEffect, useRef, useState } from "react"; import { AutoHeightControl } from "comps/controls/autoHeightControl"; -import { - VideoMeetingControllerComp, - client, -} from "./videoMeetingControllerComp"; +import { client } from "./videoMeetingControllerComp"; import { IAgoraRTCRemoteUser } from "agora-rtc-sdk-ng"; import { + ControlParams, MeetingEventHandlerControl, + SimpleComp, StringControl, StringStateControl, hiddenPropertyView, stringExposingStateControl, } from "@lowcoder-ee/index.sdk"; +import { BoolShareVideoControl } from "./meetingControlerUtils"; const FormLabel = styled(CommonBlueLabel)` font-size: 13px; @@ -73,15 +73,7 @@ const TextContainer = styled.div<{ $style: any }>` justify-content: center; ${(props) => props.$style && getStyle(props.$style)} `; -const ProfileImageContainer = styled.div<{ $style: any }>` - height: 100%; - width: 100%; - display: flex; - align-items: center; - position: absolute; - justify-content: center; - ${(props) => props.$style && getStyle(props.$style)} -`; + const VideoContainer = styled.video<{ $style: any }>` height: 100%; width: 100%; @@ -102,6 +94,7 @@ const getStyle = (style: any) => { } `; }; + function getForm(editorState: EditorState, formName: string) { const comp = editorState?.getUICompByName(formName); if (comp && comp.children.compType.getView() === "form") { @@ -175,7 +168,7 @@ const typeOptions = [ export const meetingStreamChildren = { autoHeight: withDefault(AutoHeightControl, "fixed"), - shareScreen: withDefault(BoolCodeControl, false), + shareScreen: withDefault(BoolShareVideoControl, false), profileImageHeight: withDefault(StringControl, "300px"), profileImageWidth: withDefault(StringControl, "300px"), type: dropdownControl(typeOptions, ""), @@ -304,7 +297,7 @@ let VideoCompBuilder = (function (props) { {(editorState) => ( - {props.shareScreen || userId ? ( + {userId ? ( <> props.onEvent("videoClicked")} @@ -360,6 +353,7 @@ let VideoCompBuilder = (function (props) { label: trans("meeting.shareScreen"), })}
+
{children.onEvent.getPropertyView()}
diff --git a/client/packages/lowcoder/src/comps/comps/tableComp/expansionControl.tsx b/client/packages/lowcoder/src/comps/comps/tableComp/expansionControl.tsx index 2bf838baf..6b5b41380 100644 --- a/client/packages/lowcoder/src/comps/comps/tableComp/expansionControl.tsx +++ b/client/packages/lowcoder/src/comps/comps/tableComp/expansionControl.tsx @@ -54,7 +54,7 @@ let ExpansionControlTmp = (function () { .setControlItemData({ filterText: label }) .setPropertyViewFn((children, dispatch) => { return ( - <> + <> {children.expandable.propertyView({ label })} {children.expandable.getView() && children.slot From 385b89fc6fbb0aa470fb40379d3620d95324f9c3 Mon Sep 17 00:00:00 2001 From: freddysundowner Date: Thu, 2 Nov 2023 11:40:26 +0300 Subject: [PATCH 16/24] fix: speaking bool on local user object --- .../comps/meetingComp/videoMeetingControllerComp.tsx | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx b/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx index bb782c83c..f7147dad7 100644 --- a/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx @@ -387,7 +387,13 @@ let MTComp = (function () { volumeInfo.uid == userId && props.localUser.value.speaking != speaking ) { - props.localUser.value.speaking = speaking; + let localObject = { + user: userId + "", + audiostatus: props.audioControl.value, + streamingVideo: props.videoControl.value, + speaking: speaking, + }; + props.localUser.onChange(localObject); } else { setUpdateVolume({ update: speaking, userid: volumeInfo.uid }); } @@ -548,6 +554,8 @@ MTComp = withMethodExposing(MTComp, [ comp.children.localUser.change({ user: userId + "", audiostatus: value, + streamingVideo: comp.children.videoControl.getView().value, + speaking: false, }); await turnOnMicrophone(value); comp.children.audioControl.change(value); From 62c21f00da0fe5d19c917f7ee5c9577e411f99ac Mon Sep 17 00:00:00 2001 From: freddysundowner Date: Fri, 3 Nov 2023 12:16:23 +0300 Subject: [PATCH 17/24] fix: profile image showing when audio is toggled --- .../videoMeetingControllerComp.tsx | 46 ++++++++++++++----- .../meetingComp/videoMeetingStreamComp.tsx | 2 + 2 files changed, 36 insertions(+), 12 deletions(-) diff --git a/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx b/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx index f7147dad7..97993cfb7 100644 --- a/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx @@ -29,7 +29,7 @@ import { BackgroundColorContext } from "comps/utils/backgroundColorContext"; import { CanvasContainerID } from "constants/domLocators"; import { Layers } from "constants/Layers"; import { trans } from "i18n"; -import { changeChildAction } from "lowcoder-core"; +import { changeChildAction, changeValueAction } from "lowcoder-core"; import { Drawer, HintPlaceHolder, @@ -282,6 +282,7 @@ let MTComp = (function () { userid: null, }); const [rtmMessages, setRtmMessages] = useState([]); + const [localUserSpeaking, setLocalUserSpeaking] = useState(false); useEffect(() => { dispatch( @@ -325,6 +326,18 @@ let MTComp = (function () { } }, [rtmMessages]); + useEffect(() => { + if (localUserSpeaking === true) { + let localObject = { + user: userId + "", + audiostatus: props.audioControl.value, + streamingVideo: props.videoControl.value, + speaking: localUserSpeaking, + }; + props.localUser.onChange(localObject); + } + }, [localUserSpeaking]); + useEffect(() => { if (props.localUser.value) { let newUsers = userIds.filter((item: any) => item.user !== userId); @@ -387,13 +400,7 @@ let MTComp = (function () { volumeInfo.uid == userId && props.localUser.value.speaking != speaking ) { - let localObject = { - user: userId + "", - audiostatus: props.audioControl.value, - streamingVideo: props.videoControl.value, - speaking: speaking, - }; - props.localUser.onChange(localObject); + setLocalUserSpeaking(speaking); } else { setUpdateVolume({ update: speaking, userid: volumeInfo.uid }); } @@ -574,12 +581,14 @@ MTComp = withMethodExposing(MTComp, [ } else { await turnOnCamera(value); } - comp.children.localUser.change({ + let localData = { user: userId + "", streamingVideo: value, - audiostatus: false, - speaking: false, - }); + audiostatus: comp.children.audioControl.getView().value, + speaking: comp.children.localUser.getView().value.speaking, + }; + + comp.children.localUser.change(localData); comp.children.videoControl.change(value); }, }, @@ -598,6 +607,19 @@ MTComp = withMethodExposing(MTComp, [ streamingVideo: true, }); + comp.children.localUser.children.value.dispatch( + changeChildAction( + "localUser", + { + user: userId + "", + audiostatus: false, + speaking: false, + streamingVideo: true, + }, + false + ) + ); + comp.children.videoControl.change(true); await publishVideo( comp.children.appId.getView(), comp.children.meetingName.getView().value == "" diff --git a/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingStreamComp.tsx b/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingStreamComp.tsx index dfb70a8b4..ee1d6657b 100644 --- a/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingStreamComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingStreamComp.tsx @@ -287,6 +287,8 @@ let VideoCompBuilder = (function (props) { } ); + console.log(userData); + setUserId(userData.user); setUsername(userData.userName); } From 167211d318cd29341f61197bc13ff7f6c93be432 Mon Sep 17 00:00:00 2001 From: freddysundowner Date: Fri, 3 Nov 2023 13:41:23 +0300 Subject: [PATCH 18/24] feat: exposed meeting active bool and also fixed image padding issue --- .../videoMeetingControllerComp.tsx | 35 +++++++++---------- .../meetingComp/videoMeetingStreamComp.tsx | 25 +++++++------ 2 files changed, 29 insertions(+), 31 deletions(-) diff --git a/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx b/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx index 97993cfb7..1c29036f7 100644 --- a/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx @@ -10,10 +10,8 @@ import { BoolControl } from "comps/controls/boolControl"; import { StringControl } from "comps/controls/codeControl"; import { booleanExposingStateControl, + BooleanStateControl, jsonObjectExposingStateControl, - numberExposingStateControl, - numberStateControl, - stringExposingStateControl, stringStateControl, } from "comps/controls/codeStateControl"; import { PositionControl } from "comps/controls/dropdownControl"; @@ -29,7 +27,7 @@ import { BackgroundColorContext } from "comps/utils/backgroundColorContext"; import { CanvasContainerID } from "constants/domLocators"; import { Layers } from "constants/Layers"; import { trans } from "i18n"; -import { changeChildAction, changeValueAction } from "lowcoder-core"; +import { changeChildAction } from "lowcoder-core"; import { Drawer, HintPlaceHolder, @@ -55,7 +53,7 @@ import AgoraRTC, { import { JSONValue } from "@lowcoder-ee/index.sdk"; import { getData } from "../listViewComp/listViewUtils"; -import AgoraRTM, { RtmChannel, RtmClient, RtmMessage } from "agora-rtm-sdk"; +import AgoraRTM, { RtmChannel, RtmClient } from "agora-rtm-sdk"; const EventOptions = [closeEvent] as const; @@ -113,13 +111,13 @@ let screenShareStream: ILocalVideoTrack; let userId: UID | null | undefined; let rtmChannelResponse: RtmChannel; let rtmClient: RtmClient; +const agoraTokenUrl = `https://sandbox.wiggolive.com/token/rtc`; const generateToken = async ( appId: any, certificate: any, channelName: any ) => { - const agoraTokenUrl = `https://sandbox.wiggolive.com/token/rtc`; let response = await axios.post(agoraTokenUrl, { appId, certificate, @@ -204,8 +202,8 @@ const publishVideo = async ( const videoSettings = mediaStreamTrack.getSettings(); const videoWidth = videoSettings.width; const videoHeight = videoSettings.height; - height.videoWidth.change(videoWidth); - height.videoHeight.change(videoHeight); + // height.videoWidth.change(videoWidth); + // height.videoHeight.change(videoHeight); } }; @@ -230,7 +228,7 @@ const rtmInit = async (appId: any, uid: any, channel: any) => { }; export const meetingControllerChildren = { - visible: booleanExposingStateControl("visible"), + visible: withDefault(BooleanStateControl, "visible"), onEvent: eventHandlerControl(EventOptions), width: StringControl, height: StringControl, @@ -239,20 +237,17 @@ export const meetingControllerChildren = { placement: PositionControl, maskClosable: withDefault(BoolControl, true), showMask: withDefault(BoolControl, true), - audioControl: booleanExposingStateControl("false"), - videoControl: booleanExposingStateControl("true"), - endCall: booleanExposingStateControl("false"), - sharing: booleanExposingStateControl("false"), - videoSettings: jsonObjectExposingStateControl(""), - videoWidth: numberStateControl(200), - videoHeight: numberStateControl(200), + meetingActive: withDefault(BooleanStateControl, "false"), + audioControl: withDefault(BooleanStateControl, "false"), + videoControl: withDefault(BooleanStateControl, "true"), + endCall: withDefault(BooleanStateControl, "false"), + sharing: withDefault(BooleanStateControl, "false"), appId: withDefault(StringControl, trans("meeting.appid")), participants: stateComp([]), usersScreenShared: stateComp([]), localUser: jsonObjectExposingStateControl(""), meetingName: stringStateControl("meetingName"), - userName: stringStateControl("userName"), - certifiCateKey: stringExposingStateControl(""), + certifiCateKey: stringStateControl(""), messages: stateComp([]), }; let MTComp = (function () { @@ -628,6 +623,7 @@ MTComp = withMethodExposing(MTComp, [ comp.children, comp.children.certifiCateKey.getView().value ); + comp.children.meetingActive.change(true); }, }, { @@ -690,6 +686,7 @@ MTComp = withMethodExposing(MTComp, [ execute: async (comp, values) => { let value = !comp.children.endCall.getView().value; comp.children.endCall.change(value); + comp.children.meetingActive.change(false); await leaveChannel(); @@ -716,6 +713,8 @@ export const VideoMeetingControllerComp = withExposingConfigs(MTComp, [ new NameConfig("appId", trans("meeting.appid")), new NameConfig("localUser", trans("meeting.host")), new NameConfig("participants", trans("meeting.participants")), + new NameConfig("meetingActive", trans("meeting.meetingName")), new NameConfig("meetingName", trans("meeting.meetingName")), new NameConfig("messages", trans("meeting.meetingName")), ]); + diff --git a/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingStreamComp.tsx b/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingStreamComp.tsx index ee1d6657b..c605291e7 100644 --- a/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingStreamComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingStreamComp.tsx @@ -169,8 +169,8 @@ const typeOptions = [ export const meetingStreamChildren = { autoHeight: withDefault(AutoHeightControl, "fixed"), shareScreen: withDefault(BoolShareVideoControl, false), - profileImageHeight: withDefault(StringControl, "300px"), - profileImageWidth: withDefault(StringControl, "300px"), + profilePadding: withDefault(StringControl, "0px"), + profileBorderRadius: withDefault(StringControl, "0px"), type: dropdownControl(typeOptions, ""), onEvent: MeetingEventHandlerControl, disabled: BoolCodeControl, @@ -287,8 +287,6 @@ let VideoCompBuilder = (function (props) { } ); - console.log(userData); - setUserId(userData.user); setUsername(userData.userName); } @@ -319,9 +317,8 @@ let VideoCompBuilder = (function (props) { > @@ -332,9 +329,9 @@ let VideoCompBuilder = (function (props) { @@ -367,10 +364,12 @@ let VideoCompBuilder = (function (props) { label: trans("meeting.profileImageUrl"), placeholder: "https://via.placeholder.com/120", })} - {children.profileImageHeight.propertyView({ - label: "Profile Height", + {children.profilePadding.propertyView({ + label: "Profile Padding", + })} + {children.profileBorderRadius.propertyView({ + label: "Profile Border Radius", })} - {children.profileImageWidth.propertyView({ label: "Profile Width" })} {children.style.getPropertyView()} From 4010b73f9936ef5202114657ed68d68db7c359e2 Mon Sep 17 00:00:00 2001 From: FalkWolsky Date: Sat, 4 Nov 2023 09:08:36 +0100 Subject: [PATCH 19/24] Fixes flaws in documentation --- client/README.md | 84 ++++++++++++++++++++++++++++++++++++++++++++---- client/VERSION | 2 +- 2 files changed, 79 insertions(+), 7 deletions(-) diff --git a/client/README.md b/client/README.md index 0130a7c73..203f65d58 100644 --- a/client/README.md +++ b/client/README.md @@ -12,7 +12,7 @@ Simply run below command to start a backend server. docker run -d --name lowcoder -p 3000:3000 -v "$PWD/stacks:/lowcoder-stacks" lowcoderorg/lowcoder-ce ``` -For more information, view our [docs](../docs/self-hosting) +For more information, view our [docs](https://docs.lowcoder.cloud/lowcoder-documentation/setup-and-run/self-hosting) #### Build Docker image from source @@ -32,9 +32,23 @@ docker run -d --name lowcoder-dev -p 3000:3000 -v "$PWD/stacks:/lowcoder-stacks" ### Start develop 1. Check out source code. -2. Change to client dir in the repository root via cd client. -3. Run yarn to install dependencies: . -4. Start dev server: `LOWCODER_API_SERVICE_URL=http://localhost:3000 yarn start`. +2. Change to **/client** dir in the source dir. + +```bash +cd client +``` +3. Run yarn to install dependencies. + +```bash +yarn install +``` + +4. Start dev server: + +```bash +LOWCODER_API_SERVICE_URL=http://localhost:3000 yarn start +``` + 5. After dev server starts successfully, it will be automatically opened in the default browser. ### Before submitting a pull request @@ -42,5 +56,63 @@ docker run -d --name lowcoder-dev -p 3000:3000 -v "$PWD/stacks:/lowcoder-stacks" In addition, before submitting a pull request, please make sure the following is done: 1. If you’ve fixed a bug or added code that should be tested and add unit test suite. -2. Run `yarn test` and ensure all test suites pass. -3. If you add new dependency, use yarn workspace lowcoder some-package to make sure yarn.lock is also updated. +2. Run test and ensure all test suites pass. + +```bash +yarn test +``` + +3. If you add new dependency, use the yarn worspace tool to make sure yarn.lock is also updated. + +```bash +yarn workspace lowcoder +``` + +### Developing and publishung UI components for Lowcoder + +1. Initialization + +Project initiation + +```bash +yarn create Lowcoder-plugin +``` + +Go to the project root + +```bash +cd my-plugin +``` + +Start the development environment + +```bash +yarn start +``` + +After executing yarn start, the browser is automatically opened and you enter the component development environment. +Please find more information in our [docs](https://docs.lowcoder.cloud/lowcoder-documentation/lowcoder-extension/develop-ui-components-for-apps) + +2. Export components + +To export all the components, use src/index.ts, for example: + +```bash +import HelloWorldComp from "./HelloWorldComp"; + +export default { + hello_world: HelloWorldComp, +}; +``` + +import HelloWorldComp from "./HelloWorldComp"; + +3. Publish plugins + +When you finish developing and testing the plugin, you can publish it into the npm registry. Login in to the npm registry locally, and then execute the following command: + +```bash +yarn build --publish +``` + +You can check a code demo here: [Code Demo on Github](https://github.com/lowcoder-org/lowcoder/tree/main/client/packages/lowcoder-plugin-demo) \ No newline at end of file diff --git a/client/VERSION b/client/VERSION index db1527897..c346e7a04 100644 --- a/client/VERSION +++ b/client/VERSION @@ -1 +1 @@ -1.1.8 \ No newline at end of file +2.1.4 \ No newline at end of file From 7506d3349a97d879b8a30909bedac3d4c0a69661 Mon Sep 17 00:00:00 2001 From: FalkWolsky Date: Sat, 4 Nov 2023 09:23:46 +0100 Subject: [PATCH 20/24] outcommented Browsercheck in index.html --- client/packages/lowcoder/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/packages/lowcoder/index.html b/client/packages/lowcoder/index.html index 10f704aa1..2a45e2639 100644 --- a/client/packages/lowcoder/index.html +++ b/client/packages/lowcoder/index.html @@ -95,6 +95,6 @@
- <%- browserCheckScript %> + From 7d4efa591c4c3e2d08cbcb17e62e1ff12a360c72 Mon Sep 17 00:00:00 2001 From: freddysundowner Date: Sat, 4 Nov 2023 13:46:38 +0300 Subject: [PATCH 21/24] fixed image and video aspect ratio --- .../videoMeetingControllerComp.tsx | 1 - .../meetingComp/videoMeetingStreamComp.tsx | 113 ++++++++---------- 2 files changed, 49 insertions(+), 65 deletions(-) diff --git a/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx b/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx index 1c29036f7..13b6b86e1 100644 --- a/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx @@ -717,4 +717,3 @@ export const VideoMeetingControllerComp = withExposingConfigs(MTComp, [ new NameConfig("meetingName", trans("meeting.meetingName")), new NameConfig("messages", trans("meeting.meetingName")), ]); - diff --git a/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingStreamComp.tsx b/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingStreamComp.tsx index c605291e7..ab1ce1461 100644 --- a/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingStreamComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingStreamComp.tsx @@ -33,9 +33,7 @@ import { client } from "./videoMeetingControllerComp"; import { IAgoraRTCRemoteUser } from "agora-rtc-sdk-ng"; import { - ControlParams, MeetingEventHandlerControl, - SimpleComp, StringControl, StringStateControl, hiddenPropertyView, @@ -57,44 +55,15 @@ function getFormOptions(editorState: EditorState) { value: info.name, })); } -const Container = styled.div<{ $style: any }>` - height: 100%; - width: 100%; - display: flex; - align-items: center; - justify-content: center; -`; -const TextContainer = styled.div<{ $style: any }>` - height: 100%; - width: 100%; - display: flex; - align-items: center; - position: absolute; - justify-content: center; - ${(props) => props.$style && getStyle(props.$style)} -`; -const VideoContainer = styled.video<{ $style: any }>` +const VideoContainer = styled.video` height: 100%; width: 100%; display: flex; align-items: center; justify-content: center; - ${(props) => props.$style && getStyle(props.$style)} `; -const getStyle = (style: any) => { - return css` - { - border: 1px solid ${style.border}; - border-radius: ${style.radius}; - margin: ${style.margin}; - padding: ${style.padding}; - background-color: ${style.background}; - } - `; -}; - function getForm(editorState: EditorState, formName: string) { const comp = editorState?.getUICompByName(formName); if (comp && comp.children.compType.getView() === "form") { @@ -192,23 +161,10 @@ let VideoCompBuilder = (function (props) { return new UICompBuilder(meetingStreamChildren, (props) => { const videoRef = useRef(null); const conRef = useRef(null); - const placeholderRef = useRef(null); const [userId, setUserId] = useState(); const [userName, setUsername] = useState(""); const [showVideo, setVideo] = useState(true); - useEffect(() => { - onResize(); - }, []); - - const onResize = async () => { - const container = conRef.current; - let videoCo = videoRef.current; - if (videoCo) { - videoCo!.style.height = container?.clientHeight + "px"; - videoCo!.style.width = container?.clientWidth + "px"; - } - }; useEffect(() => { if (props.userId.value !== "") { let userData = JSON.parse(props.userId?.value); @@ -289,55 +245,84 @@ let VideoCompBuilder = (function (props) { setUserId(userData.user); setUsername(userData.userName); + console.log(userData); } }, [props.userId.value]); return ( {(editorState) => ( - - + +
{userId ? ( - <> + showVideo ? ( props.onEvent("videoClicked")} ref={videoRef} - style={{ display: `${showVideo ? "flex" : "none"}` }} - $style={props.style} + style={{ + display: `${showVideo ? "flex" : "none"}`, + aspectRatio: "1 / 1", + borderRadius: props.style.radius, + width: "auto", + }} id={props.shareScreen ? "share-screen" : userId} > - props.onEvent("videoClicked")} - ref={placeholderRef} + ) : ( +
- {userName ?? "No Username"} - - +

{userName ?? ""}

+
+ ) ) : ( - +
- +

{userName ?? ""}

+
)} - +
)}
From 5366cd48db06f31f16e594f98ebc7ae6bcba611f Mon Sep 17 00:00:00 2001 From: FalkWolsky Date: Sat, 4 Nov 2023 17:09:08 +0100 Subject: [PATCH 22/24] Fix Editable Aspect Ratio --- .../meetingComp/videoMeetingStreamComp.tsx | 62 ++++++++++--------- 1 file changed, 33 insertions(+), 29 deletions(-) diff --git a/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingStreamComp.tsx b/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingStreamComp.tsx index ab1ce1461..2b22ede61 100644 --- a/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingStreamComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingStreamComp.tsx @@ -1,11 +1,11 @@ import { BoolCodeControl } from "comps/controls/codeControl"; import { dropdownControl } from "comps/controls/dropdownControl"; -import { IconControl } from "comps/controls/iconControl"; +// import { IconControl } from "comps/controls/iconControl"; import { CompNameContext, EditorContext, EditorState } from "comps/editorState"; import { withDefault } from "comps/generators"; import { UICompBuilder } from "comps/generators/uiCompBuilder"; import ReactResizeDetector from "react-resize-detector"; -import _ from "lodash"; +// import _ from "lodash"; import { CommonBlueLabel, controlItem, @@ -61,7 +61,7 @@ const VideoContainer = styled.video` width: 100%; display: flex; align-items: center; - justify-content: center; + justify-content: space-around; `; function getForm(editorState: EditorState, formName: string) { @@ -140,13 +140,14 @@ export const meetingStreamChildren = { shareScreen: withDefault(BoolShareVideoControl, false), profilePadding: withDefault(StringControl, "0px"), profileBorderRadius: withDefault(StringControl, "0px"), + videoAspectRatio: withDefault(StringControl, "1 / 1"), type: dropdownControl(typeOptions, ""), onEvent: MeetingEventHandlerControl, disabled: BoolCodeControl, loading: BoolCodeControl, form: SelectFormControl, - prefixIcon: IconControl, - suffixIcon: IconControl, + // prefixIcon: IconControl, + // suffixIcon: IconControl, style: ButtonStyleControl, viewRef: RefControl, userId: stringExposingStateControl(""), @@ -169,12 +170,12 @@ let VideoCompBuilder = (function (props) { if (props.userId.value !== "") { let userData = JSON.parse(props.userId?.value); if ( - userData.user == userId && - userData.streamingVideo == false && + userData.user === userId && + userData.streamingVideo === false && videoRef.current && - videoRef.current?.id == userId + "" + videoRef.current?.id === userId + "" ) { - if (videoRef.current && videoRef.current?.id == userId + "") { + if (videoRef.current && videoRef.current?.id === userId + "") { videoRef.current.srcObject = null; setVideo(false); } @@ -189,8 +190,8 @@ let VideoCompBuilder = (function (props) { let userId = user.uid + ""; if ( user.hasVideo && - user.uid + "" != userData.user && - userData.user != "" + user.uid + "" !== userData.user && + userData.user !== "" ) { props.onEvent("videoOn"); } @@ -204,8 +205,8 @@ let VideoCompBuilder = (function (props) { const remoteTrack = await client.subscribe(user, mediaType); if ( user.hasAudio && - user.uid + "" != userData.user && - userData.user != "" + user.uid + "" !== userData.user && + userData.user !== "" ) { userData.audiostatus = user.hasVideo; @@ -221,21 +222,21 @@ let VideoCompBuilder = (function (props) { if (mediaType === "audio") { if ( !user.hasAudio && - user.uid + "" != userData.user && - userData.user != "" + user.uid + "" !== userData.user && + userData.user !== "" ) { userData.audiostatus = user.hasVideo; props.onEvent("audioMuted"); } } if (mediaType === "video") { - if (videoRef.current && videoRef.current?.id == user.uid + "") { + if (videoRef.current && videoRef.current?.id === user.uid + "") { videoRef.current.srcObject = null; } if ( !user.hasVideo && - user.uid + "" != userData.user && - userData.user != "" + user.uid + "" !== userData.user && + userData.user !== "" ) { props.onEvent("videoOff"); } @@ -245,7 +246,7 @@ let VideoCompBuilder = (function (props) { setUserId(userData.user); setUsername(userData.userName); - console.log(userData); + // console.log(userData); } }, [props.userId.value]); @@ -261,7 +262,7 @@ let VideoCompBuilder = (function (props) { height: "100%", overflow: "hidden", borderRadius: props.style.radius, - aspectRatio: "1 / 1", + aspectRatio: props.videoAspectRatio, backgroundColor: props.style.background, padding: props.style.padding, margin: props.style.margin, @@ -274,7 +275,7 @@ let VideoCompBuilder = (function (props) { ref={videoRef} style={{ display: `${showVideo ? "flex" : "none"}`, - aspectRatio: "1 / 1", + aspectRatio: props.videoAspectRatio, borderRadius: props.style.radius, width: "auto", }} @@ -290,7 +291,7 @@ let VideoCompBuilder = (function (props) { padding: props.profilePadding, }} > - -
@@ -345,15 +350,14 @@ let VideoCompBuilder = (function (props) { {hiddenPropertyView(children)}
- {children.profileImageUrl.propertyView({ - label: trans("meeting.profileImageUrl"), - placeholder: "https://via.placeholder.com/120", - })} {children.profilePadding.propertyView({ - label: "Profile Padding", + label: "Profile Image Padding", })} {children.profileBorderRadius.propertyView({ - label: "Profile Border Radius", + label: "Profile Image Border Radius", + })} + {children.videoAspectRatio.propertyView({ + label: "Video Aspect Ratio", })} {children.style.getPropertyView()}
From e985886792e23812906d817ebf34d23d1a1ee05d Mon Sep 17 00:00:00 2001 From: FalkWolsky Date: Sat, 4 Nov 2023 18:08:35 +0100 Subject: [PATCH 23/24] Fix Version Display --- .../src/main/resources/selfhost/ce/application.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/api-service/lowcoder-server/src/main/resources/selfhost/ce/application.yml b/server/api-service/lowcoder-server/src/main/resources/selfhost/ce/application.yml index ce0618058..31255c54b 100644 --- a/server/api-service/lowcoder-server/src/main/resources/selfhost/ce/application.yml +++ b/server/api-service/lowcoder-server/src/main/resources/selfhost/ce/application.yml @@ -37,7 +37,7 @@ common: domain: default-value: lowcoder.org cloud: false - version: 1.1.8 + version: 2.1.4 block-hound-enable: false js-executor: host: ${LOWCODER_NODE_SERVICE_URL:http://127.0.0.1:6060} From cbec794cd0f4486fc43bced67138160d5dc72d49 Mon Sep 17 00:00:00 2001 From: Falk Wolsky Date: Sat, 4 Nov 2023 18:42:34 +0100 Subject: [PATCH 24/24] Revert "build(deps): bump antd from 5.7.2 to 5.10.3 in /client" --- client/packages/lowcoder/package.json | 2 +- client/yarn.lock | 505 ++++++++++---------------- 2 files changed, 187 insertions(+), 320 deletions(-) diff --git a/client/packages/lowcoder/package.json b/client/packages/lowcoder/package.json index 6a947cbd6..3f9dc3541 100644 --- a/client/packages/lowcoder/package.json +++ b/client/packages/lowcoder/package.json @@ -40,7 +40,7 @@ "agora-rtc-sdk-ng": "^4.19.0", "agora-rtm-sdk": "^1.5.1", "ali-oss": "^6.17.1", - "antd": "5.10.3", + "antd": "5.7.2", "antd-img-crop": "^4.12.2", "axios": "^0.21.1", "buffer": "^6.0.3", diff --git a/client/yarn.lock b/client/yarn.lock index da52a3106..2a05e158b 100644 --- a/client/yarn.lock +++ b/client/yarn.lock @@ -74,21 +74,21 @@ __metadata: languageName: node linkType: hard -"@ant-design/cssinjs@npm:^1.17.2": - version: 1.17.2 - resolution: "@ant-design/cssinjs@npm:1.17.2" +"@ant-design/cssinjs@npm:^1.10.1": + version: 1.13.2 + resolution: "@ant-design/cssinjs@npm:1.13.2" dependencies: "@babel/runtime": ^7.11.1 "@emotion/hash": ^0.8.0 "@emotion/unitless": ^0.7.5 classnames: ^2.3.1 csstype: ^3.0.10 - rc-util: ^5.35.0 + rc-util: ^5.34.1 stylis: ^4.0.13 peerDependencies: react: ">=16.0.0" react-dom: ">=16.0.0" - checksum: ed864b4f890038cb132131c25ebe137a421c32a518dbbd0424126ce2603f71946ce0fca91bbe1ad7a629760374266af6246da01ca86fbce8f68acb9ceba6b91f + checksum: 630c30defcd713ab64ea9b2f2cd193d9f71eb7d55eef142a86e7a32214e613c2d5ded35dd859d0becb1f005868bb7ae496c18c80edbb6fb5df2f3fef7f9b6ba9 languageName: node linkType: hard @@ -99,13 +99,6 @@ __metadata: languageName: node linkType: hard -"@ant-design/icons-svg@npm:^4.3.0": - version: 4.3.1 - resolution: "@ant-design/icons-svg@npm:4.3.1" - checksum: 47f0474277366fb3b8bacfeb1691be35052c3f9b28811be7fb25ad219100533d0e31c2eec00a8dee744c34381a4cda7f39b39403e160811a8fd5d33b861e77aa - languageName: node - linkType: hard - "@ant-design/icons@npm:^4.1.0, @ant-design/icons@npm:^4.2.1, @ant-design/icons@npm:^4.3.0, @ant-design/icons@npm:^4.7.0": version: 4.8.0 resolution: "@ant-design/icons@npm:4.8.0" @@ -122,19 +115,19 @@ __metadata: languageName: node linkType: hard -"@ant-design/icons@npm:^5.2.6": - version: 5.2.6 - resolution: "@ant-design/icons@npm:5.2.6" +"@ant-design/icons@npm:^5.1.0": + version: 5.1.4 + resolution: "@ant-design/icons@npm:5.1.4" dependencies: "@ant-design/colors": ^7.0.0 - "@ant-design/icons-svg": ^4.3.0 + "@ant-design/icons-svg": ^4.2.1 "@babel/runtime": ^7.11.2 classnames: ^2.2.6 rc-util: ^5.31.1 peerDependencies: react: ">=16.0.0" react-dom: ">=16.0.0" - checksum: 2f571699b1903383cd09faa78e4cce34973debb0e7ec6223b9d9a0a6ab2b2f0c876072db62bbd4e6a45e864df5447343315e066abeffaf58aa5b97df3acc89f1 + checksum: f74f27b526459e69354adbc9d222a99afcf5fd0074a97575df239fbe5d077de0de903afa612546f24c378c2e163e02e4e31cde575da4e84e597025f12c90984f languageName: node linkType: hard @@ -281,9 +274,9 @@ __metadata: languageName: node linkType: hard -"@ant-design/react-slick@npm:~1.0.2": - version: 1.0.2 - resolution: "@ant-design/react-slick@npm:1.0.2" +"@ant-design/react-slick@npm:~1.0.0": + version: 1.0.1 + resolution: "@ant-design/react-slick@npm:1.0.1" dependencies: "@babel/runtime": ^7.10.4 classnames: ^2.2.5 @@ -292,7 +285,7 @@ __metadata: throttle-debounce: ^5.0.0 peerDependencies: react: ">=16.9.0" - checksum: c2a2d14270b3551c1af16c4cc8c63e29ee7f08e4203191d834df61211235102fd5d8e4325adfa41ada1c5212e4388849ec0d23fcb980bf69790b565f363e2d1f + checksum: 4b6274b4d9097d6c922321550a0923b1f52a85e9b8bec2b51be56523f158801a9931fcd5b211a44aeb8a6bb583b9b88bf13d47fe263883178915860598144ab4 languageName: node linkType: hard @@ -1847,15 +1840,6 @@ __metadata: languageName: node linkType: hard -"@babel/runtime@npm:^7.23.2": - version: 7.23.2 - resolution: "@babel/runtime@npm:7.23.2" - dependencies: - regenerator-runtime: ^0.14.0 - checksum: 6c4df4839ec75ca10175f636d6362f91df8a3137f86b38f6cd3a4c90668a0fe8e9281d320958f4fbd43b394988958585a17c3aab2a4ea6bf7316b22916a371fb - languageName: node - linkType: hard - "@babel/template@npm:^7.18.10, @babel/template@npm:^7.20.7, @babel/template@npm:^7.3.3": version: 7.21.9 resolution: "@babel/template@npm:7.21.9" @@ -2109,13 +2093,6 @@ __metadata: languageName: node linkType: hard -"@ctrl/tinycolor@npm:^3.6.1": - version: 3.6.1 - resolution: "@ctrl/tinycolor@npm:3.6.1" - checksum: cefec6fcaaa3eb8ddf193f981e097dccf63b97b93b1e861cb18c645654824c831a568f444996e15ee509f255658ed82fba11c5365494a6e25b9b12ac454099e0 - languageName: node - linkType: hard - "@cush/relative@npm:^1.0.0": version: 1.0.0 resolution: "@cush/relative@npm:1.0.0" @@ -3092,7 +3069,7 @@ __metadata: languageName: node linkType: hard -"@rc-component/color-picker@npm:~1.4.1": +"@rc-component/color-picker@npm:~1.4.0": version: 1.4.1 resolution: "@rc-component/color-picker@npm:1.4.1" dependencies: @@ -3107,16 +3084,16 @@ __metadata: languageName: node linkType: hard -"@rc-component/context@npm:^1.4.0": - version: 1.4.0 - resolution: "@rc-component/context@npm:1.4.0" +"@rc-component/context@npm:^1.3.0": + version: 1.3.0 + resolution: "@rc-component/context@npm:1.3.0" dependencies: "@babel/runtime": ^7.10.1 rc-util: ^5.27.0 peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: 3771237de1e82a453cfff7b5f0ca0dcc370a2838be8ecbfe172c26dec2e94dc2354a8b3061deaff7e633e418fc1b70ce3d10d770603f12dc477fe03f2ada7059 + checksum: 77cdd49a2dfde3b2d82ff8652581eddeceefb53c0f3f31b9ed6b09356291821d4e16e915c07a1e15a38ceb6087fb92e7c2cb8ddb26d304fafd96c8571c9136ce languageName: node linkType: hard @@ -3129,9 +3106,9 @@ __metadata: languageName: node linkType: hard -"@rc-component/mutate-observer@npm:^1.1.0": - version: 1.1.0 - resolution: "@rc-component/mutate-observer@npm:1.1.0" +"@rc-component/mutate-observer@npm:^1.0.0": + version: 1.0.0 + resolution: "@rc-component/mutate-observer@npm:1.0.0" dependencies: "@babel/runtime": ^7.18.0 classnames: ^2.3.2 @@ -3139,7 +3116,7 @@ __metadata: peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: ffd79ad54b1f4dd02a94306373d3ebe408d5348156ac7908a86937f58c169f2fd42457461a5dc27bb874b9af5c2c196dc11a18db6bb6a5ff514cfd6bc1a3bb6a + checksum: fd6d9581882cca35582e399bf5585e237748fc8240a2d76549ed003ea17fdf7ca97609cb6c8113c2836e9d3182fceda2c1469620560168eeb66fc95656f495e7 languageName: node linkType: hard @@ -3171,9 +3148,9 @@ __metadata: languageName: node linkType: hard -"@rc-component/tour@npm:~1.10.0": - version: 1.10.0 - resolution: "@rc-component/tour@npm:1.10.0" +"@rc-component/tour@npm:~1.8.0": + version: 1.8.0 + resolution: "@rc-component/tour@npm:1.8.0" dependencies: "@babel/runtime": ^7.18.0 "@rc-component/portal": ^1.0.0-9 @@ -3183,28 +3160,11 @@ __metadata: peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: d586ca2e02d85c346640ddb228b60ddae94790973b030a85297aeef1e10e8e4ce1bef9d65f66098de59cafdacff5c04ad390528099d2b23fab449813696ba089 + checksum: 58fa0e23b84e581298c0d4f5e0ac3a30eddb6c101a9d3405a3189a20c787254b7f416ecff0e383ffded554ad93f8f732052623c6eaf59f5270f51bd0c4782058 languageName: node linkType: hard -"@rc-component/trigger@npm:^1.17.0, @rc-component/trigger@npm:^1.18.0": - version: 1.18.0 - resolution: "@rc-component/trigger@npm:1.18.0" - dependencies: - "@babel/runtime": ^7.23.2 - "@rc-component/portal": ^1.1.0 - classnames: ^2.3.2 - rc-motion: ^2.0.0 - rc-resize-observer: ^1.3.1 - rc-util: ^5.38.0 - peerDependencies: - react: ">=16.9.0" - react-dom: ">=16.9.0" - checksum: 8d4daf32aaea36f083a57aa40a4cab0224d0603ac3327675d6dcee861f5ac897f20dc406dc7a89181c81399ea44a0a14bbb52365045dca2eaced09fc70a8185e - languageName: node - linkType: hard - -"@rc-component/trigger@npm:^1.3.6, @rc-component/trigger@npm:^1.5.0, @rc-component/trigger@npm:^1.7.0": +"@rc-component/trigger@npm:^1.0.4, @rc-component/trigger@npm:^1.13.0, @rc-component/trigger@npm:^1.3.6, @rc-component/trigger@npm:^1.5.0, @rc-component/trigger@npm:^1.6.2, @rc-component/trigger@npm:^1.7.0": version: 1.14.3 resolution: "@rc-component/trigger@npm:1.14.3" dependencies: @@ -5135,62 +5095,62 @@ __metadata: languageName: node linkType: hard -"antd@npm:5.10.3": - version: 5.10.3 - resolution: "antd@npm:5.10.3" +"antd@npm:5.7.2": + version: 5.7.2 + resolution: "antd@npm:5.7.2" dependencies: "@ant-design/colors": ^7.0.0 - "@ant-design/cssinjs": ^1.17.2 - "@ant-design/icons": ^5.2.6 - "@ant-design/react-slick": ~1.0.2 + "@ant-design/cssinjs": ^1.10.1 + "@ant-design/icons": ^5.1.0 + "@ant-design/react-slick": ~1.0.0 "@babel/runtime": ^7.18.3 - "@ctrl/tinycolor": ^3.6.1 - "@rc-component/color-picker": ~1.4.1 - "@rc-component/mutate-observer": ^1.1.0 - "@rc-component/tour": ~1.10.0 - "@rc-component/trigger": ^1.18.0 + "@ctrl/tinycolor": ^3.6.0 + "@rc-component/color-picker": ~1.4.0 + "@rc-component/mutate-observer": ^1.0.0 + "@rc-component/tour": ~1.8.0 + "@rc-component/trigger": ^1.13.0 classnames: ^2.2.6 copy-to-clipboard: ^3.2.0 dayjs: ^1.11.1 qrcode.react: ^3.1.0 - rc-cascader: ~3.18.1 + rc-cascader: ~3.12.0 rc-checkbox: ~3.1.0 - rc-collapse: ~3.7.1 - rc-dialog: ~9.3.4 - rc-drawer: ~6.5.2 + rc-collapse: ~3.7.0 + rc-dialog: ~9.1.0 + rc-drawer: ~6.2.0 rc-dropdown: ~4.1.0 - rc-field-form: ~1.39.0 - rc-image: ~7.3.1 - rc-input: ~1.2.1 - rc-input-number: ~8.1.0 - rc-mentions: ~2.8.0 - rc-menu: ~9.12.2 - rc-motion: ^2.9.0 - rc-notification: ~5.3.0 - rc-pagination: ~3.6.1 - rc-picker: ~3.14.6 - rc-progress: ~3.5.1 + rc-field-form: ~1.34.0 + rc-image: ~7.0.0 + rc-input: ~1.1.0 + rc-input-number: ~8.0.2 + rc-mentions: ~2.5.0 + rc-menu: ~9.10.0 + rc-motion: ^2.7.3 + rc-notification: ~5.0.4 + rc-pagination: ~3.5.0 + rc-picker: ~3.10.0 + rc-progress: ~3.4.1 rc-rate: ~2.12.0 - rc-resize-observer: ^1.4.0 - rc-segmented: ~2.2.2 - rc-select: ~14.9.2 - rc-slider: ~10.3.1 + rc-resize-observer: ^1.2.0 + rc-segmented: ~2.2.0 + rc-select: ~14.5.0 + rc-slider: ~10.1.0 rc-steps: ~6.0.1 rc-switch: ~4.1.0 - rc-table: ~7.34.4 - rc-tabs: ~12.12.1 - rc-textarea: ~1.4.0 - rc-tooltip: ~6.1.2 - rc-tree: ~5.7.12 - rc-tree-select: ~5.13.0 - rc-upload: ~4.3.5 - rc-util: ^5.38.0 + rc-table: ~7.32.1 + rc-tabs: ~12.9.0 + rc-textarea: ~1.3.2 + rc-tooltip: ~6.0.0 + rc-tree: ~5.7.6 + rc-tree-select: ~5.9.0 + rc-upload: ~4.3.0 + rc-util: ^5.32.0 scroll-into-view-if-needed: ^3.0.3 throttle-debounce: ^5.0.0 peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: de3aaa1f3441e478c38e8ec398ff0e86101362e85e64455f20a19188f1a462622e4fb86d251d7f701883e838bed8babd6162d1064cfc4d4e5f81bd39c60e1685 + checksum: 38565a6443bf9b801da8c5e9cbaae5b4856aee1e5948e3c0e6ef6948cd0eaaed0f0261724c22e73ec0fc21342585f6f986031bf16e406da847fe0aea69f9ff70 languageName: node linkType: hard @@ -12055,7 +12015,7 @@ __metadata: agora-rtc-sdk-ng: ^4.19.0 agora-rtm-sdk: ^1.5.1 ali-oss: ^6.17.1 - antd: 5.10.3 + antd: 5.7.2 antd-img-crop: ^4.12.2 axios: ^0.21.1 buffer: ^6.0.3 @@ -14324,20 +14284,20 @@ __metadata: languageName: node linkType: hard -"rc-cascader@npm:~3.18.1": - version: 3.18.1 - resolution: "rc-cascader@npm:3.18.1" +"rc-cascader@npm:~3.12.0": + version: 3.12.1 + resolution: "rc-cascader@npm:3.12.1" dependencies: "@babel/runtime": ^7.12.5 array-tree-filter: ^2.1.0 classnames: ^2.3.1 - rc-select: ~14.9.0 + rc-select: ~14.5.0 rc-tree: ~5.7.0 - rc-util: ^5.35.0 + rc-util: ^5.6.1 peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: 4a3ecee7385a8814b1a78c1e8921dd3194f052352a2d08d0c931f3edd83ee3ae4864eb535f9dd243dd9699e601372309ea5fb64c715d1c79231e309da703abf0 + checksum: 11fddad49d7c6dcd06f7875b34fb40d798d912e2280e75e4f89777ade05d8a162f2c8f81e447dec44b327603e92f15c93b5c1a7489353732ca37f4c020d45624 languageName: node linkType: hard @@ -14402,9 +14362,9 @@ __metadata: languageName: node linkType: hard -"rc-collapse@npm:~3.7.1": - version: 3.7.1 - resolution: "rc-collapse@npm:3.7.1" +"rc-collapse@npm:~3.7.0": + version: 3.7.0 + resolution: "rc-collapse@npm:3.7.0" dependencies: "@babel/runtime": ^7.10.1 classnames: 2.x @@ -14413,7 +14373,7 @@ __metadata: peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: 8256ecff54d9a54f2abe0cce71ca52cce27522ec24ee3e87a5796e29ed18fd92008d2353a9797f034f5e5af060609b8c0cff2f9a92966d62ff0095d501687607 + checksum: f3f6dc1724c763f2e89ac8f1a853f8d80bc32731ad266c1092167cf9af3eb7e32a4d6b113c54366716f3e63f14eb511be77d9192103dec9d95c021b813f26203 languageName: node linkType: hard @@ -14433,9 +14393,9 @@ __metadata: languageName: node linkType: hard -"rc-dialog@npm:~9.3.4": - version: 9.3.4 - resolution: "rc-dialog@npm:9.3.4" +"rc-dialog@npm:~9.1.0": + version: 9.1.0 + resolution: "rc-dialog@npm:9.1.0" dependencies: "@babel/runtime": ^7.10.1 "@rc-component/portal": ^1.0.0-8 @@ -14445,7 +14405,7 @@ __metadata: peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: 75d689d281ae3a1a85faa2f87c95ac65995ed58f696898edbe89a79604e18213565edc1d21291c9a640379fa6705c19ec51ba9275d69cde877d21f5108eb3503 + checksum: 59d2504301a813022b9782e808e61e4e6a55d746a5608d9927b8f6cf4806dd694df7812678f56174419cccb5273d5e302c3178d31a6c5871aa97be5fd086267c languageName: node linkType: hard @@ -14465,19 +14425,19 @@ __metadata: languageName: node linkType: hard -"rc-drawer@npm:~6.5.2": - version: 6.5.2 - resolution: "rc-drawer@npm:6.5.2" +"rc-drawer@npm:~6.2.0": + version: 6.2.0 + resolution: "rc-drawer@npm:6.2.0" dependencies: "@babel/runtime": ^7.10.1 "@rc-component/portal": ^1.1.1 classnames: ^2.2.6 rc-motion: ^2.6.1 - rc-util: ^5.36.0 + rc-util: ^5.21.2 peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: e96908f641ea0a4b26e7142a932cefe60ee34c03c6c569a6070af770b0be8a883e89521217d8391957254b0ed88b4ac1735129c9e062528db0751bfd0222a0c1 + checksum: b006caa2036bb84760f447de193841de00a0867e32971349d210b6e1c97f7cf61b2dba05a467f03d55bba592d153b688e882adb4af20daa5271b9286f313fbc0 languageName: node linkType: hard @@ -14525,9 +14485,9 @@ __metadata: languageName: node linkType: hard -"rc-field-form@npm:~1.39.0": - version: 1.39.0 - resolution: "rc-field-form@npm:1.39.0" +"rc-field-form@npm:~1.34.0": + version: 1.34.2 + resolution: "rc-field-form@npm:1.34.2" dependencies: "@babel/runtime": ^7.18.0 async-validator: ^4.1.0 @@ -14535,7 +14495,7 @@ __metadata: peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: 26ccb14ea49c60a7e70134d50d68da59400deb6f04ac73a7878c420091f52e61c2069580837e73970075c459ebf79cdd958805bdaa6fa0f75c745eb1d93a2e8a + checksum: 50535a06fa3f3fa428ab142e4722e6c567a30202c7fec0a7e63685ba1cc356c3159721902aa2fdeb563e9153faa9d1b515624da4d0c5ba4cf93cf6249a763521 languageName: node linkType: hard @@ -14556,20 +14516,20 @@ __metadata: languageName: node linkType: hard -"rc-image@npm:~7.3.1": - version: 7.3.2 - resolution: "rc-image@npm:7.3.2" +"rc-image@npm:~7.0.0": + version: 7.0.0 + resolution: "rc-image@npm:7.0.0" dependencies: "@babel/runtime": ^7.11.2 "@rc-component/portal": ^1.0.2 classnames: ^2.2.6 - rc-dialog: ~9.3.4 + rc-dialog: ~9.1.0 rc-motion: ^2.6.2 rc-util: ^5.34.1 peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: d6447b31a92b9c5bb303bfafef4938546a28402ef3c35c3a00c53962ae7a4aa430be91211de1e3c2440f88bbe2a94b1efcae99adf239f2764e3e7dc391767e2b + checksum: e45be52d57481b290501d97dc8fe76a5541564e92a183c087956f09b39b0f4cd21aabad668e8df1ab3a263c009f7d02f91be333e4b153190b95d4dd6c5a08f44 languageName: node linkType: hard @@ -14587,19 +14547,19 @@ __metadata: languageName: node linkType: hard -"rc-input-number@npm:~8.1.0": - version: 8.1.0 - resolution: "rc-input-number@npm:8.1.0" +"rc-input-number@npm:~8.0.2": + version: 8.0.3 + resolution: "rc-input-number@npm:8.0.3" dependencies: "@babel/runtime": ^7.10.1 "@rc-component/mini-decimal": ^1.0.1 classnames: ^2.2.5 - rc-input: ~1.2.1 + rc-input: ~1.1.0 rc-util: ^5.28.0 peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: 2266cc4dbabe1f289bca9fdfeaaa024b76d24b22de944f8a7230c8da4f6c3573447f237a67866b8f0c37718a401c9902e91a8575c3cdbc55ad515a16e6e3d90a + checksum: d567919037db72dd2df04868ae909e1d74959e3956bded722931accefcdfa48d05946489dfd10e39f63599045cc89351108e7bbff869cc4415a53b6f06837d48 languageName: node linkType: hard @@ -14617,9 +14577,9 @@ __metadata: languageName: node linkType: hard -"rc-input@npm:~1.2.1": - version: 1.2.1 - resolution: "rc-input@npm:1.2.1" +"rc-input@npm:~1.1.0": + version: 1.1.0 + resolution: "rc-input@npm:1.1.0" dependencies: "@babel/runtime": ^7.11.1 classnames: ^2.2.1 @@ -14627,7 +14587,7 @@ __metadata: peerDependencies: react: ">=16.0.0" react-dom: ">=16.0.0" - checksum: ab83347620ef505e12e92ac2ea380ac5ad33e3d97a98f7cc2dd01c6eae228edd293b13df360bf7ac91962e09ba2355ffff962aa8eff6268dad4249e0f8b95cce + checksum: d3f7fc2c6dfe2cf1cec4cebe2c21614f306666f39fef798af4885b58f6ada8cead0a301c10e16940a37199a572420a5146c9ff4d67927da8a9e52ca53b09de04 languageName: node linkType: hard @@ -14648,30 +14608,30 @@ __metadata: languageName: node linkType: hard -"rc-mentions@npm:~2.8.0": - version: 2.8.0 - resolution: "rc-mentions@npm:2.8.0" +"rc-mentions@npm:~2.5.0": + version: 2.5.0 + resolution: "rc-mentions@npm:2.5.0" dependencies: "@babel/runtime": ^7.22.5 "@rc-component/trigger": ^1.5.0 classnames: ^2.2.6 - rc-input: ~1.2.1 - rc-menu: ~9.12.0 - rc-textarea: ~1.4.0 - rc-util: ^5.34.1 + rc-input: ~1.1.0 + rc-menu: ~9.10.0 + rc-textarea: ~1.3.0 + rc-util: ^5.22.5 peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: 74703e3763522768797eaa0f7c24efa449cf242db97f19b4fb516aff3191f012ac947cf597672bf53f8e39a63eed30b3dfcea324cb440a4f752cac6296a19c5f + checksum: 084236d5e58738acbc8ab3ccaa9c02daf6a6cda8040780a8c99cdebf9a7bec262df5a22732ce250d73263bc64c115f44bc8b5e11b0db4eb82c68f7cdcbb2ab9c languageName: node linkType: hard -"rc-menu@npm:~9.12.0, rc-menu@npm:~9.12.2": - version: 9.12.2 - resolution: "rc-menu@npm:9.12.2" +"rc-menu@npm:~9.10.0": + version: 9.10.0 + resolution: "rc-menu@npm:9.10.0" dependencies: "@babel/runtime": ^7.10.1 - "@rc-component/trigger": ^1.17.0 + "@rc-component/trigger": ^1.6.2 classnames: 2.x rc-motion: ^2.4.3 rc-overflow: ^1.3.1 @@ -14679,7 +14639,7 @@ __metadata: peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: 0db857a5e0819348f86a66a560e7bf0496a6e69ef88b96fe2fccd1616ff5989d20bb0c3d84bbec892483f9f29c9c210be1ead3b7f08c608dc7dce439b0637dd0 + checksum: 600f16a6d8b64ee90093786abdee3ad4663d4c4922ad7b568bc51dd9e5edbbd230ba93a8eae56d8d8ce070551ca12f3ae3c01d5e5b105a3d07a11245207fda6c languageName: node linkType: hard @@ -14700,7 +14660,7 @@ __metadata: languageName: node linkType: hard -"rc-motion@npm:^2.0.0, rc-motion@npm:^2.0.1, rc-motion@npm:^2.2.0, rc-motion@npm:^2.3.0, rc-motion@npm:^2.3.4, rc-motion@npm:^2.4.3, rc-motion@npm:^2.4.4, rc-motion@npm:^2.6.1, rc-motion@npm:^2.6.2": +"rc-motion@npm:^2.0.0, rc-motion@npm:^2.0.1, rc-motion@npm:^2.2.0, rc-motion@npm:^2.3.0, rc-motion@npm:^2.3.4, rc-motion@npm:^2.4.3, rc-motion@npm:^2.4.4, rc-motion@npm:^2.6.0, rc-motion@npm:^2.6.1, rc-motion@npm:^2.6.2, rc-motion@npm:^2.7.3": version: 2.7.3 resolution: "rc-motion@npm:2.7.3" dependencies: @@ -14714,20 +14674,6 @@ __metadata: languageName: node linkType: hard -"rc-motion@npm:^2.9.0": - version: 2.9.0 - resolution: "rc-motion@npm:2.9.0" - dependencies: - "@babel/runtime": ^7.11.1 - classnames: ^2.2.1 - rc-util: ^5.21.0 - peerDependencies: - react: ">=16.9.0" - react-dom: ">=16.9.0" - checksum: 6c7c211a62896a2c443c43f27d13ec84c832884ec1860a40025f6270321e4e8c8a7abaf99d60a09d6e5cadc112e3d9787e0c58970eb69b0bb798eaa6be81dcf5 - languageName: node - linkType: hard - "rc-notification@npm:~4.6.0": version: 4.6.1 resolution: "rc-notification@npm:4.6.1" @@ -14743,18 +14689,18 @@ __metadata: languageName: node linkType: hard -"rc-notification@npm:~5.3.0": - version: 5.3.0 - resolution: "rc-notification@npm:5.3.0" +"rc-notification@npm:~5.0.4": + version: 5.0.5 + resolution: "rc-notification@npm:5.0.5" dependencies: "@babel/runtime": ^7.10.1 classnames: 2.x - rc-motion: ^2.9.0 + rc-motion: ^2.6.0 rc-util: ^5.20.1 peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: 1e6bc146e687815d784e0b4c626a9af82435086bc02bb5e19827baa523e26440d6ed03b43de83a15e0272b83bebede3b67d61c4d4af2240ae7dcdd6604f0ef58 + checksum: 47aee7887dae4d943303803cb74a908411eabdfcfb5154c82f834e0a4f0b934d07b8933907e513787ffc98de5f66e71537820bc48fb6cf8a24870919e6548036 languageName: node linkType: hard @@ -14801,9 +14747,9 @@ __metadata: languageName: node linkType: hard -"rc-pagination@npm:~3.6.1": - version: 3.6.1 - resolution: "rc-pagination@npm:3.6.1" +"rc-pagination@npm:~3.5.0": + version: 3.5.0 + resolution: "rc-pagination@npm:3.5.0" dependencies: "@babel/runtime": ^7.10.1 classnames: ^2.2.1 @@ -14811,7 +14757,7 @@ __metadata: peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: 12389a94bf60048cd3d8e95c638170646b7405aa30f748b96baee8df7e24d00b9d5b3c75195e3ea7589d08b771f2661d48f2fe7784624e4bdf6b22c290ffef85 + checksum: 27ac05cdaf331ba571eb19fdaf79a2e3b6cb3575fce5f011f0de5abbe88db21a4292ef5323abab3a829ff6cda396444c664f88bd55226fa477f473282a8a868e languageName: node linkType: hard @@ -14834,9 +14780,9 @@ __metadata: languageName: node linkType: hard -"rc-picker@npm:~3.14.6": - version: 3.14.6 - resolution: "rc-picker@npm:3.14.6" +"rc-picker@npm:~3.10.0": + version: 3.10.0 + resolution: "rc-picker@npm:3.10.0" dependencies: "@babel/runtime": ^7.10.1 "@rc-component/trigger": ^1.5.0 @@ -14858,7 +14804,7 @@ __metadata: optional: true moment: optional: true - checksum: e87914c6ffbbcf760b56080d8bf504cf9323885378a6769abcf9a62bb1325f7a9d534c065a683ab1d30269a26a81ce11a008d01aacc800359e3c7a4fbda66e17 + checksum: 908df48acfff11d62a64b11f12ceda10f424b3483ea2926ca25d5477609f0416559826ede78f2a0604682cc0e28a8c0ffdd98ee802746b1bee0f5b9890699df4 languageName: node linkType: hard @@ -14876,20 +14822,6 @@ __metadata: languageName: node linkType: hard -"rc-progress@npm:~3.5.1": - version: 3.5.1 - resolution: "rc-progress@npm:3.5.1" - dependencies: - "@babel/runtime": ^7.10.1 - classnames: ^2.2.6 - rc-util: ^5.16.1 - peerDependencies: - react: ">=16.9.0" - react-dom: ">=16.9.0" - checksum: b0722a696396f985267e35e26f49c1c1bd6a17b4918eb93318fc36a7a5ffae9806932d4982a7da0d83349648ca85325b792003ec40240820fd6e00e0bc6f3c1d - languageName: node - linkType: hard - "rc-rate@npm:~2.12.0": version: 2.12.0 resolution: "rc-rate@npm:2.12.0" @@ -14933,21 +14865,6 @@ __metadata: languageName: node linkType: hard -"rc-resize-observer@npm:^1.4.0": - version: 1.4.0 - resolution: "rc-resize-observer@npm:1.4.0" - dependencies: - "@babel/runtime": ^7.20.7 - classnames: ^2.2.1 - rc-util: ^5.38.0 - resize-observer-polyfill: ^1.5.1 - peerDependencies: - react: ">=16.9.0" - react-dom: ">=16.9.0" - checksum: e6ee24fd887ea440b07e0326c3fc60b240274fa43ea87cf8f86ca9e0741a2c817e47a182f336b00d7246b4fd21b3536f4d3aacd7f0db5ae673f106630cd348ba - languageName: node - linkType: hard - "rc-segmented@npm:~2.1.0": version: 2.1.2 resolution: "rc-segmented@npm:2.1.2" @@ -14963,7 +14880,7 @@ __metadata: languageName: node linkType: hard -"rc-segmented@npm:~2.2.2": +"rc-segmented@npm:~2.2.0": version: 2.2.2 resolution: "rc-segmented@npm:2.2.2" dependencies: @@ -14996,21 +14913,21 @@ __metadata: languageName: node linkType: hard -"rc-select@npm:~14.9.0, rc-select@npm:~14.9.2": - version: 14.9.2 - resolution: "rc-select@npm:14.9.2" +"rc-select@npm:~14.5.0": + version: 14.5.2 + resolution: "rc-select@npm:14.5.2" dependencies: "@babel/runtime": ^7.10.1 "@rc-component/trigger": ^1.5.0 classnames: 2.x rc-motion: ^2.0.1 - rc-overflow: ^1.3.1 + rc-overflow: ^1.0.0 rc-util: ^5.16.1 rc-virtual-list: ^3.5.2 peerDependencies: react: "*" react-dom: "*" - checksum: 1d5738fbd963df170ffe5b3f37a7800340814d6bd7699601980816a9bd71985933188fc8940c82c564b46f7eca941759b814c08dced01187c3f4fb1f5dad2421 + checksum: d3f55543eae15ac9bf56019345ad94268f9e063ede38c3d8c46dc59b1bc47c0f4c724613a9e9a6f4dc0d5bc0e31c7f7029e6bef717b335432818fbeea0f7398f languageName: node linkType: hard @@ -15029,9 +14946,9 @@ __metadata: languageName: node linkType: hard -"rc-slider@npm:~10.3.1": - version: 10.3.1 - resolution: "rc-slider@npm:10.3.1" +"rc-slider@npm:~10.1.0": + version: 10.1.1 + resolution: "rc-slider@npm:10.1.1" dependencies: "@babel/runtime": ^7.10.1 classnames: ^2.2.5 @@ -15039,7 +14956,7 @@ __metadata: peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: 67998137031ab0551538ba7aa038863ccd07c876d268f2ab05e408298105ab4e6136a532c97296231e91c6791442c2f7a495d9a604440bddaa094e73336705f2 + checksum: 8df66142f1be00d31aaa45f3cf266fa30d03b70c74c734502389bbfacdb6741e149cd36dc1d3557d9dbb0194ed2733748366d888651d1120098338086419ba2c languageName: node linkType: hard @@ -15115,56 +15032,55 @@ __metadata: languageName: node linkType: hard -"rc-table@npm:~7.34.4": - version: 7.34.4 - resolution: "rc-table@npm:7.34.4" +"rc-table@npm:~7.32.1": + version: 7.32.1 + resolution: "rc-table@npm:7.32.1" dependencies: "@babel/runtime": ^7.10.1 - "@rc-component/context": ^1.4.0 + "@rc-component/context": ^1.3.0 classnames: ^2.2.5 rc-resize-observer: ^1.1.0 - rc-util: ^5.36.0 - rc-virtual-list: ^3.11.1 + rc-util: ^5.27.1 peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: 44f6d4f3d5418928708929c1eea28ad7eb6294e4f23611bb3d92609c1d76942733dcd8070fb6c417aaeb98ebf35afb9e168f6f4dc0e62c69fa226bbad58f0c34 + checksum: b2ecc2a11ceb4789414c3e49947508d570c163911d4c09926277b1c2973806bdc6932ca9652cf8098c1ad73657b6c6e412b002555d90f1bd9104d0cc570e09de languageName: node linkType: hard -"rc-tabs@npm:~12.12.1": - version: 12.12.1 - resolution: "rc-tabs@npm:12.12.1" +"rc-tabs@npm:~12.5.6": + version: 12.5.10 + resolution: "rc-tabs@npm:12.5.10" dependencies: "@babel/runtime": ^7.11.2 classnames: 2.x - rc-dropdown: ~4.1.0 - rc-menu: ~9.12.0 + rc-dropdown: ~4.0.0 + rc-menu: ~9.8.0 rc-motion: ^2.6.2 rc-resize-observer: ^1.0.0 - rc-util: ^5.34.1 + rc-util: ^5.16.0 peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: 4a0d1a83bb9d96d3ad9935ff63bfde782b02caa75fe0e81a2979afae85c70b99cebe9fbb4e7795656cb769ed5103d5a3079f305be6ea215aeb291c512f668e34 + checksum: 0b26b61ce96f525c2d4c74b89561997176b8673c842d28f542cbc056cc26ee16953ea34d9a591b599872717a342ffbdded4e6115d95bcfe1ec594048fe669d31 languageName: node linkType: hard -"rc-tabs@npm:~12.5.6": - version: 12.5.10 - resolution: "rc-tabs@npm:12.5.10" +"rc-tabs@npm:~12.9.0": + version: 12.9.0 + resolution: "rc-tabs@npm:12.9.0" dependencies: "@babel/runtime": ^7.11.2 classnames: 2.x - rc-dropdown: ~4.0.0 - rc-menu: ~9.8.0 + rc-dropdown: ~4.1.0 + rc-menu: ~9.10.0 rc-motion: ^2.6.2 rc-resize-observer: ^1.0.0 rc-util: ^5.16.0 peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: 0b26b61ce96f525c2d4c74b89561997176b8673c842d28f542cbc056cc26ee16953ea34d9a591b599872717a342ffbdded4e6115d95bcfe1ec594048fe669d31 + checksum: a8ab132f3e2f5dfc933e6942962ea3c13a0aa9b88c498d9183901f0124c92d60692fe5e9ee34bfa67dfce3b8ee426d999f9dd465617fde755a27dfbdd6fcd134 languageName: node linkType: hard @@ -15184,19 +15100,19 @@ __metadata: languageName: node linkType: hard -"rc-textarea@npm:~1.4.0": - version: 1.4.0 - resolution: "rc-textarea@npm:1.4.0" +"rc-textarea@npm:~1.3.0, rc-textarea@npm:~1.3.2": + version: 1.3.3 + resolution: "rc-textarea@npm:1.3.3" dependencies: "@babel/runtime": ^7.10.1 classnames: ^2.2.1 - rc-input: ~1.2.1 + rc-input: ~1.1.0 rc-resize-observer: ^1.0.0 rc-util: ^5.27.0 peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: 3aa6b6f8c3ab846f3c0e21087a096028fbbb7d0c5b19b210f7dfea787c25eab31e926edff8ba9ce02eb684e12a39c90d97495a1a9e247ec69ab9daa41df6c978 + checksum: b91a691f63093195f63190258a705ce2464bb3ac22a81d6c4248b888044754e55efdbbe9c3d01bd4ae397731d21fb4ee8c7f07017719195b15dc3a655faea5b7 languageName: node linkType: hard @@ -15214,49 +15130,49 @@ __metadata: languageName: node linkType: hard -"rc-tooltip@npm:~6.1.2": - version: 6.1.2 - resolution: "rc-tooltip@npm:6.1.2" +"rc-tooltip@npm:~6.0.0": + version: 6.0.1 + resolution: "rc-tooltip@npm:6.0.1" dependencies: "@babel/runtime": ^7.11.2 - "@rc-component/trigger": ^1.18.0 + "@rc-component/trigger": ^1.0.4 classnames: ^2.3.1 peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: 0450fe0bac954fe13cc1117cef1e632ec65e5fbb7bc9d31069925e7df026ff39211cad95509ec93500541bf55e70efaf0ee99694fdd18deac7e804b1b3f72240 + checksum: fe7f617a4f4e0085d8f5eb5e8da5598f0164841c841f62f77966706ae604491246441a469aeb44f1dec7001bb4716ee81d11ec646e8889f4164fcba3a024eea5 languageName: node linkType: hard -"rc-tree-select@npm:~5.13.0": - version: 5.13.0 - resolution: "rc-tree-select@npm:5.13.0" +"rc-tree-select@npm:~5.5.0": + version: 5.5.5 + resolution: "rc-tree-select@npm:5.5.5" dependencies: "@babel/runtime": ^7.10.1 classnames: 2.x - rc-select: ~14.9.0 + rc-select: ~14.1.0 rc-tree: ~5.7.0 rc-util: ^5.16.1 peerDependencies: react: "*" react-dom: "*" - checksum: 0fa16bb69c411197e3c1fea125132949576ff42ad4f0c1f22c89ff055665fcf9e436b10934a916e940d64a68397c2a011343ec9358b7b266d4585919a47ded36 + checksum: 6d7de4d9b80583b3bd39be0c8bad5138a62770805048da9fd177eb3f21acc7d02cd68ea64d9ca3accf8bfefa41b0db84c1ac50a3637c7b3c97060d7d3e9d60e5 languageName: node linkType: hard -"rc-tree-select@npm:~5.5.0": - version: 5.5.5 - resolution: "rc-tree-select@npm:5.5.5" +"rc-tree-select@npm:~5.9.0": + version: 5.9.0 + resolution: "rc-tree-select@npm:5.9.0" dependencies: "@babel/runtime": ^7.10.1 classnames: 2.x - rc-select: ~14.1.0 + rc-select: ~14.5.0 rc-tree: ~5.7.0 rc-util: ^5.16.1 peerDependencies: react: "*" react-dom: "*" - checksum: 6d7de4d9b80583b3bd39be0c8bad5138a62770805048da9fd177eb3f21acc7d02cd68ea64d9ca3accf8bfefa41b0db84c1ac50a3637c7b3c97060d7d3e9d60e5 + checksum: 35114024de35c59b2b56df77aa5b1ad6d262ae6ac5a02b68a425af598420e98d08a12dfa64f68578d4293166032239647d5c03a9c089aef49b33b5cfc4be9306 languageName: node linkType: hard @@ -15276,9 +15192,9 @@ __metadata: languageName: node linkType: hard -"rc-tree@npm:~5.7.12": - version: 5.7.12 - resolution: "rc-tree@npm:5.7.12" +"rc-tree@npm:~5.7.6": + version: 5.7.9 + resolution: "rc-tree@npm:5.7.9" dependencies: "@babel/runtime": ^7.10.1 classnames: 2.x @@ -15288,7 +15204,7 @@ __metadata: peerDependencies: react: "*" react-dom: "*" - checksum: 107a85407c774616cd06bc54164f3413d4e85fbe0909efee16d6bf45486ee624ba67ff07e523c25249724d6be99ec155a2503d89e14d5b3ed28acf06b4cdabab + checksum: ece66a1c56883da5a3412d524e2fb66e3ddb7c463a0d91e15062f023e590bf738431d70a8697d6799db758cf2f9752c875b89d7d60d5903ab41a5d4185a6600b languageName: node linkType: hard @@ -15322,20 +15238,6 @@ __metadata: languageName: node linkType: hard -"rc-upload@npm:~4.3.5": - version: 4.3.5 - resolution: "rc-upload@npm:4.3.5" - dependencies: - "@babel/runtime": ^7.18.3 - classnames: ^2.2.5 - rc-util: ^5.2.0 - peerDependencies: - react: ">=16.9.0" - react-dom: ">=16.9.0" - checksum: 00758b3f34d5850a37cba8e1b4d7c5e2e60c8bd21e44b42c4ac2fe5f641575464e4209d7b9bdbdab70e46ff55705f5be71b1df7f13bbe15fd5950e895474c0cd - languageName: node - linkType: hard - "rc-util@npm:^5.0.1, rc-util@npm:^5.0.6, rc-util@npm:^5.15.0, rc-util@npm:^5.16.0, rc-util@npm:^5.16.1, rc-util@npm:^5.17.0, rc-util@npm:^5.18.1, rc-util@npm:^5.19.2, rc-util@npm:^5.2.0, rc-util@npm:^5.2.1, rc-util@npm:^5.20.1, rc-util@npm:^5.21.0, rc-util@npm:^5.21.2, rc-util@npm:^5.22.5, rc-util@npm:^5.23.0, rc-util@npm:^5.24.4, rc-util@npm:^5.25.2, rc-util@npm:^5.26.0, rc-util@npm:^5.27.0, rc-util@npm:^5.30.0, rc-util@npm:^5.4.0, rc-util@npm:^5.6.1, rc-util@npm:^5.8.0, rc-util@npm:^5.9.4": version: 5.32.2 resolution: "rc-util@npm:5.32.2" @@ -15349,7 +15251,7 @@ __metadata: languageName: node linkType: hard -"rc-util@npm:^5.28.0, rc-util@npm:^5.31.1, rc-util@npm:^5.32.2, rc-util@npm:^5.33.0, rc-util@npm:^5.34.1": +"rc-util@npm:^5.27.1, rc-util@npm:^5.28.0, rc-util@npm:^5.31.1, rc-util@npm:^5.32.0, rc-util@npm:^5.32.2, rc-util@npm:^5.33.0, rc-util@npm:^5.34.1": version: 5.34.1 resolution: "rc-util@npm:5.34.1" dependencies: @@ -15362,34 +15264,6 @@ __metadata: languageName: node linkType: hard -"rc-util@npm:^5.35.0, rc-util@npm:^5.36.0, rc-util@npm:^5.38.0": - version: 5.38.0 - resolution: "rc-util@npm:5.38.0" - dependencies: - "@babel/runtime": ^7.18.3 - react-is: ^18.2.0 - peerDependencies: - react: ">=16.9.0" - react-dom: ">=16.9.0" - checksum: 97a3e1dd94e199c12e69eed1f69e9a9be39b383f2b0d9e1d52d6fcdf676e91e6499fa7be4c48f37b08b6500747f2dc41014f9be54351a39f23b3b5087360690c - languageName: node - linkType: hard - -"rc-virtual-list@npm:^3.11.1": - version: 3.11.2 - resolution: "rc-virtual-list@npm:3.11.2" - dependencies: - "@babel/runtime": ^7.20.0 - classnames: ^2.2.6 - rc-resize-observer: ^1.0.0 - rc-util: ^5.36.0 - peerDependencies: - react: "*" - react-dom: "*" - checksum: b642e55ca2c4b56fb2048b5151a17e2f0f1c15cf3f4d8a26a4f1f370c95a6f4476743886b6633f083f107c82fbe86c5548bbf37b7e2f8b79615d90b62777824e - languageName: node - linkType: hard - "rc-virtual-list@npm:^3.2.0, rc-virtual-list@npm:^3.5.1": version: 3.5.2 resolution: "rc-virtual-list@npm:3.5.2" @@ -16097,13 +15971,6 @@ __metadata: languageName: node linkType: hard -"regenerator-runtime@npm:^0.14.0": - version: 0.14.0 - resolution: "regenerator-runtime@npm:0.14.0" - checksum: 1c977ad82a82a4412e4f639d65d22be376d3ebdd30da2c003eeafdaaacd03fc00c2320f18120007ee700900979284fc78a9f00da7fb593f6e6eeebc673fba9a3 - languageName: node - linkType: hard - "regenerator-transform@npm:^0.15.1": version: 0.15.1 resolution: "regenerator-transform@npm:0.15.1"