mirror of
https://github.com/apache/zeppelin
synced 2026-05-24 09:38:26 +00:00
Add %angular display system
This commit is contained in:
parent
a7c77b8775
commit
bb52d7bf39
3 changed files with 29 additions and 1 deletions
|
|
@ -48,6 +48,7 @@ public class InterpreterResult implements Serializable {
|
|||
public static enum Type {
|
||||
TEXT,
|
||||
HTML,
|
||||
ANGULAR,
|
||||
TABLE,
|
||||
IMG,
|
||||
SVG,
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
* @author anthonycorbacho
|
||||
*/
|
||||
angular.module('zeppelinWebApp')
|
||||
.controller('ParagraphCtrl', function($scope, $rootScope, $route, $window, $element, $routeParams, $location, $timeout) {
|
||||
.controller('ParagraphCtrl', function($scope, $rootScope, $route, $window, $element, $routeParams, $location, $timeout, $compile) {
|
||||
|
||||
$scope.paragraph = null;
|
||||
$scope.editor = null;
|
||||
|
|
@ -56,6 +56,8 @@ angular.module('zeppelinWebApp')
|
|||
$scope.setGraphMode($scope.getGraphMode(), false, false);
|
||||
} else if ($scope.getResultType() === 'HTML') {
|
||||
$scope.renderHtml();
|
||||
} else if ($scope.getResultType() === 'ANGULAR') {
|
||||
$scope.renderAngular();
|
||||
}
|
||||
};
|
||||
|
||||
|
|
@ -77,6 +79,24 @@ angular.module('zeppelinWebApp')
|
|||
|
||||
};
|
||||
|
||||
$scope.renderAngular = function() {
|
||||
var retryRenderer = function() {
|
||||
if ($('#p'+$scope.paragraph.id+'_angular').length) {
|
||||
try {
|
||||
$('#p'+$scope.paragraph.id+'_angular').html($scope.paragraph.result.msg);
|
||||
$compile($('#p'+$scope.paragraph.id+'_angular').contents())($scope);
|
||||
} catch(err) {
|
||||
console.log('ANGULAR rendering error %o', err);
|
||||
}
|
||||
} else {
|
||||
$timeout(retryRenderer,10);
|
||||
}
|
||||
};
|
||||
$timeout(retryRenderer);
|
||||
|
||||
};
|
||||
|
||||
|
||||
var initializeDefault = function() {
|
||||
var config = $scope.paragraph.config;
|
||||
|
||||
|
|
@ -210,6 +230,8 @@ angular.module('zeppelinWebApp')
|
|||
}
|
||||
} else if (newType === 'HTML') {
|
||||
$scope.renderHtml();
|
||||
} else if (newType === 'ANGULAR') {
|
||||
$scope.renderAngular();
|
||||
}
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -353,6 +353,11 @@ limitations under the License.
|
|||
ng-Init="loadResultType(paragraph.result)">
|
||||
</div>
|
||||
|
||||
<div id="p{{paragraph.id}}_angular"
|
||||
ng-if="paragraph.result.type == 'ANGULAR'"
|
||||
ng-Init="loadResultType(paragraph.result)">
|
||||
</div>
|
||||
|
||||
<img id="{{paragraph.id}}_img"
|
||||
ng-if="paragraph.result.type == 'IMG'"
|
||||
ng-Init="loadResultType(paragraph.result)"
|
||||
|
|
|
|||
Loading…
Reference in a new issue