Merge branch 'dev' into plugin-duckdb

Author: yharby

client/packages/lowcoder-comps/src/comps/calendarComp/calendarComp.tsx

@@ -31,6 +31,7 @@ import {
   StringControl,
   hiddenPropertyView,
   ChangeEventHandlerControl,
+  DragEventHandlerControl,
   Section,
   sectionNames,
   dropdownControl,
@@ -74,6 +75,7 @@ const childrenMap = {
   resources: jsonValueExposingStateControl("resources", resourcesDefaultData),
   resourceName: withDefault(StringControl, trans("calendar.resourcesDefault")),
   onEvent: ChangeEventHandlerControl,
+  onDropEvent: DragEventHandlerControl,
   editable: withDefault(BoolControl, true),
   showEventTime: withDefault(BoolControl, true),
   showWeekends: withDefault(BoolControl, true),
@@ -95,6 +97,7 @@ let CalendarBasicComp = (function () {
     resources: any; 
     resourceName : string
     onEvent?: any;
+    onEventDrop?: any;
     editable?: boolean; 
     showEventTime?: boolean; 
     showWeekends?: boolean; 
@@ -521,6 +524,11 @@ let CalendarBasicComp = (function () {
                 props.onEvent("change");
               }
             }}
+            eventDragStop={(info) => {
+              if (info.view) {
+                props.onEventDrop("dropEvent");
+              }
+            }}
           />
         </ErrorBoundary>
       </Wrapper>
@@ -533,6 +541,7 @@ let CalendarBasicComp = (function () {
       resources: { propertyView: (arg0: {}) => any; };
       resourceName: { propertyView: (arg0: {}) => any; };
       onEvent: { getPropertyView: () => any; }; 
+      onDropEvent: { getPropertyView: () => any; };
       editable: { propertyView: (arg0: { label: string; }) => any; };
       showEventTime: { propertyView: (arg0: { label: string; tooltip: string; }) => any; }; 
       showWeekends: { propertyView: (arg0: { label: string; }) => any; }; 
@@ -565,6 +574,7 @@ let CalendarBasicComp = (function () {
           <Section name={sectionNames.interaction}>
             {hiddenPropertyView(children)}
             {children.onEvent.getPropertyView()}
+            {children.onDropEvent.getPropertyView()}
             {children.editable.propertyView({ label: trans("calendar.editable"), })}
           </Section>
           <Section name={sectionNames.advanced}>

client/packages/lowcoder-sdk/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lowcoder-sdk",
-  "version": "2.4.0-beta-2",
+  "version": "2.4.0-beta-4",
   "type": "module",
   "files": [
     "src",

client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx

@@ -17,6 +17,7 @@ import { PositionControl } from "comps/controls/dropdownControl";
 import {
   closeEvent,
   eventHandlerControl,
+  MeetingEventHandlerControl,
 } from "comps/controls/eventHandlerControl";
 import { styleControl } from "comps/controls/styleControl";
 import { DrawerStyle } from "comps/controls/styleControlConstants";
@@ -226,6 +227,7 @@ const rtmInit = async (appId: any, uid: any, token: any, channel: any) => {
 const meetingControllerChildren = {
   visible: withDefault(BooleanStateControl, "false"),
   onEvent: eventHandlerControl(EventOptions),
+  onMeetingEvent: MeetingEventHandlerControl,
   width: StringControl,
   height: StringControl,
   autoHeight: AutoHeightControl,
@@ -589,6 +591,7 @@ let MTComp = (function () {
             </Section>
             <Section name={sectionNames.interaction}>
               {children.onEvent.getPropertyView()}
+              {children.onMeetingEvent.getPropertyView()}
             </Section>
           </>
         )}