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

login esc disable button

Browse Source
This commit is contained in:
Alessandro Francia
2018-07-20 16:35:49 +02:00
parent 9aa3095032
commit 361a677159
9 changed files with 188 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Step/wwwroot/assets/styles/base/modals.less
+61
View File
@@ -23,6 +23,8 @@ sans-serif;
@modal-load-program-width: 1808px;
@modal-job-add-parameter-width: 704px;
@modal-job-add-parameter-height: 608px;
@modal-edit-job-width: 952px;
@modal-edit-job-height: 872px;
@modal-iframe-height: 800px;
@modal-iframe-width: 1800px;
@modal-user-info-height: 610px;
@@ -1069,6 +1071,56 @@ sans-serif;
}
}
}
.items-list{
width: 475px;
min-height: 191px;
display: flex;
flex-flow: column;
.group-item{
width: 100%;
min-height: 128px;
display: flex;
flex-flow: column;
.item{
width: 100%;
height: 48px;
display: flex;
flex-flow: row;
align-items: center;
.number{
font-size: 18px;
line-height: 1.11;
color: @color-greyish-brown;
margin-right: 16px;
}
.input-text-box{
margin-right: 8px;
input{
width: 304px;
height: 48px;
border-radius: 2px;
box-shadow: inset 0 1px 3px 0 @color-black-50;
border: solid 1px @color-silver;
}
}
.group-button{
button.btn{
padding: 0 12px;
.fa{
font-size: 24px;
}
}
}
}
.item:first-child{
margin-top: 12px;
}
}
.add-item{
width: 100%;
display: flex;
}
}
}
.job-add-parameter-footer{
width: 100%;
@@ -1080,4 +1132,13 @@ sans-serif;
justify-content: flex-end;
}
}
.@{modal}.modal-edit-job{
width: @modal-edit-job-width;
height: @modal-edit-job-height;
border-radius: 2px;
top: calc(~'50%' - 392px);
left: calc(~'50%' - @modal-edit-job-width /2);
background-color: @color-background-white;
}
Step/wwwroot/assets/styles/style.css
+56
View File
@@ -1008,6 +1008,54 @@
border: solid 1px #bbbcbc;
margin: 16px;
}
.modal.modal-job-add-parameter .job-add-parameter-body .items-list {
width: 475px;
min-height: 191px;
display: flex;
flex-flow: column;
}
.modal.modal-job-add-parameter .job-add-parameter-body .items-list .group-item {
width: 100%;
min-height: 128px;
display: flex;
flex-flow: column;
}
.modal.modal-job-add-parameter .job-add-parameter-body .items-list .group-item .item {
width: 100%;
height: 48px;
display: flex;
flex-flow: row;
align-items: center;
}
.modal.modal-job-add-parameter .job-add-parameter-body .items-list .group-item .item .number {
font-size: 18px;
line-height: 1.11;
color: #4b4b4b;
margin-right: 16px;
}
.modal.modal-job-add-parameter .job-add-parameter-body .items-list .group-item .item .input-text-box {
margin-right: 8px;
}
.modal.modal-job-add-parameter .job-add-parameter-body .items-list .group-item .item .input-text-box input {
width: 304px;
height: 48px;
border-radius: 2px;
box-shadow: inset 0 1px 3px 0 rgba(0, 0, 0, 0.5);
border: solid 1px #bbbcbc;
}
.modal.modal-job-add-parameter .job-add-parameter-body .items-list .group-item .item .group-button button.btn {
padding: 0 12px;
}
.modal.modal-job-add-parameter .job-add-parameter-body .items-list .group-item .item .group-button button.btn .fa {
font-size: 24px;
}
.modal.modal-job-add-parameter .job-add-parameter-body .items-list .group-item .item:first-child {
margin-top: 12px;
}
.modal.modal-job-add-parameter .job-add-parameter-body .items-list .add-item {
width: 100%;
display: flex;
}
.modal.modal-job-add-parameter .job-add-parameter-footer {
width: 100%;
height: 78px;
@@ -1017,6 +1065,14 @@
align-items: center;
justify-content: flex-end;
}
.modal.modal-edit-job {
width: 952px;
height: 872px;
border-radius: 2px;
top: calc(50% - 392px);
left: calc(50% - 476px);
background-color: #fff;
}
.row {
display: flex;
width: 100%;
Step/wwwroot/src/app.modules.js
+4 -1
View File
@@ -140,6 +140,9 @@ export const ModalLoadProgram = () =>
export const ModalJobAddParameter = () =>
import ("./modules/base-components/modal-job-add-parameter.vue");
export const ModalEditJob = () =>
import ("./modules/base-components/modal-edit-job.vue");
export const ProgramManagement = () =>
import ("./modules/program-management.vue");
@@ -150,4 +153,4 @@ export const TestEmpty = () =>
import ("./components/test-empty.vue");
export const TestHeader = () =>
import ("./components/test-status.vue");
import ("./components/test-status.vue");
import ("./components/test-status.vue");
Step/wwwroot/src/app.routes.js
+3 -1
View File
@@ -43,7 +43,8 @@ import {
CardProductionSectionFile,
ModalLoadProgram,
ProgramManagement,
ModalJobAddParameter
ModalJobAddParameter,
ModalEditJob
} from "./app.modules";
export let routes = [
@@ -77,6 +78,7 @@ export let routes = [
{ path: "/modal-load-program", component: ModalLoadProgram, meta: { title: "Step - Modal-Load-Program", area: "modal-load-program" } },
{ path: "/modal-job-add-parameter", component: ModalJobAddParameter, meta: { title: "Step - Modal-Job-Add-Parameter", area: "modal-job-add-parameter" } },
{ path: "/modal-edit-job", component: ModalEditJob, meta: { title: "Step - Modal-Edit-Job", area: "modal-edit-job" } },
{ path: "/card-folder-path", component: CardFolderPath, meta: { title: "Step - Card-Folder-Path", area: "card-folder-path" } },
{ path: "/card-element-queue", component: CardElementQueue, meta: { title: "Step - Card-Element-Queue", area: "card-element-queue" } },
Step/wwwroot/src/modules/base-components/modal-edit-job.vue
+22
View File
@@ -0,0 +1,22 @@
<template>
<modal type="modal-edit-job" :title="'modal_edit_job_title_window' | localize('Setup di Job 1')">
<button class="close" slot="header-buttons" @click="close()"><i class="fa fa-remove"></i></button>
</modal>
</template>
<script>
import Modal from "src/modules/base-components/modal.vue";
import { ModalHelper } from "src/modules/base-components/ModalHelper.ts";
import { Factory, MessageService } from '../../_base';
export default {
components:{
modal: Modal
},
methods:{
close() {
Factory.Get(MessageService).deleteChannel("esc_pressed");
ModalHelper.HideModal();
},
}
};
</script>
Step/wwwroot/src/modules/base-components/modal-job-add-parameter.vue
+18
View File
@@ -25,6 +25,24 @@
<div class="title">
<label>Elementi della lista</label>
</div>
<div class="group-item">
<div class="item">
<div class="number">
1
</div>
<div class="input-text-box">
<input type="text">
</div>
<div class="group-button">
<button class="btn" v-if="true"><i class="fa fa-pencil-square-o"></i></button>
<button class="btn" v-if="false"><i class="fa fa-check"></i></button>
<button class="btn" style="padding: 0 15px;"><i class="fa fa-trash"></i></button>
</div>
</div>
</div>
<div class="add-item">
<button class="btn"><i class="fa fa-plus"></i></button>
</div>
</div>
</div>
<div class="job-add-parameter-footer">
Step/wwwroot/src/modules/base-components/modal-load-program.vue
+20 -3
View File
@@ -36,8 +36,14 @@
@click="val.IsDirectory? changePath(val.AbsolutePath):fileInfo(val.AbsolutePath) "></card-folder-path>
</div>
</div>
<div class="third-column" v-if="enableSecondColumn">
<div class="third-column" v-if="enableThirdColumn">
<div class="content scrollable">
<card-folder-path v-for="val in this.fileList"
:key="val.Name"
:name="val.Name"
:withArrow="val.IsDirectory"
:iconType="val.IsDirectory? 'FOLDER':'FILE'"
@click="val.IsDirectory? changePath(val.AbsolutePath):fileInfo(val.AbsolutePath) "></card-folder-path>
<!-- <card-folder-path name="Cliente A" @click="selectItem()" :with-arrow="false"></card-folder-path>-->
</div>
</div>
@@ -94,25 +100,36 @@ export default {
selectedFile: null,
driveList: {},
fileList: {},
arrayList: [],
arrayViewList: [],
dirPath: "C:\\"
}
},
mounted: function (){
debugger
if (typeof cmsClient != "undefined"){
this.driveList = JSON.parse(cmsClient.getOSdriveList())
this.fileList = JSON.parse(cmsClient.getFileList(this.dirPath))
console.log(this.fileList);
}
},
watch:{
dirPath: function(){
dirPath: function(){
debugger
if (typeof cmsClient != "undefined")
this.fileList = JSON.parse(cmsClient.getFileList(this.dirPath))
this.arrayList.push(this.fileList);
console.log(this.fileList);
console.log(this.arrayList);
}
},
methods:{
changePath(str){
this.selectElementSecond()
this.selectElementSecond();
if(this.arrayList.length > 1){
this.selectElementThird();
}
this.enableSelectedItem = false;
this.dirPath = str;
},
Step/wwwroot/src/modules/login.ts
+3 -3
View File
@@ -33,9 +33,9 @@ export default class Login extends Vue {
Factory.Get(MessageService).subscribeToChannel("force-ui-update", args => {
this.$forceUpdate();
});
document.body.addEventListener('keyup', e => {
if (e.keyCode === 27) {
iziToast.warning({title: "Write username and password"} as IziToastSettings);
document.body.addEventListener('keydown', function(e) {
if (e.keyCode == 27) {
return false;
}
})
Step/wwwroot/src/modules/login.vue
+1 -1
View File
@@ -1,5 +1,5 @@
<template>
<modal type="login" :title="'login_lbl_title' | localize('Login utente')">
<modal type="login" :title="'login_lbl_title' | localize('Login utente')" @keyup="test()">
<div>
<div class="login-form">