legend and title position and tooltip visibility

MenaamAfzal · MenaamAfzal · commit 3421f8c8cc37 · 2024-05-02T02:10:47.000+05:00
diff --git a/client/packages/lowcoder-comps/src/comps/chartComp/chartConstants.tsx b/client/packages/lowcoder-comps/src/comps/chartComp/chartConstants.tsx
@@ -267,6 +267,8 @@ const chartJsonModeChildren = {
   echartsLabelConfig: EchartsLabelConfig,
   echartsConfig: EchartsOptionComp,
   style: styleControl(EchartsStyle),
+  tooltip: withDefault(BoolControl, true),
+  legendVisibility: withDefault(BoolControl, true),
 }
 
 const chartMapModeChildren = {
diff --git a/client/packages/lowcoder-comps/src/comps/chartComp/chartPropertyView.tsx b/client/packages/lowcoder-comps/src/comps/chartComp/chartPropertyView.tsx
@@ -178,6 +178,8 @@ export function chartPropertyView(
           {children.echartsLabelConfig.getPropertyView()}
           </>}
         {children.echartsTitle.propertyView({ label: trans("echarts.title") })}
+        {children.tooltip.propertyView({label: trans("echarts.tooltip")})}
+        {children.legendVisibility.propertyView({label: trans("echarts.legendVisibility")})}
       </Section>
       <Section name={sectionNames.interaction}>
         {children.onEvent.propertyView()}
diff --git a/client/packages/lowcoder-comps/src/comps/chartComp/chartUtils.ts b/client/packages/lowcoder-comps/src/comps/chartComp/chartUtils.ts
@@ -133,15 +133,16 @@ export function getEchartsConfig(props: EchartsConfigProps, chartSize?: ChartSiz
     let opt={
   "title": {
     "text": props.echartsTitle,
-    "left": "center"
+    'top': props.echartsLegendConfig.top === 'bottom' ?'top':'bottom',
+    "left":"center"
   },
   "backgroundColor": props?.style?.background,
   "color":props?.style?.color,
-  "tooltip": {
+  "tooltip": props.tooltip&&{
     "trigger": "item",
     "formatter": "{a} <br/>{b} : {c}%"
   },
-  "legend": {
+  "legend":props.legendVisibility&& {
     "data": [
       "Show",
       "Click",

Original file line number	Diff line number	Diff line change
`@@ -267,6 +267,8 @@ const chartJsonModeChildren = {`
`267`	`267`	`echartsLabelConfig: EchartsLabelConfig,`
`268`	`268`	`echartsConfig: EchartsOptionComp,`
`269`	`269`	`style: styleControl(EchartsStyle),`
	`270`	`+ tooltip: withDefault(BoolControl, true),`
	`271`	`+ legendVisibility: withDefault(BoolControl, true),`
`270`	`272`	`}`
`271`	`273`
`272`	`274`	`const chartMapModeChildren = {`