Merge branch 'test' into dev
gitea/salix/dev This commit looks good
Details
gitea/salix/dev This commit looks good
Details
This commit is contained in:
commit
4e085d930f
|
@ -6,7 +6,7 @@
|
||||||
<input
|
<input
|
||||||
class="mdl-textfield__input"
|
class="mdl-textfield__input"
|
||||||
type="time"
|
type="time"
|
||||||
ng-model="$ctrl.value"
|
ng-model="$ctrl.model"
|
||||||
vn-validation="{{$ctrl.rule}}"
|
vn-validation="{{$ctrl.rule}}"
|
||||||
ng-disabled="$ctrl.disabled"
|
ng-disabled="$ctrl.disabled"
|
||||||
ng-readonly="$ctrl.readonly"
|
ng-readonly="$ctrl.readonly"
|
||||||
|
|
|
@ -3,11 +3,19 @@ import Textfield from '../textfield/textfield';
|
||||||
import './style.scss';
|
import './style.scss';
|
||||||
|
|
||||||
export default class InputTime extends Textfield {
|
export default class InputTime extends Textfield {
|
||||||
|
|
||||||
get value() {
|
get value() {
|
||||||
return this._value;
|
return this._value;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
get model() {
|
||||||
|
return this._model;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
set model(value) {
|
||||||
|
this.value = value;
|
||||||
|
}
|
||||||
|
|
||||||
set value(value) {
|
set value(value) {
|
||||||
if (!value) return;
|
if (!value) return;
|
||||||
|
|
||||||
|
@ -15,7 +23,15 @@ export default class InputTime extends Textfield {
|
||||||
newDate.setSeconds(0);
|
newDate.setSeconds(0);
|
||||||
newDate.setMilliseconds(0);
|
newDate.setMilliseconds(0);
|
||||||
|
|
||||||
this._value = newDate;
|
this._model = newDate;
|
||||||
|
this.hasValue = this._model !== null;
|
||||||
|
|
||||||
|
let date = new Date(value);
|
||||||
|
date.setSeconds(0);
|
||||||
|
date.setMilliseconds(0);
|
||||||
|
let offset = date.getTimezoneOffset() * 60000;
|
||||||
|
date.setTime(date.getTime() - offset);
|
||||||
|
this._value = date;
|
||||||
|
|
||||||
this.hasValue = this._value !== null;
|
this.hasValue = this._value !== null;
|
||||||
|
|
||||||
|
|
|
@ -10,8 +10,8 @@ module.exports = {
|
||||||
<a href="https://www.youtube.com/watch?v=qhb0kgQF3o8" title="Youtube" target="_blank" style="color:#8dba25">https://www.youtube.com/watch?v=qhb0kgQF3o8</a>.
|
<a href="https://www.youtube.com/watch?v=qhb0kgQF3o8" title="Youtube" target="_blank" style="color:#8dba25">https://www.youtube.com/watch?v=qhb0kgQF3o8</a>.
|
||||||
También necesitarás el QLabel, el programa para imprimir las cintas.`,
|
También necesitarás el QLabel, el programa para imprimir las cintas.`,
|
||||||
downloadFrom: `Puedes descargarlo desde este enlace
|
downloadFrom: `Puedes descargarlo desde este enlace
|
||||||
<a href="http://ww.godexintl.com/es1/download/downloads/Download/2996" title="Descargar QLabel"
|
<a href="https://godex.s3-accelerate.amazonaws.com/gGnOPoojkP6vC1lgmrbEqQ.file?v01" title="Descargar QLabel"
|
||||||
target="_blank" style="color:#8dba25">http://ww.godexintl.com/es1/download/downloads/Download/2996</a>`,
|
target="_blank" style="color:#8dba25">https://godex.s3-accelerate.amazonaws.com/gGnOPoojkP6vC1lgmrbEqQ.file?v01</a>`,
|
||||||
},
|
},
|
||||||
sections: {
|
sections: {
|
||||||
QLabel: {
|
QLabel: {
|
||||||
|
|
Loading…
Reference in New Issue