@visns-studio/visns-components 3.5.4 → 3.5.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/components/crm/DataGrid.jsx +55 -39
- package/package.json +1 -1
|
@@ -578,45 +578,47 @@ const DataGrid = forwardRef(
|
|
|
578
578
|
} else {
|
|
579
579
|
const column = rowProps.columns[columnIndex];
|
|
580
580
|
|
|
581
|
-
if (column.
|
|
582
|
-
|
|
583
|
-
|
|
584
|
-
|
|
585
|
-
|
|
586
|
-
|
|
587
|
-
|
|
588
|
-
|
|
589
|
-
|
|
590
|
-
|
|
591
|
-
|
|
592
|
-
if (
|
|
593
|
-
|
|
594
|
-
|
|
595
|
-
|
|
596
|
-
|
|
597
|
-
|
|
581
|
+
if (column.id !== '__checkbox-column') {
|
|
582
|
+
if (column.link && column.link.url) {
|
|
583
|
+
const fileRelationArray = column.id.split('.');
|
|
584
|
+
const linkUrl = column.link.url;
|
|
585
|
+
const linkKey = rowProps.columns[columnIndex].link.key;
|
|
586
|
+
const rowData = rowProps.data[linkKey];
|
|
587
|
+
|
|
588
|
+
if (column.link.hasOwnProperty('folder')) {
|
|
589
|
+
const linkFolder =
|
|
590
|
+
rowProps.columns[columnIndex].link.folder;
|
|
591
|
+
|
|
592
|
+
if (rowProps.data[fileRelationArray[0]]) {
|
|
593
|
+
if (linkFolder !== '') {
|
|
594
|
+
window.open(
|
|
595
|
+
`${linkUrl}${rowData}/${linkFolder}`
|
|
596
|
+
);
|
|
597
|
+
} else {
|
|
598
|
+
window.open(`${linkUrl}${rowData}`);
|
|
599
|
+
}
|
|
598
600
|
}
|
|
601
|
+
} else {
|
|
602
|
+
navigate(`${linkUrl}${rowData}`);
|
|
599
603
|
}
|
|
604
|
+
} else if (column.link && column.link.popup) {
|
|
605
|
+
const linkPopup = column.link.popup;
|
|
606
|
+
const linkKey = rowProps.columns[columnIndex].link.key;
|
|
607
|
+
const rowData = rowProps.data[linkKey];
|
|
608
|
+
|
|
609
|
+
window.open(
|
|
610
|
+
`${linkPopup}/${rowData}`,
|
|
611
|
+
'',
|
|
612
|
+
'width=1440,height=1024,menubar=1,resizable=1,status=1,titlebar=1,toolbar=1'
|
|
613
|
+
);
|
|
600
614
|
} else {
|
|
601
|
-
|
|
602
|
-
|
|
603
|
-
|
|
604
|
-
const linkPopup = column.link.popup;
|
|
605
|
-
const linkKey = rowProps.columns[columnIndex].link.key;
|
|
606
|
-
const rowData = rowProps.data[linkKey];
|
|
607
|
-
|
|
608
|
-
window.open(
|
|
609
|
-
`${linkPopup}/${rowData}`,
|
|
610
|
-
'',
|
|
611
|
-
'width=1440,height=1024,menubar=1,resizable=1,status=1,titlebar=1,toolbar=1'
|
|
612
|
-
);
|
|
613
|
-
} else {
|
|
614
|
-
const updateSetting = settings.find(
|
|
615
|
-
(setting) => setting.id === 'update'
|
|
616
|
-
);
|
|
615
|
+
const updateSetting = settings.find(
|
|
616
|
+
(setting) => setting.id === 'update'
|
|
617
|
+
);
|
|
617
618
|
|
|
618
|
-
|
|
619
|
-
|
|
619
|
+
if (updateSetting) {
|
|
620
|
+
modalOpen('update', rowProps.data[form.primaryKey]);
|
|
621
|
+
}
|
|
620
622
|
}
|
|
621
623
|
}
|
|
622
624
|
}
|
|
@@ -1936,10 +1938,24 @@ const DataGrid = forwardRef(
|
|
|
1936
1938
|
e.stopPropagation();
|
|
1937
1939
|
e.preventDefault();
|
|
1938
1940
|
|
|
1939
|
-
|
|
1940
|
-
|
|
1941
|
-
column.
|
|
1942
|
-
|
|
1941
|
+
// Check if every required field in column.validate exists and is truthy in data
|
|
1942
|
+
const isValid =
|
|
1943
|
+
column.validate?.every(
|
|
1944
|
+
(v) => data[v]
|
|
1945
|
+
) ?? true;
|
|
1946
|
+
|
|
1947
|
+
if (isValid) {
|
|
1948
|
+
handleTimer(
|
|
1949
|
+
data[
|
|
1950
|
+
form.primaryKey
|
|
1951
|
+
],
|
|
1952
|
+
column.id
|
|
1953
|
+
);
|
|
1954
|
+
} else {
|
|
1955
|
+
toast.error(
|
|
1956
|
+
'Please complete the required fields before starting the timer.'
|
|
1957
|
+
);
|
|
1958
|
+
}
|
|
1943
1959
|
}}
|
|
1944
1960
|
>
|
|
1945
1961
|
<Alarm
|
package/package.json
CHANGED