\ No newline at end of file
diff --git a/ui/src/app/components/widget/action/manage-widget-actions.directive.js b/ui/src/app/components/widget/action/manage-widget-actions.directive.js
index bcaa96aea2..25c7df74a8 100644
--- a/ui/src/app/components/widget/action/manage-widget-actions.directive.js
+++ b/ui/src/app/components/widget/action/manage-widget-actions.directive.js
@@ -37,6 +37,7 @@ import './manage-widget-actions.scss';
import thingsboardMaterialIconSelect from '../../material-icon-select.directive';
import WidgetActionDialogController from './widget-action-dialog.controller';
+import CustomActionPrettyEditor from './custom-action-pretty-editor.directive';
/* eslint-disable import/no-unresolved, import/default */
@@ -45,7 +46,7 @@ import widgetActionDialogTemplate from './widget-action-dialog.tpl.html';
/* eslint-enable import/no-unresolved, import/default */
-export default angular.module('thingsboard.directives.widgetActions', [thingsboardMaterialIconSelect])
+export default angular.module('thingsboard.directives.widgetActions', [thingsboardMaterialIconSelect, CustomActionPrettyEditor])
.controller('WidgetActionDialogController', WidgetActionDialogController)
.directive('tbManageWidgetActions', ManageWidgetActions)
.name;
diff --git a/ui/src/app/components/widget/action/widget-action-dialog.controller.js b/ui/src/app/components/widget/action/widget-action-dialog.controller.js
index d2ac7fbb1f..22afa80210 100644
--- a/ui/src/app/components/widget/action/widget-action-dialog.controller.js
+++ b/ui/src/app/components/widget/action/widget-action-dialog.controller.js
@@ -14,7 +14,7 @@
* limitations under the License.
*/
/*@ngInject*/
-export default function WidgetActionDialogController($scope, $mdDialog, $filter, $q, dashboardService, dashboardUtils, types, utils,
+export default function WidgetActionDialogController($scope, $mdDialog, $filter, $q, dashboardService, dashboardUtils, types, toast, utils,
isAdd, fetchDashboardStates, actionSources, widgetActions, action) {
var vm = this;
@@ -41,7 +41,7 @@ export default function WidgetActionDialogController($scope, $mdDialog, $filter,
vm.actionSourceName = actionSourceName;
vm.targetDashboardStateSearchTextChanged = function() {
- }
+ };
vm.dashboardStateSearch = dashboardStateSearch;
vm.cancel = cancel;
@@ -155,6 +155,12 @@ export default function WidgetActionDialogController($scope, $mdDialog, $filter,
case vm.types.widgetActionTypes.custom.value:
result.customFunction = action.customFunction;
break;
+ case vm.types.widgetActionTypes.customPretty.value:
+ result.customResources = action.customResources;
+ result.customHtml = action.customHtml;
+ result.customCss = action.customCss;
+ result.customFunction = action.customFunction;
+ break;
}
return result;
}
diff --git a/ui/src/app/components/widget/action/widget-action-dialog.tpl.html b/ui/src/app/components/widget/action/widget-action-dialog.tpl.html
index 09e3120d36..ce182b8288 100644
--- a/ui/src/app/components/widget/action/widget-action-dialog.tpl.html
+++ b/ui/src/app/components/widget/action/widget-action-dialog.tpl.html
@@ -123,6 +123,7 @@
function-args="{{ ['$event', 'widgetContext', 'entityId', 'entityName', 'additionalParams'] }}"
validation-args="{{ [] }}">
+
diff --git a/ui/src/app/components/widget/widget.controller.js b/ui/src/app/components/widget/widget.controller.js
index 996e808a39..632a6c9e28 100644
--- a/ui/src/app/components/widget/widget.controller.js
+++ b/ui/src/app/components/widget/widget.controller.js
@@ -17,12 +17,15 @@ import $ from 'jquery';
import 'javascript-detect-element-resize/detect-element-resize';
import Subscription from '../../api/subscription';
+import 'oclazyload';
+import cssjs from '../../../vendor/css.js/css';
+
/* eslint-disable angular/angularelement */
/*@ngInject*/
-export default function WidgetController($scope, $state, $timeout, $window, $element, $q, $log, $injector, $filter, $compile, tbRaf, types, utils, timeService,
+export default function WidgetController($scope, $state, $timeout, $window, $ocLazyLoad, $element, $q, $log, $injector, $filter, $compile, tbRaf, types, utils, timeService,
datasourceService, alarmService, entityService, dashboardService, deviceService, visibleRect, isEdit, isMobile, dashboardTimewindow,
- dashboardTimewindowApi, dashboard, widget, aliasController, stateController, widgetInfo, widgetType) {
+ dashboardTimewindowApi, dashboard, widget, aliasController, stateController, widgetInfo, widgetType, toast) {
var vm = this;
@@ -38,6 +41,12 @@ export default function WidgetController($scope, $state, $timeout, $window, $ele
vm.dashboardTimewindow = dashboardTimewindow;
+ $window.lazyLoad = $ocLazyLoad;
+ $window.cssjs = cssjs;
+
+ var cssParser = new cssjs();
+ cssParser.testMode = false;
+
var gridsterItemInited = false;
var subscriptionInited = false;
var widgetSizeDetected = false;
@@ -522,9 +531,95 @@ export default function WidgetController($scope, $state, $timeout, $window, $ele
}
}
break;
+ case types.widgetActionTypes.customPretty.value:
+ var customPrettyFunction = descriptor.customFunction;
+ var customHtml = descriptor.customHtml;
+ var customCss = descriptor.customCss;
+ var customResources = descriptor.customResources;
+ var actionNamespace = 'custom-action-pretty-'+descriptor.name.toLowerCase();
+ var htmlTemplate = '';
+ if (angular.isDefined(customHtml) && customHtml.length > 0) {
+ htmlTemplate = customHtml;
+ }
+ loadCustomActionResources(actionNamespace, customCss, customResources).then(
+ function success() {
+ if (angular.isDefined(customPrettyFunction) && customPrettyFunction.length > 0) {
+ try {
+ if (!additionalParams) {
+ additionalParams = {};
+ }
+ var customActionPrettyFunction = new Function('$event', 'widgetContext', 'entityId', 'entityName', 'htmlTemplate', 'additionalParams', customPrettyFunction);
+ customActionPrettyFunction($event, widgetContext, entityId, entityName, htmlTemplate, additionalParams);
+ } catch (e) {
+ //
+ }
+ }
+ },
+ function fail(errorMessages) {
+ processResourcesLoadErrors(errorMessages);
+ }
+ );
+ break;
}
}
+ function loadCustomActionResources(actionNamespace, customCss, customResources) {
+ var deferred = $q.defer();
+
+ if (angular.isDefined(customCss) && customCss.length > 0) {
+ cssParser.cssPreviewNamespace = actionNamespace;
+ cssParser.createStyleElement(actionNamespace, customCss, 'nonamespace');
+ }
+
+ function loadNextOrComplete(i) {
+ i++;
+ if (i < customResources.length) {
+ loadNext(i);
+ } else {
+ if (errors.length > 0) {
+ deferred.reject(errors);
+ } else {
+ deferred.resolve();
+ }
+ }
+ }
+
+ function loadNext(i) {
+ var resourceUrl = customResources[i].url;
+ if (resourceUrl && resourceUrl.length > 0) {
+ $ocLazyLoad.load(resourceUrl).then(
+ function success () {
+ loadNextOrComplete(i);
+ },
+ function fail() {
+ errors.push('Failed to load custom action resource: \'' + resourceUrl + '\'');
+ loadNextOrComplete(i);
+ }
+ );
+ } else {
+ loadNextOrComplete(i);
+ }
+ }
+
+ if (angular.isDefined(customResources) && customResources.length > 0) {
+ var errors = [];
+ loadNext(0);
+ } else {
+ deferred.resolve();
+ }
+
+ return deferred.promise;
+ }
+
+ function processResourcesLoadErrors(errorMessages) {
+ var messageToShow = '';
+ for (var e in errorMessages) {
+ var error = errorMessages[e];
+ messageToShow += '
' + error + '
';
+ }
+ toast.showError(messageToShow);
+ }
+
function getActiveEntityInfo() {
var entityInfo = widgetContext.activeEntityInfo;
if (!entityInfo) {
diff --git a/ui/src/app/locale/locale.constant-en_US.json b/ui/src/app/locale/locale.constant-en_US.json
index 9f4a6ceb87..918b3b4a35 100644
--- a/ui/src/app/locale/locale.constant-en_US.json
+++ b/ui/src/app/locale/locale.constant-en_US.json
@@ -1512,6 +1512,7 @@
"settings-schema": "Settings schema",
"datakey-settings-schema": "Data key settings schema",
"javascript": "Javascript",
+ "js": "JS",
"remove-widget-type-title": "Are you sure you want to remove the widget type '{{widgetName}}'?",
"remove-widget-type-text": "After the confirmation the widget type and all related data will become unrecoverable.",
"remove-widget-type": "Remove widget type",
@@ -1528,6 +1529,7 @@
"update-dashboard-state": "Update current dashboard state",
"open-dashboard": "Navigate to other dashboard",
"custom": "Custom action",
+ "custom-pretty": "Custom action (with HTML template)",
"target-dashboard-state": "Target dashboard state",
"target-dashboard-state-required": "Target dashboard state is required",
"set-entity-from-widget": "Set entity from widget",
diff --git a/ui/src/app/locale/locale.constant-ru_RU.json b/ui/src/app/locale/locale.constant-ru_RU.json
index e89ff22f4a..504344c749 100644
--- a/ui/src/app/locale/locale.constant-ru_RU.json
+++ b/ui/src/app/locale/locale.constant-ru_RU.json
@@ -1464,6 +1464,7 @@
"update-dashboard-state": "Обновить текущее состояние дашборда",
"open-dashboard": "Перейти к другому дашборду",
"custom": "Пользовательское действие",
+ "custom-pretty": "Пользовательское действие (с HTML шаблоном)",
"target-dashboard-state": "Целевое состояние дашборда",
"target-dashboard-state-required": "Целевое состояние дашборда обязательно",
"set-entity-from-widget": "Установить объект из виджета",
diff --git a/ui/src/app/locale/locale.constant-uk_UA.json b/ui/src/app/locale/locale.constant-uk_UA.json
index 03f446d8f3..8c2e9c6def 100644
--- a/ui/src/app/locale/locale.constant-uk_UA.json
+++ b/ui/src/app/locale/locale.constant-uk_UA.json
@@ -2032,6 +2032,7 @@
"update-dashboard-state": "Оновити поточний стан панелі візуалізації",
"open-dashboard": "Перейти до іншої панелі візуалізації",
"custom": "Дії користувачів",
+ "custom-pretty": "Дії користувачів (з HTML шаблоном)",
"target-dashboard-state": "Цільовий стан панелі візуалізації",
"target-dashboard-state-required": "Необхідно вказати цільовий стан панелі візуалізації",
"set-entity-from-widget": "Встановити сутність із віджета",