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

improvements graphic load program production

Browse Source
This commit is contained in:
Alessandro Francia
2018-07-27 10:35:09 +02:00
parent 133a8f060c
commit 5eac5bc6f6
3 changed files with 38 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Step/wwwroot/assets/styles/base/modals.less
+15 -6
View File
@@ -866,20 +866,20 @@ sans-serif;
}
.first-column{
height: calc(~'100% - 19px');
min-width: 188px;
min-width: 295px;
border-right: solid 2px @color-whitethree;
display: flex;
flex-flow: column;
padding-top: 19px;
.card-folder-path{
width: 159px;
width: 280px;
display: flex;
margin-top: 8px 0 8px 5px;
}
}
.second-column{
height: calc(~'100% - 19px');
min-width: 343px;
min-width: 445px;
border-right: solid 2px @color-whitethree;
display: flex;
flex-flow: column;
@@ -888,7 +888,7 @@ sans-serif;
width: 94%;
height: 100%;
.card-folder-path{
width: 280px;
width: 371px;
display: flex;
margin-top: 8px 0 8px 8px;
}
@@ -896,7 +896,7 @@ sans-serif;
}
.third-column{
height: calc(~'100% - 19px');
min-width: 343px;
min-width: 447px;
border-right: solid 2px @color-whitethree;
display: flex;
flex-flow: column;
@@ -905,11 +905,20 @@ sans-serif;
width: 94%;
height: 100%;
.card-folder-path{
width: 280px;
width: 371px;
display: flex;
margin-top: 8px 0 8px 8px;
}
}
.label-folder-empty{
display: flex;
width: 100%;
height: 100%;
align-items: center;
justify-content: center;
color: @color-greyish-brown;
font-size: 20px;
}
}
.selected-item{
width: calc(~'100% - 880px');
Step/wwwroot/assets/styles/style.css
+15 -6
View File
@@ -805,20 +805,20 @@
}
.modal.modal-load-program .modal-load-program-body .first-column {
height: calc(100% - 19px);
min-width: 188px;
min-width: 295px;
border-right: solid 2px #e7e7e7;
display: flex;
flex-flow: column;
padding-top: 19px;
}
.modal.modal-load-program .modal-load-program-body .first-column .card-folder-path {
width: 159px;
width: 280px;
display: flex;
margin-top: 8px 0 8px 5px;
}
.modal.modal-load-program .modal-load-program-body .second-column {
height: calc(100% - 19px);
min-width: 343px;
min-width: 445px;
border-right: solid 2px #e7e7e7;
display: flex;
flex-flow: column;
@@ -829,13 +829,13 @@
height: 100%;
}
.modal.modal-load-program .modal-load-program-body .second-column .content .card-folder-path {
width: 280px;
width: 371px;
display: flex;
margin-top: 8px 0 8px 8px;
}
.modal.modal-load-program .modal-load-program-body .third-column {
height: calc(100% - 19px);
min-width: 343px;
min-width: 447px;
border-right: solid 2px #e7e7e7;
display: flex;
flex-flow: column;
@@ -846,10 +846,19 @@
height: 100%;
}
.modal.modal-load-program .modal-load-program-body .third-column .content .card-folder-path {
width: 280px;
width: 371px;
display: flex;
margin-top: 8px 0 8px 8px;
}
.modal.modal-load-program .modal-load-program-body .third-column .label-folder-empty {
display: flex;
width: 100%;
height: 100%;
align-items: center;
justify-content: center;
color: #4b4b4b;
font-size: 20px;
}
.modal.modal-load-program .modal-load-program-body .selected-item {
width: calc(100% - 880px);
height: 100%;
Step/wwwroot/src/modules/base-components/modal-load-program.vue
+8 -4
View File
@@ -36,14 +36,17 @@
<card-folder-path v-for="(val,key) in this.arrayViewList[0]"
:key="key"
:name="val.Name"
:disabled="val.Name == nameNewPath"
:disabled="val.Name == nameNewPath || (selectedFile ? val.Name == selectedFile.Name : '')"
:withArrow="val.IsDirectory"
:iconType="val.IsDirectory? 'FOLDER':'FILE'"
@click="val.IsDirectory && val.Name != nameNewPath ? changePath(val.AbsolutePath): val.IsDirectory ? null : fileInfo(val.AbsolutePath)"></card-folder-path>
</div>
</div>
<div class="third-column" v-if="enableThirdColumn">
<div class="content scrollable">
<div class="label-folder-empty" v-if="this.arrayViewList[1].length < 1">
<label>Cartella vuota</label>
</div>
<div class="content scrollable" v-if="!this.arrayViewList[1].length < 1">
<card-folder-path v-for="val in this.arrayViewList[1]"
:key="val.Name"
:name="val.Name"
@@ -79,7 +82,7 @@
</div>
</div>
<div class="modal-load-program-footer">
<button class="btn">Aggiungi in coda</button>
<button class="btn btn-success">{{'modal_load_program_btn_load_program' | localize('Carica programma')}}</button>
</div>
</modal>
</template>
@@ -153,6 +156,7 @@ export default {
},
methods:{
changePath(str, first = false, type){
this.selectedFile = "";
this.selectElementSecond();
this.enableSelectedItem = false;
this.parentPath = this.dirPath.split('\\').filter(i => i.length);
@@ -246,7 +250,7 @@ export default {
// console.log(this.childPath);
},
backPath(str){
var n = 0;
this.selectedFile = "";
// this.breadcrumbs = [];
this.childPath = str.split('\\').filter(i => i.length);
this.parentPath = this.dirPath.split('\\').filter(i => i.length);