github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 01:38:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

updating based on last review

Browse source
This commit is contained in:
ppisljar 2017-01-25 12:07:35 +01:00
parent e9de4f75b1
commit 2b97717f50
10 changed files with 37 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/core_plugins/kbn_vislib_vis_types/public/area.js
View file

@ -104,13 +104,13 @@ export default function PointSeriesVisType(Private) {
}],
editor: pointSeriesTemplate,
optionTabs: [
{ name: 'options', title: 'Settings', editor: pointSeriesTemplate },
{
name: 'advanced',
title: 'Advanced',
title: 'Axes & Metrics',
editor: '<div><vislib-series></vislib-series><vislib-value-axes>' +
'</vislib-value-axes><vislib-category-axis></vislib-category-axis></div>'
},
{ name: 'options', title: 'Panel Settings', editor: pointSeriesTemplate },
],
},
schemas: new Schemas([

2
src/core_plugins/kbn_vislib_vis_types/public/controls/point_series/category_axis.html
View file

@ -1,4 +1,4 @@
<div class="kuiSideBarSection">
<div class="kuiSideBarSection kuiSideBarSection__main">
<div class="kuiSideBarSectionTitle">
<div class="kuiSideBarSectionTitle__text">
X-Axis

4
src/core_plugins/kbn_vislib_vis_types/public/controls/point_series/series.html
View file

@ -1,4 +1,4 @@
<div class="kuiSideBarSection">
<div class="kuiSideBarSection kuiSideBarSection__main">
<div class="kuiSideBarSectionTitle">
<div class="kuiSideBarSectionTitle__text">
Metrics
@ -69,7 +69,7 @@
ng-change="changeValueAxis($index)"
>
<option ng-repeat="axis in vis.params.valueAxes track by axis.id" value="{{axis.id}}">{{axis.name}}</option>
<option value="new">New Axis ...</option>
</select>
</div>
</div>

19
src/core_plugins/kbn_vislib_vis_types/public/controls/point_series/series.js
View file

@ -55,26 +55,19 @@ module.directive('vislibSeries', function ($parse, $compile) {
$scope.savedVis.type = types.length === 1 ? types[0] : 'histogram';
});
$scope.addValueAxis = function () {
const newAxis = _.cloneDeep($scope.vis.params.valueAxes[0]);
newAxis.id = 'ValueAxis-' + $scope.vis.params.valueAxes.reduce((value, axis) => {
if (axis.id.substr(0, 10) === 'ValueAxis-') {
const num = parseInt(axis.id.substr(10));
if (num >= value) value = num + 1;
$scope.$watch('vis.params.valueAxes.length', () => {
$scope.vis.params.seriesParams.forEach(series => {
if (!$scope.vis.params.valueAxes.find(axis => axis.id === series.valueAxis)) {
series.valueAxis = $scope.vis.params.valueAxes[0].id;
}
return value;
}, 1);
$scope.vis.params.valueAxes.push(newAxis);
return newAxis;
};
});
});
$scope.changeValueAxis = (index) => {
const series = $scope.vis.params.seriesParams[index];
if (series.valueAxis === 'new') {
const axis = $scope.addValueAxis();
series.valueAxis = axis.id;
$scope.$parent.$parent.sidebar.section = 'axes';
}
};
}

2
src/core_plugins/kbn_vislib_vis_types/public/controls/point_series/value_axes.html
View file

@ -1,4 +1,4 @@
<div class="kuiSideBarSection">
<div class="kuiSideBarSection kuiSideBarSection__main">
<div class="kuiSideBarSectionTitle">
<div class="kuiSideBarSectionTitle__text">
Y-Axes

1
src/core_plugins/kbn_vislib_vis_types/public/controls/point_series/value_axes.js
View file

@ -88,6 +88,7 @@ module.directive('vislibValueAxes', function ($parse, $compile) {
}, 1);
$scope.vis.params.valueAxes.push(newAxis);
return newAxis;
};
$scope.removeValueAxis = function (axis) {

10
src/core_plugins/kbn_vislib_vis_types/public/histogram.js
View file

@ -102,13 +102,13 @@ export default function PointSeriesVisType(Private) {
}],
editor: pointSeriesTemplate,
optionTabs: [
{ name: 'series', title: 'Series', editor: '<vislib-series></vislib-series>' },
{
name: 'axes',
title: 'Axes',
editor: '<div><vislib-value-axes></vislib-value-axes><vislib-category-axis></vislib-category-axis></div>'
name: 'advanced',
title: 'Axes & Metrics',
editor: '<div><vislib-series></vislib-series><vislib-value-axes>' +
'</vislib-value-axes><vislib-category-axis></vislib-category-axis></div>'
},
{ name: 'options', title: 'Settings', editor: pointSeriesTemplate },
{ name: 'options', title: 'Panel Settings', editor: pointSeriesTemplate },
],
},
schemas: new Schemas([

10
src/core_plugins/kbn_vislib_vis_types/public/horizontal_bar.js
View file

@ -96,13 +96,13 @@ export default function PointSeriesVisType(Private) {
}],
editor: pointSeriesTemplate,
optionTabs: [
{ name: 'series', title: 'Series', editor: '<vislib-series></vislib-series>' },
{
name: 'axes',
title: 'Axes',
editor: '<div><vislib-value-axes></vislib-value-axes><vislib-category-axis></vislib-category-axis></div>'
name: 'advanced',
title: 'Axes & Metrics',
editor: '<div><vislib-series></vislib-series><vislib-value-axes>' +
'</vislib-value-axes><vislib-category-axis></vislib-category-axis></div>'
},
{ name: 'options', title: 'Settings', editor: pointSeriesTemplate },
{ name: 'options', title: 'Panel Settings', editor: pointSeriesTemplate },
],
},
schemas: new Schemas([

10
src/core_plugins/kbn_vislib_vis_types/public/line.js
View file

@ -91,13 +91,13 @@ export default function PointSeriesVisType(Private) {
}],
editor: pointSeriesTemplate,
optionTabs: [
{ name: 'series', title: 'Series', editor: '<vislib-series></vislib-series>' },
{
name: 'axes',
title: 'Axes',
editor: '<div><vislib-value-axes></vislib-value-axes><vislib-category-axis></vislib-category-axis></div>'
name: 'advanced',
title: 'Axes & Metrics',
editor: '<div><vislib-series></vislib-series><vislib-value-axes>' +
'</vislib-value-axes><vislib-category-axis></vislib-category-axis></div>'
},
{ name: 'options', title: 'Settings', editor: pointSeriesTemplate },
{ name: 'options', title: 'Panel Settings', editor: pointSeriesTemplate },
],
},
schemas: new Schemas([

9
src/ui/public/styles/base.less
View file

@ -923,6 +923,10 @@ fieldset {
margin-bottom: 6px;
}
.kuiSideBarSection__main {
margin-bottom: 25px;
}
.kuiSideBarSectionTitle {
display: flex;
justify-content: space-between;
@ -931,6 +935,11 @@ fieldset {
border-bottom: 1px solid #D4D4D4;
}
.kuiSideBarSection__main .kuiSideBarSectionTitle {
background-color: #E4E4E4;
padding: 2px 10px;
}
.kuiSideBarSectionTitle__text {
font-size: 14px;
font-weight: 700;