muehe/onefinity-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cancel in macros and fixed issue

Browse Source
This commit is contained in:
sanjayk03-dev
2024-01-26 16:58:01 +05:30
parent ec757089f6
commit 4c188e16e0
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/js/control-view.js
View File

@@ -205,11 +205,11 @@ module.exports = {
item => !this.config.macrosList.some(compareItem => compareItem.gcode_file_name == item), item => !this.config.macrosList.some(compareItem => compareItem.gcode_file_name == item),
); );
console.log("filesWithNoMacros: ", filesWithNoMacros); console.log("filesWithNoMacros: ", filesWithNoMacros);
console.log("this.config.gcodeList", config.gcodeList); console.log("this.config.gcodeList", this.config.gcodeList);
const gcodelist = this.config.gcodeList.map(item => item.gcode_file_name); const gcodelist = this.config.gcodeList.map(item => item.gcode_file_name);
const unionSet = new Set([...filesWithNoMacros, ...gcodelist]); const unionSet = new Set([...filesWithNoMacros, ...gcodelist]);
const files = [...unionSet]; const files = [...unionSet];
console.log("files: ", files); console.log("final files: ", files);
return files; return files;
}, },
}, },
@@ -392,7 +392,7 @@ module.exports = {
} }
if (this.config.macrosList.some(obj => obj.gcode_file_name == file.name)) { if (this.config.macrosList.some(obj => obj.gcode_file_name == file.name)) {
console.log("It is a macros, remove it from macrosList"); console.log("It is also a macros");
// this.config.gcodeList.push(file.name); // this.config.gcodeList.push(file.name);
} }

7
src/js/macros.js
View File

@@ -225,7 +225,7 @@ module.exports = {
this.$set("newGcode[this.tab-1]", ""); this.$set("newGcode[this.tab-1]", "");
} else { } else {
if (!this.isPresent({ gcode_file_name: this.selectedValues[this.tab - 1] })) { if (!this.isPresent({ gcode_file_name: this.selectedValues[this.tab - 1] })) {
console.log("this is not default macros"); console.log("this is not default macros");
api.delete(`file/${this.selectedValues[this.tab - 1]}`); api.delete(`file/${this.selectedValues[this.tab - 1]}`);
this.$set("newGcode[this.tab-1]", ""); this.$set("newGcode[this.tab-1]", "");
this.config.macrosList = this.config.macrosList.filter( this.config.macrosList = this.config.macrosList.filter(
@@ -259,8 +259,9 @@ module.exports = {
} }
}, },
cancelMacros: function () { cancelMacros: function () {
document.getElementById(`macros-name-${this.tab - 1}`).value = ""; const defaultValue = this.config.macros[this.tab-1];
document.getElementById(`macros-color-${this.tab - 1}`).value = "#ffffff"; document.getElementById(`macros-name-${this.tab - 1}`).value = defaultValue.name;
document.getElementById(`macros-color-${this.tab - 1}`).value = defaultValue.color;
document.getElementById(`gcodeSelect-${this.tab - 1}`).value = "default"; document.getElementById(`gcodeSelect-${this.tab - 1}`).value = "default";
this.newGcode[this.tab - 1] = ""; this.newGcode[this.tab - 1] = "";
}, },

1
src/resources/config-template.json
View File

@@ -652,6 +652,7 @@
} }
} }
}, },
"gcodeList":{ "gcodeList":{
"type":"list", "type":"list",
"default":[], "default":[],