Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit64d5bbd

Browse files
authored
Merge pull request#1105 from lowcoder-org/dynamic-style-fixes
Allow dynamic/conditional styles + Refactor logic for applying theme on each comp
2 parentsa28726f +906df19 commit64d5bbd

File tree

80 files changed

+60
-293
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+60
-293
lines changed

‎client/packages/lowcoder-comps/src/comps/basicChartComp/chartComp.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import {
2626
chartColorPalette,
2727
getPromiseAfterDispatch,
2828
dropdownControl,
29-
useMergeCompStyles,
3029
}from"lowcoder-sdk";
3130
import{getEchartsLocale,trans}from"i18n/comps";
3231
import{ItemColorComp}from"comps/chartComp/chartConfigs/lineChartConfig";
@@ -74,8 +73,6 @@ BasicChartTmpComp = withViewFn(BasicChartTmpComp, (comp) => {
7473
log.error('theme chart error: ',error);
7574
}
7675

77-
useMergeCompStyles?.(childrenToProps(comp.children),comp.dispatch);
78-
7976
consttriggerClickEvent=async(dispatch:any,action:CompAction<JSONValue>)=>{
8077
awaitgetPromiseAfterDispatch(
8178
dispatch,

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ import {
4545
jsonValueExposingStateControl,
4646
CalendarDeleteIcon,
4747
Tooltip,
48-
useMergeCompStyles,
4948
EditorContext,
5049
CompNameContext,
5150
}from'lowcoder-sdk';
@@ -137,8 +136,6 @@ let CalendarBasicComp = (function () {
137136
const[left,setLeft]=useState<number|undefined>(undefined);
138137
const[licensed,setLicensed]=useState<boolean>(props.licenseKey!=="");
139138

140-
useMergeCompStyles?.(props,dispatch);
141-
142139
useEffect(()=>{
143140
setLicensed(props.licenseKey!=="");
144141
},[props.licenseKey]);

‎client/packages/lowcoder-comps/src/comps/candleStickChartComp/candleStickChartComp.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import {
2525
chartColorPalette,
2626
getPromiseAfterDispatch,
2727
dropdownControl,
28-
useMergeCompStyles,
2928
}from"lowcoder-sdk";
3029
import{getEchartsLocale,trans}from"i18n/comps";
3130
import{ItemColorComp}from"comps/chartComp/chartConfigs/lineChartConfig";
@@ -71,8 +70,6 @@ CandleStickChartTmpComp = withViewFn(CandleStickChartTmpComp, (comp) => {
7170
log.error('theme chart error: ',error);
7271
}
7372

74-
useMergeCompStyles(childrenToProps(comp.children),comp.dispatch);
75-
7673
consttriggerClickEvent=async(dispatch:any,action:CompAction<JSONValue>)=>{
7774
awaitgetPromiseAfterDispatch(
7875
dispatch,

‎client/packages/lowcoder-comps/src/comps/chartsGeoMapComp/chartsGeoMapComp.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import {
2626
chartColorPalette,
2727
getPromiseAfterDispatch,
2828
dropdownControl,
29-
useMergeCompStyles,
3029
}from"lowcoder-sdk";
3130
import{getEchartsLocale,trans}from"i18n/comps";
3231
import{ItemColorComp}from"comps/basicChartComp/chartConfigs/lineChartConfig";
@@ -83,8 +82,6 @@ MapTmpComp = withViewFn(MapTmpComp, (comp) => {
8382
log.error('theme chart error: ',error);
8483
}
8584

86-
useMergeCompStyles(childrenToProps(comp.children),comp.dispatch);
87-
8885
consttriggerClickEvent=async(dispatch:any,action:CompAction<JSONValue>)=>{
8986
awaitgetPromiseAfterDispatch(
9087
dispatch,

‎client/packages/lowcoder-comps/src/comps/funnelChartComp/funnelChartComp.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import {
2525
chartColorPalette,
2626
getPromiseAfterDispatch,
2727
dropdownControl,
28-
useMergeCompStyles,
2928
}from"lowcoder-sdk";
3029
import{getEchartsLocale,trans}from"i18n/comps";
3130
import{ItemColorComp}from"comps/chartComp/chartConfigs/lineChartConfig";
@@ -72,8 +71,6 @@ FunnelChartTmpComp = withViewFn(FunnelChartTmpComp, (comp) => {
7271
log.error('theme chart error: ',error);
7372
}
7473

75-
useMergeCompStyles(childrenToProps(comp.children),comp.dispatch);
76-
7774
consttriggerClickEvent=async(dispatch:any,action:CompAction<JSONValue>)=>{
7875
awaitgetPromiseAfterDispatch(
7976
dispatch,

‎client/packages/lowcoder-comps/src/comps/gaugeChartComp/gaugeChartComp.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import {
2626
getPromiseAfterDispatch,
2727
dropdownControl,
2828
JSONObject,
29-
useMergeCompStyles,
3029
}from"lowcoder-sdk";
3130
import{getEchartsLocale,trans}from"i18n/comps";
3231
import{ItemColorComp}from"comps/chartComp/chartConfigs/lineChartConfig";
@@ -73,8 +72,6 @@ GaugeChartTmpComp = withViewFn(GaugeChartTmpComp, (comp) => {
7372
log.error('theme chart error: ',error);
7473
}
7574

76-
useMergeCompStyles(childrenToProps(comp.children),comp.dispatch);
77-
7875
consttriggerClickEvent=async(dispatch:any,action:CompAction<JSONValue>)=>{
7976
awaitgetPromiseAfterDispatch(
8077
dispatch,

‎client/packages/lowcoder-comps/src/comps/graphChartComp/graphChartComp.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import {
2626
getPromiseAfterDispatch,
2727
dropdownControl,
2828
JSONObject,
29-
useMergeCompStyles,
3029
}from"lowcoder-sdk";
3130
import{getEchartsLocale,trans}from"i18n/comps";
3231
import{ItemColorComp}from"comps/chartComp/chartConfigs/lineChartConfig";
@@ -73,8 +72,6 @@ GraphChartTmpComp = withViewFn(GraphChartTmpComp, (comp) => {
7372
log.error('theme chart error: ',error);
7473
}
7574

76-
useMergeCompStyles(childrenToProps(comp.children),comp.dispatch);
77-
7875
consttriggerClickEvent=async(dispatch:any,action:CompAction<JSONValue>)=>{
7976
awaitgetPromiseAfterDispatch(
8077
dispatch,

‎client/packages/lowcoder-comps/src/comps/heatmapChartComp/heatmapChartComp.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import {
2525
chartColorPalette,
2626
getPromiseAfterDispatch,
2727
dropdownControl,
28-
useMergeCompStyles,
2928
}from"lowcoder-sdk";
3029
import{getEchartsLocale,trans}from"i18n/comps";
3130
import{ItemColorComp}from"comps/chartComp/chartConfigs/lineChartConfig";
@@ -72,8 +71,6 @@ HeatmapChartTmpComp = withViewFn(HeatmapChartTmpComp, (comp) => {
7271
log.error('theme chart error: ',error);
7372
}
7473

75-
useMergeCompStyles(childrenToProps(comp.children),comp.dispatch);
76-
7774
consttriggerClickEvent=async(dispatch:any,action:CompAction<JSONValue>)=>{
7875
awaitgetPromiseAfterDispatch(
7976
dispatch,

‎client/packages/lowcoder-comps/src/comps/radarChartComp/radarChartComp.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import {
2525
chartColorPalette,
2626
getPromiseAfterDispatch,
2727
dropdownControl,
28-
useMergeCompStyles,
2928
}from"lowcoder-sdk";
3029
import{getEchartsLocale,trans}from"i18n/comps";
3130
import{ItemColorComp}from"comps/chartComp/chartConfigs/lineChartConfig";
@@ -72,8 +71,6 @@ RadarChartTmpComp = withViewFn(RadarChartTmpComp, (comp) => {
7271
log.error('theme chart error: ',error);
7372
}
7473

75-
useMergeCompStyles(childrenToProps(comp.children),comp.dispatch);
76-
7774
consttriggerClickEvent=async(dispatch:any,action:CompAction<JSONValue>)=>{
7875
awaitgetPromiseAfterDispatch(
7976
dispatch,

‎client/packages/lowcoder-comps/src/comps/sankeyChartComp/sankeyChartComp.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import {
2525
chartColorPalette,
2626
getPromiseAfterDispatch,
2727
dropdownControl,
28-
useMergeCompStyles,
2928
}from"lowcoder-sdk";
3029
import{getEchartsLocale,trans}from"i18n/comps";
3130
import{ItemColorComp}from"comps/chartComp/chartConfigs/lineChartConfig";
@@ -72,8 +71,6 @@ SankeyChartTmpComp = withViewFn(SankeyChartTmpComp, (comp) => {
7271
log.error('theme chart error: ',error);
7372
}
7473

75-
useMergeCompStyles(childrenToProps(comp.children),comp.dispatch);
76-
7774
consttriggerClickEvent=async(dispatch:any,action:CompAction<JSONValue>)=>{
7875
awaitgetPromiseAfterDispatch(
7976
dispatch,

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp