evui 3.3.32 → 3.3.33
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/dist/evui.common.js +6 -13
- package/dist/evui.common.js.map +1 -1
- package/dist/evui.umd.js +6 -13
- package/dist/evui.umd.js.map +1 -1
- package/dist/evui.umd.min.js +1 -1
- package/dist/evui.umd.min.js.map +1 -1
- package/package.json +1 -1
- package/src/components/calendar/uses.js +6 -11
- package/src/components/grid/uses.js +1 -1
package/package.json
CHANGED
|
@@ -532,7 +532,8 @@ export const useCalendarDate = (param) => {
|
|
|
532
532
|
// time 모드인 경우 현재 값의 시간을 가지고 테스트
|
|
533
533
|
const timeValue = modelValue?.split(' ')[1] ?? '';
|
|
534
534
|
|
|
535
|
-
const isDisabled = disabledDate
|
|
535
|
+
const isDisabled = disabledDate
|
|
536
|
+
? disabledDate(new Date(`${currDate} ${timeValue}`)) : isInvalidDate;
|
|
536
537
|
|
|
537
538
|
const index = +(calendarType !== 'main');
|
|
538
539
|
const isRangeSelected = isRangeMode && selectedValue.value.length > index
|
|
@@ -543,7 +544,7 @@ export const useCalendarDate = (param) => {
|
|
|
543
544
|
|
|
544
545
|
// mode가 dateRange일 때는 이전, 다음달에 selected 를 하지 않는다.
|
|
545
546
|
calendarTableInfo[i][j] = {
|
|
546
|
-
monthType: `${monthType}${isDisabled
|
|
547
|
+
monthType: `${monthType}${isDisabled ? ' disabled' : ''}`,
|
|
547
548
|
isToday: TODAY_YMD === currDate,
|
|
548
549
|
isSelected,
|
|
549
550
|
year,
|
|
@@ -632,7 +633,7 @@ export const useCalendarDate = (param) => {
|
|
|
632
633
|
return true;
|
|
633
634
|
}
|
|
634
635
|
|
|
635
|
-
return compareFromAndToDateTime(
|
|
636
|
+
return !disabledDateFunc && compareFromAndToDateTime(
|
|
636
637
|
props.mode,
|
|
637
638
|
calendarType,
|
|
638
639
|
targetDateTimeValue,
|
|
@@ -887,7 +888,8 @@ export const useEvent = (param) => {
|
|
|
887
888
|
};
|
|
888
889
|
|
|
889
890
|
const setRangeModeDateByIndex = (currIndex, currDate) => {
|
|
890
|
-
if (
|
|
891
|
+
if (!disabledDate
|
|
892
|
+
&& compareFromAndToDateTime(props.mode, calendarType, currDate, selectedValue.value)) {
|
|
891
893
|
return;
|
|
892
894
|
}
|
|
893
895
|
|
|
@@ -1158,13 +1160,6 @@ export const useEvent = (param) => {
|
|
|
1158
1160
|
);
|
|
1159
1161
|
}
|
|
1160
1162
|
|
|
1161
|
-
const fromDate = index ? selectedValue.value[0] : currDateTime;
|
|
1162
|
-
const toDate = index ? currDateTime : selectedValue.value[1];
|
|
1163
|
-
|
|
1164
|
-
if (new Date(fromDate).getTime() > new Date(toDate).getTime()) {
|
|
1165
|
-
return;
|
|
1166
|
-
}
|
|
1167
|
-
|
|
1168
1163
|
selectedValue.value[index] = currDateTime;
|
|
1169
1164
|
}
|
|
1170
1165
|
emit('update:modelValue', [...selectedValue.value]);
|
|
@@ -898,7 +898,7 @@ export const contextMenuEvent = (params) => {
|
|
|
898
898
|
if (clickedRow) {
|
|
899
899
|
selectInfo.selectedRow = clickedRow;
|
|
900
900
|
setContextMenu();
|
|
901
|
-
emit('update:selected', clickedRow);
|
|
901
|
+
emit('update:selected', [clickedRow]);
|
|
902
902
|
} else {
|
|
903
903
|
selectInfo.selectedRow = [];
|
|
904
904
|
setContextMenu(false);
|