Egalware/cms_thermo_active
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop

Browse Source
This commit is contained in:
Alessandro Francia
2018-05-30 12:27:18 +02:00
parent 74bfd366c1 a298f4d8a0
commit 8337abcffd
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Step/wwwroot/src/components/tooling-equipment.ts
+2 -2
View File
@@ -101,7 +101,7 @@ export default class toolingEquipment extends Vue {
this.toolsConfiguration = (this.$store.state as AppModel).tooling.toolsConfiguration;
this.edgeConfiguration = (this.$store.state as AppModel).tooling.edgesConfiguration;
this.selectedTool = item;
this.copySelectedTool = JSON.stringify(item);
this.copySelectedTool = Object.assign({}, item);
this.enableParameters = true;
this.enableEquipment = false;
this.selectedEquipment = null;
@@ -194,11 +194,11 @@ export default class toolingEquipment extends Vue {
}
public cancel = function () {
this.selectedTool = JSON.parse(this.copySelectedTool);
if(this.selectedTool.id == null || this.selectedTool.id == 0){
this.selectedTool = null;
}
else{
this.selectedTool = this.copySelectedTool;
for (let l in this.selectedTool.edgesData) {
if (this.selectedTool.edgesData[l].id <= 0) {
this.selectedTool.edgesData.splice(l, 1);