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

Commit00e61a2

Browse files
committed
Fixed candlestick and gauge chart to apply theme.
1 parent451a0f6 commit00e61a2

File tree

6 files changed

+30
-30
lines changed

6 files changed

+30
-30
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ CandleStickChartTmpComp = withViewFn(CandleStickChartTmpComp, (comp) => {
145145
returngetEchartsConfig(
146146
childrenPropsasToViewReturn<typeofechartsConfigChildren>,
147147
chartSize,
148-
theme?.theme?.components?.candleStickChart||{},
148+
themeConfig
149149
);
150150
},[theme,childrenProps,chartSize, ...Object.values(echartsConfigChildren)]);
151151

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,8 +271,8 @@ if (EchartCandleStickChartStyle && EchartDefaultTextStyle) {
271271
...chartJsonModeChildren,
272272
chartStyle:styleControl(EchartCandleStickChartStyle,'chartStyle'),
273273
titleStyle:styleControl(EchartDefaultTextStyle,'titleStyle'),
274-
labelStyle:styleControl(EchartDefaultTextStyle,'labelStyle'),
275-
legendStyle:styleControl(EchartDefaultTextStyle,'legendStyle'),
274+
xAxisStyle:styleControl(EchartDefaultTextStyle,'xAxisStyle'),
275+
yAxisStyle:styleControl(EchartDefaultTextStyle,'yAxisStyle'),
276276
}
277277
}
278278

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ export function candleStickChartPropertyView(
5656
{children.titleStyle?.getPropertyView()}
5757
</Section>
5858
<Sectionname={sectionNames.xAxisStyle}>
59-
{children.labelStyle?.getPropertyView()}
59+
{children.xAxisStyle?.getPropertyView()}
6060
</Section>
6161
<Sectionname={sectionNames.yAxisStyle}>
62-
{children.legendStyle?.getPropertyView()}
62+
{children.yAxisStyle?.getPropertyView()}
6363
</Section>
6464
</>
6565
);

‎client/packages/lowcoder-comps/src/comps/candleStickChartComp/candleStickChartUtils.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ export function getEchartsConfig(
182182
}
183183
},
184184
axisLabel:{
185-
...styleWrapper(props?.legendStyle,theme?.legendStyle,13),
185+
...styleWrapper(props?.yAxisStyle,theme?.yAxisStyle,13),
186186
}
187187
},
188188
xAxis:props?.echartsOption&&{
@@ -196,7 +196,7 @@ export function getEchartsConfig(
196196
},
197197
},
198198
axisLabel:{
199-
...styleWrapper(props?.labelStyle,theme?.labelStyle,13),
199+
...styleWrapper(props?.xAxisStyle,theme?.xAxisStyle,13),
200200
},
201201
boundaryGap:true,
202202
// Turn off x-axis split lines if desired, so you only see colored areas

