Merge branch 'dev' into sso-scim-integration

Author: Sanjai1994

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

@@ -75,6 +75,7 @@ BarChartTmpComp = withViewFn(BarChartTmpComp, (comp) => {
     log.error('theme chart error: ', error);
   }
 
+
   // Detect race mode changes and force chart recreation
   const currentRaceMode = comp.children.chartConfig?.children?.comp?.children?.race?.getView();
   useEffect(() => {
@@ -172,7 +173,6 @@ BarChartTmpComp = withViewFn(BarChartTmpComp, (comp) => {
   useResizeDetector({
     targetRef: containerRef,
     onResize: ({width, height}) => {
-      console.log('barChart - resize');
       if (width && height) {
         setChartSize({ w: width, h: height });
       }
@@ -194,6 +194,7 @@ BarChartTmpComp = withViewFn(BarChartTmpComp, (comp) => {
         notMerge={!currentRaceMode}
         lazyUpdate={!currentRaceMode}
         opts={{ locale: getEchartsLocale() }}
+        theme={themeConfig}
         option={option}
         mode={mode}
       />

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

@@ -174,6 +174,7 @@ LineChartTmpComp = withViewFn(LineChartTmpComp, (comp) => {
         notMerge
         lazyUpdate
         opts={{ locale: getEchartsLocale() }}
+        theme={themeConfig}
         option={option}
         mode={mode}
       />

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

@@ -194,6 +194,7 @@ PieChartTmpComp = withViewFn(PieChartTmpComp, (comp) => {
         notMerge
         lazyUpdate
         opts={{ locale: getEchartsLocale() }}
+        theme={themeConfig}
         option={option}
         mode={mode}
       />
@@ -302,7 +303,7 @@ let PieChartComp = withExposingConfigs(PieChartTmpComp, [
 
 
 export const PieChartCompWithDefault = withDefault(PieChartComp, {
-  xAxisKey: "date",
+  xAxisKey: "name",
   series: [
     {
       dataIndex: genRandomKey(),

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

@@ -175,6 +175,7 @@ ScatterChartTmpComp = withViewFn(ScatterChartTmpComp, (comp) => {
         notMerge
         lazyUpdate
         opts={{ locale: getEchartsLocale() }}
+        theme={themeConfig}
         option={option}
         mode={mode}
       />

client/packages/lowcoder-design/src/components/Dropdown.tsx

@@ -159,16 +159,6 @@ export function Dropdown<T extends OptionsType>(props: DropdownProps<T>) {
   const { placement = "right" } = props;
   const valueInfoMap = _.fromPairs(props.options.map((option) => [option.value, option]));
 
-  useEffect(() => {
-    const dropdownElems = document.querySelectorAll<HTMLElement>("div.ant-dropdown ul.ant-dropdown-menu");
-    for (let index = 0; index < dropdownElems.length; index++) {
-      const element = dropdownElems[index];
-      element.style.maxHeight = "300px";
-      element.style.overflowY = "scroll";
-      element.style.minWidth = "150px";
-      element.style.paddingRight = "10px";
-    }
-  }, []);
 
   return (
     <FlexDiv style={props.style} className={props.className}>

client/packages/lowcoder/src/components/table/EditableCell.tsx

@@ -225,7 +225,6 @@ function EditableCellComp<T extends JSONValue>(props: EditableCellProps<T>) {
           key={`normal-view-${cellIndex}`}
           tabIndex={editable ? 0 : -1 }
           onFocus={enterEditFn}
-          style={{ width: '100%', height: '100%'}}
         >
           {normalView}
         </div>

client/packages/lowcoder/src/comps/comps/buttonComp/scannerComp.tsx

@@ -30,7 +30,7 @@ import React, {
   useState,
   useContext,
 } from "react";
-import { arrayStringExposingStateControl } from "comps/controls/codeStateControl";
+import { arrayStringExposingStateControl, stringExposingStateControl } from "comps/controls/codeStateControl";
 import { BoolControl } from "comps/controls/boolControl";
 import { RefControl } from "comps/controls/refControl";
 import { EditorContext } from "comps/editorState";
@@ -120,6 +120,7 @@ const BarcodeScannerComponent = React.lazy(
 const ScannerTmpComp = (function () {
   const childrenMap = {
     data: arrayStringExposingStateControl("data"),
+    value: stringExposingStateControl("value"),
     text: withDefault(StringControl, trans("scanner.text")),
     continuous: BoolControl,
     uniqueData: withDefault(BoolControl, true),
@@ -150,17 +151,27 @@ const ScannerTmpComp = (function () {
     }, [success, showModal]);
 
     const continuousValue = useRef<string[]>([]);
+    const seenSetRef = useRef<Set<string>>(new Set());
 
     const handleUpdate = (err: any, result: any) => {
       if (result) {
         if (props.continuous) {
-          continuousValue.current = [...continuousValue.current, result.text];
+          const scannedText: string = result.text;
+          if (props.uniqueData && seenSetRef.current.has(scannedText)) {
+            return;
+          }
+          continuousValue.current = [...continuousValue.current, scannedText];
+          if (props.uniqueData) {
+            seenSetRef.current.add(scannedText);
+          }
           const val = props.uniqueData
             ? [...new Set(continuousValue.current)]
             : continuousValue.current;
+          props.value.onChange(scannedText);
           props.data.onChange(val);
           props.onEvent("success");
         } else {
+          props.value.onChange(result.text);
           props.data.onChange([result.text]);
           setShowModal(false);
           setSuccess(true);
@@ -205,6 +216,7 @@ const ScannerTmpComp = (function () {
             props.onEvent("click");
             setShowModal(true);
             continuousValue.current = [];
+            seenSetRef.current = new Set();
           }}
         >
           <span>{props.text}</span>
@@ -317,6 +329,7 @@ const ScannerTmpComp = (function () {
 
 export const ScannerComp = withExposingConfigs(ScannerTmpComp, [
   new NameConfig("data", trans("data")),
+  new NameConfig("value", trans("value")),
   new NameConfig("text", trans("button.textDesc")),
   ...CommonNameConfig,
 ]);

client/packages/lowcoder/src/comps/comps/formComp/formComp.tsx

@@ -390,15 +390,24 @@ let FormTmpComp = class extends FormBaseComp implements IForm {
         if (ret.children.initialData !== this.children.initialData) {
           // FIXME: kill setTimeout ?
           setTimeout(() => {
-            this.dispatch(
-              customAction<SetDataAction>(
-                {
-                  type: "setData",
-                  initialData: (action.value["initialData"] as ValueAndMsg<JSONObject>).value || {},
-                },
-                false
-              )
-            );
+            const newInitialData = (action.value["initialData"] as ValueAndMsg<JSONObject>)
+              .value;
+            // only setData when initialData has explicit keys.
+            if (
+              newInitialData &&
+              typeof newInitialData === "object" &&
+              Object.keys(newInitialData).length > 0
+            ) {
+              this.dispatch(
+                customAction<SetDataAction>(
+                  {
+                    type: "setData",
+                    initialData: newInitialData,
+                  },
+                  false
+                )
+              );
+            }
           }, 1000);
         }
         return ret;

client/packages/lowcoder/src/comps/comps/jsonComp/jsonLottieComp.tsx

@@ -10,7 +10,7 @@ import { styleControl } from "comps/controls/styleControl";
 import { AnimationStyle, LottieStyle } from "comps/controls/styleControlConstants";
 import { trans } from "i18n";
 import { Section, sectionNames } from "lowcoder-design";
-import { useContext, lazy, useEffect, useState } from "react";  
+import { useContext, lazy, useEffect, useState, useCallback } from "react";  
 import { stateComp, UICompBuilder, withDefault } from "../../generators";
 import {
   NameConfig,
@@ -23,9 +23,10 @@ import { AssetType, IconscoutControl } from "@lowcoder-ee/comps/controls/iconsco
 import { DotLottie } from "@lottiefiles/dotlottie-react";
 import { AutoHeightControl } from "@lowcoder-ee/comps/controls/autoHeightControl";
 import { useResizeDetector } from "react-resize-detector";
-import { eventHandlerControl } from "@lowcoder-ee/comps/controls/eventHandlerControl";
+import { eventHandlerControl, clickEvent, doubleClickEvent } from "@lowcoder-ee/comps/controls/eventHandlerControl";
 import { withMethodExposing } from "@lowcoder-ee/comps/generators/withMethodExposing";
 import { changeChildAction } from "lowcoder-core";
+import { useCompClickEventHandler } from "@lowcoder-ee/comps/utils/useCompClickEventHandler";
 
 // const Player = lazy(
 //   () => import('@lottiefiles/react-lottie-player')
@@ -128,6 +129,8 @@ const ModeOptions = [
 ] as const;
 
 const EventOptions = [
+  clickEvent,
+  doubleClickEvent,
   { label: trans("jsonLottie.load"), value: "load", description: trans("jsonLottie.load") },
   { label: trans("jsonLottie.play"), value: "play", description: trans("jsonLottie.play") },
   { label: trans("jsonLottie.pause"), value: "pause", description: trans("jsonLottie.pause") },
@@ -160,6 +163,10 @@ let JsonLottieTmpComp = (function () {
   };
   return new UICompBuilder(childrenMap, (props, dispatch) => {
     const [dotLottie, setDotLottie] = useState<DotLottie | null>(null);
+    const handleClickEvent = useCompClickEventHandler({ onEvent: props.onEvent });
+    const handleClick = useCallback(() => {
+      handleClickEvent();
+    }, [handleClickEvent]);
 
     const setLayoutAndResize = () => {
       const align = props.align.split(',');
@@ -244,6 +251,7 @@ let JsonLottieTmpComp = (function () {
             padding: `${props.container.padding}`,
             rotate: props.container.rotation,
           }}
+          onClick={handleClick}
         >
           <DotLottiePlayer
             key={