filtering Gcodes

src/js/control-view.js

@@ -41,7 +41,9 @@ module.exports = {
             deleteGCode: false,
             tab: "auto",
             ask_home: true,
-            showGcodeMessage: false
+            showGcodeMessage: false,
+            gcode_files:this.state.files.filter(item => !this.config.macrosList.some(compareItem => compareItem.gcode_file_name === item.gcode_file_name))
+            .map(item => item.gcode_file_name)
         };
     },
 
@@ -285,6 +287,8 @@ module.exports = {
                 return;
             }
 
+            console.log(file,file_time);
+
             this.last_file = file;
             this.last_file_time = file_time;
 

src/js/macros.js

@@ -23,7 +23,7 @@ module.exports = {
         "default",
       ],
       newGcode: ["", "", "", "", "", "", "", ""],
-      macrosList: this.config.macros.map((item) => item.gcode_file_name),
+      macrosList: this.config.macrosList.map((el) => el.gcode_file_name),
     };
   },
   computed: {
@@ -63,7 +63,7 @@ module.exports = {
       } else {
         this.newGcode[this.tab - 1] = "";
       }
-      console.log(this.newGcode[this.tab-1]);
+      console.log(this.newGcode[this.tab - 1]);
     },
     upload: function (e) {
       const files = e.target.files || e.dataTransfer.files;