‎client/packages/lowcoder-comps/src/comps/gaugeChartComp/gaugeChartUtils.ts

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -709,9 +709,9 @@ export function getEchartsConfig(
709709
width:props.progressBarWidth,
710710
color:[[1,props?.clockGaugeOption?.data?.map(data=>data.outlineColor)[0]]],
711711
shadowColor:props?.chartStyle?.chartShadowColor||theme?.chartStyle?.shadowColor,
712-
shadowBlur:props?.chartStyle?.chartBoxShadow?.split('px')[0]||theme?.chartStyle?.boxShadow?.split('px')[0],
713-
shadowOffsetX:props?.chartStyle?.chartBoxShadow?.split('px')[1]||theme?.chartStyle?.boxShadow?.split('px')[1],
714-
shadowOffsetY:props?.chartStyle?.chartBoxShadow?.split('px')[2]||theme?.chartStyle?.boxShadow?.split('px')[2]
712+
shadowBlur:props?.chartStyle?.chartBoxShadow?.split('px')[0]||theme?.chartStyle?.boxShadow&&theme?.chartStyle?.boxShadow?.split('px')[0],
713+
shadowOffsetX:props?.chartStyle?.chartBoxShadow?.split('px')[1]||theme?.chartStyle?.boxShadow&&theme?.chartStyle?.boxShadow?.split('px')[1],
714+
shadowOffsetY:props?.chartStyle?.chartBoxShadow?.split('px')[2]||theme?.chartStyle?.boxShadow&&theme?.chartStyle?.boxShadow?.split('px')[2]
715715
}
716716
},
717717
axisTick:{
@@ -720,9 +720,9 @@ export function getEchartsConfig(
720720
width:props.axisTickWidth,
721721
color:props.axisTickColor,
722722
shadowColor:props?.chartStyle?.chartShadowColor+"55"||theme?.chartStyle?.shadowColor+"55",
723-
shadowBlur:props?.chartStyle?.chartBoxShadow?.split('px')[0]||theme?.chartStyle?.boxShadow?.split('px')[0],
724-
shadowOffsetX:props?.chartStyle?.chartBoxShadow?.split('px')[1]||theme?.chartStyle?.boxShadow?.split('px')[1],
725-
shadowOffsetY:props?.chartStyle?.chartBoxShadow?.split('px')[2]||theme?.chartStyle?.boxShadow?.split('px')[2]
723+
shadowBlur:props?.chartStyle?.chartBoxShadow?.split('px')[0]||theme?.chartStyle?.boxShadow&&theme?.chartStyle?.boxShadow?.split('px')[0],
724+
shadowOffsetX:props?.chartStyle?.chartBoxShadow?.split('px')[1]||theme?.chartStyle?.boxShadow&&theme?.chartStyle?.boxShadow?.split('px')[1],
725+
shadowOffsetY:props?.chartStyle?.chartBoxShadow?.split('px')[2]||theme?.chartStyle?.boxShadow&&theme?.chartStyle?.boxShadow?.split('px')[2]
726726
}
727727
},
728728
splitLine:{
@@ -731,9 +731,9 @@ export function getEchartsConfig(
731731
width:Number(props.axisTickWidth)*1.5,
732732
color:props.axisTickColor,
733733
shadowColor:props?.chartStyle?.chartShadowColor+"55"||theme?.chartStyle?.shadowColor+"55",
734-
shadowBlur:props?.chartStyle?.chartBoxShadow?.split('px')[0]||theme?.chartStyle?.boxShadow?.split('px')[0],
735-
shadowOffsetX:props?.chartStyle?.chartBoxShadow?.split('px')[1]||theme?.chartStyle?.boxShadow?.split('px')[1],
736-
shadowOffsetY:props?.chartStyle?.chartBoxShadow?.split('px')[2]||theme?.chartStyle?.boxShadow?.split('px')[2]
734+
shadowBlur:props?.chartStyle?.chartBoxShadow?.split('px')[0]||theme?.chartStyle?.boxShadow&&theme?.chartStyle?.boxShadow?.split('px')[0],
735+
shadowOffsetX:props?.chartStyle?.chartBoxShadow?.split('px')[1]||theme?.chartStyle?.boxShadow&&theme?.chartStyle?.boxShadow?.split('px')[1],
736+
shadowOffsetY:props?.chartStyle?.chartBoxShadow?.split('px')[2]||theme?.chartStyle?.boxShadow&&theme?.chartStyle?.boxShadow?.split('px')[2]
737737
}
738738
},
739739
axisLabel:{
@@ -754,9 +754,9 @@ export function getEchartsConfig(
754754
itemStyle:{
755755
color:props?.clockGaugeOption?.data?.map(data=>data.hour)[0]?.color,
756756
shadowColor:props?.chartStyle?.chartShadowColor+"55"||theme?.chartStyle?.shadowColor+"55",
757-
shadowBlur:props?.chartStyle?.chartBoxShadow?.split('px')[0]||theme?.chartStyle?.boxShadow?.split('px')[0],
758-
shadowOffsetX:props?.chartStyle?.chartBoxShadow?.split('px')[1]||theme?.chartStyle?.boxShadow?.split('px')[1],
759-
shadowOffsetY:props?.chartStyle?.chartBoxShadow?.split('px')[2]||theme?.chartStyle?.boxShadow?.split('px')[2]
757+
shadowBlur:props?.chartStyle?.chartBoxShadow?.split('px')[0]||theme?.chartStyle?.boxShadow&&theme?.chartStyle?.boxShadow?.split('px')[0],
758+
shadowOffsetX:props?.chartStyle?.chartBoxShadow?.split('px')[1]||theme?.chartStyle?.boxShadow&&theme?.chartStyle?.boxShadow?.split('px')[1],
759+
shadowOffsetY:props?.chartStyle?.chartBoxShadow?.split('px')[2]||theme?.chartStyle?.boxShadow&&theme?.chartStyle?.boxShadow?.split('px')[2]
760760
}
761761
},
762762
detail:{
@@ -799,9 +799,9 @@ export function getEchartsConfig(
799799
itemStyle:{
800800
color:props?.clockGaugeOption?.data?.map(data=>data.minute)[0]?.color,
801801
shadowColor:props?.chartStyle?.chartShadowColor+"55"||theme?.chartStyle?.shadowColor+"55",
802-
shadowBlur:props?.chartStyle?.chartBoxShadow?.split('px')[0]||theme?.chartStyle?.boxShadow?.split('px')[0],
803-
shadowOffsetX:props?.chartStyle?.chartBoxShadow?.split('px')[1]||theme?.chartStyle?.boxShadow?.split('px')[1],
804-
shadowOffsetY:props?.chartStyle?.chartBoxShadow?.split('px')[2]||theme?.chartStyle?.boxShadow?.split('px')[2]
802+
shadowBlur:props?.chartStyle?.chartBoxShadow?.split('px')[0]||theme?.chartStyle?.boxShadow&&theme?.chartStyle?.boxShadow?.split('px')[0],
803+
shadowOffsetX:props?.chartStyle?.chartBoxShadow?.split('px')[1]||theme?.chartStyle?.boxShadow&&theme?.chartStyle?.boxShadow?.split('px')[1],
804+
shadowOffsetY:props?.chartStyle?.chartBoxShadow?.split('px')[2]||theme?.chartStyle?.boxShadow&&theme?.chartStyle?.boxShadow?.split('px')[2]
805805
}
806806
},
807807
detail:{
@@ -845,9 +845,9 @@ export function getEchartsConfig(
845845
itemStyle:{
846846
color:props?.clockGaugeOption?.data?.map(data=>data.second)[0]?.color,
847847
shadowColor:props?.chartStyle?.chartShadowColor+"55"||theme?.chartStyle?.shadowColor+"55",
848-
shadowBlur:props?.chartStyle?.chartBoxShadow?.split('px')[0]||theme?.chartStyle?.boxShadow?.split('px')[0],
849-
shadowOffsetX:props?.chartStyle?.chartBoxShadow?.split('px')[1]||theme?.chartStyle?.boxShadow?.split('px')[1],
850-
shadowOffsetY:props?.chartStyle?.chartBoxShadow?.split('px')[2]||theme?.chartStyle?.boxShadow?.split('px')[2]
848+
shadowBlur:props?.chartStyle?.chartBoxShadow?.split('px')[0]||theme?.chartStyle?.boxShadow&&theme?.chartStyle?.boxShadow?.split('px')[0],
849+
shadowOffsetX:props?.chartStyle?.chartBoxShadow?.split('px')[1]||theme?.chartStyle?.boxShadow&&theme?.chartStyle?.boxShadow?.split('px')[1],
850+
shadowOffsetY:props?.chartStyle?.chartBoxShadow?.split('px')[2]||theme?.chartStyle?.boxShadow&&theme?.chartStyle?.boxShadow?.split('px')[2]
851851
}
852852
},
853853
anchor:{
@@ -857,9 +857,9 @@ export function getEchartsConfig(
857857
itemStyle:{
858858
color:props?.clockGaugeOption?.data?.map(data=>data.anchor)[0]?.color,
859859
shadowColor:props?.chartStyle?.chartShadowColor+"55"||theme?.chartStyle?.shadowColor+"55",
860-
shadowBlur:props?.chartStyle?.chartBoxShadow?.split('px')[0]||theme?.chartStyle?.boxShadow?.split('px')[0],
861-
shadowOffsetX:props?.chartStyle?.chartBoxShadow?.split('px')[1]||theme?.chartStyle?.boxShadow?.split('px')[1],
862-
shadowOffsetY:props?.chartStyle?.chartBoxShadow?.split('px')[2]||theme?.chartStyle?.boxShadow?.split('px')[2]
860+
shadowBlur:props?.chartStyle?.chartBoxShadow?.split('px')[0]||theme?.chartStyle?.boxShadow&&theme?.chartStyle?.boxShadow?.split('px')[0],
861+
shadowOffsetX:props?.chartStyle?.chartBoxShadow?.split('px')[1]||theme?.chartStyle?.boxShadow&&theme?.chartStyle?.boxShadow?.split('px')[1],
862+
shadowOffsetY:props?.chartStyle?.chartBoxShadow?.split('px')[2]||theme?.chartStyle?.boxShadow&&theme?.chartStyle?.boxShadow?.split('px')[2]
863863
}
864864
},
865865
detail:{

‎client/packages/lowcoder/src/comps/comps/remoteComp/loaders.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ async function npmLoader(
2626

2727
constapplicationId=(!appId||appId&&appId===PUBLIC_APP_ID) ?'none' :appId;
2828

29-
//const entry = `${pluginBaseUrl}/${applicationId}/${packageName}@${localPackageVersion}/index.js`;
30-
constentry='../../../../../public/package/index.js';
29+
constentry=`${pluginBaseUrl}/${applicationId}/${packageName}@${localPackageVersion}/index.js`;
30+
3131
try{
3232
constmodule=awaitimport(
3333
/*@vite-ignore */

0 commit comments

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