- corretto componente CDateTime

- aggiunto componente CDateTimeStartEnd
This commit is contained in:
Surya Paolo
2025-10-05 23:58:57 +02:00
parent 58db59a751
commit 2f39d4f1d9
71 changed files with 1559 additions and 1642 deletions

View File

@@ -1876,14 +1876,19 @@ export default defineComponent({
newRecord.value = {};
}
function SaveValue(newVal: any, valinitial: any) {
function SaveValue(newVal: any, valinitial: any, which?: string) {
// console.log('SaveValue', newVal)
// console.log('rowsel', rowsel, 'colsel', colsel.value)
let myfield = '';
let subf = '';
if (colsel.value) {
myfield = colsel.value.field!;
subf = colsel.value.subfield!;
if (which === 'end') {
myfield = colsel.value.field2!;
subf = colsel.value.subfield2!;
} else {
myfield = colsel.value.field!;
subf = colsel.value.subfield!;
}
}
let myrec = rowsel.value;
@@ -2159,8 +2164,8 @@ export default defineComponent({
};
if (col.action === lists.MenuAction.CAN_EDIT_TABLE) {
canEditPrec.value = canEdit.value
canEdit.value = true
canEditPrec.value = canEdit.value;
canEdit.value = true;
// console.log('Edit', item);
selItem(item, col);
recModif.value = { ...item };
@@ -2713,8 +2718,8 @@ export default defineComponent({
const check = tools.checkIfShowField(col, tipovis, visulabel, value);
let valuePresent =
colVisib.value.includes(col.field! + (col.subfield ? ('.' + col.subfield) : '')) ||
colVisib.value.includes(col.field + (col.subfield ? ('.' + col.subfield) : ''))
colVisib.value.includes(col.field! + (col.subfield ? '.' + col.subfield : '')) ||
colVisib.value.includes(col.field + (col.subfield ? '.' + col.subfield : ''));
if (valuePresent && col.visibleif! > 0 && record) {
if (col.visib_field) {
@@ -2944,7 +2949,7 @@ export default defineComponent({
function hidewindowEdit() {
annulla(0);
canEdit.value = canEditPrec.value
canEdit.value = canEditPrec.value;
}
function clickMarker(id: any) {

View File

@@ -53,7 +53,7 @@
:disable="disabilita()"
:val="lists.MenuAction.CAN_EDIT_TABLE"
icon="fas fa-pencil-alt"
:label="canEdit ? t('grid.edit_table') : t('grid.disable_edit_table')"
:label="canEdit ? t('grid.edit_table') : ''"
@update:model-value="canEdit = !canEdit"
@click="canEdit = !canEdit"
>
@@ -1142,6 +1142,8 @@
v-model:row="props.row"
:field="col.field"
:subfield="col.subfield"
:field2="col.field2"
:subfield2="col.subfield2"
minuteinterval="1"
@save="SaveValue"
@show="selItem(props.row, col)"
@@ -1278,6 +1280,8 @@
v-model:row="props.row"
:field="col.field"
:subfield="col.subfield"
:field2="col.field2"
:subfield2="col.subfield2"
minuteinterval="1"
@save="SaveValue"
@show="selItem(props.row, col)"
@@ -1484,6 +1488,8 @@
:tablesel="mycol.tablesel"
:field="mycol.field"
:subfield="mycol.subfield"
:field2="mycol.field2"
:subfield2="mycol.subfield2"
@save="SaveValdb"
@show="selItem(rowclicksel, mycol)"
@showandsave="showandsave"
@@ -1552,6 +1558,7 @@
"
>
<div class="">
MODIF_B: {{col.field2}}
<CMyPopupEdit
:table="mytable"
:canEdit="true"
@@ -1560,6 +1567,8 @@
v-model:row="newRecord"
:field="col.field"
:subfield="col.subfield"
:field2="col.field2"
:subfield2="col.subfield2"
:tablesel="col.tablesel"
:value_extra="getValueExtra(col, newRecord)"
:isInModif="true"
@@ -1642,6 +1651,7 @@
class="tdclass"
>
<div>
MODIF_C: {{col.field2}}
<CMyPopupEdit
:table="mytable"
:canEdit="true"
@@ -1652,6 +1662,8 @@
v-model:row="recModif"
:field="col.field"
:subfield="col.subfield"
:field2="col.field2"
:subfield2="col.subfield2"
:dense="false"
:value_extra="getValueExtra(col, recModif)"
minuteinterval="1"