Fix bug on Frame condition using isnull or notnull

minjk-bl · minjk-bl · commit e742830193c1 · 2023-11-17T05:29:58.000+09:00
diff --git a/visualpython/js/m_apps/Frame.js b/visualpython/js/m_apps/Frame.js
@@ -2767,7 +2767,7 @@ define([
                                 var condText = $(condTextTag[i]).prop('checked');
                                 var operConn = $(operConnTag[i]).val();
                                 var condObj = {};
-                                if (col !== '' && oper !== '' && cond !== '') {
+                                if (col !== '' && oper !== '' && (oper == 'isnull()' || oper === 'notnull()' || cond !== '')) {
                                     condObj = {
                                         oper: oper,
                                         cond: com_util.convertToStr(cond, condText)
@@ -2808,7 +2808,7 @@ define([
                             var condText = $(condTextTag[i]).prop('checked');
                             var operConn = $(operConnTag[i]).val();
                             var condObj = {};
-                            if (col !== '' && oper !== '' && cond !== '') {
+                            if (col !== '' && oper !== '' && (oper == 'isnull()' || oper === 'notnull()' || cond !== '')) {
                                 condObj = {
                                     colName: col,
                                     oper: oper,
@@ -2861,7 +2861,7 @@ define([
                             var condText = $(condTextTag[i]).prop('checked');
                             var operConn = $(operConnTag[i]).val();
                             var condObj = {};
-                            if (col !== '' && oper !== '' && cond !== '') {
+                            if (col !== '' && oper !== '' && (oper == 'isnull()' || oper === 'notnull()' || cond !== '')) {
                                 condObj = {
                                     colName: col,
                                     oper: oper,
@@ -2894,7 +2894,7 @@ define([
                                 var condText = $(condTextTag[i]).prop('checked');
                                 var operConn = $(operConnTag[i]).val();
                                 var condObj = {};
-                                if (col !== '' && oper !== '' && cond !== '') {
+                                if (col !== '' && oper !== '' && (oper == 'isnull()' || oper === 'notnull()' || cond !== '')) {
                                     condObj = {
                                         oper: oper,
                                         cond: com_util.convertToStr(cond, condText)
