dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rule Chain UI: IE11 fixes.

Browse Source
This commit is contained in:
Igor Kulikov 2018-04-12 17:37:19 +03:00
parent fbfac3e6b2
commit 7b5dbddf63
8 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rule-engine/rule-engine-components/src/main/resources/public/static/rulenode/rulenode-core-config.js
View File

File diff suppressed because one or more lines are too long

2
ui/src/app/components/js-func.directive.js
View File

@ -61,7 +61,7 @@ function JsFunc($compile, $templateCache, toast, utils, $translate) {
scope.functionArgsString = ''; scope.functionArgsString = '';
for (var i in scope.functionArgs) { for (var i = 0; i < scope.functionArgs.length; i++) {
if (scope.functionArgsString.length > 0) { if (scope.functionArgsString.length > 0) {
scope.functionArgsString += ', '; scope.functionArgsString += ', ';
} }

2
ui/src/app/components/js-func.scss
View File

@ -26,7 +26,7 @@ tb-js-func {
.tb-js-func-panel { .tb-js-func-panel {
margin-left: 15px; margin-left: 15px;
border: 1px solid #C0C0C0; border: 1px solid #C0C0C0;
height: 100%; height: calc(100% - 80px);
#tb-javascript-input { #tb-javascript-input {
min-width: 200px; min-width: 200px;
width: 100%; width: 100%;

6
ui/src/app/components/js-func.tpl.html
View File

@ -15,14 +15,14 @@
limitations under the License. limitations under the License.
--> -->
<div style="background: #fff;" ng-class="{'tb-disabled': disabled, 'fill-height': fillHeight}" tb-expand-fullscreen fullscreen-zindex="100" expand-button-id="expand-button" on-fullscreen-changed="onFullscreenChanged()" layout="column"> <div style="background: #fff;" ng-class="{'tb-disabled': disabled, 'fill-height': fillHeight}" tb-expand-fullscreen fullscreen-zindex="100" expand-button-id="expand-button" on-fullscreen-changed="onFullscreenChanged()">
<div layout="row" layout-align="start center" style="height: 40px;"> <div layout="row" layout-align="start center" style="height: 40px;">
<label class="tb-title no-padding">function {{ functionName }}({{ functionArgsString }}) {</label> <label class="tb-title no-padding">function {{ functionName }}({{ functionArgsString }}) {</label>
<span flex></span> <span flex></span>
<div id="expand-button" layout="column" aria-label="Fullscreen" class="md-button md-icon-button tb-md-32 tb-fullscreen-button-style"></div> <div id="expand-button" layout="column" aria-label="Fullscreen" class="md-button md-icon-button tb-md-32 tb-fullscreen-button-style"></div>
</div> </div>
<div flex id="tb-javascript-panel" class="tb-js-func-panel" layout="column"> <div id="tb-javascript-panel" class="tb-js-func-panel">
<div flex id="tb-javascript-input" ng-class="{'fill-height': fillHeight}" <div id="tb-javascript-input" ng-class="{'fill-height': fillHeight}"
ui-ace="jsEditorOptions" ui-ace="jsEditorOptions"
ng-readonly="disabled" ng-readonly="disabled"
ng-model="functionBody"> ng-model="functionBody">

2
ui/src/app/components/kv-map.tpl.html
View File

@ -17,7 +17,7 @@
--> -->
<section layout="column" class="tb-kv-map"> <section layout="column" class="tb-kv-map">
<label translate class="tb-title no-padding">{{ vm.titleText }}</label> <label translate class="tb-title no-padding">{{ vm.titleText }}</label>
<div flex layout="row" <div layout="row"
ng-repeat="keyVal in vm.kvList track by $index" ng-repeat="keyVal in vm.kvList track by $index"
style="max-height: 40px;" layout-align="start center"> style="max-height: 40px;" layout-align="start center">
<md-input-container flex md-no-float class="md-block" <md-input-container flex md-no-float class="md-block"

2
ui/src/app/event/event-content-dialog.controller.js
View File

@ -68,7 +68,7 @@ export default function EventContentDialogController($mdDialog, types, content,
var lines = vm.content.split('\n'); var lines = vm.content.split('\n');
newHeight = 16 * lines.length + 16; newHeight = 16 * lines.length + 16;
var maxLineLength = 0; var maxLineLength = 0;
for (var i in lines) { for (var i = 0; i < lines.length; i++) {
var line = lines[i].replace(/\t/g, ' ').replace(/\n/g, ''); var line = lines[i].replace(/\t/g, ' ').replace(/\n/g, '');
var lineLength = line.length; var lineLength = line.length;
maxLineLength = Math.max(maxLineLength, lineLength); maxLineLength = Math.max(maxLineLength, lineLength);

1
ui/src/app/rulechain/rulechain.scss
View File

@ -173,6 +173,7 @@
max-width: 150px; max-width: 150px;
min-height: 32px; min-height: 32px;
max-height: 32px; max-height: 32px;
height: 32px;
padding: 5px 10px; padding: 5px 10px;
border-radius: 5px; border-radius: 5px;
background-color: #F15B26; background-color: #F15B26;

4
ui/src/app/rulechain/script/node-script-test.scss
View File

@ -20,6 +20,10 @@ md-dialog.tb-node-script-test-dialog {
&.md-dialog-fullscreen { &.md-dialog-fullscreen {
min-height: 100%; min-height: 100%;
min-width: 100%; min-width: 100%;
max-height: 100%;
max-width: 100%;
width: 100%;
height: 100%;
border-radius: 0; border-radius: 0;
} }