fix #261

RhoInc · Dec 13, 2019 · f7037ad · f7037ad
1 parent 3437ef6
commit f7037ad
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 21 deletions.
diff --git a/build/webcharts.js b/build/webcharts.js
@@ -39,7 +39,7 @@
         this.initial_data = data;
 
         var startup = function startup(data) {
-            //connect this chart and its controls, if any
+            // connect this chart and its controls, if any
             if (_this.controls) {
                 _this.controls.targets.push(_this);
 
@@ -48,7 +48,7 @@
                 } else {
                     _this.controls.layout();
                 }
-            } //make sure container is visible (has height and width) before trying to initialize
+            } // make sure container is visible (has height and width) before trying to initialize
 
             var visible = d3.select(_this.div).property('offsetWidth') > 0 || test;
 
@@ -120,7 +120,7 @@
                     requiredCols.push(e.split);
                 }
 
-                if (e.values) {
+                if (e.values && e.checkColumns) {
                     for (var value in e.values) {
                         requiredVars.push('this.config.marks[' + i + "].values['" + value + "']");
                         requiredCols.push(value);
@@ -600,6 +600,7 @@
             this.config.marks && this.config.marks.length ? this.config.marks : [{}];
         this.config.marks.forEach(function(m, i) {
             m.id = m.id ? m.id : 'mark' + (i + 1);
+            m.checkColumns = m.checkColumns !== false ? true : false;
         });
         this.config.date_format = this.config.date_format || '%x';
         this.config.padding = this.config.padding !== undefined ? this.config.padding : 0.3;

diff --git a/build/webcharts.min.js b/build/webcharts.min.js
diff --git a/src/chart/draw/consolidateData/setDefaults.js b/src/chart/draw/consolidateData/setDefaults.js
@@ -25,6 +25,7 @@ export default function setDefaults() {
     this.config.marks = this.config.marks && this.config.marks.length ? this.config.marks : [{}];
     this.config.marks.forEach(function(m, i) {
         m.id = m.id ? m.id : 'mark' + (i + 1);
+        m.checkColumns = m.checkColumns !== false ? true : false;
     });
 
     this.config.date_format = this.config.date_format || '%x';

diff --git a/src/chart/init.js b/src/chart/init.js
@@ -26,7 +26,7 @@ export default function init(data, test = false) {
     this.initial_data = data;
 
     let startup = data => {
-        //connect this chart and its controls, if any
+        // connect this chart and its controls, if any
         if (this.controls) {
             this.controls.targets.push(this);
             if (!this.controls.ready) {
@@ -36,7 +36,7 @@ export default function init(data, test = false) {
             }
         }
 
-        //make sure container is visible (has height and width) before trying to initialize
+        // make sure container is visible (has height and width) before trying to initialize
         var visible = select(this.div).property('offsetWidth') > 0 || test;
         if (!visible) {
             console.warn(

diff --git a/src/chart/init/checkRequired.js b/src/chart/init/checkRequired.js
@@ -28,7 +28,7 @@ export default function checkRequired(data) {
                 requiredVars.push('this.config.marks[' + i + '].split');
                 requiredCols.push(e.split);
             }
-            if (e.values) {
+            if (e.values && e.checkColumns) {
                 for (const value in e.values) {
                     requiredVars.push('this.config.marks[' + i + "].values['" + value + "']");
                     requiredCols.push(value);

diff --git a/test-page/createChart/index.js b/test-page/createChart/index.js
@@ -38,18 +38,6 @@ const controls = new webCharts.createControls(
                 value_col: 'species',
                 label: 'Species',
             },
-            //{
-            //    type: 'radio',
-            //    option: 'x.domain.0',
-            //    label: 'X-domain Lower Limit',
-            //    values: ['minimum',0],
-            //},
-            //{
-            //    type: 'radio',
-            //    option: 'y.domain.0',
-            //    label: 'Y-domain Lower Limit',
-            //    values: ['minimum',0],
-            //},
             {
                 type: 'number',
                 option: 'x.domain.0',