Fix DataSelector slicing, indexing 0 bug

minjk-bl · minjk-bl · commit c37cb62d2b13 · 2023-09-08T14:39:44.000+09:00
diff --git a/visualpython/js/com/component/DataSelector.js b/visualpython/js/com/component/DataSelector.js
@@ -766,7 +766,7 @@ define([
                 case 'list':
                     code.append(data);
                     // start / end value
-                    if ((slicingStart1 && slicingStart1 != '') || (slicingEnd1 && slicingEnd1 != '')) {
+                    if ((slicingStart1 != null && slicingStart1 != '') || (slicingEnd1 != null && slicingEnd1 != '')) {
                         code.appendFormat('[{0}:{1}]', slicingStart1, slicingEnd1);
                     }
                     break;
@@ -781,7 +781,7 @@ define([
                         let colCode = '';
                         if (ndRowType == 'slicing') {
                             // slicing start / end value
-                            if ((slicingStart1 && slicingStart1 != '') || (slicingEnd1 && slicingEnd1 != '')) {
+                            if ((slicingStart1 != null && slicingStart1 != '') || (slicingEnd1 != null && slicingEnd1 != '')) {
                                 rowCode = com_util.formatString('{0}:{1}', slicingStart1, slicingEnd1);
                             }
                         } else {
@@ -802,7 +802,7 @@ define([
                         }
                         if (ndColType == 'slicing') {
                             // slicing start / end value
-                            if ((slicingStart2 && slicingStart2 != '') || (slicingEnd2 && slicingEnd2 != '')) {
+                            if ((slicingStart2 != null && slicingStart2 != '') || (slicingEnd2 != null && slicingEnd2 != '')) {
                                 colCode = com_util.formatString('{0}:{1}', slicingStart2, slicingEnd2);
                             }
                         } else {
@@ -830,7 +830,7 @@ define([
                         }
                     } else {
                         // start / end value
-                        if ((slicingStart1 && slicingStart1 != '') || (slicingEnd1 && slicingEnd1 != '')) {
+                        if ((slicingStart1 != null && slicingStart1 != '') || (slicingEnd1 != null && slicingEnd1 != '')) {
                             code.appendFormat('[{0}:{1}]', slicingStart1, slicingEnd1);
                         }
                     }

Original file line number	Diff line number	Diff line change
`@@ -766,7 +766,7 @@ define([`
`766`	`766`	`case 'list':`
`767`	`767`	`code.append(data);`
`768`	`768`	`// start / end value`
`769`		`- if ((slicingStart1 && slicingStart1 != '') \|\| (slicingEnd1 && slicingEnd1 != '')) {`
	`769`	`+ if ((slicingStart1 != null && slicingStart1 != '') \|\| (slicingEnd1 != null && slicingEnd1 != '')) {`
`770`	`770`	`code.appendFormat('[{0}:{1}]', slicingStart1, slicingEnd1);`
`771`	`771`	`}`
`772`	`772`	`break;`
`@@ -781,7 +781,7 @@ define([`
`781`	`781`	`let colCode = '';`
`782`	`782`	`if (ndRowType == 'slicing') {`
`783`	`783`	`// slicing start / end value`
`784`		`- if ((slicingStart1 && slicingStart1 != '') \|\| (slicingEnd1 && slicingEnd1 != '')) {`
	`784`	`+ if ((slicingStart1 != null && slicingStart1 != '') \|\| (slicingEnd1 != null && slicingEnd1 != '')) {`
`785`	`785`	`rowCode = com_util.formatString('{0}:{1}', slicingStart1, slicingEnd1);`
`786`	`786`	`}`
`787`	`787`	`} else {`
`@@ -802,7 +802,7 @@ define([`
`802`	`802`	`}`
`803`	`803`	`if (ndColType == 'slicing') {`
`804`	`804`	`// slicing start / end value`
`805`		`- if ((slicingStart2 && slicingStart2 != '') \|\| (slicingEnd2 && slicingEnd2 != '')) {`
	`805`	`+ if ((slicingStart2 != null && slicingStart2 != '') \|\| (slicingEnd2 != null && slicingEnd2 != '')) {`
`806`	`806`	`colCode = com_util.formatString('{0}:{1}', slicingStart2, slicingEnd2);`
`807`	`807`	`}`
`808`	`808`	`} else {`
`@@ -830,7 +830,7 @@ define([`
`830`	`830`	`}`
`831`	`831`	`} else {`
`832`	`832`	`// start / end value`
`833`		`- if ((slicingStart1 && slicingStart1 != '') \|\| (slicingEnd1 && slicingEnd1 != '')) {`
	`833`	`+ if ((slicingStart1 != null && slicingStart1 != '') \|\| (slicingEnd1 != null && slicingEnd1 != '')) {`
`834`	`834`	`code.appendFormat('[{0}:{1}]', slicingStart1, slicingEnd1);`
`835`	`835`	`}`
`836`	`836`	`}`