Elgato_dark/zeppelin
1
0
Fork 0
mirror of https://github.com/apache/zeppelin synced 2026-05-24 09:38:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

refactor: Add getAxisInSingleDimension func

Browse source
This commit is contained in:
1ambda 2017-03-12 16:55:12 +09:00
parent 9768ecfcc5
commit a8a4fb1ac5
2 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
zeppelin-web/src/app/tabledata/advanced-transformation-setting.html
View file

@ -20,6 +20,10 @@ limitations under the License.
<span style="vertical-align: middle; display: inline-block; margin-top: 3px;">Configured Columns</span>
<span style="float: right;">
<div class="btn-group" role="group" aria-label="...">
<div type="button" ng-click="parameterChanged()"
class="btn btn-default" style="padding: 2px 5px 2px 5px;">
<i class="fa fa-floppy-o" aria-hidden="true"></i>
</div>
<div type="button" ng-if="config.panel.columnPanelOpened"
ng-click="toggleColumnPanel()"
class="btn btn-default" style="padding: 2px 5px 2px 5px;">
@ -74,7 +78,7 @@ limitations under the License.
<div ng-if="!isAggregatorAxis(axisSpec)"
class="btn btn-default btn-xs"
style="background-color: #EFEFEF;">
{{config.axis[axisSpec.name].name}}
{{ getAxisInSingleDimension(axisSpec).name }}
<span class="fa fa-close" ng-click="removeFromSingleDimension(axisSpec.name)"></span>
</div>
@ -84,9 +88,9 @@ limitations under the License.
class="btn btn-default btn-xs dropdown-toggle"
style="background-color: #EFEFEF; "
type="button" data-toggle="dropdown">
{{config.axis[axisSpec.name].name | limitTo: 30}}{{config.axis[axisSpec.name].name > 30 ? '...' : ''}}
{{getAxisInSingleDimension(axisSpec).name | limitTo: 30}}{{getAxisInSingleDimension(axisSpec).name > 30 ? '...' : ''}}
<span style="color:#717171;">
<span class="lightBold" style="text-transform: uppercase;">{{config.axis[axisSpec.name].aggr}}</span>
<span class="lightBold" style="text-transform: uppercase;">{{getAxisInSingleDimension(axisSpec).aggr}}</span>
</span>
<span class="fa fa-close" ng-click="removeFromSingleDimension(axisSpec.name)"></span>
</div>
@ -177,8 +181,7 @@ limitations under the License.
<span style="vertical-align: middle; display: inline-block; margin-top: 3px;">Dynamic Parameters</span>
<span style="float: right;">
<div class="btn-group" role="group" aria-label="...">
<div type="button"
ng-click="parameterChanged()"
<div type="button" ng-click="parameterChanged()"
class="btn btn-default" style="padding: 2px 5px 2px 5px;">
<i class="fa fa-floppy-o" aria-hidden="true"></i>
</div>

8
zeppelin-web/src/app/tabledata/advanced-transformation.js
View file

@ -99,12 +99,20 @@ class AdvancedTransformation extends Transformation {
return `${axisSpec.name} (${axisSpec.type})`
},
getAxisInSingleDimension: (axisSpec) => {
return configInstance.axis[axisSpec.name]
},
toggleColumnPanel: () => {
configInstance.panel.columnPanelOpened =
!configInstance.panel.columnPanelOpened
self.emitConfig(configInstance)
},
clearConfig: () => {
},
toggleParameterPanel: () => {
configInstance.panel.parameterPanelOpened =
!configInstance.panel.parameterPanelOpened