Browse Source

Zahlenformat Labels in Echarts #8

master
Daniel Quathamer 2 days ago
parent
commit
0d5f34e098
  1. 58
      superx/xml/js/viz/viz_viewer.js

58
superx/xml/js/viz/viz_viewer.js

@ -1331,7 +1331,11 @@ if(orientation=="x")
trigger: "axis", trigger: "axis",
axisPointer: { axisPointer: {
type: "shadow" type: "shadow"
} },/*
formatter: function (value, index) {
return numberFormatter(value,"value");
}*/
valueFormatter: (value) => numberFormatter(value,"value")
}, },
xAxis: { xAxis: {
type:xAxisType, //horizontal oder vertikal type:xAxisType, //horizontal oder vertikal
@ -1341,7 +1345,10 @@ if(orientation=="x")
margin: 15, margin: 15,
fontSize: 12, fontSize: 12,
width:"100px", width:"100px",
rotate: 30 rotate: 30,
formatter: function (value, index) {
return numberFormatter(value,xAxisType);
}
} }
}, },
yAxis: { yAxis: {
@ -1351,7 +1358,11 @@ if(orientation=="x")
inside: false, inside: false,
margin: 5, margin: 5,
fontSize: 12, fontSize: 12,
width:"50px" width:"50px",
formatter: function (value, index) {
return numberFormatter(value,yAxisType);
}
} }
}, },
series: [ series: [
@ -1909,13 +1920,14 @@ Sonstige: #98b4c9*/
function openDashboardTab(tabnr,maskennr,optional_filter_name,optional_filter_value,myOptionalFilters) function openDashboardTab(tabnr,maskennr,optional_filter_name,optional_filter_value,myOptionalFilters)
{ {
document.forms[0].elements["tid"].value=maskennr; var myForm=document.forms["Weiterverarbeitung"];
document.forms[0].elements["Tabnr."].value=tabnr; myForm.elements["tid"].value=maskennr;
document.forms[0].elements["reuseresult"].value="false"; myForm.elements["Tabnr."].value=tabnr;
myForm.elements["reuseresult"].value="false";
//zuerst alle Filter resetten: //zuerst alle Filter resetten:
if(document.forms[0].elements["Booklet-Stylesheet"]) if(myForm.elements["Booklet-Stylesheet"])
{ {
document.forms[0].elements["Booklet-Stylesheet"].value=""; myForm.elements["Booklet-Stylesheet"].value="";
} }
if(myOptionalFilters.length>0) if(myOptionalFilters.length>0)
{ {
@ -1923,18 +1935,18 @@ for(var j=0;j < myOptionalFilters.length;j++)
{ {
var optionalFilterFldName=myOptionalFilters[j+1]; var optionalFilterFldName=myOptionalFilters[j+1];
console.log("Resetting "+optionalFilterFldName); console.log("Resetting "+optionalFilterFldName);
if(document.forms[0].elements[optionalFilterFldName]) if(myForm.elements[optionalFilterFldName])
{ {
document.forms[0].elements[optionalFilterFldName].value=""; myForm.elements[optionalFilterFldName].value="";
} }
} }
} }
if(optional_filter_name != "") if(optional_filter_name != "")
{ {
document.forms[0].elements[optional_filter_name].value=optional_filter_value; myForm.elements[optional_filter_name].value=optional_filter_value;
} }
document.forms[0].submit(); myForm.submit();
} }
function openKachelDetails(ergebniselementOrdnr,formName,maskeninfoTID,grafikUniquename,tablestylesheet,reuseResults) function openKachelDetails(ergebniselementOrdnr,formName,maskeninfoTID,grafikUniquename,tablestylesheet,reuseResults)
@ -1959,7 +1971,21 @@ function exportVizBooklet(contenttype,stylesheet)
{ {
document.forms['Weiterverarbeitung'].stylesheet.value = stylesheet; document.forms['Weiterverarbeitung'].stylesheet.value = stylesheet;
//document.forms['Weiterverarbeitung'].tablestylesheet.value = stylesheet; //document.forms['Weiterverarbeitung'].tablestylesheet.value = stylesheet;
document.forms[0].contenttype.value = contenttype; document.forms['Weiterverarbeitung'].contenttype.value = contenttype;
document.forms[0].target = '_blank'; document.forms['Weiterverarbeitung'].target = '_blank';
document.forms[0].submit(); document.forms['Weiterverarbeitung'].submit();
} }
function numberFormatter(value,axisType,digits,usedLocale)
{
//TODO: digits auswerten
if(axisType=="value")
{
var myusedLocale="de-DE"; //default
if(!usedLocale || usedLocale=="")
myusedLocale=usedLocale;
return new Intl.NumberFormat(myusedLocale).format(value);
}
else
return value ;
}

Loading…
Cancel
Save