fix #65

algenty · Oct 29, 2019 · 642702f · 642702f
1 parent 4c3210c
commit 642702f
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 50 deletions.
diff --git a/README.md b/README.md
@@ -39,6 +39,7 @@ See more example at draw.io
   - Variables support in download input url ([See example](https://algenty.github.io/flowcharting-repository/images/url_download_variable_ani.png))
 ### Fixed
   - Fix download url on first load.
+  - Fix value null for string [(issue #65)](https://github.com/algenty/grafana-flowcharting/issues/65)
 
 ## [[0.5.0]](https://algenty.github.io/flowcharting-repository/archives/agenty-flowcharting-panel-0.5.0.zip) - 2019-10-17
 ### Added  

diff --git a/dist/README.md b/dist/README.md
@@ -39,6 +39,7 @@ See more example at draw.io
   - Variables support in download input url ([See example](https://algenty.github.io/flowcharting-repository/images/url_download_variable_ani.png))
 ### Fixed
   - Fix download url on first load.
+  - Fix value null for string [(issue #65)](https://github.com/algenty/grafana-flowcharting/issues/65)
 
 ## [[0.5.0]](https://algenty.github.io/flowcharting-repository/archives/agenty-flowcharting-panel-0.5.0.zip) - 2019-10-17
 ### Added  

diff --git a/dist/libs/mxgraph/javascript/dist/styles/grapheditor.css b/dist/libs/mxgraph/javascript/dist/styles/grapheditor.css
@@ -21,7 +21,7 @@
 	cursor:pointer !important;
 }
 .geBackgroundPage {
-  	box-shadow:0px 0px 2px 1px #e9e9e9;
+  	box-shadow:0px 0px 2px 1px #d1d1d1;
 }
 .geSidebarContainer a, .geMenubarContainer a, .geToolbar a {
 	color:#000000;
@@ -93,20 +93,16 @@
 	margin-top:-5px;
 	padding:4px 6px 4px 6px;
 	font-size:12px;
-	background-image: -webkit-linear-gradient(top,#dff0d8 0,#c8e5bc 100%);
-    background-image: -o-linear-gradient(top,#dff0d8 0,#c8e5bc 100%);
-    background-image: -webkit-gradient(linear,left top,left bottom,from(#dff0d8),to(#c8e5bc));
-    background-image: linear-gradient(to bottom,#dff0d8 0,#c8e5bc 100%);
+	background: -webkit-linear-gradient(top,#dff0d8 0,#c8e5bc 100%);
+    background: -o-linear-gradient(top,#dff0d8 0,#c8e5bc 100%);
+    background: -webkit-gradient(linear,left top,left bottom,from(#dff0d8),to(#c8e5bc));
+    background: linear-gradient(to bottom,#dff0d8 0,#c8e5bc 100%);
     filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffc8e5bc', GradientType=0);
     background-repeat: repeat-x;
     border:1px solid #b2dba1;
 	border-radius:3px;
 	color:#3c763d !important;
 }
-.geStatusMessage:hover {
-	background:#c8e5bc;
-	border-color:#b2dba1;
-}
 .geAlert {
 	position:absolute;
 	white-space:nowrap;
@@ -234,14 +230,28 @@
 	vertical-align:middle;
 }
 .geMenubarContainer .geItem, .geToolbar .geItem {
-	padding:6px 8px 6px 8px;
+	padding:6px 6px 6px 9px;
 	cursor:default;
 }
 .geMenubarContainer .geItem:hover {
-	background: #e0e0e0;
+	background: #eee;
+	border-radius:2px;	
 }
 .geMenubarContainer .geItem:active {
-	background: #e8f0fe;
+	background: #F8C382;
+}
+.geToolbarContainer .geButton:hover {
+	opacity:1;
+	_filter:none !important;
+	background: #eee;
+	border-radius:2px;
+}
+.geToolbarContainer .geButton:active, .geToolbarContainer .geLabel:active {
+	background: #F8C382;
+}
+.geToolbarContainer .geLabel:hover {
+	background: #eee;
+	border-radius:2px;
 }
 .geToolbarButton {
 	opacity: 0.6;
@@ -254,7 +264,7 @@
 }
 .geMenubar a.geStatus {
 	color:#888888;
-	padding-left:6px;
+	padding-left:12px;
 	display:inline-block;
 	cursor:default !important;
 }
@@ -273,7 +283,7 @@
 	overflow:hidden;
 }
 .geToolbar {
-	padding:1px 0px 0px 4px;
+	padding:1px 0px 0px 6px;
 	border-top:1px solid #dadce0;
 	-webkit-box-shadow: inset 0 1px 0 0 #fff;
 	-moz-box-shadow: inset 0 1px 0 0 #fff;
@@ -300,14 +310,6 @@
 	opacity:0.6;
 	_filter:alpha(opacity=60);
 }
-.geToolbarContainer .geButton:hover {
-	opacity:1;
-	_filter:none !important;
-	background: #e0e0e0;
-}
-.geToolbarContainer .geButton:active {
-	background: #e8f0fe;
-}
 div.mxWindow .geButton {
 	margin: -1px 2px 2px 2px;
 	padding: 1px 2px 2px 1px;
@@ -318,18 +320,6 @@ div.mxWindow .geButton {
 	cursor:pointer;
 	padding:3px 5px 3px 5px;
 	border:1px solid transparent;
-	opacity:0.6;
-	filter:alpha(opacity=60);
-}
-.geToolbarContainer .geLabel:hover {
-	background: #e0e0e0;
-	opacity:0.9;
-	filter:alpha(opacity=90) !important;
-}
-.geToolbarContainer .geLabel:active {
-	background: #e8f0fe;
-	opacity:1;
-	filter:none !important;
 }
 .geToolbarContainer .mxDisabled:hover {
 	border:1px solid transparent !important;
@@ -355,7 +345,7 @@ div.mxWindow .geButton {
 	padding-left:10px;
 	_padding:2px;
 	_padding-left:6px;
-	padding-bottom:12px;
+	padding-bottom:6px;
 	overflow:hidden;
 }
 .geSidebarContainer .geTitle {
@@ -372,7 +362,11 @@ div.mxWindow .geButton {
 	line-height:1.4em;
 }
 .geSidebarContainer .geTitle:hover {
-	background-color:#e0e0e0;
+	background: #eee;
+	border-radius:2px;
+}
+.geSidebarContainer .geTitle:active {
+	background-color:#F8C382;
 }
 .geSidebarContainer .geDropTarget {
 	border-radius:10px;
@@ -539,24 +533,32 @@ div.mxWindow .geButton {
 .geBigButton {
 	color:#ffffff;
 	border: none;
-	padding:10px;
-	font-size:14pt;
+	padding:4px 10px;
+	font-size:14px;
 	white-space: nowrap;
-	border-radius:6px;
-	text-shadow: rgb(41, 89, 137) 0px 1px 0px;
-	background-color:#428bca;
-	background-image:linear-gradient(rgb(70, 135, 206) 0px, rgb(48, 104, 162) 100%);
-	-webkit-box-shadow: rgba(255, 255, 255, 0.0980392) 0px 1px 0px 0px inset, rgba(0, 0, 0, 0.2) 0px 1px 1px 0px;
-	-moz-box-shadow: rgba(255, 255, 255, 0.0980392) 0px 1px 0px 0px inset, rgba(0, 0, 0, 0.2) 0px 1px 1px 0px;
-	box-shadow: rgba(255, 255, 255, 0.0980392) 0px 1px 0px 0px inset, rgba(0, 0, 0, 0.2) 0px 1px 1px 0px;
+	border-radius:3px;
+	background-color:#0052cc;
+	currsor:pointer;
+	transition: background-color 0.1s ease-out;
+	overflow:hidden;
+	text-overflow: ellipsis;
 }
 .geBigButton:hover {
-	background-color:#2d6ca2;
-	background-image: linear-gradient(rgb(90, 148, 211) 0px, rgb(54, 115, 181) 100%);
+	background-color:#0065ff;
 }
 .geBigButton:active {
-	background-color: rgb(54, 115, 181);
-	background-image: none;
+	background-color:#0747a6;
+}
+html body .geBigStandardButton {
+	color: #344563;
+	background-color: rgba(9, 30, 66, 0.08);
+}
+html body .geBigStandardButton:hover {
+	background-color: rgba(9, 30, 66, 0.13);
+}
+html body .geBigStandardButton:active {
+	background-color: #F8C382;
+	color: #600000;
 }
 @media print {
 	div.geNoPrint { display: none !important; }

diff --git a/dist/rule_class.js b/dist/rule_class.js
@@ -517,6 +517,8 @@ var Rule = function () {
       }
 
       if (this.data.type === 'string') {
+        if (value === null) return '-';
+
         if (_.isArray(value)) {
           value = value.join(', ');
         }

diff --git a/src/rule_class.js b/src/rule_class.js
@@ -621,6 +621,7 @@ export default class Rule {
     }
 
     if (this.data.type === 'string') {
+      if (value === null) return '-';
       if (_.isArray(value)) {
         value = value.join(', ');
       }
@@ -660,7 +661,6 @@ export default class Rule {
       // }
       return date.format(this.data.dateFormat);
     }
-
     return value;
   }