Skip to content

Commit a656c5c

Browse files
committed
Merge branch 'dev' of github.com:lowcoder-org/lowcoder into fix/table-header
2 parents d5e3b23 + 68150c9 commit a656c5c

File tree

29 files changed

+1282
-257
lines changed

29 files changed

+1282
-257
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ BarChartTmpComp = withViewFn(BarChartTmpComp, (comp) => {
7575
log.error('theme chart error: ', error);
7676
}
7777

78+
7879
// Detect race mode changes and force chart recreation
7980
const currentRaceMode = comp.children.chartConfig?.children?.comp?.children?.race?.getView();
8081
useEffect(() => {
@@ -172,7 +173,6 @@ BarChartTmpComp = withViewFn(BarChartTmpComp, (comp) => {
172173
useResizeDetector({
173174
targetRef: containerRef,
174175
onResize: ({width, height}) => {
175-
console.log('barChart - resize');
176176
if (width && height) {
177177
setChartSize({ w: width, h: height });
178178
}
@@ -194,6 +194,7 @@ BarChartTmpComp = withViewFn(BarChartTmpComp, (comp) => {
194194
notMerge={!currentRaceMode}
195195
lazyUpdate={!currentRaceMode}
196196
opts={{ locale: getEchartsLocale() }}
197+
theme={themeConfig}
197198
option={option}
198199
mode={mode}
199200
/>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@ LineChartTmpComp = withViewFn(LineChartTmpComp, (comp) => {
174174
notMerge
175175
lazyUpdate
176176
opts={{ locale: getEchartsLocale() }}
177+
theme={themeConfig}
177178
option={option}
178179
mode={mode}
179180
/>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,7 @@ PieChartTmpComp = withViewFn(PieChartTmpComp, (comp) => {
194194
notMerge
195195
lazyUpdate
196196
opts={{ locale: getEchartsLocale() }}
197+
theme={themeConfig}
197198
option={option}
198199
mode={mode}
199200
/>
@@ -302,7 +303,7 @@ let PieChartComp = withExposingConfigs(PieChartTmpComp, [
302303

303304

304305
export const PieChartCompWithDefault = withDefault(PieChartComp, {
305-
xAxisKey: "date",
306+
xAxisKey: "name",
306307
series: [
307308
{
308309
dataIndex: genRandomKey(),

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,7 @@ ScatterChartTmpComp = withViewFn(ScatterChartTmpComp, (comp) => {
175175
notMerge
176176
lazyUpdate
177177
opts={{ locale: getEchartsLocale() }}
178+
theme={themeConfig}
178179
option={option}
179180
mode={mode}
180181
/>

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -159,16 +159,6 @@ export function Dropdown<T extends OptionsType>(props: DropdownProps<T>) {
159159
const { placement = "right" } = props;
160160
const valueInfoMap = _.fromPairs(props.options.map((option) => [option.value, option]));
161161

162-
useEffect(() => {
163-
const dropdownElems = document.querySelectorAll<HTMLElement>("div.ant-dropdown ul.ant-dropdown-menu");
164-
for (let index = 0; index < dropdownElems.length; index++) {
165-
const element = dropdownElems[index];
166-
element.style.maxHeight = "300px";
167-
element.style.overflowY = "scroll";
168-
element.style.minWidth = "150px";
169-
element.style.paddingRight = "10px";
170-
}
171-
}, []);
172162

173163
return (
174164
<FlexDiv style={props.style} className={props.className}>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,6 @@ function EditableCellComp<T extends JSONValue>(props: EditableCellProps<T>) {
225225
key={`normal-view-${cellIndex}`}
226226
tabIndex={editable ? 0 : -1 }
227227
onFocus={enterEditFn}
228-
style={{ width: '100%', height: '100%'}}
229228
>
230229
{normalView}
231230
</div>

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { styleControl } from "comps/controls/styleControl";
1010
import { AnimationStyle, LottieStyle } from "comps/controls/styleControlConstants";
1111
import { trans } from "i18n";
1212
import { Section, sectionNames } from "lowcoder-design";
13-
import { useContext, lazy, useEffect, useState } from "react";
13+
import { useContext, lazy, useEffect, useState, useCallback } from "react";
1414
import { stateComp, UICompBuilder, withDefault } from "../../generators";
1515
import {
1616
NameConfig,
@@ -23,9 +23,10 @@ import { AssetType, IconscoutControl } from "@lowcoder-ee/comps/controls/iconsco
2323
import { DotLottie } from "@lottiefiles/dotlottie-react";
2424
import { AutoHeightControl } from "@lowcoder-ee/comps/controls/autoHeightControl";
2525
import { useResizeDetector } from "react-resize-detector";
26-
import { eventHandlerControl } from "@lowcoder-ee/comps/controls/eventHandlerControl";
26+
import { eventHandlerControl, clickEvent, doubleClickEvent } from "@lowcoder-ee/comps/controls/eventHandlerControl";
2727
import { withMethodExposing } from "@lowcoder-ee/comps/generators/withMethodExposing";
2828
import { changeChildAction } from "lowcoder-core";
29+
import { useCompClickEventHandler } from "@lowcoder-ee/comps/utils/useCompClickEventHandler";
2930

3031
// const Player = lazy(
3132
// () => import('@lottiefiles/react-lottie-player')
@@ -128,6 +129,8 @@ const ModeOptions = [
128129
] as const;
129130

130131
const EventOptions = [
132+
clickEvent,
133+
doubleClickEvent,
131134
{ label: trans("jsonLottie.load"), value: "load", description: trans("jsonLottie.load") },
132135
{ label: trans("jsonLottie.play"), value: "play", description: trans("jsonLottie.play") },
133136
{ label: trans("jsonLottie.pause"), value: "pause", description: trans("jsonLottie.pause") },
@@ -160,6 +163,10 @@ let JsonLottieTmpComp = (function () {
160163
};
161164
return new UICompBuilder(childrenMap, (props, dispatch) => {
162165
const [dotLottie, setDotLottie] = useState<DotLottie | null>(null);
166+
const handleClickEvent = useCompClickEventHandler({ onEvent: props.onEvent });
167+
const handleClick = useCallback(() => {
168+
handleClickEvent();
169+
}, [handleClickEvent]);
163170

164171
const setLayoutAndResize = () => {
165172
const align = props.align.split(',');
@@ -244,6 +251,7 @@ let JsonLottieTmpComp = (function () {
244251
padding: `${props.container.padding}`,
245252
rotate: props.container.rotation,
246253
}}
254+
onClick={handleClick}
247255
>
248256
<DotLottiePlayer
249257
key={

0 commit comments

Comments
 (0)