vxe-pc-ui 4.18.15 → 4.18.17

package/dist/all.esm.js

@@ -101,7 +101,7 @@ function checkDynamic() {
 }
 
 const { log } = VxeUI;
-const uiVersion = `ui v${"4.18.15"}`;
+const uiVersion = `ui v${"4.18.17"}`;
 function createComponentLog(name) {
     const tableVersion = VxeUI.tableVersion ? `table v${VxeUI.tableVersion}` : '';
     const ganttVersion = VxeUI.ganttVersion ? `gantt v${VxeUI.ganttVersion}` : '';
@@ -115,7 +115,7 @@ function createComponentLog(name) {
 const warnLog$i = log.create('warn', uiVersion);
 log.create('error', uiVersion);
 
-const version = "4.18.15";
+const version = "4.18.17";
 VxeUI.uiVersion = version;
 VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -4983,14 +4983,8 @@ var VxeCalendarComponent = defineVxeComponent({
         },
         labelFormat: String,
         valueFormat: String,
-        festivalMethod: {
-            type: Function,
-            default: () => getConfig$2().calendar.festivalMethod
-        },
-        disabledMethod: {
-            type: Function,
-            default: () => getConfig$2().calendar.disabledMethod
-        },
+        festivalMethod: Function,
+        disabledMethod: Function,
         cellStyle: [Object, Function],
         menuConfig: Object,
         // week
@@ -5028,6 +5022,10 @@ var VxeCalendarComponent = defineVxeComponent({
             monthSize: 20,
             quarterSize: 8
         };
+        const defaultFuncProps = {
+            festivalMethod: getConfig$2().calendar.festivalMethod,
+            disabledMethod: getConfig$2().calendar.disabledMethod
+        };
         const refElem = ref();
         const refMaps = {
             refElem
@@ -5547,9 +5545,9 @@ var VxeCalendarComponent = defineVxeComponent({
             }
         };
         const isDateDisabled = (item) => {
-            const { disabledMethod } = props;
+            const disbMethod = props.disabledMethod || defaultFuncProps.disabledMethod;
             const { datePanelType } = reactData;
-            return disabledMethod && disabledMethod({ type: datePanelType, viewType: datePanelType, date: item.date, $calendar: $xeCalendar });
+            return disbMethod && disbMethod({ type: datePanelType, viewType: datePanelType, date: item.date, $calendar: $xeCalendar });
         };
         const changeViewEvent = (evnt) => {
             const { datePanelType } = reactData;
@@ -5742,10 +5740,10 @@ var VxeCalendarComponent = defineVxeComponent({
             }
         };
         const renderDateLabel = (item, label) => {
-            const { festivalMethod } = props;
-            if (festivalMethod) {
+            const flMethod = props.festivalMethod || defaultFuncProps.festivalMethod;
+            if (flMethod) {
                 const { datePanelType } = reactData;
-                const festivalRest = festivalMethod({ type: datePanelType, viewType: datePanelType, date: item.date, $calendar: $xeCalendar });
+                const festivalRest = flMethod({ type: datePanelType, viewType: datePanelType, date: item.date, $calendar: $xeCalendar });
                 const festivalItem = festivalRest ? (XEUtils.isString(festivalRest) ? { label: festivalRest } : festivalRest) : {};
                 const extraItem = festivalItem.extra ? (XEUtils.isString(festivalItem.extra) ? { label: festivalItem.extra } : festivalItem.extra) : null;
                 const labels = [
@@ -9292,14 +9290,8 @@ var VxeInputComponent = defineVxeComponent({
             type: Boolean,
             default: true
         },
-        festivalMethod: {
-            type: Function,
-            default: () => getConfig$3().input.festivalMethod
-        },
-        disabledMethod: {
-            type: Function,
-            default: () => getConfig$3().input.disabledMethod
-        },
+        festivalMethod: Function,
+        disabledMethod: Function,
         // week
         selectDay: {
             type: [String, Number],
@@ -9376,6 +9368,10 @@ var VxeInputComponent = defineVxeComponent({
             hpTimeout: undefined,
             dnTimeout: undefined
         };
+        const defaultFuncProps = {
+            festivalMethod: getConfig$3().input.festivalMethod,
+            disabledMethod: getConfig$3().input.disabledMethod
+        };
         const refElem = ref();
         const refInputTarget = ref();
         const refInputPanel = ref();
@@ -10557,7 +10553,7 @@ var VxeInputComponent = defineVxeComponent({
             }
         };
         const isDateDisabled = (item) => {
-            const { disabledMethod } = props;
+            const disbMethod = props.disabledMethod || defaultFuncProps.disabledMethod;
             const { datePanelType } = reactData;
             const dateStartTime = computeDateStartTime.value;
             const dateEndTime = computeDateEndTime.value;
@@ -10568,8 +10564,8 @@ var VxeInputComponent = defineVxeComponent({
             if (dateEndTime && dateEndTime.getTime() < date.getTime()) {
                 return true;
             }
-            if (disabledMethod) {
-                return disabledMethod({ type: datePanelType, viewType: datePanelType, date, $input: $xeInput });
+            if (disbMethod) {
+                return disbMethod({ type: datePanelType, viewType: datePanelType, date, $input: $xeInput });
             }
             return false;
         };
@@ -11130,10 +11126,10 @@ var VxeInputComponent = defineVxeComponent({
         };
         Object.assign($xeInput, inputMethods);
         const renderDateLabel = (item, label) => {
-            const { festivalMethod } = props;
-            if (festivalMethod) {
+            const flMethod = props.festivalMethod || defaultFuncProps.festivalMethod;
+            if (flMethod) {
                 const { datePanelType } = reactData;
-                const festivalRest = festivalMethod({ type: datePanelType, viewType: datePanelType, date: item.date, $input: $xeInput });
+                const festivalRest = flMethod({ type: datePanelType, viewType: datePanelType, date: item.date, $input: $xeInput });
                 const festivalItem = festivalRest ? (XEUtils.isString(festivalRest) ? { label: festivalRest } : festivalRest) : {};
                 const extraItem = festivalItem.extra ? (XEUtils.isString(festivalItem.extra) ? { label: festivalItem.extra } : festivalItem.extra) : null;
                 const labels = [
@@ -18711,14 +18707,8 @@ var VxeDatePanelComponent = defineVxeComponent({
         valueFormat: String,
         timeFormat: String,
         valueSort: Boolean,
-        festivalMethod: {
-            type: Function,
-            default: () => getConfig$3().datePanel.festivalMethod
-        },
-        disabledMethod: {
-            type: Function,
-            default: () => getConfig$3().datePanel.disabledMethod
-        },
+        festivalMethod: Function,
+        disabledMethod: Function,
         timeConfig: Object,
         // week
         selectDay: {
@@ -18760,6 +18750,10 @@ var VxeDatePanelComponent = defineVxeComponent({
             quarterSize: 4,
             hpTimeout: undefined
         };
+        const defaultFuncProps = {
+            festivalMethod: getConfig$3().datePanel.festivalMethod,
+            disabledMethod: getConfig$3().datePanel.disabledMethod
+        };
         const refElem = ref();
         const refPanelWrapper = ref();
         const refInputTimeBody = ref();
@@ -19612,11 +19606,11 @@ var VxeDatePanelComponent = defineVxeComponent({
             return false;
         };
         const isDateDisabled = (item) => {
-            const { disabledMethod } = props;
+            const disbMethod = props.disabledMethod || defaultFuncProps.disabledMethod;
             const { datePanelType } = reactData;
             const { date } = item;
-            if (disabledMethod) {
-                return disabledMethod({ type: datePanelType, viewType: datePanelType, date, $datePanel: $xeDatePanel });
+            if (disbMethod) {
+                return disbMethod({ type: datePanelType, viewType: datePanelType, date, $datePanel: $xeDatePanel });
             }
             return false;
         };
@@ -19898,11 +19892,11 @@ var VxeDatePanelComponent = defineVxeComponent({
         };
         Object.assign($xeDatePanel, datePanelMethods);
         const renderDateLabel = (item, label) => {
-            const { festivalMethod } = props;
+            const flMethod = props.festivalMethod || defaultFuncProps.festivalMethod;
             const labelVNs = [];
-            if (festivalMethod) {
+            if (flMethod) {
                 const { datePanelType } = reactData;
-                const festivalRest = festivalMethod({ type: datePanelType, viewType: datePanelType, date: item.date, $datePanel: $xeDatePanel });
+                const festivalRest = flMethod({ type: datePanelType, viewType: datePanelType, date: item.date, $datePanel: $xeDatePanel });
                 const festivalItem = festivalRest ? (XEUtils.isString(festivalRest) ? { label: festivalRest } : festivalRest) : {};
                 const extraItem = festivalItem.extra ? (XEUtils.isString(festivalItem.extra) ? { label: festivalItem.extra } : festivalItem.extra) : null;
                 labelVNs.push(h('div', {
@@ -20572,22 +20566,13 @@ var VxeDatePickerComponent = defineVxeComponent({
         labelFormat: String,
         valueFormat: String,
         timeFormat: String,
-        parseInputMethod: {
-            type: Function,
-            default: () => getConfig$3().datePicker.parseInputMethod
-        },
+        parseInputMethod: Function,
         editable: {
             type: Boolean,
             default: true
         },
-        festivalMethod: {
-            type: Function,
-            default: () => getConfig$3().datePicker.festivalMethod
-        },
-        disabledMethod: {
-            type: Function,
-            default: () => getConfig$3().datePicker.disabledMethod
-        },
+        festivalMethod: Function,
+        disabledMethod: Function,
         // week
         selectDay: {
             type: [String, Number],
@@ -20660,6 +20645,11 @@ var VxeDatePickerComponent = defineVxeComponent({
         const { computeSize } = useSize(props);
         const reactData = reactive(createReactData$h());
         const internalData = createInternalData$g();
+        const defaultFuncProps = {
+            parseInputMethod: getConfig$3().datePicker.parseInputMethod,
+            festivalMethod: getConfig$3().datePicker.festivalMethod,
+            disabledMethod: getConfig$3().datePicker.disabledMethod
+        };
         const refElem = ref();
         const refInputTarget = ref();
         const refInputPanel = ref();
@@ -21014,12 +21004,13 @@ var VxeDatePickerComponent = defineVxeComponent({
             handleInputLabel(panelLabel, true);
         };
         const afterCheckValue = (inpVal) => {
-            const { type, editable, multiple, maskedConfig, parseInputMethod } = props;
+            const { type, editable, multiple, maskedConfig } = props;
             const { inputLabel } = internalData;
             const dateLabelFormat = computeDateLabelFormat.value;
             const maskedOpts = computeMaskedOpts.value;
             const dateStartDate = computeDateStartDate.value;
             const dateEndDate = computeDateEndDate.value;
+            const parseInpMethod = props.parseInputMethod || defaultFuncProps.parseInputMethod;
             if (!inpVal) {
                 handleChange('', { type: 'check' });
                 return;
@@ -21046,8 +21037,8 @@ var VxeDatePickerComponent = defineVxeComponent({
                 }
             }
             let inpDateVal;
-            if (parseInputMethod) {
-                inpDateVal = parseInputMethod({
+            if (parseInpMethod) {
+                inpDateVal = parseInpMethod({
                     $datePicker: $xeDatePicker,
                     type,
                     inputValue: inpVal,
@@ -21894,8 +21885,8 @@ var VxeDatePickerComponent = defineVxeComponent({
                                             valueFormat: props.valueFormat,
                                             timeFormat: props.timeFormat,
                                             timeConfig: timeOpts,
-                                            festivalMethod: props.festivalMethod,
-                                            disabledMethod: props.disabledMethod,
+                                            festivalMethod: props.festivalMethod || defaultFuncProps.festivalMethod,
+                                            disabledMethod: props.disabledMethod || defaultFuncProps.disabledMethod,
                                             selectDay: props.selectDay,
                                             onChange: panelChangeEvent,
                                             onConfirm: panelConfirmEvent,
@@ -22222,14 +22213,8 @@ var VxeDateRangePickerComponent = defineVxeComponent({
             type: Boolean,
             default: true
         },
-        festivalMethod: {
-            type: Function,
-            default: () => getConfig$3().dateRangePicker.festivalMethod
-        },
-        disabledMethod: {
-            type: Function,
-            default: () => getConfig$3().dateRangePicker.disabledMethod
-        },
+        festivalMethod: Function,
+        disabledMethod: Function,
         separator: {
             type: [String, Number],
             default: () => getConfig$3().dateRangePicker.separator
@@ -22302,6 +22287,10 @@ var VxeDateRangePickerComponent = defineVxeComponent({
         const { computeSize } = useSize(props);
         const reactData = reactive(createReactData$g());
         const internalData = createInternalData$f();
+        const defaultFuncProps = {
+            festivalMethod: getConfig$3().dateRangePicker.festivalMethod,
+            disabledMethod: getConfig$3().dateRangePicker.disabledMethod
+        };
         const refElem = ref();
         const refInputTarget = ref();
         const refInputPanel = ref();
@@ -23387,8 +23376,8 @@ var VxeDateRangePickerComponent = defineVxeComponent({
                                             defaultDate: sdDate,
                                             defaultTime: sdTime,
                                             timeConfig: timeOpts,
-                                            festivalMethod: props.festivalMethod,
-                                            disabledMethod: props.disabledMethod,
+                                            festivalMethod: props.festivalMethod || defaultFuncProps.festivalMethod,
+                                            disabledMethod: props.disabledMethod || defaultFuncProps.disabledMethod,
                                             selectDay: props.selectDay,
                                             cellClassName: panelCellClassName,
                                             onChange: startPanelChangeEvent,
@@ -23414,8 +23403,8 @@ var VxeDateRangePickerComponent = defineVxeComponent({
                                             defaultDate: edDate,
                                             defaultTime: edTime,
                                             timeConfig: timeOpts,
-                                            festivalMethod: props.festivalMethod,
-                                            disabledMethod: props.disabledMethod,
+                                            festivalMethod: props.festivalMethod || defaultFuncProps.festivalMethod,
+                                            disabledMethod: props.disabledMethod || defaultFuncProps.disabledMethod,
                                             selectDay: props.selectDay,
                                             cellClassName: panelCellClassName,
                                             onChange: endPanelChangeEvent,
@@ -23887,10 +23876,7 @@ var VxeDrawerComponent = defineVxeComponent({
             type: String,
             default: () => getConfig$3().drawer.size || getConfig$3().size
         },
-        beforeHideMethod: {
-            type: Function,
-            default: () => getConfig$3().drawer.beforeHideMethod
-        },
+        beforeHideMethod: Function,
         slots: Object
     },
     emits: [
@@ -23922,6 +23908,9 @@ var VxeDrawerComponent = defineVxeComponent({
             drawerZIndex: 0,
             resizeFlag: 1
         });
+        const defaultFuncProps = {
+            beforeHideMethod: getConfig$3().drawer.beforeHideMethod
+        };
         const refMaps = {
             refElem
         };
@@ -23988,11 +23977,11 @@ var VxeDrawerComponent = defineVxeComponent({
             }
         };
         const closeDrawer = (type) => {
-            const { beforeHideMethod } = props;
             const { visible } = reactData;
+            const beHideMethod = props.beforeHideMethod || defaultFuncProps.beforeHideMethod;
             const params = { type };
             if (visible) {
-                Promise.resolve(beforeHideMethod ? beforeHideMethod(params) : null).then((rest) => {
+                Promise.resolve(beHideMethod ? beHideMethod(params) : null).then((rest) => {
                     if (!XEUtils.isError(rest)) {
                         const el = refElem.value;
                         if (el) {